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

equal deleted inserted replaced

-:b9e04db066d4
+:7d93ee07fb27
 *
 * Description:   videolist selection dialog implementation
 *
 */
-// Version : %version: 25 %
+// Version : %version: 29 %
 // INCLUDE FILES
 #include <qgraphicsitem.h>
 #include <hblabel.h>
 #include <hbcheckbox.h>
 #include "videolistselectiondialog.h"
 #include "videocollectionwrapper.h"
 #include "videocollectionviewutils.h"
 #include "videocollectionclient.h"
 #include "videocollectiontrace.h"
+// Object names.
+const char* const SELECTION_DIALOG_OBJECT_NAME_LIST_WIDGET    = "vc:SelectionDialogListWidget";
+const char* const SELECTION_DIALOG_OBJECT_NAME_NEW_COLLECTION = "vc:SelectionDialogNewCollection";
+const char* const SELECTION_DIALOG_OBJECT_NAME_BUTTON_OK      = "vc:SelectionDialogButtonOk";
+const char* const SELECTION_DIALOG_OBJECT_NAME_BUTTON_CANCEL  = "vc:SelectionDialogButtonCancel";
 /**
 * global qHash function required fo creating hash values for TMPXItemId -keys
 */
 inline uint qHash(TMPXItemId key)
 delete mListWidget;
 mListWidget = 0;
 }
 // disable list related animations to make dialog faster
 mListWidget->setEnabledAnimations(HbAbstractItemView::None);
+mListWidget->setObjectName(SELECTION_DIALOG_OBJECT_NAME_LIST_WIDGET);
 }
 }
 // ---------------------------------------------------------------------------
 // ~VideoListSelectionDialog
 mUiLoader->findWidget<HbStackedWidget>(DOCML_NAME_LIST_CONTAINER);
 if(!mListWidget)
 {
 mListWidget = new VideoListWidget(mUiLoader);
+mListWidget->setObjectName(SELECTION_DIALOG_OBJECT_NAME_LIST_WIDGET);
 if(mListWidget->initialize(*mModel) < 0)
 {
 ERROR(-1, "VideoListSelectionDialog::initDialog() failed to setup VideoListWidget.");
 delete mListWidget;
 mListWidget = 0;
 // HbDialog connects actions to finished signal by default.
 if(!mPrimaryAction)
 {
 mPrimaryAction = new HbAction(hbTrId("txt_common_button_ok"));
+mPrimaryAction->setObjectName(SELECTION_DIALOG_OBJECT_NAME_BUTTON_OK);
 addAction(mPrimaryAction);
 }
 if(!mSecondaryAction)
 {
 mSecondaryAction = new HbAction(hbTrId("txt_common_button_cancel"));
+mSecondaryAction->setObjectName(SELECTION_DIALOG_OBJECT_NAME_BUTTON_CANCEL);
 addAction(mSecondaryAction);
 }
 if(!mListContainer || !mHeading || !mCheckBox || !mCheckBoxText)
 {
 {
 headingTxt = hbTrId("txt_videos_title_select_collection");
 mCheckboxContainer->setVisible(false);
 mListWidget->setSelectionMode(-1);
 mListWidget->activate(VideoCollectionCommon::ELevelCategory);
-// need to set primaryaction disabled here in order for it
+// New collection button is always enabled for collection selection.
-// get correctly updated at modelReady(), where it will be enabled
+mPrimaryAction->setDisabled(false);
-// if state would be same, no update will happen
-mPrimaryAction->setDisabled(true);
 }
 else
 {
 headingTxt = hbTrId("txt_videos_title_select_videos");
 mListWidget->setSelectionMode(HbAbstractItemView::MultiSelection);
 mListWidget->activate(VideoCollectionCommon::ELevelVideos);
 mCheckboxContainer->setVisible(true);
 mItemCount->setPlainText(tr("0/%1").arg(mModel->rowCount()));
 mCheckBox->setChecked(false);
-// need to set primaryaction enabled here in order for it
+// Add button will be enabled when videos are selected from the list.
-// get correctly updated at modelReady(), where it will be disabled
+mPrimaryAction->setDisabled(true);
-// if state would be same, no update will happen
-mPrimaryAction->setDisabled(false);
 }
 mHeading->setPlainText(headingTxt);
 // sort to make sure dialog has correctly filtered content
 // at the same order as in view
 VideoCollectionViewUtils::sortModel(mModel, false, mListWidget->getLevel());
 {
 INFO("VideoListSelectionDialog::exec(): secondary action triggered.")
 return;
 }
 QString albumName("");
-if( mTypeOfSelection == ESelectCollection )
+if(mTypeOfSelection == ESelectCollection)
 {
 mTypeOfSelection = EAddToCollection;
-if( mSelectedAlbumId == TMPXItemId::InvalidId())
+if(mSelectedAlbumId == TMPXItemId::InvalidId())
 {
 QString label(hbTrId("txt_videos_title_enter_name"));
 HbInputDialog *dialog = new HbInputDialog();
+dialog->setObjectName(SELECTION_DIALOG_OBJECT_NAME_NEW_COLLECTION);
 dialog->setAttribute(Qt::WA_DeleteOnClose);
-dialog->getText(label, this, SLOT(newAlbumNameDialogFinished(HbAction *)),
+dialog->setPromptText(label);
-hbTrId("txt_videos_dialog_entry_new_collection"));
+dialog->setValue(hbTrId("txt_videos_dialog_entry_new_collection"));
+dialog->open(this, SLOT(newAlbumNameDialogFinished(HbAction *)));
 }
 else
 {
 finalize();
 }
 {
 if(!albumName.length())
 {
 albumName = getSelectedName();
 }
-QVariant data = albumName;
+QList<QVariant> dataList;
+dataList.append(QVariant(mSelectedVideos.count()));
+dataList.append(QVariant(albumName));
+QVariant data = dataList;
 VideoCollectionViewUtils::instance().showStatusMsgSlot(
 VideoCollectionCommon::statusVideosAddedToCollection,
 data);
 }
 }
 void VideoListSelectionDialog::modelReadySlot()
 {
 	FUNC_LOG;
 if(mTypeOfSelection == ESelectCollection)
 {
-mPrimaryAction->setDisabled(false);
 if(!mModel->rowCount())
 {
 // in case there are no user defined albums,
 // start input dialog right away by accepting dialog
 INFO("VideoListSelectionDialog::selectionChangedSlot(): no albums, starting album creation.")
 mPrimaryAction->trigger();
 return;
 }
-}
-if(mTypeOfSelection != ESelectCollection)
-{
-mPrimaryAction->setDisabled(true);
 }
 updateCounterSlot();
 }
 // ---------------------------------------------------------------------------
 if(index.isValid())
 {
 name = model->data(index, VideoCollectionCommon::KeyTitle).toString();
 }
 }
 return name;
 }
+// End of file

changeset 24	7d93ee07fb27
parent 20	b9e04db066d4
child 46	adbe7d5ba2f5