# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1268401367 -7200
# Node ID 108d9820af0157976edbea292c89e78f1ab216b2
# Parent  42dc287846beac0254f53180028f1bf49a96fc40
Revision: 201007
Kit: 201008

diff -r 42dc287846be -r 108d9820af01 fmradio/fmradio/data/fmradio.rss
--- a/fmradio/fmradio/data/fmradio.rss	Fri Feb 19 22:51:16 2010 +0200
+++ b/fmradio/fmradio/data/fmradio.rss	Fri Mar 12 15:42:47 2010 +0200
@@ -241,6 +241,7 @@
                                     {
                                      AVKON_BUTTON_STATE
                                         {
+                                        txt = qtn_tbextension_operator_music;
                                         bmpfile = KFMRadioBitmapFile;
                                         bmpmask = EMbmFmradioQgn_indi_radio_tb_mshop;
                                         bmpid = EMbmFmradioQgn_indi_radio_tb_mshop_mask;
diff -r 42dc287846be -r 108d9820af01 fmradio/fmradio/inc/fmradioappui.h
--- a/fmradio/fmradio/inc/fmradioappui.h	Fri Feb 19 22:51:16 2010 +0200
+++ b/fmradio/fmradio/inc/fmradioappui.h	Fri Mar 12 15:42:47 2010 +0200
@@ -798,6 +798,8 @@
         CAsyncCallBack* iStartupForegroundCallback;
         // The view id of the view that is to be activated when possible
         TUid iPendingViewId;
+        // Boolean for region change, force rescanning
+        TBool iRegionChanged;
     };
 
 #endif
diff -r 42dc287846be -r 108d9820af01 fmradio/fmradio/src/fmradioappui.cpp
--- a/fmradio/fmradio/src/fmradioappui.cpp	Fri Feb 19 22:51:16 2010 +0200
+++ b/fmradio/fmradio/src/fmradioappui.cpp	Fri Mar 12 15:42:47 2010 +0200
@@ -108,8 +108,9 @@
     iStartupWizardRunning = EFalse;
     iTuneFromWizardActivated = EFalse;
     iInfoNoteOn = EFalse;
-  	iAutoTune = EFalse;
-   	iAutoTuneUnmute = EFalse;
+    iAutoTune = EFalse;
+    iAutoTuneUnmute = EFalse;
+    iRegionChanged = EFalse;
 
    	BaseConstructL( EAknEnableSkin | EAknEnableMSK | EAknSingleClickCompatible );
     FeatureManager::InitializeLibL();
@@ -2186,10 +2187,11 @@
                 // Show note only if the region has changed from a concrete 
                 // one to another concrete one. EFMRadioRegionNone is not 
                 // a concrete one (first startup case) -- don't show note.
+                iRegionChanged = ETrue;
                 HBufC* bandSetText = StringLoader::LoadLC( R_QTN_FMRADIO_CONF_FREQ_BAND_SET_AUTOM, iCoeEnv );
-			    CAknInformationNote* note = new ( ELeave ) CAknInformationNote( ETrue );			    
-			    note->ExecuteLD( *bandSetText );
-			    CleanupStack::PopAndDestroy( bandSetText );
+                CAknInformationNote* note = new ( ELeave ) CAknInformationNote( ETrue );			    
+                note->ExecuteLD( *bandSetText );
+                CleanupStack::PopAndDestroy( bandSetText );
                 }
             }
         }
@@ -2253,7 +2255,7 @@
 void CFMRadioAppUi::HandleStartupWizardL()
     {
     FTRACE( FPrint( _L("CFMRadioAppUi::HandleStartupWizardL()")) );
-    if ( !IsStartupWizardHandled() )
+    if ( !IsStartupWizardHandled() || iRegionChanged )
         {
         // Call to iRadioEngine->UpdatedStartupCount()
         // increases startup count by one and returns amount of app startups.
@@ -2264,6 +2266,13 @@
             SetStartupWizardRunning( ETrue );
             ActivateLocalViewL( iScanLocalStationsView->Id() );
             }
+        else if ( iRegionChanged ) //force rescan
+            {
+            iRegionChanged = EFalse;
+            UpdateChannelsL( ERemoveAllFromRepository, 0, 0 );
+            SetStartupWizardRunning( ETrue );
+            ActivateLocalViewL( iScanLocalStationsView->Id() );
+            }
         else // check IAD update here
             {
             HandleIADUpdateCheckL();
diff -r 42dc287846be -r 108d9820af01 fmradio/fmradio/src/fmradiomaincontainer.cpp
--- a/fmradio/fmradio/src/fmradiomaincontainer.cpp	Fri Feb 19 22:51:16 2010 +0200
+++ b/fmradio/fmradio/src/fmradiomaincontainer.cpp	Fri Mar 12 15:42:47 2010 +0200
@@ -655,9 +655,9 @@
     TRgb color( KRgbBlue );
     AknsUtils::GetCachedColor( skin, color, KAknsIIDQsnTextColors, EAknsCIQsnTextColorsCG6 );  
        
-    iVisualControl->SetStationInformationTextColor( color );  
-                   
-    iMediaIdle->SetPrimaryColor( color );     
+    iVisualControl->SetStationInformationTextColor( color );
+    iMediaIdle->SetPrimaryColor( color );
+    iRdsViewer->SetTextColor( color );
     
     AknsUtils::GetCachedColor( skin, color, KAknsIIDQsnTextColors, EAknsCIQsnTextColorsCG10 );
     
diff -r 42dc287846be -r 108d9820af01 fmradio/fmradio/src/fmradiomainview.cpp
--- a/fmradio/fmradio/src/fmradiomainview.cpp	Fri Feb 19 22:51:16 2010 +0200
+++ b/fmradio/fmradio/src/fmradiomainview.cpp	Fri Mar 12 15:42:47 2010 +0200
@@ -107,8 +107,7 @@
     
     if ( operatorStoreButton )
         {
-        // set text for button name and tooltip
-        operatorStoreButton->State()->SetTextL( storeName );
+        // set text for button tooltip
         operatorStoreButton->State()->SetHelpTextL( storeName );
         }
     }
diff -r 42dc287846be -r 108d9820af01 fmradio/fmradioengine/src/fmradioengine.cpp
--- a/fmradio/fmradioengine/src/fmradioengine.cpp	Fri Feb 19 22:51:16 2010 +0200
+++ b/fmradio/fmradioengine/src/fmradioengine.cpp	Fri Mar 12 15:42:47 2010 +0200
@@ -402,7 +402,7 @@
     iTempFrequency = aFrequency;
 
     iRadioSettings->SetRadioMode( aRadioMode );
-    if ( iTunerControl )
+    if ( iTunerControl && iRadioSettings->IsHeadsetConnected() )
         {
         iFmTunerUtility->SetFrequency( aFrequency );
         }
@@ -1203,7 +1203,10 @@
     else
         {
         iInitializeRadioRequestExists = EFalse;
-
+        if ( aError == KFmRadioErrAntennaNotConnected )
+            {            
+            iRadioSettings->SetHeadsetDisconnected();
+            }
         FTRACE(FPrint(_L("CRadioEngine::MrftoStationSeekComplete() - Sending event to UI")));
         iTuningState = EFMRadioPSTuningUninitialized;
         HandleCallback( MRadioEngineStateChangeCallback::EFMRadioEventTune, aError );
diff -r 42dc287846be -r 108d9820af01 fmradio/loc/fmradio.loc
--- a/fmradio/loc/fmradio.loc	Fri Feb 19 22:51:16 2010 +0200
+++ b/fmradio/loc/fmradio.loc	Fri Mar 12 15:42:47 2010 +0200
@@ -651,6 +651,11 @@
 // d: main view toolbar extension command text
 // l: cell_tb_ext_pane_t1/opt1
 //
+#define qtn_tbextension_operator_music "Music Store"
+
+// d: main view toolbar extension command text
+// l: cell_tb_ext_pane_t1/opt1
+//
 #define qtn_tbextension_activate_loudspeaker "Activate loudspeaker"
 
 // d: main view toolbar extension command text