FCL/sf/app/musicplayer: comparison mpengine/src/mpengine.cpp

equal deleted inserted replaced

-:ecf06a08d4d9
+:2c5162224003
 #include <QTranslator>
 #include <QLocale>
 #include <hbmessagebox.h>
 #include <hbprogressdialog.h>
+#include <hbaction.h>
 #include <hbinstance.h>
 #include <xqsharablefile.h>
 #include "mpengine.h"
 #include "mpmpxharvesterframeworkwrapper.h"
 This signal is emitted when scan count is updated.
 */
 /*!
-\fn void libraryRefreshed()
+\fn void libraryUpdated()
 This signal is emitted when MpSongScannerHelper ends scanning,
 or USB-MTP Synchronization finishes.
 */
 */
 MpEngine::MpEngine()
 : mMpxHarvesterWrapper(0),
 mSongScanner(0),
 mMediaKeyHandler(0),
-mUsbBlockingNote(0),
+mUsbOutstandingNote(0),
 mMpxCollectionWrapper(0),
 mMpxPlaybackWrapper(0),
 mMpTranslator(0),
 mUsbBlockingState(USB_NotConnected),
 mPreviousUsbState(USB_NotConnected),
 mMpTranslator = 0;
 delete mSongScanner;
 mSongScanner = 0;
 delete mMediaKeyHandler;
 mMediaKeyHandler = 0;
-delete mUsbBlockingNote;
+delete mUsbOutstandingNote;
-mUsbBlockingNote = 0;
+mUsbOutstandingNote = 0;
 delete mMpxPlaybackWrapper;
 mMpxPlaybackWrapper = 0;
 delete mMpxHarvesterWrapper;
 mMpxHarvesterWrapper = 0;
 delete mMpxCollectionWrapper;
 Harvesting related
 -------------------------------------------------------------------------------
 */
 /*!
-Refresh library by starting the scan.
-If scanning is already ongoing, this request is ignored.
-*/
-void MpEngine::refreshLibrary()
-{
-TX_ENTRY
-if ( !verifyUsbBlocking( true ) ) {
-emit libraryAboutToRefresh();
-mSongScanner->scan();
-}
-TX_EXIT
-}
-/*!
 \
 Used to verify if an action can be executed depending on USB blocking state.
 If not, a notification note might be displayed.
 */
 bool MpEngine::verifyUsbBlocking( bool showMessage )
 TX_ENTRY
 bool result( false );
 if ( mUsbBlockingState == USB_Connected ) {
 result = true;
 if ( showMessage ) {
-HbMessageBox dialog ( HbMessageBox::MessageTypeInformation );
+HbMessageBox *dialog = new HbMessageBox( HbMessageBox::MessageTypeInformation );
-dialog.setText( QString( tr( "USB connection in progress. Cannot proceed with operation" ) ) );
+dialog->setText( hbTrId( "txt_mus_info_usb_conn_in_progress" ) );
-dialog.setModal( true );
+dialog->setModal( true );
-dialog.exec();
+setOutstandingPopup( dialog );
+mUsbOutstandingNote->show();;
 }
 }
 TX_EXIT
 return result;
 }
 */
 void MpEngine::checkForSystemEvents()
 {
 TX_ENTRY
 mMpxHarvesterWrapper->checkForSystemEvents();
+TX_EXIT
+}
+/*!
+Slot to be called to start Refresh library process.
+If scanning is already ongoing, this request is ignored.
+*/
+void MpEngine::refreshLibrary()
+{
+TX_ENTRY
+if ( !verifyUsbBlocking( true ) ) {
+emit libraryAboutToUpdate();
+mSongScanner->scan();
+}
 TX_EXIT
 }
 /*!
 Slot to be called when song scanning starts.
 void MpEngine::handleScanEnded( int count, int error ) {
 TX_ENTRY
 Q_UNUSED( count );
 Q_UNUSED( error );
 mMediaKeyHandler->setEnabled(true);
-emit libraryRefreshed();
+emit libraryUpdated();
 TX_EXIT
 }
 /*!
 Slot to be called when disk event is received from MPX framework.
 case DiskFormatEnded:
 mMediaKeyHandler->setEnabled(true);
 break;
 case DiskRemoved:
 if ( mUsbBlockingState != USB_Synchronizing ) {
-emit libraryRefreshed();
+emit libraryUpdated();
 }
 break;
 case DiskInserted:
 if ( mUsbBlockingState == USB_NotConnected ) {
 refreshLibrary();
 }
 else if ( mUsbBlockingState == USB_Connected ) {
-emit libraryRefreshed();
+emit libraryUpdated();
 }
 break;
 default:
 break;
 }
 }
 TX_EXIT
 }
 /*!
-Slot to be called when mUsbBlockingNote is about to close.
+Slot to be called when mUsbOutstandingNote is about to close.
 */
-void MpEngine::handleBlockingNoteClosing()
+void MpEngine::handleOutstandingNoteClosing()
 {
 TX_ENTRY
-mUsbBlockingNote = 0;
+mUsbOutstandingNote = 0;
 TX_EXIT
 }
 /*!
 To be called when EMcMsgUSBMassStorageStart event is received.
 TX_ENTRY
 mMediaKeyHandler->setEnabled(true);
 changeUsbBlockingState( USB_NotConnected );
 emit usbBlocked(false);
-if ( mUsbBlockingNote ) {
+HbAction *action;
-mUsbBlockingNote->close();
+HbMessageBox *promptRefresh = new HbMessageBox( HbMessageBox::MessageTypeQuestion );
-}
+promptRefresh->setText( hbTrId( "txt_mus_info_music_may_need_to_be_refreshed" ) );
-HbMessageBox promptRefresh( HbMessageBox::MessageTypeQuestion );
+promptRefresh->setTimeout( HbPopup::NoTimeout );
-promptRefresh.setText( QString( tr( "List may need refreshing due to recent USB synchronisation. Refresh now?" ) ) );
+promptRefresh->setModal( true );
-promptRefresh.setTimeout( HbPopup::NoTimeout );
+promptRefresh->clearActions();
-promptRefresh.setModal( true );
+action = new HbAction( hbTrId( "txt_common_button_yes" ) );
-HbAction *action = promptRefresh.exec();
+connect( action, SIGNAL( triggered() ), this, SLOT( refreshLibrary() ) );
-if ( action == promptRefresh.primaryAction() ) {
+promptRefresh->addAction( action );
-refreshLibrary();
+action = new HbAction( hbTrId( "txt_common_button_no" ) );
-}
+promptRefresh->addAction( action );
+setOutstandingPopup( promptRefresh );
+mUsbOutstandingNote->show();
 TX_EXIT
 }
 /*!
 To be called when EMcMsgUSBMTPStart event is received.
 changeUsbBlockingState( USB_Synchronizing );
 emit usbBlocked(true);
 //Cancel any ongoing operation.
-emit libraryAboutToRefresh();
+emit libraryAboutToUpdate();
 launchBlockingNote();
 TX_EXIT
 }
 mMediaKeyHandler->setEnabled(true);
 changeUsbBlockingState( USB_NotConnected );
 emit usbBlocked(false);
-if ( mUsbBlockingNote ) {
+if ( mUsbOutstandingNote ) {
-mUsbBlockingNote->close();
+mUsbOutstandingNote->close();
 }
 if ( mPreviousUsbState == USB_Synchronizing ) {
-emit libraryRefreshed();
+emit libraryUpdated();
 }
 TX_EXIT
 }
 /*!
 Used to launch the usb blocking note
 */
 void MpEngine::launchBlockingNote()
 {
 TX_ENTRY
-if ( !mUsbBlockingNote ) {
-mUsbBlockingNote = new HbProgressDialog( HbProgressDialog::WaitDialog );
+HbProgressDialog *usbBlockingNote = new HbProgressDialog( HbProgressDialog::WaitDialog );
-mUsbBlockingNote->setModal( true );
+usbBlockingNote->setModal( true );
-mUsbBlockingNote->setPrimaryAction( 0 );
+if ( usbBlockingNote->actions().count() ) {
-mUsbBlockingNote->setTextAlignment( Qt::AlignCenter );
+//Hide cancel action.
-mUsbBlockingNote->setAttribute( Qt::WA_DeleteOnClose );
+usbBlockingNote->actions().at( 0 )->setVisible( false );
-mUsbBlockingNote->setDismissPolicy( HbPopup::NoDismiss );
+}
-mUsbBlockingNote->setText( QString( tr( "USB connection in progress" ) ) );
+usbBlockingNote->setDismissPolicy( HbPopup::NoDismiss );
-connect( mUsbBlockingNote, SIGNAL( aboutToClose() ), this, SLOT( handleBlockingNoteClosing() ) );
+usbBlockingNote->setText( hbTrId( "txt_mus_info_usb_conn_in_progress" ) );
-}
+setOutstandingPopup( usbBlockingNote );
+mUsbOutstandingNote->show();
-mUsbBlockingNote->show();
+TX_EXIT
+}
+/*!
+\internal
+sets \a popup as the current outstanding popup and cancels any other active popup.
+*/
+void MpEngine::setOutstandingPopup( HbPopup *popup )
+{
+TX_ENTRY
+//Close previous popup (Normally blocking usb note)
+if ( mUsbOutstandingNote ) {
+disconnect( mUsbOutstandingNote, SIGNAL( aboutToClose() ), this, SLOT( handleOutstandingNoteClosing() ) );
+mUsbOutstandingNote->close();
+}
+//Set new outstanding popup
+popup->setAttribute( Qt::WA_DeleteOnClose );
+connect( popup, SIGNAL( aboutToClose() ), this, SLOT( handleOutstandingNoteClosing() ) );
+mUsbOutstandingNote = popup;
 TX_EXIT
 }
 /*!
 -------------------------------------------------------------------------------

changeset 34	2c5162224003
parent 22	ecf06a08d4d9
child 29	8192e5b5c935