FCL/sf/app/videoplayer: comparison videocollection/videocollectionview/src/videolistselectiondialog.cpp

equal deleted inserted replaced

-:45e72b57a2fd
+:e3cecb93e76a
 *
 * Description:   videolist selection dialog implementation
 *
 */
-// Version : %version: 30 %
+// Version : %version: 30.1.2 %
 // INCLUDE FILES
 #include <qgraphicsitem.h>
 #include <hblabel.h>
 #include <hbcheckbox.h>
 , mCheckBoxText( 0 )
 , mCheckBox( 0 )
 , mListContainer( 0 )
 , mForcedCheck( false )
 , mModel( 0 )
+, mModelReady( false )
+, mAlbumListReady( false )
 , mListWidget( 0 )
 , mPrimaryAction( 0 )
 , mSecondaryAction( 0 )
 {
 	FUNC_LOG;
 default:
 break;
 }
 mPrimaryAction->setText(primaryTxt);
+mModelReady = false;
+mAlbumListReady = false;
 if(mTypeOfSelection == ESelectCollection)
 {
 headingTxt = hbTrId("txt_videos_title_select_collection");
 mCheckboxContainer->setVisible(false);
 mListWidget->clearSelection();
 // scroll list back to top
 mListWidget->scrollTo(mModel->index(0, 0));
+connectSignals();
 if(mModel->rowCount())
 {
-connectSignals();
 if(mTypeOfSelection == ECreateCollection)
 {
 // note this does not leak memory as the dialog will destroy itself upon close.
 HbInputDialog *dialog = gCreateNewAlbumNameDialog(LIST_VIEW_OBJECT_NAME_CREATE_COLLECTION);
 dialog->open(this, SLOT(newAlbumNameDialogFinished(HbAction *)));
 {
 // show dialog
 HbDialog::open();
 }
 }
-else
+else if((mModelReady && mTypeOfSelection != ESelectCollection) ||
+(mAlbumListReady && mTypeOfSelection == ESelectCollection))
 {
 INFO("VideoListSelectionDialog::exec(): nothing to show, finishing.")
 // no items, finish right away
 finishedSlot(mPrimaryAction);
 }
 if(mTypeOfSelection == ESelectCollection)
 {
 mTypeOfSelection = EAddToCollection;
 if(mSelectedAlbumId == TMPXItemId::InvalidId())
 {
+close(); // closes selection dialog if it's open.
 // note this does not leak memory as the dialog will destroy itself upon close.
 HbInputDialog *dialog = gCreateNewAlbumNameDialog(SELECTION_DIALOG_OBJECT_NAME_NEW_COLLECTION);
 dialog->open(this, SLOT(newAlbumNameDialogFinished(HbAction *)));
 }
 else
 QVariant variant = dialog->value();
 if(dialog->actions().first() == action && variant.isValid())
 {
 QString text = mModel->resolveAlbumName(variant.toString());
-if(text.length())
+if(!text.isEmpty())
 {
 if(mSelectedVideos.count() == 0)
 {
 mNewAlbumText = text;
 // show video selection dialog
 {
 mSelectedAlbumId = mModel->addNewAlbum(text);
 finalize(text);
 }
 }
+else
+{
+// new album name empty, effectively cancel, so disconnect signals.
+disconnectSignals();
+}
+}
+else
+{
+// new album dialog cancelled, disconnect signals.
+disconnectSignals();
 }
 }
 // ---------------------------------------------------------------------------
 // finalize
 // ---------------------------------------------------------------------------
 //
 void VideoListSelectionDialog::modelReadySlot()
 {
 	FUNC_LOG;
+mModelReady = true;
+	if(mTypeOfSelection != ESelectCollection)
+	{
+if(!mModel->rowCount())
+{
+// no items, finish right away
+INFO("VideoListSelectionDialog::modelReadySlot(): nothing to show, finishing.");
+if(mTypeOfSelection == EAddToCollection ||
+mTypeOfSelection == ERemoveFromCollection)
+{
+primaryActionTriggeredSlot();
+}
+else
+{
+finishedSlot(mPrimaryAction);
+}
+return;
+}
+// if dialog is not yet visible, bring it visible.
+if(!isVisible() && mTypeOfSelection != ECreateCollection)
+{
+// scroll list back to top
+mListWidget->scrollTo(mModel->index(0, 0));
+HbDialog::open();
+}
+updateCounterSlot();
+	}
+}
+// ---------------------------------------------------------------------------
+// albumListReadySlot
+// ---------------------------------------------------------------------------
+//
+void VideoListSelectionDialog::albumListReadySlot()
+{
+mAlbumListReady = true;
 if(mTypeOfSelection == ESelectCollection)
 {
 if(!mModel->rowCount())
 {
-// in case there are no user defined albums,
+finishedSlot(mPrimaryAction);
-// start input dialog right away by accepting dialog
-INFO("VideoListSelectionDialog::selectionChangedSlot(): no albums, starting album creation.")
-mPrimaryAction->trigger();
 return;
 }
-}
-updateCounterSlot();
+// if dialog is not yet visible, bring it visible.
+if(!isVisible())
+{
+// scroll list back to top
+mListWidget->scrollTo(mModel->index(0, 0));
+HbDialog::open();
+}
+updateCounterSlot();
+}
 }
 // ---------------------------------------------------------------------------
 // updateCounterSlot
 // ---------------------------------------------------------------------------
 // reconnect primary action
 mPrimaryAction->disconnect(SIGNAL(triggered()));
 connect(mPrimaryAction, SIGNAL(triggered()), this, SLOT(close()));
 // update video items selection here before content changes.
-int count = mSelection.indexes().count();
+QModelIndexList indexes = mSelection.indexes();
+int count = indexes.count();
 TMPXItemId id = TMPXItemId::InvalidId();
 for(int i = 0; i < count; ++i)
 {
-id = mModel->getMediaIdAtIndex(mSelection.indexes().at(i));
+id = mModel->getMediaIdAtIndex(indexes.at(i));
 if(id.iId2 == KVcxMvcMediaTypeVideo)
 {
 mSelectedVideos.insert(id);
 }
 }
 connect(mListWidget->selectionModel(), SIGNAL(selectionChanged (const QItemSelection&, const QItemSelection&)),
 this, SLOT(selectionChangedSlot(const QItemSelection&, const QItemSelection &)));
 // model changes signals
 connect(mModel->sourceModel(), SIGNAL(modelReady()), this, SLOT(modelReadySlot()));
-connect(mModel->sourceModel(), SIGNAL(modelChanged()), this, SLOT(updateCounterSlot()));
+connect(mModel->sourceModel(), SIGNAL(albumListReady()), this, SLOT(albumListReadySlot()));
+connect(mModel->sourceModel(), SIGNAL(modelChanged()), this, SLOT(updateCounterSlot()));
 // mark all state changes
 connect(mCheckBox, SIGNAL(stateChanged(int)), this, SLOT(markAllStateChangedSlot(int)));
 }
 disconnect(mListWidget->selectionModel(), SIGNAL(selectionChanged (const QItemSelection&, const QItemSelection&)),
 this, SLOT(selectionChangedSlot(const QItemSelection&, const QItemSelection &)));
 // model changes signals
 disconnect(mModel->sourceModel(), SIGNAL(modelReady()), this, SLOT(modelReadySlot()));
+disconnect(mModel->sourceModel(), SIGNAL(albumListReady()), this, SLOT(albumListReadySlot()));
 disconnect(mModel->sourceModel(), SIGNAL(modelChanged()), this, SLOT(updateCounterSlot()));
 // mark all state changes
 disconnect(mCheckBox, SIGNAL(stateChanged(int)), this, SLOT(markAllStateChangedSlot(int)));
 }

changeset 52	e3cecb93e76a
parent 46	adbe7d5ba2f5
child 59	a76e86df7ccd