FCL/sf/app/radio: comparison radioapp/radiowidgets/src/radiomainview.cpp

equal deleted inserted replaced

-:075425b8d9a4
+:189d20c34778
 *
 */
 // System includes
 #include <QTimer>
-#include <HbLabel>
 #include <HbPushButton>
 #include <HbAction>
 #include <HbMenu>
 #include <QApplication>
 {
 if ( scanning ) {
 loadSection( DOCML::FILE_MAINVIEW, DOCML::MV_SECTION_SCANNING );
 } else {
 loadSection( DOCML::FILE_MAINVIEW, DOCML::MV_SECTION_NORMAL );
+updateFavoriteButton();
 mFrequencyScanner.take();
 const bool firsTimeStart = mUiEngine->isFirstTimeStart();
 const int rowCount = mUiEngine->stationModel().rowCount();
 if ( firsTimeStart && rowCount != 0 ) {
 LOG_METHOD;
 loadSection( DOCML::FILE_MAINVIEW, DOCML::SECTION_LAZY_LOAD );
 mCarousel = mUiLoader->findObject<RadioStationCarousel>( DOCML::MV_NAME_STATION_CAROUSEL );
 mCarousel->init( *mUiLoader, mUiEngine.data() );
-// Note! UI connections are already made in the DocML file. Here we need to connect UI to engine
 mFrequencyStrip = mUiLoader->findObject<RadioFrequencyStrip>( DOCML::MV_NAME_FREQUENCY_STRIP );
 mFrequencyStrip->init( mUiEngine.data(), *mUiLoader );
 RadioStationModel* stationModel = &mUiEngine->stationModel();
 this,                       SLOT(handleFavoriteChange(RadioStation)) );
 connectXmlElement( DOCML::MV_NAME_STATIONS_BUTTON,  SIGNAL(clicked()),
 mMainWindow,                     SLOT(activateStationsView()) );
-connectXmlElement( DOCML::MV_NAME_SCAN_BUTTON,      SIGNAL(clicked()),
+connectXmlElement( DOCML::MV_NAME_FAVORITE_BUTTON,  SIGNAL(clicked()),
-this,                            SLOT(toggleScanning()) );
+this,                            SLOT(toggleFavorite()) );
 connectXmlElement( DOCML::MV_NAME_SPEAKER_BUTTON,   SIGNAL(clicked()),
 mUiEngine.data(),                SLOT(toggleAudioRoute()) );
+connectXmlElement( DOCML::MV_NAME_SCAN_ACTION,      SIGNAL(triggered()),
+this,                            SLOT(toggleScanning()) );
+updateFavoriteButton();
 connectCommonMenuItem( MenuItem::Exit );
 // "Play history" menu item
 connectViewChangeMenuItem( DOCML::MV_NAME_HISTORYVIEW_ACTION, SLOT(activateHistoryView()) );
 //TODO: REMOVE. THIS IS TEMPORARY TEST CODE
 toggleSkippingMode();
-menu()->addAction( "Reset start count", this, SLOT(resetFirstTimeCount()) );
+menu()->addAction( "-- Reset start count", this, SLOT(resetFirstTimeCount()) );
 // END TEMPORARY TEST CODE
 updateAudioRoute( mUiEngine->isUsingLoudspeaker() );
 // Add "back" navigation action to put the application to background
 * Private slot
 */
 void RadioMainView::setFrequencyFromEngine( uint frequency, int reason )
 {
 LOG_FORMAT( "RadioMainView::setFrequencyFromEngine reason: %d", reason );
-if ( !RadioUtil::isScannerAlive() && !mFrequencyStrip->isInManualSeekMode() ) {
+if ( RadioUtil::scanStatus() != Scan::ScanningInMainView && !mFrequencyStrip->isInManualSeekMode() ) {
 mCarousel->clearInfoText();
+updateFavoriteButton();
 if ( reason != TuneReason::FrequencyStrip &&
 reason != TuneReason::StationCarousel &&
 reason != TuneReason::Skip ) {
 mCarousel->setFrequency( frequency, reason, Scroll::Shortest );
 mFrequencyStrip->setFrequency( frequency, reason, Scroll::Shortest );
 }
 /*!
 * Private slot
 */
+void RadioMainView::toggleFavorite()
+{
+if ( RadioUtil::isScannerAlive() ) {
+toggleScanning();
+} else {
+mUiEngine->stationModel().setData( QModelIndex(), mFrequencyStrip->frequency(), RadioRole::ToggleFavoriteRole );
+}
+}
+/*!
+* Private slot
+*/
 void RadioMainView::seekingStarted()
 {
 if ( !RadioUtil::isScannerAlive() ) {
 mCarousel->setInfoText( CarouselInfoText::Seeking );
 }
 {
 if ( !connected ) {
 mFrequencyStrip->cancelManualSeek();
 }
-HbPushButton* scanButton = mUiLoader->findWidget<HbPushButton>( DOCML::MV_NAME_SCAN_BUTTON );
+HbAction* scanAction = mUiLoader->findObject<HbAction>( DOCML::MV_NAME_SCAN_ACTION );
-scanButton->setEnabled( connected );
+scanAction->setEnabled( connected );
 mCarousel->updateAntennaStatus( connected );
 }
 /*!
 * Private slot
 */
 void RadioMainView::setManualSeekMode( bool manualSeekActive )
 {
 if ( manualSeekActive ) {
 qApp->installEventFilter( this );
+mUiLoader->findWidget<HbPushButton>( DOCML::MV_NAME_FAVORITE_BUTTON )->setText( hbTrId( "txt_rad_button_add_to_favourites" ) );
 } else {
 qApp->removeEventFilter( this );
+updateFavoriteButton();
 }
 mUiEngine->setManualSeekMode( manualSeekActive );
 mCarousel->setManualSeekMode( manualSeekActive );
 * Private slot
 */
 void RadioMainView::handleFavoriteChange( const RadioStation& station )
 {
 mFrequencyStrip->updateFavorite( station );
-if ( station.isFavorite() ) {
+updateFavoriteButton();
-RadioUtil::showDiscreetNote( "Station added to Favourites." );
-} else {
-RadioUtil::showDiscreetNote( "Station removed from Favourites." );
-}
 }
 /*!
 * Private slot
 */
 }
 mAlternateSkipping = !mAlternateSkipping;
 mCarousel->setAlternateSkippingMode( mAlternateSkipping );
 if ( mAlternateSkipping ) {
-mSkippingAction->setText( "Normal skipping mode" );
+mSkippingAction->setText( "-- Normal skipping mode" );
 } else {
-mSkippingAction->setText( "Alternate skipping mode" );
+mSkippingAction->setText( "-- Alternate skipping mode" );
 }
 }
 /*!
 * Private slot
 */
 void RadioMainView::resetFirstTimeCount()
 {
 mUiEngine->setFirstTimeStartPerformed( false );
 }
+/*!
+*
+*/
+void RadioMainView::updateFavoriteButton()
+{
+RadioStation station;
+RadioStationModel& model = mUiEngine->stationModel();
+model.findFrequency( mUiEngine->currentFrequency(), station );
+HbPushButton* favoriteButton = mUiLoader->findWidget<HbPushButton>( DOCML::MV_NAME_FAVORITE_BUTTON );
+if ( station.isFavorite() ) {
+//TODO: Get localized text
+favoriteButton->setText( "Remove from favourites" );
+//        favoriteButton->setIcon( HbIcon( ":/images/pri_small_star_inactive.svg" ) );
+} else {
+favoriteButton->setText( hbTrId( "txt_rad_button_add_to_favourites" ) );
+//        favoriteButton->setIcon( HbIcon( ":/images/pri_small_star.svg" ) );
+}
+}

changeset 32	189d20c34778
parent 28	075425b8d9a4
child 33	11b6825f0862