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

equal deleted inserted replaced

-:c5b304f4d89b
+:ed94e1e8390e
 #include "mpcollectiondatamodel.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" );
 public:
 MpPopupHandlerPermanentData( QObject *parent=0 );
 virtual ~MpPopupHandlerPermanentData();
 void clear();
 public:
-MpMpxCollectionData         *mIsolatedCollectionData;        // Not own
+MpMpxCollectionData         *mCollectionData;      // ownership depends on mIsolatedOperation
-QAbstractItemModel          *mAbstractItemModel;             // Own
+QAbstractItemModel          *mAbstractItemModel;   // ownership depends on use case, parented.
 QList<int>                  mSelectedItems;
 QString                     mOriginalName;
-int                         mContextMenuIndex;
+QModelIndex                 mContextMenuModelIndex;
+bool                        mIsolatedOperation;
 };
 /*!
 Constructs the popup handler permanent data.
 */
 MpPopupHandlerPermanentData::MpPopupHandlerPermanentData( QObject *parent )
 : QObject( parent ),
-mIsolatedCollectionData( 0 ),
+mCollectionData( 0 ),
 mAbstractItemModel( 0 ),
-mContextMenuIndex( KNullIndex )
+mContextMenuModelIndex(),
+mIsolatedOperation( false )
 {
 TX_ENTRY
 mSelectedItems.clear();
 mOriginalName.clear();
 TX_EXIT
 void MpPopupHandlerPermanentData::clear()
 {
 TX_ENTRY
 mSelectedItems.clear();
 mOriginalName.clear();
-mContextMenuIndex = KNullIndex;
+mContextMenuModelIndex = QModelIndex();
-if ( mIsolatedCollectionData ) {
+if ( mIsolatedOperation ) {
-MpEngineFactory::sharedEngine()->releaseIsolatedCollection();
+mIsolatedOperation = false;
-mIsolatedCollectionData = 0;
+if ( mCollectionData ) {
-}
+MpEngineFactory::sharedEngine()->releaseIsolatedCollection();
-if ( mAbstractItemModel ) {
+mCollectionData = 0;
-delete mAbstractItemModel;
+}
-mAbstractItemModel = 0;
+}
-}
+//deleted by parenting if owned
+mAbstractItemModel = 0;
 //clearing any child Objects.
 foreach (QObject* child, children()) {
 child->deleteLater();
 }
 TX_EXIT
 }
 /*!
 Default view context menu.
 */
-void MpCollectionPopupHandler::openDefaultViewContextMenu( int index, const QPointF &coords )
+void MpCollectionPopupHandler::openDefaultViewContextMenu( const QModelIndex &index, const QPointF &coords )
 {
 TX_ENTRY
 if ( mView->isActivated() ) {
 break;
 case ECollectionContextPlaylists:
 contextMenu = new HbMenu();
 action = contextMenu->addAction( hbTrId( "txt_common_menu_open" ) );
 action->setObjectName( KOpen );
-if ( !mMpEngine->collectionData()->isAutoPlaylist( index ) ) {
+if ( !mMpEngine->collectionData()->isAutoPlaylist( index.row() ) ) {
 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 );
 default:
 break;
 }
 if ( contextMenu ) {
-mPermanentData->mContextMenuIndex = index;
+mPermanentData->mContextMenuModelIndex = index;
 contextMenu->setPreferredPos( coords );
 contextMenu->setObjectName( KContextMenu );
 contextMenu->setAttribute( Qt::WA_DeleteOnClose );
 setOutstandingPopup( contextMenu );
 contextMenu->open( this, SLOT( defaultContextMenuOptionSelected( HbAction* ) ) );
 }
 /*!
 Fetch view context menu
 */
-void MpCollectionPopupHandler::openFetchViewContextMenu( int index, const QPointF &coords )
+void MpCollectionPopupHandler::openFetchViewContextMenu( const QModelIndex &index, const QPointF &coords )
 {
-TX_ENTRY_ARGS( "index=" << index );
+TX_ENTRY_ARGS( "index=" << index.row() );
 if ( mView->isActivated() ) {
 HbAction *action;
 HbMenu *contextMenu = 0;
 default:
 break;
 }
 if ( contextMenu ) {
-mPermanentData->mContextMenuIndex = index;
+mPermanentData->mContextMenuModelIndex = index;
 contextMenu->setPreferredPos( coords );
 contextMenu->setAttribute( Qt::WA_DeleteOnClose );
 contextMenu->setObjectName( KContextMenu );
 setOutstandingPopup( contextMenu );
 contextMenu->open( this, SLOT( fetcherContextMenuOptionSelected( HbAction* ) ) );
 */
 void MpCollectionPopupHandler::openRenamePlaylistContainerDialog( const QString &currentName )
 {
 TX_ENTRY_ARGS( "Current name=" << currentName );
 mPermanentData->mOriginalName = currentName;
-getText( hbTrId( "txt_mus_dialog_enter_name" ), currentName,
+getText( hbTrId( "txt_mus_dialog_enter_name" ),
+currentName,
+hbTrId( "txt_common_button_ok" ), //TODO:replace for "rename" when string is available
 SLOT( handleRenamePlaylistContainer( HbAction* ) ) );
 TX_EXIT
 }
 /*!
 */
 void MpCollectionPopupHandler::openRenamePlaylistItemDialog( const QString &currentName )
 {
 TX_ENTRY_ARGS( "Current name=" << currentName );
 mPermanentData->mOriginalName = currentName;
-getText( hbTrId( "txt_mus_dialog_enter_name" ), currentName,
+getText( hbTrId( "txt_mus_dialog_enter_name" ),
+currentName,
+hbTrId( "txt_common_button_ok" ),//TODO:replace for "rename" when string is available
 SLOT( handleRenamePlaylistItem( HbAction* ) ) );
 TX_EXIT
 }
 /*!
 Request to select songs to add to the playlist
 */
 void MpCollectionPopupHandler::openAddSongsToPlaylist( QAbstractItemModel* model )
 {
 TX_ENTRY
-getModelIndexes( hbTrId( "txt_mus_title_select_songs" ), model,
+getModelIndexes( hbTrId( "txt_mus_title_select_songs" ),//TODO:replace for "add songs" when string is available
+hbTrId( "txt_common_button_add_dialog" ),
+model,
 SLOT( handleAddSongsToPlayList( HbAction* ) ) );
 TX_EXIT
 }
 /*!
 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,
+getModelIndexes( hbTrId( "txt_mus_title_select_songs" ),//TODO:replace for "add songs" when string is available
+hbTrId( "txt_common_button_add_dialog" ),
+model,
 SLOT( handleAddSongsToPlayList( HbAction* ) ) );
 TX_EXIT
 }
 /*!
 Request to select songs to be deleted
 */
 void MpCollectionPopupHandler::openDeleteSongs( QAbstractItemModel* model )
 {
 TX_ENTRY
-getModelIndexes( hbTrId( "txt_mus_title_select_songs" ), model,
+//currently we can only get here from playlistsongs, no need to check for that.
+getModelIndexes( hbTrId( "txt_mus_title_remove_songs" ),
+hbTrId( "txt_common_button_remove_dialog" ),
+model,
 SLOT( handleDeleteSongs( HbAction* ) ) );
 TX_EXIT
 }
 /*!
 Request to select songs to be added to the current play list
 */
 void MpCollectionPopupHandler::openAddToCurrentPlaylist( MpMpxCollectionData* collectionData )
 {
 TX_ENTRY
-mPermanentData->mIsolatedCollectionData = collectionData;
+mPermanentData->mIsolatedOperation = true;
+mPermanentData->mCollectionData = collectionData;
 MpCollectionDataModel *collectionDataModel;
 collectionDataModel = new MpCollectionDataModel( collectionData );
+//this item will be deleted when clearing permanent data.
+collectionDataModel->setParent( mPermanentData );
 collectionDataModel->refreshModel();
 mPermanentData->mAbstractItemModel = collectionDataModel;
-getModelIndexes( hbTrId( "txt_mus_title_select_songs" ), collectionDataModel,
+getModelIndexes( hbTrId( "txt_mus_title_select_songs" ),//TODO:replace for "add songs" when string is available
+hbTrId( "txt_common_button_add_dialog" ),
+collectionDataModel,
 SLOT( handleAddToCurrentPlaylist( HbAction* ) ) );
 TX_EXIT
 }
 /*!
 Request to create a new play list and then add songs to it.
 */
-void MpCollectionPopupHandler::openCreateNewPlaylist( MpMpxCollectionData* collectionData )
+void MpCollectionPopupHandler::openCreateNewPlaylist( MpMpxCollectionData* collectionData, bool isolated )
 {
 TX_ENTRY
-mPermanentData->mIsolatedCollectionData = collectionData;
+mPermanentData->mIsolatedOperation = isolated;
+mPermanentData->mCollectionData = collectionData;
 MpCollectionDataModel *collectionDataModel;
+//this item will be deleted when clearing permanent data.
 collectionDataModel = new MpCollectionDataModel( collectionData );
+collectionDataModel->setParent( mPermanentData );
 collectionDataModel->refreshModel();
 mPermanentData->mAbstractItemModel = collectionDataModel;
+QStringList playlists;
+mMpEngine->findPlaylists( playlists );
+queryNewPlaylistName( playlists, SLOT( handleCreateNewPlaylistGetTextFinished( HbAction* ) ) );
+TX_EXIT
+}
+/*!
+Request to create a new playlist from TBone
+*/
+void MpCollectionPopupHandler::openCreateNewPlaylistFromTBone( )
+{
+TX_ENTRY
+mPermanentData->mIsolatedOperation = false;
+MpCollectionTBoneListDataModel *model;
+model = new MpCollectionTBoneListDataModel( mMpEngine->collectionData() );
+//this item will be deleted when clearing permanent data.
+model->setParent(mPermanentData);
+model->refreshModel();
+mPermanentData->mAbstractItemModel = model;
 QStringList playlists;
 mMpEngine->findPlaylists( playlists );
 queryNewPlaylistName( playlists, SLOT( handleCreateNewPlaylistGetTextFinished( HbAction* ) ) );
 TX_EXIT
 }
 mPermanentData->clear();
 }
 }
 else {
 mOutstandingPopup->close();
-//Delete/Clear permanent data until current popup gets deleted
+//Delete/Clear permanent data when current popup is deleted
 mPermanentData->setParent( mOutstandingPopup );
 //Generate new permanent data for future popups
 mPermanentData = new MpPopupHandlerPermanentData( this );
 }
 }
 {
 TX_ENTRY
 if ( selectedAction ) {
 QString objectName = selectedAction->objectName();
 QList<int> selection;
-selection.append( mPermanentData->mContextMenuIndex );
+selection.append( mPermanentData->mContextMenuModelIndex.row() );
 if ( objectName == KOpen ) {
-mView->openItem( mPermanentData->mContextMenuIndex );
+mView->openItem( mPermanentData->mContextMenuModelIndex );
 }
 if ( objectName == KAdd ) {
 launchAddToPlaylistDialog( selection );
 }
 else if ( objectName == KDelete ) {
-requestDelete( selection );
+mPermanentData->mSelectedItems = selection;
+requestDelete();
 }
 else if ( objectName == KRenamePlayList ) {
 QString currentName;
 currentName = mMpEngine->collectionData()->itemData(
-mPermanentData->mContextMenuIndex, MpMpxCollectionData::Title );
+mPermanentData->mContextMenuModelIndex.row(), MpMpxCollectionData::Title );
 openRenamePlaylistItemDialog( currentName );
 }
 else if ( objectName == KDetails ) {
-mView->showItemDetails( mPermanentData->mContextMenuIndex );
+mView->showItemDetails( mPermanentData->mContextMenuModelIndex.row() );
 }
 }
 TX_EXIT
 }
 void MpCollectionPopupHandler::fetcherContextMenuOptionSelected( HbAction *selectedAction )
 {
 TX_ENTRY
 if ( selectedAction ) {
 // Start the playback process. View will switch to playbackview.
-mMpEngine->previewItem( mPermanentData->mContextMenuIndex );
+mMpEngine->previewItem( mPermanentData->mContextMenuModelIndex.row() );
 }
 TX_EXIT
 }
 /*!
 if ( selectedAction ) {
 QString objectName = selectedAction->objectName();
 if ( objectName == KOk ) {
 QString newPlaylistName = dialog->value().toString();
-if ( newPlaylistName.length() ) {
+//Create new playlist with given name
-//Create new playlist with given name
+mMpEngine->createPlaylist( newPlaylistName, mPermanentData->mSelectedItems );
-mMpEngine->createPlaylist( newPlaylistName, mPermanentData->mSelectedItems );
-}
-else {
-//No valid name, prompt for one again.
-getText( hbTrId( "txt_mus_dialog_enter_name" ), newPlaylistName,
-SLOT( handleAddToPlaylistGetTextFinished( HbAction* ) ) );
-operationCompleted = false;
-}
 }
 else {
 // user decided to not provide a new name, go back to playlist list selection
 QStringList playlists;
 mMpEngine->findPlaylists( playlists );
 void MpCollectionPopupHandler::handleRenamePlaylistContainer( HbAction *selectedAction )
 {
 TX_ENTRY
 HbInputDialog *dialog = qobject_cast<HbInputDialog *>( sender() );
 clearOutstandingPopup( dialog );
-bool operationCompleted( true );
 if ( selectedAction ) {
 QString objectName = selectedAction->objectName();
 if ( objectName == KOk ) {
 QString newPlaylistName = dialog->value().toString();
-if ( newPlaylistName.length() ) {
+if ( newPlaylistName != mPermanentData->mOriginalName ) {
-if ( newPlaylistName != mPermanentData->mOriginalName ) {
+mMpEngine->renamePlaylist( newPlaylistName );
-mMpEngine->renamePlaylist( newPlaylistName );
-}
 }
-else {
+}
-//No valid name, prompt for one again.
+}
-getText( hbTrId( "txt_mus_dialog_enter_name" ), newPlaylistName,
+mPermanentData->clear();
-SLOT( handleRenamePlaylistContainer( HbAction* ) ) );
-operationCompleted = false;
-}
-}
-}
-if ( operationCompleted ) {
-mPermanentData->clear();
-}
 TX_EXIT
 }
 /*!
 Slot to be called when input dialog (getText) has finished, comming from RenamePlaylist ContextMenu.
 void MpCollectionPopupHandler::handleRenamePlaylistItem( HbAction *selectedAction )
 {
 TX_ENTRY
 HbInputDialog *dialog = qobject_cast<HbInputDialog *>( sender() );
 clearOutstandingPopup( dialog );
-bool operationCompleted( true );
 if ( selectedAction ) {
 QString objectName = selectedAction->objectName();
 if ( objectName == KOk ) {
 QString newPlaylistName = dialog->value().toString();
-if ( newPlaylistName.length() ) {
+if ( newPlaylistName != mPermanentData->mOriginalName ) {
-if ( newPlaylistName != mPermanentData->mOriginalName ) {
+mMpEngine->renamePlaylist( newPlaylistName, mPermanentData->mContextMenuModelIndex.row() );
-mMpEngine->renamePlaylist( newPlaylistName, mPermanentData->mContextMenuIndex );
 }
 }
-else {
+}
-//No valid name, prompt for one again.
+mPermanentData->clear();
-getText( hbTrId( "txt_mus_dialog_enter_name" ), newPlaylistName,
-SLOT( handleRenamePlaylistItem( HbAction* ) ) );
-operationCompleted = false;
-}
-}
-}
-if ( operationCompleted ) {
-mPermanentData->clear();
-}
 TX_EXIT
 }
 /*!
 Slot to be called when select songs dialog (getModelIndexes) has finished, coming from AddSongsToPlayList.
 }
 launchAddToPlaylistDialog( selection );
 }
 }
 else {
-mPermanentData->clear();
+//Delete/Clear permanent data when current dialog is deleted
+mPermanentData->setParent( dialog );
+//Generate new permanent data for future popups
+mPermanentData = new MpPopupHandlerPermanentData( this );
 }
 }
 //Dialog won't use CollectionView main model any more, return it to its original layout.
 MpCollectionDataModel *mpModel = qobject_cast<MpCollectionDataModel *>( dialog->model() );
 {
 TX_ENTRY
 HbSelectionDialog *dialog = qobject_cast<HbSelectionDialog *>( sender() );
 clearOutstandingPopup( dialog );
-if ( selectedAction ) {
+if ( selectedAction && selectedAction->objectName() == KOk ) {
-QString objectName = selectedAction->objectName();
+QModelIndexList selectedModelIndexes;
-if ( objectName == KOk ) {
+selectedModelIndexes = dialog->selectedModelIndexes();
-QModelIndexList selectedModelIndexes;
+if ( selectedModelIndexes.count() ) {
-selectedModelIndexes = dialog->selectedModelIndexes();
+QList<int> selection;
-if ( selectedModelIndexes.count() ) {
+for ( int i = 0; i < selectedModelIndexes.size(); ++i ) {
-QList<int> selection;
+selection.append( selectedModelIndexes.at( i ).row() );
-for ( int i = 0; i < selectedModelIndexes.size(); ++i ) {
-selection.append( selectedModelIndexes.at( i ).row() );
-}
-requestDelete( selection );
 }
-}
+mPermanentData->mSelectedItems = selection;
 }
+//we have to delay the delete, so the list on the dialog does not get the update (flicker!)
+connect( dialog, SIGNAL( destroyed() ), this, SLOT( requestDelete() ) );
+}
+else {
+mPermanentData->clear();
+}
 //Dialog won't use CollectionView main model any more, return it to its original layout.
 MpCollectionDataModel *mpModel = qobject_cast<MpCollectionDataModel *>( dialog->model() );
 if ( mpModel ) {
 //setLayout() only applies for MpCollectionDataModel where we need to
 //decide which layout to use for the secondary text.
 QList<int> selection;
 for ( int i = 0; i < selectedModelIndexes.size(); ++i ) {
 selection.append( selectedModelIndexes.at( i ).row() );
 }
 mMpEngine->saveToCurrentPlaylist( selection,
-mPermanentData->mIsolatedCollectionData );
+mPermanentData->mCollectionData );
 }
 }
 }
 //Dialog is using an isolated model which will be deleted, no need to change its layout.
-mPermanentData->clear();
+//Delete/Clear permanent data when current dialog is deleted
+mPermanentData->setParent( dialog );
+//Generate new permanent data for future popups
+mPermanentData = new MpPopupHandlerPermanentData( this );
 TX_EXIT
 }
 /*!
 Slot to be called when the input dialog (getText) has finished, comming from CreateNewPlaylist.
 void MpCollectionPopupHandler::handleCreateNewPlaylistGetTextFinished( HbAction *selectedAction )
 {
 TX_ENTRY
 HbInputDialog *dialog = qobject_cast<HbInputDialog *>( sender() );
 clearOutstandingPopup( dialog );
-bool operationCompleted( true );
+if ( selectedAction && selectedAction->objectName() == KOk) {
-if ( selectedAction ) {
+QString newPlaylistName = dialog->value().toString();
-QString objectName = selectedAction->objectName();
+//Store the new playlist name and query for the items to be added
-if ( objectName == KOk ) {
+mPermanentData->mOriginalName = newPlaylistName;
-QString newPlaylistName = dialog->value().toString();
+getModelIndexes( hbTrId( "txt_mus_title_select_songs" ),//TODO:replace for "add songs" when string is available
-if ( newPlaylistName.length() ) {
+hbTrId( "txt_common_button_add_dialog" ),
-//Store the new playlist name and query for the items to be added
+mPermanentData->mAbstractItemModel,
-mPermanentData->mOriginalName = newPlaylistName;
+SLOT( handleCreateNewPlaylistGetModelIndexesFinished( HbAction* ) ) );
-getModelIndexes( hbTrId( "txt_mus_title_select_songs" ),
+}
-mPermanentData->mAbstractItemModel,
+else {
-SLOT( handleCreateNewPlaylistGetModelIndexesFinished( HbAction* ) ) );
-}
-else {
-//No valid name, prompt for one again.
-getText( hbTrId( "txt_mus_dialog_enter_name" ), newPlaylistName,
-SLOT( handleCreateNewPlaylistGetTextFinished( HbAction* ) ) );
-}
-operationCompleted = false;
-}
-}
-if ( operationCompleted ) {
 mPermanentData->clear();
 }
 TX_EXIT
 }
 selectedModelIndexes = dialog->selectedModelIndexes();
 if ( selectedModelIndexes.count() ) {
 for ( int i = 0; i < selectedModelIndexes.size(); ++i ) {
 selection.append( selectedModelIndexes.at( i ).row() );
 }
+mMpEngine->createPlaylist( mPermanentData->mOriginalName, selection,
+mPermanentData->mCollectionData );
 }
-//Creating Playlist even when there is no selection.
+}
-mMpEngine->createPlaylist( mPermanentData->mOriginalName, selection,
+}
-mPermanentData->mIsolatedCollectionData );
-}
-}
+//Delete/Clear permanent data when current dialog is deleted
+mPermanentData->setParent( dialog );
-//Dialog is using an isolated model which will be deleted, no need to change its layout.
+//Generate new permanent data for future popups
-mPermanentData->clear();
+mPermanentData = new MpPopupHandlerPermanentData( this );
+//Dialog won't use model any more, return it to its original layout.
+MpCollectionDataModel *mpModel = qobject_cast<MpCollectionDataModel *>( dialog->model() );
+if ( mpModel ) {
+//setLayout() only applies for MpCollectionDataModel where we need to
+//decide which layout to use for the secondary text.
+//MpCollectionTBoneListDataModel doesn't have secondary text.
+mpModel->setLayout( ECollectionListView );
+}
 TX_EXIT
 }
 /*!
 Slot to be called when arrange songs dialog has finished.
 }
 TX_EXIT
 }
 /*!
+Slot to be called when the text on an input dialog changes.
+*/
+void MpCollectionPopupHandler::inputDialogChanged( QString text )
+{
+if ( !mOutstandingPopup ) {
+return;
+}
+//Attempt to cast the outstanding dialog as the input dialog that owns the
+//line edit that changed. If cast fails it means that the dialog is out of
+//scope and the operation is not needed anymore.
+HbInputDialog *dialog = qobject_cast<HbInputDialog *>( mOutstandingPopup );
+HbLineEdit *dialogLineEdit = qobject_cast<HbLineEdit *>( sender() );
+if ( dialog && dialogLineEdit && dialog->lineEdit() == dialogLineEdit ) {
+if ( dialog->actions().count() ) {
+dialog->actions()[0]->setEnabled( !text.isEmpty() );
+}
+}
+}
+/*!
 \internal
-sets \a popup as the current outstanding popup and cancels any other previous popup.
+Slot to be called to request a delete operation upon user confirmation.
 */
-void MpCollectionPopupHandler::setOutstandingPopup( HbPopup *popup )
+void MpCollectionPopupHandler::requestDelete()
-{
-TX_ENTRY
-if ( mOutstandingPopup ) {
-TX_LOG_ARGS( "Warning: Multiple popups attempted to be displayed" );
-mOutstandingPopup->close();
-}
-connect( popup, SIGNAL( aboutToClose() ), this, SLOT( outstandingPopupClosing() ) );
-mOutstandingPopup = popup;
-TX_EXIT
-}
-/*!
-\internal
-clears and disconnects \a popup. In some cases it's needed to open a new dialog when a current one has just finished.
-*/
-void MpCollectionPopupHandler::clearOutstandingPopup( HbPopup *popup )
-{
-TX_ENTRY
-disconnect( popup, SIGNAL( aboutToClose() ), this, SLOT( outstandingPopupClosing() ) );
-mOutstandingPopup = 0;
-TX_EXIT
-}
-/*!
-\internal
-Launches the 'Add to playlist' dialog.
-*/
-void MpCollectionPopupHandler::launchAddToPlaylistDialog( QList<int> &selection )
-{
-TX_ENTRY
-QStringList playlists;
-mPermanentData->mSelectedItems = selection;
-mMpEngine->findPlaylists( playlists );
-if ( playlists.count() ) {
-//There are saved playlists, query for a saved playlist or new.
-HbAction *action;
-HbSelectionDialog *dialog = new HbSelectionDialog();
-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( KNew );
-dialog->addAction( action );
-action = new HbAction( hbTrId( "txt_common_button_cancel" ) );
-action->setObjectName( KCancel );
-dialog->addAction( action );
-dialog->setObjectName( KAddToPlaylistSelectionDialog );
-dialog->setAttribute( Qt::WA_DeleteOnClose );
-setOutstandingPopup( dialog );
-dialog->open( this, SLOT( handleAddToPlaylistDialogFinished( HbAction* ) ) );
-}
-else {
-//querying for a new playlist name.
-queryNewPlaylistName( playlists, SLOT( handleAddToPlaylistGetTextFinished( HbAction* ) ) );
-}
-TX_EXIT
-}
-/*!
-\internal
-Trigger an imput text dialog with a suggested playlist name.
-uses \a playlists to generate a suggested playlist name
-\handler Slot that should be called when input dialog finished
-*/
-void MpCollectionPopupHandler::queryNewPlaylistName(const QStringList &playlists,
-const char *handler )
-{
-TX_ENTRY
-int i = 0;
-for ( ;
-playlists.contains( hbTrId( "txt_mus_dialog_enter_name_entry_playlist_l1" ).arg( i ) ) ;
-i++ ) {};
-QString suggestedPlaylistName = hbTrId( "txt_mus_dialog_enter_name_entry_playlist_l1" ).arg( i );
-getText( hbTrId( "txt_mus_dialog_enter_name" ), suggestedPlaylistName, handler );
-TX_EXIT
-}
-/*!
-\internal
-Launches an input text dialog.
-\a label Dialog title.
-\a text Suggested text.
-\a handler Slot to be called when input dialog finishes.
-*/
-void MpCollectionPopupHandler::getText( const QString &label, const QString &text,
-const char *handler )
-{
-TX_ENTRY
-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( KOk );
-dialog->addAction( action );
-action = new HbAction( hbTrId( "txt_common_button_cancel" ) );
-action->setObjectName( KCancel );
-dialog->addAction( action );
-dialog->setObjectName( KInputTextDialog );
-dialog->setAttribute( Qt::WA_DeleteOnClose );
-setOutstandingPopup( dialog );
-dialog->open( this, handler );
-TX_EXIT
-}
-/*!
-\internal
-Launches a list dialog to select items.
-\a label Dialog title.
-\a model List model.
-\a handler Slot to be called when list dialog finishes.
-*/
-void MpCollectionPopupHandler::getModelIndexes( const QString &label, QAbstractItemModel* model,
-const char *handler)
-{
-TX_ENTRY
-connectExternalEvents();
-HbAction *action;
-HbSelectionDialog *dialog = new HbSelectionDialog();
-dialog->setHeadingWidget( new HbLabel( label ) );
-dialog->setSelectionMode( HbAbstractItemView::MultiSelection );
-MpCollectionDataModel *mpModel = qobject_cast<MpCollectionDataModel *>( model );
-if ( mpModel ) {
-//setLayout() only applies for MpCollectionDataModel where we need to
-//decide which layout to use for the secondary text.
-//MpCollectionTBoneListDataModel doesn't have secondary text.
-mpModel->setLayout( ECollectionSelectionDialog );
-}
-dialog->setModel( model );
-dialog->clearActions();
-action = new HbAction( hbTrId( "txt_common_button_ok" ) );
-action->setObjectName( KOk );
-dialog->addAction( action );
-action = new HbAction( hbTrId( "txt_common_button_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.
-*/
-void MpCollectionPopupHandler::launchArrangeSongsDialog()
-{
-TX_ENTRY
-HbListView *listView = new HbListView();
-listView->setItemRecycling( true );
-listView->setScrollingStyle( HbListView::PanOrFlick );
-listView->setClampingStyle( HbListView::BounceBackClamping );
-HbScrollBar *scrollbar = listView->verticalScrollBar();
-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( mMpEngine->collectionData() , mMpEngine->playbackData(), listView );
-model->refreshModel();
-connect( model,
-SIGNAL( orderChanged( int, int, int, int ) ),
-mMpEngine,
-SLOT( reorderPlaylist( int, int, int, int ) ) );
-MpCollectionDataModel *mpModel = qobject_cast<MpCollectionDataModel *>( model );
-if ( mpModel ) {
-//setLayout() only applies for MpCollectionDataModel where we need to
-//decide which layout to use for the secondary text.
-//MpCollectionTBoneListDataModel doesn't have secondary text.
-mpModel->setLayout( ECollectionArrangeSongsDialog );
-}
-listView->setModel( model );
-listView->setArrangeMode( true );
-HbDialog *dialog = new HbDialog();
-dialog->setDismissPolicy( HbPopup::NoDismiss );
-dialog->setTimeout( HbPopup::NoTimeout );
-HbLabel *label = new HbLabel( hbTrId( "txt_mus_title_arrange"  ) );
-dialog->setHeadingWidget( label );
-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
-}
-/*!
-\internal
-Request a delete operation always it has been confirmed.
-\a selection Items selected to be deleted.
-*/
-void MpCollectionPopupHandler::requestDelete( QList<int> &selection )
 {
 TX_ENTRY
 QString message;
-mPermanentData->mSelectedItems = selection;
 bool needsConfirmation = true;
 connectExternalEvents();
 switch ( mMpEngine->collectionData()->context() ) {
 case ECollectionContextAllSongs:
 TX_EXIT
 }
 /*!
 \internal
+sets \a popup as the current outstanding popup and cancels any other previous popup.
+*/
+void MpCollectionPopupHandler::setOutstandingPopup( HbPopup *popup )
+{
+TX_ENTRY
+if ( mOutstandingPopup ) {
+TX_LOG_ARGS( "Warning: Multiple popups attempted to be displayed" );
+mOutstandingPopup->close();
+}
+connect( popup, SIGNAL( aboutToClose() ), this, SLOT( outstandingPopupClosing() ) );
+mOutstandingPopup = popup;
+TX_EXIT
+}
+/*!
+\internal
+clears and disconnects \a popup. In some cases it's needed to open a new dialog when a current one has just finished.
+*/
+void MpCollectionPopupHandler::clearOutstandingPopup( HbPopup *popup )
+{
+TX_ENTRY
+disconnect( popup, SIGNAL( aboutToClose() ), this, SLOT( outstandingPopupClosing() ) );
+mOutstandingPopup = 0;
+TX_EXIT
+}
+/*!
+\internal
+Launches the 'Add to playlist' dialog.
+*/
+void MpCollectionPopupHandler::launchAddToPlaylistDialog( QList<int> &selection )
+{
+TX_ENTRY
+QStringList playlists;
+mPermanentData->mSelectedItems = selection;
+mMpEngine->findPlaylists( playlists );
+if ( playlists.count() ) {
+//There are saved playlists, query for a saved playlist or new.
+HbAction *action;
+HbSelectionDialog *dialog = new HbSelectionDialog();
+dialog->setStringItems( playlists );
+dialog->setSelectionMode( HbAbstractItemView::SingleSelection );
+dialog->setSelectedItems( QList< QVariant >());
+dialog->setHeadingWidget(new HbLabel( hbTrId( "txt_mus_title_select_playlist" ) ) );
+dialog->clearActions();
+action = new HbAction( hbTrId( "txt_mus_button_new" ) );
+action->setObjectName( KNew );
+dialog->addAction( action );
+action = new HbAction( hbTrId( "txt_common_button_cancel" ) );
+action->setObjectName( KCancel );
+dialog->addAction( action );
+dialog->setObjectName( KAddToPlaylistSelectionDialog );
+dialog->setAttribute( Qt::WA_DeleteOnClose );
+setOutstandingPopup( dialog );
+dialog->open( this, SLOT( handleAddToPlaylistDialogFinished( HbAction* ) ) );
+}
+else {
+//querying for a new playlist name.
+queryNewPlaylistName( playlists, SLOT( handleAddToPlaylistGetTextFinished( HbAction* ) ) );
+}
+TX_EXIT
+}
+/*!
+\internal
+Trigger an imput text dialog with a suggested playlist name.
+uses \a playlists to generate a suggested playlist name
+\handler Slot that should be called when input dialog finished
+*/
+void MpCollectionPopupHandler::queryNewPlaylistName(const QStringList &playlists,
+const char *handler )
+{
+TX_ENTRY
+int i = 0;
+for ( ;
+playlists.contains( hbTrId( "txt_mus_dialog_enter_name_entry_playlist_l1" ).arg( i ) ) ;
+i++ ) {};
+QString suggestedPlaylistName = hbTrId( "txt_mus_dialog_enter_name_entry_playlist_l1" ).arg( i );
+getText( hbTrId( "txt_mus_dialog_enter_name" ),
+suggestedPlaylistName,
+hbTrId( "txt_mus_button_create_new" ),
+handler );
+TX_EXIT
+}
+/*!
+\internal
+Launches an input text dialog.
+\a label Dialog title.
+\a text Suggested text.
+\a confirmationActionLabel label for the first action on the dialog.
+\a handler Slot to be called when input dialog finishes.
+*/
+void MpCollectionPopupHandler::getText( const QString &label,
+const QString &text,
+const QString &confirmationActionLabel,
+const char *handler )
+{
+TX_ENTRY
+HbAction *action;
+HbInputDialog *dialog = new HbInputDialog();
+dialog->setPromptText( label );
+dialog->setInputMode( HbInputDialog::TextInput );
+dialog->setValue( text );
+dialog->clearActions();
+action = new HbAction( confirmationActionLabel );
+action->setObjectName( KOk );
+dialog->addAction( action );
+//we want to prevent the user from slecting an empty string.
+HbLineEdit  * lineEdit;
+lineEdit = dialog->lineEdit();
+connect (lineEdit , SIGNAL(textChanged(QString)), SLOT(inputDialogChanged(QString)) );
+action->setEnabled( !lineEdit->text().isEmpty() );
+action = new HbAction( hbTrId( "txt_common_button_cancel" ) );
+action->setObjectName( KCancel );
+dialog->addAction( action );
+dialog->setObjectName( KInputTextDialog );
+dialog->setAttribute( Qt::WA_DeleteOnClose );
+setOutstandingPopup( dialog );
+dialog->open( this, handler );
+TX_EXIT
+}
+/*!
+\internal
+Launches a list dialog to select items.
+\a label Dialog title.
+\a confirmationActionLabel label for the first action on the dialog.
+\a model List model.
+\a handler Slot to be called when list dialog finishes.
+*/
+void MpCollectionPopupHandler::getModelIndexes( const QString &label,
+const QString &confirmationActionLabel,
+QAbstractItemModel* model,
+const char *handler)
+{
+TX_ENTRY
+connectExternalEvents();
+HbAction *action;
+HbSelectionDialog *dialog = new HbSelectionDialog();
+dialog->setHeadingWidget( new HbLabel( label ) );
+dialog->setSelectionMode( HbAbstractItemView::MultiSelection );
+MpCollectionDataModel *mpModel = qobject_cast<MpCollectionDataModel *>( model );
+if ( mpModel ) {
+//setLayout() only applies for MpCollectionDataModel where we need to
+//decide which layout to use for the secondary text.
+//MpCollectionTBoneListDataModel doesn't have secondary text.
+mpModel->setLayout( ECollectionSelectionDialog );
+}
+dialog->setModel( model );
+dialog->clearActions();
+action = new HbAction( confirmationActionLabel );
+action->setObjectName( KOk );
+dialog->addAction( action );
+action = new HbAction( hbTrId( "txt_common_button_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.
+*/
+void MpCollectionPopupHandler::launchArrangeSongsDialog()
+{
+TX_ENTRY
+HbListView *listView = new HbListView();
+listView->setItemRecycling( true );
+listView->setScrollingStyle( HbListView::PanOrFlick );
+listView->setClampingStyle( HbListView::BounceBackClamping );
+HbScrollBar *scrollbar = listView->verticalScrollBar();
+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( mMpEngine->collectionData() , mMpEngine->playbackData(), listView );
+model->refreshModel();
+connect( model,
+SIGNAL( orderChanged( int, int, int, int ) ),
+mMpEngine,
+SLOT( reorderPlaylist( int, int, int, int ) ) );
+MpCollectionDataModel *mpModel = qobject_cast<MpCollectionDataModel *>( model );
+if ( mpModel ) {
+//setLayout() only applies for MpCollectionDataModel where we need to
+//decide which layout to use for the secondary text.
+//MpCollectionTBoneListDataModel doesn't have secondary text.
+mpModel->setLayout( ECollectionArrangeSongsDialog );
+}
+listView->setModel( model );
+listView->setArrangeMode( true );
+HbDialog *dialog = new HbDialog();
+dialog->setDismissPolicy( HbPopup::NoDismiss );
+dialog->setTimeout( HbPopup::NoTimeout );
+HbLabel *label = new HbLabel( hbTrId( "txt_mus_title_arrange"  ) );
+dialog->setHeadingWidget( label );
+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
+}
+/*!
+\internal
 Launches a waiting progress note.
 \a content String id to display in the dialog.
 */
 void MpCollectionPopupHandler::launchProgressDialog( const char *id )
 {

changeset 58	ed94e1e8390e
parent 54	c5b304f4d89b
child 59	cd9e40a08dda