# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1271419105 -10800
# Node ID 6bb1b21d24844531c689dcb80e1856ec77241d8b
# Parent  92ab7f8d0eabeac5046933d4d22aa0446e76ee62
Revision: 201011
Kit: 201015

diff -r 92ab7f8d0eab -r 6bb1b21d2484 package_definition.xml
--- a/package_definition.xml	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="phone" name="Phone Apps" levels="engine plugin ui app">
-    <collection id="phoneapp" name="Phone Application" level="app">
-      <component id="blacklist" filter="s60" name="Phone Blacklist Clearing" class="plugin">
-        <unit bldFile="phoneapp/blacklist/group"/>
-      </component>
-      <component id="phoneui" filter="s60" name="Phone UI">
-        <unit bldFile="phoneapp/phoneui/group"/>
-        	<!-- should these be separate components? #included? -->
-        <!-- <unit bldFile="phoneapp/phoneui/tsrc/public/basic/3dringingtoneinterface_tests/group"/> -->
-        <!-- <unit bldFile="phoneapp/phoneui/tsrc/public/basic/group"/> -->
-      </component>
-      <component id="phoneuicontrol" filter="s60" name="Phone UI Control">
-        <unit bldFile="phoneapp/phoneuicontrol/group"/>
-      </component>
-      <component id="phoneuistates" filter="s60" name="Phone UI States">
-        <unit bldFile="phoneapp/phoneuistates/group"/>
-      </component>
-      <component id="phoneuiutils" filter="s60" name="Phone UI Utils">
-        <unit bldFile="phoneapp/phoneuiutils/group"/>
-      </component>
-      <component id="phoneuiview" filter="s60" name="Phone UI View">
-        <unit bldFile="phoneapp/phoneuiview/group"/>
-      </component>
-      <component id="phoneuivoipextension" filter="s60" name="Phone UI VOIP Extension">
-        <unit bldFile="phoneapp/phoneuivoipextension/group"/>
-      </component>
-      <component id="silenceactionplugin" filter="s60" name="Silence Action Plugin" class="plugin">
-        <unit bldFile="phoneapp/silenceactionplugin/group"/>
-      </component>
-      <component id="phonemediatorcenter" filter="s60" name="Phone Mediator Center">
-        <unit bldFile="phoneapp/phonemediatorcenter/group"/>
-      </component>
-    </collection>
-    <collection id="phoneengine" name="Phone Engine" level="engine">
-      <component id="phonecntfinder" filter="s60" name="Phone Contact Finder">
-        <unit bldFile="phoneengine/phonecntfinder/group"/>
-      </component>
-      <component id="audiohandling" filter="s60" name="Phone Audio Handling">
-        <unit bldFile="phoneengine/audiohandling/group"/>
-      </component>
-      <component id="callhandling" filter="s60" name="Call Handling">
-        <unit bldFile="phoneengine/callhandling/group"/>
-      </component>
-      <component id="contacthandling" filter="s60" name="Phone Contact Handling">
-        <unit bldFile="phoneengine/contacthandling/group"/>
-      </component>
-      <component id="loghandling" filter="s60" name="Phone Log Handling">
-        <unit bldFile="phoneengine/loghandling/group"/>
-      </component>
-      <component id="engineinfo" filter="s60" name="Phone Engine Info">
-        <unit bldFile="phoneengine/engineinfo/group"/>
-      </component>
-      <component id="phonemodel" filter="s60" name="Phone Model">
-        <unit bldFile="phoneengine/phonemodel/group"/>
-      </component>
-      <component id="servicehandling" filter="s60" name="Phone Service Handling">
-        <unit bldFile="phoneengine/servicehandling/group"/>
-      </component>
-    </collection>
-    <collection id="phonesettings" name="Phone Settings" level="plugin">
-      <component id="aiwcallimageplugin" filter="s60" name="Call Image AIW Plugin" class="plugin">
-        <unit bldFile="phonesettings/aiwcallimageplugin/group"/>
-      </component>
-      <component id="pslncallimageplugin" filter="s60" name="Call Image Personalization Plugin"  class="plugin">
-        <unit bldFile="phonesettings/pslncallimageplugin/group"/>
-      </component>
-    </collection>
-    <collection id="phoneuis" name="Phone UIs" level="ui">
-      <component id="dialer" filter="s60" name="Dialer">
-        <unit bldFile="phoneuis/dialer/group"/>
-        	<!-- what to do about this test unit? -->
-        <!-- <unit bldFile="phoneuis/dialer/tsrc/public/basic/group"/> -->
-      </component>
-      <component id="bubblemanager" filter="s60" name="Phone Bubble Manager">
-        <unit bldFile="phoneuis/bubblemanager/group"/>
-      </component>
-      <component id="connectutil" filter="s60" name="Connection Utility" class="plugin">
-        <unit bldFile="phoneuis/connectutil/group"/>
-      </component>
-      <component id="sfiutils" filter="s60" name="Send File In Call Utilities" class="plugin">
-        <unit bldFile="phoneuis/sfiutils/group"/>
-        	<!-- what to do about this test unit? -->
-        <!-- <unit bldFile="phoneuis/sfiutils/tsrc/public/basic/group"/> -->
-      </component>
-      <component id="ussd" filter="s60" name="Unstructured Supplementary Services Data">
-        <unit bldFile="phoneuis/ussd/group"/>
-      </component>
-      <component id="vmbx" filter="s60" name="Voice Mailbox">
-        <unit bldFile="phoneuis/vmbx/group"/>
-      </component>
-      <component id="telephonydevicemode" filter="s60" name="Telephony Device Mode">
-        <unit bldFile="phoneuis/telephonydevicemode/group"/>
-      </component>
-    </collection>
-    <collection id="phone_info" name="Phone Apps Info" level="app">
-      <component id="phone_plat" filter="s60" name="Phone Apps Platform Interfaces" class="api">
-        <unit bldFile="phone_plat/group"/>
-      </component>
-    </collection>
-    <collection id="phoneplugins" name="Phone Plugins" level="plugin">
-      <component id="telbranding" filter="s60" name="Tel Branding" class="plugin" introduced="^2">
-        <unit bldFile="phoneplugins/telbranding/group"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phone.pro
--- a/phone.pro	Fri Mar 19 09:28:42 2010 +0200
+++ b/phone.pro	Fri Apr 16 14:58:25 2010 +0300
@@ -31,6 +31,6 @@
 SUBDIRS += phoneapp/phoneui2
 SUBDIRS += phonesettings/cpphonesettingsplugins
 SUBDIRS += phoneplugins/hsdialerwidgetplugin
-SUBDIRS += phoneplugins/infowidgetprovider
+SUBDIRS += phoneplugins/infowidgetplugin
 }
           
\ No newline at end of file
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phone_plat/group/bld.inf
--- a/phone_plat/group/bld.inf	Fri Mar 19 09:28:42 2010 +0200
+++ b/phone_plat/group/bld.inf	Fri Apr 16 14:58:25 2010 +0300
@@ -24,11 +24,9 @@
 #include "../telephony_remote_party_information_api/group/bld.inf"
 #include "../telephony_video_mailbox_settings_api/group/bld.inf"
 
-// <-- QT PHONE START --> 
 //#include "../telephony_configuration_api/group/bld.inf"
 //#include "../dialer_keypad_api/group/bld.inf"
 //#include "../telephony_bubble_extension_api/group/bld.inf"
-// <-- QT PHONE END --> 
 
 #include "../telephony_menu_extension_api/group/bld.inf"
 #include "../telephony_microphone_mute_status_api/group/bld.inf"
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phone_plat/tsrc/group/bld.inf
--- a/phone_plat/tsrc/group/bld.inf	Fri Mar 19 09:28:42 2010 +0200
+++ b/phone_plat/tsrc/group/bld.inf	Fri Apr 16 14:58:25 2010 +0300
@@ -17,9 +17,5 @@
 
 
 PRJ_TESTMMPFILES
-// <-- QT PHONE START -->
-//#include "../../../phoneapp/phoneui/tsrc/public/basic/3dringingtoneinterface_tests/group/bld.inf"
-//#include "../../../phoneuis/dialer/tsrc/public/basic/group/bld.inf"
-// <-- QT PHONE END -->
 
  // End of File
\ No newline at end of file
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/Blacklist/group/bld.inf
--- a/phoneapp/Blacklist/group/bld.inf	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/Blacklist/group/bld.inf	Fri Apr 16 14:58:25 2010 +0300
@@ -23,10 +23,10 @@
 
 PRJ_EXPORTS
 ../inc/phoneanimdllstd.h         |../../../inc/phoneanimdllstd.h
-../group/phoneanimdll_stub.SIS    /epoc32/data/z/system/install/phoneanimdll_stub.SIS
+../group/phoneanimdll_stub.sis    /epoc32/data/z/system/install/phoneanimdll_stub.sis
 
 // IBY files
-../rom/PhoneAnimDll.iby             CORE_APP_LAYER_IBY_EXPORT_PATH(PhoneAnimDll.iby)
+../rom/phoneanimdll.iby             CORE_APP_LAYER_IBY_EXPORT_PATH(phoneanimdll.iby)
 
 PRJ_MMPFILES
 ../group/phoneanimdll.mmp
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/Blacklist/group/phoneanimdll.mmp
--- a/phoneapp/Blacklist/group/phoneanimdll.mmp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/Blacklist/group/phoneanimdll.mmp	Fri Apr 16 14:58:25 2010 +0300
@@ -31,8 +31,8 @@
 USERINCLUDE     ../inc
 APP_LAYER_SYSTEMINCLUDE
 
-SOURCE          CPhoneAnimDll.cpp
-SOURCE          CPhoneBlacklistAnim.cpp
+SOURCE          cphoneanimdll.cpp
+SOURCE          cphoneblacklistanim.cpp
 
 LIBRARY         euser.lib 
 LIBRARY         etel.lib 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/Blacklist/rom/PhoneAnimDll.iby
--- a/phoneapp/Blacklist/rom/PhoneAnimDll.iby	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/Blacklist/rom/PhoneAnimDll.iby	Fri Apr 16 14:58:25 2010 +0300
@@ -19,8 +19,8 @@
 #ifndef __PHONEANIMDLL_IBY__
 #define __PHONEANIMDLL_IBY__
 
-file=ABI_DIR\BUILD_DIR\PhoneAnimDll.dll         SHARED_LIB_DIR\PhoneAnimDll.dll
+file=ABI_DIR\BUILD_DIR\phoneanimdll.dll         SHARED_LIB_DIR\phoneanimdll.dll
 
-data=ZSYSTEM\install\PhoneAnimDll_stub.sis       System\Install\PhoneAnimDll_stub.sis
+data=ZSYSTEM\install\phoneanimdll_stub.sis       System\Install\phoneanimdll_stub.sis
 
 #endif
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/Blacklist/src/CPhoneAnimDll.cpp
--- a/phoneapp/Blacklist/src/CPhoneAnimDll.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/Blacklist/src/CPhoneAnimDll.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -21,8 +21,8 @@
 
 // INCLUDE FILES
 #include    "phoneanimdllstd.h"         
-#include    "CPhoneAnimDll.h"
-#include    "CPhoneBlacklistAnim.h"
+#include    "cphoneanimdll.h"
+#include    "cphoneblacklistanim.h"
 
 // ================= MEMBER FUNCTIONS =======================
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/Blacklist/src/CPhoneBlacklistAnim.cpp
--- a/phoneapp/Blacklist/src/CPhoneBlacklistAnim.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/Blacklist/src/CPhoneBlacklistAnim.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -21,7 +21,7 @@
 #include    <e32base.h>                     
 #include    <mmtsy_names.h>                 
 #include    "phoneanimdllstd.h"             
-#include    "CPhoneBlacklistAnim.h"
+#include    "cphoneblacklistanim.h"
 
 // CONSTANTS
 // Amount of retries to be performed.
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/group/bld.inf
--- a/phoneapp/group/bld.inf	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/group/bld.inf	Fri Apr 16 14:58:25 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 
-#include "../Blacklist/group/bld.inf"
+#include "../blacklist/group/bld.inf"
 #include "../phoneuicontrol/group/bld.inf"
 #include "../phoneuistates/group/bld.inf"
 #include "../phoneuiutils/group/bld.inf"
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phonemediatorcenter/src/cphonedataportmessage.cpp
--- a/phoneapp/phonemediatorcenter/src/cphonedataportmessage.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phonemediatorcenter/src/cphonedataportmessage.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -75,7 +75,6 @@
     {
     __LOGMETHODSTARTEND( EPhoneMediatorCenter, "CPhoneDataPortMessage::ExecuteL( ) ");
     const TName& dataPortName = iEngineInfo.DataPortName();
-// <-- QT PHONE START -->
     TDataPortPackage dataPortPackage( dataPortName );
     CPhoneMediatorSender::Instance()->IssueCommand( KMediatorVideoTelephonyDomain,
                                                     KCatPhoneToVideotelCommands,
@@ -84,8 +83,6 @@
                                                               KPhoneToVideotelCmdVersionMinor,
                                                               KPhoneToVideotelCmdVersionBuild ),
                                                     dataPortPackage );
-
-// <-- QT PHONE END -->
     }
 
 //  End of File  
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phonemediatorcenter/src/cphonemediatorsender.cpp
--- a/phoneapp/phonemediatorcenter/src/cphonemediatorsender.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phonemediatorcenter/src/cphonemediatorsender.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -18,17 +18,12 @@
 
 // INCLUDE FILES
 #include <MediatorDomainUIDs.h>
-// <-- QT PHONE START -->
 #include <videotelcontrolmediatorapi.h>
-// <-- QT PHONE END -->
 #include "phoneui.hrh"
 #include "cphonemediatorsender.h"
 #include "phonelogger.h"
 #include "phoneconstants.h"
 #include "phonemediatorpackagetypes.h"
-// <-- QT PHONE START --> 
-//#include "mphonecoveruiobserver.h"
-// <-- QT PHONE END --> 
 #include "phoneui.pan"
 #include "tphonecmdparamcallheaderdata.h"
 #include "tphonecmdparamboolean.h"
@@ -196,7 +191,7 @@
             TPhoneCmdParamBoolean& booleanParam = static_cast<TPhoneCmdParamBoolean&>( aCommandParam );
             const TBool audioMute( booleanParam.Boolean() );
             TInt response = KErrNone;
-// <-- QT PHONE START --> 
+
             TInt command = -1; 
             if( audioMute )
                 {
@@ -236,7 +231,6 @@
                                                     KPhoneToVideotelCmdVersionMinor, 
                                                     KPhoneToVideotelCmdVersionBuild );
                 }
-// <-- QT PHONE END --> 
             }
             break;
             
@@ -345,15 +339,12 @@
             ResetCommandBuffer();
             }
         }
-// <-- QT PHONE START --> 
 
     if( ( aDomain == KMediatorVideoTelephonyDomain ) &&
         ( aCategory == KCatPhoneToVideotelCommands ) )
         {
         VideoTelephonyCommandResponse( aCommandId );        
         }
-
-// <-- QT PHONE END --> 
     }
 
 // -----------------------------------------------------------------------------
@@ -365,7 +356,6 @@
     __LOGMETHODSTARTEND( EPhoneMediatorCenter, "CPhoneMediatorSender::VideoTelephonyCommandResponse( ) ");
     __PHONELOG1( EBasic, EPhoneMediatorCenter, 
         "VideoTelephonyCommandResponse aCommandId = %d", aCommandId );
-// <-- QT PHONE START --> 
 
     switch( aCommandId )
         {
@@ -377,8 +367,6 @@
         default:
             break;
         }     
-
-// <-- QT PHONE END --> 
     }
 
 // -----------------------------------------------------------------------------
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneringingtoneplayer/src/cphoneringingtone.cpp
--- a/phoneapp/phoneringingtoneplayer/src/cphoneringingtone.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneringingtoneplayer/src/cphoneringingtone.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -389,7 +389,6 @@
     // Get file size
     TInt size = 0;
 
-// <-- QT PHONE START -->    
     RFs fs;   
     TInt error = fs.Connect();
     TEntry entry;
@@ -407,7 +406,6 @@
             error = KErrTooBig;
             }
         }
-// <-- QT PHONE END -->
 
     fs.Close();
     __PHONELOG1( 
@@ -428,14 +426,8 @@
     {
     __LOGMETHODSTARTEND( EPhoneControl, "CPhoneRingingtone::GetMaxToneFileSize()" );
 
-// <-- QT PHONE START -->     
-    /*const TInt error = CPhoneCenRepProxy::Instance()->GetInt( 
-            KCRUidProfileEngine,
-            KProEngRingingToneMaxSize,
-            iToneFileSizeLimitKB );*/
     TInt error(KErrNone);           
     iToneFileSizeLimitKB = 5000;
-// <-- QT PHONE END -->     
    
     if ( error != KErrNone )
         {
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneringingtoneplayer/src/cphoneringingtoneplayer.cpp
--- a/phoneapp/phoneringingtoneplayer/src/cphoneringingtoneplayer.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneringingtoneplayer/src/cphoneringingtoneplayer.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -21,9 +21,6 @@
 #include <utility.h>
 #include <AudioPreference.h>
 #include <ProfileEngineDomainCRKeys.h>
-// <-- QT PHONE START -->
-//#include <musicplayerdomaincrkeys.h>
-// <-- QT PHONE END -->
 #include <DRMHelperServerInternalCRKeys.h>
 #include <DRMHelper.h>
 #include <activeidle2domainpskeys.h>
@@ -38,14 +35,6 @@
 #include "phoneconstants.h"
 #include "phoneui.pan"
 
-// CONSTANTS
-
-// <-- QT PHONE START -->
-// Minimum acceptable length of parsed DRM message.
-
-//const TInt KPhoneMinDRMTextLength = 3;
-// <-- QT PHONE END -->
-
 CPhoneRingingtonePlayer::CPhoneRingingtonePlayer():
 CActive( CActive::EPriorityStandard ), iAsyncDeletePlayers( EPlayerCount )
 {
@@ -117,28 +106,10 @@
             iAsyncDeletePlayers.Append( NULL ) );
         }
     
- 
-    // <-- QT PHONE START -->
-       // Checks if DRM extend security is needed
-    //TInt extSecNeeded = KErrNone;
-/*
-    TInt err = CPhoneCenRepProxy::Instance()->GetInt(
-        KCRUidMusicPlayerFeatures,
-        KRequireDRMInPlayback,
-        extSecNeeded );
-*/
-
     //disabling the DRM for the TB10.1wk46 release. Lets see if need to put it back and how.
     //iExtSecNeeded = ( ( err == KErrNone ) && extSecNeeded ) ? ETrue : EFalse;
     iExtSecNeeded = EFalse; 
-    
-    
-    /*CPhoneCenRepProxy::Instance()->NotifyChangeL(
-        KCRUidDRMHelperServer, 
-        KDRMHelperServerNotificationPassive,
-        this );*/
-    // <-- QT PHONE END-->        
-    
+        
     // Construct players.
     if ( !iMdaServer )
         {
@@ -147,9 +118,7 @@
     
     // Backup player. 
     ConstructBackupPlayer();
-    // <-- QT PHONE START-->
     ConstructDefaultPlayerL();
-    // <-- QT PHONE END-->
     }
 
 // -----------------------------------------------------------------------------
@@ -486,14 +455,8 @@
     {
     // Construct the default ringing tone
     TBuf<KMaxFileName> defaultTone;
-// <-- QT PHONE START-->
-    /*TInt err = CPhoneCenRepProxy::Instance()->GetString(            
-        KCRUidProfileEngine,
-        KProEngDefaultRingingTone,
-        defaultTone );*/
     defaultTone = _L("z:\\data\\sounds\\digital\\Nokia tune.aac");        
     TInt err(KErrNone);
-// <-- QT PHONE END-->    
     
     if ( err == KErrNone )
         {
@@ -791,60 +754,6 @@
     
     if ( aUid == KCRUidDRMHelperServer )
         {
-// <-- QT PHONE START --> 
-        /*
-        TBuf<256> tempBuf16( KNullDesC );
-        
-        User::LeaveIfError( CPhoneCenRepProxy::Instance()->GetString(
-            KCRUidDRMHelperServer,
-            KDRMHelperServerNotificationPassive,
-            tempBuf16 ) );         
-       
-        const TBool idleIsTopApp = CPhonePubSubProxy::Instance()->Value(
-            KPSUidAiInformation, KActiveIdleState ) == EPSAiForeground;
-       
-        // Quick validity check and    
-        // The first Tuint8 is the times the content has been informed.
-        // Note should not shown until Idle.
-        if ( idleIsTopApp && tempBuf16.Length() >= KPhoneMinDRMTextLength )
-            { 
-            TBuf8<256> tempBuf8;
-            TPtrC8 ptr((TUint8*)tempBuf16.Ptr(), tempBuf16.Size());
-            HBufC8* buf8 = HBufC8::NewLC( 256 );
-            buf8->Des().Copy(ptr);  
-            // Extract URI etc. 
-            // buf8 format:
-            //<TUint8 aTimes><TUint8 aExpirationMark>
-            //<TUint8 aPermissionType>
-            //<TUint8 aAutomatedContentType><TDesC8 aContentID>
-            TInt8 count = (TInt8)(*(buf8->Ptr())); 
-            TChar mark = (TChar)(*(buf8->Ptr()+1));
-            TInt8 permtype = (TChar)(*(buf8->Ptr()+2));
-            TInt8 automcontenttype = (TChar)(*(buf8->Ptr()+3)); 
-            TBuf8<256> curi = buf8->Right( buf8->Length()-4);
-            
-            if (curi.Ptr()[curi.Size()-1] == 0)
-                {
-                // The last character in the descriptor is 0, which means
-                // that the original 16-bit desc was padded so
-                // remove the last char...
-                curi.SetLength(curi.Size()-1);
-                }
-                    
-            // Create DRM helper.     
-            CDRMHelper* drmHelper = CDRMHelper::NewLC();            
-            // Show notification.
-            drmHelper->SetAutomatedType( (CDRMHelper::TDRMHelperAutomatedType)automcontenttype );
-            TInt error = drmHelper->CheckRightsAmountL( curi );
-
-            __PHONELOG1( EBasic, EPhoneControl, 
-                "CPhoneRingingtonePlayer::HandleCenRepChangeL > CheckRightsAmountL, error: %d"
-                , error );
-                           
-            CleanupStack::PopAndDestroy( drmHelper ); 
-            CleanupStack::PopAndDestroy( buf8 ); 
-            } */
-// <-- QT PHONE END --> 
         }
     }
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/graphics/qgn_indi_button_swap.svg
--- a/phoneapp/phoneui2/graphics/qgn_indi_button_swap.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" y="0px">
-<g>
-<rect fill="none" height="60" width="60"/>
-<polygon fill="#FFFFFF" points="48.238,32.606 48.238,21.683 44.691,25.234 39.162,19.706 35.476,23.391 41.005,28.92    37.318,32.604  "/>
-<polygon fill="#FFFFFF" points="19.57,22.312 19.57,33.236 23.118,29.685 28.646,35.212 32.333,31.527 26.804,25.998 30.49,22.313     "/>
-<path d="M32.988,9.917c-0.006-0.012-0.016-0.029-0.024-0.041l-0.008,0.006c-0.037-0.04-3.326-3.954-9.407-3.235   c-0.111,0.014-5.901,4.255-10.232,8.584c-6.157,6.158-9.167,10.641-9.17,10.643c-1.195,5.927,3.065,9.674,3.105,9.713   c0,0,1.178,0.982,2.302-0.127l4.418-5.89c0.216-0.267,0.879-1.169,0.046-2.18c-0.04-0.048-1.295-1.36-2.232-3.394l9.583-9.583   c2.034,0.939,3.23,2.115,3.246,2.126c0.046,0.048,1.05,1.144,2.328,0.062l5.889-4.42C33.303,11.745,33.739,11.027,32.988,9.917z" fill="#FFFFFF"/>
-<path d="M55.76,41.392c0,0,0.208-2.28-2.392-2.69l-8.405,1.095c-2.304,0.198-2.461,2.254-2.461,2.254   s-0.163,1.431-0.685,3.076l-10.598,0.07c-0.522-1.647-0.546-2.256-0.546-2.256c-0.003-0.013-0.064-2.503-2.458-3.009l-7.932-1.23   c-1.369,0-2.043,0.743-2.6,1.3c-0.938,1.878-1.96,7.034,4.182,12.197c11.074,1.996,25.51,1.14,29.26-0.104   C51.126,52.094,56.591,48.186,55.76,41.392z M50.007,49.714c-10.504,2.051-23.6,0.76-26.814,0.116   c-0.61-0.59-4.187-3.562-3.5-8.149c0.165-0.159,0.341-0.309,0.487-0.354l7.631,1.184c0,0,0,0-0.003,0   c-0.011,0,0.194,0.072,0.264,0.581c0.171,1.262,1.241,4.727,1.241,4.727l14.414-0.094c0,0,1.17-3.695,1.364-5.378l7.745-0.965   c0,0,0.479-0.028,0.489,0.569C53.4,46.651,50.497,49.312,50.007,49.714z" fill="#FFFFFF"/>
-</g>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/graphics/qtg_large_comp_message.svg
--- a/phoneapp/phoneui2/graphics/qtg_large_comp_message.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<rect fill="none" height="60" width="60"/>
-<g>
-<polygon fill="#666666" points="38.165,38.746 32.015,40.565 33.922,34.504 51.582,16.844 55.824,21.086   "/>
-<path d="M42,47.675H13.174c-3.033,0-5.501-2.47-5.501-5.503V19.692c0-3.033,2.468-5.501,5.501-5.501H42    c2.604,0,4.87,1.855,5.388,4.409l0.056,0.263L34.964,31.138H20.029l-9.354-9.158v20.194c0,1.379,1.12,2.499,2.498,2.499H42    c1.381,0,2.501-1.12,2.501-2.499v-7.643l3-3v10.641C47.501,45.205,45.034,47.675,42,47.675L42,47.675z M21.35,28.136h12.294    l10.33-9.956c-0.473-0.615-1.2-0.983-1.974-0.983H13.174c-0.829,0-1.585,0.407-2.048,1.084L21.35,28.136L21.35,28.136z" fill="#666666"/>
-</g>
-</g>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/graphics/qtg_large_tb_contacts.svg
--- a/phoneapp/phoneui2/graphics/qtg_large_tb_contacts.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg version="1.1" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-	 x="0px" y="0px" width="60px" height="60px" viewBox="0 0 60 60" xml:space="preserve">
-<g>
-	<rect fill="none" width="60" height="60"/>
-	<path fill="#666666" d="M45.047,10.296h-29c-2.75,0-5,2.25-5,5v5.702h5.676v3h-5.676v5.798h5.676v3h-5.676v5.798h5.676v3h-5.676
-		v6.702c0,2.75,2.25,5,5,5h29c2.75,0,5-2.25,5-5v-33C50.047,12.546,47.797,10.296,45.047,10.296z M41.804,25.414
-		c-0.059,0.947-0.776,1.983-2.33,3.355c-1.459,1.284-2.816,2.008-3.646,1.931c-0.219-0.066-0.656-0.258-1.177-0.91
-		c-0.352-0.448-0.599-1.104-0.731-1.953l-0.068-0.403l-0.41,0.002c-2.037,0.01-5.48,3.454-5.499,5.502l-0.003,0.41l0.405,0.064
-		c0.85,0.136,1.485,0.412,1.943,0.734c0.976,0.683,0.917,1.308,0.917,1.308c0,1.237-1.479,3.006-1.934,3.518
-		c-1.375,1.554-2.402,2.273-3.34,2.332c0,0-0.506,0.045-1.388-0.448c-0.977-0.543-1.526-1.315-1.921-1.904
-		c-0.383-0.577-0.847-1.771-0.847-3.404c0-2.526,1.015-6.053,4.624-9.666c5.945-5.944,11.697-4.81,13.119-3.722
-		c0.662,0.506,1.114,0.941,1.847,1.868C41.938,24.753,41.805,25.414,41.804,25.414z"/>
-</g>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/graphics/qtg_large_tb_dialler.svg
--- a/phoneapp/phoneui2/graphics/qtg_large_tb_dialler.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<rect fill="none" height="60" width="60"/>
-<path d="M39.189,11.974c0-0.55,0.449-1,1-1h8.004c0.551,0,1,0.45,1,1v4.437c0,0.55-0.449,1-1,1h-8.004   c-0.551,0-1-0.45-1-1V11.974z M39.189,37.485c0,0.55,0.449,1,1,1h8.004c0.551,0,1-0.45,1-1v-4.438c0-0.55-0.449-1-1-1h-8.004   c-0.551,0-1,0.45-1,1V37.485z M39.184,26.949c0,0.55,0.451,1,1,1h8.01c0.551,0,1-0.45,1-1V22.51c0-0.55-0.449-1-1-1h-8.01   c-0.549,0-1,0.45-1,1V26.949z M24.965,16.41c0,0.55,0.449,1,1,1h7.992c0.551,0,1-0.45,1-1v-4.437c0-0.55-0.449-1-1-1h-7.992   c-0.551,0-1,0.45-1,1V16.41z M24.965,37.485c0,0.55,0.449,1,1,1h7.992c0.551,0,1-0.45,1-1v-4.438c0-0.55-0.449-1-1-1h-7.992   c-0.551,0-1,0.45-1,1V37.485z M24.965,48.026c0,0.55,0.449,1,1,1h7.992c0.551,0,1-0.45,1-1v-4.444c0-0.55-0.449-1-1-1h-7.992   c-0.551,0-1,0.45-1,1V48.026z M24.961,26.949c0,0.55,0.451,1,1,1h7.996c0.551,0,1-0.45,1-1V22.51c0-0.55-0.449-1-1-1h-7.996   c-0.549,0-1,0.45-1,1V26.949z M10.816,16.41c0,0.55,0.449,1,1,1h7.996c0.551,0,1-0.45,1-1v-4.437c0-0.55-0.449-1-1-1h-7.996   c-0.551,0-1,0.45-1,1V16.41z M10.816,37.485c0,0.55,0.449,1,1,1h7.996c0.551,0,1-0.45,1-1v-4.438c0-0.55-0.449-1-1-1h-7.996   c-0.551,0-1,0.45-1,1V37.485z M10.805,26.949c0,0.55,0.451,1,1,1h8.008c0.551,0,1-0.45,1-1V22.51c0-0.55-0.449-1-1-1h-8.008   c-0.549,0-1,0.45-1,1V26.949z" fill="#666666"/>
-</g>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/graphics/qtg_large_tb_join.svg
--- a/phoneapp/phoneui2/graphics/qtg_large_tb_join.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<rect fill="none" fill-opacity="0.5" height="60" stroke-opacity="0.5" width="60"/>
-<g>
-<path d="M33.305,22.519c0,2.729,1.895,5.014,4.434,5.633c-0.297-0.846-0.468-1.75-0.477-2.691    c-0.979-0.617-1.635-1.701-1.635-2.941c0-1.918,1.563-3.48,3.482-3.48c0.33,0,0.646,0.063,0.952,0.148    c0.678-0.605,1.452-1.107,2.305-1.465c-0.93-0.633-2.051-1.004-3.257-1.004C35.908,16.716,33.305,19.319,33.305,22.519z     M38.518,31.806c0.27-0.33,0.545-0.639,0.838-0.896c-0.385-0.436-0.721-0.914-1.012-1.426h-2.809c-1.654,0-3.295,3.881-4.42,7.145    c-1.125,3.26-1.709,5.627-1.709,5.627h2.643c0-0.408,0.543-2.563,1.438-5.201c0.971-2.604,1.691-4.162,2.493-5.246h2.538V31.806z     M32.049,28.931c0.269-0.33,0.543-0.639,0.838-0.896c-0.387-0.436-0.723-0.914-1.012-1.426h-2.81c-1.657,0-3.294,3.881-4.42,7.143    s-1.708,5.629-1.708,5.629h2.64c0-0.408,0.543-2.563,1.437-5.201c0.971-2.602,1.69-4.164,2.492-5.248H32.049L32.049,28.931z     M31.268,25.276c-0.297-0.844-0.469-1.75-0.475-2.691c-0.979-0.619-1.637-1.701-1.637-2.939c0-1.92,1.563-3.482,3.479-3.482    c0.334,0,0.648,0.063,0.953,0.148c0.683-0.605,1.455-1.105,2.309-1.465c-0.932-0.633-2.055-1.006-3.262-1.006    c-3.199,0-5.801,2.604-5.801,5.803C26.836,22.37,28.728,24.657,31.268,25.276z" fill="#666666"/>
-<path d="M39.778,25.396c0,3.199,2.601,5.803,5.799,5.803c3.201,0,5.808-2.604,5.808-5.803    s-2.604-5.803-5.808-5.803C42.377,19.593,39.778,22.196,39.778,25.396z M45.576,21.913c1.924,0,3.486,1.563,3.486,3.482    s-1.563,3.48-3.486,3.48c-1.918,0-3.48-1.561-3.48-3.48S43.658,21.913,45.576,21.913z M53.481,39.503    c-1.125-3.266-2.765-7.143-4.418-7.143h-3.438h-3.617c-1.658,0-3.295,3.877-4.422,7.143c-1.125,3.26-1.707,5.629-1.707,5.629h2.64    c0-0.41,0.545-2.564,1.438-5.201c0.971-2.605,1.692-4.164,2.491-5.248h3.179h2.993c0.804,1.084,1.523,2.646,2.494,5.248    c0.894,2.639,1.438,4.791,1.438,5.201h2.642C55.192,45.132,54.608,42.763,53.481,39.503z" fill="#666666"/>
-<g>
-<path d="M18.227,33.763l-1.555-1.557c-0.979,1.18-2.072,2.256-3.264,3.219l1.553,1.553     c-0.91,0.732-1.873,1.404-2.892,1.994l-0.041,0.039h8.403v-8.395C19.787,31.729,19.045,32.776,18.227,33.763z" fill="#666666"/>
-<path d="M19.752,22.079c-0.787-0.605-6.068-2.355-12.262,3.779l-0.076,0.074     C1.28,32.126,3.032,37.409,3.635,38.194c0.438,0.574,0.933,1.221,1.771,1.785c0.207,0.127,0.6,0.285,1.021,0.275     s1.387-0.637,2.596-1.959c1.211-1.322,1.721-2.387,1.834-2.887l0.064-0.285l-0.189-0.223c-0.119-0.145-0.262-0.277-0.43-0.41     c-0.715-0.57-2.205-0.658-2.223-0.658l-0.229-0.014L7.74,33.616c-0.046-0.086-1.137-2.184,1.998-5.438     c3.254-3.135,5.35-2.043,5.436-1.996l0.203,0.111l0.014,0.229c0,0.018,0.088,1.508,0.658,2.223c0.131,0.17,0.268,0.309,0.41,0.43     l0.223,0.189l0.283-0.064c0.5-0.113,1.567-0.623,2.89-1.834c1.321-1.211,1.948-2.174,1.959-2.596     c0.009-0.422-0.15-0.814-0.277-1.021C20.971,23.009,20.325,22.515,19.752,22.079z" fill="#666666"/>
-</g>
-</g>
-</g>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/graphics/qtg_large_tb_loudsp_mute.svg
--- a/phoneapp/phoneui2/graphics/qtg_large_tb_loudsp_mute.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<rect fill="none" fill-opacity="0.5" height="60" stroke-opacity="0.5" width="60"/>
-<g>
-<path d="M30.896,14.575h-4.929c-0.291,0-0.618,0.109-0.91,0.277l6.839,10.611v-9.889    C31.896,15.024,31.445,14.575,30.896,14.575z M36.33,20.429c-0.69,0-1.25,0.561-1.25,1.25v8.729l2.498,3.877V21.679    C37.578,20.989,37.019,20.429,36.33,20.429z M19.757,22.667H14.83c-0.55,0-1,0.449-1,1v13.994c0,0.551,0.45,1,1,1h4.927    l4.621,6.342c0.324,0.445,1.039,0.809,1.589,0.809h4.929c0.55,0,1-0.449,1-1v-7.35L21.058,20.646L19.757,22.667z" fill="#666666"/>
-<polygon fill="#666666" points="15.071,7.665 17.171,6.31 46.171,51.308 44.071,52.663 15.071,7.665   "/>
-</g>
-</g>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/graphics/qtg_large_tb_loudsp_unmute.svg
--- a/phoneapp/phoneui2/graphics/qtg_large_tb_loudsp_unmute.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<g>
-<rect fill="none" fill-opacity="0.5" height="60" stroke-opacity="0.5" width="60"/>
-<g>
-<path d="M25.348,14.381c-0.55,0-1.244,0.378-1.541,0.841l-4.669,7.251h-4.927c-0.55,0-1,0.45-1,1v13.995     c0,0.55,0.45,1,1,1h4.927l4.621,6.342c0.324,0.445,1.039,0.809,1.589,0.809h4.929c0.55,0,1-0.45,1-1V15.381c0-0.55-0.45-1-1-1     H25.348z" fill="#666666"/>
-</g>
-</g>
-<g>
-<path d="M34.462,37.372V21.485c0-0.691,0.559-1.251,1.248-1.251l0,0c0.689,0,1.252,0.56,1.252,1.251l0,0v15.887    c0,0.689-0.563,1.249-1.252,1.249l0,0C35.021,38.621,34.462,38.062,34.462,37.372L34.462,37.372z" fill="#666666"/>
-<path d="M39.896,40.298v-21.74c0-0.689,0.561-1.249,1.25-1.249l0,0c0.689,0,1.249,0.56,1.249,1.249l0,0v21.74    c0,0.689-0.56,1.252-1.249,1.252l0,0C40.456,41.55,39.896,40.987,39.896,40.298L39.896,40.298z" fill="#666666"/>
-<path d="M45.538,43.641V15.215c0-0.69,0.56-1.25,1.252-1.25l0,0c0.689,0,1.25,0.56,1.25,1.25l0,0v28.426    c0,0.69-0.561,1.252-1.25,1.252l0,0C46.098,44.893,45.538,44.331,45.538,43.641L45.538,43.641z" fill="#666666"/>
-</g>
-</g>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/graphics/qtg_large_tb_mute.svg
--- a/phoneapp/phoneui2/graphics/qtg_large_tb_mute.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<rect fill="none" fill-opacity="0.5" height="60" stroke-opacity="0.5" width="60"/>
-<path d="M38.377,23.988v12.305l2.066,3.207c0.273-0.703,0.43-1.464,0.431-2.263V23.988H38.377z M25.377,40.989   c-2.056-0.005-3.747-1.698-3.752-3.752V23.988h-2.497h-0.002v13.249c0.005,3.446,2.805,6.247,6.251,6.249h1.75v10.558h5.75V43.486   h1.751c0.214,0,0.424-0.011,0.632-0.032l-1.588-2.465H25.377z M29.33,38.531h1.343c0.45,0,0.878-0.078,1.292-0.189L24.33,26.494   v7.037C24.33,36.293,26.568,38.531,29.33,38.531z M30.673,10.604H29.33c-2.434,0-4.456,1.739-4.903,4.042l11.246,17.451V15.604   C35.673,12.843,33.435,10.604,30.673,10.604z" fill="#666666"/>
-<polygon fill="#666666" points="14.45,7.471 16.551,6.115 45.55,51.114 43.45,52.47 14.45,7.471  "/>
-</g>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/graphics/qtg_large_tb_silence.svg
--- a/phoneapp/phoneui2/graphics/qtg_large_tb_silence.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<rect fill="none" fill-opacity="0.5" height="60" stroke-opacity="0.5" width="60"/>
-<g>
-<g>
-<path d="M20.253,15.567l2.602,2.604v-5.16l4.037,2.156v-4.459l-6.639-3.98V15.567L20.253,15.567z M16.163,35.304     c0.184,0.023,0.367,0.035,0.547,0.035l0,0c1.805-0.016,3.715-1.086,4.656-2.666l0,0c0.271-0.465,0.416-0.936,0.457-1.385     l0.025-0.047v-0.133l0,0c0-0.139,0-3.648,0-4.742v-0.211l-2.6-2.598v5.092l0,0c-0.078-0.004-0.156-0.006-0.234-0.004l0,0     c-1.801,0.012-3.723,1.082-4.662,2.674l0,0c-0.309,0.537-0.471,1.09-0.471,1.619l0,0C13.858,34.155,14.8,35.144,16.163,35.304     L16.163,35.304z" fill="#666666"/>
-</g>
-<polygon fill="#666666" points="9.358,11.591 11.495,9.454 31.698,29.655 29.562,31.794 9.358,11.591   "/>
-</g>
-<path d="M54.592,25.338c-0.059-0.357-0.295-1.59-0.837-2.398c-1.101-1.652-2.377-2.627-3.226-3.271   c-2.435-1.863-11.519-3.749-21.144,4.851l1.771,1.771c5.564-4.919,10.563-5.707,13.16-5.707c2.418,0,4.132,0.64,4.695,1.071   c0.758,0.576,1.793,1.364,2.66,2.67c0.153,0.229,0.334,0.788,0.434,1.311c-0.135,1.033-1.224,2.454-3.244,4.236   c-2.063,1.826-3.787,2.688-4.567,2.744c-0.112-0.073-0.452-0.311-0.878-0.847c-0.268-0.339-0.635-1.03-0.859-2.412l-0.344-2.106   l-2.133,0.007c-1.532,0.003-4.006,0.636-7.09,3.622c-3.007,3.124-3.645,5.593-3.652,7.123l-0.013,2.135l2.109,0.345   c1.443,0.236,2.127,0.645,2.407,0.866c0.5,0.396,0.742,0.72,0.84,0.878c-0.103,0.897-1.038,2.643-2.734,4.558   c-1.788,2.03-3.201,3.121-4.213,3.254c-0.513-0.092-1.09-0.277-1.321-0.434c-1.283-0.852-2.051-1.854-2.727-2.736   c-0.817-1.088-2.911-7.435,2.745-15.371l-1.793-1.794c-6.855,9.306-4.186,17.05-2.962,18.655c0.729,0.951,1.704,2.232,3.351,3.328   c0.813,0.541,2.042,0.777,2.4,0.836l0.181,0.027l0.181-0.006c1.765-0.115,3.627-1.375,6.031-4.102   c1.035-1.168,3.37-4.066,3.37-6.299c0.003-0.092-0.002-0.186-0.014-0.281l-0.019-0.18l-0.058-0.17   c-0.075-0.242-0.439-1.119-1.703-2.119c-1.062-0.846-2.514-1.207-3.56-1.379c0.006-0.939,0.431-2.775,2.927-5.352l-0.035,0.012   c2.576-2.494,4.418-2.914,5.358-2.918c0.171,1.053,0.528,2.508,1.371,3.568c1.007,1.264,1.879,1.627,2.122,1.705l0.172,0.061   l0.181,0.016c2.264,0.213,5.355-2.275,6.584-3.359c2.717-2.402,3.979-4.268,4.093-6.049l0.012-0.184L54.592,25.338z" fill="#666666"/>
-</g>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/graphics/qtg_large_tb_unmute.svg
--- a/phoneapp/phoneui2/graphics/qtg_large_tb_unmute.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<rect fill="none" fill-opacity="0.5" height="60" stroke-opacity="0.5" width="60"/>
-<path d="M40.864,23.988h-2.497v13.249c-0.005,2.054-1.696,3.747-3.752,3.752h-9.238   c-2.056-0.005-3.747-1.698-3.752-3.752V23.988h-2.497h-0.002v13.249c0.005,3.446,2.805,6.247,6.251,6.249h1.738v10.558h5.756   V43.486c0,0,2.241-0.017,2.389-0.032l-0.001-0.001c3.145-0.325,5.603-2.987,5.607-6.216V23.988H40.864z M29.42,38.579h1.283   c2.75,0,5-2.25,5-5V15.544c0-2.75-2.25-5-5-5H29.42c-2.75,0-5,2.25-5,5v18.035C24.42,36.329,26.67,38.579,29.42,38.579z" fill="#666666"/>
-</g>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/graphics/qtg_mono_answer_call.svg
--- a/phoneapp/phoneui2/graphics/qtg_mono_answer_call.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
-<defs>
-</defs>
-<g opacity="0.5">
-	<rect fill="none" width="30" height="30"/>
-</g>
-<path d="M28.578,7.523l-7.359,4.248c-0.364,0.152-0.771,0.057-0.953-0.256l-1.277-2.142c-0.002,0.002-0.006,0.007-0.007,0.008
-	c-0.001-0.001,0-0.003-0.001-0.004c-1.119,0.582-3.617,2.223-5.187,3.79c-1.632,1.635-3.149,3.394-4.417,5.576
-	c0,0-0.006,0.008-0.008,0.01c0.009,0.002,0.018,0.002,0.027,0.003l2.725,1.743c0.344,0.222,0.412,0.706,0.158,1.078L7.486,28.62
-	c-0.254,0.37-0.736,0.491-1.081,0.268c0,0-0.298-0.194-1.021-0.83c-0.001,0-0.002,0-0.003,0c-0.394-0.347-0.411-0.476-0.785-0.925
-	c-0.319-0.385-0.573-0.765-0.783-1.114c-0.001-0.001-0.004,0-0.005-0.002c-0.043-0.071-0.081-0.139-0.119-0.207
-	c-0.005-0.009-0.01-0.018-0.015-0.024c-0.391-0.698-0.56-1.211-0.56-1.211c-0.178-0.688-0.252-3.057,0.563-5.205
-	c0.52-1.364,3.24-5.672,6.42-8.854c3.181-3.182,8.125-6.349,10.3-7.005c2.176-0.656,3.903-0.556,4.417-0.374
-	c0,0,1.326,0.434,2.53,1.536c0.401,0.367,0.439,0.382,0.751,0.765c0.002,0.003,0,0.006,0.002,0.008
-	c-0.002-0.002-0.002-0.004-0.004-0.005c0.615,0.757,0.818,1.062,0.818,1.062C29.111,6.844,28.961,7.304,28.578,7.523z"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/graphics/qtg_mono_drop_call.svg
--- a/phoneapp/phoneui2/graphics/qtg_mono_drop_call.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
-<defs>
-</defs>
-<g opacity="0.5">
-	<rect fill="none" width="30" height="30"/>
-</g>
-<path d="M10.212,8.109c0.055,0.038,0.103,0.08,0.159,0.117c0.002,0.085,0.007,0.529,0.002,0.614
-	c-0.004,0.054-0.023,0.11-0.042,0.167c0.089,1.068,0.15,3.104-0.483,4.348c-0.273,0.539-0.615,1.011-1.033,1.424
-	C9.12,15.073,9.671,15.486,10.438,16h6.139c-0.073-0.132-0.162-0.251-0.228-0.389c-0.603-1.273-0.687-3.219-0.65-4.633
-	c-1.034-0.719-2.033-1.543-2.07-2.138c-0.006-0.09,0-0.523,0-0.614c0.621-0.419,1.057-0.91,1.383-1.552
-	c0.605-1.188,0.281-3.985,0.281-3.985C15.293,1.45,13.646,0,12.395,0H11.6c-1.254,0-2.902,1.45-2.902,2.689
-	c0,0-0.172,1.68,0.017,2.991C9.477,6.346,10.033,7.214,10.212,8.109z"/>
-<path d="M19.987,16.797c0.003,0.112,0.009,0.695,0.001,0.807c-0.005,0.076-0.032,0.158-0.061,0.24
-	c0.001-0.001,0.002-0.002,0.002-0.003h4.393c-0.027-0.081-0.055-0.162-0.06-0.237c-0.007-0.118-0.001-0.687,0.001-0.807
-	c0.814-0.549,1.385-1.194,1.814-2.037c0.795-1.559,0.369-5.229,0.369-5.229c0-1.626-2.16-3.53-3.805-3.53H21.6
-	c-1.645,0-3.81,1.904-3.81,3.53c0,0-0.376,3.652,0.367,5.225C18.564,15.615,19.153,16.25,19.987,16.797z"/>
-<path d="M24.677,18.443l-2.552,5.771l-2.552-5.771c-0.921,1.158-3.178,2.559-4.44,3.355l1.008,1.008l-1.891,1.891v0.461L16.092,27
-	H30v-4.594C29.778,22.114,25.947,20.043,24.677,18.443z"/>
-<path d="M7.129,14.841c-0.006-0.09,0-0.523,0-0.614c0.621-0.419,1.057-0.91,1.383-1.552c0.605-1.188,0.281-3.985,0.281-3.985
-	C8.793,7.45,7.146,6,5.895,6H5.1C3.846,6,2.197,7.45,2.197,8.689c0,0-0.287,2.783,0.279,3.981c0.311,0.654,0.76,1.139,1.395,1.556
-	c0.002,0.085,0.007,0.529,0.002,0.614C3.811,15.82,1.139,17.424,0,18.147V22h2.807l4.143-4.143l2.121,2.121l1.867-1.867
-	C9.769,17.37,7.189,15.804,7.129,14.841z"/>
-<polygon points="13.313,22.807 11.191,20.686 9.07,22.807 6.949,20.686 4.828,22.807 6.949,24.928 4.828,27.049 6.949,29.171 
-	9.07,27.05 11.191,29.171 13.313,27.049 11.191,24.928 "/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/graphics/qtg_mono_end_call.svg
--- a/phoneapp/phoneui2/graphics/qtg_mono_end_call.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
-<defs>
-</defs>
-<g opacity="0.5">
-	<rect fill="none" width="30" height="30"/>
-</g>
-<path d="M28.908,18.236l-7.671-2.057c-0.341-0.139-0.547-0.472-0.461-0.798l0.571-2.261c-0.002,0.001-0.008,0.001-0.01,0.001
-	c0.001-0.001,0.002-0.002,0.002-0.003c-1.125-0.355-3.859-0.922-5.933-0.923c-2.159,0.001-4.325,0.161-6.604,0.766
-	c0,0-0.009,0.002-0.012,0.002c0.006,0.007,0.012,0.013,0.017,0.02l0.648,2.953c0.081,0.374-0.194,0.738-0.608,0.816l-7.822,1.486
-	c-0.412,0.076-0.811-0.162-0.891-0.537c0,0-0.068-0.325-0.126-1.224c-0.001,0-0.001,0-0.001-0.002
-	c-0.031-0.489,0.042-0.586,0.092-1.13c0.043-0.466,0.126-0.885,0.219-1.254c0-0.001-0.003-0.003-0.002-0.005
-	c0.019-0.074,0.039-0.145,0.059-0.216c0.002-0.009,0.005-0.018,0.006-0.025c0.203-0.72,0.43-1.17,0.43-1.17
-	c0.338-0.572,1.855-2.187,3.813-3.068C5.867,9.05,10.514,8.001,14.718,8c4.205-0.001,9.565,1.174,11.438,2.178
-	s2.946,2.212,3.165,2.671c0,0,0.59,1.164,0.658,2.688c0.023,0.509,0.037,0.543-0.01,1.002c0,0.003-0.003,0.004-0.003,0.007
-	c0-0.003,0-0.004,0-0.007c-0.094,0.907-0.161,1.243-0.161,1.243C29.71,18.14,29.308,18.344,28.908,18.236z"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/graphics/qtg_mono_hold_call.svg
--- a/phoneapp/phoneui2/graphics/qtg_mono_hold_call.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
-<defs>
-</defs>
-<g opacity="0.5">
-	<rect fill="none" width="30" height="30"/>
-</g>
-<path d="M28.908,10.028l-7.671,2.057c-0.341,0.139-0.547,0.472-0.461,0.798l0.571,2.261c-0.002-0.001-0.008-0.001-0.01-0.001
-	c0.001,0.001,0.002,0.002,0.002,0.003c-1.125,0.355-3.859,0.922-5.933,0.923c-2.159-0.001-4.325-0.161-6.604-0.766
-	c0,0-0.009-0.002-0.012-0.002c0.006-0.007,0.012-0.013,0.017-0.02l0.648-2.953c0.081-0.374-0.194-0.738-0.608-0.816l-7.822-1.486
-	c-0.412-0.076-0.811,0.162-0.891,0.537c0,0-0.068,0.325-0.126,1.224c-0.001,0-0.001,0-0.001,0.002
-	c-0.031,0.489,0.042,0.586,0.092,1.13c0.043,0.466,0.126,0.885,0.219,1.254c0,0.001-0.003,0.003-0.002,0.005
-	c0.019,0.074,0.039,0.145,0.059,0.216c0.002,0.009,0.005,0.018,0.006,0.025c0.203,0.72,0.43,1.17,0.43,1.17
-	c0.338,0.572,1.855,2.187,3.813,3.068c1.244,0.559,5.891,1.607,10.095,1.608c4.205,0.001,9.565-1.174,11.438-2.178
-	s2.946-2.212,3.165-2.671c0,0,0.59-1.164,0.658-2.688c0.023-0.509,0.037-0.543-0.01-1.002c0-0.003-0.003-0.004-0.003-0.007
-	c0,0.003,0,0.004,0,0.007c-0.094-0.907-0.161-1.243-0.161-1.243C29.71,10.125,29.308,9.921,28.908,10.028z"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/graphics/qtg_mono_join_call.svg
--- a/phoneapp/phoneui2/graphics/qtg_mono_join_call.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
-<defs>
-</defs>
-<g opacity="0.5">
-	<rect fill="none" width="30" height="30"/>
-</g>
-<path d="M10.213,8.109c0.054,0.038,0.102,0.08,0.158,0.117c0.002,0.085,0.007,0.529,0.002,0.614
-	c-0.004,0.053-0.023,0.109-0.042,0.166c0.089,1.067,0.151,3.104-0.483,4.349c-0.273,0.539-0.615,1.011-1.033,1.424
-	c0.305,0.294,0.856,0.707,1.623,1.221h6.824c-0.354-0.427-0.67-0.879-0.912-1.389c-0.469-0.993-0.623-2.394-0.651-3.634
-	c-1.034-0.719-2.032-1.543-2.069-2.137c-0.006-0.09,0-0.523,0-0.614c0.621-0.419,1.057-0.91,1.383-1.552
-	c0.605-1.188,0.281-3.985,0.281-3.985C15.293,1.45,13.646,0,12.395,0H11.6c-1.254,0-2.902,1.45-2.902,2.689
-	c0,0-0.172,1.68,0.018,2.992C9.477,6.346,10.033,7.214,10.213,8.109z"/>
-<path d="M19.987,15.797c0.003,0.112,0.009,0.695,0.001,0.807c-0.005,0.076-0.032,0.158-0.061,0.24c0-0.001,0.002-0.002,0.002-0.003
-	h4.393c-0.027-0.081-0.055-0.162-0.06-0.237c-0.007-0.118-0.001-0.687,0.001-0.807c0.814-0.549,1.385-1.194,1.814-2.037
-	c0.795-1.559,0.369-5.229,0.369-5.229c0-1.626-2.16-3.53-3.805-3.53H21.6c-1.645,0-3.81,1.904-3.81,3.53
-	c0,0-0.376,3.652,0.367,5.225C18.564,14.615,19.153,15.25,19.987,15.797z"/>
-<path d="M24.677,17.443l-2.552,5.771l-2.551-5.771c-0.549,0.688-1.57,1.464-2.574,2.146V26h13v-4.594
-	C29.778,21.114,25.947,19.043,24.677,17.443z"/>
-<path d="M7.129,14.841c-0.006-0.09,0-0.523,0-0.614c0.621-0.419,1.057-0.91,1.383-1.552c0.605-1.188,0.281-3.985,0.281-3.985
-	C8.793,7.45,7.146,6,5.895,6H5.1C3.846,6,2.197,7.45,2.197,8.689c0,0-0.287,2.783,0.279,3.981c0.311,0.654,0.76,1.139,1.395,1.556
-	c0.002,0.085,0.007,0.529,0.002,0.614C3.811,15.82,1.139,17.425,0,18.148V22h1.454l7.665-5.078
-	C8.115,16.217,7.166,15.42,7.129,14.841z"/>
-<polygon points="11,18.075 2,23.537 11,29 11,26 15,26 15,21 11,21 "/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/graphics/qtg_mono_private_call.svg
--- a/phoneapp/phoneui2/graphics/qtg_mono_private_call.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
-<defs>
-</defs>
-<g opacity="0.5">
-	<rect fill="none" width="30" height="30"/>
-</g>
-<path d="M12.794,12.168c1.569-1.567,4.066-3.208,5.188-3.79c0,0.001,0,0.003,0,0.004c0.002-0.001,0.005-0.006,0.006-0.008
-	l1.278,2.142c0.183,0.313,0.589,0.408,0.952,0.256l7.36-4.248c0.384-0.22,0.532-0.68,0.333-1.022c0,0-0.202-0.305-0.818-1.062
-	c0.002,0.001,0.004,0.003,0.005,0.005c-0.001-0.002-0.001-0.005-0.003-0.008c-0.311-0.383-0.349-0.397-0.75-0.765
-	c-1.205-1.103-2.531-1.536-2.531-1.536c-0.513-0.182-2.24-0.282-4.416,0.374s-7.119,3.823-10.3,7.005
-	c-3.18,3.183-5.9,7.49-6.42,8.854c-0.814,2.148-0.74,4.517-0.563,5.205c0,0,0.169,0.513,0.56,1.211
-	c0.005,0.007,0.01,0.016,0.015,0.024c0.038,0.068,0.076,0.136,0.119,0.207c0.001,0.002,0.004,0.001,0.005,0.002
-	c0.21,0.35,0.464,0.729,0.783,1.114c0.374,0.449,0.392,0.578,0.785,0.925c0.001,0,0.002,0,0.003,0
-	c0.723,0.636,1.021,0.83,1.021,0.83c0.345,0.224,0.827,0.103,1.08-0.268l4.794-7.042c0.254-0.372,0.186-0.856-0.158-1.078
-	l-2.725-1.743c-0.01-0.001-0.019-0.001-0.027-0.003c0.002-0.002,0.008-0.01,0.008-0.01C9.644,15.562,11.162,13.803,12.794,12.168z"
-	/>
-<path d="M22.5,16c-3.59,0-6.5,2.91-6.5,6.5s2.91,6.5,6.5,6.5s6.5-2.91,6.5-6.5S26.09,16,22.5,16z M27,24h-9v-3h9V24z"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/graphics/qtg_mono_reject_call.svg
--- a/phoneapp/phoneui2/graphics/qtg_mono_reject_call.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
-<defs>
-</defs>
-<g opacity="0.5">
-	<rect fill="none" width="30" height="30"/>
-</g>
-<path d="M15.691,11.542c1.257-0.96,2.563-1.786,3.289-2.164c0.001,0.001,0,0.003,0.001,0.004c0.001-0.001,0.005-0.006,0.007-0.008
-	l1.277,2.142c0.183,0.313,0.589,0.408,0.953,0.256l7.359-4.248c0.383-0.22,0.533-0.68,0.334-1.022c0,0-0.203-0.305-0.818-1.062
-	c0.002,0.001,0.002,0.003,0.004,0.005c-0.002-0.002,0-0.005-0.002-0.008c-0.312-0.383-0.35-0.397-0.751-0.765
-	c-1.204-1.103-2.53-1.536-2.53-1.536c-0.514-0.182-2.241-0.282-4.417,0.374c-1.677,0.506-4.996,2.505-7.888,4.851L15.691,11.542z"/>
-<path d="M9.396,18.757c-0.01-0.001-0.019-0.001-0.027-0.003c0.002-0.002,0.008-0.01,0.008-0.01c0.652-1.125,1.375-2.136,2.143-3.077
-	l-3.205-3.205c-2.367,2.794-4.219,5.808-4.637,6.907c-0.814,2.148-0.74,4.517-0.563,5.205c0,0,0.169,0.513,0.56,1.211
-	c0.005,0.007,0.01,0.016,0.015,0.024c0.038,0.068,0.076,0.136,0.119,0.207c0.001,0.002,0.004,0.001,0.005,0.002
-	c0.21,0.35,0.464,0.729,0.783,1.114c0.374,0.449,0.392,0.578,0.785,0.925c0.001,0,0.002,0,0.003,0
-	c0.723,0.636,1.021,0.83,1.021,0.83c0.345,0.224,0.827,0.103,1.08-0.268l4.794-7.042c0.254-0.372,0.186-0.856-0.158-1.078
-	L9.396,18.757z"/>
-<rect x="13.74" y="-3.24" transform="matrix(0.7066 -0.7076 0.7076 0.7066 -6.0774 14.6889)" width="1.867" height="35.826"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/graphics/qtg_mono_replace_call.svg
--- a/phoneapp/phoneui2/graphics/qtg_mono_replace_call.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
-<defs>
-</defs>
-<g opacity="0.5">
-	<rect fill="none" width="30" height="30"/>
-</g>
-<path d="M27.578,6.523l-7.36,4.248c-0.363,0.152-0.77,0.057-0.952-0.256l-1.278-2.142c-0.001,0.002-0.004,0.007-0.006,0.008
-	c0-0.001,0-0.003,0-0.004c-1.121,0.582-3.618,2.223-5.188,3.79c-1.632,1.635-3.15,3.394-4.417,5.576c0,0-0.006,0.008-0.008,0.01
-	c0.009,0.002,0.018,0.002,0.027,0.003l2.725,1.743c0.344,0.222,0.412,0.706,0.158,1.078L6.485,27.62
-	c-0.253,0.37-0.735,0.491-1.08,0.268c0,0-0.298-0.194-1.021-0.83c-0.001,0-0.002,0-0.003,0c-0.394-0.347-0.411-0.476-0.785-0.925
-	c-0.319-0.385-0.573-0.765-0.783-1.114c-0.001-0.001-0.004,0-0.005-0.002c-0.043-0.071-0.081-0.139-0.119-0.207
-	c-0.005-0.009-0.01-0.018-0.015-0.024c-0.391-0.698-0.56-1.211-0.56-1.211c-0.178-0.688-0.252-3.057,0.563-5.205
-	c0.52-1.364,3.24-5.672,6.42-8.854c3.181-3.182,8.124-6.349,10.3-7.005s3.903-0.556,4.416-0.374c0,0,1.326,0.434,2.531,1.536
-	c0.401,0.367,0.439,0.382,0.75,0.765c0.002,0.003,0.002,0.006,0.003,0.008c-0.001-0.002-0.003-0.004-0.005-0.005
-	c0.616,0.757,0.818,1.062,0.818,1.062C28.11,5.844,27.962,6.304,27.578,6.523z"/>
-<path d="M24.001,11L18,19h1.963h2v2.522V25H20v-5h-0.037H16v4v1l0,0c0,3,2.775,5,5.5,5s5.5-2,5.5-5v-6h3L24.001,11z"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/graphics/resources.qrc
--- a/phoneapp/phoneui2/graphics/resources.qrc	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<RCC>
-    <qresource prefix="/" >   
-        <file>qtg_large_tb_silence.svg</file>
-        <file>qtg_large_tb_loudsp_mute.svg</file>
-        <file>qtg_large_tb_loudsp_unmute.svg</file>
-        <file>qtg_large_tb_dialler.svg</file>
-        <file>qtg_large_tb_mute.svg</file>
-        <file>qtg_large_tb_unmute.svg</file>
-        <file>qtg_large_tb_contacts.svg</file>
-        <file>qtg_large_tb_join.svg</file>        
-        <file>qtg_large_comp_message.svg</file>                
-        <file>qgn_indi_button_swap.svg</file>        
-        <file>qtg_mono_answer_call.svg</file>
-        <file>qtg_mono_reject_call.svg</file>
-        <file>qtg_mono_end_call.svg</file>
-        <file>qtg_mono_hold_call.svg</file>
-        <file>qtg_mono_join_call.svg</file>
-        <file>qtg_mono_private_call.svg</file>
-        <file>qtg_mono_drop_call.svg</file>
-        <file>qtg_mono_replace_call.svg</file>
-    </qresource>
-</RCC>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/inc/phoneuihousehold_p.h
--- a/phoneapp/phoneui2/inc/phoneuihousehold_p.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneui2/inc/phoneuihousehold_p.h	Fri Apr 16 14:58:25 2010 +0300
@@ -115,6 +115,9 @@
     
     PhoneUIQtViewAdapter* iViewAdapter;
     
+    //List for translators
+    QList<QTranslator*> m_translators;
+    
 };
 
 #endif
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/inc/phoneuikeyeventadapter.h
--- a/phoneapp/phoneui2/inc/phoneuikeyeventadapter.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneui2/inc/phoneuikeyeventadapter.h	Fri Apr 16 14:58:25 2010 +0300
@@ -51,8 +51,22 @@
     */
     void keyPressed (QKeyEvent *event);
     
+    /*!
+        \fn void keyReleased (QKeyEvent *event)
+    
+        This method is called when keyReleaseEvent signal
+        is emitted from view.
+    */
     void keyReleased (QKeyEvent *event);
     
+    /*!
+        \fn void endKeyLongPress()
+    
+        This method is called when end key is pressed for 0.6 seconds.
+    */
+    void endKeyLongPress();
+
+
 private:
  
     /*!
@@ -71,8 +85,8 @@
     
 private:
 
-    MPhoneKeyEventHandler &m_handler;
-    
+    MPhoneKeyEventHandler &mHandler;
+
 };
 
 #endif // PHONEUIKEYEVENTADAPTER_H
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/phoneui2.pro
--- a/phoneapp/phoneui2/phoneui2.pro	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneui2/phoneui2.pro	Fri Apr 16 14:58:25 2010 +0300
@@ -19,7 +19,7 @@
 TEMPLATE = app
 TARGET = phoneui
 CONFIG += hb svg
-RESOURCES = ./graphics/resources.qrc
+RESOURCES = ./phoneui2.qrc
 
 TRANSLATIONS = telephone.ts
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/phoneui2.qrc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneui2/phoneui2.qrc	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,21 @@
+<RCC>
+    <qresource prefix="/" >                  
+        <file>themes/icons/hbdefault/scalable/qtg_mono_swap.svg</file>        
+        <file>themes/icons/hbdefault/scalable/qtg_mono_call.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_mono_reject_call.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_mono_end_call.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_mono_hold_call.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_mono_join_call.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_mono_private_call.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_mono_drop_call.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_mono_replace_call.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_mono_send.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_mono_mic_mute.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_mono_mic_unmute.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_mono_dialer.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_mono_loudspeaker.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_mono_contacts.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_mono_mute.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_mono_mobile.svg</file>
+    </qresource>
+</RCC>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/rom/phoneui.iby
--- a/phoneapp/phoneui2/rom/phoneui.iby	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneui2/rom/phoneui.iby	Fri Apr 16 14:58:25 2010 +0300
@@ -19,8 +19,6 @@
 #ifndef __PHONEUI_IBY__
 #define __PHONEUI_IBY__
 
-#ifdef RD_PHONE_NG
-
 #include <data_caging_paths_for_iby.hrh>
 
 #define UPGRADABLE_APP_REG_RSC(NAME) data=DATAZ_\PRIVATE\10003A3F\IMPORT\APPS\ ## NAME ## _reg.rsc        Private\10003a3f\import\apps\ ## NAME ## _reg.rsc
@@ -29,7 +27,6 @@
 S60_APP_EXE(phoneui)
 UPGRADABLE_APP_REG_RSC(phoneui)
 S60_APP_AIF_RSC(phoneui)
-S60_APP_RESOURCE(phoneui)
 //S60_APP_BITMAP(phoneui)
 //S60_APP_AIF_ICONS(phoneui)
 
@@ -54,6 +51,4 @@
 data=ZSYSTEM\install\phoneuiutils_stub.sis          System\Install\phoneuiutils_stub.sis
 data=ZSYSTEM\install\phonemediatorcenter_stub.sis   System\Install\phonemediatorcenter_stub.sis
 
-#endif // RD_PHONE_NG
-
 #endif
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/rom/phoneuiresources.iby
--- a/phoneapp/phoneui2/rom/phoneuiresources.iby	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneui2/rom/phoneuiresources.iby	Fri Apr 16 14:58:25 2010 +0300
@@ -24,8 +24,8 @@
 data=DATAZ_\RESOURCE_FILES_DIR\PhoneClient.rsc RESOURCE_FILES_DIR\PhoneClient.rsc
 data=DATAZ_\RESOURCE_FILES_DIR\PhoneServer.rsc RESOURCE_FILES_DIR\PhoneServer.rsc
 
-// <-- QT PHONE START -->
-data=DATAZ_\QT_TRANSLATIONS_DIR\telephony.qm QT_TRANSLATIONS_DIR\telephony.qm
-// <-- QT PHONE END -->
+S60_APP_RESOURCE(phoneui)
+
+data=DATAZ_\QT_TRANSLATIONS_DIR\telephone.qm QT_TRANSLATIONS_DIR\telephone.qm
 
 #endif
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/src/phoneuihousehold_p.cpp
--- a/phoneapp/phoneui2/src/phoneuihousehold_p.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneui2/src/phoneuihousehold_p.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -18,17 +18,13 @@
 #include <exception> // must be before e32base.h so uncaught_exception gets defined
 #include <starterclient.h>
 #include <telinternalpskeys.h>
-// <-- QT PHONE START --> 
-//#include <activeidle2domainpskeys.h>
 #include <QLocale>
 #include <QTranslator>
-// <-- QT PHONE END --> 
 #include <telremotepartyinformationpskeys.h>
 #include <telinformationpskeys.h>
 #include <UikonInternalPSKeys.h>
 #include <startupdomainpskeys.h>
 #include <featmgr.h>        // for FeatureManager
-//#include <phoneui.hrh>
 #include <hbmainwindow.h>
 #include "phoneconstants.h"
 #include "cphonelogger.h"
@@ -41,14 +37,14 @@
 #include "phoneuikeyeventadapter.h"
 #include "phoneuicommandadapter.h"
 #include "phonenotecontroller.h"
-//#include "qtcall.h"
+#include "qtphonelog.h"
 
 PhoneUiHouseHoldPrivate::PhoneUiHouseHoldPrivate(HbMainWindow &window) :
     iAppsReady (0), iStartupSignalRecoveryId (0), iLightIdleReached (EFalse),
     iOnScreenDialer (EFalse), iQwertyHandler (0), iPhoneUIController (0),
     m_window (window)
 {
-    qDebug("phoneui - Start phoneapp");
+    PHONE_DEBUG("phoneui - Start phoneapp");
     
     TRAPD( error, ConstructL() );
     qt_symbian_throwIfError(error);
@@ -56,6 +52,13 @@
 
 PhoneUiHouseHoldPrivate::~PhoneUiHouseHoldPrivate()
 {
+    while (!m_translators.isEmpty()) {
+        QTranslator *translator = m_translators.takeFirst();
+        qApp->removeTranslator(translator);
+        delete translator;
+        translator = 0;
+    }
+    
     delete iKeyEventAdapter;
     delete iCommandAdapter;
     delete iPhoneUIController;
@@ -77,20 +80,16 @@
     {
     TBool idleReached = EFalse;
     
-// <-- QT PHONE START --> 
     // Check if Idle application has been started.
-  const TInt idleUid = 0x20022F35; /*CPhonePubSubProxy::Instance()->Value(
-            KPSUidAiInformation,
-            KActiveIdleUid );*/
-// <-- QT PHONE END --> 
-    qDebug("phoneui::DoStartupSignalIdleL() idleUID=%d", idleUid);
+    const TInt idleUid = 0x20022F35;
+    PHONE_DEBUG2("phoneui::DoStartupSignalIdleL() idleUID=", idleUid);
     
     if ( idleUid != 0 && idleUid != KErrNotFound )
         {
         // Idle application has already started
         if ( !( iAppsReady & EPhoneIdleStartedUp ) )
             {
-            qDebug("phoneui::DoStartupSignalIdleL() Idle App started ");
+            PHONE_DEBUG("phoneui::DoStartupSignalIdleL() Idle App started ");
             iAppsReady += EPhoneIdleStartedUp;
             
             // Remove Phone application from Fast Swap Window.
@@ -102,66 +101,19 @@
                 KUikVideoCallTopApp,
                 idleUid );
                 
-// <-- QT PHONE START -->             
             // hack to make sure EPhonePhase1Ok is set - to be fixed properly
             idleReached = true;
-            qDebug("phoneui::DoStartupSignalIdleL() Phone and Idle apps have both been started");    
-            CPhonePubSubProxy::Instance()->ChangePropertyValue(
-                KPSUidStartup,
-                KPSPhonePhase1Ok,
-                EPhonePhase1Ok );
-// <-- QT PHONE END -->                         
-            }
-        }
-    else
-        {
-// <-- QT PHONE START --> 
-        /*qDebug("phoneui::DoStartupSignalIdleL() NotifyChangeL(KPSUidAiInformation,KActiveIdleUid) ");
-        CPhonePubSubProxy::Instance()->NotifyChangeL(
-            KPSUidAiInformation,
-            KActiveIdleUid,
-            this );*/
-// <-- QT PHONE END --> 
-        }
-
-// <-- QT PHONE START -->
-/*    const TInt current = CPhonePubSubProxy::Instance()->Value(
-        KPSUidStartup,
-        KPSGlobalSystemState );
-
-    qDebug("phoneui::DoStartupSignalIdleL() System state=%d ", current);
-    if ( current == ESwStateSelfTestOK ||
-        current == ESwStateCriticalPhaseOK )
-        {                       
-        // Check that both the Phone and Idle applications are ready
-        idleReached = ( iAppsReady & EPhoneStartedUp ) &&
-             ( iAppsReady & EPhoneIdleStartedUp );
-
-        if ( idleReached )
-            {
-            qDebug("phoneui::DoStartupSignalIdleL() Phone and Idle apps have both been started");    
+            PHONE_DEBUG("phoneui::DoStartupSignalIdleL() Phone and Idle apps have both been started");    
             CPhonePubSubProxy::Instance()->ChangePropertyValue(
                 KPSUidStartup,
                 KPSPhonePhase1Ok,
                 EPhonePhase1Ok );
             }
         }
-    else 
-        {
-        idleReached = ( iAppsReady & EPhoneIdleStartedUp ) && 
-            ( current == ESwStateEmergencyCallsOnly ||
-            current == ESwStateNormalRfOn ||
-            current == ESwStateNormalRfOff ||
-            current == ESwStateNormalBTSap );
-
-        
-        }
-*/        
-// <-- QT PHONE END -->         
 
     if ( idleReached )
         {
-        qDebug("phoneui::DoStartupSignalIdleL() Idle reached!");
+        PHONE_DEBUG("phoneui::DoStartupSignalIdleL() Idle reached!");
         // Now err == KErrNone and it means that
         // we have succeeded in signalling.
         CPhoneRecoverySystem::Instance()->EnablePreconditionL();
@@ -174,7 +126,7 @@
         }
     else 
         {
-        qDebug("phoneui::DoStartupSignalIdleL() Idle is not reached yet!");
+        PHONE_DEBUG("phoneui::DoStartupSignalIdleL() Idle is not reached yet!");
         // Idle has not been reached yet. Indicate to the recovery
         // system that this iteration has failed so that it will
         // try again at a later time.
@@ -190,46 +142,11 @@
     return err;
     }
 
-// <-- QT PHONE START -->
 void PhoneUiHouseHoldPrivate::HandlePropertyChangedL(
         const TUid& aCategory, const TUint /*aKey*/, const TInt /*aValue*/)
 {
-    qDebug("phoneui::HandlePropertyChangedL()");
+    PHONE_DEBUG("phoneui::HandlePropertyChangedL()");
     
- 
-    /*if ( aCategory == KPSUidAiInformation )
-        {
-        // Call state event
-        if ( aKey == KActiveIdleUid )
-            {
-            
-            TInt idleUid = aValue;
-            
-            // If idle startup is ok.
-            if ( idleUid != 0 )
-                {
-                // If idle startup is ok for the first time, then recover
-                // the Start signal processing
-                if ( !( iAppsReady & EPhoneIdleStartedUp ) )
-                    {            
-                    qDebug("phoneui::HandlePropertyChangedL() Idle App started!");
-                    iAppsReady += EPhoneIdleStartedUp;
-                    // Try to update the startup signal again
-                    CPhoneRecoverySystem::Instance()->RecoverNow(
-                        iStartupSignalRecoveryId, 
-                        CTeleRecoverySystem::EPhonePriorityHigh );    
-                    // Remove Phone application from Fast Swap Window.
-//                    iPhoneViewController->SetHiddenL( ETrue );
-                    // Set Idle's UID to PubSub.
-                    CPhonePubSubProxy::Instance()->ChangePropertyValue(
-                        KPSUidUikon,
-                        KUikVideoCallTopApp,
-                        idleUid );
-                    }
-                }
-            }
-        }*/
-// <-- QT PHONE END --> 
     if ( aCategory == KPSUidStartup )
         {
         
@@ -237,7 +154,7 @@
             KPSUidStartup,
             KPSGlobalSystemState );
         
-        qDebug("phoneui::HandlePropertyChangedL() StartupState value=%d", startupState );
+        PHONE_DEBUG2("phoneui::HandlePropertyChangedL() StartupState value=%d", startupState );
        
         if ( startupState == ESwStateCriticalPhaseOK ||
             startupState == ESwStateEmergencyCallsOnly ||
@@ -245,7 +162,7 @@
             startupState == ESwStateNormalRfOff ||
             startupState == ESwStateNormalBTSap )
             {
-            qDebug("phoneui::HandlePropertyChangedL() Try to update the startup signal again..." );
+            PHONE_DEBUG("phoneui::HandlePropertyChangedL() Try to update the startup signal again..." );
             // Try to update the startup signal again
             CPhoneRecoverySystem::Instance()->RecoverNow(
                 iStartupSignalRecoveryId, 
@@ -260,13 +177,39 @@
     FeatureManager::InitializeLibL();
     
     QString locale = QLocale::system ().name ();
-    QTranslator translator;
+    QTranslator *translator = new QTranslator;
     QString path = QString("z:\\resource\\qt\\translations\\");
-    QString filename = QString("telephone_");
-    bool ret = translator.load(QString(path + filename + locale));
-	qDebug() <<"PhoneUiHouseHoldPrivate::ConstructL() translator.load:" <<ret;
-    qApp->installTranslator(&translator);
+
+    bool translatorLoaded = translator->load(QString(path + "telephone_" + locale));
+    PHONE_DEBUG2("PhoneUiHouseHoldPrivate::ConstructL() translator.load:", translatorLoaded);
+	if (translatorLoaded) {
+        qApp->installTranslator(translator);
+        m_translators.append(translator);
+	}else {
+        delete translator;
+        translator = 0;
+    }
     
+    QTranslator *translator2 = new QTranslator;
+    translatorLoaded = translator2->load(path + "telephone_cp_" + locale);
+    if (translatorLoaded) {
+        qApp->installTranslator(translator2);
+        m_translators.append(translator2);
+    } else {
+        delete translator2;
+        translator2 = 0;
+    }
+
+    QTranslator *translator3 = new QTranslator;
+    translatorLoaded = translator3->load(path + "common_" + locale);
+    if (translatorLoaded) {
+        qApp->installTranslator(translator3);
+        m_translators.append(translator3);
+    } else {
+        delete translator3;
+        translator3 = 0;
+    }
+	
     PhoneUIQtView *view = new PhoneUIQtView(m_window);
     iViewAdapter = new PhoneUIQtViewAdapter(*view);
     iPhoneUIController = CPhoneUIController::NewL(iViewAdapter);
@@ -281,6 +224,7 @@
     QObject::connect(view, SIGNAL(keyReleased(QKeyEvent *)), iViewAdapter, SLOT(keyReleased (QKeyEvent *)));
     QObject::connect(view, SIGNAL(keyPressed (QKeyEvent *)), iKeyEventAdapter, SLOT(keyPressed (QKeyEvent *)));
     QObject::connect(view, SIGNAL(keyReleased (QKeyEvent *)), iKeyEventAdapter, SLOT(keyReleased (QKeyEvent *)));
+    QObject::connect(view, SIGNAL(endKeyLongPress()), iKeyEventAdapter, SLOT(endKeyLongPress()));
     QObject::connect(view, SIGNAL(command (int)), iCommandAdapter, SLOT(handleCommand (int)),
                      Qt::QueuedConnection); // async to enable deletion of widget during signal handling
     
@@ -377,7 +321,7 @@
         KPSUidStartup,
         KPSGlobalSystemState );
 
-    qDebug("phoneui::main() startupState value=%d", startupState );
+    PHONE_DEBUG2("phoneui::main() startupState value=", startupState );
 
     if ( startupState == ESwStateCriticalPhaseOK ||
         startupState == ESwStateEmergencyCallsOnly ||
@@ -385,14 +329,14 @@
         startupState == ESwStateNormalRfOff ||
         startupState == ESwStateNormalBTSap )
         {
-        qDebug("phoneui::main() Notify Starter that phone is ready...");    
+        PHONE_DEBUG("phoneui::main() Notify Starter that phone is ready...");    
         CPhoneRecoverySystem::Instance()->RecoverNow(
             iStartupSignalRecoveryId, 
             CTeleRecoverySystem::EPhonePriorityHigh );
         }
     else
         {        
-        qDebug("phoneui::main() Startup not ready yet. Start listening...");
+        PHONE_DEBUG("phoneui::main() Startup not ready yet. Start listening...");
         CPhonePubSubProxy::Instance()->NotifyChangeL(
             KPSUidStartup,
             KPSGlobalSystemState,
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/src/phoneuikeyeventadapter.cpp
--- a/phoneapp/phoneui2/src/phoneuikeyeventadapter.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneui2/src/phoneuikeyeventadapter.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -17,14 +17,13 @@
 */
 
 #include <exception> // must be before e32base.h so uncaught_exception gets defined
+#include <qkeyevent>
 #include "phoneuikeyeventadapter.h"
 #include "phoneconstants.h"
-#include <QKeyEvent>
 
 PhoneUIKeyEventAdapter::PhoneUIKeyEventAdapter (MPhoneKeyEventHandler &keyEventHandler, QObject *parent) :
-    QObject (parent), m_handler (keyEventHandler)
+    QObject (parent), mHandler (keyEventHandler)
 {
-
 }
 
 PhoneUIKeyEventAdapter::~PhoneUIKeyEventAdapter ()
@@ -50,8 +49,7 @@
     symbianKeyEvent.iRepeats = 0;
     symbianKeyEvent.iScanCode = convertKeyCode(event);
     
-    TRAP_IGNORE(m_handler.HandleKeyEventL (symbianKeyEvent, symbianEventCode));
-    
+    TRAP_IGNORE(mHandler.HandleKeyEventL (symbianKeyEvent, symbianEventCode));  
 }
 
 int PhoneUIKeyEventAdapter::convertKeyCode(QKeyEvent *event)
@@ -75,7 +73,16 @@
             code = event->key();
             break;
         }
-
-    
+ 
     return code;
 }
+
+void PhoneUIKeyEventAdapter::endKeyLongPress()
+{
+    TKeyEvent symbianKeyEvent;
+    symbianKeyEvent.iCode = EKeyNo;
+    symbianKeyEvent.iRepeats = 0;
+    symbianKeyEvent.iScanCode = EKeyNo;
+    
+    TRAP_IGNORE(mHandler.HandleKeyEventL (symbianKeyEvent, (TEventCode)EEventLongPress));      
+}
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_call.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_call.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,9 @@
+<?xml version="1.0" ?>
+<!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1 Tiny//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd'>
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+
+<rect fill="none" height="30" width="30"/>
+
+<path d="M28.58,7.523l-7.359,4.248c-0.364,0.152-0.771,0.057-0.953-0.256l-1.277-2.142c-0.002,0.002-0.006,0.007-0.007,0.008-0.001-0.001,0-0.003-0.001-0.004-1.119,0.582-3.617,2.223-5.187,3.79-1.632,1.635-3.149,3.394-4.417,5.576,0,0-0.006,0.008-0.008,0.01,0.009,0.002,0.018,0.002,0.027,0.003l2.725,1.743c0.344,0.222,0.412,0.706,0.158,1.078l-4.794,7.05c-0.254,0.37-0.736,0.491-1.081,0.268,0,0-0.298-0.194-1.021-0.83h-0.003c-0.394-0.347-0.411-0.476-0.785-0.925-0.319-0.385-0.573-0.765-0.783-1.114-0.001-0.001-0.004,0-0.005-0.002-0.043-0.071-0.081-0.139-0.119-0.207-0.005-0.009-0.01-0.018-0.015-0.024-0.391-0.698-0.56-1.211-0.56-1.211-0.178-0.688-0.252-3.057,0.563-5.205,0.52-1.364,3.24-5.672,6.42-8.854,3.181-3.182,8.125-6.349,10.3-7.005,2.176-0.656,3.903-0.556,4.417-0.374,0,0,1.326,0.434,2.53,1.536,0.401,0.367,0.439,0.382,0.751,0.765,0.002,0.003,0,0.006,0.002,0.008-0.002-0.002-0.002-0.004-0.004-0.005,0.615,0.757,0.818,1.062,0.818,1.062,0.19,0.327,0.04,0.787-0.34,1.006z"/>
+
+</svg>
\ No newline at end of file
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_contacts.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_contacts.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="32px" version="1.1" viewBox="-3 -3 32 32" width="32px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M16.813,13.657c0.711-0.849,1.363-2.117,1.363-3.617c0-1.499-0.703-4.04-3.174-4.04c-2.469,0-3.172,2.704-3.172,4.04  c0,1.337,0.457,2.672,1.363,3.617c1.785,1.865-2.877,2.49-3.49,3.647C9.4,17.878,8.491,20,9.379,20c1.203,0,10.039,0,11.246,0  c0.875,0-0.02-2.122-0.322-2.695C19.691,16.147,15.209,15.575,16.813,13.657z"/>
+<path d="M25,0H4C3.45,0,3,0.45,3,1v3H2C0.897,4,0,4.897,0,6s0.897,2,2,2h1v3H2c-1.103,0-2,0.897-2,2s0.897,2,2,2h1v3H2  c-1.103,0-2,0.897-2,2s0.897,2,2,2h1v3c0,0.55,0.45,1,1,1h21c0.549,0,1-0.45,1-1V1C26,0.45,25.549,0,25,0z M2,7C1.45,7,1,6.55,1,6  s0.45-1,1-1h3c0.55,0,1,0.45,1,1S5.55,7,5,7H2z M2,14c-0.55,0-1-0.45-1-1s0.45-1,1-1h3c0.55,0,1,0.45,1,1s-0.45,1-1,1H2z M2,21  c-0.55,0-1-0.45-1-1s0.45-1,1-1h3c0.55,0,1,0.45,1,1s-0.45,1-1,1H2z M24,24H5v-2c1.103,0,2-0.897,2-2s-0.897-2-2-2v-3  c1.103,0,2-0.897,2-2s-0.897-2-2-2V8c1.103,0,2-0.897,2-2S6.103,4,5,4V2h19V24z"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_dialer.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_dialer.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30" version="1.1" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<rect fill="none" height="30" width="30"/>
+<path d="M0,0v30h30V0H0z M29,29H1V1h28V29z" fill="#FF0000"/>
+<polygon fill="#FF0000" points="24.344,2.415 27.584,5.655 18.242,15.001 27.585,24.346 24.346,27.585 14.999,18.238 5.655,27.585   2.415,24.346 11.76,15 2.415,5.655 5.655,2.415 15.002,11.763 "/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_drop_call.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_drop_call.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
+</g>
+<path d="M7.129,14.841c-0.006-0.09,0-0.523,0-0.614c0.621-0.419,1.057-0.91,1.383-1.552c0.605-1.188,0.281-3.985,0.281-3.985  C8.793,7.45,7.146,6,5.895,6H5.1C3.846,6,2.197,7.45,2.197,8.689c0,0-0.287,2.783,0.279,3.981c0.311,0.654,0.76,1.139,1.395,1.556  c0.002,0.085,0.007,0.529,0.002,0.614C3.795,16.056,0.2,18.233,0,18.497V22h11.5v-3.5C11.299,18.235,7.205,16.056,7.129,14.841z"/>
+<path d="M11.019,12.166l2.82-2.818c-0.124-0.181-0.2-0.352-0.21-0.507c-0.006-0.09,0-0.523,0-0.614  c0.621-0.419,1.057-0.91,1.383-1.552c0.605-1.188,0.281-3.985,0.281-3.985C15.293,1.45,13.646,0,12.395,0H11.6  c-1.254,0-2.902,1.45-2.902,2.689c0,0-0.118,1.153-0.052,2.294c1.202,0.875,2.088,2.216,2.145,3.568  c0.098,0.898,0.291,3.486-0.496,5.031c-0.215,0.422-0.468,0.806-0.762,1.156c0.403,0.321,1.018,0.747,1.815,1.261h3.505  L11.019,12.166z"/>
+<path d="M24.261,17.111c0.001-0.137,0.002-0.266,0.003-0.314c0.814-0.549,1.385-1.194,1.814-2.037  c0.795-1.559,0.369-5.229,0.369-5.229c0-1.626-2.16-3.53-3.805-3.53H21.6c-1.645,0-3.81,1.904-3.81,3.53c0,0-0.043,0.425-0.071,1.04  L24.261,17.111z"/>
+<path d="M30,22.851v-0.444c-0.079-0.104-0.616-0.434-1.328-0.884L30,22.851z"/>
+<path d="M18.411,19.559c-1.64,1.318-3.989,2.618-4.161,2.844V27h11.603L18.411,19.559z"/>
+<rect height="20.977" transform="matrix(0.7066 -0.7076 0.7076 0.7066 -6.9576 21.0662)" width="1.867" x="20.99" y="8.434"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_end_call.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_end_call.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+	<rect fill="none" width="30" height="30"/>
+</g>
+<path d="M28.908,18.236l-7.671-2.057c-0.341-0.139-0.547-0.472-0.461-0.798l0.571-2.261c-0.002,0.001-0.008,0.001-0.01,0.001
+	c0.001-0.001,0.002-0.002,0.002-0.003c-1.125-0.355-3.859-0.922-5.933-0.923c-2.159,0.001-4.325,0.161-6.604,0.766
+	c0,0-0.009,0.002-0.012,0.002c0.006,0.007,0.012,0.013,0.017,0.02l0.648,2.953c0.081,0.374-0.194,0.738-0.608,0.816l-7.822,1.486
+	c-0.412,0.076-0.811-0.162-0.891-0.537c0,0-0.068-0.325-0.126-1.224c-0.001,0-0.001,0-0.001-0.002
+	c-0.031-0.489,0.042-0.586,0.092-1.13c0.043-0.466,0.126-0.885,0.219-1.254c0-0.001-0.003-0.003-0.002-0.005
+	c0.019-0.074,0.039-0.145,0.059-0.216c0.002-0.009,0.005-0.018,0.006-0.025c0.203-0.72,0.43-1.17,0.43-1.17
+	c0.338-0.572,1.855-2.187,3.813-3.068C5.867,9.05,10.514,8.001,14.718,8c4.205-0.001,9.565,1.174,11.438,2.178
+	s2.946,2.212,3.165,2.671c0,0,0.59,1.164,0.658,2.688c0.023,0.509,0.037,0.543-0.01,1.002c0,0.003-0.003,0.004-0.003,0.007
+	c0-0.003,0-0.004,0-0.007c-0.094,0.907-0.161,1.243-0.161,1.243C29.71,18.14,29.308,18.344,28.908,18.236z"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_hold_call.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_hold_call.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+	<rect fill="none" width="30" height="30"/>
+</g>
+<path d="M28.908,10.028l-7.671,2.057c-0.341,0.139-0.547,0.472-0.461,0.798l0.571,2.261c-0.002-0.001-0.008-0.001-0.01-0.001
+	c0.001,0.001,0.002,0.002,0.002,0.003c-1.125,0.355-3.859,0.922-5.933,0.923c-2.159-0.001-4.325-0.161-6.604-0.766
+	c0,0-0.009-0.002-0.012-0.002c0.006-0.007,0.012-0.013,0.017-0.02l0.648-2.953c0.081-0.374-0.194-0.738-0.608-0.816l-7.822-1.486
+	c-0.412-0.076-0.811,0.162-0.891,0.537c0,0-0.068,0.325-0.126,1.224c-0.001,0-0.001,0-0.001,0.002
+	c-0.031,0.489,0.042,0.586,0.092,1.13c0.043,0.466,0.126,0.885,0.219,1.254c0,0.001-0.003,0.003-0.002,0.005
+	c0.019,0.074,0.039,0.145,0.059,0.216c0.002,0.009,0.005,0.018,0.006,0.025c0.203,0.72,0.43,1.17,0.43,1.17
+	c0.338,0.572,1.855,2.187,3.813,3.068c1.244,0.559,5.891,1.607,10.095,1.608c4.205,0.001,9.565-1.174,11.438-2.178
+	s2.946-2.212,3.165-2.671c0,0,0.59-1.164,0.658-2.688c0.023-0.509,0.037-0.543-0.01-1.002c0-0.003-0.003-0.004-0.003-0.007
+	c0,0.003,0,0.004,0,0.007c-0.094-0.907-0.161-1.243-0.161-1.243C29.71,10.125,29.308,9.921,28.908,10.028z"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_join_call.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_join_call.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+	<rect fill="none" width="30" height="30"/>
+</g>
+<path d="M10.213,8.109c0.054,0.038,0.102,0.08,0.158,0.117c0.002,0.085,0.007,0.529,0.002,0.614
+	c-0.004,0.053-0.023,0.109-0.042,0.166c0.089,1.067,0.151,3.104-0.483,4.349c-0.273,0.539-0.615,1.011-1.033,1.424
+	c0.305,0.294,0.856,0.707,1.623,1.221h6.824c-0.354-0.427-0.67-0.879-0.912-1.389c-0.469-0.993-0.623-2.394-0.651-3.634
+	c-1.034-0.719-2.032-1.543-2.069-2.137c-0.006-0.09,0-0.523,0-0.614c0.621-0.419,1.057-0.91,1.383-1.552
+	c0.605-1.188,0.281-3.985,0.281-3.985C15.293,1.45,13.646,0,12.395,0H11.6c-1.254,0-2.902,1.45-2.902,2.689
+	c0,0-0.172,1.68,0.018,2.992C9.477,6.346,10.033,7.214,10.213,8.109z"/>
+<path d="M19.987,15.797c0.003,0.112,0.009,0.695,0.001,0.807c-0.005,0.076-0.032,0.158-0.061,0.24c0-0.001,0.002-0.002,0.002-0.003
+	h4.393c-0.027-0.081-0.055-0.162-0.06-0.237c-0.007-0.118-0.001-0.687,0.001-0.807c0.814-0.549,1.385-1.194,1.814-2.037
+	c0.795-1.559,0.369-5.229,0.369-5.229c0-1.626-2.16-3.53-3.805-3.53H21.6c-1.645,0-3.81,1.904-3.81,3.53
+	c0,0-0.376,3.652,0.367,5.225C18.564,14.615,19.153,15.25,19.987,15.797z"/>
+<path d="M24.677,17.443l-2.552,5.771l-2.551-5.771c-0.549,0.688-1.57,1.464-2.574,2.146V26h13v-4.594
+	C29.778,21.114,25.947,19.043,24.677,17.443z"/>
+<path d="M7.129,14.841c-0.006-0.09,0-0.523,0-0.614c0.621-0.419,1.057-0.91,1.383-1.552c0.605-1.188,0.281-3.985,0.281-3.985
+	C8.793,7.45,7.146,6,5.895,6H5.1C3.846,6,2.197,7.45,2.197,8.689c0,0-0.287,2.783,0.279,3.981c0.311,0.654,0.76,1.139,1.395,1.556
+	c0.002,0.085,0.007,0.529,0.002,0.614C3.811,15.82,1.139,17.425,0,18.148V22h1.454l7.665-5.078
+	C8.115,16.217,7.166,15.42,7.129,14.841z"/>
+<polygon points="11,18.075 2,23.537 11,29 11,26 15,26 15,21 11,21 "/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_loudspeaker.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_loudspeaker.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30" version="1.1" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<rect fill="none" height="30" width="30"/>
+<path d="M0,0v30h30V0H0z M29,29H1V1h28V29z" fill="#FF0000"/>
+<polygon fill="#FF0000" points="24.344,2.415 27.584,5.655 18.242,15.001 27.585,24.346 24.346,27.585 14.999,18.238 5.655,27.585   2.415,24.346 11.76,15 2.415,5.655 5.655,2.415 15.002,11.763 "/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_mic_mute.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_mic_mute.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,15 @@
+<?xml version="1.0" ?>
+<!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1 Tiny//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd'>
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+
+<rect fill="none" height="30" width="30"/>
+
+<path d="M12.39,8.243l4.364-4.364c1.17-1.17,3.073-1.17,4.242,0l2.13,2.121c1.169,1.17,1.169,3.073,0,4.243l-4.363,4.363,1.414,1.414,4.363-4.363c1.953-1.953,1.953-5.118,0-7.071l-2.121-2.121c-1.953-1.953-5.119-1.953-7.071,0l-4.364,4.364,1.41,1.421z"/>
+
+<path d="M17,12.5c0-1.93-1.57-3.5-3.5-3.5-0.109,0-0.212,0.021-0.318,0.032l3.786,3.785c0.01-0.11,0.03-0.21,0.03-0.32z"/>
+
+<path d="M20,26h-5v-4.808l1.023-1.022-9.19-9.19-1.387,1.388c-0.791,0.791-1.245,1.782-1.396,2.81l-0.019,0.019,0.016,0.016c-0.209,1.499,0.245,3.074,1.398,4.228l2.121,2.121c1.153,1.153,2.728,1.607,4.227,1.398l0.016,0.016,0.019-0.019c0.059-0.009,0.117-0.007,0.175-0.017v3.05h-5c-0.553,0-1,0.447-1,1v2h15v-2c0-0.55-0.45-1-1-1z"/>
+
+<rect height="35.83" transform="matrix(0.7066 -0.7076 0.7076 0.7066 -6.1479 14.8607)" width="1.867" x="13.91" y="-3.069"/>
+
+</svg>
\ No newline at end of file
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_mic_unmute.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_mic_unmute.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,9 @@
+<?xml version="1.0" ?>
+<!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1 Tiny//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd'>
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+
+<rect fill="none" height="30" width="30"/>
+
+<path d="M24.56,4.586l-2.121-2.121c-1.953-1.953-5.119-1.953-7.071,0l-4.95,4.95-1.42-1.415-2.121,2.121,1.414,1.415-2.828,2.828c-0.791,0.791-1.245,1.782-1.396,2.81l-0.019,0.019,0.016,0.016c-0.209,1.499,0.245,3.074,1.398,4.228l2.121,2.121c1.153,1.153,2.728,1.607,4.227,1.398l0.016,0.016,0.019-0.019c0.059-0.009,0.117-0.007,0.175-0.017v3.06h-5c-0.553,0-1,0.447-1,1v2h15v-2c0-0.553-0.447-1-1-1h-5v-4.808l2.464-2.464,1.414,1.414,2.121-2.121-1.414-1.414,4.95-4.95c1.96-1.956,1.96-5.121,0.01-7.074zm-11.04,9.914c-1.104,0-2-0.896-2-2s0.896-2,2-2,2,0.896,2,2-0.89,2-2,2zm9.62-4.26l-4.95,4.95-1.419-1.42c0.155-0.396,0.248-0.823,0.248-1.273,0-1.93-1.57-3.5-3.5-3.5-0.45,0-0.878,0.093-1.273,0.248l-0.42-0.419,4.95-4.95c1.17-1.17,3.073-1.17,4.242,0l2.12,2.121c1.17,1.17,1.17,3.073,0,4.24z"/>
+
+</svg>
\ No newline at end of file
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_mobile.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_mobile.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="32px" version="1.1" viewBox="-7 -3 32 32" width="32px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M17,0H1C0.449,0,0,0.45,0,1v24c0,0.55,0.449,1,1,1h16c0.549,0,1-0.45,1-1V1C18,0.45,17.549,0,17,0z M4,23H3  c-0.551,0-1-0.45-1-1s0.449-1,1-1h1c0.549,0,1,0.45,1,1S4.549,23,4,23z M11,23c0,0.55-0.451,1-1,1H8c-0.551,0-1-0.45-1-1v-2  c0-0.55,0.449-1,1-1h2c0.549,0,1,0.45,1,1V23z M15,23h-1c-0.551,0-1-0.45-1-1s0.449-1,1-1h1c0.549,0,1,0.45,1,1S15.549,23,15,23z   M16,18H2V2h14V18z"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_mute.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_mute.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 40 40" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="40" width="40"/>
+<rect height="12" width="7" x="6.483" y="15.48"/>
+<polygon points="26.483,18.679 26.483,7.48 19.393,11.588 "/>
+<polygon points="14.483,14.976 14.483,28.481 26.483,35.481 26.483,26.975 "/>
+<rect height="44.313" transform="matrix(0.7061 -0.7082 0.7082 0.7061 -6.8584 21.7822)" width="1.867" x="21.876" y="-3.004"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_private_call.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_private_call.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
+</g>
+<path d="M7.129,15.841c-0.006-0.09,0-0.523,0-0.614c0.621-0.419,1.057-0.91,1.383-1.552c0.605-1.188,0.281-3.985,0.281-3.985  C8.793,8.45,7.146,7,5.895,7H5.1C3.846,7,2.197,8.45,2.197,9.689c0,0-0.287,2.783,0.279,3.981c0.311,0.654,0.76,1.139,1.395,1.556  c0.002,0.085,0.007,0.529,0.002,0.614C3.795,17.056,0.2,19.233,0,19.497V23h11.5v-3.5C11.299,19.235,7.205,17.056,7.129,15.841z"/>
+<path d="M16.35,16.611c-0.603-1.273-0.687-3.219-0.65-4.633c-1.034-0.719-2.033-1.543-2.07-2.138c-0.006-0.09,0-0.523,0-0.614  c0.621-0.419,1.057-0.91,1.383-1.552c0.605-1.188,0.281-3.985,0.281-3.985C15.293,2.45,13.646,1,12.395,1H11.6  c-1.254,0-2.902,1.45-2.902,2.689c0,0-0.118,1.153-0.052,2.294c1.202,0.875,2.088,2.216,2.145,3.568  c0.098,0.898,0.291,3.486-0.496,5.031c-0.215,0.422-0.468,0.806-0.762,1.156c0.403,0.321,1.018,0.747,1.815,1.261h5.229  C16.504,16.868,16.415,16.749,16.35,16.611z"/>
+<path d="M26.447,10.53c0-0.746-0.465-1.543-1.115-2.195l-7.244,7.245c0.022,0.059,0.044,0.121,0.069,0.175  c0.361,0.764,0.877,1.345,1.569,1.85l6.752-6.752C26.461,10.651,26.447,10.53,26.447,10.53z"/>
+<path d="M24.263,18.604c-0.007-0.118-0.001-0.687,0.001-0.807c0.814-0.549,1.385-1.194,1.814-2.037  c0.297-0.583,0.424-1.461,0.466-2.332L14.25,25.722V28h1.386l8.84-8.84C24.355,18.964,24.273,18.775,24.263,18.604z"/>
+<path d="M23.765,7.263C23.385,7.104,23.001,7,22.643,7H21.6c-1.645,0-3.81,1.904-3.81,3.53c0,0-0.14,1.365-0.079,2.785L23.765,7.263  z"/>
+<path d="M25.771,20.505L18.276,28h3.665l5.967-5.968C27.198,21.57,26.427,21.039,25.771,20.505z"/>
+<path d="M30,23.406c-0.042-0.055-0.223-0.179-0.479-0.346L24.581,28h3.665L30,26.246V23.406z"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_reject_call.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_reject_call.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+	<rect fill="none" width="30" height="30"/>
+</g>
+<path d="M15.691,11.542c1.257-0.96,2.563-1.786,3.289-2.164c0.001,0.001,0,0.003,0.001,0.004c0.001-0.001,0.005-0.006,0.007-0.008
+	l1.277,2.142c0.183,0.313,0.589,0.408,0.953,0.256l7.359-4.248c0.383-0.22,0.533-0.68,0.334-1.022c0,0-0.203-0.305-0.818-1.062
+	c0.002,0.001,0.002,0.003,0.004,0.005c-0.002-0.002,0-0.005-0.002-0.008c-0.312-0.383-0.35-0.397-0.751-0.765
+	c-1.204-1.103-2.53-1.536-2.53-1.536c-0.514-0.182-2.241-0.282-4.417,0.374c-1.677,0.506-4.996,2.505-7.888,4.851L15.691,11.542z"/>
+<path d="M9.396,18.757c-0.01-0.001-0.019-0.001-0.027-0.003c0.002-0.002,0.008-0.01,0.008-0.01c0.652-1.125,1.375-2.136,2.143-3.077
+	l-3.205-3.205c-2.367,2.794-4.219,5.808-4.637,6.907c-0.814,2.148-0.74,4.517-0.563,5.205c0,0,0.169,0.513,0.56,1.211
+	c0.005,0.007,0.01,0.016,0.015,0.024c0.038,0.068,0.076,0.136,0.119,0.207c0.001,0.002,0.004,0.001,0.005,0.002
+	c0.21,0.35,0.464,0.729,0.783,1.114c0.374,0.449,0.392,0.578,0.785,0.925c0.001,0,0.002,0,0.003,0
+	c0.723,0.636,1.021,0.83,1.021,0.83c0.345,0.224,0.827,0.103,1.08-0.268l4.794-7.042c0.254-0.372,0.186-0.856-0.158-1.078
+	L9.396,18.757z"/>
+<rect x="13.74" y="-3.24" transform="matrix(0.7066 -0.7076 0.7076 0.7066 -6.0774 14.6889)" width="1.867" height="35.826"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_replace_call.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_replace_call.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+	<rect fill="none" width="30" height="30"/>
+</g>
+<path d="M27.578,6.523l-7.36,4.248c-0.363,0.152-0.77,0.057-0.952-0.256l-1.278-2.142c-0.001,0.002-0.004,0.007-0.006,0.008
+	c0-0.001,0-0.003,0-0.004c-1.121,0.582-3.618,2.223-5.188,3.79c-1.632,1.635-3.15,3.394-4.417,5.576c0,0-0.006,0.008-0.008,0.01
+	c0.009,0.002,0.018,0.002,0.027,0.003l2.725,1.743c0.344,0.222,0.412,0.706,0.158,1.078L6.485,27.62
+	c-0.253,0.37-0.735,0.491-1.08,0.268c0,0-0.298-0.194-1.021-0.83c-0.001,0-0.002,0-0.003,0c-0.394-0.347-0.411-0.476-0.785-0.925
+	c-0.319-0.385-0.573-0.765-0.783-1.114c-0.001-0.001-0.004,0-0.005-0.002c-0.043-0.071-0.081-0.139-0.119-0.207
+	c-0.005-0.009-0.01-0.018-0.015-0.024c-0.391-0.698-0.56-1.211-0.56-1.211c-0.178-0.688-0.252-3.057,0.563-5.205
+	c0.52-1.364,3.24-5.672,6.42-8.854c3.181-3.182,8.124-6.349,10.3-7.005s3.903-0.556,4.416-0.374c0,0,1.326,0.434,2.531,1.536
+	c0.401,0.367,0.439,0.382,0.75,0.765c0.002,0.003,0.002,0.006,0.003,0.008c-0.001-0.002-0.003-0.004-0.005-0.005
+	c0.616,0.757,0.818,1.062,0.818,1.062C28.11,5.844,27.962,6.304,27.578,6.523z"/>
+<path d="M24.001,11L18,19h1.963h2v2.522V25H20v-5h-0.037H16v4v1l0,0c0,3,2.775,5,5.5,5s5.5-2,5.5-5v-6h3L24.001,11z"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_send.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_send.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="32px" version="1.1" viewBox="0 -7 32 32" width="32px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<polygon points="1,6 1.5,8 5,8 5,6 "/>
+<polygon points="2,10 2.5,12 5,12 5,10 "/>
+<polygon points="0,2 0.5,4 5,4 5,2 "/>
+<path d="M31,0H7C6.449,0,6,0.45,6,1v17c0,0.55,0.449,1,1,1h24c0.549,0,1-0.45,1-1V1C32,0.45,31.549,0,31,0z M19,12.146l3.447-1.991  L29.293,17H8.707l6.846-6.846L19,12.146z M23.344,9.637L30,5.794v10.499L23.344,9.637z M8,2h22v1.484L19,9.836L8,3.484V2z   M14.656,9.637L8,16.293V5.794L14.656,9.637z"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_swap.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneui2/themes/icons/hbdefault/scalable/qtg_mono_swap.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30" version="1.1" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<rect fill="none" height="30" width="30"/>
+<path d="M0,0v30h30V0H0z M29,29H1V1h28V29z" fill="#FF0000"/>
+<polygon fill="#FF0000" points="24.344,2.415 27.584,5.655 18.242,15.001 27.585,24.346 24.346,27.585 14.999,18.238 5.655,27.585   2.415,24.346 11.76,15 2.415,5.655 5.655,2.415 15.002,11.763 "/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/tsrc/ut_phoneuikeyeventadapter/cphoneuicontroller_stub.cpp
--- a/phoneapp/phoneui2/tsrc/ut_phoneuikeyeventadapter/cphoneuicontroller_stub.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneui2/tsrc/ut_phoneuikeyeventadapter/cphoneuicontroller_stub.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -18,6 +18,7 @@
 // INCLUDE FILES
 
 #include "CPhoneUIController_Stub.h"
+#include "phoneconstants.h"
 
 int m_scan_code;
 int m_code;
@@ -25,6 +26,7 @@
 int m_code_down;
 int m_repeats;
 bool m_leave;
+TEventCode m_eventCode;
 
 
 // ================= MEMBER FUNCTIONS =======================
@@ -36,9 +38,9 @@
 // -----------------------------------------------------------
 //
 CPhoneUIController_Stub::CPhoneUIController_Stub()  
-    {
+{
     m_leave = false;	
-    }
+}
 
 
 
@@ -48,9 +50,8 @@
 // -----------------------------------------------------------
 
 CPhoneUIController_Stub::~CPhoneUIController_Stub()
-    {
-
-    }
+{
+}
 
 
 
@@ -61,32 +62,32 @@
 TKeyResponse CPhoneUIController_Stub::HandleKeyEventL(
     const TKeyEvent& aKeyEvent,
     TEventCode aEventCode )
-    {
+{
     m_scan_code = 0;
     m_code = 0;
     m_scan_code_down = 0;
     m_code_down = 0;
+    m_eventCode = aEventCode;
     
-    if (m_leave)
-        {
+    if (m_leave) {
         User::Leave(KErrArgument);
-        }
+    }
         
     m_repeats = aKeyEvent.iRepeats;
     
-    if ( EEventKeyUp == aEventCode )
-        {
+    if(EEventKeyUp == aEventCode) {
         m_scan_code = aKeyEvent.iScanCode;
         m_code = aKeyEvent.iCode;
-        }
-    else if ( EEventKey == aEventCode )
-        {
+    } else if(EEventKey == aEventCode) {
         m_scan_code_down = aKeyEvent.iScanCode;
         m_code_down = aKeyEvent.iCode;       	
-        }
+    } else if(EEventLongPress) {
+        m_scan_code = aKeyEvent.iScanCode;
+        m_code = aKeyEvent.iCode;
+    }
     
     return EKeyWasNotConsumed;
-    }
+}
 
 
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/tsrc/ut_phoneuikeyeventadapter/cphoneuicontroller_stub.h
--- a/phoneapp/phoneui2/tsrc/ut_phoneuikeyeventadapter/cphoneuicontroller_stub.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneui2/tsrc/ut_phoneuikeyeventadapter/cphoneuicontroller_stub.h	Fri Apr 16 14:58:25 2010 +0300
@@ -32,6 +32,7 @@
 extern int m_code_down;
 extern int m_repeats;
 extern bool m_leave;
+extern TEventCode m_eventCode;
 
 // FORWARD DECLARATIONS
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneui2/tsrc/ut_phoneuikeyeventadapter/unit_tests.cpp
--- a/phoneapp/phoneui2/tsrc/ut_phoneuikeyeventadapter/unit_tests.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneui2/tsrc/ut_phoneuikeyeventadapter/unit_tests.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -59,10 +59,11 @@
     void cleanup ();
     
 private slots:
-    void testKeyPressEvents ();
-    void testKeyReleaseEvents ();
-    void testKeyPressEventsByQtKeys ();
-    void testLeave ();
+    void testKeyPressEvents();
+    void testKeyReleaseEvents();
+    void testKeyPressEventsByQtKeys();
+    void testLeave();
+    void testEndKeyLongPress();
 
 
 
@@ -200,5 +201,14 @@
     delete keyEvent;
 }
 
+void TestPhoneKeyEventAdapter::testEndKeyLongPress()
+{
+    m_keyadapter->endKeyLongPress();
+    QCOMPARE((int)m_eventCode, EEventLongPress);
+    QCOMPARE(m_scan_code, (int)EKeyNo);
+    QCOMPARE(m_code, (int)EKeyNo);
+    QCOMPARE(m_repeats, 0);
+}
+
 PHONE_QT_TEST_MAIN(TestPhoneKeyEventAdapter)
 #include "unit_tests.moc"
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuicontrol/bwins/phoneuicontrolu.def
--- a/phoneapp/phoneuicontrol/bwins/phoneuicontrolu.def	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuicontrol/bwins/phoneuicontrolu.def	Fri Apr 16 14:58:25 2010 +0300
@@ -213,24 +213,26 @@
 	?UpdateRemoteInfoDataL@CPhoneState@@IAEXH@Z @ 212 NONAME ; void CPhoneState::UpdateRemoteInfoDataL(int)
 	?GetRingingCallL@CPhoneStateInCall@@MAEHXZ @ 213 NONAME ; int CPhoneStateInCall::GetRingingCallL(void)
 	?HandleIdleForegroundEventL@CPhoneUIController@@UAEXXZ @ 214 NONAME ; void CPhoneUIController::HandleIdleForegroundEventL(void)
-	?HandlePhoneForegroundEventL@CPhoneState@@UAEXXZ @ 215 NONAME ; void CPhoneState::HandlePhoneForegroundEventL(void)
-	?HandleForegroundEventL@CPhoneState@@UAEXH@Z @ 216 NONAME ; void CPhoneState::HandleForegroundEventL(int)
-	?DisplayIncomingCallL@CPhoneStateIdle@@IAEXH@Z @ 217 NONAME ; void CPhoneStateIdle::DisplayIncomingCallL(int)
-	?HandleRemConCommandL@CPhoneState@@UAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 218 NONAME ; int CPhoneState::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction)
-	??1CPhoneStateIdle@@UAE@XZ @ 219 NONAME ; CPhoneStateIdle::~CPhoneStateIdle(void)
-	?PhoneNumberFromEntryLC@CPhoneState@@IAEPAVHBufC16@@XZ @ 220 NONAME ; class HBufC16 * CPhoneState::PhoneNumberFromEntryLC(void)
-	?BaseConstructL@CPhoneState@@QAEXXZ @ 221 NONAME ; void CPhoneState::BaseConstructL(void)
-	?HandlePhoneStartupL@CPhoneUIController@@UAEXXZ @ 222 NONAME ; void CPhoneUIController::HandlePhoneStartupL(void)
-	?SpeedDialL@CPhoneStateIdle@@IAEXABIW4TDialInitiationMethod@1@@Z @ 223 NONAME ; void CPhoneStateIdle::SpeedDialL(unsigned int const &, enum CPhoneStateIdle::TDialInitiationMethod)
-	?SetCallHeaderType@CPhoneState@@IAEXH@Z @ 224 NONAME ; void CPhoneState::SetCallHeaderType(int)
-	?SetTouchPaneButtonEnabled@CPhoneState@@IAEXH@Z @ 225 NONAME ; void CPhoneState::SetTouchPaneButtonEnabled(int)
-	?SetPhoneEngine@CPhoneStateMachine@@UAEXPAVMPEPhoneModel@@@Z @ 226 NONAME ; void CPhoneStateMachine::SetPhoneEngine(class MPEPhoneModel *)
-	?SpeedDialCanceledL@CPhoneStateIdle@@IAEXABI@Z @ 227 NONAME ; void CPhoneStateIdle::SpeedDialCanceledL(unsigned int const &)
-	?CloseDTMFEditorL@CPhoneState@@IAEXXZ @ 228 NONAME ; void CPhoneState::CloseDTMFEditorL(void)
-	?SetTouchPaneVisible@CPhoneState@@IAEXH@Z @ 229 NONAME ; void CPhoneState::SetTouchPaneVisible(int)
-	?HandlePhoneFocusLostEventL@CPhoneUIController@@UAEXXZ @ 230 NONAME ; void CPhoneUIController::HandlePhoneFocusLostEventL(void)
-	?HandleKeyLockEnabled@CPhoneStateIncoming@@UAEXH@Z @ 231 NONAME ; void CPhoneStateIncoming::HandleKeyLockEnabled(int)
-	??0CPhoneStateMachine@@IAE@PAVMPhoneViewCommandHandle@@@Z @ 232 NONAME ; CPhoneStateMachine::CPhoneStateMachine(class MPhoneViewCommandHandle *)
-	??1CPhoneStateStartup@@UAE@XZ @ 233 NONAME ; CPhoneStateStartup::~CPhoneStateStartup(void)
-	?HandleKeyMessageL@CPhoneState@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 234 NONAME ; void CPhoneState::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
+	?SetBackButtonActive@CPhoneState@@IAEXH@Z @ 215 NONAME ; void CPhoneState::SetBackButtonActive(int)
+	?HandlePhoneForegroundEventL@CPhoneState@@UAEXXZ @ 216 NONAME ; void CPhoneState::HandlePhoneForegroundEventL(void)
+	?HandleForegroundEventL@CPhoneState@@UAEXH@Z @ 217 NONAME ; void CPhoneState::HandleForegroundEventL(int)
+	?DisplayIncomingCallL@CPhoneStateIdle@@IAEXH@Z @ 218 NONAME ; void CPhoneStateIdle::DisplayIncomingCallL(int)
+	?HandleRemConCommandL@CPhoneState@@UAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 219 NONAME ; int CPhoneState::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction)
+	??1CPhoneStateIdle@@UAE@XZ @ 220 NONAME ; CPhoneStateIdle::~CPhoneStateIdle(void)
+	?PhoneNumberFromEntryLC@CPhoneState@@IAEPAVHBufC16@@XZ @ 221 NONAME ; class HBufC16 * CPhoneState::PhoneNumberFromEntryLC(void)
+	?BaseConstructL@CPhoneState@@QAEXXZ @ 222 NONAME ; void CPhoneState::BaseConstructL(void)
+	?HandlePhoneStartupL@CPhoneUIController@@UAEXXZ @ 223 NONAME ; void CPhoneUIController::HandlePhoneStartupL(void)
+	?SpeedDialL@CPhoneStateIdle@@IAEXABIW4TDialInitiationMethod@1@@Z @ 224 NONAME ; void CPhoneStateIdle::SpeedDialL(unsigned int const &, enum CPhoneStateIdle::TDialInitiationMethod)
+	?SetCallHeaderType@CPhoneState@@IAEXH@Z @ 225 NONAME ; void CPhoneState::SetCallHeaderType(int)
+	?SetTouchPaneButtonEnabled@CPhoneState@@IAEXH@Z @ 226 NONAME ; void CPhoneState::SetTouchPaneButtonEnabled(int)
+	?SetPhoneEngine@CPhoneStateMachine@@UAEXPAVMPEPhoneModel@@@Z @ 227 NONAME ; void CPhoneStateMachine::SetPhoneEngine(class MPEPhoneModel *)
+	?SpeedDialCanceledL@CPhoneStateIdle@@IAEXABI@Z @ 228 NONAME ; void CPhoneStateIdle::SpeedDialCanceledL(unsigned int const &)
+	?CloseDTMFEditorL@CPhoneState@@IAEXXZ @ 229 NONAME ; void CPhoneState::CloseDTMFEditorL(void)
+	?SetTouchPaneVisible@CPhoneState@@IAEXH@Z @ 230 NONAME ; void CPhoneState::SetTouchPaneVisible(int)
+	?HandlePhoneFocusLostEventL@CPhoneUIController@@UAEXXZ @ 231 NONAME ; void CPhoneUIController::HandlePhoneFocusLostEventL(void)
+	?HandleKeyLockEnabled@CPhoneStateIncoming@@UAEXH@Z @ 232 NONAME ; void CPhoneStateIncoming::HandleKeyLockEnabled(int)
+	??0CPhoneStateMachine@@IAE@PAVMPhoneViewCommandHandle@@@Z @ 233 NONAME ; CPhoneStateMachine::CPhoneStateMachine(class MPhoneViewCommandHandle *)
+	??1CPhoneStateStartup@@UAE@XZ @ 234 NONAME ; CPhoneStateStartup::~CPhoneStateStartup(void)
+	?HandleKeyMessageL@CPhoneState@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 235 NONAME ; void CPhoneState::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
+	?OpenSoftRejectMessageEditorL@CPhoneState@@MAEXXZ @ 236 NONAME ; void CPhoneState::OpenSoftRejectMessageEditorL(void)
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuicontrol/eabi/phoneuicontrolu.def
--- a/phoneapp/phoneuicontrol/eabi/phoneuicontrolu.def	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuicontrol/eabi/phoneuicontrolu.def	Fri Apr 16 14:58:25 2010 +0300
@@ -41,432 +41,434 @@
 	_ZN11CPhoneState19HandlePhoneStartupLEv @ 40 NONAME
 	_ZN11CPhoneState19SendGlobalInfoNoteLEi @ 41 NONAME
 	_ZN11CPhoneState19SetBTHandsfreeModeLEi @ 42 NONAME
-	_ZN11CPhoneState19SetDivertIndicationEi @ 43 NONAME
-	_ZN11CPhoneState19SetTouchPaneButtonsEi @ 44 NONAME
-	_ZN11CPhoneState19SetTouchPaneVisibleEi @ 45 NONAME
-	_ZN11CPhoneState19ShowNumberBusyNoteLEv @ 46 NONAME
-	_ZN11CPhoneState20CallFromNumberEntryLEv @ 47 NONAME
-	_ZN11CPhoneState20DecreaseAudioVolumeLEv @ 48 NONAME
-	_ZN11CPhoneState20HandleDisconnectingLEi @ 49 NONAME
-	_ZN11CPhoneState20HandleKeyLockEnabledEi @ 50 NONAME
-	_ZN11CPhoneState20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 51 NONAME
-	_ZN11CPhoneState20IncreaseAudioVolumeLEv @ 52 NONAME
-	_ZN11CPhoneState20SendGlobalErrorNoteLEi @ 53 NONAME
-	_ZN11CPhoneState21IsNumberEntryVisibleLEv @ 54 NONAME
-	_ZN11CPhoneState21UpdateRemoteInfoDataLEi @ 55 NONAME
-	_ZN11CPhoneState22CloseCustomizedDialerLEv @ 56 NONAME
-	_ZN11CPhoneState22DeleteTouchPaneButtonsEv @ 57 NONAME
-	_ZN11CPhoneState22HandleForegroundEventLEi @ 58 NONAME
-	_ZN11CPhoneState22HandleNumericKeyEventLERK9TKeyEvent10TEventCode @ 59 NONAME
-	_ZN11CPhoneState22HandlePropertyChangedLERK4TUidji @ 60 NONAME
-	_ZN11CPhoneState22OnlyHashInNumberEntryLEv @ 61 NONAME
-	_ZN11CPhoneState22PhoneNumberFromEntryLCEv @ 62 NONAME
-	_ZN11CPhoneState22SendGlobalWarningNoteLEi @ 63 NONAME
-	_ZN11CPhoneState22StartShowSecurityNoteLEv @ 64 NONAME
-	_ZN11CPhoneState23HandleAudioMuteChangedLEv @ 65 NONAME
-	_ZN11CPhoneState23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 66 NONAME
-	_ZN11CPhoneState23HandleNumberEntryEditedEv @ 67 NONAME
-	_ZN11CPhoneState23SetRingingTonePlaybackLEi @ 68 NONAME
-	_ZN11CPhoneState23UpdateSingleActiveCallLEi @ 69 NONAME
-	_ZN11CPhoneState24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 70 NONAME
-	_ZN11CPhoneState24HandleEnvironmentChangeLEi @ 71 NONAME
-	_ZN11CPhoneState24StartAlsLineChangeTimerLEv @ 72 NONAME
-	_ZN11CPhoneState24StoreNumberEntryContentLEv @ 73 NONAME
-	_ZN11CPhoneState24UpdateInCallContextMenuLEv @ 74 NONAME
-	_ZN11CPhoneState25HandleAudioOutputChangedLEv @ 75 NONAME
-	_ZN11CPhoneState25HandleNumberEntryClearedLEv @ 76 NONAME
-	_ZN11CPhoneState25HandlePhoneEngineMessageLEii @ 77 NONAME
-	_ZN11CPhoneState25SetNumberEntryVisibilityLEi @ 78 NONAME
-	_ZN11CPhoneState25SetTouchPaneButtonEnabledEi @ 79 NONAME
-	_ZN11CPhoneState26HandleIdleForegroundEventLEv @ 80 NONAME
-	_ZN11CPhoneState26HandlePhoneFocusLostEventLEv @ 81 NONAME
-	_ZN11CPhoneState26IsNumberEntryContentStoredEv @ 82 NONAME
-	_ZN11CPhoneState26RestoreNumberEntryContentLEv @ 83 NONAME
-	_ZN11CPhoneState26SetTouchPaneButtonDisabledEi @ 84 NONAME
-	_ZN11CPhoneState26UpdateIncomingContextMenuLEi @ 85 NONAME
-	_ZN11CPhoneState26UpdateSilenceButtonDimmingEv @ 86 NONAME
-	_ZN11CPhoneState27DisplayCallTerminationNoteLEv @ 87 NONAME
-	_ZN11CPhoneState27HandlePhoneForegroundEventLEv @ 88 NONAME
-	_ZN11CPhoneState27RetainPreviousKeylockStateLEv @ 89 NONAME
-	_ZN11CPhoneState28CheckDisableHWKeysAndCallUILEv @ 90 NONAME
-	_ZN11CPhoneState28ClearNumberEntryContentCacheEv @ 91 NONAME
-	_ZN11CPhoneState28SetupIdleScreenInBackgroundLEv @ 92 NONAME
-	_ZN11CPhoneState29DisplayHeaderForCallComingInLEii @ 93 NONAME
-	_ZN11CPhoneState29DisplayHeaderForOutgoingCallLEi @ 94 NONAME
-	_ZN11CPhoneState30CheckIfShowCallTerminationNoteEv @ 95 NONAME
-	_ZN11CPhoneState30CustomizedDialerCbaResourceIdLEv @ 96 NONAME
-	_ZN11CPhoneState31CustomizedDialerMenuResourceIdLEv @ 97 NONAME
-	_ZN11CPhoneState34CaptureKeysDuringCallNotificationLEi @ 98 NONAME
-	_ZN11CPhoneState34SetCallHeaderTextsForCallComingInLEiiP28TPhoneCmdParamCallHeaderData @ 99 NONAME
-	_ZN11CPhoneState34SetToolbarButtonLoudspeakerEnabledEv @ 100 NONAME
-	_ZN11CPhoneState35IsAlphanumericSupportedAndCharInputERK9TKeyEvent @ 101 NONAME
-	_ZN11CPhoneState38CheckIfRestoreNEContentAfterDtmfDialerEv @ 102 NONAME
-	_ZN11CPhoneState43IsSimStateNotPresentWithSecurityModeEnabledEv @ 103 NONAME
-	_ZN11CPhoneState7IsSimOkEv @ 104 NONAME
-	_ZN11CPhoneState9ShowNoteLEi @ 105 NONAME
-	_ZN11CPhoneStateC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 106 NONAME
-	_ZN11CPhoneStateC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 107 NONAME
-	_ZN11CPhoneStateD0Ev @ 108 NONAME
-	_ZN11CPhoneStateD1Ev @ 109 NONAME
-	_ZN11CPhoneStateD2Ev @ 110 NONAME
-	_ZN15CPhoneStateIdle10ConstructLEv @ 111 NONAME
-	_ZN15CPhoneStateIdle10SpeedDialLERKjNS_21TDialInitiationMethodE @ 112 NONAME
-	_ZN15CPhoneStateIdle14DialVoiceCallLEv @ 113 NONAME
-	_ZN15CPhoneStateIdle14HandleCommandLEi @ 114 NONAME
-	_ZN15CPhoneStateIdle14HandleDialingLEi @ 115 NONAME
-	_ZN15CPhoneStateIdle15HandleKeyEventLERK9TKeyEvent10TEventCode @ 116 NONAME
-	_ZN15CPhoneStateIdle15ProcessCommandLEi @ 117 NONAME
-	_ZN15CPhoneStateIdle17DisplayCallSetupLEi @ 118 NONAME
-	_ZN15CPhoneStateIdle17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 119 NONAME
-	_ZN15CPhoneStateIdle18HandleSendCommandLEv @ 120 NONAME
-	_ZN15CPhoneStateIdle18SpeedDialCanceledLERKj @ 121 NONAME
-	_ZN15CPhoneStateIdle19DialMultimediaCallLEv @ 122 NONAME
-	_ZN15CPhoneStateIdle20DisplayIncomingCallLEi @ 123 NONAME
-	_ZN15CPhoneStateIdle20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 124 NONAME
-	_ZN15CPhoneStateIdle22OnlyHashInNumberEntryLEv @ 125 NONAME
-	_ZN15CPhoneStateIdle25HandleNumberEntryClearedLEv @ 126 NONAME
-	_ZN15CPhoneStateIdle25HandleNumberLongKeyPressLEv @ 127 NONAME
-	_ZN15CPhoneStateIdle25HandlePhoneEngineMessageLEii @ 128 NONAME
-	_ZN15CPhoneStateIdle26HandleIdleForegroundEventLEv @ 129 NONAME
-	_ZN15CPhoneStateIdle26HandlePhoneFocusLostEventLEv @ 130 NONAME
-	_ZN15CPhoneStateIdle27HandlePhoneForegroundEventLEv @ 131 NONAME
-	_ZN15CPhoneStateIdle5DialLERK7TDesC1616TPhoneNumberTypeNS_21TDialInitiationMethodE @ 132 NONAME
-	_ZN15CPhoneStateIdleC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 133 NONAME
-	_ZN15CPhoneStateIdleC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 134 NONAME
-	_ZN15CPhoneStateIdleD0Ev @ 135 NONAME
-	_ZN15CPhoneStateIdleD1Ev @ 136 NONAME
-	_ZN15CPhoneStateIdleD2Ev @ 137 NONAME
-	_ZN16CPhoneCbaManager10UpdateCbaLEi @ 138 NONAME
-	_ZN16CPhoneCbaManager18UpdateIncomingCbaLEi @ 139 NONAME
-	_ZN16CPhoneCbaManager7SetCbaLEi @ 140 NONAME
-	_ZN17CPhoneStateHandle12StateMachineEv @ 141 NONAME
-	_ZN17CPhoneStateHandle17ViewCommandHandleEv @ 142 NONAME
-	_ZN17CPhoneStateHandle8InstanceEv @ 143 NONAME
-	_ZN17CPhoneStateInCall10ConstructLEv @ 144 NONAME
-	_ZN17CPhoneStateInCall10UpdateCbaLEi @ 145 NONAME
-	_ZN17CPhoneStateInCall11HandleIdleLEi @ 146 NONAME
-	_ZN17CPhoneStateInCall12OpenMenuBarLEv @ 147 NONAME
-	_ZN17CPhoneStateInCall14HandleCommandLEi @ 148 NONAME
-	_ZN17CPhoneStateInCall15CloseDtmfQueryLEv @ 149 NONAME
-	_ZN17CPhoneStateInCall15GetRingingCallLEv @ 150 NONAME
-	_ZN17CPhoneStateInCall16UpdateInCallCbaLEv @ 151 NONAME
-	_ZN17CPhoneStateInCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 152 NONAME
-	_ZN17CPhoneStateInCall18CallFetchedNumberLERK7TDesC16 @ 153 NONAME
-	_ZN17CPhoneStateInCall18CreateNumberEntryLEv @ 154 NONAME
-	_ZN17CPhoneStateInCall18IsVideoCallActiveLEv @ 155 NONAME
-	_ZN17CPhoneStateInCall19IsVideoCallRingingLEv @ 156 NONAME
-	_ZN17CPhoneStateInCall19LaunchNewCallQueryLEv @ 157 NONAME
-	_ZN17CPhoneStateInCall23DisconnectOutgoingCallLEv @ 158 NONAME
-	_ZN17CPhoneStateInCall25HandleNumberEntryClearedLEv @ 159 NONAME
-	_ZN17CPhoneStateInCall25HandlePhoneEngineMessageLEii @ 160 NONAME
-	_ZN17CPhoneStateInCall34PhoneNumberAvailableInPhoneEngineLEi @ 161 NONAME
-	_ZN17CPhoneStateInCallC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 162 NONAME
-	_ZN17CPhoneStateInCallC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 163 NONAME
-	_ZN17CPhoneStateInCallD0Ev @ 164 NONAME
-	_ZN17CPhoneStateInCallD1Ev @ 165 NONAME
-	_ZN17CPhoneStateInCallD2Ev @ 166 NONAME
-	_ZN18CPhoneStateMachine11ChangeStateEi @ 167 NONAME
-	_ZN18CPhoneStateMachine11PhoneEngineEv @ 168 NONAME
-	_ZN18CPhoneStateMachine12PhoneStorageEv @ 169 NONAME
-	_ZN18CPhoneStateMachine14SetPhoneEngineEP13MPEPhoneModel @ 170 NONAME
-	_ZN18CPhoneStateMachine15PhoneEngineInfoEv @ 171 NONAME
-	_ZN18CPhoneStateMachine18CreatePhoneEngineLER14MEngineMonitor @ 172 NONAME
-	_ZN18CPhoneStateMachine22SendPhoneEngineMessageEi @ 173 NONAME
-	_ZN18CPhoneStateMachine5StateEv @ 174 NONAME
-	_ZN18CPhoneStateMachine9SetCallIdEi @ 175 NONAME
-	_ZN18CPhoneStateMachineC1EP23MPhoneViewCommandHandle @ 176 NONAME
-	_ZN18CPhoneStateMachineC2EP23MPhoneViewCommandHandle @ 177 NONAME
-	_ZN18CPhoneStateMachineD0Ev @ 178 NONAME
-	_ZN18CPhoneStateMachineD1Ev @ 179 NONAME
-	_ZN18CPhoneStateMachineD2Ev @ 180 NONAME
-	_ZN18CPhoneStateStartup10ConstructLEv @ 181 NONAME
-	_ZN18CPhoneStateStartup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 182 NONAME
-	_ZN18CPhoneStateStartup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 183 NONAME
-	_ZN18CPhoneStateStartup18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 184 NONAME
-	_ZN18CPhoneStateStartup19HandlePhoneStartupLEv @ 185 NONAME
-	_ZN18CPhoneStateStartup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 186 NONAME
-	_ZN18CPhoneStateStartup25HandlePhoneEngineMessageLEii @ 187 NONAME
-	_ZN18CPhoneStateStartup26HandleIdleForegroundEventLEv @ 188 NONAME
-	_ZN18CPhoneStateStartup4NewLEP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 189 NONAME
-	_ZN18CPhoneStateStartupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 190 NONAME
-	_ZN18CPhoneStateStartupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 191 NONAME
-	_ZN18CPhoneStateStartupD0Ev @ 192 NONAME
-	_ZN18CPhoneStateStartupD1Ev @ 193 NONAME
-	_ZN18CPhoneStateStartupD2Ev @ 194 NONAME
-	_ZN18CPhoneUIController11HandleErrorERK12TPEErrorInfo @ 195 NONAME
-	_ZN18CPhoneUIController13HandleMessageEii @ 196 NONAME
-	_ZN18CPhoneUIController14HandleCommandLEi @ 197 NONAME
-	_ZN18CPhoneUIController15DynInitMenuBarLEiP11CEikMenuBar @ 198 NONAME
-	_ZN18CPhoneUIController15HandleKeyEventLERK9TKeyEvent10TEventCode @ 199 NONAME
-	_ZN18CPhoneUIController15ProcessCommandLEi @ 200 NONAME
-	_ZN18CPhoneUIController16DynInitMenuPaneLEiP12CEikMenuPane @ 201 NONAME
-	_ZN18CPhoneUIController18HandleSystemEventLERK8TWsEvent @ 202 NONAME
-	_ZN18CPhoneUIController19HandlePhoneStartupLEv @ 203 NONAME
-	_ZN18CPhoneUIController20HandleKeyLockEnabledEi @ 204 NONAME
-	_ZN18CPhoneUIController22HandleForegroundEventLEi @ 205 NONAME
-	_ZN18CPhoneUIController24HandleEnvironmentChangeLEi @ 206 NONAME
-	_ZN18CPhoneUIController26HandleIdleForegroundEventLEv @ 207 NONAME
-	_ZN18CPhoneUIController26HandlePhoneFocusLostEventLEv @ 208 NONAME
-	_ZN18CPhoneUIController27HandlePhoneForegroundEventLEv @ 209 NONAME
-	_ZN18CPhoneUIController4NewLEP23MPhoneViewCommandHandle @ 210 NONAME
-	_ZN18CPhoneUIControllerD0Ev @ 211 NONAME
-	_ZN18CPhoneUIControllerD1Ev @ 212 NONAME
-	_ZN18CPhoneUIControllerD2Ev @ 213 NONAME
-	_ZN19CPhoneStateIncoming10ConstructLEv @ 214 NONAME
-	_ZN19CPhoneStateIncoming14HandleCommandLEi @ 215 NONAME
-	_ZN19CPhoneStateIncoming15HandleKeyEventLERK9TKeyEvent10TEventCode @ 216 NONAME
-	_ZN19CPhoneStateIncoming16DynInitMenuPaneLEiP12CEikMenuPane @ 217 NONAME
-	_ZN19CPhoneStateIncoming17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 218 NONAME
-	_ZN19CPhoneStateIncoming20HandleKeyLockEnabledEi @ 219 NONAME
-	_ZN19CPhoneStateIncoming23HandleAudioPlayStoppedLEv @ 220 NONAME
-	_ZN19CPhoneStateIncoming23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 221 NONAME
-	_ZN19CPhoneStateIncoming25HandleNumberEntryClearedLEv @ 222 NONAME
-	_ZN19CPhoneStateIncoming25HandlePhoneEngineMessageLEii @ 223 NONAME
-	_ZN19CPhoneStateIncomingC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 224 NONAME
-	_ZN19CPhoneStateIncomingC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 225 NONAME
-	_ZN19CPhoneStateIncomingD0Ev @ 226 NONAME
-	_ZN19CPhoneStateIncomingD1Ev @ 227 NONAME
-	_ZN19CPhoneStateIncomingD2Ev @ 228 NONAME
-	_ZN20CPhoneReconnectQuery19ShowReconnectQueryLEi @ 229 NONAME
-	_ZN20CPhoneReconnectQuery9InstanceLEv @ 230 NONAME
-	_ZN20CPhoneStateCallSetup10ConstructLEv @ 231 NONAME
-	_ZN20CPhoneStateCallSetup10UpdateCbaLEi @ 232 NONAME
-	_ZN20CPhoneStateCallSetup12OpenMenuBarLEv @ 233 NONAME
-	_ZN20CPhoneStateCallSetup14HandleCommandLEi @ 234 NONAME
-	_ZN20CPhoneStateCallSetup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 235 NONAME
-	_ZN20CPhoneStateCallSetup16UpdateInCallCbaLEv @ 236 NONAME
-	_ZN20CPhoneStateCallSetup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 237 NONAME
-	_ZN20CPhoneStateCallSetup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 238 NONAME
-	_ZN20CPhoneStateCallSetup25HandleNumberEntryClearedLEv @ 239 NONAME
-	_ZN20CPhoneStateCallSetup25HandlePhoneEngineMessageLEii @ 240 NONAME
-	_ZN20CPhoneStateCallSetupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 241 NONAME
-	_ZN20CPhoneStateCallSetupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 242 NONAME
-	_ZN20CPhoneStateCallSetupD0Ev @ 243 NONAME
-	_ZN20CPhoneStateCallSetupD1Ev @ 244 NONAME
-	_ZN20CPhoneStateCallSetupD2Ev @ 245 NONAME
-	_ZNK11CPhoneState11IsKeyLockOnEv @ 246 NONAME
-	_ZNK11CPhoneState12IsAutoLockOnEv @ 247 NONAME
-	_ZNK11CPhoneState14IsSwivelClosedEv @ 248 NONAME
-	_ZNK11CPhoneState17GetBlockedKeyListEv @ 249 NONAME
-	_ZNK11CPhoneState17IsMenuBarVisibleLEv @ 250 NONAME
-	_ZNK11CPhoneState18TopAppIsDisplayedLEv @ 251 NONAME
-	_ZNK11CPhoneState20IsDTMFEditorVisibleLEv @ 252 NONAME
-	_ZNK11CPhoneState23NeedToSendToBackgroundLEv @ 253 NONAME
-	_ZNK11CPhoneState25IsOnScreenDialerSupportedEv @ 254 NONAME
-	_ZNK11CPhoneState26IsCustomizedDialerVisibleLEv @ 255 NONAME
-	_ZNK11CPhoneState8SimStateEv @ 256 NONAME
-	_ZNK15CPhoneStateIdle17IsSpeedDialNumberERK7TDesC16 @ 257 NONAME
-	_ZTI11CPhoneState @ 258 NONAME
-	_ZTI15CPhoneStateIdle @ 259 NONAME
-	_ZTI17CPhoneStateHandle @ 260 NONAME
-	_ZTI17CPhoneStateInCall @ 261 NONAME
-	_ZTI18CPhoneStateMachine @ 262 NONAME
-	_ZTI18CPhoneStateStartup @ 263 NONAME
-	_ZTI18CPhoneUIController @ 264 NONAME
-	_ZTI19CPhoneStateIncoming @ 265 NONAME
-	_ZTI20CPhoneReconnectQuery @ 266 NONAME
-	_ZTI20CPhoneStateCallSetup @ 267 NONAME
-	_ZTI23CPhoneDtmfWaitCharTimer @ 268 NONAME
-	_ZTI23CPhoneKeyEventForwarder @ 269 NONAME
-	_ZTI24CPhoneSystemEventHandler @ 270 NONAME
-	_ZTI26CPhoneRemoteControlHandler @ 271 NONAME
-	_ZTI27CPhoneBtaaDisconnectHandler @ 272 NONAME
-	_ZTV11CPhoneState @ 273 NONAME
-	_ZTV15CPhoneStateIdle @ 274 NONAME
-	_ZTV17CPhoneStateHandle @ 275 NONAME
-	_ZTV17CPhoneStateInCall @ 276 NONAME
-	_ZTV18CPhoneStateMachine @ 277 NONAME
-	_ZTV18CPhoneStateStartup @ 278 NONAME
-	_ZTV18CPhoneUIController @ 279 NONAME
-	_ZTV19CPhoneStateIncoming @ 280 NONAME
-	_ZTV20CPhoneReconnectQuery @ 281 NONAME
-	_ZTV20CPhoneStateCallSetup @ 282 NONAME
-	_ZTV23CPhoneDtmfWaitCharTimer @ 283 NONAME
-	_ZTV23CPhoneKeyEventForwarder @ 284 NONAME
-	_ZTV24CPhoneSystemEventHandler @ 285 NONAME
-	_ZTV26CPhoneRemoteControlHandler @ 286 NONAME
-	_ZTV27CPhoneBtaaDisconnectHandler @ 287 NONAME
-	_ZThn12_N11CPhoneState15DynInitMenuBarLEiP11CEikMenuBar @ 288 NONAME
-	_ZThn12_N11CPhoneState16DynInitMenuPaneLEiP12CEikMenuPane @ 289 NONAME
-	_ZThn12_N11CPhoneState18HandleSystemEventLERK8TWsEvent @ 290 NONAME
-	_ZThn12_N11CPhoneState19HandleCenRepChangeLERK4TUidj @ 291 NONAME
-	_ZThn12_N11CPhoneState19HandlePhoneStartupLEv @ 292 NONAME
-	_ZThn12_N11CPhoneState20HandleKeyLockEnabledEi @ 293 NONAME
-	_ZThn12_N11CPhoneState22HandleForegroundEventLEi @ 294 NONAME
-	_ZThn12_N11CPhoneState22HandlePropertyChangedLERK4TUidji @ 295 NONAME
-	_ZThn12_N11CPhoneState24HandleEnvironmentChangeLEi @ 296 NONAME
-	_ZThn12_N11CPhoneState26HandleIdleForegroundEventLEv @ 297 NONAME
-	_ZThn12_N11CPhoneState26HandlePhoneFocusLostEventLEv @ 298 NONAME
-	_ZThn12_N11CPhoneState27HandlePhoneForegroundEventLEv @ 299 NONAME
-	_ZThn12_N11CPhoneStateD0Ev @ 300 NONAME
-	_ZThn12_N11CPhoneStateD1Ev @ 301 NONAME
-	_ZThn12_N15CPhoneStateIdle26HandleIdleForegroundEventLEv @ 302 NONAME
-	_ZThn12_N15CPhoneStateIdle26HandlePhoneFocusLostEventLEv @ 303 NONAME
-	_ZThn12_N15CPhoneStateIdle27HandlePhoneForegroundEventLEv @ 304 NONAME
-	_ZThn12_N15CPhoneStateIdleD0Ev @ 305 NONAME
-	_ZThn12_N15CPhoneStateIdleD1Ev @ 306 NONAME
-	_ZThn12_N17CPhoneStateInCallD0Ev @ 307 NONAME
-	_ZThn12_N17CPhoneStateInCallD1Ev @ 308 NONAME
-	_ZThn12_N18CPhoneStateStartup19HandlePhoneStartupLEv @ 309 NONAME
-	_ZThn12_N18CPhoneStateStartup26HandleIdleForegroundEventLEv @ 310 NONAME
-	_ZThn12_N18CPhoneStateStartupD0Ev @ 311 NONAME
-	_ZThn12_N18CPhoneStateStartupD1Ev @ 312 NONAME
-	_ZThn12_N18CPhoneUIController15DynInitMenuBarLEiP11CEikMenuBar @ 313 NONAME
-	_ZThn12_N18CPhoneUIController16DynInitMenuPaneLEiP12CEikMenuPane @ 314 NONAME
-	_ZThn12_N18CPhoneUIController18HandleSystemEventLERK8TWsEvent @ 315 NONAME
-	_ZThn12_N18CPhoneUIController19HandlePhoneStartupLEv @ 316 NONAME
-	_ZThn12_N18CPhoneUIController20HandleKeyLockEnabledEi @ 317 NONAME
-	_ZThn12_N18CPhoneUIController22HandleForegroundEventLEi @ 318 NONAME
-	_ZThn12_N18CPhoneUIController24HandleEnvironmentChangeLEi @ 319 NONAME
-	_ZThn12_N18CPhoneUIController26HandleIdleForegroundEventLEv @ 320 NONAME
-	_ZThn12_N18CPhoneUIController26HandlePhoneFocusLostEventLEv @ 321 NONAME
-	_ZThn12_N18CPhoneUIController27HandlePhoneForegroundEventLEv @ 322 NONAME
-	_ZThn12_N18CPhoneUIControllerD0Ev @ 323 NONAME
-	_ZThn12_N18CPhoneUIControllerD1Ev @ 324 NONAME
-	_ZThn12_N19CPhoneStateIncoming16DynInitMenuPaneLEiP12CEikMenuPane @ 325 NONAME
-	_ZThn12_N19CPhoneStateIncoming20HandleKeyLockEnabledEi @ 326 NONAME
-	_ZThn12_N19CPhoneStateIncomingD0Ev @ 327 NONAME
-	_ZThn12_N19CPhoneStateIncomingD1Ev @ 328 NONAME
-	_ZThn12_N20CPhoneStateCallSetupD0Ev @ 329 NONAME
-	_ZThn12_N20CPhoneStateCallSetupD1Ev @ 330 NONAME
-	_ZThn16_N11CPhoneState14HandleCommandLEi @ 331 NONAME
-	_ZThn16_N11CPhoneState15ProcessCommandLEi @ 332 NONAME
-	_ZThn16_N11CPhoneStateD0Ev @ 333 NONAME
-	_ZThn16_N11CPhoneStateD1Ev @ 334 NONAME
-	_ZThn16_N15CPhoneStateIdle14HandleCommandLEi @ 335 NONAME
-	_ZThn16_N15CPhoneStateIdle15ProcessCommandLEi @ 336 NONAME
-	_ZThn16_N15CPhoneStateIdleD0Ev @ 337 NONAME
-	_ZThn16_N15CPhoneStateIdleD1Ev @ 338 NONAME
-	_ZThn16_N17CPhoneStateInCall14HandleCommandLEi @ 339 NONAME
-	_ZThn16_N17CPhoneStateInCallD0Ev @ 340 NONAME
-	_ZThn16_N17CPhoneStateInCallD1Ev @ 341 NONAME
-	_ZThn16_N18CPhoneStateStartupD0Ev @ 342 NONAME
-	_ZThn16_N18CPhoneStateStartupD1Ev @ 343 NONAME
-	_ZThn16_N18CPhoneUIController14HandleCommandLEi @ 344 NONAME
-	_ZThn16_N18CPhoneUIController15ProcessCommandLEi @ 345 NONAME
-	_ZThn16_N18CPhoneUIControllerD0Ev @ 346 NONAME
-	_ZThn16_N18CPhoneUIControllerD1Ev @ 347 NONAME
-	_ZThn16_N19CPhoneStateIncoming14HandleCommandLEi @ 348 NONAME
-	_ZThn16_N19CPhoneStateIncomingD0Ev @ 349 NONAME
-	_ZThn16_N19CPhoneStateIncomingD1Ev @ 350 NONAME
-	_ZThn16_N20CPhoneStateCallSetup14HandleCommandLEi @ 351 NONAME
-	_ZThn16_N20CPhoneStateCallSetupD0Ev @ 352 NONAME
-	_ZThn16_N20CPhoneStateCallSetupD1Ev @ 353 NONAME
-	_ZThn20_N11CPhoneState20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 354 NONAME
-	_ZThn20_N11CPhoneStateD0Ev @ 355 NONAME
-	_ZThn20_N11CPhoneStateD1Ev @ 356 NONAME
-	_ZThn20_N15CPhoneStateIdle20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 357 NONAME
-	_ZThn20_N15CPhoneStateIdleD0Ev @ 358 NONAME
-	_ZThn20_N15CPhoneStateIdleD1Ev @ 359 NONAME
-	_ZThn20_N17CPhoneStateInCallD0Ev @ 360 NONAME
-	_ZThn20_N17CPhoneStateInCallD1Ev @ 361 NONAME
-	_ZThn20_N18CPhoneStateStartupD0Ev @ 362 NONAME
-	_ZThn20_N18CPhoneStateStartupD1Ev @ 363 NONAME
-	_ZThn20_N19CPhoneStateIncomingD0Ev @ 364 NONAME
-	_ZThn20_N19CPhoneStateIncomingD1Ev @ 365 NONAME
-	_ZThn20_N20CPhoneStateCallSetupD0Ev @ 366 NONAME
-	_ZThn20_N20CPhoneStateCallSetupD1Ev @ 367 NONAME
-	_ZThn24_N11CPhoneState19SetDivertIndicationEi @ 368 NONAME
-	_ZThn24_N11CPhoneStateD0Ev @ 369 NONAME
-	_ZThn24_N11CPhoneStateD1Ev @ 370 NONAME
-	_ZThn24_N15CPhoneStateIdleD0Ev @ 371 NONAME
-	_ZThn24_N15CPhoneStateIdleD1Ev @ 372 NONAME
-	_ZThn24_N17CPhoneStateInCallD0Ev @ 373 NONAME
-	_ZThn24_N17CPhoneStateInCallD1Ev @ 374 NONAME
-	_ZThn24_N18CPhoneStateStartupD0Ev @ 375 NONAME
-	_ZThn24_N18CPhoneStateStartupD1Ev @ 376 NONAME
-	_ZThn24_N19CPhoneStateIncomingD0Ev @ 377 NONAME
-	_ZThn24_N19CPhoneStateIncomingD1Ev @ 378 NONAME
-	_ZThn24_N20CPhoneStateCallSetupD0Ev @ 379 NONAME
-	_ZThn24_N20CPhoneStateCallSetupD1Ev @ 380 NONAME
-	_ZThn28_NK11CPhoneState17GetBlockedKeyListEv @ 381 NONAME
-	_ZThn32_N11CPhoneState25HandleNumberEntryClearedLEv @ 382 NONAME
-	_ZThn32_N15CPhoneStateIdle25HandleNumberEntryClearedLEv @ 383 NONAME
-	_ZThn32_N17CPhoneStateInCall25HandleNumberEntryClearedLEv @ 384 NONAME
-	_ZThn32_N19CPhoneStateIncoming25HandleNumberEntryClearedLEv @ 385 NONAME
-	_ZThn32_N20CPhoneStateCallSetup25HandleNumberEntryClearedLEv @ 386 NONAME
-	_ZThn36_N11CPhoneState23HandleNumberEntryEditedEv @ 387 NONAME
-	_ZThn36_N11CPhoneStateD0Ev @ 388 NONAME
-	_ZThn36_N11CPhoneStateD1Ev @ 389 NONAME
-	_ZThn36_N15CPhoneStateIdleD0Ev @ 390 NONAME
-	_ZThn36_N15CPhoneStateIdleD1Ev @ 391 NONAME
-	_ZThn36_N17CPhoneStateInCallD0Ev @ 392 NONAME
-	_ZThn36_N17CPhoneStateInCallD1Ev @ 393 NONAME
-	_ZThn36_N18CPhoneStateStartupD0Ev @ 394 NONAME
-	_ZThn36_N18CPhoneStateStartupD1Ev @ 395 NONAME
-	_ZThn36_N19CPhoneStateIncomingD0Ev @ 396 NONAME
-	_ZThn36_N19CPhoneStateIncomingD1Ev @ 397 NONAME
-	_ZThn36_N20CPhoneStateCallSetupD0Ev @ 398 NONAME
-	_ZThn36_N20CPhoneStateCallSetupD1Ev @ 399 NONAME
-	_ZThn40_NK11CPhoneState11IsKeyLockOnEv @ 400 NONAME
-	_ZThn40_NK11CPhoneState12IsAutoLockOnEv @ 401 NONAME
-	_ZThn4_N11CPhoneState12HandleErrorLERK12TPEErrorInfo @ 402 NONAME
-	_ZThn4_N11CPhoneState25HandlePhoneEngineMessageLEii @ 403 NONAME
-	_ZThn4_N11CPhoneStateD0Ev @ 404 NONAME
-	_ZThn4_N11CPhoneStateD1Ev @ 405 NONAME
-	_ZThn4_N15CPhoneStateIdle25HandlePhoneEngineMessageLEii @ 406 NONAME
-	_ZThn4_N15CPhoneStateIdleD0Ev @ 407 NONAME
-	_ZThn4_N15CPhoneStateIdleD1Ev @ 408 NONAME
-	_ZThn4_N17CPhoneStateInCall25HandlePhoneEngineMessageLEii @ 409 NONAME
-	_ZThn4_N17CPhoneStateInCallD0Ev @ 410 NONAME
-	_ZThn4_N17CPhoneStateInCallD1Ev @ 411 NONAME
-	_ZThn4_N18CPhoneStateMachine11ChangeStateEi @ 412 NONAME
-	_ZThn4_N18CPhoneStateMachine11PhoneEngineEv @ 413 NONAME
-	_ZThn4_N18CPhoneStateMachine12PhoneStorageEv @ 414 NONAME
-	_ZThn4_N18CPhoneStateMachine14SetPhoneEngineEP13MPEPhoneModel @ 415 NONAME
-	_ZThn4_N18CPhoneStateMachine15PhoneEngineInfoEv @ 416 NONAME
-	_ZThn4_N18CPhoneStateMachine18CreatePhoneEngineLER14MEngineMonitor @ 417 NONAME
-	_ZThn4_N18CPhoneStateMachine22SendPhoneEngineMessageEi @ 418 NONAME
-	_ZThn4_N18CPhoneStateMachine5StateEv @ 419 NONAME
-	_ZThn4_N18CPhoneStateMachine9SetCallIdEi @ 420 NONAME
-	_ZThn4_N18CPhoneStateMachineD0Ev @ 421 NONAME
-	_ZThn4_N18CPhoneStateMachineD1Ev @ 422 NONAME
-	_ZThn4_N18CPhoneStateStartup25HandlePhoneEngineMessageLEii @ 423 NONAME
-	_ZThn4_N18CPhoneStateStartupD0Ev @ 424 NONAME
-	_ZThn4_N18CPhoneStateStartupD1Ev @ 425 NONAME
-	_ZThn4_N18CPhoneUIController11HandleErrorERK12TPEErrorInfo @ 426 NONAME
-	_ZThn4_N18CPhoneUIController13HandleMessageEii @ 427 NONAME
-	_ZThn4_N19CPhoneStateIncoming25HandlePhoneEngineMessageLEii @ 428 NONAME
-	_ZThn4_N19CPhoneStateIncomingD0Ev @ 429 NONAME
-	_ZThn4_N19CPhoneStateIncomingD1Ev @ 430 NONAME
-	_ZThn4_N20CPhoneStateCallSetup25HandlePhoneEngineMessageLEii @ 431 NONAME
-	_ZThn4_N20CPhoneStateCallSetupD0Ev @ 432 NONAME
-	_ZThn4_N20CPhoneStateCallSetupD1Ev @ 433 NONAME
-	_ZThn8_N11CPhoneState14IsNoteVisibleLEv @ 434 NONAME
-	_ZThn8_N11CPhoneState15HandleKeyEventLERK9TKeyEvent10TEventCode @ 435 NONAME
-	_ZThn8_N11CPhoneState15HandleLongHashLEv @ 436 NONAME
-	_ZThn8_N11CPhoneState17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 437 NONAME
-	_ZThn8_N11CPhoneState18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 438 NONAME
-	_ZThn8_N11CPhoneState23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 439 NONAME
-	_ZThn8_N11CPhoneState24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 440 NONAME
-	_ZThn8_N11CPhoneState35IsAlphanumericSupportedAndCharInputERK9TKeyEvent @ 441 NONAME
-	_ZThn8_N11CPhoneStateD0Ev @ 442 NONAME
-	_ZThn8_N11CPhoneStateD1Ev @ 443 NONAME
-	_ZThn8_N15CPhoneStateIdle15HandleKeyEventLERK9TKeyEvent10TEventCode @ 444 NONAME
-	_ZThn8_N15CPhoneStateIdle17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 445 NONAME
-	_ZThn8_N15CPhoneStateIdleD0Ev @ 446 NONAME
-	_ZThn8_N15CPhoneStateIdleD1Ev @ 447 NONAME
-	_ZThn8_N17CPhoneStateInCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 448 NONAME
-	_ZThn8_N17CPhoneStateInCallD0Ev @ 449 NONAME
-	_ZThn8_N17CPhoneStateInCallD1Ev @ 450 NONAME
-	_ZThn8_N18CPhoneStateStartup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 451 NONAME
-	_ZThn8_N18CPhoneStateStartup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 452 NONAME
-	_ZThn8_N18CPhoneStateStartup18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 453 NONAME
-	_ZThn8_N18CPhoneStateStartup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 454 NONAME
-	_ZThn8_N18CPhoneStateStartupD0Ev @ 455 NONAME
-	_ZThn8_N18CPhoneStateStartupD1Ev @ 456 NONAME
-	_ZThn8_N18CPhoneUIController15HandleKeyEventLERK9TKeyEvent10TEventCode @ 457 NONAME
-	_ZThn8_N18CPhoneUIControllerD0Ev @ 458 NONAME
-	_ZThn8_N18CPhoneUIControllerD1Ev @ 459 NONAME
-	_ZThn8_N19CPhoneStateIncoming15HandleKeyEventLERK9TKeyEvent10TEventCode @ 460 NONAME
-	_ZThn8_N19CPhoneStateIncoming17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 461 NONAME
-	_ZThn8_N19CPhoneStateIncoming23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 462 NONAME
-	_ZThn8_N19CPhoneStateIncomingD0Ev @ 463 NONAME
-	_ZThn8_N19CPhoneStateIncomingD1Ev @ 464 NONAME
-	_ZThn8_N20CPhoneStateCallSetup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 465 NONAME
-	_ZThn8_N20CPhoneStateCallSetup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 466 NONAME
-	_ZThn8_N20CPhoneStateCallSetup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 467 NONAME
-	_ZThn8_N20CPhoneStateCallSetupD0Ev @ 468 NONAME
-	_ZThn8_N20CPhoneStateCallSetupD1Ev @ 469 NONAME
-	_ZThn8_NK11CPhoneState17IsMenuBarVisibleLEv @ 470 NONAME
+	_ZN11CPhoneState19SetBackButtonActiveEi @ 43 NONAME
+	_ZN11CPhoneState19SetDivertIndicationEi @ 44 NONAME
+	_ZN11CPhoneState19SetTouchPaneButtonsEi @ 45 NONAME
+	_ZN11CPhoneState19SetTouchPaneVisibleEi @ 46 NONAME
+	_ZN11CPhoneState19ShowNumberBusyNoteLEv @ 47 NONAME
+	_ZN11CPhoneState20CallFromNumberEntryLEv @ 48 NONAME
+	_ZN11CPhoneState20DecreaseAudioVolumeLEv @ 49 NONAME
+	_ZN11CPhoneState20HandleDisconnectingLEi @ 50 NONAME
+	_ZN11CPhoneState20HandleKeyLockEnabledEi @ 51 NONAME
+	_ZN11CPhoneState20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 52 NONAME
+	_ZN11CPhoneState20IncreaseAudioVolumeLEv @ 53 NONAME
+	_ZN11CPhoneState20SendGlobalErrorNoteLEi @ 54 NONAME
+	_ZN11CPhoneState21IsNumberEntryVisibleLEv @ 55 NONAME
+	_ZN11CPhoneState21UpdateRemoteInfoDataLEi @ 56 NONAME
+	_ZN11CPhoneState22CloseCustomizedDialerLEv @ 57 NONAME
+	_ZN11CPhoneState22DeleteTouchPaneButtonsEv @ 58 NONAME
+	_ZN11CPhoneState22HandleForegroundEventLEi @ 59 NONAME
+	_ZN11CPhoneState22HandleNumericKeyEventLERK9TKeyEvent10TEventCode @ 60 NONAME
+	_ZN11CPhoneState22HandlePropertyChangedLERK4TUidji @ 61 NONAME
+	_ZN11CPhoneState22OnlyHashInNumberEntryLEv @ 62 NONAME
+	_ZN11CPhoneState22PhoneNumberFromEntryLCEv @ 63 NONAME
+	_ZN11CPhoneState22SendGlobalWarningNoteLEi @ 64 NONAME
+	_ZN11CPhoneState22StartShowSecurityNoteLEv @ 65 NONAME
+	_ZN11CPhoneState23HandleAudioMuteChangedLEv @ 66 NONAME
+	_ZN11CPhoneState23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 67 NONAME
+	_ZN11CPhoneState23HandleNumberEntryEditedEv @ 68 NONAME
+	_ZN11CPhoneState23SetRingingTonePlaybackLEi @ 69 NONAME
+	_ZN11CPhoneState23UpdateSingleActiveCallLEi @ 70 NONAME
+	_ZN11CPhoneState24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 71 NONAME
+	_ZN11CPhoneState24HandleEnvironmentChangeLEi @ 72 NONAME
+	_ZN11CPhoneState24StartAlsLineChangeTimerLEv @ 73 NONAME
+	_ZN11CPhoneState24StoreNumberEntryContentLEv @ 74 NONAME
+	_ZN11CPhoneState24UpdateInCallContextMenuLEv @ 75 NONAME
+	_ZN11CPhoneState25HandleAudioOutputChangedLEv @ 76 NONAME
+	_ZN11CPhoneState25HandleNumberEntryClearedLEv @ 77 NONAME
+	_ZN11CPhoneState25HandlePhoneEngineMessageLEii @ 78 NONAME
+	_ZN11CPhoneState25SetNumberEntryVisibilityLEi @ 79 NONAME
+	_ZN11CPhoneState25SetTouchPaneButtonEnabledEi @ 80 NONAME
+	_ZN11CPhoneState26HandleIdleForegroundEventLEv @ 81 NONAME
+	_ZN11CPhoneState26HandlePhoneFocusLostEventLEv @ 82 NONAME
+	_ZN11CPhoneState26IsNumberEntryContentStoredEv @ 83 NONAME
+	_ZN11CPhoneState26RestoreNumberEntryContentLEv @ 84 NONAME
+	_ZN11CPhoneState26SetTouchPaneButtonDisabledEi @ 85 NONAME
+	_ZN11CPhoneState26UpdateIncomingContextMenuLEi @ 86 NONAME
+	_ZN11CPhoneState26UpdateSilenceButtonDimmingEv @ 87 NONAME
+	_ZN11CPhoneState27DisplayCallTerminationNoteLEv @ 88 NONAME
+	_ZN11CPhoneState27HandlePhoneForegroundEventLEv @ 89 NONAME
+	_ZN11CPhoneState27RetainPreviousKeylockStateLEv @ 90 NONAME
+	_ZN11CPhoneState28CheckDisableHWKeysAndCallUILEv @ 91 NONAME
+	_ZN11CPhoneState28ClearNumberEntryContentCacheEv @ 92 NONAME
+	_ZN11CPhoneState28OpenSoftRejectMessageEditorLEv @ 93 NONAME
+	_ZN11CPhoneState28SetupIdleScreenInBackgroundLEv @ 94 NONAME
+	_ZN11CPhoneState29DisplayHeaderForCallComingInLEii @ 95 NONAME
+	_ZN11CPhoneState29DisplayHeaderForOutgoingCallLEi @ 96 NONAME
+	_ZN11CPhoneState30CheckIfShowCallTerminationNoteEv @ 97 NONAME
+	_ZN11CPhoneState30CustomizedDialerCbaResourceIdLEv @ 98 NONAME
+	_ZN11CPhoneState31CustomizedDialerMenuResourceIdLEv @ 99 NONAME
+	_ZN11CPhoneState34CaptureKeysDuringCallNotificationLEi @ 100 NONAME
+	_ZN11CPhoneState34SetCallHeaderTextsForCallComingInLEiiP28TPhoneCmdParamCallHeaderData @ 101 NONAME
+	_ZN11CPhoneState34SetToolbarButtonLoudspeakerEnabledEv @ 102 NONAME
+	_ZN11CPhoneState35IsAlphanumericSupportedAndCharInputERK9TKeyEvent @ 103 NONAME
+	_ZN11CPhoneState38CheckIfRestoreNEContentAfterDtmfDialerEv @ 104 NONAME
+	_ZN11CPhoneState43IsSimStateNotPresentWithSecurityModeEnabledEv @ 105 NONAME
+	_ZN11CPhoneState7IsSimOkEv @ 106 NONAME
+	_ZN11CPhoneState9ShowNoteLEi @ 107 NONAME
+	_ZN11CPhoneStateC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 108 NONAME
+	_ZN11CPhoneStateC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 109 NONAME
+	_ZN11CPhoneStateD0Ev @ 110 NONAME
+	_ZN11CPhoneStateD1Ev @ 111 NONAME
+	_ZN11CPhoneStateD2Ev @ 112 NONAME
+	_ZN15CPhoneStateIdle10ConstructLEv @ 113 NONAME
+	_ZN15CPhoneStateIdle10SpeedDialLERKjNS_21TDialInitiationMethodE @ 114 NONAME
+	_ZN15CPhoneStateIdle14DialVoiceCallLEv @ 115 NONAME
+	_ZN15CPhoneStateIdle14HandleCommandLEi @ 116 NONAME
+	_ZN15CPhoneStateIdle14HandleDialingLEi @ 117 NONAME
+	_ZN15CPhoneStateIdle15HandleKeyEventLERK9TKeyEvent10TEventCode @ 118 NONAME
+	_ZN15CPhoneStateIdle15ProcessCommandLEi @ 119 NONAME
+	_ZN15CPhoneStateIdle17DisplayCallSetupLEi @ 120 NONAME
+	_ZN15CPhoneStateIdle17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 121 NONAME
+	_ZN15CPhoneStateIdle18HandleSendCommandLEv @ 122 NONAME
+	_ZN15CPhoneStateIdle18SpeedDialCanceledLERKj @ 123 NONAME
+	_ZN15CPhoneStateIdle19DialMultimediaCallLEv @ 124 NONAME
+	_ZN15CPhoneStateIdle20DisplayIncomingCallLEi @ 125 NONAME
+	_ZN15CPhoneStateIdle20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 126 NONAME
+	_ZN15CPhoneStateIdle22OnlyHashInNumberEntryLEv @ 127 NONAME
+	_ZN15CPhoneStateIdle25HandleNumberEntryClearedLEv @ 128 NONAME
+	_ZN15CPhoneStateIdle25HandleNumberLongKeyPressLEv @ 129 NONAME
+	_ZN15CPhoneStateIdle25HandlePhoneEngineMessageLEii @ 130 NONAME
+	_ZN15CPhoneStateIdle26HandleIdleForegroundEventLEv @ 131 NONAME
+	_ZN15CPhoneStateIdle26HandlePhoneFocusLostEventLEv @ 132 NONAME
+	_ZN15CPhoneStateIdle27HandlePhoneForegroundEventLEv @ 133 NONAME
+	_ZN15CPhoneStateIdle5DialLERK7TDesC1616TPhoneNumberTypeNS_21TDialInitiationMethodE @ 134 NONAME
+	_ZN15CPhoneStateIdleC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 135 NONAME
+	_ZN15CPhoneStateIdleC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 136 NONAME
+	_ZN15CPhoneStateIdleD0Ev @ 137 NONAME
+	_ZN15CPhoneStateIdleD1Ev @ 138 NONAME
+	_ZN15CPhoneStateIdleD2Ev @ 139 NONAME
+	_ZN16CPhoneCbaManager10UpdateCbaLEi @ 140 NONAME
+	_ZN16CPhoneCbaManager18UpdateIncomingCbaLEi @ 141 NONAME
+	_ZN16CPhoneCbaManager7SetCbaLEi @ 142 NONAME
+	_ZN17CPhoneStateHandle12StateMachineEv @ 143 NONAME
+	_ZN17CPhoneStateHandle17ViewCommandHandleEv @ 144 NONAME
+	_ZN17CPhoneStateHandle8InstanceEv @ 145 NONAME
+	_ZN17CPhoneStateInCall10ConstructLEv @ 146 NONAME
+	_ZN17CPhoneStateInCall10UpdateCbaLEi @ 147 NONAME
+	_ZN17CPhoneStateInCall11HandleIdleLEi @ 148 NONAME
+	_ZN17CPhoneStateInCall12OpenMenuBarLEv @ 149 NONAME
+	_ZN17CPhoneStateInCall14HandleCommandLEi @ 150 NONAME
+	_ZN17CPhoneStateInCall15CloseDtmfQueryLEv @ 151 NONAME
+	_ZN17CPhoneStateInCall15GetRingingCallLEv @ 152 NONAME
+	_ZN17CPhoneStateInCall16UpdateInCallCbaLEv @ 153 NONAME
+	_ZN17CPhoneStateInCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 154 NONAME
+	_ZN17CPhoneStateInCall18CallFetchedNumberLERK7TDesC16 @ 155 NONAME
+	_ZN17CPhoneStateInCall18CreateNumberEntryLEv @ 156 NONAME
+	_ZN17CPhoneStateInCall18IsVideoCallActiveLEv @ 157 NONAME
+	_ZN17CPhoneStateInCall19IsVideoCallRingingLEv @ 158 NONAME
+	_ZN17CPhoneStateInCall19LaunchNewCallQueryLEv @ 159 NONAME
+	_ZN17CPhoneStateInCall23DisconnectOutgoingCallLEv @ 160 NONAME
+	_ZN17CPhoneStateInCall25HandleNumberEntryClearedLEv @ 161 NONAME
+	_ZN17CPhoneStateInCall25HandlePhoneEngineMessageLEii @ 162 NONAME
+	_ZN17CPhoneStateInCall34PhoneNumberAvailableInPhoneEngineLEi @ 163 NONAME
+	_ZN17CPhoneStateInCallC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 164 NONAME
+	_ZN17CPhoneStateInCallC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 165 NONAME
+	_ZN17CPhoneStateInCallD0Ev @ 166 NONAME
+	_ZN17CPhoneStateInCallD1Ev @ 167 NONAME
+	_ZN17CPhoneStateInCallD2Ev @ 168 NONAME
+	_ZN18CPhoneStateMachine11ChangeStateEi @ 169 NONAME
+	_ZN18CPhoneStateMachine11PhoneEngineEv @ 170 NONAME
+	_ZN18CPhoneStateMachine12PhoneStorageEv @ 171 NONAME
+	_ZN18CPhoneStateMachine14SetPhoneEngineEP13MPEPhoneModel @ 172 NONAME
+	_ZN18CPhoneStateMachine15PhoneEngineInfoEv @ 173 NONAME
+	_ZN18CPhoneStateMachine18CreatePhoneEngineLER14MEngineMonitor @ 174 NONAME
+	_ZN18CPhoneStateMachine22SendPhoneEngineMessageEi @ 175 NONAME
+	_ZN18CPhoneStateMachine5StateEv @ 176 NONAME
+	_ZN18CPhoneStateMachine9SetCallIdEi @ 177 NONAME
+	_ZN18CPhoneStateMachineC1EP23MPhoneViewCommandHandle @ 178 NONAME
+	_ZN18CPhoneStateMachineC2EP23MPhoneViewCommandHandle @ 179 NONAME
+	_ZN18CPhoneStateMachineD0Ev @ 180 NONAME
+	_ZN18CPhoneStateMachineD1Ev @ 181 NONAME
+	_ZN18CPhoneStateMachineD2Ev @ 182 NONAME
+	_ZN18CPhoneStateStartup10ConstructLEv @ 183 NONAME
+	_ZN18CPhoneStateStartup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 184 NONAME
+	_ZN18CPhoneStateStartup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 185 NONAME
+	_ZN18CPhoneStateStartup18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 186 NONAME
+	_ZN18CPhoneStateStartup19HandlePhoneStartupLEv @ 187 NONAME
+	_ZN18CPhoneStateStartup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 188 NONAME
+	_ZN18CPhoneStateStartup25HandlePhoneEngineMessageLEii @ 189 NONAME
+	_ZN18CPhoneStateStartup26HandleIdleForegroundEventLEv @ 190 NONAME
+	_ZN18CPhoneStateStartup4NewLEP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 191 NONAME
+	_ZN18CPhoneStateStartupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 192 NONAME
+	_ZN18CPhoneStateStartupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 193 NONAME
+	_ZN18CPhoneStateStartupD0Ev @ 194 NONAME
+	_ZN18CPhoneStateStartupD1Ev @ 195 NONAME
+	_ZN18CPhoneStateStartupD2Ev @ 196 NONAME
+	_ZN18CPhoneUIController11HandleErrorERK12TPEErrorInfo @ 197 NONAME
+	_ZN18CPhoneUIController13HandleMessageEii @ 198 NONAME
+	_ZN18CPhoneUIController14HandleCommandLEi @ 199 NONAME
+	_ZN18CPhoneUIController15DynInitMenuBarLEiP11CEikMenuBar @ 200 NONAME
+	_ZN18CPhoneUIController15HandleKeyEventLERK9TKeyEvent10TEventCode @ 201 NONAME
+	_ZN18CPhoneUIController15ProcessCommandLEi @ 202 NONAME
+	_ZN18CPhoneUIController16DynInitMenuPaneLEiP12CEikMenuPane @ 203 NONAME
+	_ZN18CPhoneUIController18HandleSystemEventLERK8TWsEvent @ 204 NONAME
+	_ZN18CPhoneUIController19HandlePhoneStartupLEv @ 205 NONAME
+	_ZN18CPhoneUIController20HandleKeyLockEnabledEi @ 206 NONAME
+	_ZN18CPhoneUIController22HandleForegroundEventLEi @ 207 NONAME
+	_ZN18CPhoneUIController24HandleEnvironmentChangeLEi @ 208 NONAME
+	_ZN18CPhoneUIController26HandleIdleForegroundEventLEv @ 209 NONAME
+	_ZN18CPhoneUIController26HandlePhoneFocusLostEventLEv @ 210 NONAME
+	_ZN18CPhoneUIController27HandlePhoneForegroundEventLEv @ 211 NONAME
+	_ZN18CPhoneUIController4NewLEP23MPhoneViewCommandHandle @ 212 NONAME
+	_ZN18CPhoneUIControllerD0Ev @ 213 NONAME
+	_ZN18CPhoneUIControllerD1Ev @ 214 NONAME
+	_ZN18CPhoneUIControllerD2Ev @ 215 NONAME
+	_ZN19CPhoneStateIncoming10ConstructLEv @ 216 NONAME
+	_ZN19CPhoneStateIncoming14HandleCommandLEi @ 217 NONAME
+	_ZN19CPhoneStateIncoming15HandleKeyEventLERK9TKeyEvent10TEventCode @ 218 NONAME
+	_ZN19CPhoneStateIncoming16DynInitMenuPaneLEiP12CEikMenuPane @ 219 NONAME
+	_ZN19CPhoneStateIncoming17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 220 NONAME
+	_ZN19CPhoneStateIncoming20HandleKeyLockEnabledEi @ 221 NONAME
+	_ZN19CPhoneStateIncoming23HandleAudioPlayStoppedLEv @ 222 NONAME
+	_ZN19CPhoneStateIncoming23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 223 NONAME
+	_ZN19CPhoneStateIncoming25HandleNumberEntryClearedLEv @ 224 NONAME
+	_ZN19CPhoneStateIncoming25HandlePhoneEngineMessageLEii @ 225 NONAME
+	_ZN19CPhoneStateIncomingC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 226 NONAME
+	_ZN19CPhoneStateIncomingC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 227 NONAME
+	_ZN19CPhoneStateIncomingD0Ev @ 228 NONAME
+	_ZN19CPhoneStateIncomingD1Ev @ 229 NONAME
+	_ZN19CPhoneStateIncomingD2Ev @ 230 NONAME
+	_ZN20CPhoneReconnectQuery19ShowReconnectQueryLEi @ 231 NONAME
+	_ZN20CPhoneReconnectQuery9InstanceLEv @ 232 NONAME
+	_ZN20CPhoneStateCallSetup10ConstructLEv @ 233 NONAME
+	_ZN20CPhoneStateCallSetup10UpdateCbaLEi @ 234 NONAME
+	_ZN20CPhoneStateCallSetup12OpenMenuBarLEv @ 235 NONAME
+	_ZN20CPhoneStateCallSetup14HandleCommandLEi @ 236 NONAME
+	_ZN20CPhoneStateCallSetup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 237 NONAME
+	_ZN20CPhoneStateCallSetup16UpdateInCallCbaLEv @ 238 NONAME
+	_ZN20CPhoneStateCallSetup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 239 NONAME
+	_ZN20CPhoneStateCallSetup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 240 NONAME
+	_ZN20CPhoneStateCallSetup25HandleNumberEntryClearedLEv @ 241 NONAME
+	_ZN20CPhoneStateCallSetup25HandlePhoneEngineMessageLEii @ 242 NONAME
+	_ZN20CPhoneStateCallSetupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 243 NONAME
+	_ZN20CPhoneStateCallSetupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 244 NONAME
+	_ZN20CPhoneStateCallSetupD0Ev @ 245 NONAME
+	_ZN20CPhoneStateCallSetupD1Ev @ 246 NONAME
+	_ZN20CPhoneStateCallSetupD2Ev @ 247 NONAME
+	_ZNK11CPhoneState11IsKeyLockOnEv @ 248 NONAME
+	_ZNK11CPhoneState12IsAutoLockOnEv @ 249 NONAME
+	_ZNK11CPhoneState14IsSwivelClosedEv @ 250 NONAME
+	_ZNK11CPhoneState17GetBlockedKeyListEv @ 251 NONAME
+	_ZNK11CPhoneState17IsMenuBarVisibleLEv @ 252 NONAME
+	_ZNK11CPhoneState18TopAppIsDisplayedLEv @ 253 NONAME
+	_ZNK11CPhoneState20IsDTMFEditorVisibleLEv @ 254 NONAME
+	_ZNK11CPhoneState23NeedToSendToBackgroundLEv @ 255 NONAME
+	_ZNK11CPhoneState25IsOnScreenDialerSupportedEv @ 256 NONAME
+	_ZNK11CPhoneState26IsCustomizedDialerVisibleLEv @ 257 NONAME
+	_ZNK11CPhoneState8SimStateEv @ 258 NONAME
+	_ZNK15CPhoneStateIdle17IsSpeedDialNumberERK7TDesC16 @ 259 NONAME
+	_ZTI11CPhoneState @ 260 NONAME
+	_ZTI15CPhoneStateIdle @ 261 NONAME
+	_ZTI17CPhoneStateHandle @ 262 NONAME
+	_ZTI17CPhoneStateInCall @ 263 NONAME
+	_ZTI18CPhoneStateMachine @ 264 NONAME
+	_ZTI18CPhoneStateStartup @ 265 NONAME
+	_ZTI18CPhoneUIController @ 266 NONAME
+	_ZTI19CPhoneStateIncoming @ 267 NONAME
+	_ZTI20CPhoneReconnectQuery @ 268 NONAME
+	_ZTI20CPhoneStateCallSetup @ 269 NONAME
+	_ZTI23CPhoneDtmfWaitCharTimer @ 270 NONAME
+	_ZTI23CPhoneKeyEventForwarder @ 271 NONAME
+	_ZTI24CPhoneSystemEventHandler @ 272 NONAME
+	_ZTI26CPhoneRemoteControlHandler @ 273 NONAME
+	_ZTI27CPhoneBtaaDisconnectHandler @ 274 NONAME
+	_ZTV11CPhoneState @ 275 NONAME
+	_ZTV15CPhoneStateIdle @ 276 NONAME
+	_ZTV17CPhoneStateHandle @ 277 NONAME
+	_ZTV17CPhoneStateInCall @ 278 NONAME
+	_ZTV18CPhoneStateMachine @ 279 NONAME
+	_ZTV18CPhoneStateStartup @ 280 NONAME
+	_ZTV18CPhoneUIController @ 281 NONAME
+	_ZTV19CPhoneStateIncoming @ 282 NONAME
+	_ZTV20CPhoneReconnectQuery @ 283 NONAME
+	_ZTV20CPhoneStateCallSetup @ 284 NONAME
+	_ZTV23CPhoneDtmfWaitCharTimer @ 285 NONAME
+	_ZTV23CPhoneKeyEventForwarder @ 286 NONAME
+	_ZTV24CPhoneSystemEventHandler @ 287 NONAME
+	_ZTV26CPhoneRemoteControlHandler @ 288 NONAME
+	_ZTV27CPhoneBtaaDisconnectHandler @ 289 NONAME
+	_ZThn12_N11CPhoneState15DynInitMenuBarLEiP11CEikMenuBar @ 290 NONAME
+	_ZThn12_N11CPhoneState16DynInitMenuPaneLEiP12CEikMenuPane @ 291 NONAME
+	_ZThn12_N11CPhoneState18HandleSystemEventLERK8TWsEvent @ 292 NONAME
+	_ZThn12_N11CPhoneState19HandleCenRepChangeLERK4TUidj @ 293 NONAME
+	_ZThn12_N11CPhoneState19HandlePhoneStartupLEv @ 294 NONAME
+	_ZThn12_N11CPhoneState20HandleKeyLockEnabledEi @ 295 NONAME
+	_ZThn12_N11CPhoneState22HandleForegroundEventLEi @ 296 NONAME
+	_ZThn12_N11CPhoneState22HandlePropertyChangedLERK4TUidji @ 297 NONAME
+	_ZThn12_N11CPhoneState24HandleEnvironmentChangeLEi @ 298 NONAME
+	_ZThn12_N11CPhoneState26HandleIdleForegroundEventLEv @ 299 NONAME
+	_ZThn12_N11CPhoneState26HandlePhoneFocusLostEventLEv @ 300 NONAME
+	_ZThn12_N11CPhoneState27HandlePhoneForegroundEventLEv @ 301 NONAME
+	_ZThn12_N11CPhoneStateD0Ev @ 302 NONAME
+	_ZThn12_N11CPhoneStateD1Ev @ 303 NONAME
+	_ZThn12_N15CPhoneStateIdle26HandleIdleForegroundEventLEv @ 304 NONAME
+	_ZThn12_N15CPhoneStateIdle26HandlePhoneFocusLostEventLEv @ 305 NONAME
+	_ZThn12_N15CPhoneStateIdle27HandlePhoneForegroundEventLEv @ 306 NONAME
+	_ZThn12_N15CPhoneStateIdleD0Ev @ 307 NONAME
+	_ZThn12_N15CPhoneStateIdleD1Ev @ 308 NONAME
+	_ZThn12_N17CPhoneStateInCallD0Ev @ 309 NONAME
+	_ZThn12_N17CPhoneStateInCallD1Ev @ 310 NONAME
+	_ZThn12_N18CPhoneStateStartup19HandlePhoneStartupLEv @ 311 NONAME
+	_ZThn12_N18CPhoneStateStartup26HandleIdleForegroundEventLEv @ 312 NONAME
+	_ZThn12_N18CPhoneStateStartupD0Ev @ 313 NONAME
+	_ZThn12_N18CPhoneStateStartupD1Ev @ 314 NONAME
+	_ZThn12_N18CPhoneUIController15DynInitMenuBarLEiP11CEikMenuBar @ 315 NONAME
+	_ZThn12_N18CPhoneUIController16DynInitMenuPaneLEiP12CEikMenuPane @ 316 NONAME
+	_ZThn12_N18CPhoneUIController18HandleSystemEventLERK8TWsEvent @ 317 NONAME
+	_ZThn12_N18CPhoneUIController19HandlePhoneStartupLEv @ 318 NONAME
+	_ZThn12_N18CPhoneUIController20HandleKeyLockEnabledEi @ 319 NONAME
+	_ZThn12_N18CPhoneUIController22HandleForegroundEventLEi @ 320 NONAME
+	_ZThn12_N18CPhoneUIController24HandleEnvironmentChangeLEi @ 321 NONAME
+	_ZThn12_N18CPhoneUIController26HandleIdleForegroundEventLEv @ 322 NONAME
+	_ZThn12_N18CPhoneUIController26HandlePhoneFocusLostEventLEv @ 323 NONAME
+	_ZThn12_N18CPhoneUIController27HandlePhoneForegroundEventLEv @ 324 NONAME
+	_ZThn12_N18CPhoneUIControllerD0Ev @ 325 NONAME
+	_ZThn12_N18CPhoneUIControllerD1Ev @ 326 NONAME
+	_ZThn12_N19CPhoneStateIncoming16DynInitMenuPaneLEiP12CEikMenuPane @ 327 NONAME
+	_ZThn12_N19CPhoneStateIncoming20HandleKeyLockEnabledEi @ 328 NONAME
+	_ZThn12_N19CPhoneStateIncomingD0Ev @ 329 NONAME
+	_ZThn12_N19CPhoneStateIncomingD1Ev @ 330 NONAME
+	_ZThn12_N20CPhoneStateCallSetupD0Ev @ 331 NONAME
+	_ZThn12_N20CPhoneStateCallSetupD1Ev @ 332 NONAME
+	_ZThn16_N11CPhoneState14HandleCommandLEi @ 333 NONAME
+	_ZThn16_N11CPhoneState15ProcessCommandLEi @ 334 NONAME
+	_ZThn16_N11CPhoneStateD0Ev @ 335 NONAME
+	_ZThn16_N11CPhoneStateD1Ev @ 336 NONAME
+	_ZThn16_N15CPhoneStateIdle14HandleCommandLEi @ 337 NONAME
+	_ZThn16_N15CPhoneStateIdle15ProcessCommandLEi @ 338 NONAME
+	_ZThn16_N15CPhoneStateIdleD0Ev @ 339 NONAME
+	_ZThn16_N15CPhoneStateIdleD1Ev @ 340 NONAME
+	_ZThn16_N17CPhoneStateInCall14HandleCommandLEi @ 341 NONAME
+	_ZThn16_N17CPhoneStateInCallD0Ev @ 342 NONAME
+	_ZThn16_N17CPhoneStateInCallD1Ev @ 343 NONAME
+	_ZThn16_N18CPhoneStateStartupD0Ev @ 344 NONAME
+	_ZThn16_N18CPhoneStateStartupD1Ev @ 345 NONAME
+	_ZThn16_N18CPhoneUIController14HandleCommandLEi @ 346 NONAME
+	_ZThn16_N18CPhoneUIController15ProcessCommandLEi @ 347 NONAME
+	_ZThn16_N18CPhoneUIControllerD0Ev @ 348 NONAME
+	_ZThn16_N18CPhoneUIControllerD1Ev @ 349 NONAME
+	_ZThn16_N19CPhoneStateIncoming14HandleCommandLEi @ 350 NONAME
+	_ZThn16_N19CPhoneStateIncomingD0Ev @ 351 NONAME
+	_ZThn16_N19CPhoneStateIncomingD1Ev @ 352 NONAME
+	_ZThn16_N20CPhoneStateCallSetup14HandleCommandLEi @ 353 NONAME
+	_ZThn16_N20CPhoneStateCallSetupD0Ev @ 354 NONAME
+	_ZThn16_N20CPhoneStateCallSetupD1Ev @ 355 NONAME
+	_ZThn20_N11CPhoneState20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 356 NONAME
+	_ZThn20_N11CPhoneStateD0Ev @ 357 NONAME
+	_ZThn20_N11CPhoneStateD1Ev @ 358 NONAME
+	_ZThn20_N15CPhoneStateIdle20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 359 NONAME
+	_ZThn20_N15CPhoneStateIdleD0Ev @ 360 NONAME
+	_ZThn20_N15CPhoneStateIdleD1Ev @ 361 NONAME
+	_ZThn20_N17CPhoneStateInCallD0Ev @ 362 NONAME
+	_ZThn20_N17CPhoneStateInCallD1Ev @ 363 NONAME
+	_ZThn20_N18CPhoneStateStartupD0Ev @ 364 NONAME
+	_ZThn20_N18CPhoneStateStartupD1Ev @ 365 NONAME
+	_ZThn20_N19CPhoneStateIncomingD0Ev @ 366 NONAME
+	_ZThn20_N19CPhoneStateIncomingD1Ev @ 367 NONAME
+	_ZThn20_N20CPhoneStateCallSetupD0Ev @ 368 NONAME
+	_ZThn20_N20CPhoneStateCallSetupD1Ev @ 369 NONAME
+	_ZThn24_N11CPhoneState19SetDivertIndicationEi @ 370 NONAME
+	_ZThn24_N11CPhoneStateD0Ev @ 371 NONAME
+	_ZThn24_N11CPhoneStateD1Ev @ 372 NONAME
+	_ZThn24_N15CPhoneStateIdleD0Ev @ 373 NONAME
+	_ZThn24_N15CPhoneStateIdleD1Ev @ 374 NONAME
+	_ZThn24_N17CPhoneStateInCallD0Ev @ 375 NONAME
+	_ZThn24_N17CPhoneStateInCallD1Ev @ 376 NONAME
+	_ZThn24_N18CPhoneStateStartupD0Ev @ 377 NONAME
+	_ZThn24_N18CPhoneStateStartupD1Ev @ 378 NONAME
+	_ZThn24_N19CPhoneStateIncomingD0Ev @ 379 NONAME
+	_ZThn24_N19CPhoneStateIncomingD1Ev @ 380 NONAME
+	_ZThn24_N20CPhoneStateCallSetupD0Ev @ 381 NONAME
+	_ZThn24_N20CPhoneStateCallSetupD1Ev @ 382 NONAME
+	_ZThn28_NK11CPhoneState17GetBlockedKeyListEv @ 383 NONAME
+	_ZThn32_N11CPhoneState25HandleNumberEntryClearedLEv @ 384 NONAME
+	_ZThn32_N15CPhoneStateIdle25HandleNumberEntryClearedLEv @ 385 NONAME
+	_ZThn32_N17CPhoneStateInCall25HandleNumberEntryClearedLEv @ 386 NONAME
+	_ZThn32_N19CPhoneStateIncoming25HandleNumberEntryClearedLEv @ 387 NONAME
+	_ZThn32_N20CPhoneStateCallSetup25HandleNumberEntryClearedLEv @ 388 NONAME
+	_ZThn36_N11CPhoneState23HandleNumberEntryEditedEv @ 389 NONAME
+	_ZThn36_N11CPhoneStateD0Ev @ 390 NONAME
+	_ZThn36_N11CPhoneStateD1Ev @ 391 NONAME
+	_ZThn36_N15CPhoneStateIdleD0Ev @ 392 NONAME
+	_ZThn36_N15CPhoneStateIdleD1Ev @ 393 NONAME
+	_ZThn36_N17CPhoneStateInCallD0Ev @ 394 NONAME
+	_ZThn36_N17CPhoneStateInCallD1Ev @ 395 NONAME
+	_ZThn36_N18CPhoneStateStartupD0Ev @ 396 NONAME
+	_ZThn36_N18CPhoneStateStartupD1Ev @ 397 NONAME
+	_ZThn36_N19CPhoneStateIncomingD0Ev @ 398 NONAME
+	_ZThn36_N19CPhoneStateIncomingD1Ev @ 399 NONAME
+	_ZThn36_N20CPhoneStateCallSetupD0Ev @ 400 NONAME
+	_ZThn36_N20CPhoneStateCallSetupD1Ev @ 401 NONAME
+	_ZThn40_NK11CPhoneState11IsKeyLockOnEv @ 402 NONAME
+	_ZThn40_NK11CPhoneState12IsAutoLockOnEv @ 403 NONAME
+	_ZThn4_N11CPhoneState12HandleErrorLERK12TPEErrorInfo @ 404 NONAME
+	_ZThn4_N11CPhoneState25HandlePhoneEngineMessageLEii @ 405 NONAME
+	_ZThn4_N11CPhoneStateD0Ev @ 406 NONAME
+	_ZThn4_N11CPhoneStateD1Ev @ 407 NONAME
+	_ZThn4_N15CPhoneStateIdle25HandlePhoneEngineMessageLEii @ 408 NONAME
+	_ZThn4_N15CPhoneStateIdleD0Ev @ 409 NONAME
+	_ZThn4_N15CPhoneStateIdleD1Ev @ 410 NONAME
+	_ZThn4_N17CPhoneStateInCall25HandlePhoneEngineMessageLEii @ 411 NONAME
+	_ZThn4_N17CPhoneStateInCallD0Ev @ 412 NONAME
+	_ZThn4_N17CPhoneStateInCallD1Ev @ 413 NONAME
+	_ZThn4_N18CPhoneStateMachine11ChangeStateEi @ 414 NONAME
+	_ZThn4_N18CPhoneStateMachine11PhoneEngineEv @ 415 NONAME
+	_ZThn4_N18CPhoneStateMachine12PhoneStorageEv @ 416 NONAME
+	_ZThn4_N18CPhoneStateMachine14SetPhoneEngineEP13MPEPhoneModel @ 417 NONAME
+	_ZThn4_N18CPhoneStateMachine15PhoneEngineInfoEv @ 418 NONAME
+	_ZThn4_N18CPhoneStateMachine18CreatePhoneEngineLER14MEngineMonitor @ 419 NONAME
+	_ZThn4_N18CPhoneStateMachine22SendPhoneEngineMessageEi @ 420 NONAME
+	_ZThn4_N18CPhoneStateMachine5StateEv @ 421 NONAME
+	_ZThn4_N18CPhoneStateMachine9SetCallIdEi @ 422 NONAME
+	_ZThn4_N18CPhoneStateMachineD0Ev @ 423 NONAME
+	_ZThn4_N18CPhoneStateMachineD1Ev @ 424 NONAME
+	_ZThn4_N18CPhoneStateStartup25HandlePhoneEngineMessageLEii @ 425 NONAME
+	_ZThn4_N18CPhoneStateStartupD0Ev @ 426 NONAME
+	_ZThn4_N18CPhoneStateStartupD1Ev @ 427 NONAME
+	_ZThn4_N18CPhoneUIController11HandleErrorERK12TPEErrorInfo @ 428 NONAME
+	_ZThn4_N18CPhoneUIController13HandleMessageEii @ 429 NONAME
+	_ZThn4_N19CPhoneStateIncoming25HandlePhoneEngineMessageLEii @ 430 NONAME
+	_ZThn4_N19CPhoneStateIncomingD0Ev @ 431 NONAME
+	_ZThn4_N19CPhoneStateIncomingD1Ev @ 432 NONAME
+	_ZThn4_N20CPhoneStateCallSetup25HandlePhoneEngineMessageLEii @ 433 NONAME
+	_ZThn4_N20CPhoneStateCallSetupD0Ev @ 434 NONAME
+	_ZThn4_N20CPhoneStateCallSetupD1Ev @ 435 NONAME
+	_ZThn8_N11CPhoneState14IsNoteVisibleLEv @ 436 NONAME
+	_ZThn8_N11CPhoneState15HandleKeyEventLERK9TKeyEvent10TEventCode @ 437 NONAME
+	_ZThn8_N11CPhoneState15HandleLongHashLEv @ 438 NONAME
+	_ZThn8_N11CPhoneState17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 439 NONAME
+	_ZThn8_N11CPhoneState18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 440 NONAME
+	_ZThn8_N11CPhoneState23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 441 NONAME
+	_ZThn8_N11CPhoneState24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 442 NONAME
+	_ZThn8_N11CPhoneState35IsAlphanumericSupportedAndCharInputERK9TKeyEvent @ 443 NONAME
+	_ZThn8_N11CPhoneStateD0Ev @ 444 NONAME
+	_ZThn8_N11CPhoneStateD1Ev @ 445 NONAME
+	_ZThn8_N15CPhoneStateIdle15HandleKeyEventLERK9TKeyEvent10TEventCode @ 446 NONAME
+	_ZThn8_N15CPhoneStateIdle17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 447 NONAME
+	_ZThn8_N15CPhoneStateIdleD0Ev @ 448 NONAME
+	_ZThn8_N15CPhoneStateIdleD1Ev @ 449 NONAME
+	_ZThn8_N17CPhoneStateInCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 450 NONAME
+	_ZThn8_N17CPhoneStateInCallD0Ev @ 451 NONAME
+	_ZThn8_N17CPhoneStateInCallD1Ev @ 452 NONAME
+	_ZThn8_N18CPhoneStateStartup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 453 NONAME
+	_ZThn8_N18CPhoneStateStartup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 454 NONAME
+	_ZThn8_N18CPhoneStateStartup18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 455 NONAME
+	_ZThn8_N18CPhoneStateStartup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 456 NONAME
+	_ZThn8_N18CPhoneStateStartupD0Ev @ 457 NONAME
+	_ZThn8_N18CPhoneStateStartupD1Ev @ 458 NONAME
+	_ZThn8_N18CPhoneUIController15HandleKeyEventLERK9TKeyEvent10TEventCode @ 459 NONAME
+	_ZThn8_N18CPhoneUIControllerD0Ev @ 460 NONAME
+	_ZThn8_N18CPhoneUIControllerD1Ev @ 461 NONAME
+	_ZThn8_N19CPhoneStateIncoming15HandleKeyEventLERK9TKeyEvent10TEventCode @ 462 NONAME
+	_ZThn8_N19CPhoneStateIncoming17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 463 NONAME
+	_ZThn8_N19CPhoneStateIncoming23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 464 NONAME
+	_ZThn8_N19CPhoneStateIncomingD0Ev @ 465 NONAME
+	_ZThn8_N19CPhoneStateIncomingD1Ev @ 466 NONAME
+	_ZThn8_N20CPhoneStateCallSetup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 467 NONAME
+	_ZThn8_N20CPhoneStateCallSetup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 468 NONAME
+	_ZThn8_N20CPhoneStateCallSetup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 469 NONAME
+	_ZThn8_N20CPhoneStateCallSetupD0Ev @ 470 NONAME
+	_ZThn8_N20CPhoneStateCallSetupD1Ev @ 471 NONAME
+	_ZThn8_NK11CPhoneState17IsMenuBarVisibleLEv @ 472 NONAME
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuicontrol/inc/cphonecallheadermanager.h
--- a/phoneapp/phoneuicontrol/inc/cphonecallheadermanager.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuicontrol/inc/cphonecallheadermanager.h	Fri Apr 16 14:58:25 2010 +0300
@@ -21,10 +21,6 @@
 
 //INCLUDES
 #include <e32base.h>
-// <-- QT PHONE START -->
-//#include <bmbubblemanager.h>
-// <-- QT PHONE END -->
-
 #include "mphonecallheadermanagerutility.h"
 #include "mphonestatemachine.h"
 #include "mphoneviewcommandhandle.h"
@@ -89,7 +85,6 @@
         void DisplayHeaderForOutgoingCallL(
                 const TInt aCallId );
 
-// <-- QT PHONE START -->       
         /**
         * Sets the call header type used in the call bubble.
         * @param aCallHeaderType, call header type.
@@ -101,7 +96,6 @@
         * Returns the set call header type.
         */
         TInt CallHeaderType() const;
-// <-- QT PHONE END -->
                 
         /**
         * Sets divert indication to call header if necessary
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuicontrol/inc/cphonestate.h
--- a/phoneapp/phoneuicontrol/inc/cphonestate.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuicontrol/inc/cphonestate.h	Fri Apr 16 14:58:25 2010 +0300
@@ -24,10 +24,6 @@
 #include <w32std.h>
 #include <remconcoreapitargetobserver.h>
 #include <MProfileEngine.h>
-// <-- QT PHONE START -->
-//#include <bmbubblemanager.h>
-// <-- QT PHONE START -->
-
 #include "mphonestate.h"
 #include "mphoneviewcommandhandle.h"
 #include "cphonecbamanager.h"
@@ -645,9 +641,7 @@
         /**
         * Sets the call header type used in the call bubble.
         */
-// <-- QT PHONE START -->
         IMPORT_C void SetCallHeaderType( TInt aCallHeaderType );
-// <-- QT PHONE END -->
 
         /**
         * Handles situation when hash key has been kept down long
@@ -752,6 +746,11 @@
         * Returns customized dialer CBA resource id
         */
         IMPORT_C TInt CustomizedDialerCbaResourceIdL();
+        
+        /**
+        * Opens soft reject message editor.
+        */
+        IMPORT_C virtual void OpenSoftRejectMessageEditorL();
 
     protected: // NumberEntry functions.
 
@@ -848,6 +847,11 @@
          * Sets toolbar loudspeaker button enabled.
          */
          IMPORT_C void SetToolbarButtonLoudspeakerEnabled();
+         
+         /**
+         * Sets state of TitleBar Back button 
+         */
+         IMPORT_C void SetBackButtonActive( TBool aActive );
 
     protected:
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuicontrol/inc/cphonestatehandle.h
--- a/phoneapp/phoneuicontrol/inc/cphonestatehandle.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuicontrol/inc/cphonestatehandle.h	Fri Apr 16 14:58:25 2010 +0300
@@ -67,9 +67,7 @@
         * Returns the state machine
         * @return State machine
         */
-// <-- QT PHONE START --> 
         IMPORT_C MPhoneStateMachine* StateMachine();
-// <-- QT PHONE END --> 
         
         /**
         * Returns the view command handle
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuicontrol/inc/cphonestateincoming.h
--- a/phoneapp/phoneuicontrol/inc/cphonestateincoming.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuicontrol/inc/cphonestateincoming.h	Fri Apr 16 14:58:25 2010 +0300
@@ -135,7 +135,7 @@
         /**
         * Open soft reject message editor
         */
-        void OpenSoftRejectMessageEditorL();
+        void OpenSoftRejectMessageL();
 
         /**
         * Indicator if soft reject message editor is displayed
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuicontrol/inc/tphonecallheaderparam.h
--- a/phoneapp/phoneuicontrol/inc/tphonecallheaderparam.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuicontrol/inc/tphonecallheaderparam.h	Fri Apr 16 14:58:25 2010 +0300
@@ -20,10 +20,6 @@
 #define TPHONECALLHEADERPARAM_H
 
 //INCLUDES
-// <-- QT PHONE START -->
-// #include    <bmbubblemanager2.h>
-// <-- QT PHONE END -->
-
 #include    "mpeengineinfo.h"
 #include    "tphonecmdparamcallheaderdata.h"
 
@@ -89,7 +85,6 @@
                 const TBool aVideoCall,
                 TPhoneCmdParamCallHeaderData* aCallHeaderData );
 
-// <-- QT PHONE START -->        
         /**
         * Sets the call header type used in the call bubble.
         * @param aCallHeaderType, call header type.
@@ -101,7 +96,6 @@
         * of call bubble.
         */
         TInt CallHeaderType() const;
-// <-- QT PHONE END -->
             
         /**
         * Setter for divert indication showing in bubble.
@@ -175,10 +169,7 @@
         void GetCNAPText( 
                const TInt aCallId,
                TDes& aData, 
-// <-- QT PHONE START -->
-//               CBubbleManager::TPhoneClippingDirection& aDirection ) const;
                TPhoneCmdParamCallHeaderData::TPhoneTextClippingDirection& aDirection ) const;
-// <-- QT PHONE END -->
         
         /**
         * Check if contact is available(RemoteName or RemoteCompanyName),
@@ -258,9 +249,7 @@
         
         MPhoneCallHeaderManagerUtility& iManagerUtility;
         MPhoneStateMachine& iStateMachine;
-// <-- QT PHONE START -->
         TInt iCallHeaderType;
-// <-- QT PHONE END -->
         TBool iSetDivertIndication;
             
     };
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuicontrol/src/cphonecallheadermanager.cpp
--- a/phoneapp/phoneuicontrol/src/cphonecallheadermanager.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuicontrol/src/cphonecallheadermanager.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -268,7 +268,6 @@
 //  CPhoneCallHeaderManager::SetCallHeaderType
 // ---------------------------------------------------------------------------
 //
-// <-- QT PHONE START --> 
 void CPhoneCallHeaderManager::SetCallHeaderType( 
     TInt aCallHeaderType )
     {
@@ -282,7 +281,6 @@
 //
 TInt CPhoneCallHeaderManager::CallHeaderType() const
     {
-// <-- QT PHONE END --> 
     __LOGMETHODSTARTEND( EPhoneControl, "CPhoneCallHeaderManager::CallHeaderType() ");
     return iCallHeaderParam->CallHeaderType();            
     }
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuicontrol/src/cphonecbamanager.cpp
--- a/phoneapp/phoneuicontrol/src/cphonecbamanager.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuicontrol/src/cphonecbamanager.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -22,9 +22,6 @@
 #include "mphonestatemachine.h"
 
 #include <featmgr.h>
-// <-- QT PHONE START -->
-//#include <callhandlingui.rsg>
-// <-- QT PHONE END -->
 
 #include "phonerssbase.h"
 #include "phoneui.pan"
@@ -458,36 +455,7 @@
         const TBool /*aSoftRejectActivated*/ )
     {
     __LOGMETHODSTARTEND(EPhoneControl, "CPhoneCbaManager::GetIncomingCallSilenceCBA ()" );
-// <-- QT PHONE START -->
     TInt ret = EPhoneCallHandlingIncomingCBA;
-    /*TInt ret = EPhoneCallHandlingIncomingSoftRejectCBA;
-    
-    //Get incoming call touchpane button set
-    TPhoneCmdParamInteger touchpaneButtonsParam;
-    touchpaneButtonsParam.SetInteger( CPhoneMainResourceResolver::Instance()->
-                             ResolveResourceID( EPhoneIncomingCallButtons ) );
-
-    if ( touchpaneButtonsParam.Integer() 
-         == R_PHONEUI_INCOMING_CALL_SILENCE_BUTTONS )
-        {
-        aSoftRejectActivated ? 
-        ret = EPhoneCallHandlingIncomingSoftRejectCBA:
-        ret = EPhoneCallHandlingIncomingRejectCBA;
-        }
-    else
-        {
-        // Check if the ringtone has been silenced. If it is, then show
-        // "Send Message" in RSK, else show "Silence".
-        iRingtoneSilenced ?
-            ret = EPhoneCallHandlingIncomingSoftRejectCBA :
-            ret = EPhoneCallHandlingIncomingCBA;
-        }
-
-    // reset the iRingtoneSilence so it won't cause any problems with
-    // next calls.
-    SetRingtoneSilencedStatus( EFalse );*/
-    
-// <-- QT PHONE END -->
     return ret;
     }
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuicontrol/src/cphonekeyeventforwarder.cpp
--- a/phoneapp/phoneuicontrol/src/cphonekeyeventforwarder.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuicontrol/src/cphonekeyeventforwarder.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -32,14 +32,6 @@
 #include "phonelogger.h"
 #include "phoneui.pan"
 
-// CONSTANTS
-
-//Avkon P&S keys
-// <-- QT PHONE START-->
-//const TUid KCRUidAvkon = { 0x101F876E };
-//const TUint32 KAknKeyBoardLayout = 0x0000000B;
-// <-- QT PHONE END-->
-
 // ============================ MEMBER FUNCTIONS ===============================
 
 // -----------------------------------------------------------------------------
@@ -229,12 +221,7 @@
         "CPhoneKeyEventForwarder::ConvertHalfQwertySpecialChar");
 
     TBool ret( EFalse );
-// <-- QT PHONE START-->    
-    /*TInt keyboard( CPhonePubSubProxy::Instance()->Value(
-          KCRUidAvkon,
-          KAknKeyBoardLayout ) );*/
     TInt keyboard(KErrNotFound);
-// <-- QT PHONE END-->
     
     if( keyboard == EPtiKeyboardHalfQwerty )
         {
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuicontrol/src/cphonenumberentrymanager.cpp
--- a/phoneapp/phoneuicontrol/src/cphonenumberentrymanager.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuicontrol/src/cphonenumberentrymanager.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -17,9 +17,6 @@
 
 
 #include <StringLoader.h>
-// <-- QT PHONE START --> 
-//#include <activeidle2domainpskeys.h>
-// <-- QT PHONE END --> 
 #include <featmgr.h>
 #include <eikenv.h>
 
@@ -226,10 +223,8 @@
     {
     __LOGMETHODSTARTEND( EPhoneControl, "CPhoneNumberEntryManager::HandleCreateNumberEntryL() ");
     
-     const TBool autoLcokOn = iState->IsAutoLockOn();
-// <-- QT PHONE START --> 
+    const TBool autoLcokOn = iState->IsAutoLockOn();
     const TBool idleVal = false;
-    //const TBool idleVal = CPhonePubSubProxy::Instance()->Value( KPSUidAiInformation, KActiveIdleState );
     const TBool queryActive = iState->IsAnyQueryActiveL();
     const TBool menuBarVisible = iState->IsMenuBarVisibleL();
     
@@ -237,7 +232,6 @@
         ( idleVal /*== EPSAiForeground*/ ) ||
         ( menuBarVisible || queryActive ) )
         {
-// <-- QT PHONE END -->         
         __PHONELOG( EBasic, EPhoneControl, 
              "CPhoneNumberEntryManager::HandleCreateNumberEntryL() NE NOT CREATED" );
         __PHONELOG2( EBasic, EPhoneControl, 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuicontrol/src/cphonereconnectquery.cpp
--- a/phoneapp/phoneuicontrol/src/cphonereconnectquery.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuicontrol/src/cphonereconnectquery.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -17,11 +17,7 @@
 
 
 // INCLUDE FILES
-// <-- QT PHONE START -->
-//#include <mcauireconnectqueryobserver.h>
-// <-- QT PHONE END -->
 #include <mpeengineinfo.h>
-
 #include "cphonereconnectquery.h"
 #include "phoneconstants.h"
 #include "phonelogger.h"
@@ -30,10 +26,6 @@
 #include "cphonestatehandle.h"
 #include "tphonecmdparamboolean.h"
 #include "tphonecmdparaminteger.h"
-// <-- QT PHONE START -->
-//#include "tphonecmdparammessageeditor.h"
-//#include "tphonecmdparamreconnectquery.h"
-// <-- QT PHONE END -->
 #include "cphonemainresourceresolver.h"
 
 // ================= MEMBER FUNCTIONS =======================
@@ -111,19 +103,6 @@
 void CPhoneReconnectQuery::HandleTimeOutL()
     {
     __LOGMETHODSTARTEND( EPhoneControl, "CPhoneReconnectQuery::HandleTimeOutL( ) ");
-// <-- QT PHONE START -->
-/* TPhoneCmdParamReconnectQuery reconQueryParam( *this );
-    // Recipient number to CallUIs reconnect query in case message selected
-    TPtrC phoneNumber( CPhoneStateHandle::Instance()->StateMachine()->
-        PhoneEngineInfo()->PhoneNumber() );
-    reconQueryParam.SetPhoneNumber( phoneNumber );
-    reconQueryParam.SetIncludeVideoOption( iIncludeVideo );
-    // Display reconnect query
-    CPhoneStateHandle::Instance()->ViewCommandHandle()->
-        ExecuteCommandL( EPhoneViewShowQuery, &reconQueryParam );
-    iDisplayingQuery = ETrue;*/
-// <-- QT PHONE END -->
-
     }
 
 // -----------------------------------------------------------
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuicontrol/src/cphonestate.cpp
--- a/phoneapp/phoneuicontrol/src/cphonestate.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuicontrol/src/cphonestate.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -32,32 +32,23 @@
 #include <AknUtils.h>
 #include <telephonyvariant.hrh>
 #include <aknsoundsystem.h>
-// <-- QT PHONE START --> 
-//#include <cphcntprofileengine.h>
-// <-- QT PHONE END --> 
 #include <wlaninternalpskeys.h>
 #include <btengdomainpskeys.h>
 #include <btengdomaincrkeys.h>
 #include <settingsinternalcrkeys.h>
 #include <starterclient.h>
 #include <rsssettings.h>
-#include <UikonInternalPSKeys.h>
+#include <uikoninternalpskeys.h>
 #include <telephonydomainpstypes.h>
 #include <telinformationpskeys.h>
-// <-- QT PHONE START --> 
-//#include <activeidle2domainpskeys.h>
-// <-- QT PHONE END --> 
 #include <coreapplicationuisdomainpskeys.h>
 #include <mccecall.h>
 #include <ccpdefs.h>
 #include <LogsDomainCRKeys.h>
 #include <spsettings.h>
-#include <ScreensaverInternalPSKeys.h>
 #include <startupdomainpskeys.h>
 #include <MediatorDomainUIDs.h>
-// <-- QT PHONE START --> 
 #include <videotelcontrolmediatorapi.h>
-// <-- QT PHONE END --> 
 #include <textresolver.h>
 #include <phoneappvoipcommands.hrh>
 #include <hwrmdomainpskeys.h>
@@ -73,16 +64,13 @@
 #include "tphonecmdparamcallheaderdata.h"
 #include "tphonecmdparamincallindicatordata.h"
 #include "tphonecmdparamnote.h"
-#include "tphonecmdparamKeycapture.h"
+#include "tphonecmdparamkeycapture.h"
 #include "tphonecmdparamglobalnote.h"
 #include "tphonecmdparamquery.h"
 #include "tphonecmdparamstring.h"
-// <-- QT PHONE START --> 
-//#include "tphonecmdparammessageeditor.h"
-// <-- QT PHONE END --> 
 #include "tphonecmdparamcallstatedata.h"
 #include "tphonecmdparambitmap.h"
-#include "tphonecmdparamAudioOutput.h"
+#include "tphonecmdparamaudiooutput.h"
 #include "tphonecmdparamaudioavailability.h"
 #include "tphonecmdparamappinfo.h"
 #include "tphonecmdparamtranseffect.h"
@@ -112,6 +100,7 @@
 #include "cphonecontinueemergencycallcommand.h"
 #include "cphonecallheadermanager.h"
 #include "cphonenumberentrymanager.h"
+#include "tphonecmdparamsfidata.h" 
 #include "mphonestorage.h"
 
 // ================= MEMBER FUNCTIONS =======================
@@ -658,14 +647,9 @@
         && !IsAnyQueryActiveL()
         && !IsMenuBarVisibleL() )
         {
-// <-- QT PHONE START -->
-        //if( IsKeyEventFurtherProcessedL( aKeyEvent ))
-        //    {
         // Send the key event to the phone engine.
         SendKeyEventL( aKeyEvent, aEventCode );
-        //    }
         }
-// <-- QT PHONE END -->
     }
 
 // -----------------------------------------------------------------------------
@@ -808,13 +792,6 @@
             // check, that there really was a call established before completing SAT request
             if( aErrorInfo.iCallId != KPECallIdNotUsed )
                 {
-// <-- QT PHONE START --> 
-                /*// Complete sat request
-                if ( iStateMachine->PhoneEngineInfo()->CallOrigin( aErrorInfo.iCallId ) == EPECallOriginSAT )
-                    {
-                    CompleteSatRequestL( aErrorInfo.iCallId );
-                    }*/
-// <-- QT PHONE END --> 
                 }
 
             // remove number entry
@@ -833,10 +810,6 @@
         default:
             break;
         }
-    // clear call blacklist if call failure occurs
-// <-- QT PHONE START --> 
-//    CPhoneClearBlacklist::Instance()->ClearBlackListOnNextKey();          
-// <-- QT PHONE END --> 
     }
 
 // -----------------------------------------------------------
@@ -848,27 +821,12 @@
     {
      __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::HandleChangedCallDurationL() ");
     // Get the call duration
-    TTime time( 0 );
-    TTimeIntervalSeconds timeInterval =
+    TTimeIntervalSeconds seconds =
         iStateMachine->PhoneEngineInfo()->CallDuration( aCallId );
-    time += timeInterval;
-
-    // Read format string from AVKON resource
-    TBuf<KPhoneMaxCharsInNote> timeDurationFormatString( KNullDesC );
-    LoadResource( timeDurationFormatString, EPhoneCallDurationFormatString );
-
-    // Format the time
-    TBuf<KPhoneMaxTimeDisplayTextLength> timeString( KNullDesC );
-    time.FormatL( timeString, timeDurationFormatString );
-
-    // Localize time format
-    AknTextUtils::LanguageSpecificNumberConversion( timeString );
-
-    // update the call header call duration
-    iViewCommandHandle->ExecuteCommandL(
-        EPhoneViewUpdateCallHeaderCallDuration,
-        aCallId,
-        timeString );
+
+    TPhoneCmdParamInteger time;
+    time.SetInteger(seconds.Int());
+    iViewCommandHandle->ExecuteCommandL(EPhoneViewUpdateCallHeaderCallDuration, aCallId, &time);
     }
 
 // -----------------------------------------------------------------------------
@@ -891,16 +849,6 @@
                 aCallId );
         CPhoneReconnectQuery::InstanceL()->ShowReconnectQueryL( ETrue );
         }
-    else
-        {
-// <-- QT PHONE START --> 
-        /*// Complete sat request
-        if ( iStateMachine->PhoneEngineInfo()->CallOrigin( aCallId ) == EPECallOriginSAT )
-            {
-            CompleteSatRequestL( aCallId );
-            }*/
-// <-- QT PHONE END --> 
-        }
     }
 
 // -----------------------------------------------------------
@@ -931,11 +879,7 @@
     iViewCommandHandle->ExecuteCommandL( EPhoneViewStopRingTone );
 
     iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId,
-        &callHeaderParam );
-    
-// <-- QT PHONE START --> 
-//    CPhoneClearBlacklist::Instance()->ClearBlackListOnNextKey();
-// <-- QT PHONE END --> 
+        &callHeaderParam );    
     }
 
 // -----------------------------------------------------------
@@ -1314,46 +1258,7 @@
 //
 EXPORT_C void CPhoneState::HandlePhoneForegroundEventL()
     {
-// <-- QT PHONE START --> 
-    /*__LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::HandlePhoneForegroundEventL( ) ");
-
-    // Force Idle to the foreground if a foreground event is received,
-    // but Idle is the top application
-
-    const TBool idleIsTopApp = iViewCommandHandle->HandleCommandL(
-        EPhoneViewIsIdleTopApp ) ==
-        EPhoneViewResponseSuccess ;
-
-    if ( !IsOnScreenDialerSupported() && idleIsTopApp )
-        {
-        TBool activatePhone = CPhonePubSubProxy::Instance()->Value(
-            KPSUidAiInformation, KActiveIdleState ) == EPSAiNumberEntry;
-        if ( activatePhone )
-            {
-            // Set Phone as the top application
-            TPhoneCmdParamInteger uidParam;
-            uidParam.SetInteger( KUidPhoneApplication.iUid );
-            iViewCommandHandle->ExecuteCommandL( EPhoneViewSetTopApplication,
-                &uidParam );
-            NumberEntryManagerL()->CreateNumberEntryL();
-            SetNumberEntryVisibilityL(ETrue);
-            }
-        else
-            {
-            TPhoneCmdParamBoolean isSecurityMode;
-            iViewCommandHandle->ExecuteCommandL( EPhoneViewGetSecurityModeStatus, &isSecurityMode );
-
-            if ( !isSecurityMode.Boolean() )
-                {
-                __PHONELOG( EBasic, EPhoneControl,
-                  "CPhoneState::HandlePhoneForegroundEventL - Force Idle to the foreground" );
-                // Bring Idle app to the foreground
-                iViewCommandHandle->ExecuteCommandL( EPhoneViewBringIdleToForeground );
-                }
-            }
-        }*/
-// <-- QT PHONE END --> 
-     }
+    }
 
 // -----------------------------------------------------------
 // CPhoneState::HandlePhoneFocusLostEventL
@@ -1750,9 +1655,15 @@
             ShowVideoCallOutOfMemoryNoteL();
             DisconnectCallL();
             break;
-
+            
+        case EPhoneCallComingCmdSoftReject:
+            // Open Soft reject message editor
+            OpenSoftRejectMessageEditorL();
+            break;
+            
         default:
-            if ( IsOnScreenDialerSupported() )
+
+            /*if ( IsOnScreenDialerSupported() )
                 {
                 // Offer command to view.
                 TPhoneViewResponseId resId =
@@ -1763,7 +1674,8 @@
                     commandStatus = EFalse;
                     }
                 }
-            else
+            else*/
+
                 {
                 commandStatus = EFalse;
                 }
@@ -1904,27 +1816,6 @@
         iStateMachine->SendPhoneEngineMessage(
             MPEPhoneModel::EPEMessageSetAudioVolume );
         }
-// <-- QT PHONE START --> 
-   /* else 
-        {
-        CAknKeySoundSystem* keySounds = 
-            static_cast<CAknAppUi*>( iEnv.EikAppUi() )
-                ->KeySounds();
-                
-        if ( aLevel < KPhoneVolumeMinValue )
-            {
-            // Set the volume value to volume control
-            valueToControl = KPhoneVolumeMinValue;
-            keySounds->PlaySound( EAvkonSIDVolumeMinTone );
-            }
-        else // aLevel > KPhoneVolumeMaxValue
-            {
-            // Set the volume value to volume control
-            valueToControl = KPhoneVolumeMaxValue;
-            keySounds->PlaySound( EAvkonSIDVolumeMaxTone );
-            }
-        }*/
-// <-- QT PHONE END --> 
         
     if ( aUpdateControl )        
         {
@@ -1980,55 +1871,9 @@
 EXPORT_C TBool CPhoneState::DisconnectCallL()
     {
     __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::DisconnectCallL( ) ");
-// <-- QT PHONE START -->
     TPhoneCmdParamInteger callIdParam;
     iViewCommandHandle->ExecuteCommandL( 
             EPhoneViewGetExpandedBubbleCallId, &callIdParam );
-    // Fetch waiting call's id from view
-    /*TPhoneCmdParamCallStateData callStateData;
-    callStateData.SetCallState( EPEStateRinging );
-    iViewCommandHandle->HandleCommandL(
-        EPhoneViewGetCallIdByState, &callStateData );
-    if( callStateData.CallId() == KErrNotFound )
-        {
-        // No waiting call, find the connected call
-        callStateData.SetCallState( EPEStateConnected );
-        iViewCommandHandle->HandleCommandL(
-            EPhoneViewGetCallIdByState, &callStateData );
-
-        if( callStateData.CallId() == KErrNotFound )
-            {
-            // No connected call, find the hold call
-            callStateData.SetCallState( EPEStateHeld );
-            iViewCommandHandle->HandleCommandL(
-                EPhoneViewGetCallIdByState, &callStateData );
-
-            if( callStateData.CallId() == KErrNotFound )
-                {
-                // No hold call, find the dialing call
-                callStateData.SetCallState( EPEStateDialing );
-                iViewCommandHandle->HandleCommandL(
-                    EPhoneViewGetCallIdByState, &callStateData );
-                }
-
-            if( callStateData.CallId() == KErrNotFound )
-                {
-                // No dialing call, find the outgoing call
-                callStateData.SetCallState( EPEStateConnecting );
-                iViewCommandHandle->HandleCommandL(
-                    EPhoneViewGetCallIdByState, &callStateData );
-                }
-
-            if( callStateData.CallId() == KErrNotFound )
-                {
-                // No active call, find the disconnectinging call
-                callStateData.SetCallState( EPEStateDisconnecting );
-                iViewCommandHandle->HandleCommandL(
-                    EPhoneViewGetCallIdByState, &callStateData );
-                }
-           }
-        }*/
-
 
     TBool ret = EFalse;
     if( callIdParam.Integer() > KErrNotFound )
@@ -2037,11 +1882,8 @@
         iStateMachine->SetCallId( callIdParam.Integer() );
 
         if( IsVideoCall( callIdParam.Integer() ) )
-// <-- QT PHONE END -->
             {
             // Video call can be released only after we get response to VT Shutdown Command
-// <-- QT PHONE START -->
- 
             CPhoneMediatorFactory::Instance()->Sender()->IssueCommand( KMediatorVideoTelephonyDomain,
                                                                                  KCatPhoneToVideotelCommands,
                                                                                  EVtCmdReleaseDataport,
@@ -2050,8 +1892,6 @@
                                                                                  KPhoneToVideotelCmdVersionBuild ),
                                                                        KNullDesC8,
                                                                        CPhoneReleaseCommand::NewL( *iStateMachine ) );
-
-// <-- QT PHONE END --> 
             }
         else
             {
@@ -2247,13 +2087,11 @@
     UpdateRemoteInfoDataL( aCallId );
 
     // Create call duration label if enabled
-// <-- QT PHONE START-->
     // This key will be moved to some other area, but since key
     // is supported we can still use it.
     TBool callDuration( EFalse );
     CPhoneCenRepProxy::Instance()->GetInt(
             KCRUidLogs, KLogsShowCallDuration, callDuration );
-// <-- QT PHONE END-->
 
     if ( callDuration )
         {
@@ -2284,9 +2122,6 @@
     // Go to background if necessary
     if ( NeedToSendToBackgroundL() ||  IsAutoLockOn() )
         {
-// <-- QT PHONE START -->             
-        //iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground );
-// <-- QT PHONE END -->         
         // If number entry is used set control and visibility.
         if ( IsNumberEntryUsedL() )
            {
@@ -2309,17 +2144,6 @@
     TBool aCaptured )
     {
     __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::CaptureKeysDuringCallNotificationL( ) ");
-// <-- QT PHONE START --> 
-/*    
-    if ( AknLayoutUtils::PenEnabled() )
-        {
-        //Capture pointer events
-        TPhoneCmdParamBoolean booleanParam;
-        booleanParam.SetBoolean( aCaptured );
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewSetPointerCapture, &booleanParam );
-        }  
-*/    
-// <-- QT PHONE END --> 
     // Determine which view command to execute based on the capture status
     const TInt viewCommandId = aCaptured ?
         EPhoneViewStartCapturingKey :
@@ -2396,10 +2220,8 @@
 // CPhoneState::SetCallHeaderType
 // -----------------------------------------------------------
 //
-// <-- QT PHONE START --> 
 EXPORT_C void CPhoneState::SetCallHeaderType(
     TInt aCallHeaderType )
-// <-- QT PHONE END --> 
     {
     __LOGMETHODSTARTEND( EPhoneControl, "CPhoneState::SetCallHeaderType() ");
     TRAP_IGNORE( CallheaderManagerL()->SetCallHeaderType( aCallHeaderType ) );
@@ -2839,104 +2661,6 @@
 //
 void CPhoneState::UpdateProfileDisplayL()
     {
-// <-- QT PHONE START --> 
-/*
-    __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::UpdateProfileDisplayL( ) ");
-    // Get the profile information
-    const TInt profileId =
-        iStateMachine->PhoneEngineInfo()->ProfileId();
-    TPEProfileName profileName =
-        iStateMachine->PhoneEngineInfo()->ProfileName();
-
-    HBufC* profileString = HBufC::NewLC( profileName.Length() +
-        KPhoneMaxDateDisplayTextLength );
-
-    TPtr profileNameBuf = profileString->Des();
-    profileNameBuf.Zero();
-    profileNameBuf.Append( profileName );
-
-    if ( ( profileId == EProfileGeneralId ) ||
-        ( profileId == EProfileOffLineId ) )
-        {
-        // Show date instead of profile name on navi pane
-        HBufC* buffer = HBufC::NewLC( KPhoneMaxDateDisplayTextLength );
-        TPtr dateString( buffer->Des() );
-
-        TTime time;
-        time.HomeTime();
-
-        // Get date string
-        CCoeEnv* coeEnv = CCoeEnv::Static();
-
-        HBufC* dateFormatString =
-            StringLoader::LoadLC( R_QTN_DATE_USUAL_WITH_ZERO, coeEnv );
-        time.FormatL( dateString, *dateFormatString );
-        CleanupStack::PopAndDestroy( dateFormatString );
-
-        // To arabic
-        AknTextUtils::DisplayTextLanguageSpecificNumberConversion(
-            dateString );
-
-        //Get week day abbreviation
-        TDayNameAbb wkDayAbb = TDayNameAbb();
-        wkDayAbb.Set(time.DayNoInWeek());
-
-        //Get time format string
-        HBufC* timeFormat = StringLoader::LoadLC(
-            CPhoneMainResourceResolver::Instance()->
-                ResolveResourceID( EPhoneIdleTimeFormat ),
-            coeEnv );
-
-        //Set date and weekdays to time format
-        profileNameBuf.Zero();
-
-        StringLoader::Format(
-            profileNameBuf,
-            *timeFormat,
-            1, // date
-            dateString );
-
-        dateString.Copy( profileNameBuf );
-
-        StringLoader::Format(
-            profileNameBuf,
-            dateString,
-            0, // weekday
-            wkDayAbb );
-
-        CleanupStack::PopAndDestroy( timeFormat );
-        CleanupStack::PopAndDestroy( buffer );
-        }
-
-    // Set silence indicator based on the ringing profile
-    const TProfileRingingType ringingType =
-        iStateMachine->PhoneEngineInfo()->RingingType();
-    if ( ringingType == EProfileRingingTypeSilent )
-        {
-        TBuf< 1 > silent;
-        silent.Append( KPuaCodeSilentSymbol );
-        profileNameBuf.Insert( 0, silent );
-        }
-
-    // Update the profile display on the navi pane
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewSetNaviPaneContent, 0,
-        profileNameBuf );
-
-    if ( profileId == EProfileOffLineId )
-        {
-        iViewCommandHandle->ExecuteCommandL(
-            EPhoneViewSetTitlePaneContent,
-            0,
-            profileName );
-        }
-    else
-        {
-        UpdateOperatorDisplayL();
-        }
-
-    CleanupStack::PopAndDestroy( profileString );
-*/
-// <-- QT PHONE END --> 
     }
 
 // -----------------------------------------------------------
@@ -3103,8 +2827,6 @@
 
     // We have existing video call so need to release dataport before continuing
     // emergency call. Otherwise we will face problems with dataport use later.
-// <-- QT PHONE START -->
- 
     CPhoneMediatorFactory::Instance()->Sender()->IssueCommand( KMediatorVideoTelephonyDomain,
                                                                      KCatPhoneToVideotelCommands,
                                                                      EVtCmdReleaseDataport,
@@ -3113,8 +2835,6 @@
                                                                          KPhoneToVideotelCmdVersionBuild ),
                                                                KNullDesC8,
                                                                CPhoneContinueEmergencyCallCommand::NewL( *iStateMachine ) );
-
-// <-- QT PHONE END --> 
     }
 
 // -----------------------------------------------------------
@@ -3783,13 +3503,10 @@
 // CPhoneState::SetTouchPaneButtons
 // ---------------------------------------------------------
 //
-// <-- QT PHONE START --> 
 EXPORT_C void CPhoneState::SetTouchPaneButtons( TInt /*aResourceId*/ )
-// <-- QT PHONE END --> 
     {
     if ( FeatureManager::FeatureSupported( KFeatureIdTouchCallHandling ) )
         {
-// <-- QT PHONE START -->
         TBool emergency( EPEStateIdle != 
             iStateMachine->PhoneEngineInfo()->CallState( KPEEmergencyCallId ) );
         TPhoneCmdParamBoolean booleanParam;
@@ -3798,7 +3515,6 @@
         TRAP_IGNORE( iViewCommandHandle->ExecuteCommandL(
                      EPhoneViewSetTouchPaneButtons,
                      &booleanParam ) );
-// <-- QT PHONE END -->
         SetTouchPaneVisible( ETrue );
         }
     }
@@ -3811,12 +3527,10 @@
     {
     if ( FeatureManager::FeatureSupported( KFeatureIdTouchCallHandling ) )
         {
-// <-- QT PHONE START -->
         TPhoneCmdParamBoolean boolParam;
         TRAP_IGNORE( iViewCommandHandle->ExecuteCommandL(
                         EPhoneViewSetTouchPaneButtons,
                         &boolParam ) );
-// <-- QT PHONE END -->
         SetTouchPaneVisible( EFalse );
         }
     }
@@ -4119,11 +3833,6 @@
         {
         CaptureKeysDuringCallNotificationL( EFalse );
         }
-    
-    CPhonePubSubProxy::Instance()->ChangePropertyValue(
-                    KPSUidScreenSaver,
-                    KScreenSaverAllowScreenSaver,
-                    EPhoneScreensaverAllowed );
 
     // Restore keylock if phone has been locked before call.
     if ( iStateMachine->PhoneStorage()->NeedToEnableKeylock() )
@@ -5001,6 +4710,66 @@
         }
     }
 
+// ---------------------------------------------------------
+// CPhoneState::SetToolbarDimming
+// ---------------------------------------------------------
+//
+EXPORT_C void CPhoneState::SetBackButtonActive( TBool aActive )
+    {
+    if ( FeatureManager::FeatureSupported( KFeatureIdTouchCallHandling ) )
+        {
+        TPhoneCmdParamBoolean booleanParam;
+        booleanParam.SetBoolean( aActive );
+        iViewCommandHandle->ExecuteCommand(
+            EPhoneViewBackButtonActive, &booleanParam );
+        }
+    }
+
+// -----------------------------------------------------------
+// CPhoneState::OpenSoftRejectMessageEditorL
+// -----------------------------------------------------------
+//
+EXPORT_C void CPhoneState::OpenSoftRejectMessageEditorL()
+    {
+    __LOGMETHODSTARTEND(EPhoneControl,
+        "CPhoneState::OpenSoftRejectMessageEditorL ()" );
+
+    // Fetch incoming call's id from view
+    TPhoneCmdParamCallStateData callStateData;
+    callStateData.SetCallState( EPEStateRinging );
+    iViewCommandHandle->HandleCommandL(
+        EPhoneViewGetCallIdByState, &callStateData );
+
+    TInt ringingCallId( KErrNotFound );
+    // Do nothing if negative incoming call id
+    if( callStateData.CallId() > KErrNotFound  )
+        {
+        iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveQuery );
+        
+        ringingCallId = callStateData.CallId();
+        }
+    
+    
+    TPhoneCmdParamSfiData sfiDataParam;
+
+    if (KErrNotFound != ringingCallId) 
+        {
+        if ( iStateMachine->PhoneEngineInfo()->RemoteName( ringingCallId ).Length() )
+            {
+            // store both the name and the number
+            sfiDataParam.SetNumber( iStateMachine->PhoneEngineInfo()->RemotePhoneNumber( ringingCallId ) );
+            sfiDataParam.SetName( iStateMachine->PhoneEngineInfo()->RemoteName( ringingCallId ) );
+            }
+        else
+            {
+            // store the number
+            sfiDataParam.SetNumber( iStateMachine->PhoneEngineInfo()->RemotePhoneNumber( ringingCallId ) );
+            }
+        }
+
+    iViewCommandHandle->ExecuteCommandL(
+        EPhoneViewOpenSoftRejectEditor, &sfiDataParam );
+    }
 
 //  End of File
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuicontrol/src/cphonestatecallsetup.cpp
--- a/phoneapp/phoneuicontrol/src/cphonestatecallsetup.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuicontrol/src/cphonestatecallsetup.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -19,7 +19,6 @@
 // INCLUDES
 #include <featmgr.h>
 #include <StringLoader.h>
-#include <ScreensaverInternalPSKeys.h>
 #include <AknUtils.h>
 #include <mpeengineinfo.h>
 #include <mpeclientinformation.h>
@@ -44,7 +43,7 @@
 #include "phonelogger.h"
 #include "phoneui.pan"
 #include "cphonedtmfwaitchartimer.h"
-#include "tphonecmdparamAudioOutput.h"
+#include "tphonecmdparamaudiooutput.h"
 #include "cphonekeys.h"
 
 // ================= MEMBER FUNCTIONS =======================
@@ -87,11 +86,6 @@
     // Enable the volume display
     iViewCommandHandle->ExecuteCommandL( EPhoneViewShowNaviPaneAudioVolume );   
     HandleAudioOutputChangedL();
-     
-    CPhonePubSubProxy::Instance()->ChangePropertyValue(
-                    KPSUidScreenSaver,
-                    KScreenSaverAllowScreenSaver,
-                    EPhoneScreensaverNotAllowed );
     }
 
 // -----------------------------------------------------------
@@ -189,7 +183,6 @@
             CloseDTMFEditorL();
             break;
 
-// <-- QT PHONE START -->            
         case EPhoneInCallCmdMute: // fall through
         case EPhoneInCallCmdUnmute:
             iStateMachine->PhoneEngineInfo()->SetAudioMuteCommand( 
@@ -197,7 +190,6 @@
             iStateMachine->SendPhoneEngineMessage( 
                 MPEPhoneModel::EPEMessageSetAudioMute );
             break;
-// <-- QT PHONE END -->            
                                    
         default:
             commandStatus = CPhoneState::HandleCommandL( aCommand );
@@ -596,15 +588,7 @@
     
     // Update the single call
     CPhoneState::UpdateSingleActiveCallL( aCallId );
-    
-// <-- QT PHONE START --> 
-/*  // Complete sat request
-    if ( iStateMachine->PhoneEngineInfo()->CallOrigin( aCallId ) == EPECallOriginSAT )
-        {
-        CompleteSatRequestL( aCallId );
-        }*/
-// <-- QT PHONE END --> 
-        
+            
     // Update touch buttons
     SetTouchPaneButtons( EPhoneIncallButtons );        
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuicontrol/src/cphonestatehandle.cpp
--- a/phoneapp/phoneuicontrol/src/cphonestatehandle.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuicontrol/src/cphonestatehandle.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -100,9 +100,7 @@
 // CPhoneStateHandle::StateMachine
 // ---------------------------------------------------------
 //
-// <-- QT PHONE START --> 
 EXPORT_C MPhoneStateMachine* CPhoneStateHandle::StateMachine()
-// <-- QT PHONE END --> 
     {   
     __ASSERT_DEBUG( Instance(), Panic( EPhoneCtrlSingletonNotInitialized ) );
     return iPhoneStateMachine;
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuicontrol/src/cphonestateidle.cpp
--- a/phoneapp/phoneuicontrol/src/cphonestateidle.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuicontrol/src/cphonestateidle.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -27,7 +27,6 @@
 #include <telephonyvariant.hrh>
 #include <featmgr.h>
 #include <settingsinternalcrkeys.h>
-#include <ScreensaverInternalPSKeys.h>
 #include <mpeengineinfo.h>
 #include <activeidle2domainpskeys.h>
 #include <mpeclientinformation.h>
@@ -56,10 +55,6 @@
 #include "cphonepubsubproxy.h"
 #include "phonelogger.h"
 #include "phoneui.pan"
-// <-- QT PHONE START --> 
-//#include "phoneconstants.h"
-//#include <activeidle2domainpskeys.h>
-// <-- QT PHONE END --> 
 #include "mphonecustomization.h"
 
 //CONSTANTS
@@ -394,12 +389,7 @@
     iViewCommandHandle->ExecuteCommandL( EPhoneViewShowNaviPaneAudioVolume );
 
     SetRingingTonePlaybackL( aCallId );
-    
-    CPhonePubSubProxy::Instance()->ChangePropertyValue(
-        KPSUidScreenSaver,
-        KScreenSaverAllowScreenSaver,
-        EPhoneScreensaverNotAllowed );
-    
+
     BeginTransEffectLC( ENumberEntryClose );
     BeginUiUpdateLC();
     
@@ -409,22 +399,17 @@
         SetNumberEntryVisibilityL(EFalse);    
         }
      
-    // Close fast swap window if it's displayed
-// <-- QT PHONE START --> 
-//    CEikonEnv::Static()->DismissTaskList();
-
-
     // Display incoming call
     DisplayIncomingCallL( aCallId );
     
     // Show incoming call buttons
     SetTouchPaneButtons( EPhoneIncomingCallButtons );
     
-// <-- QT PHONE END --> 
-
     // Disable HW keys and Call UI if needed
     CheckDisableHWKeysAndCallUIL();
     
+    SetBackButtonActive(EFalse);
+    
     EndUiUpdate();
     
     EndTransEffect();
@@ -458,13 +443,11 @@
     
     SetNumberEntryVisibilityL(EFalse);
 
-    // <-- QT PHONE START -->
     // Display call setup 
     DisplayCallSetupL( aCallId );  
     
     // Show call setup buttons
     SetTouchPaneButtons( EPhoneCallSetupButtons );          
-    // <-- QT PHONE END -->
     
     EndUiUpdate();
     
@@ -841,45 +824,6 @@
 
 EXPORT_C void CPhoneStateIdle::HandlePhoneForegroundEventL()
     {
-// <-- QT PHONE START --> 
-    /*__LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandlePhoneForegroundEventL( ) ");
-    
-    TPhoneCmdParamBoolean isSecurityMode;      
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewGetSecurityModeStatus, &isSecurityMode );
-
-    TBool activatePhone = CPhonePubSubProxy::Instance()->Value(
-                    KPSUidAiInformation, KActiveIdleState ) == EPSAiNumberEntry;
-    
-    if ( activatePhone )
-        {
-        // If activatePhone is true then user has pressed some numeric
-        // key and icon must be set to FSW. In this case number entry is not yet open so it
-        // it is not enough to call EPhoneViewUpdateFSW.
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdatePhoneIconToFSW );
-        }
-    // If number entry is used update FSW accordingly.
-    else if ( IsNumberEntryUsedL() )
-        {
-        // If numberentry is used then we need to call EPhoneViewSetDialerControlVisible 
-        // to ensure that numberentry/dialler is drawn to UI.
-        TPhoneViewResponseId respond = 
-            iViewCommandHandle->HandleCommandL( EPhoneViewSetDialerControlVisible );
-        
-        if ( respond && IsNumberEntryVisibleL() )
-            {
-            // Set Number Entry CBA
-            iCbaManager->SetCbaL( EPhoneNumberAcqCBA );
-            }
-        
-        // If dialer is open add icon to FSW list.
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateFSW );
-        }
-    else if ( !IsNumberEntryUsedL() && !isSecurityMode.Boolean() )
-        {
-        // Bring Idle app to the foreground
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewBringIdleToForeground );
-        }*/
-// <-- QT PHONE END --> 
     }
 
 // -----------------------------------------------------------
@@ -1090,9 +1034,7 @@
     wsSession.SimulateKeyEvent( keyEvent );
     wsSession.Flush();  
 
-// <-- QT PHONE START -->     
     iViewCommandHandle->ExecuteCommandL( EPhoneAppShutDown );
-// <-- QT PHONE END --> 
     }
 
 // -----------------------------------------------------------
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuicontrol/src/cphonestateincall.cpp
--- a/phoneapp/phoneuicontrol/src/cphonestateincall.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuicontrol/src/cphonestateincall.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -23,9 +23,7 @@
 #include <hwrmdomainpskeys.h>
 #include <UikonInternalPSKeys.h>
 #include <mpeengineinfo.h>
-// <-- QT PHONE START --> 
 #include <videotelcontrolmediatorapi.h>
-// <-- QT PHONE END --> 
 #include <MediatorDomainUIDs.h>
 #include <bldvariant.hrh>
 
@@ -35,9 +33,6 @@
 #include "tphonecmdparamstring.h"
 #include "tphonecmdparamnote.h"
 #include "tphonecmdparamquery.h"
-// <-- QT PHONE START -->
-//#include "tphonecmdparamsingleitemfetch.h"
-// <-- QT PHONE END -->
 #include "tphonecmdparamcallstatedata.h"
 #include "tphonecmdparamsfidata.h"
 #include "mphonestatemachine.h"
@@ -576,16 +571,7 @@
     switch( aCommand )
         {
         case EPhoneInCallCmdDialer:
-            // <-- QT PHONE START -->
             iViewCommandHandle->ExecuteCommandL( EPhoneViewOpenDialer );
-            /*BeginTransEffectLC( ENumberEntryCreate );
-            if ( !IsNumberEntryUsedL() )
-                {
-                CreateNumberEntryL();
-                }
-            SetNumberEntryVisibilityL(ETrue ); 
-            EndTransEffect();*/
-            // <-- QT PHONE END -->
             break;
         case EPhoneCmdOptions:
             OpenMenuBarL();
@@ -1477,9 +1463,7 @@
 
         if( IsVideoCall( callStateData.CallId() ) )
             {
-            // Video call can be released only after we get response to VT Shutdown Command
-// <-- QT PHONE START -->
- 
+            // Video call can be released only after we get response to VT Shutdown Command 
             CPhoneMediatorFactory::Instance()->Sender()->IssueCommand( 
                 KMediatorVideoTelephonyDomain,
                 KCatPhoneToVideotelCommands, 
@@ -1489,8 +1473,6 @@
                     KPhoneToVideotelCmdVersionBuild ),
                 KNullDesC8,
                 CPhoneTerminateAllConnectionsCommand::NewL( *iStateMachine ) );
-
-// <-- QT PHONE END --> 
             }
         else
             {
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuicontrol/src/cphonestateincoming.cpp
--- a/phoneapp/phoneuicontrol/src/cphonestateincoming.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuicontrol/src/cphonestateincoming.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -24,12 +24,9 @@
 #include <StringLoader.h>
 #include <dundomainpskeys.h>
 #include <telephonyvariant.hrh>
-#include <ScreensaverInternalPSKeys.h>
 #include <mpeengineinfo.h>
 #include <MediatorDomainUIDs.h>
-// <-- QT PHONE START -->
 #include <videotelcontrolmediatorapi.h>
-// <-- QT PHONE END -->
 
 #include "cphonepubsubproxy.h"
 #include "phoneui.pan"
@@ -409,6 +406,7 @@
 
     SetTouchPaneButtons( EPhoneIncallButtons );
     SetToolbarDimming( EFalse );
+    SetBackButtonActive(ETrue);
             
     EndUiUpdate();
     EndTransEffect();
@@ -482,7 +480,6 @@
     iViewCommandHandle->ExecuteCommandL( EPhoneViewSetEikonNotifiersDisabled,
         &globalNotifierParam );
     
-
     SetDefaultFlagsL();
     
      if ( IsNumberEntryUsedL() )
@@ -517,6 +514,8 @@
         }
  
     DeleteTouchPaneButtons();
+    SetBackButtonActive(ETrue);
+    
     EndUiUpdate();
     EndTransEffect();
     // Go to idle state   
@@ -573,7 +572,7 @@
 
         case EPhoneCallComingCmdSoftReject:
             // Open Soft reject message editor
-            OpenSoftRejectMessageEditorL();
+            OpenSoftRejectMessageL();
             break;
 
         case EPhoneNumberAcqCmdSendCommand:
@@ -649,8 +648,6 @@
     if( IsVideoCall( iRingingCallId ) )
         {
         // Video call can be released only after we get response to VT Shutdown Command
-// <-- QT PHONE START -->
- 
         CPhoneMediatorFactory::Instance()->Sender()->IssueCommand( KMediatorVideoTelephonyDomain,
                                                                              KCatPhoneToVideotelCommands, 
                                                                              EVtCmdReleaseDataport,
@@ -659,8 +656,6 @@
                                                                              KPhoneToVideotelCmdVersionBuild ),
                                                                    KNullDesC8,
                                                                    CPhoneReleaseCommand::NewL( *iStateMachine ) );
-
-// <-- QT PHONE END --> 
         }
     else
         {
@@ -676,7 +671,7 @@
 // CPhoneStateIncoming::OpenSoftRejectMessageEditorL
 // -----------------------------------------------------------
 //
-void CPhoneStateIncoming::OpenSoftRejectMessageEditorL()
+void CPhoneStateIncoming::OpenSoftRejectMessageL()
     {
     __LOGMETHODSTARTEND(EPhoneControl,
         "CPhoneStateIncoming::OpenSoftRejectMessageEditorL ()" );
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuicontrol/src/cphonestatestartup.cpp
--- a/phoneapp/phoneuicontrol/src/cphonestatestartup.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuicontrol/src/cphonestatestartup.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -20,7 +20,7 @@
 #include "cphonestatestartup.h"
 #include "phonestatedefinitions.h"
 #include "mphonestatemachine.h"
-#include "tphonecmdparamKeycapture.h"
+#include "tphonecmdparamkeycapture.h"
 #include "tphonecmdparamboolean.h"
 #include "phonelogger.h"
 #include "phonerssbase.h"
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuicontrol/src/cphoneuicontroller.cpp
--- a/phoneapp/phoneuicontrol/src/cphoneuicontroller.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuicontrol/src/cphoneuicontroller.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -69,11 +69,6 @@
     iSystemEventHandler = CPhoneSystemEventHandler::NewL( iStateMachine );
      // Create the remote control handler
     iRemoteControlHandler = CPhoneRemoteControlHandler::NewL( iStateMachine );
-    // Create the key event forwarder
-// <-- QT PHONE START --> 
-//    iKeyEventForwarder = CPhoneKeyEventForwarder::NewL( 
-//        CEikonEnv::Static()->EikAppUi()->ClientRect(), iStateMachine, aViewCommandHandle );
-// <-- QT PHONE END --> 
 
     TInt leaveCode( 0 );
     TInt retry( 0 );
@@ -159,9 +154,7 @@
     delete iSystemEventHandler;
     delete iEngineHandler;
     delete iKeyEventForwarder;
-// <-- QT PHONE START --> 
     delete iStateHandle;
-// <-- QT PHONE END --> 
     }
 
 // ---------------------------------------------------------
@@ -218,22 +211,22 @@
     const TKeyEvent& aKeyEvent,
     TEventCode aEventCode )
     {
-// <-- QT PHONE START --> 
-//    __ASSERT_DEBUG( iKeyEventForwarder, Panic( EPhoneCtrlInvariant ) );
-//    return iKeyEventForwarder->OfferKeyEventAfterControlStackL( 
-//                aKeyEvent,
-//                aEventCode );
-    if ( EEventKey == aEventCode )
+    if ( aEventCode == EEventKey )
         {
         iStateMachine->State()->HandleKeyMessageL( 
                         MPhoneKeyEvents::EPhoneKeyShortPress, 
                         TKeyCode( aKeyEvent.iCode ) );
         }
+    else if ( aEventCode == EEventLongPress )
+        {
+        iStateMachine->State()->HandleKeyMessageL( 
+                        MPhoneKeyEvents::EPhoneKeyLongPress, 
+                        TKeyCode( aKeyEvent.iCode ) );    
+        }
     
     iStateMachine->State()->HandleDtmfKeyToneL( aKeyEvent, aEventCode );
         
     return EKeyWasNotConsumed;
-// <-- QT PHONE END --> 
     }
 
 // ---------------------------------------------------------
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuicontrol/src/tphonecallheaderparam.cpp
--- a/phoneapp/phoneuicontrol/src/tphonecallheaderparam.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuicontrol/src/tphonecallheaderparam.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -43,9 +43,7 @@
         MPhoneStateMachine& aStateMachine ) 
         : iManagerUtility ( aManagerUtility ),
           iStateMachine ( aStateMachine ),
-// <-- QT PHONE START --> 
           iCallHeaderType ( EPECallTypeUninitialized ),
-// <-- QT PHONE END --> 
           iSetDivertIndication ( EFalse )
     {
     }
@@ -157,10 +155,8 @@
          ( !ContactInfoAvailable( aCallId ) ) )
         {
         // Set phonenumber/URI as the CLI text for the call header      
-// <-- QT PHONE START --> 
        aCallHeaderData->SetCLIText( iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ),
                  TPhoneCmdParamCallHeaderData::ELeft );
-// <-- QT PHONE END --> 
             
         // No contact name, use phonenumber when available.
         aCallHeaderData->SetParticipantListCLI(
@@ -168,10 +164,7 @@
         }
     else
         {
-// <-- QT PHONE START -->
-//        CBubbleManager::TPhoneClippingDirection cnapClippingDirection = CBubbleManager::ERight;
         TPhoneCmdParamCallHeaderData::TPhoneTextClippingDirection cnapClippingDirection = TPhoneCmdParamCallHeaderData::ERight;
-// <-- QT PHONE END -->
         TBuf<KCntMaxTextFieldLength> remoteInfoText( KNullDesC );
  
         /*If call is Private/PayPhone call then IsCallPrivateOrPayPhone
@@ -180,14 +173,9 @@
         if ( !IsCallPrivateOrPayPhone( aCallId, remoteInfoText ) )
             {
             GetRemoteInfoDataL( aCallId, remoteInfoText );
-// <-- QT PHONE START -->
-//            cnapClippingDirection = CBubbleManager::ELeft;
             cnapClippingDirection = TPhoneCmdParamCallHeaderData::ELeft;
-// <-- QT PHONE END -->
             }
-// <-- QT PHONE START --> 
         aCallHeaderData->SetCLIText( remoteInfoText,  TPhoneCmdParamCallHeaderData::ERight );
-// <-- QT PHONE END --> 
         aCallHeaderData->SetCNAPText( iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ), 
                 cnapClippingDirection );
         }
@@ -244,9 +232,6 @@
 
     // Set call header type            
     aCallHeaderData->SetCallType( GetCallType( aCallId, aCallHeaderData ) );
-// <-- QT PHONE START --> 
-//    aCallHeaderData->SetCallFlag( CallHeaderType() );
-// <-- QT PHONE END --> 
     
     // Set call header voice privacy status
     aCallHeaderData->SetCiphering( 
@@ -275,7 +260,6 @@
 //  TPhoneCallHeaderParam::GetCallType
 // ---------------------------------------------------------------------------
 //
-// <-- QT PHONE START --> 
 TPECallType TPhoneCallHeaderParam::GetCallType( 
         const TInt aCallId,
         TPhoneCmdParamCallHeaderData* aCallHeaderData )
@@ -297,17 +281,14 @@
                 callType )
     return callType;
     }
-// <-- QT PHONE END --> 
 
 // ---------------------------------------------------------------------------
 //  TPhoneCallHeaderParam::SetCallHeaderType
 // ---------------------------------------------------------------------------
 //
-// <-- QT PHONE START --> 
 void TPhoneCallHeaderParam::SetCallHeaderType( 
     TInt aCallHeaderType )
     {
-// <-- QT PHONE END --> 
     __LOGMETHODSTARTEND(EPhoneControl, "TPhoneCallHeaderParam::SetCallHeaderType( ) ");
     iCallHeaderType = aCallHeaderType;
     __PHONELOG1( EBasic, EPhoneControl, 
@@ -319,10 +300,8 @@
 //  TPhoneCallHeaderParam::CallHeaderType
 // ---------------------------------------------------------------------------
 //
-// <-- QT PHONE START --> 
 TInt TPhoneCallHeaderParam::CallHeaderType() const
     {
-// <-- QT PHONE END --> 
     __LOGMETHODSTARTEND(EPhoneControl, "TPhoneCallHeaderParam::CallHeaderType( ) ");
     __PHONELOG1( EBasic, EPhoneControl, 
                         "TPhoneCallHeaderParam::CallHeaderType() - iCallHeaderType: %d ", 
@@ -368,11 +347,9 @@
          ( !info.ShowNumber() ) )
         {
         // No contact info data available; use the phone number
-// <-- QT PHONE START --> 
         aCallHeaderData->SetCLIText(
                 iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ),
                 TPhoneCmdParamCallHeaderData::ELeft);
-// <-- QT PHONE END --> 
         
         // No contact name, use phonenumber when available.
         aCallHeaderData->SetParticipantListCLI( 
@@ -389,18 +366,12 @@
             {
             GetRemoteInfoDataL( aCallId, remoteInfoText );
             }
-// <-- QT PHONE START --> 
         aCallHeaderData->SetCLIText( remoteInfoText, TPhoneCmdParamCallHeaderData::ERight );
-// <-- QT PHONE END --> 
         }
 
     // Fetch CNAP text and clipping direction
-// <-- QT PHONE START -->
-//    CBubbleManager::TPhoneClippingDirection cnapClippingDirection;
     TPhoneCmdParamCallHeaderData::TPhoneTextClippingDirection cnapClippingDirection;
-//    GetCNAPText( aCallId, cnapText, &cnapClippingDirection );
     GetCNAPText( aCallId, cnapText, cnapClippingDirection );
-// <-- QT PHONE END -->
     
     // Set CNAP data 
     aCallHeaderData->SetCNAPText( cnapText, cnapClippingDirection );
@@ -418,10 +389,7 @@
     if ( IsFeatureSupported( KTelephonyLVFlagUUS, aCallId ) )
         {
         aCallHeaderData->SetCNAPText( iStateMachine.PhoneEngineInfo()->RemotePartyName( aCallId ), 
-// <-- QT PHONE START -->
-//                CBubbleManager::ERight );
                 TPhoneCmdParamCallHeaderData::ERight );
-// <-- QT PHONE END -->
         }
     }
 
@@ -432,18 +400,12 @@
 void TPhoneCallHeaderParam::GetCNAPText( 
     const TInt aCallId,
        TDes& aData, 
-// <-- QT PHONE START -->
-//       CBubbleManager::TPhoneClippingDirection& aDirection ) const
        TPhoneCmdParamCallHeaderData::TPhoneTextClippingDirection& aDirection ) const
-// <-- QT PHONE START -->
     {
     __LOGMETHODSTARTEND(EPhoneControl, "TPhoneCallHeaderParam::GetCNAPText( ) ");
     
     // Set clipping direction  
-// <-- QT PHONE START -->
-//    aDirection = CBubbleManager::ERight;
     aDirection = TPhoneCmdParamCallHeaderData::ERight;
-// <-- QT PHONE END -->
     
     // If it's not a private number show further info
     if ( iStateMachine.PhoneEngineInfo()->RemotePhoneNumberType( aCallId ) != 
@@ -458,10 +420,7 @@
             aData.Copy( iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ) );
             
             // Clipping direction for non-private number
-// <-- QT PHONE START -->
-//            aDirection = CBubbleManager::ELeft;
             aDirection = TPhoneCmdParamCallHeaderData::ELeft;
-// <-- QT PHONE END -->
             }
         }
     }
@@ -509,10 +468,7 @@
     __LOGMETHODSTARTEND(EPhoneControl, "TPhoneCallHeaderParam::SetDivertIndicatorToCallHeader( ) ");
     if( iSetDivertIndication )
         {
-// <-- QT PHONE START --> 
-//        aCallHeaderData->SetCallFlag( CBubbleManager::EDiverted );            
         aCallHeaderData->SetDiverted( ETrue );
-// <-- QT PHONE END --> 
         }
     
     if ( iStateMachine.PhoneEngineInfo()->CallALSLine( aCallId ) == CCCECallParameters::ECCELineTypeAux )
@@ -610,40 +566,27 @@
     
     // Set call header type
     GetCallType( aCallId, aCallHeaderData );
-// <-- QT PHONE START -->
-    //aCallHeaderData->SetCallFlag( CallHeaderType() );
-// <-- QT PHONE END -->
     
     // Set CLI text for the call header
     GetRemoteInfoDataL( aCallId, remoteInfoText );
     if ( remoteInfoText != KNullDesC )
         {
-// <-- QT PHONE START --> 
         aCallHeaderData->SetCLIText( remoteInfoText, TPhoneCmdParamCallHeaderData::ERight );
-// <-- QT PHONE END --> 
         if ( IsCallPrivateOrPayPhone( aCallId, remoteInfoText ) )
             {
-// <-- QT PHONE START --> 
-//            aCallHeaderData->SetCNAPText( remoteInfoText, CBubbleManager::ERight );
             aCallHeaderData->SetCNAPText( remoteInfoText, TPhoneCmdParamCallHeaderData::ERight );
-// <-- QT PHONE END --> 
             }
         else
             {
             aCallHeaderData->SetCNAPText( iStateMachine.PhoneEngineInfo()->
-// <-- QT PHONE START -->
-//                RemotePhoneNumber( aCallId ), CBubbleManager::ELeft );       
                 RemotePhoneNumber( aCallId ), TPhoneCmdParamCallHeaderData::ELeft );       
-// <-- QT PHONE END --> 
             }
         }
     else
         {
-// <-- QT PHONE START --> 
         aCallHeaderData->SetCLIText( 
             iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ),
             TPhoneCmdParamCallHeaderData::ERight );
-// <-- QT PHONE END --> 
         }
 
     // If KTelephonyLVFlagUUS is enabled it will over write RemotePartyName setting.
@@ -656,22 +599,13 @@
         if ( iStateMachine.PhoneEngineInfo()->CallState( aCallId ) == EPEStateRinging )
             {
             // Set CNAP text  
-// <-- QT PHONE START -->
-//            aCallHeaderData->SetCNAPText( remotePartyName, CBubbleManager::ERight );
             aCallHeaderData->SetCNAPText( remotePartyName, TPhoneCmdParamCallHeaderData::ERight );
-// <-- QT PHONE END -->
             }
         else
             {
-// <-- QT PHONE START --> 
             aCallHeaderData->SetCLIText( remotePartyName, TPhoneCmdParamCallHeaderData::ERight );
-// <-- QT PHONE END --> 
             }
         }   
-   
-// <-- QT PHONE START --> 
-//    aCallHeaderData->SetCallFlag( CallHeaderType() );
-// <-- QT PHONE END --> 
     
     // Set call header labels
     SetCallHeaderTexts( 
@@ -785,9 +719,7 @@
         {
         // If call header has customized items and callheadertype is voip
         // then load customized text.
-// <-- QT PHONE START -->
         if ( ( iManagerUtility.Customization() ) && ( CallHeaderType() == EPECallTypeVoIP ) )
-// <-- QT PHONE END -->
             {
             // Display private address
             iManagerUtility.LoadResource( aData, iManagerUtility.Customization()->CustomizeCallHeaderText() );
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiqtviewadapter/bwins/phoneuiqtviewadapteru.def
--- a/phoneapp/phoneuiqtviewadapter/bwins/phoneuiqtviewadapteru.def	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiqtviewadapter/bwins/phoneuiqtviewadapteru.def	Fri Apr 16 14:58:25 2010 +0300
@@ -86,4 +86,7 @@
 	?metaObject@PhoneResourceAdapter@@UBEPBUQMetaObject@@XZ @ 85 NONAME ; struct QMetaObject const * PhoneResourceAdapter::metaObject(void) const
 	?setParticipantListActions@PhoneUIQtViewAdapter@@AAEXXZ @ 86 NONAME ; void PhoneUIQtViewAdapter::setParticipantListActions(void)
 	?convertToHbActions@PhoneResourceAdapter@@QBE?AV?$QList@PAVHbAction@@@@H@Z @ 87 NONAME ; class QList<class HbAction *> PhoneResourceAdapter::convertToHbActions(int) const
+	?convertDuration@PhoneUIQtViewAdapter@@AAE?AVQString@@H@Z @ 88 NONAME ; class QString PhoneUIQtViewAdapter::convertDuration(int)
+	?setBubbleSelectionFlag@PhoneUIQtViewAdapter@@AAEXXZ @ 89 NONAME ; void PhoneUIQtViewAdapter::setBubbleSelectionFlag(void)
+	?handleCipheringInfoChange@PhoneUIQtViewAdapter@@AAEXHPAVTPhoneCommandParam@@@Z @ 90 NONAME ; void PhoneUIQtViewAdapter::handleCipheringInfoChange(int, class TPhoneCommandParam *)
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiqtviewadapter/eabi/phoneuiqtviewadapteru.def
--- a/phoneapp/phoneuiqtviewadapter/eabi/phoneuiqtviewadapteru.def	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiqtviewadapter/eabi/phoneuiqtviewadapteru.def	Fri Apr 16 14:58:25 2010 +0300
@@ -98,4 +98,7 @@
 	_ZThn8_N20PhoneUIQtViewAdapterD0Ev @ 97 NONAME
 	_ZThn8_N20PhoneUIQtViewAdapterD1Ev @ 98 NONAME
 	_ZNK20PhoneResourceAdapter18convertToHbActionsEi @ 99 NONAME
+	_ZN20PhoneUIQtViewAdapter15convertDurationEi @ 100 NONAME
+	_ZN20PhoneUIQtViewAdapter22setBubbleSelectionFlagEv @ 101 NONAME
+	_ZN20PhoneUIQtViewAdapter25handleCipheringInfoChangeEiP18TPhoneCommandParam @ 102 NONAME
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiqtviewadapter/inc/mphonebuttoncustomization.h
--- a/phoneapp/phoneuiqtviewadapter/inc/mphonebuttoncustomization.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiqtviewadapter/inc/mphonebuttoncustomization.h	Fri Apr 16 14:58:25 2010 +0300
@@ -17,8 +17,6 @@
 
 #ifndef MPHONEBUTTONCUSTOMIZATION_H
 #define MPHONEBUTTONCUSTOMIZATION_H
-// <-- QT PHONE START --> 
-//#include <bmtouchpaneinterface.h>
 
 // CLASS DECLARATION
 /**
@@ -33,11 +31,7 @@
     * @param aTouchPane Interface to add and dimm
     *                   bubble touch pane buttons.
     */
-    virtual void CustomizeTouchPaneButtons(
-                    /*MBubbleTouchPaneInterface& aTouchPane*/ ) = 0;
-    
-
-// <-- QT PHONE END --> 
+    virtual void CustomizeTouchPaneButtons() = 0;
     };
     
 #endif // MPHONEBUTTONCUSTOMIZATION_H
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiqtviewadapter/inc/phonebubblewrapper.h
--- a/phoneapp/phoneuiqtviewadapter/inc/phonebubblewrapper.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiqtviewadapter/inc/phonebubblewrapper.h	Fri Apr 16 14:58:25 2010 +0300
@@ -65,6 +65,8 @@
     int bubbleId (int callId);
     
     void setDivert (int bubble, bool enabled);
+    
+    void setCiphering(int bubble, bool indicatorAllowed, bool enabled);
 
     int activeCallCount();    
     
@@ -72,7 +74,7 @@
     
     QMap<int, int> bubbles() const;
     
-    void createConferenceBubble(int callId, int callState,
+    int createConferenceBubble(int callId, int callState,
             const TDesC &labelText, const TDesC &cliText);
     
     void setConferenceCallId(int callId);
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiqtviewadapter/inc/phonemessagecontroller.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneuiqtviewadapter/inc/phonemessagecontroller.h	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,65 @@
+/*!
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Handles message editor.
+*
+*/
+
+#ifndef PHONEMESSAGECONTROLLER_H
+#define PHONEMESSAGECONTROLLER_H
+
+#include <QObject>
+#include <QString>
+#include "tphonecmdparamnote.h"
+
+// FORWARD DECLARATION
+class TPhoneCommandParam;
+
+class PhoneMessageController : public QObject
+{
+    Q_OBJECT
+    
+public:
+
+    /*!
+        \fn PhoneMessageController (QObject *parent)
+    */
+    PhoneMessageController(QObject *parent = 0);
+        
+    /*!
+        Destructor
+     */
+    virtual ~PhoneMessageController();
+    
+    /*!
+        \fn void openSoftRejectMessageEditor()
+        
+        This method opens soft reject message editor.
+
+    */
+    void openSoftRejectMessageEditor(TPhoneCommandParam *commandParam);
+ 
+private:
+    
+    /*!
+        \fn void showNote ()
+        
+        This method opens message editor.
+
+    */
+    void openEditor(QString toField, QString name, QString messageBody = QString());
+    
+};
+
+#endif // PHONEMESSAGECONTROLLER_H
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiqtviewadapter/inc/phonenotecontroller.h
--- a/phoneapp/phoneuiqtviewadapter/inc/phonenotecontroller.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiqtviewadapter/inc/phonenotecontroller.h	Fri Apr 16 14:58:25 2010 +0300
@@ -28,7 +28,7 @@
 class TPhoneCmdParamQuery;
 class HbDeviceMessageBox;
 class HbDeviceProgressDialog;
-class HbProgressNote;
+class HbProgressDialog;
 class HbMessageBox;
 class HbAction;
 class QSignalMapper;
@@ -186,7 +186,7 @@
     QTimer *m_timer;
     QList<HbDeviceMessageBox *> m_messageBoxList;
     HbDeviceProgressDialog *m_progressDialog;
-    HbProgressNote *m_dtmfNote;
+    HbProgressDialog *m_dtmfNote;
     HbMessageBox *m_queryNote;
     QSignalMapper *m_signalMapper;
     QList<HbAction*> m_actions;
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiqtviewadapter/inc/phoneuiqtbuttonscontroller.h
--- a/phoneapp/phoneuiqtviewadapter/inc/phoneuiqtbuttonscontroller.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiqtviewadapter/inc/phoneuiqtbuttonscontroller.h	Fri Apr 16 14:58:25 2010 +0300
@@ -32,7 +32,8 @@
         Hold            = 0x02, // Hold
         Ihf             = 0x04, // Ihf
         Wired           = 0x08, // Wired
-        Btaa            = 0x10  // Btaa
+        Btaa            = 0x10, // Btaa
+        DisableJoin     = 0x20  // Should join option be disabled
     };
     Q_DECLARE_FLAGS(PhoneButtonFlags, PhoneButtonFlag)
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiqtviewadapter/inc/phoneuiqtviewadapter.h
--- a/phoneapp/phoneuiqtviewadapter/inc/phoneuiqtviewadapter.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiqtviewadapter/inc/phoneuiqtviewadapter.h	Fri Apr 16 14:58:25 2010 +0300
@@ -35,6 +35,7 @@
 class PhoneResourceAdapter;
 class PhoneUIQtButtonsController;
 class PhoneNoteController;
+class PhoneMessageController;
 class PhoneUiCommandController;
 class TelephonyService;
 class QKeyEvent;
@@ -212,6 +213,13 @@
         This method updates remote information in call header and label.
     */
     void updateCallHeaderRemoteInfoAndLabel (int callId, TPhoneCommandParam *commandParam);    
+
+    /*!
+        \fn int PhoneUIQtViewAdapter::handleCipheringInfoChange()
+        
+        This method updates ciphering indicators.
+    */
+    void handleCipheringInfoChange(int callId, TPhoneCommandParam *commandParam);    
     
     /*!
         \fn int PhoneUIQtViewAdapter::callIdByState()
@@ -468,6 +476,18 @@
     */
     void showNote(TPhoneCommandParam *commandParam);
     
+	/*!
+	    /fn QString convertDuration(int)
+		This method returns the localized call duration
+    */
+    QString convertDuration(int seconds);
+ 
+    /*!
+        /fn void setBubbleSelectionFlag()
+        This method sets bubble selection flag.
+    */
+    void setBubbleSelectionFlag();
+    
 private:
 
     PhoneUIQtViewIF &m_view;
@@ -478,7 +498,9 @@
     PhoneNoteController *m_noteController;
     TelephonyService *m_telephonyService;
     PhoneUiCommandController *m_uiCommandController;
+    PhoneMessageController *m_messageController;
     bool m_dialpadAboutToClose;
+    bool m_homeScreenToForeground;
 };
 
 #endif // PHONEUIQTVIEWADAPTER_H
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiqtviewadapter/inc/phoneviewcommanddefinitions.h
--- a/phoneapp/phoneuiqtviewadapter/inc/phoneviewcommanddefinitions.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiqtviewadapter/inc/phoneviewcommanddefinitions.h	Fri Apr 16 14:58:25 2010 +0300
@@ -232,7 +232,8 @@
     EPhoneViewOpenDialer,
     EPhoneSetConferenceExpanded,
     EPhoneAppShutDown,
-    EPhoneViewBackButtonVisible,
+    EPhoneViewBackButtonActive,
+    EPhoneViewHsToForegroundAfterCall,
     EPhoneAmountOfCommands, // Don't remove this, this should always be the last in list.
 };
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiqtviewadapter/phoneuiqtviewadapter.pri
--- a/phoneapp/phoneuiqtviewadapter/phoneuiqtviewadapter.pri	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiqtviewadapter/phoneuiqtviewadapter.pri	Fri Apr 16 14:58:25 2010 +0300
@@ -24,6 +24,7 @@
 HEADERS += ./inc/telephonyservice.h
 HEADERS += ./inc/phoneuicommandcontroller.h
 HEADERS += ./inc/phonecommandextensionwrapper.h
+HEADERS += ./inc/phonemessagecontroller.h
 
 SOURCES += ./src/phoneuiqtviewadapter.cpp
 SOURCES += ./src/phoneuiqtbuttonscontroller.cpp
@@ -33,3 +34,4 @@
 SOURCES += ./src/telephonyservice.cpp
 SOURCES += ./src/phoneuicommandcontroller.cpp
 SOURCES += ./src/phonecommandextensionwrapper.cpp
+SOURCES += ./src/phonemessagecontroller.cpp
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiqtviewadapter/src/phonebubblewrapper.cpp
--- a/phoneapp/phoneuiqtviewadapter/src/phonebubblewrapper.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiqtviewadapter/src/phonebubblewrapper.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -15,14 +15,13 @@
 *
 */
 
-#include <QtDebug>
 #include <hbaction.h>
 #include <pevirtualengine.h>
 
 #include "bubblemanagerif.h"
 #include "phonebubblewrapper.h"
 #include "phoneconstants.h"
-
+#include "qtphonelog.h"
 
 PhoneBubbleWrapper::PhoneBubbleWrapper (BubbleManagerIF& bubble, QObject *parent) :
     QObject (parent), m_bubbleManager (bubble)
@@ -127,26 +126,27 @@
     
     updateCallState (callId, callState);
     m_bubbleManager.setState (bubble, state);
+
 }
 
 void PhoneBubbleWrapper::setLabel (int bubble, const TDesC &text)
 {
     QString labelText = QString::fromUtf16 (text.Ptr (), text.Length ());
-    qDebug () << "PhoneBubbleWrapper::setLabel, label:" << labelText; 
+    PHONE_DEBUG2("PhoneBubbleWrapper::setLabel, label:", labelText); 
     m_bubbleManager.setLabel (bubble, labelText, Qt::ElideRight);
 }
 
 void PhoneBubbleWrapper::setCli (int bubble, const TDesC &cliText)
 {
     QString text = QString::fromUtf16 (cliText.Ptr (), cliText.Length ());
-    qDebug () << "PhoneBubbleWrapper::setCli, cli:" << text; 
+    PHONE_DEBUG2("PhoneBubbleWrapper::setCli, cli:", text); 
     m_bubbleManager.setCli (bubble, text, Qt::ElideRight);
 }
 
 void PhoneBubbleWrapper::setSecondaryCli (int bubble, const TDesC &cliText)
 {
     QString text = QString::fromUtf16 (cliText.Ptr (), cliText.Length ());
-    qDebug () << "PhoneBubbleWrapper::setSecondaryCli, SecondaryCli:" << text; 
+    PHONE_DEBUG2("PhoneBubbleWrapper::setSecondaryCli, SecondaryCli:", text); 
     m_bubbleManager.setSecondaryCli (bubble, text);
 }
 
@@ -184,6 +184,15 @@
     }
 }
 
+void PhoneBubbleWrapper::setCiphering(int bubble, bool indicatorAllowed, bool enabled)
+{
+    if (indicatorAllowed && !enabled) {
+        m_bubbleManager.setCallFlag (bubble, BubbleManagerIF::NoCiphering, true);
+    } else {
+        m_bubbleManager.setCallFlag (bubble, BubbleManagerIF::NoCiphering, false);
+    }
+}
+
 int PhoneBubbleWrapper::activeCallCount()
 {
     int count(0);
@@ -230,7 +239,7 @@
     return ret;
 }
 
-void PhoneBubbleWrapper::createConferenceBubble(
+int PhoneBubbleWrapper::createConferenceBubble(
         int callId,
         int callState,
         const TDesC &labelText, 
@@ -238,9 +247,10 @@
 {
     int callId1;
     int callId2;
+    int bubble = -1;
     if (getCallIdsForConference(callId1, callId2)) {
         m_bubbleManager.startChanges();
-        int bubble = m_bubbleManager.createConference( 
+        bubble = m_bubbleManager.createConference( 
                 bubbleId(callId1), 
                 bubbleId(callId2) );
         
@@ -259,6 +269,8 @@
         
         m_bubbleManager.endChanges();
     }
+    
+    return bubble;
 }
 
 void PhoneBubbleWrapper::setConferenceCallId(int callId) 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiqtviewadapter/src/phonecommandextensionwrapper.cpp
--- a/phoneapp/phoneuiqtviewadapter/src/phonecommandextensionwrapper.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiqtviewadapter/src/phonecommandextensionwrapper.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -1,5 +1,5 @@
 /*!
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -15,21 +15,21 @@
 */
 
 #include "phonecommandextensionwrapper.h"
-#include <QtDebug>
+#include "qtphonelog.h"
 #include <xqplugin.h>
 #include <xqpluginloader.h>
 #include <pevirtualengine.h>
 
-  
+
 PhoneCommandExtensionWrapper::PhoneCommandExtensionWrapper(int pluginUid) :
     m_plugin(0),m_pluginUid(pluginUid)
 {
-    qDebug() << "PhoneCommandExtensionWrapper::PhoneMenuExtensionWrapper";    
+    PHONE_DEBUG("PhoneCommandExtensionWrapper::PhoneMenuExtensionWrapper");
     XQPluginLoader pluginLoader;
     pluginLoader.setUid(m_pluginUid);
-    
+
     QObject *plugin = pluginLoader.instance();
-    
+
     if (plugin) {
         m_plugin = qobject_cast<XQTelUiCommandExtension*>(plugin);
     }
@@ -37,7 +37,7 @@
 
 PhoneCommandExtensionWrapper::~PhoneCommandExtensionWrapper()
 {
-    qDebug() << "PhoneCommandExtensionWrapper::~PhoneCommandExtensionWrapper";
+    PHONE_DEBUG("PhoneCommandExtensionWrapper::~PhoneCommandExtensionWrapper");
     release();
 }
 
@@ -47,18 +47,18 @@
 }
 
 void PhoneCommandExtensionWrapper::modifyMenuCommandList(
-        const QList<XQTelUiCommandExtension::CallInfo> &callInfo, 
+        const QList<XQTelUiCommandExtension::CallInfo> &callInfo,
         QList<int> &menuCmdList)
-{   
+{
     if (m_plugin) {
         m_plugin->modifyMenuCommandList(callInfo, menuCmdList);
     }
 }
 
 void PhoneCommandExtensionWrapper::modifyPushButtonCommandList(
-        const QList<XQTelUiCommandExtension::CallInfo> &callInfo, 
+        const QList<XQTelUiCommandExtension::CallInfo> &callInfo,
         QList<int> &buttonCmdList)
-{   
+{
     if (m_plugin) {
         m_plugin->modifyPushButtonCommandList(callInfo, buttonCmdList);
     }
@@ -90,7 +90,7 @@
 
 void PhoneCommandExtensionWrapper::getCallInfoList(
         QList<XQTelUiCommandExtension::CallInfo> &callInfo,
-        QMap<int,int> callStates, 
+        QMap<int,int> callStates,
         QMap<int,int> serviceIds,
         int expandedCall )
 {
@@ -107,45 +107,45 @@
         int callState )
 {
     XQTelUiCommandExtension::CallState state(XQTelUiCommandExtension::None);
-    
+
     switch( callState ) {
     case EPEStateDisconnecting: {
         state = XQTelUiCommandExtension::Disconnecting;
     }
     break;
-    
+
     case EPEStateRinging: {
         state = XQTelUiCommandExtension::Incoming;
     }
     break;
-    
+
     case EPEStateDialing:
     case EPEStateConnecting: {
         state = XQTelUiCommandExtension::Outgoing;
     }
     break;
-    
+
     case EPEStateConnected:
     case EPEStateConnectedConference: {
         state = XQTelUiCommandExtension::Active;
     }
     break;
-    
+
     case EPEStateHeld:
     case EPEStateHeldConference: {
         state = XQTelUiCommandExtension::OnHold;
     }
     break;
-    
+
     case EPEStateUnknown:
     case EPEStateIdle:
-    case EPEStateConferenceIdle:   
+    case EPEStateConferenceIdle:
     break;
-    
+
     default:
     break;
     }
-    
+
     return state;
 }
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiqtviewadapter/src/phonemessagecontroller.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneuiqtviewadapter/src/phonemessagecontroller.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,100 @@
+/*!
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Handles message editor.
+*/
+
+#include "phonemessagecontroller.h"
+#include "tphonecmdparamsfidata.h"
+#include "phoneconstants.h"
+#include "cphonecenrepproxy.h"
+#include "cphonepubsubproxy.h"
+#include <settingsinternalcrkeys.h>
+#include <coreapplicationuisdomainpskeys.h>
+#include <hbglobal.h>
+#include <xqservicerequest.h>
+
+
+PhoneMessageController::PhoneMessageController(QObject *parent) : 
+    QObject(parent)
+{
+
+}
+
+PhoneMessageController::~PhoneMessageController()
+{
+
+}
+
+void PhoneMessageController::openSoftRejectMessageEditor(
+        TPhoneCommandParam *commandParam)
+{
+    TPhoneCmdParamSfiData* sfiParam =
+        static_cast<TPhoneCmdParamSfiData*>( commandParam );
+    
+    QString toField;
+    QString alias;
+    QString messageBody;
+    
+    
+    // Get message body
+    TInt softRejectDefaultInUseValue = 0;
+    const TInt err = CPhoneCenRepProxy::Instance()->GetInt(
+        KCRUidTelephonySettings,
+        KSettingsSoftRejectDefaultInUse,
+        softRejectDefaultInUseValue );
+    
+    if (softRejectDefaultInUseValue) {
+        HBufC* softRejectTxt = NULL;
+        TRAP_IGNORE( softRejectTxt = HBufC::NewL( KPhoneSMSLength ) );
+        
+        if (softRejectTxt) {
+            TPtr string( softRejectTxt->Des() );
+        
+            // Default txt used or not
+            CPhoneCenRepProxy::Instance()->GetString(
+                KCRUidTelephonySettings,
+                KSettingsSoftRejectText,
+                string );
+            
+            messageBody = QString::fromUtf16(string.Ptr(), string.Length());
+            delete softRejectTxt;
+        }
+    } else {
+        messageBody = hbTrId("txt_phone_setlabel_soft_reject_val_default_text");
+    }
+    
+    // store the remote caller's info
+    alias = QString::fromUtf16(sfiParam->Name().Ptr(), 
+            sfiParam->Name().Length());
+    
+    toField = QString::fromUtf16(sfiParam->Number().Ptr(), 
+            sfiParam->Number().Length());
+
+    
+    // open message editor
+    openEditor(toField, alias, messageBody );
+}
+
+void PhoneMessageController::openEditor(
+        QString /*toField*/, QString /*name*/, QString /*messageBody*/)
+{
+    //TODO
+    /*XQServiceRequest snd(QLatin1String("com.nokia.services.hbserviceprovider.imessage.send"), QLatin1String("send(QVariant)"));
+    QVariant data;
+    snd << data;
+    snd.send();*/
+}
+
+
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiqtviewadapter/src/phonenotecontroller.cpp
--- a/phoneapp/phoneuiqtviewadapter/src/phonenotecontroller.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiqtviewadapter/src/phonenotecontroller.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -18,13 +18,13 @@
 #include "tphonecmdparamglobalnote.h"
 #include "tphonecmdparamquery.h"
 #include "phoneresourceadapter.h"
-#include <QtDebug>
+#include "qtphonelog.h"
 #include <QSignalMapper>
 #include <QTimer>
 #include <hbdevicemessagebox.h>
 #include <hbdeviceprogressdialog.h>
 #include <hbmessagebox.h>
-#include <hbprogressnote.h>
+#include <hbprogressdialog.h>
 #include <hbaction.h>
 #include <phoneappcommands.hrh>
   
@@ -32,14 +32,14 @@
     QObject(parent), m_timer(0), m_progressDialog(0), m_dtmfNote(0), 
     m_queryNote(0), m_queryCanceledCommand(-1), m_timeoutCommand(-1)
 {
-    qDebug() << "PhoneNoteController::PhoneNoteController";
+    PHONE_DEBUG("PhoneNoteController::PhoneNoteController");
     m_signalMapper = new QSignalMapper(this);
     connect(m_signalMapper, SIGNAL(mapped(int)), this, SIGNAL(command (int)));
 }
 
 PhoneNoteController::~PhoneNoteController()
 {
-    qDebug() << "PhoneNoteController::~PhoneNoteController";
+    PHONE_DEBUG("PhoneNoteController::~PhoneNoteController");
     if (m_timer) {
         delete m_timer;
     }
@@ -47,7 +47,7 @@
 
 void PhoneNoteController::showGlobalNote(TPhoneCommandParam *commandParam)
 {
-    qDebug() << "PhoneNoteController::showGlobalNote";
+    PHONE_DEBUG("PhoneNoteController::showGlobalNote");
     Q_ASSERT (commandParam->ParamId () == TPhoneCommandParam::EPhoneParamIdGlobalNote);
 
     TPhoneCmdParamGlobalNote* globalNoteParam = 
@@ -90,7 +90,7 @@
 
 void PhoneNoteController::showNote(TPhoneCommandParam *commandParam)
 {
-    qDebug() << "PhoneNoteController::showNote";
+    PHONE_DEBUG("PhoneNoteController::showNote");
 
     TPhoneCmdParamNote* noteParam = static_cast<TPhoneCmdParamNote*>(
             commandParam );
@@ -103,7 +103,7 @@
 
 void PhoneNoteController::showQuery(TPhoneCommandParam *commandParam)
 {
-    qDebug() << "PhoneNoteController::showQuery";
+    PHONE_DEBUG("PhoneNoteController::showQuery");
     TPhoneCmdParamQuery& params = *static_cast<TPhoneCmdParamQuery*>( commandParam );
 
     if ( EPhoneQueryDialog == params.QueryType() && 
@@ -120,7 +120,7 @@
 
 void PhoneNoteController::removeDtmfNote()
 {
-    qDebug() << "PhoneNoteController::removeDtmfNote"; 
+    PHONE_DEBUG("PhoneNoteController::removeDtmfNote"); 
     if (m_dtmfNote) {
         m_dtmfNote->close();
     }
@@ -128,13 +128,13 @@
 
 void PhoneNoteController::removeNote()
 {
-    qDebug() << "PhoneNoteController::removeNote"; 
+    PHONE_DEBUG("PhoneNoteController::removeNote"); 
     removeDtmfNote();
 }
 
 void PhoneNoteController::removeQuery()
 {
-    qDebug() << "PhoneNoteController::removeQuery"; 
+    PHONE_DEBUG("PhoneNoteController::removeQuery"); 
     if (m_queryNote) {
         m_queryNote->close();
     }
@@ -142,7 +142,7 @@
 
 void PhoneNoteController::removeGlobalWaitNote()
 {
-    qDebug() << "PhoneNoteController::removeGlobalWaitNote"; 
+    PHONE_DEBUG("PhoneNoteController::removeGlobalWaitNote"); 
     if (m_timer) {
         m_timeoutCommand = -1;
         m_timer->stop();
@@ -156,13 +156,13 @@
 
 void PhoneNoteController::destroyDialog()
 {
-    qDebug() << "PhoneNoteController::destroyDialog"; 
+    PHONE_DEBUG("PhoneNoteController::destroyDialog"); 
     HbDeviceMessageBox *messageBox = m_messageBoxList.takeFirst();
     messageBox->deleteLater();
     messageBox = 0;
     
     if ( 0 < m_messageBoxList.size() ) {
-        qDebug() << "PhoneNoteController::show pending note";
+        PHONE_DEBUG("PhoneNoteController::show pending note");
         HbDeviceMessageBox *messageBoxTemp = m_messageBoxList[0];
         QObject::connect(messageBoxTemp, SIGNAL(aboutToClose()), 
                          this, SLOT(destroyDialog()));
@@ -254,9 +254,9 @@
     } else {
         QList<HbAction*> hbactions = PhoneResourceAdapter::Instance()->
             convertToHbActions(noteParam->ResourceId());
-        
+
         if (hbactions.count() > 0) {
-            m_dtmfNote = new HbProgressNote(HbProgressNote::ProgressNote);
+            m_dtmfNote = new HbProgressDialog(HbProgressDialog::ProgressDialog);
             m_dtmfNote->setText( QString::fromUtf16(noteParam->Text().Ptr(), 
                     noteParam->Text().Length()) ); 
                   
@@ -313,7 +313,7 @@
     if (!m_progressDialog) {        
         m_queryCanceledCommand = params->CbaCommandMapping(EAknSoftkeyCancel);
 
-        m_progressDialog = new HbDeviceProgressDialog(HbProgressNote::WaitNote);
+        m_progressDialog = new HbDeviceProgressDialog(HbProgressDialog::WaitDialog);
         
         if (params->QueryPrompt().Length()) {
             m_progressDialog->setText(QString::fromUtf16(params->QueryPrompt().Ptr(), 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiqtviewadapter/src/phoneresourceadapter.cpp
--- a/phoneapp/phoneuiqtviewadapter/src/phoneresourceadapter.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiqtviewadapter/src/phoneresourceadapter.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -65,103 +65,44 @@
     QMap<PhoneAction::ActionType, PhoneAction *> translatedActions;
     
     switch (symbianResourceId) {
-    case R_PHONEUI_INCOMING_CALL_BUTTONS:
-    case R_PHONEUI_WAITING_CALL_BUTTONS:        
-        {
-        PhoneAction *leftButton = new PhoneAction;
-        leftButton->setText (hbTrId("txt_common_button_answer"));
-        leftButton->setIcon (HbIcon(":/pri_large_button_answer.svg"));
-        leftButton->setCommand (EPhoneCallComingCmdAnswer);
-        translatedActions [PhoneAction::LeftButton] = leftButton;
-        
-        PhoneAction *rightButton = new PhoneAction;
-        rightButton->setText (hbTrId("txt_common_button_reject"));
-        rightButton->setIcon (HbIcon(":/qtg_large_button_reject.svg"));
-        rightButton->setCommand (EPhoneCallComingCmdReject);
-        translatedActions [PhoneAction::RightButton] = rightButton;
-        }
-        break;
-        
-    case R_PHONEUI_CALL_SETUP_BUTTONS:
-        {
-        PhoneAction *leftButton = new PhoneAction;
-        leftButton->setText (hbTrId("txt_phone_button_end_call"));
-        leftButton->setIcon (HbIcon(":/pri_large_button_endcall.svg"));
-        leftButton->setCommand (EPhoneInCallCmdEndThisOutgoingCall);
-        translatedActions [PhoneAction::LeftButton] = leftButton;
-        }
-        break;
-
-    case R_PHONEUI_INCALL_BUTTONS:
-        {
-        PhoneAction *leftButton = new PhoneAction;
-        leftButton->setText (hbTrId("txt_phone_button_hold"));
-        leftButton->setIcon (HbIcon(":/qtg_large_button_hold.svg"));
-        leftButton->setCommand (EPhoneInCallCmdHold);
-        translatedActions [PhoneAction::LeftButton] = leftButton;
-
-        PhoneAction *rightButton = new PhoneAction;
-        rightButton->setText (hbTrId("txt_phone_button_end_call"));
-        rightButton->setIcon (HbIcon(":/pri_large_button_endcall.svg"));
-        rightButton->setCommand (EPhoneInCallCmdEndThisActiveCall);
-        translatedActions [PhoneAction::RightButton] = rightButton;
-        }
-        break;
-        
-    case R_PHONEUI_INCALL_HELD_BUTTONS:
-        {
-        PhoneAction *leftButton = new PhoneAction;
-        leftButton->setText (hbTrId("txt_phone_button_unhold"));
-        leftButton->setIcon (HbIcon(":/qtg_large_button_onhold.svg"));
-        leftButton->setCommand (EPhoneInCallCmdUnhold);
-        translatedActions [PhoneAction::LeftButton] = leftButton;
-
-        PhoneAction *rightButton = new PhoneAction;
-        rightButton->setText (hbTrId("txt_phone_button_end_call"));
-        rightButton->setIcon (HbIcon(":/pri_large_button_endcall.svg"));
-        rightButton->setCommand (EPhoneInCallCmdEndThisActiveCall);
-        translatedActions [PhoneAction::RightButton] = rightButton;
-        }
-        break;
-
-    case R_PHONEUI_TWO_SINGLES_BUTTONS:
-        {
-        PhoneAction *leftButton = new PhoneAction;
-        leftButton->setText (hbTrId("txt_phone_button_swap"));
-        leftButton->setIcon (HbIcon(":/qgn_indi_button_swap.svg"));
-        leftButton->setCommand (EPhoneInCallCmdSwap);
-        translatedActions [PhoneAction::LeftButton] = leftButton;
-
-        PhoneAction *rightButton = new PhoneAction;
-        rightButton->setText (hbTrId("txt_phone_button_end_call"));
-        rightButton->setIcon (HbIcon(":/pri_large_button_endcall.svg"));
-        rightButton->setCommand (EPhoneInCallCmdEndThisActiveCall);
-        translatedActions [PhoneAction::RightButton] = rightButton;                        
-        }
-        break;
     
     case R_PHONEUI_CALLHANDLING_INCOMINGCALL_CBA:
         {
         PhoneAction *leftButton = new PhoneAction;
-        leftButton->setIcon (HbIcon(":/qtg_large_comp_message.svg"));
+        leftButton->setIcon (HbIcon("qtg_mono_send"));
+        leftButton->setCommand(EPhoneCallComingCmdSoftReject);
         translatedActions [PhoneAction::ToolbarButton1] = leftButton;       
         
         PhoneAction *rightButton = new PhoneAction;
-        rightButton->setIcon (HbIcon(":/qtg_large_tb_silence.svg"));
+        rightButton->setIcon (HbIcon("qtg_mono_mute"));
         rightButton->setCommand (EPhoneCallComingCmdSilent);
         translatedActions [PhoneAction::ToolbarButton2] = rightButton;            
         }
         break;
 
     case R_PHONEUI_CALLHANDLING_INCOMINGCALL_REJECT_CBA:
+        {
+        PhoneAction *leftButton = new PhoneAction;
+        leftButton->setIcon (HbIcon("qtg_mono_send"));
+        leftButton->setCommand(EPhoneCallComingCmdSoftReject);
+        translatedActions [PhoneAction::ToolbarButton1] = leftButton;
+               
+        PhoneAction *rightButton = new PhoneAction;
+        rightButton->setIcon (HbIcon("qtg_mono_reject_call"));
+        rightButton->setCommand (EPhoneCallComingCmdReject);
+        translatedActions [PhoneAction::ToolbarButton2] = rightButton;      
+        }
+        break;
+        
     case R_PHONEUI_CALLHANDLING_INCOMINGCALL_SOFT_REJECT_CBA:
         {
         PhoneAction *leftButton = new PhoneAction;
-        leftButton->setIcon (HbIcon(":/qtg_large_comp_message.svg"));
-        translatedActions [PhoneAction::ToolbarButton1] = leftButton;
+        leftButton->setIcon (HbIcon("qtg_mono_send"));
+        leftButton->setCommand(EPhoneCallComingCmdSoftReject);
+        translatedActions [PhoneAction::ToolbarButton1] = leftButton;    
         
         PhoneAction *rightButton = new PhoneAction;
-        rightButton->setIcon (HbIcon(":/qtg_large_tb_silence.svg"));
+        rightButton->setIcon (HbIcon("qtg_mono_mute"));
         rightButton->setDisabled(true);
         translatedActions [PhoneAction::ToolbarButton2] = rightButton;        
         }
@@ -170,12 +111,14 @@
     case R_PHONEUI_CALLHANDLING_CALLWAITING_CBA:        
         {
         PhoneAction *leftButton = new PhoneAction;
-        leftButton->setIcon (HbIcon(":/qtg_large_comp_message.svg"));
+        leftButton->setIcon (HbIcon("qtg_mono_send"));
+        leftButton->setCommand(EPhoneCallComingCmdSoftReject);
         translatedActions [PhoneAction::ToolbarButton1] = leftButton;       
         
         PhoneAction *rightButton = new PhoneAction;
-        rightButton->setIcon (HbIcon(":/qtg_large_tb_join.svg"));
+        rightButton->setIcon (HbIcon("qtg_mono_join_call"));
         rightButton->setCommand (EPhoneInCallCmdJoin);
+        rightButton->setDisabled(true);
         translatedActions [PhoneAction::ToolbarButton2] = rightButton;            
         }
         break;        
@@ -186,30 +129,30 @@
     case R_PHONEUI_CALLHANDLING_INCALL_UNHOLD_CBA:
         {
         PhoneAction *leftButton = new PhoneAction;
-        leftButton->setIcon (HbIcon(":/qtg_large_tb_dialler.svg"));
+        leftButton->setIcon (HbIcon("qtg_mono_dialer"));
         leftButton->setCommand(EPhoneInCallCmdDialer);
         translatedActions [PhoneAction::ToolbarButton1] = leftButton;
         
         PhoneAction *centerButton = new PhoneAction;
-        centerButton->setIcon (HbIcon(":/qtg_large_tb_mute.svg"));
+        centerButton->setIcon (HbIcon("qtg_mono_mic_mute"));
         centerButton->setCommand (EPhoneInCallCmdMute);
         translatedActions [PhoneAction::ToolbarButton2] = centerButton;        
 
         PhoneAction *centerButton2 = new PhoneAction;
         if (!m_buttonsCtrl->getButtonFlags(PhoneUIQtButtonsController::Ihf))
             {
-            centerButton2->setIcon (HbIcon(":/qtg_large_tb_loudsp_unmute.svg"));
+            centerButton2->setIcon (HbIcon("qtg_mono_loudspeaker"));
             centerButton2->setCommand (EPhoneInCallCmdActivateIhf);
             }
         else
             {
-            centerButton2->setIcon (HbIcon(":/qtg_large_tb_loudsp_mute.svg"));
+            centerButton2->setIcon (HbIcon("qtg_mono_mobile"));
             centerButton2->setCommand (EPhoneInCallCmdDeactivateIhf);
             }
         translatedActions [PhoneAction::ToolbarButton3] = centerButton2; 
         
         PhoneAction *rightButton = new PhoneAction;
-        rightButton->setIcon(HbIcon(":/qtg_large_tb_contacts.svg"));
+        rightButton->setIcon(HbIcon("qtg_mono_contacts"));
         rightButton->setDisabled( 
                 (symbianResourceId==
                  R_PHONEUI_CALLHANDLING_CALLSETUP_EMPTY_DTMFDIALER_CBA));
@@ -221,19 +164,19 @@
     case R_PHONEUI_CALLHANDLING_EMERGENCY_CBA:
         {
         PhoneAction *leftButton = new PhoneAction;
-        leftButton->setIcon (HbIcon(":/qtg_large_tb_dialler.svg"));
+        leftButton->setIcon (HbIcon("qtg_mono_dialer"));
         leftButton->setCommand(EPhoneInCallCmdDialer);
         translatedActions [PhoneAction::ToolbarButton1] = leftButton;
         
         PhoneAction *rightButton = new PhoneAction;
         if (!m_buttonsCtrl->getButtonFlags(PhoneUIQtButtonsController::Ihf))
             {
-            rightButton->setIcon (HbIcon(":/qtg_large_tb_loudsp_unmute.svg"));
+            rightButton->setIcon (HbIcon("qtg_mono_loudspeaker"));
             rightButton->setCommand (EPhoneInCallCmdActivateIhf);
             }
         else
             {
-            rightButton->setIcon (HbIcon(":/qtg_large_tb_loudsp_mute.svg"));
+            rightButton->setIcon (HbIcon("qtg_mono_mobile"));
             rightButton->setCommand (EPhoneInCallCmdDeactivateIhf);
             }
         translatedActions [PhoneAction::ToolbarButton2] = rightButton;                    
@@ -243,30 +186,30 @@
     case R_PHONEUI_CALLHANDLING_INCALL_UNMUTE_CBA:
         {
         PhoneAction *leftButton = new PhoneAction;
-        leftButton->setIcon (HbIcon(":/qtg_large_tb_dialler.svg"));
+        leftButton->setIcon (HbIcon("qtg_mono_dialer"));
         leftButton->setCommand(EPhoneInCallCmdDialer);
         translatedActions [PhoneAction::ToolbarButton1] = leftButton;
         
         PhoneAction *centerButton = new PhoneAction;
-        centerButton->setIcon (HbIcon(":/qtg_large_tb_unmute.svg"));
+        centerButton->setIcon (HbIcon("qtg_mono_mic_unmute"));
         centerButton->setCommand (EPhoneInCallCmdUnmute);
         translatedActions [PhoneAction::ToolbarButton2] = centerButton;        
 
         PhoneAction *centerButton2 = new PhoneAction;
         if (!m_buttonsCtrl->getButtonFlags(PhoneUIQtButtonsController::Ihf))
             {
-            centerButton2->setIcon (HbIcon(":/qtg_large_tb_loudsp_unmute.svg"));
+            centerButton2->setIcon (HbIcon("qtg_mono_loudspeaker"));
             centerButton2->setCommand (EPhoneInCallCmdActivateIhf);
             }
         else
             {
-            centerButton2->setIcon (HbIcon(":/qtg_large_tb_loudsp_mute.svg"));
+            centerButton2->setIcon (HbIcon("qtg_mono_mobile"));
             centerButton2->setCommand (EPhoneInCallCmdDeactivateIhf);
             }
         translatedActions [PhoneAction::ToolbarButton3] = centerButton2;     
         
         PhoneAction *rightButton = new PhoneAction;
-        rightButton->setIcon(HbIcon(":/qtg_large_tb_contacts.svg"));
+        rightButton->setIcon(HbIcon("qtg_mono_contacts"));
         translatedActions[PhoneAction::ToolbarButton4] = rightButton;   
         }
         break;
@@ -274,30 +217,30 @@
     case R_PHONEUI_CALLHANDLING_INCALL_HANDSET_CBA:
         {
         PhoneAction *leftButton = new PhoneAction;
-        leftButton->setIcon (HbIcon(":/qtg_large_tb_dialler.svg"));
+        leftButton->setIcon (HbIcon("qtg_mono_dialer"));
         leftButton->setCommand(EPhoneInCallCmdDialer);
         translatedActions [PhoneAction::ToolbarButton1] = leftButton;
         
         PhoneAction *centerButton1 = new PhoneAction;
         if (!m_buttonsCtrl->getButtonFlags(PhoneUIQtButtonsController::Hold))
             {
-            centerButton1->setIcon (HbIcon(":/qtg_large_tb_mute.svg"));
+            centerButton1->setIcon (HbIcon("qtg_mono_mic_mute"));
             centerButton1->setCommand (EPhoneInCallCmdMute);
             }
         else
             {
-            centerButton1->setIcon (HbIcon(":/qtg_large_tb_unmute.svg"));
+            centerButton1->setIcon (HbIcon("qtg_mono_mic_unmute"));
             centerButton1->setCommand (EPhoneInCallCmdUnmute);
             }
         translatedActions [PhoneAction::ToolbarButton2] = centerButton1;
 
         PhoneAction *centerButton2 = new PhoneAction;
-        centerButton2->setIcon (HbIcon(":/qtg_large_tb_loudsp_mute.svg"));
+        centerButton2->setIcon (HbIcon("qtg_mono_mobile"));
         centerButton2->setCommand (EPhoneInCallCmdDeactivateIhf);
         translatedActions [PhoneAction::ToolbarButton3] = centerButton2;
         
         PhoneAction *rightButton = new PhoneAction;
-        rightButton->setIcon(HbIcon(":/qtg_large_tb_contacts.svg"));
+        rightButton->setIcon(HbIcon("qtg_mono_contacts"));
         translatedActions[PhoneAction::ToolbarButton4] = rightButton;
         }
         break;
@@ -305,7 +248,7 @@
     case R_PHONEUI_MTCAL_INCOMING_CALL:
         {
         PhoneAction *text = new PhoneAction;
-        text->setText (hbTrId("calling"));
+        text->setText (hbTrId("txt_phone_other_incoming_call"));
         translatedActions [PhoneAction::Text] = text;
         }
         break;
@@ -313,7 +256,7 @@
     case R_PHONEUI_INCALL_CALL_DISCONNECTED:
         {
         PhoneAction *text = new PhoneAction;
-        text->setText (hbTrId("disconnected"));
+        text->setText (hbTrId("txt_phone_other_disconnected"));
         translatedActions [PhoneAction::Text] = text;
         }
         break;      
@@ -340,7 +283,7 @@
         VA_LIST list;
         VA_START (list, symbianResourceId);
         int intValue = VA_ARG (list, int);
-        text->setText (hbTrId("txt_phone_other_call_ln").arg (intValue));
+        text->setText(hbTrId("txt_phone_other_call_ln", intValue));
         translatedActions [PhoneAction::Text] = text;
         VA_END (list);
         }
@@ -392,7 +335,7 @@
         {
         PhoneAction *button = new PhoneAction;
         button->setText (hbTrId("txt_phone_button_end_call"));
-        button->setIcon (HbIcon(":/pri_large_button_endcall.svg"));
+        button->setIcon (HbIcon("qtg_mono_end_call"));
         button->setCommand (EPhoneCmdEnd);
         translatedActions [PhoneAction::LeftButton] = button;
         }
@@ -419,7 +362,7 @@
         VA_LIST list;
         VA_START (list, symbianResourceId);
         const TDesC *string = (TDesC*)VA_ARG(list, TDesC*);
-        text->setText (hbTrId("Sending:\n%1").arg(QString::fromUtf16(string->Ptr(), 
+        text->setText (hbTrId("txt_phone_info_sending").arg(QString::fromUtf16(string->Ptr(), 
                 string->Length())));
         translatedActions [PhoneAction::Text] = text;
         VA_END (list);
@@ -431,7 +374,7 @@
         VA_LIST list;
         VA_START (list, symbianResourceId);
         const TDesC *string = (TDesC*)VA_ARG(list, TDesC*);
-        text->setText (hbTrId("Send string:\n%1").arg(QString::fromUtf16(string->Ptr(), 
+        text->setText (hbTrId("txt_phone_info_send_string").arg(QString::fromUtf16(string->Ptr(), 
                 string->Length())));
         translatedActions [PhoneAction::Text] = text;
         VA_END (list);
@@ -464,19 +407,19 @@
             
         case R_NOTETEXT_INVALID_PHONENUMBER:
             {
-            ret = hbTrId("Invalid phone number"); 
+            ret = hbTrId("txt_phone_info_invalid_phone_number"); 
             }
             break;
             
         case R_NOTETEXT_NO_ANSWER:
             {
-            ret = hbTrId("No answer"); 
+            ret = hbTrId("txt_phone_info_no_answer"); 
             }
             break;
         
         case R_PHONE_ERROR_NUMBER_BUSY:
             {
-            ret = hbTrId("Number busy"); 
+            ret = hbTrId("txt_phone_info_number_busy"); 
             }
             break;
             
@@ -500,7 +443,7 @@
             
         case R_INCAL_REMOTE_ACTIVE_TEXT:
             {
-            ret = hbTrId("Connected");
+            ret = hbTrId("txt_phone_info_connected");
             }
             break;
             
@@ -511,7 +454,7 @@
             break;
         case R_PHONE_INCALL_INFO_NO_NETWORK_SUPPORT:
             {
-            ret = hbTrId("No network support for video call");
+            ret = hbTrId("txt_phone_info_no_network_support_for_video_call");
             }
             break;
         default:
@@ -530,7 +473,7 @@
 
         case R_PHONE_TEXT_COLP_CONNECTED:
             {
-            ret = hbTrId("Connected to %1").arg(text);
+            ret = hbTrId("txt_phone_info_connected_to_1").arg(text);
             }
             break;
         default:
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiqtviewadapter/src/phoneuicommandcontroller.cpp
--- a/phoneapp/phoneuiqtviewadapter/src/phoneuicommandcontroller.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiqtviewadapter/src/phoneuicommandcontroller.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -16,7 +16,8 @@
 
 #include "phoneuicommandcontroller.h"
 #include "phoneresourceadapter.h"
-#include <QtDebug>
+#include "phoneuiqtbuttonscontroller.h"
+#include "qtphonelog.h"
 #include <hbaction.h>
 #include <spsettings.h>
 #include <spentry.h>
@@ -32,12 +33,12 @@
         PhoneUIQtViewIF &view, QObject *parent) 
 : QObject (parent), m_view(view), m_lastCommandExtension(0)
 {
-    qDebug() << "PhoneMenuController::PhoneMenuController";
+    PHONE_DEBUG("PhoneMenuController::PhoneMenuController");
 }
 
 PhoneUiCommandController::~PhoneUiCommandController()
 {
-    qDebug() << "PhoneMenuController::~PhoneMenuController";
+    PHONE_DEBUG("PhoneMenuController::~PhoneMenuController");
     for (int i=0;i<m_commandExtensions.count();++i) {
         m_commandExtensions.at(i)->release();
     }
@@ -47,7 +48,7 @@
         QMap<int,int> callStates, QMap<int,int> serviceIds, 
         int serviceId, int expandedCallId )
 {
-    qDebug() << "PhoneMenuController::setCallMenuActions";
+    PHONE_DEBUG("PhoneMenuController::setCallMenuActions");
     releaseMenu();
     
     PhoneCommandExtensionWrapper *extension = commandExtension(serviceId);
@@ -75,7 +76,7 @@
 
 void PhoneUiCommandController::setDialpadMenuActions()
 {
-    qDebug() << "PhoneMenuController::setDialpadMenuActions";
+    PHONE_DEBUG("PhoneMenuController::setDialpadMenuActions");
     releaseMenu();
     QList<PhoneAction*> values;
     m_view.setMenuActions(values);
@@ -129,29 +130,35 @@
 QList<int> PhoneUiCommandController::menuCommands(
         QMap<int,int> callStates, QMap<int,int> serviceIds )
 {
-    qDebug() << "PhoneMenuController::menuCommands";
+    PHONE_DEBUG("PhoneMenuController::menuCommands");
     QList<int> commands;
     bool sameServices = areServicesSame(callStates,serviceIds);
 
     switch(callStates.values().count()) {
-    case 1:
+    case 1: {
         // No logical string for switch to video option	
         /*if (callStates.values().contains(EPEStateConnected)) {
             commands.append(PhoneInCallCmdSwitchToVideo);
         }*/
-        break;
-    case 2:
+    }
+    break;
+    case 2: {
+        if (!callStates.values().contains(EPEStateRinging) &&
+            !callStates.values().contains(EPEStateDisconnecting)) {
+            commands.append(PhoneInCallCmdEndAllCalls);
+        }
         if (callStates.values().contains(EPEStateConnected) &&
             callStates.values().contains(EPEStateHeld)) {
-            commands.append(PhoneInCallCmdEndAllCalls);
             if (sameServices) {
                 commands.append(PhoneInCallCmdTransfer);
             }
         }
-        break;
-    case 3:
-
-        break;
+    }
+    break;
+    case 3: {
+        commands.append(PhoneInCallCmdEndAllCalls);    
+    }
+    break;
     default:
         break;
     }
@@ -281,7 +288,7 @@
 
 void PhoneUiCommandController::releaseMenu()
 {
-    qDebug() << "PhoneMenuController::setDialpadMenuActions";
+    PHONE_DEBUG("PhoneMenuController::setDialpadMenuActions");
     for (int i=0;i<m_customMenuActions.count();i++) {
         m_view.menuReference().removeAction(m_customMenuActions.at(i));
     }
@@ -349,7 +356,9 @@
                 
                 if (EPEStateConnectedConference == callState) {
                     ret.append(PhoneInCallCmdSwap);
-                } else if (sameServices) {
+                } else if (sameServices && 
+                    false == PhoneResourceAdapter::Instance()->buttonsController()->
+                        getButtonFlags(PhoneUIQtButtonsController::DisableJoin)) {
                     if ( callStates.contains(EPEStateHeldConference) ) {
                         ret.append(PhoneInCallCmdJoinToConference);                  
                     } else {
@@ -373,7 +382,9 @@
         } else {
             if (EPEStateHeldConference == callState) {
                 ret.append(PhoneInCallCmdSwap);
-            } else if (sameServices) {
+            } else if (sameServices && 
+                    false == PhoneResourceAdapter::Instance()->buttonsController()->
+                        getButtonFlags(PhoneUIQtButtonsController::DisableJoin)) {
                 if ( callStates.contains(EPEStateConnectedConference)) {
                     ret.append(PhoneInCallCmdJoinToConference);
                 } else {
@@ -403,21 +414,21 @@
     switch( command ) {
     case PhoneInCallCmdJoinToConference: {
         action = new PhoneAction;
-        action->setIcon(HbIcon(":/qtg_mono_join_call.svg"));
+        action->setIcon(HbIcon("qtg_mono_join_call"));
         action->setCommand(EPhoneInCallCmdJoin);
     }
     break;
 
     case PhoneInCallCmdCreateConference: {
         action = new PhoneAction;
-        action->setIcon(HbIcon(":/qtg_mono_join_call.svg"));
+        action->setIcon(HbIcon("qtg_mono_join_call"));
         action->setCommand(EPhoneInCallCmdCreateConference);
     }
     break;
         
     case PhoneInCallCmdAnswer: {
         action = new PhoneAction;
-        action->setIcon(HbIcon(":/qtg_mono_answer_call.svg"));
+        action->setIcon(HbIcon("qtg_mono_call"));
         action->setCommand (EPhoneCallComingCmdAnswer);
         action->setActionRole(PhoneAction::Accept);
     }
@@ -425,7 +436,7 @@
     
     case PhoneInCallCmdReject: {
         action = new PhoneAction;
-        action->setIcon(HbIcon(":/qtg_mono_reject_call.svg"));
+        action->setIcon(HbIcon("qtg_mono_reject_call"));
         action->setCommand (EPhoneCallComingCmdReject);
         action->setActionRole(PhoneAction::Decline);
     }
@@ -433,21 +444,21 @@
     
     case PhoneInCallCmdHold: {
         action = new PhoneAction;
-        action->setIcon(HbIcon(":/qtg_mono_hold_call.svg"));
+        action->setIcon(HbIcon("qtg_mono_hold_call"));
         action->setCommand(EPhoneInCallCmdHold);
     }
     break;
     
     case PhoneInCallCmdUnhold: {
         action = new PhoneAction;
-        action->setIcon(HbIcon(":/qtg_mono_answer_call.svg")); // todo icon missing
+        action->setIcon(HbIcon("qtg_mono_call"));
         action->setCommand(EPhoneInCallCmdUnhold);
     }
     break;
     
     case PhoneInCallCmdEndActive: {
         action = new PhoneAction;
-        action->setIcon(HbIcon(":/qtg_mono_end_call.svg"));
+        action->setIcon(HbIcon("qtg_mono_end_call"));
         action->setCommand(EPhoneInCallCmdEndThisActiveCall);
         action->setActionRole(PhoneAction::Decline);
     }
@@ -455,7 +466,7 @@
     
     case PhoneInCallCmdEndOutgoingCall: {
         action = new PhoneAction;
-        action->setIcon(HbIcon(":/qtg_mono_end_call.svg"));
+        action->setIcon(HbIcon("qtg_mono_end_call"));
         action->setCommand(EPhoneInCallCmdEndThisOutgoingCall);
         action->setActionRole(PhoneAction::Decline);
     }
@@ -463,7 +474,7 @@
 
     case PhoneInCallCmdReplace: {
         action = new PhoneAction;
-        action->setIcon(HbIcon(":/qtg_mono_replace_call.svg"));
+        action->setIcon(HbIcon("qtg_mono_replace_call"));
         action->setCommand(EPhoneInCallCmdReplace);
         action->setActionRole(PhoneAction::Accept);
     }
@@ -471,7 +482,7 @@
     
     case PhoneInCallCmdSwap: {
         action = new PhoneAction;
-        action->setIcon(HbIcon(":/qgn_indi_button_swap.svg"));
+        action->setIcon(HbIcon("qtg_mono_swap"));
         action->setCommand(EPhoneInCallCmdSwap); 
     }
     break;
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiqtviewadapter/src/phoneuiqtviewadapter.cpp
--- a/phoneapp/phoneuiqtviewadapter/src/phoneuiqtviewadapter.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiqtviewadapter/src/phoneuiqtviewadapter.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -1,5 +1,5 @@
 /*!
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -38,36 +38,45 @@
 #include "phonenotecontroller.h"
 #include "telephonyservice.h"
 #include "phoneuicommandcontroller.h"
-#include <uikoninternalpskeys.h>
+#include "phonemessagecontroller.h"
+#include "qtphonelog.h"
+#include <UikonInternalPSKeys.h>
 #include <bubblemanagerif.h>
 #include <hbaction.h>
-#include <QtDebug>
 #include <pevirtualengine.h>
 #include <xqservicerequest.h>
 #include <QtGlobal>
 #include <xqserviceutil.h>
 #include <hbinstance.h>
 #include <QKeyEvent>
+#include <hbextendedlocale.h>
+#include <hbi18ndef.h>
+#include <eikenv.h>
+#include <w32std.h>
+#include <apgtask.h>
+#include <hbstringutil.h>
 
 //CONSTANTS
 static const int PHONE_CALL_NOT_FOUND = -1;
 
-PhoneUIQtViewAdapter::PhoneUIQtViewAdapter (PhoneUIQtViewIF &view, QObject *parent) : 
-    QObject (parent), m_view (view), m_idleUid(-1), m_dialpadAboutToClose(false)
+PhoneUIQtViewAdapter::PhoneUIQtViewAdapter (PhoneUIQtViewIF &view, QObject *parent) :
+    QObject (parent), m_view (view), m_idleUid(-1),
+    m_dialpadAboutToClose(false), m_homeScreenToForeground(false)
 {
     m_bubbleWrapper = new PhoneBubbleWrapper(m_view.bubbleManager (), this);
     m_noteController = new PhoneNoteController(this);
     m_uiCommandController = new PhoneUiCommandController(view, this);
+    m_messageController = new PhoneMessageController(this);
 
     TRAPD( error, m_ringingtonecontroller = CPhoneRingingToneController::NewL () );
     qt_symbian_throwIfError(error);
     m_resourceAdapter = PhoneResourceAdapter::Instance(this);
-    
-    // display initial toolbar to make client area size correct 
+
+    // display initial toolbar to make client area size correct
     TPhoneCmdParamInteger intParam;
     intParam.SetInteger(m_resourceAdapter->defaultToolbarResourceId());
     setToolbarButtons(&intParam);
-    
+
     m_telephonyService = new TelephonyService (this, this);
 }
 
@@ -84,35 +93,35 @@
         m_view.shutdownPhoneApp();
         }
         break;
-        
+
     case EPhoneViewSetIdleTopApplication:
         {
             TPhoneCmdParamInteger uidParam;
             uidParam.SetInteger (idleAppUid());
             setTopApplication (&uidParam);
         }
-        break;        
+        break;
 
     case EPhoneViewMuteRingToneOnAnswer:
         m_ringingtonecontroller->MuteRingingToneOnAnswer();
         break;
-    
+
     case EPhoneViewStopRingTone:
         m_ringingtonecontroller->StopPlaying();
         break;
-    
+
     case EPhoneViewMuteRingTone:
         m_ringingtonecontroller->MuteRingingTone();
         break;
-        
+
     case EPhoneViewBeginUpdate:
         m_bubbleWrapper->bubbleManager ().startChanges ();
         break;
-        
+
     case EPhoneViewEndUpdate:
         m_bubbleWrapper->bubbleManager ().endChanges ();
         break;
-        
+
     case EPhoneViewHideNaviPaneAudioVolume:
         m_view.removeVolumeSlider ();
         break;
@@ -120,14 +129,25 @@
     case EPhoneViewOpenDialer:
         openDialpad();
         break;
-        
+
     case EPhoneViewRemoveConferenceBubble:
         removeConferenceBubble();
         break;
-                
+
     case EPhoneViewSendToBackground:
     case EPhoneViewBringIdleToForeground:
-        XQServiceUtil::toBackground(true);
+        if (m_homeScreenToForeground) {
+            RWsSession& wsSession = CEikonEnv::Static()->WsSession();
+
+            TApaTaskList taskList( wsSession );
+            _LIT(KPhoneHsAppName,"hsapplication");
+            TApaTask task = taskList.FindApp(KPhoneHsAppName);
+            task.BringToForeground();
+        } else {
+            XQServiceUtil::toBackground(true);
+        }
+
+        m_homeScreenToForeground = false;
         break;
     case EPhoneViewRemoveAllCallHeaders:
         removeAllCallHeaders();
@@ -156,11 +176,11 @@
     case EPhoneViewRemoveGlobalWaitNote:
         m_noteController->removeGlobalWaitNote();
         break;
-        
+
     default:
         break;
     }
- CPhoneMediatorFactory::Instance()->Sender()->SendEvent( aCmdId ); 
+ CPhoneMediatorFactory::Instance()->Sender()->SendEvent( aCmdId );
 }
 
 void PhoneUIQtViewAdapter::ExecuteCommandL (TPhoneViewCommandId aCmdId, TInt aCallId)
@@ -185,7 +205,7 @@
     default:
         break;
     }
-   CPhoneMediatorFactory::Instance()->Sender()->SendEvent( aCmdId, aCallId ); 
+   CPhoneMediatorFactory::Instance()->Sender()->SendEvent( aCmdId, aCallId );
 }
 
 void PhoneUIQtViewAdapter::ExecuteCommandL (TPhoneViewCommandId aCmdId, TPhoneCommandParam* aCommandParam)
@@ -249,10 +269,13 @@
     case EPhoneViewShowQuery:
         m_noteController->showQuery(aCommandParam);
         break;
+    case EPhoneViewOpenSoftRejectEditor:
+        m_messageController->openSoftRejectMessageEditor(aCommandParam);
+        break;
     default:
         break;
     }
-    CPhoneMediatorFactory::Instance()->Sender()->SendEvent( aCmdId, *aCommandParam ); 
+    CPhoneMediatorFactory::Instance()->Sender()->SendEvent( aCmdId, *aCommandParam );
 }
 
 void PhoneUIQtViewAdapter::ExecuteCommandL (TPhoneViewCommandId aCmdId, TInt aCallId,
@@ -281,38 +304,47 @@
     case EPhoneViewGetCallExistsInConference:
         conferenceCallId(aCallId, aCommandParam);
         break;
+    case EPhoneViewUpdateCallHeaderCallDuration:
+    {
+        TPhoneCmdParamInteger *time = static_cast<TPhoneCmdParamInteger *>(aCommandParam);
+        QString duration = convertDuration(time->Integer());
+        PHONE_DEBUG2("call duration:", duration);
+        m_bubbleWrapper->bubbleManager ().updateCallTime (m_bubbleWrapper->bubbleId (aCallId), duration);
+        break;
+    }
+
+    case EPhoneViewCipheringInfoChange:
+    {
+        handleCipheringInfoChange(aCallId, aCommandParam);
+        break;
+    }
+
     default:
         break;
     }
-    CPhoneMediatorFactory::Instance()->Sender()->SendEvent( aCmdId, aCallId, *aCommandParam ); 
+    CPhoneMediatorFactory::Instance()->Sender()->SendEvent( aCmdId, aCallId, *aCommandParam );
 }
 
-void PhoneUIQtViewAdapter::ExecuteCommandL (TPhoneViewCommandId aCmdId, TInt aCallId, 
+void PhoneUIQtViewAdapter::ExecuteCommandL (TPhoneViewCommandId aCmdId, TInt aCallId,
     TDesC &aMessage)
 {
     switch (aCmdId) {
-    case EPhoneViewUpdateCallHeaderCallDuration:
-    { 
-        QString duration ((QChar*)aMessage.Ptr (), aMessage.Length ());
-        qDebug() << "call duration: " << duration;
-        m_bubbleWrapper->bubbleManager ().updateCallTime (m_bubbleWrapper->bubbleId (aCallId), duration);
+
+    default:
         break;
     }
-    default:    
-        break;
-    }
-    CPhoneMediatorFactory::Instance()->Sender()->SendEvent( aCmdId, aCallId, &aMessage ); 
+    CPhoneMediatorFactory::Instance()->Sender()->SendEvent( aCmdId, aCallId, &aMessage );
 }
 
 TPhoneViewResponseId PhoneUIQtViewAdapter::HandleCommandL (TPhoneViewCommandId aCmdId)
 {
     TPhoneViewResponseId response = EPhoneViewResponseSuccess;
-    
+
     switch (aCmdId) {
     case EPhoneIsDTMFDialerVisible:
     case EPhoneViewIsDTMFEditorVisible: //TODO
     case EPhoneIsCustomizedDialerVisible:
-    case EPhoneViewGetNeedToSendToBackgroundStatus:        
+    case EPhoneViewGetNeedToSendToBackgroundStatus:
         // TODO: currently not supported
         response = EPhoneViewResponseFailed;
         break;
@@ -331,13 +363,13 @@
         break;
         }
     default:
-        break;      
+        break;
     }
-    
+
     return response;
 }
 
-TPhoneViewResponseId PhoneUIQtViewAdapter::HandleCommandL (TPhoneViewCommandId aCmdId, 
+TPhoneViewResponseId PhoneUIQtViewAdapter::HandleCommandL (TPhoneViewCommandId aCmdId,
     TPhoneCommandParam *aCommandParam)
 {
     TPhoneViewResponseId viewResponse = EPhoneViewResponseSuccess;
@@ -347,10 +379,10 @@
         viewResponse = callIdByState (aCommandParam);
         break;
     case EPhoneViewSelectedConfMember:
-        viewResponse = getSelectedConferenceMember (aCommandParam); 
+        viewResponse = getSelectedConferenceMember (aCommandParam);
         break;
     default:
-        break;  
+        break;
     }
 
     return viewResponse;
@@ -358,8 +390,8 @@
 
 void PhoneUIQtViewAdapter::ExecuteCommand (TPhoneViewCommandId aCmdId)
 {
-    switch (aCmdId) {        
-    case EPhoneSetConferenceExpanded: 
+    switch (aCmdId) {
+    case EPhoneSetConferenceExpanded:
         m_bubbleWrapper->bubbleManager ().startChanges ();
         m_bubbleWrapper->bubbleManager().setExpandedConferenceCallHeader(
                 m_bubbleWrapper->conferenceCallList().size());
@@ -367,12 +399,12 @@
         break;
     default:
         break;
-    }      
+    }
 }
 
 void PhoneUIQtViewAdapter::ExecuteCommand (TPhoneViewCommandId aCmdId, TPhoneCommandParam *aCommandParam)
 {
-    switch (aCmdId) {        
+    switch (aCmdId) {
     case EPhoneViewGetAudioVolumeLevel:
         writeAudioVolumeLevel (aCommandParam);
         break;
@@ -385,14 +417,19 @@
     case EPhoneViewSetVideoCallDTMFVisibilityFlag:
         //TODO
         break;
-    case EPhoneViewBackButtonVisible: {
+    case EPhoneViewBackButtonActive: {
         TPhoneCmdParamBoolean *param = static_cast<TPhoneCmdParamBoolean *>(aCommandParam);
         m_view.setBackButtonVisible(param->Boolean());
 		}
         break;
+    case EPhoneViewHsToForegroundAfterCall: {
+        TPhoneCmdParamBoolean *param = static_cast<TPhoneCmdParamBoolean *>(aCommandParam);
+        m_homeScreenToForeground = param->Boolean();
+        }
+        break;
     default:
         break;
-    }   
+    }
 }
 
 const TDesC& PhoneUIQtViewAdapter::FetchContent ()
@@ -426,9 +463,9 @@
         KPSUidUikon,
         KUikVideoCallTopApp,
         integerParam->Integer() );
-    
+
     // Hide the Phone icon if it is not the top application
-    // TODO: how to do this?    
+    // TODO: how to do this?
 }
 
 int PhoneUIQtViewAdapter::idleAppUid ()
@@ -444,33 +481,35 @@
     return m_idleUid;
 }
 
-void PhoneUIQtViewAdapter::createCallHeader( 
-    int callId, 
+void PhoneUIQtViewAdapter::createCallHeader(
+    int callId,
     TPhoneCommandParam *commandParam )
 {
-    qDebug () << "PhoneUIQtViewAdapter::createCallHeader";
+    PHONE_DEBUG("PhoneUIQtViewAdapter::createCallHeader");
     Q_ASSERT (commandParam->ParamId () == TPhoneCommandParam::EPhoneParamIdCallHeaderData);
-        
-    TPhoneCmdParamCallHeaderData &data = 
-        static_cast<TPhoneCmdParamCallHeaderData &> (*commandParam); 
-    
+
+    TPhoneCmdParamCallHeaderData &data =
+        static_cast<TPhoneCmdParamCallHeaderData &> (*commandParam);
+
     m_bubbleWrapper->bubbleManager ().startChanges ();
-        
+
     if (m_bubbleWrapper->bubbleManager().isConferenceExpanded())
         {
         m_bubbleWrapper->bubbleManager().setExpandedConferenceCallHeader(false);
         }
-                  
+
     int bubble = m_bubbleWrapper->createCallHeader (callId);
     m_bubbleWrapper->setState (callId, bubble, data.CallState ());
     m_bubbleWrapper->setCli (bubble, data.CLIText ());
     m_bubbleWrapper->setServiceId(callId, data.ServiceId());
     m_bubbleWrapper->setSecondaryCli (bubble, data.CNAPText ());
-    m_bubbleWrapper->setLabel (bubble, data.LabelText ());    
+    m_bubbleWrapper->setLabel (bubble, data.LabelText ());
     m_bubbleWrapper->setCallType (bubble, data.CallType ());
     m_bubbleWrapper->setDivert (bubble, data.Diverted ());
+    m_bubbleWrapper->setCiphering(bubble, data.CipheringIndicatorAllowed(), data.Ciphering());
+
     if (data.Picture().Length()) {
-        QString imagePath = 
+        QString imagePath =
             QString::fromUtf16(data.Picture().Ptr(),data.Picture().Length());
         m_bubbleWrapper->bubbleManager().setCallObjectImage(bubble,imagePath);
     } else {
@@ -480,34 +519,33 @@
 }
 
 void PhoneUIQtViewAdapter::createEmergencyCallHeader(
-    int callId, 
+    int callId,
     TPhoneCommandParam *commandParam)
 {
-    qDebug () << "PhoneUIQtViewAdapter::createEmergencyCallHeader";
+    PHONE_DEBUG("PhoneUIQtViewAdapter::createEmergencyCallHeader");
     Q_ASSERT (commandParam->ParamId () == TPhoneCommandParam::EPhoneParamIdEmergencyCallHeaderData);
-        
-    TPhoneCmdParamEmergencyCallHeaderData &data = 
-        static_cast<TPhoneCmdParamEmergencyCallHeaderData &> (*commandParam); 
-    
+
+    TPhoneCmdParamEmergencyCallHeaderData &data =
+        static_cast<TPhoneCmdParamEmergencyCallHeaderData &> (*commandParam);
+
     m_bubbleWrapper->bubbleManager ().startChanges ();
     int bubble = m_bubbleWrapper->createCallHeader (callId);
     m_bubbleWrapper->setLabel (bubble, data.LabelText ());
     m_bubbleWrapper->setCli (bubble, data.HeaderText ());
-    m_bubbleWrapper->bubbleManager ().endChanges ();    
+    m_bubbleWrapper->setCiphering(bubble, data.CipheringIndicatorAllowed(), data.Ciphering());
+    m_bubbleWrapper->bubbleManager ().endChanges ();
 }
 
 void PhoneUIQtViewAdapter::updateCallHeaderState (
-    int callId, 
+    int callId,
     TPhoneCommandParam *commandParam)
 {
-    qDebug () << "PhoneUIQtViewAdapter::updateCallHeaderState";
+    PHONE_DEBUG("PhoneUIQtViewAdapter::updateCallHeaderState");
     Q_ASSERT (commandParam->ParamId () == TPhoneCommandParam::EPhoneParamIdCallHeaderData);
-    
-    TPhoneCmdParamCallHeaderData &data = 
+
+    TPhoneCmdParamCallHeaderData &data =
             static_cast<TPhoneCmdParamCallHeaderData &> (*commandParam);
 
-            
-    
     int bubble = m_bubbleWrapper->bubbleId (callId);
     if ( -1 != bubble ) {
         m_bubbleWrapper->bubbleManager ().startChanges ();
@@ -516,18 +554,17 @@
         m_bubbleWrapper->setDivert (bubble, data.Diverted ());
         m_bubbleWrapper->bubbleManager ().endChanges ();
     }
-    
 }
 
 void PhoneUIQtViewAdapter::updateCallHeaderRemoteInfo (int callId, TPhoneCommandParam *commandParam)
 {
-    qDebug () << "PhoneUIQtViewAdapter::updateCallHeaderRemoteInfo";
+    PHONE_DEBUG("PhoneUIQtViewAdapter::updateCallHeaderRemoteInfo");
     Q_ASSERT (commandParam->ParamId () == TPhoneCommandParam::EPhoneParamIdCallHeaderData);
-    
-    TPhoneCmdParamCallHeaderData &data = 
+
+    TPhoneCmdParamCallHeaderData &data =
          static_cast<TPhoneCmdParamCallHeaderData &> (*commandParam);
-     
-     
+
+
      int bubble = m_bubbleWrapper->bubbleId (callId);
      if ( -1 != bubble ) {
          m_bubbleWrapper->bubbleManager ().startChanges ();
@@ -536,17 +573,17 @@
          m_bubbleWrapper->setDivert (bubble, data.Diverted ());
          m_bubbleWrapper->bubbleManager ().endChanges ();
      }
-     
+
 }
 
 void PhoneUIQtViewAdapter::updateCallHeaderRemoteInfoAndLabel (int callId, TPhoneCommandParam *commandParam)
 {
-    qDebug () << "PhoneUIQtViewAdapter::updateCallHeaderRemoteInfoAndLabel";    
+    PHONE_DEBUG("PhoneUIQtViewAdapter::updateCallHeaderRemoteInfoAndLabel");
     Q_ASSERT (commandParam->ParamId () == TPhoneCommandParam::EPhoneParamIdCallHeaderData);
-    
-    TPhoneCmdParamCallHeaderData &data = 
-         static_cast<TPhoneCmdParamCallHeaderData &> (*commandParam); 
-     
+
+    TPhoneCmdParamCallHeaderData &data =
+         static_cast<TPhoneCmdParamCallHeaderData &> (*commandParam);
+
      int bubble = m_bubbleWrapper->bubbleId (callId);
      if ( -1 != bubble ) {
          m_bubbleWrapper->bubbleManager ().startChanges ();
@@ -555,7 +592,18 @@
          m_bubbleWrapper->setLabel (bubble, data.LabelText ());
          m_bubbleWrapper->setDivert (bubble, data.Diverted ());
          m_bubbleWrapper->bubbleManager ().endChanges ();
-     }   
+     }
+}
+
+void PhoneUIQtViewAdapter::handleCipheringInfoChange(int callId, TPhoneCommandParam *commandParam)
+{
+    TPhoneCmdParamCallHeaderData *param =
+        static_cast<TPhoneCmdParamCallHeaderData*>(commandParam);
+    m_bubbleWrapper->bubbleManager().startChanges();
+    m_bubbleWrapper->setCiphering(m_bubbleWrapper->bubbleId(callId),
+                                  param->CipheringIndicatorAllowed(),
+                                  param->Ciphering());
+    m_bubbleWrapper->bubbleManager().endChanges();
 }
 
 TPhoneViewResponseId PhoneUIQtViewAdapter::callIdByState (TPhoneCommandParam *commandParam)
@@ -579,38 +627,43 @@
 
     m_bubbleWrapper->bubbleManager ().startChanges ();
     m_view.clearParticipantListActions();
-    
+
     QList<int> bubbles = m_bubbleWrapper->bubbles().keys();
 
+    m_resourceAdapter->buttonsController()->setButtonFlags(
+            PhoneUIQtButtonsController::DisableJoin,
+            (5 <= m_bubbleWrapper->conferenceCallList().count()));
+
     for (int j = 0; j < bubbles.size(); ++j){
-        int callId = bubbles.at(j);   
+        int callId = bubbles.at(j);
         // Clear bubble
         m_view.clearBubbleCommands(m_bubbleWrapper->bubbles().value(callId));
 
 		// Get bubble actions by call type
         QMap<PhoneAction::ActionType, PhoneAction *> actions =
-            m_uiCommandController->pushButtonActionsForCall( 
+            m_uiCommandController->pushButtonActionsForCall(
                                m_bubbleWrapper->callStates().value(callId),
                                emergencyCall,
                                m_bubbleWrapper->callStates(),
                                m_bubbleWrapper->serviceIds(),
                                m_bubbleWrapper->serviceIdByCallId(callId),
                                callId);
-        
+
         QList<PhoneAction *> values = actions.values();
         for (int i = 0; i < values.size (); ++i) {
-            PhoneAction *action = values.at (i);        
-            m_view.addBubbleCommand(m_bubbleWrapper->bubbles().value(callId), 
+            PhoneAction *action = values.at (i);
+            m_view.addBubbleCommand(m_bubbleWrapper->bubbles().value(callId),
                                     *action);
             delete action;
         }
     }
-    
+
     setParticipantListActions();
     setExpandedConferenceCallHeader();
+    setBubbleSelectionFlag();
     setMenu();
-    
-    m_bubbleWrapper->bubbleManager ().endChanges ();    
+
+    m_bubbleWrapper->bubbleManager ().endChanges ();
 }
 
 void PhoneUIQtViewAdapter::setToolbarButtons (TPhoneCommandParam *commandParam)
@@ -620,13 +673,17 @@
     TPhoneCmdParamInteger &intParam =
         static_cast<TPhoneCmdParamInteger &>(*commandParam);
 
+    m_resourceAdapter->buttonsController()->setButtonFlags(
+            PhoneUIQtButtonsController::DisableJoin,
+            (5 <= m_bubbleWrapper->conferenceCallList().count()));
+
     QMap<PhoneAction::ActionType, PhoneAction *> actions = m_resourceAdapter->convert (intParam.Integer ());
     QList<PhoneAction*> values = actions.values();
-    
+
     if (actions.count()) {
         m_view.setToolbarActions(values);
     }
-    
+
     qDeleteAll(actions);
 }
 
@@ -656,7 +713,7 @@
 
     TPhoneCmdParamInteger &intParam =
         static_cast<TPhoneCmdParamInteger &>(*commandParam);
-    intParam.SetInteger (m_view.volumeSliderValue ());  
+    intParam.SetInteger (m_view.volumeSliderValue ());
 }
 
 void PhoneUIQtViewAdapter::setAudioVolumeSliderValue (TPhoneCommandParam *commandParam)
@@ -666,7 +723,7 @@
     TPhoneCmdParamInteger &intParam =
         static_cast<TPhoneCmdParamInteger &>(*commandParam);
 
-    m_view.setVolumeSliderValue(intParam.Integer(), 
+    m_view.setVolumeSliderValue(intParam.Integer(),
                                 EPhoneInCallCmdSetVolumeLevel,
                                 KPhoneVolumeMaxValue,
                                 KPhoneVolumeMinValue );
@@ -686,13 +743,13 @@
 
     TPhoneCmdParamInteger &integerParam =
         static_cast<TPhoneCmdParamInteger&>(*commandParam);
-    integerParam.SetInteger (m_bubbleWrapper->activeCallCount());    
+    integerParam.SetInteger (m_bubbleWrapper->activeCallCount());
 }
 
 void PhoneUIQtViewAdapter::setAudioPath (TPhoneCommandParam *commandParam)
     {
     Q_ASSERT (commandParam->ParamId () == TPhoneCommandParam::EPhoneParamIdAudioOutput);
-    
+
     TPhoneCmdParamAudioOutput &outputParam =
         static_cast<TPhoneCmdParamAudioOutput &>(*commandParam);
 
@@ -703,20 +760,20 @@
     m_resourceAdapter->buttonsController()->setButtonFlags(PhoneUIQtButtonsController::Btaa,
                               outputParam.AudioOutput() == EPEBTAudioAccessory);
     }
-    
+
 void PhoneUIQtViewAdapter::expandedBubbleCallId(TPhoneCommandParam *commandParam)
     {
     Q_ASSERT (commandParam->ParamId () == TPhoneCommandParam::EPhoneParamIdInteger);
-    
+
     TPhoneCmdParamInteger &outputParam =
             static_cast<TPhoneCmdParamInteger &>(*commandParam);
-    int callId = PHONE_CALL_NOT_FOUND; 
-    
-    if ( 0<m_bubbleWrapper->callStates().keys().size() ) {      
+    int callId = PHONE_CALL_NOT_FOUND;
+
+    if ( 0<m_bubbleWrapper->callStates().keys().size() ) {
         int bubbleId = m_bubbleWrapper->bubbleManager().expandedBubble();
         callId = m_bubbleWrapper->callIdByBubbleId(bubbleId);
     }
-    
+
     outputParam.SetInteger( callId );
     }
 
@@ -729,27 +786,28 @@
 
 void PhoneUIQtViewAdapter::createConferenceBubble(int callId, TPhoneCommandParam *commandParam)
 {
-    qDebug () << "PhoneUIQtViewAdapter::createConferenceBubble";    
+    PHONE_DEBUG("PhoneUIQtViewAdapter::createConferenceBubble");
     Q_ASSERT (commandParam->ParamId () == TPhoneCommandParam::EPhoneParamIdCallHeaderData);
-    
-    TPhoneCmdParamCallHeaderData &data = 
+
+    TPhoneCmdParamCallHeaderData &data =
          static_cast<TPhoneCmdParamCallHeaderData &> (*commandParam);
-      
-    m_bubbleWrapper->createConferenceBubble(
+
+    int bubble = m_bubbleWrapper->createConferenceBubble(
             callId, data.CallState(), data.LabelText(), data.CLIText());
-    
+
     m_bubbleWrapper->setServiceId(callId,data.ServiceId());
+    m_bubbleWrapper->setCiphering(bubble, data.CipheringIndicatorAllowed(), data.Ciphering());
 }
 
 void PhoneUIQtViewAdapter::conferenceCallId(int callId, TPhoneCommandParam *commandParam)
 {
-    qDebug () << "PhoneUIQtViewAdapter::conferenceCallId";    
+    PHONE_DEBUG("PhoneUIQtViewAdapter::conferenceCallId");
     Q_ASSERT (commandParam->ParamId () == TPhoneCommandParam::EPhoneParamIdBoolean);
-    
+
     TPhoneCmdParamBoolean*  conferenceDataValue =
         static_cast<TPhoneCmdParamBoolean*>(
-                commandParam ); 
-        
+                commandParam );
+
     conferenceDataValue->SetBoolean(m_bubbleWrapper->conferenceCallId(callId));
 }
 
@@ -764,11 +822,11 @@
 void PhoneUIQtViewAdapter::isConference(TPhoneCommandParam *commandParam)
 {
     Q_ASSERT (commandParam->ParamId () == TPhoneCommandParam::EPhoneParamIdBoolean);
-    
+
     TPhoneCmdParamBoolean*  conferenceDataValue =
         static_cast<TPhoneCmdParamBoolean*>(
-                commandParam ); 
-        
+                commandParam );
+
     conferenceDataValue->SetBoolean(0<m_bubbleWrapper->conferenceCallList().size());
 }
 
@@ -790,17 +848,17 @@
     TPhoneViewResponseId ret = EPhoneViewResponseSuccess;
     TPhoneCmdParamInteger*  integerValue =
         static_cast<TPhoneCmdParamInteger*>(
-                commandParam ); 
-    
+                commandParam );
+
     int bubbleId = m_bubbleWrapper->bubbleManager().selectionIdInConference();
     int callId = m_bubbleWrapper->callIdByBubbleId(bubbleId);
-    
+
     if (callId == -1) {
-        ret = EPhoneViewResponseFailed; 
+        ret = EPhoneViewResponseFailed;
     } else {
-        integerValue->SetInteger(callId); 
+        integerValue->SetInteger(callId);
     }
-    
+
     return ret;
 }
 
@@ -818,30 +876,30 @@
     /* If there is 2 or more calls ongoing then we should
      * enable expancion swap*/
     int heldBubble = -1;
-    
+
     if ( 2 <= m_bubbleWrapper->callStates().values().size() ) {
         if (callsExists(EPEStateConnected,EPEStateHeld)) {
             heldBubble =
                 m_bubbleWrapper->bubbleId(m_bubbleWrapper->callId(EPEStateHeld));
             m_view.setExpandAction(heldBubble, EPhoneInCallCmdSwap);
         } else if (callsExists(EPEStateConnected,EPEStateHeldConference)) {
-            heldBubble = 
+            heldBubble =
                 m_bubbleWrapper->bubbleId(m_bubbleWrapper->callId(EPEStateHeldConference));
-            m_view.setExpandAction(heldBubble, EPhoneInCallCmdSwap);        
+            m_view.setExpandAction(heldBubble, EPhoneInCallCmdSwap);
         } else if (callsExists(EPEStateRinging,EPEStateHeld)) {
             heldBubble =
                 m_bubbleWrapper->bubbleId(m_bubbleWrapper->callId(EPEStateHeld));
-            m_view.setExpandAction(heldBubble, EPhoneInCallCmdUnhold);        
+            m_view.setExpandAction(heldBubble, EPhoneInCallCmdUnhold);
         }
 
         QList<int> calls = m_bubbleWrapper->bubbles().keys();
         foreach (int call, calls) {
-            int bubbleId = m_bubbleWrapper->bubbleId(call); 
+            int bubbleId = m_bubbleWrapper->bubbleId(call);
             if ( bubbleId != heldBubble ) {
                  m_view.setExpandAction(bubbleId, EPhoneCmdUpdateUiControls);
             }
-        }            
-    }    
+        }
+    }
 }
 
 bool PhoneUIQtViewAdapter::callsExists(int call1State, int call2State)
@@ -858,31 +916,31 @@
 {
     if ( 0<m_bubbleWrapper->conferenceCallList().size() ) {
         m_view.addParticipantListAction(
-                EPhoneInCallCmdPrivate, 
-                hbTrId("txt_phone_button_private"), 
-                HbIcon(":/qtg_mono_private_call.svg.svg"));
+                EPhoneInCallCmdPrivate,
+                hbTrId("txt_phone_button_private"),
+                HbIcon("qtg_mono_private_call"));
         m_view.addParticipantListAction(
-                EPhoneInCallCmdDrop, 
-                hbTrId("txt_phone_button_drop"), 
-                HbIcon(":/qtg_mono_drop_call.svg.svg"));        
+                EPhoneInCallCmdDrop,
+                hbTrId("txt_phone_button_drop"),
+                HbIcon("qtg_mono_drop_call"));
     }
 }
 
 void PhoneUIQtViewAdapter::setExpandedConferenceCallHeader()
 {
-    int callId = PHONE_CALL_NOT_FOUND; 
+    int callId = PHONE_CALL_NOT_FOUND;
 
-    if ( 1==m_bubbleWrapper->bubbles().keys().size() 
+    if ( 1==m_bubbleWrapper->bubbles().keys().size()
          || (1<m_bubbleWrapper->bubbles().keys().size()
          && false == m_bubbleWrapper->callStates().values().contains(EPEStateRinging)
          && false == m_bubbleWrapper->callStates().values().contains(EPEStateDialing)
          && false == m_bubbleWrapper->callStates().values().contains(EPEStateConnecting)
-         && false == m_bubbleWrapper->callStates().values().contains(EPEStateHeldConference))) { 
-         
+         && false == m_bubbleWrapper->callStates().values().contains(EPEStateHeldConference))) {
+
         int bubbleId = m_bubbleWrapper->bubbleManager().expandedBubble();
-        callId = m_bubbleWrapper->callIdByBubbleId(bubbleId);        
+        callId = m_bubbleWrapper->callIdByBubbleId(bubbleId);
     }
-    
+
     m_bubbleWrapper->bubbleManager().setExpandedConferenceCallHeader(
             (KConferenceCallId == callId));
 }
@@ -904,7 +962,7 @@
     Q_ASSERT (commandParam->ParamId () == TPhoneCommandParam::EPhoneParamIdBoolean);
     TPhoneCmdParamBoolean* booleanParam =
         static_cast<TPhoneCmdParamBoolean*>(commandParam);
-        
+
     if (booleanParam->Boolean()) {
         m_dialpadAboutToClose = false;
         m_view.showDialpad();
@@ -918,9 +976,9 @@
     if (m_bubbleWrapper->conferenceCallList().size()) {
         removeConferenceBubble();
     }
-    
+
     QList<int> callIds = m_bubbleWrapper->bubbles().keys();
-    
+
     for (int i=0; i<callIds.size(); ++i) {
         int callId = callIds.at(i);
         if (KEmergencyCallId != callId) {
@@ -940,8 +998,11 @@
 
     TPhoneCmdParamString* entryContent =
         static_cast<TPhoneCmdParamString*>(commandParam);
-     
-    (*entryContent->String()).Copy(m_view.dialpadText().utf16());         
+    
+    QString westernNumber = 
+        HbStringUtil::convertDigitsTo(m_view.dialpadText(), WesternDigit);
+    
+    (*entryContent->String()).Copy(westernNumber.utf16());         
 }
 
 void PhoneUIQtViewAdapter::getDialpadStringLength(
@@ -950,13 +1011,13 @@
 
     TPhoneCmdParamInteger* integerParam =
         static_cast<TPhoneCmdParamInteger*>(commandParam);
-        
-    integerParam->SetInteger(m_view.dialpadText().length());    
+
+    integerParam->SetInteger(m_view.dialpadText().length());
 }
 
 void PhoneUIQtViewAdapter::removeDialpad()
 {
-    m_view.clearAndHideDialpad();    
+    m_view.clearAndHideDialpad();
 }
 
 void PhoneUIQtViewAdapter::addToConference()
@@ -995,3 +1056,25 @@
     m_noteController->showNote(commandParam);
 }
 
+QString PhoneUIQtViewAdapter::convertDuration(TInt secs)
+    {
+    QTime init(0,0,0);
+    QTime duration = init.addSecs(secs);
+    HbExtendedLocale locale = HbExtendedLocale::system();
+    QString durationString = locale.format(duration, QString(r_qtn_time_durat_long));
+    return HbStringUtil::convertDigits(durationString); 
+} 
+
+void PhoneUIQtViewAdapter::setBubbleSelectionFlag()
+{
+    bool selectionFlag = ((m_bubbleWrapper->callStates().
+                              values().contains(EPEStateRinging) &&
+                           m_bubbleWrapper->conferenceCallList().count())||
+                          m_bubbleWrapper->callStates().
+                              values().contains(EPEStateDialing) ||
+                          m_bubbleWrapper->callStates().
+                              values().contains(EPEStateConnecting));
+
+    m_bubbleWrapper->bubbleManager().setBubbleSelectionDisabled(selectionFlag);
+}
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiqtviewadapter/src/telephonyservice.cpp
--- a/phoneapp/phoneuiqtviewadapter/src/telephonyservice.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiqtviewadapter/src/telephonyservice.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -1,5 +1,5 @@
 /*!
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -15,28 +15,28 @@
 *
 */
 
-#include <QDebug>
 #include <xqserviceutil.h>
 #include "telephonyservice.h"
 #include "phoneuiqtviewadapter.h"
 #include "tphonecmdparaminteger.h"
-    
-TelephonyService::TelephonyService( PhoneUIQtViewAdapter *viewAdapter, QObject* parent) : 
+#include "qtphonelog.h"
+
+TelephonyService::TelephonyService( PhoneUIQtViewAdapter *viewAdapter, QObject* parent) :
     XQServiceProvider(QLatin1String("com.nokia.services.telephony.uistarter"), parent),
     m_viewAdapter (viewAdapter)
 {
-    qDebug () << "TelephonyService::TelephonyService";
+    PHONE_DEBUG("TelephonyService::TelephonyService");
     publishAll();
 }
 
 TelephonyService::~TelephonyService()
 {
-    qDebug () << "TelephonyService::~TelephonyService";
+    PHONE_DEBUG("TelephonyService::~TelephonyService");
 }
 
 void TelephonyService::start(const int serviceId)
 {
-    qDebug () << "TelephonyService::start:"  << serviceId;
+    PHONE_DEBUG2("TelephonyService::start:", serviceId);
     switch (serviceId) {
         case 0: {
             TPhoneCmdParamInteger uidParam;
@@ -46,7 +46,7 @@
         }
         case 1: {
             m_viewAdapter->ExecuteCommandL( EPhoneViewOpenDialer );
-            
+
             /*TODO: remove this as soon as QT Highway brings in call dialer to foreground*/
             TPhoneCmdParamInteger uidParam;
             uidParam.SetInteger( KUidPhoneApplication.iUid );
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiqtviewadapter/tsrc/ut_phonebubblewrapper/unit_tests.cpp
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonebubblewrapper/unit_tests.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonebubblewrapper/unit_tests.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -109,6 +109,7 @@
     void testSetState ();
     void testBubbleId ();
     void testSetDivert();
+    void testSetCiphering();
     void testActiveCallCount();
     void testCallStates ();
     void testBubbles ();
@@ -255,59 +256,59 @@
 void TestPhoneBubbleWrapper::testSetState ()
 {
     m_wrapper->setState (0, 1, EPEStateIdle);
-    QCOMPARE (m_int, 1);	
-    QCOMPARE (m_bubbleState, BubbleManagerIF::Disconnected);
-    QCOMPARE (m_wrapper->callId (EPEStateIdle), 0);
+    QCOMPARE(m_int, 1);	
+    QCOMPARE(m_bubbleState, BubbleManagerIF::Disconnected);
+    QCOMPARE(m_wrapper->callId (EPEStateIdle), 0);
     
     m_wrapper->setState (0, 2, EPEStateDialing);
-    QCOMPARE (m_int, 2);	
-    QCOMPARE (m_bubbleState, BubbleManagerIF::Outgoing);
-    QCOMPARE (m_wrapper->callId (EPEStateDialing), 0);
+    QCOMPARE(m_int, 2);	
+    QCOMPARE(m_bubbleState, BubbleManagerIF::Outgoing);
+    QCOMPARE(m_wrapper->callId (EPEStateDialing), 0);
 
     m_wrapper->setState (0, 3, EPEStateRinging);
-    QCOMPARE (m_int, 3);	
-    QCOMPARE (m_bubbleState, BubbleManagerIF::Incoming);
-    QCOMPARE (m_wrapper->callId (EPEStateRinging), 0);
+    QCOMPARE(m_int, 3);	
+    QCOMPARE(m_bubbleState, BubbleManagerIF::Incoming);
+    QCOMPARE(m_wrapper->callId (EPEStateRinging), 0);
 
     m_wrapper->setState (0, 4, EPEStateConnecting);
-    QCOMPARE (m_int, 4);	
-    QCOMPARE (m_bubbleState, BubbleManagerIF::Alerting);
-    QCOMPARE (m_wrapper->callId (EPEStateConnecting), 0);
+    QCOMPARE(m_int, 4);	
+    QCOMPARE(m_bubbleState, BubbleManagerIF::Alerting);
+    QCOMPARE(m_wrapper->callId (EPEStateConnecting), 0);
 
     m_wrapper->setState (0, 5, EPEStateConnected);
-    QCOMPARE (m_int, 5);	
-    QCOMPARE (m_bubbleState, BubbleManagerIF::Active);
-    QCOMPARE (m_wrapper->callId (EPEStateConnected), 0);
+    QCOMPARE(m_int, 5);	
+    QCOMPARE(m_bubbleState, BubbleManagerIF::Active);
+    QCOMPARE(m_wrapper->callId (EPEStateConnected), 0);
 
     m_wrapper->setState (0, 6, EPEStateHeld);
-    QCOMPARE (m_int, 6);	
-    QCOMPARE (m_bubbleState, BubbleManagerIF::OnHold);
-    QCOMPARE (m_wrapper->callId (EPEStateHeld), 0);
+    QCOMPARE(m_int, 6);	
+    QCOMPARE(m_bubbleState, BubbleManagerIF::OnHold);
+    QCOMPARE(m_wrapper->callId (EPEStateHeld), 0);
 
     m_wrapper->setState (0, 7, EPEStateDisconnecting);
-    QCOMPARE (m_int, 7);	
-    QCOMPARE (m_bubbleState, BubbleManagerIF::Disconnected);
-    QCOMPARE (m_wrapper->callId (EPEStateDisconnecting), 0);
+    QCOMPARE(m_int, 7);	
+    QCOMPARE(m_bubbleState, BubbleManagerIF::Disconnected);
+    QCOMPARE(m_wrapper->callId (EPEStateDisconnecting), 0);
 
     m_wrapper->setState (0, 8, EPEStateConferenceIdle);
-    QCOMPARE (m_int, 8);	
-    QCOMPARE (m_bubbleState, BubbleManagerIF::Disconnected);
-    QCOMPARE (m_wrapper->callId (EPEStateConferenceIdle), 0);
+    QCOMPARE(m_int, 8);	
+    QCOMPARE(m_bubbleState, BubbleManagerIF::Disconnected);
+    QCOMPARE(m_wrapper->callId (EPEStateConferenceIdle), 0);
 
     m_wrapper->setState (0, 9, EPEStateConnectedConference);
-    QCOMPARE (m_int, 9);	
-    QCOMPARE (m_bubbleState, BubbleManagerIF::Active);
-    QCOMPARE (m_wrapper->callId (EPEStateConnectedConference), 0);
+    QCOMPARE(m_int, 9);	
+    QCOMPARE(m_bubbleState, BubbleManagerIF::Active);
+    QCOMPARE(m_wrapper->callId (EPEStateConnectedConference), 0);
 
     m_wrapper->setState (0, 10, EPEStateHeldConference);
-    QCOMPARE (m_int, 10);	
-    QCOMPARE (m_bubbleState, BubbleManagerIF::OnHold);
-    QCOMPARE (m_wrapper->callId (EPEStateHeldConference), 0);
+    QCOMPARE(m_int, 10);	
+    QCOMPARE(m_bubbleState, BubbleManagerIF::OnHold);
+    QCOMPARE(m_wrapper->callId (EPEStateHeldConference), 0);
     
     m_wrapper->setState (0, 11, EPEStateUnknown);
-    QCOMPARE (m_int, 11);	
-    QCOMPARE (m_bubbleState, BubbleManagerIF::None);
-    QCOMPARE (m_wrapper->callId (EPEStateUnknown), 0);
+    QCOMPARE(m_int, 11);	
+    QCOMPARE(m_bubbleState, BubbleManagerIF::None);
+    QCOMPARE(m_wrapper->callId (EPEStateUnknown), 0);
 
     m_wrapper->createCallHeader (0);
     int bubble = m_wrapper->createCallHeader (1);
@@ -345,6 +346,27 @@
     QVERIFY (m_set == true);    
 }
 
+void TestPhoneBubbleWrapper::testSetCiphering()
+{
+    m_wrapper->setCiphering(2, false, false);
+    QVERIFY(m_setCallFlagCalled == true);
+    QCOMPARE(m_callFlags, (int)BubbleManagerIF::NoCiphering);
+    QVERIFY(m_int == 2);
+    QVERIFY(m_set == false);        
+    
+    m_wrapper->setCiphering(2, true, true);
+    QVERIFY(m_setCallFlagCalled == true);
+    QCOMPARE(m_callFlags, (int)BubbleManagerIF::NoCiphering);
+    QVERIFY(m_int == 2);
+    QVERIFY(m_set == false);    
+
+    m_wrapper->setCiphering(2, true, false);
+    QVERIFY(m_setCallFlagCalled == true);
+    QCOMPARE(m_callFlags,  (int)BubbleManagerIF::NoCiphering);
+    QVERIFY(m_int == 2);
+    QVERIFY(m_set == true);        
+}
+
 void TestPhoneBubbleWrapper::testActiveCallCount ()
 {
     QCOMPARE (m_wrapper->activeCallCount(), 0);
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiqtviewadapter/tsrc/ut_phonemessagecontroller/unit_tests.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonemessagecontroller/unit_tests.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,99 @@
+/*!
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Unit tests for PhoneNoteController.
+*
+*/
+
+#include <QtTest/QtTest>
+#include <QtGui>
+#include <hbapplication.h>
+#include <QSignalSpy>
+//#include <hbglobal_p.h>
+#include "phonemessagecontroller.h"
+#include "tphonecmdparamsfidata.h"
+
+#define PHONE_QT_MESSAGE_CONTROLLER_TEST_MAIN(TestObject) \
+int main(int argc, char *argv[]) \
+{ \
+    HbApplication app(argc, argv); \
+    TestObject tc; \
+    QResource::registerResource("../hbcore.rcc"); \
+    int ret = QTest::qExec(&tc, argc, argv); \
+    /* Core dump if HbIconLoader instance is not destroyed before the application instance. */ \
+    /* HbIconLoader uses QCoreApplication::aboutToQuit() signal to destroy itself. */ \
+    /* app.exec() where the signal is normally emitted is not called here. */ \
+    /* So, invoking the signal explicitly. */ \
+    QMetaObject::invokeMethod(&app, "aboutToQuit", Qt::DirectConnection); \
+    return ret; \
+}
+
+class TestPhoneMessageController : public QObject
+{
+    Q_OBJECT
+public:
+    TestPhoneMessageController();
+    virtual ~TestPhoneMessageController();
+
+public slots:
+    void initTestCase();
+    void cleanupTestCase();
+    void init();
+    void cleanup(); 
+    
+private slots:
+    void testOpenSoftRejectEditor();
+
+
+    
+private:
+    PhoneMessageController *m_messageController; // class under test
+};
+
+TestPhoneMessageController::TestPhoneMessageController()
+{
+}
+
+TestPhoneMessageController::~TestPhoneMessageController()
+{
+}
+
+void TestPhoneMessageController::initTestCase()
+{
+    m_messageController = new PhoneMessageController();
+}
+
+void TestPhoneMessageController::cleanupTestCase()
+{
+    delete m_messageController;
+}
+
+void TestPhoneMessageController::init()
+{
+}
+
+void TestPhoneMessageController::cleanup()
+{
+}
+
+void TestPhoneMessageController::testOpenSoftRejectEditor()
+{
+    TPhoneCmdParamSfiData sfiParam;
+    sfiParam.SetNumber(_L("1234567"));
+    sfiParam.SetName(_L("Tester"));
+    
+    m_messageController->openSoftRejectMessageEditor(&sfiParam);
+}
+
+PHONE_QT_MESSAGE_CONTROLLER_TEST_MAIN(TestPhoneMessageController)
+#include "unit_tests.moc"
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiqtviewadapter/tsrc/ut_phonemessagecontroller/ut_phonemessagecontroller.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonemessagecontroller/ut_phonemessagecontroller.pro	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,47 @@
+#
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+# 
+# Description: Project file for building unit test component
+#
+#
+
+TEMPLATE = app
+TARGET = 
+TARGET.UID3 = 0xEDA69234
+DEPENDPATH += .
+INCLUDEPATH += .
+CONFIG += hb
+CONFIG += qtestlib
+
+symbian {
+
+    INCLUDEPATH += \epoc32\include\platform\mw \
+                   \epoc32\include\platform \
+                   \epoc32\include\platform\app \
+                   ../../../phoneuiutils/inc/ \
+                   ../../../phoneuiview2/inc \
+                   ../../../../inc \
+                   ../../../phoneui2/srcdata
+
+    LIBS += -lphoneuiutils
+
+    TARGET.CAPABILITY = ALL -TCB
+    DEFINES += FT_SYMBIAN_INTEGRATION
+    DEFINES += BUILD_PHONEUIQTVIEWADAPTER
+}
+
+# Input
+HEADERS += ../../inc/phonemessagecontroller.h
+SOURCES += ../../src/phonemessagecontroller.cpp
+SOURCES += unit_tests.cpp
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneresourceadapter/unit_tests.cpp
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneresourceadapter/unit_tests.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneresourceadapter/unit_tests.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -105,93 +105,40 @@
     
 
     QMap<PhoneAction::ActionType, PhoneAction *> map;
-    map = m_resourceAdapter->convert (R_PHONEUI_INCOMING_CALL_BUTTONS);
-    QCOMPARE (map.size (), 2);
     PhoneAction *action = map [PhoneAction::LeftButton];
-    QCOMPARE (action->text (), QString ("Answer"));
-    QCOMPARE (action->icon (), HbIcon(":/pri_large_button_answer.svg"));
-    QCOMPARE (action->command (), (int)EPhoneCallComingCmdAnswer);
-    action = map [PhoneAction::RightButton];
-    QCOMPARE (action->text (), QString ("Reject"));
-    QCOMPARE (action->icon (), HbIcon(":/qtg_large_button_reject.svg"));
-    QCOMPARE (action->command (), (int)EPhoneCallComingCmdReject);
-    
-    map = m_resourceAdapter->convert (R_PHONEUI_INCALL_BUTTONS);
-    QCOMPARE (map.size (), 2);
-    action = map [PhoneAction::LeftButton];
-    QCOMPARE (action->text (), QString ("Hold"));
-    QCOMPARE (action->icon (), HbIcon(":/qtg_large_button_hold.svg"));
-    QCOMPARE (action->command (), (int)EPhoneInCallCmdHold);
-    action = map [PhoneAction::RightButton];
-    QCOMPARE (action->text (), QString ("End call"));
-    QCOMPARE (action->icon (), HbIcon(":/pri_large_button_endcall.svg"));
-    QCOMPARE (action->command (), (int)EPhoneInCallCmdEndThisActiveCall);
-    
-    map = m_resourceAdapter->convert (R_PHONEUI_INCALL_HELD_BUTTONS);
-    QCOMPARE (map.size (), 2);
-    action = map [PhoneAction::LeftButton];
-    QCOMPARE (action->text (), QString ("Unhold"));
-    QCOMPARE (action->icon (), HbIcon(":/qtg_large_button_onhold.svg"));
-    QCOMPARE (action->command (), (int)EPhoneInCallCmdUnhold);
-    action = map [PhoneAction::RightButton];
-    QCOMPARE (action->text (), QString ("End call"));
-    QCOMPARE (action->icon (), HbIcon(":/pri_large_button_endcall.svg"));
-    QCOMPARE (action->command (), (int)EPhoneInCallCmdEndThisActiveCall);
-    
-    map = m_resourceAdapter->convert (R_PHONEUI_WAITING_CALL_BUTTONS);
-    QCOMPARE (map.size (), 2);
-    action = map [PhoneAction::LeftButton];
-    QCOMPARE (action->text (), QString ("Answer"));
-    QCOMPARE (action->icon (), HbIcon(":/pri_large_button_answer.svg"));
-    QCOMPARE (action->command (), (int)EPhoneCallComingCmdAnswer);
-    action = map [PhoneAction::RightButton];
-    QCOMPARE (action->text (), QString ("Reject"));
-    QCOMPARE (action->icon (), HbIcon(":/qtg_large_button_reject.svg"));
-    QCOMPARE (action->command (), (int)EPhoneCallComingCmdReject);
 
-    map = m_resourceAdapter->convert (R_PHONEUI_TWO_SINGLES_BUTTONS);
-    QCOMPARE (map.size (), 2);
-    action = map [PhoneAction::LeftButton];
-    QCOMPARE (action->text (), QString ("Swap"));
-    QCOMPARE (action->icon (), HbIcon(":/qgn_indi_button_swap.svg"));
-    QCOMPARE (action->command (), (int)EPhoneInCallCmdSwap);
-    action = map [PhoneAction::RightButton];
-    QCOMPARE (action->text (), QString ("End call"));
-    QCOMPARE (action->icon (), HbIcon(":/pri_large_button_endcall.svg"));
-    QCOMPARE (action->command (), (int)EPhoneInCallCmdEndThisActiveCall);    
-    
     map = m_resourceAdapter->convert (R_PHONEUI_CALLHANDLING_INCOMINGCALL_CBA);
     QCOMPARE (map.size (), 2);
     action = map [PhoneAction::ToolbarButton1];
-    QCOMPARE (action->icon (), HbIcon(":/qtg_large_comp_message.svg"));    
+    QCOMPARE (action->icon (), HbIcon("qtg_mono_send"));    
     action = map [PhoneAction::ToolbarButton2];
-    QCOMPARE (action->icon (), HbIcon(":/qtg_large_tb_silence.svg"));
+    QCOMPARE (action->icon (), HbIcon("qtg_mono_mute"));
     QCOMPARE (action->command (), (int)EPhoneCallComingCmdSilent);    
     
     map = m_resourceAdapter->convert (R_PHONEUI_CALLHANDLING_INCOMINGCALL_REJECT_CBA);
     QCOMPARE (map.size (), 2);
     action = map [PhoneAction::ToolbarButton1];
-    QCOMPARE (action->icon (), HbIcon(":/qtg_large_comp_message.svg"));    
+    QCOMPARE (action->icon (), HbIcon("qtg_mono_send"));    
     action = map [PhoneAction::ToolbarButton2];
-    QCOMPARE (action->icon (), HbIcon(":/qtg_large_tb_silence.svg"));
+    QCOMPARE (action->icon (), HbIcon("qtg_mono_reject_call"));
     //Command is disabled
     //QCOMPARE (action->command (), (int)EPhoneCallComingCmdReject);    
      
     map = m_resourceAdapter->convert (R_PHONEUI_CALLHANDLING_INCOMINGCALL_SOFT_REJECT_CBA);
     QCOMPARE (map.size (), 2);
     action = map [PhoneAction::ToolbarButton1];
-    QCOMPARE (action->icon (), HbIcon(":/qtg_large_comp_message.svg"));    
+    QCOMPARE (action->icon (), HbIcon("qtg_mono_send"));    
     action = map [PhoneAction::ToolbarButton2];
-    QCOMPARE (action->icon (), HbIcon(":/qtg_large_tb_silence.svg"));
+    QCOMPARE (action->icon (), HbIcon("qtg_mono_mute"));
     //Command is disabled
     //QCOMPARE (action->command (), (int)EPhoneCallComingCmdReject); 
 
     map = m_resourceAdapter->convert (R_PHONEUI_CALLHANDLING_CALLWAITING_CBA);
     QCOMPARE (map.size (), 2);
     action = map [PhoneAction::ToolbarButton1];
-    QCOMPARE (action->icon (), HbIcon(":/qtg_large_comp_message.svg"));    
+    QCOMPARE (action->icon (), HbIcon("qtg_mono_send"));    
     action = map [PhoneAction::ToolbarButton2];
-    QCOMPARE (action->icon (), HbIcon(":/qtg_large_tb_join.svg"));
+    QCOMPARE (action->icon (), HbIcon("qtg_mono_join_call"));
     QCOMPARE (action->command (), (int)EPhoneInCallCmdJoin);    
     
     testIncallToolbar( R_PHONEUI_DIALER_CBA );
@@ -203,95 +150,88 @@
     map = m_resourceAdapter->convert (R_PHONEUI_MTCAL_INCOMING_CALL);
     QCOMPARE (map.size (), 1);
     action = map [PhoneAction::Text];
-    QCOMPARE (action->text (), QString ("calling"));
+    QVERIFY( false == action->text().isEmpty() );
 
     map = m_resourceAdapter->convert (R_PHONEUI_INCALL_CALL_DISCONNECTED);
     QCOMPARE (map.size (), 1);
     action = map [PhoneAction::Text];
-    QCOMPARE (action->text (), QString ("disconnected"));
+    QVERIFY( false == action->text().isEmpty() );
     
     map = m_resourceAdapter->convert (R_PHONEUI_INCALL_CALL_HELD);
     QCOMPARE (map.size (), 1);
     action = map [PhoneAction::Text];
-    QCOMPARE (action->text (), QString ("on hold"));
+    QVERIFY( false == action->text().isEmpty() );
 
     map = m_resourceAdapter->convert (R_PHONEUI_MULTC_WAITING);
     QCOMPARE (map.size (), 1);
     action = map [PhoneAction::Text];
-    QCOMPARE (action->text (), QString ("waiting"));
+    QVERIFY( false == action->text().isEmpty() );
 
     map = m_resourceAdapter->convert (R_PHONEUI_INCALL_CALL_NUMBER, 3);
     QCOMPARE (map.size (), 1);
     action = map [PhoneAction::Text];
-    QCOMPARE (action->text (), QString ("Call 3"));
-
-    map = m_resourceAdapter->convert (R_PHONEUI_CALL_SETUP_BUTTONS);
-    QCOMPARE (map.size (), 1);
-    action = map [PhoneAction::LeftButton];
-    QCOMPARE (action->text (), QString ("End call"));
-    QCOMPARE (action->icon (), HbIcon(":/pri_large_button_endcall.svg"));
-    QCOMPARE (action->command (), (int)EPhoneInCallCmdEndThisOutgoingCall);
+    QVERIFY( false == action->text().isEmpty() );
     
     map = m_resourceAdapter->convert (R_PHONEUI_TIME_DURAT_LONG_WITH_ZERO);
     QCOMPARE (map.size (), 1);
     action = map [PhoneAction::Text];
-    QCOMPARE (action->text (), QString ("%:0%H%:1%T%:2%S%:3"));
+    QVERIFY( false == action->text().isEmpty() );
     
     map = m_resourceAdapter->convert (R_PHONEUI_OUT_GOING_CALL);
     QCOMPARE (map.size (), 1);
     action = map [PhoneAction::Text];
-    QCOMPARE (action->text (), QString ("Calling"));
+    QVERIFY( false == action->text().isEmpty() );
 
     map = m_resourceAdapter->convert (R_PHONEUI_MTCAL_CLI_WITHHELD);
     QCOMPARE (map.size (), 1);
     action = map [PhoneAction::Text];
-    QCOMPARE (action->text (), QString ("Private number"));
+    QVERIFY( false == action->text().isEmpty() );
     
     map = m_resourceAdapter->convert (R_PHONEUI_MTCAL_CALL);
     QCOMPARE (map.size (), 1);
     action = map [PhoneAction::Text];
-    QCOMPARE (action->text (), QString ("Call"));
+    QVERIFY( false == action->text().isEmpty() );
     
     map = m_resourceAdapter->convert (R_PHONEUI_EMERGENCY_CALL_HEADER);
     QCOMPARE (map.size (), 1);
     action = map [PhoneAction::Text];
-    QCOMPARE (action->text (), QString ("Emergency call"));
+    QVERIFY( false == action->text().isEmpty() );
 
     map = m_resourceAdapter->convert (R_PHONEUI_ATTEMPTING_EMERGENCY_CALL_TEXT);
     QCOMPARE (map.size (), 1);
     action = map [PhoneAction::Text];
-    QCOMPARE (action->text (), QString ("Attempting"));
+    QVERIFY( false == action->text().isEmpty() );
     
     map = m_resourceAdapter->convert (R_PHONEUI_EMERGENCY_CALL_BUTTONS);
     QCOMPARE (map.size (), 1);
     action = map [PhoneAction::LeftButton];
-    QCOMPARE (action->text (), QString ("End call"));
-    QCOMPARE (action->icon (), HbIcon(":/pri_large_button_endcall.svg"));
+    QVERIFY( false == action->text().isEmpty() );
+    QCOMPARE (action->icon (), HbIcon("qtg_mono_end_call"));
     QCOMPARE (action->command (), (int)EPhoneCmdEnd);
     
     map = m_resourceAdapter->convert (R_PHONEUI_CALLHANDLING_EMERGENCY_CBA);
     QCOMPARE (map.size (), 2);
     action = map [PhoneAction::ToolbarButton1];
-    QCOMPARE (action->icon (), HbIcon(":/qtg_large_tb_dialler.svg"));
+    QCOMPARE (action->icon (), HbIcon("qtg_mono_dialer"));
     action = map [PhoneAction::ToolbarButton2];
-    QCOMPARE (action->icon (), HbIcon(":/qtg_large_tb_loudsp_unmute.svg"));
+    QCOMPARE (action->icon (), HbIcon("qtg_mono_loudspeaker"));
     QCOMPARE (action->command (), (int)EPhoneInCallCmdActivateIhf);        
     
     map = m_resourceAdapter->convert (R_PHONEUI_CONFERENCE_CALL);
     QCOMPARE (map.size (), 1);
     action = map [PhoneAction::Text];
-    QCOMPARE (action->text (), QString ("Conference"));
+    QVERIFY( false == action->text().isEmpty() );
     
     TBuf<10> buffer(_L("123"));
     map = m_resourceAdapter->convert (R_PHONEUI_SENDING_DTMF_WAIT_NOTE_TEXT, &buffer);
     QCOMPARE (map.size(), 1);
     action = map[PhoneAction::Text];
-    QCOMPARE (action->text(), QString("Sending:\n123"));
+    QVERIFY( false == action->text().isEmpty() );
     
     map = m_resourceAdapter->convert(R_PHONEUI_DTMF_WAIT_CHARACTER_CONFIRMATION_QUERY_TEXT, &buffer);
     QCOMPARE(map.size(), 1);
     action = map[PhoneAction::Text];
-    QCOMPARE(action->text(), QString("Send string:\n123"));
+    QVERIFY( false == action->text().isEmpty() );
     
     // TODO
     map = m_resourceAdapter->convert (R_PHONEUI_CALLHANDLING_INCALL_HANDSET_CBA);
@@ -305,37 +245,37 @@
     m_resourceAdapter = PhoneResourceAdapter::Instance (this);
         
     QString testString = m_resourceAdapter->convertToString(R_PHONE_ERROR_CALL_NOT_ALLOWED); 
-    QCOMPARE( testString, QString ("Call not allowed") );
+    QVERIFY( false == testString.isEmpty() );
     
     QString testString2 = m_resourceAdapter->convertToString(R_ERROR_NOTE_NOT_ALLOWED); 
-    QCOMPARE( testString2, QString ("Not allowed") );
+    QVERIFY( false == testString2.isEmpty() );
     
     QString testString3 = m_resourceAdapter->convertToString(R_NOTETEXT_INVALID_PHONENUMBER); 
-    QCOMPARE( testString3, QString ("Invalid phone number") );
+    QVERIFY( false == testString3.isEmpty() );
     
     QString testString4 = m_resourceAdapter->convertToString(R_NOTETEXT_NO_ANSWER); 
-    QCOMPARE( testString4, QString ("No answer") );
+    QVERIFY( false == testString4.isEmpty() );
     
     QString testString5 = m_resourceAdapter->convertToString(R_PHONE_ERROR_NUMBER_BUSY); 
-    QCOMPARE( testString5, QString ("Number busy") );
+    QVERIFY( false == testString5.isEmpty() );
     
     QString testString6 = m_resourceAdapter->convertToString(R_PHONE_SS_NOTIFICATION_MOCAL_WAITING_TEXT); 
-    QCOMPARE( testString6, QString ("Waiting") );
+    QVERIFY( false == testString6.isEmpty() );
     
     QString testString7 = m_resourceAdapter->convertToString(R_PHONE_SS_NOTIFICATION_INCAL_INFO_HOLD_TEXT); 
-    QCOMPARE( testString7, QString ("On hold") );
+    QVERIFY( false == testString7.isEmpty() );
     
     QString testString8 = m_resourceAdapter->convertToString(R_INCAL_INFO_HOLD_TEXT); 
-    QCOMPARE( testString8, QString ("On hold") );
+    QVERIFY( false == testString8.isEmpty() );
     
     QString testString9 = m_resourceAdapter->convertToString(R_INCAL_REMOTE_ACTIVE_TEXT); 
-    QCOMPARE( testString9, QString ("Connected") );
+    QVERIFY( false == testString9.isEmpty() );
     
     QString testString10 = m_resourceAdapter->convertToString(R_INCAL_INFO_CONF_HOLD_TEXT); 
-    QCOMPARE( testString10, QString ("Conference on hold") );
+    QVERIFY( false == testString10.isEmpty() );
     
     QString testString11 = m_resourceAdapter->convertToString(R_PHONE_INCALL_INFO_NO_NETWORK_SUPPORT); 
-    QCOMPARE( testString11, QString ("No network support for video call") );
+    QVERIFY( false == testString11.isEmpty() );
     
     QString testString12 = m_resourceAdapter->convertToString(0); 
     QCOMPARE( testString12, QString ("") );
@@ -348,7 +288,7 @@
     QString testString = m_resourceAdapter->convertToString(
             R_PHONE_TEXT_COLP_CONNECTED, QString("123456"));
     
-    QCOMPARE( testString, QString ("Connected to 123456") );
+    QVERIFY( false == testString.isEmpty() );
        
     QString testString2 = m_resourceAdapter->convertToString(0, QString()); 
     QCOMPARE( testString2, QString ("") );
@@ -364,22 +304,22 @@
     switch(id) {
     case R_PHONEUI_CALLHANDLING_INCALL_UNMUTE_CBA:
         action = map [PhoneAction::ToolbarButton1];
-        QCOMPARE (action->icon (), HbIcon(":/qtg_large_tb_dialler.svg"));
+        QCOMPARE (action->icon (), HbIcon("qtg_mono_dialer"));
         action = map [PhoneAction::ToolbarButton2];
-        QCOMPARE (action->icon (), HbIcon(":/qtg_large_tb_unmute.svg"));
+        QCOMPARE (action->icon (), HbIcon("qtg_mono_mic_unmute"));
         QCOMPARE (action->command (), (int)EPhoneInCallCmdUnmute);    
         action = map [PhoneAction::ToolbarButton3];
-        QCOMPARE (action->icon (), HbIcon(":/qtg_large_tb_loudsp_unmute.svg"));
+        QCOMPARE (action->icon (), HbIcon("qtg_mono_loudspeaker"));
         QCOMPARE (action->command (), (int)EPhoneInCallCmdActivateIhf);        
         break;
     default:    
         action = map [PhoneAction::ToolbarButton1];
-        QCOMPARE (action->icon (), HbIcon(":/qtg_large_tb_dialler.svg"));
+        QCOMPARE (action->icon (), HbIcon("qtg_mono_dialer"));
         action = map [PhoneAction::ToolbarButton2];
-        QCOMPARE (action->icon (), HbIcon(":/qtg_large_tb_mute.svg"));
+        QCOMPARE (action->icon (), HbIcon("qtg_mono_mic_mute"));
         QCOMPARE (action->command (), (int)EPhoneInCallCmdMute);    
         action = map [PhoneAction::ToolbarButton3];
-        QCOMPARE (action->icon (), HbIcon(":/qtg_large_tb_loudsp_unmute.svg"));
+        QCOMPARE (action->icon (), HbIcon("qtg_mono_loudspeaker"));
         QCOMPARE (action->command (), (int)EPhoneInCallCmdActivateIhf);
         break;
     }
@@ -397,23 +337,23 @@
     
     QString testString = m_resourceAdapter->convertCommandToString(
             EPhoneInCallCmdEndAllCalls);    
-    QCOMPARE( testString, QString ("End all calls") );
+    QVERIFY( false == testString.isEmpty() );
     
     testString = m_resourceAdapter->convertCommandToString(
             EPhoneInCallCmdTransfer);    
-    QCOMPARE( testString, QString ("Transfer") );
+    QVERIFY( false == testString.isEmpty() );
     
     testString = m_resourceAdapter->convertCommandToString(
             EPhoneInCallCmdSwitchToVideo);    
-    QCOMPARE( testString, QString ("Call back with video call") );
+    QVERIFY( false == testString.isEmpty() );
     
     testString = m_resourceAdapter->convertCommandToString(
             EPhoneCmdHandoverToWlan);    
-    QCOMPARE( testString, QString ("Handover to WLAN") );
+    QVERIFY( false == testString.isEmpty() );
     
     testString = m_resourceAdapter->convertCommandToString(
             EPhoneCmdHandoverToGsm);    
-    QCOMPARE( testString, QString ("Handover to GSM") );
+    QVERIFY( false == testString.isEmpty() );
     
     testString = m_resourceAdapter->convertCommandToString(0); 
     QCOMPARE( testString, QString ("") );
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/cphonemediatorsender_stub.cpp
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/cphonemediatorsender_stub.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/cphonemediatorsender_stub.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -23,9 +23,6 @@
 #include "PhoneLogger.h"
 #include "PhoneConstants.h"
 #include "PhoneMediatorPackageTypes.h"
-// <-- QT PHONE START --> 
-//#include "MPhoneCoverUiObserver.h"
-// <-- QT PHONE END --> 
 #include "phoneui.pan"
 #include "tphonecmdparamcallheaderdata.h"
 #include "tphonecmdparamboolean.h"
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/phonebubblewrapper.h
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/phonebubblewrapper.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/phonebubblewrapper.h	Fri Apr 16 14:58:25 2010 +0300
@@ -54,6 +54,7 @@
 extern bool m_removeCallFromConference;
 extern int m_bubble_id;
 extern QMap<int,int> m_services;
+extern bool m_setCipheringCalled;
 
 
 class PhoneBubbleWrapper : public QObject
@@ -75,13 +76,14 @@
     BubbleManagerIF& bubbleManager ();
     int bubbleId (int callId);
     void setDivert (int bubble, bool enabled);
+    void setCiphering(int bubble, bool indicatorAllowed, bool enabled);
     int activeCallCount ();
     
     const QMap<int, int> callStates() const;
     
     QMap<int, int> bubbles();
     
-    void createConferenceBubble(int callId, int callState, 
+    int createConferenceBubble(int callId, int callState, 
             const TDesC &labelText, const TDesC &cliText);
     
     void setConferenceCallId(int callId);
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/phonebubblewrapper_stub.cpp
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/phonebubblewrapper_stub.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/phonebubblewrapper_stub.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -51,6 +51,7 @@
 int m_bubble_id;
 bool m_addToConferenceBubbleCalled;
 QMap<int,int> m_services;
+bool m_setCipheringCalled;
 
 PhoneBubbleWrapper::PhoneBubbleWrapper (BubbleManagerIF& bubble, QObject *parent) : m_bubble(bubble)
 {
@@ -80,6 +81,7 @@
     m_removeCallHeaderCalled = false;
     m_bubble_id = -2;
     m_addToConferenceBubbleCalled = false;
+    m_setCipheringCalled = false;
 }
 
 PhoneBubbleWrapper::~PhoneBubbleWrapper () 
@@ -170,6 +172,11 @@
     m_bubblewrapperbool = enabled;
 }
 
+void PhoneBubbleWrapper::setCiphering(int bubble, bool indicatorAllowed, bool enabled)
+{
+    m_setCipheringCalled = true;
+}
+
 int PhoneBubbleWrapper::activeCallCount ()
 {
     m_activeCallCountCalled = true;
@@ -186,7 +193,7 @@
     return m_bubblesMap;
 }
 
-void PhoneBubbleWrapper::createConferenceBubble(
+int PhoneBubbleWrapper::createConferenceBubble(
         int callId, int callState, const TDesC &labelText, const TDesC &cliText)
 {
     m_creataConferenceCalled = true;
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/unit_tests.cpp
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/unit_tests.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/unit_tests.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -230,6 +230,8 @@
     void testSetConferenceExpanded();
     void testSetMenuActions();
     void testNoteController();
+    void testHsToForegroundAfterCall();
+    void testCipheringInfoChange();
 
 private:
     PhoneUIQtViewAdapter *m_adapter; // class under test
@@ -284,6 +286,7 @@
 {
     m_startChangesCalled = false;
     m_endChangesCalled = false;
+    m_setCipheringCalled = false;
 }
 
 void TestPhoneUIQtViewAdapter::cleanup ()
@@ -344,12 +347,12 @@
 
 void TestPhoneUIQtViewAdapter::testEPhoneViewUpdateCallHeaderCallDurationCommand ()
 {
-    _LIT (KText, "01:20:13");
-    TBufC<8> textBuf (KText);
-    m_adapter->ExecuteCommandL (EPhoneViewUpdateCallHeaderCallDuration, 1, textBuf);	
+    TPhoneCmdParamInteger time;
+    time.SetInteger(73);
+    m_adapter->ExecuteCommandL (EPhoneViewUpdateCallHeaderCallDuration, 1, &time);	
     QCOMPARE (m_updateCallTimeCalled, true);
     QCOMPARE (m_int, 2);
-    QVERIFY (m_string == "01:20:13");
+    QVERIFY (m_string == "0:01:13");
 }
 
 void TestPhoneUIQtViewAdapter::testEPhoneViewCreateCallHeaderCommand ()
@@ -361,6 +364,8 @@
     callHeader.SetCLIText (_L("Bar"), TPhoneCmdParamCallHeaderData::ERight);
     callHeader.SetCNAPText (_L("CNAP"), TPhoneCmdParamCallHeaderData::ERight);
     callHeader.SetCallType (3);
+    callHeader.SetCipheringIndicatorAllowed(true);
+    callHeader.SetCiphering(false);
     m_adapter->ExecuteCommandL (EPhoneViewCreateCallHeader, 2, &callHeader);
 
     QVERIFY (m_startChangesCalled == true);
@@ -396,6 +401,8 @@
     QVERIFY (m_bubblewrapperbool == true);
     QCOMPARE (m_bubblewrapperint, 1);
     
+    QVERIFY (m_setCipheringCalled == true);
+    
     QVERIFY (m_endChangesCalled == true);
 }
 
@@ -405,6 +412,8 @@
     callHeader.SetLabelText (_L("Attempting"));
     callHeader.SetHeaderText (_L("emergency") );
     m_adapter->ExecuteCommandL (EPhoneViewCreateEmergencyCallHeader, 2, &callHeader);
+    callHeader.SetCipheringIndicatorAllowed(true);
+    callHeader.SetCiphering(false);    
 
     QVERIFY (m_startChangesCalled == true);
 
@@ -421,6 +430,8 @@
     QCOMPARE (m_setCliBubbleId, 1);
     QCOMPARE (cliText, QString("emergency"));
     
+    QVERIFY (m_setCipheringCalled == true);
+    
     QVERIFY (m_endChangesCalled == true);    
 }
 
@@ -874,6 +885,9 @@
     callHeader.SetCallState (2);
     callHeader.SetLabelText (_L("Foo2"));
     callHeader.SetDiverted (EFalse);
+    callHeader.SetCipheringIndicatorAllowed(true);
+    callHeader.SetCiphering(false);
+    
     m_adapter->ExecuteCommandL (EPhoneViewCreateConference, 3, &callHeader);    
     QVERIFY (m_creataConferenceCalled == true);
     
@@ -887,6 +901,8 @@
     
     m_adapter->ExecuteCommandL (EPhoneViewGetCallExistsInConference, 0, &conferenceDataValue);
     QVERIFY (conferenceDataValue.Boolean() == false);
+    
+    QVERIFY (m_setCipheringCalled == true);
 }
 
 void TestPhoneUIQtViewAdapter::testHandleCommandL ()
@@ -1219,5 +1235,24 @@
     
 }
 
+void TestPhoneUIQtViewAdapter::testHsToForegroundAfterCall()
+{
+    TPhoneCmdParamBoolean booleanParam;
+    booleanParam.SetBoolean( ETrue );
+    m_adapter->ExecuteCommand( EPhoneViewHsToForegroundAfterCall,
+        &booleanParam );
+}
+
+void TestPhoneUIQtViewAdapter::testCipheringInfoChange()
+{
+    TPhoneCmdParamCallHeaderData callHeader;
+    callHeader.SetCipheringIndicatorAllowed(true);
+    callHeader.SetCiphering(false);
+    m_adapter->ExecuteCommandL (EPhoneViewCipheringInfoChange, 1, &callHeader);
+    QVERIFY (m_startChangesCalled == true);
+    QVERIFY (m_setCipheringCalled == true);
+    QVERIFY (m_endChangesCalled == true);
+}
+
 PHONE_QT_VIEW_ADAPTER_TEST_MAIN(TestPhoneUIQtViewAdapter)
 #include "unit_tests.moc"
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/ut_phoneuiqtviewadapter.pro
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/ut_phoneuiqtviewadapter.pro	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/ut_phoneuiqtviewadapter.pro	Fri Apr 16 14:58:25 2010 +0300
@@ -64,6 +64,8 @@
 SOURCES += ../../src/phoneuicommandcontroller.cpp
 HEADERS += ../../inc/phonecommandextensionwrapper.h
 SOURCES += ../../src/phonecommandextensionwrapper.cpp
+HEADERS += ../../inc/phonemessagecontroller.h
+SOURCES += ../../src/phonemessagecontroller.cpp
 SOURCES += phoneuiqtbuttonscontroller_stub.cpp
 HEADERS += phonebubblewrapper.h
 SOURCES += phonebubblewrapper_stub.cpp
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuistates/inc/cphoneconferenceandwaiting.h
--- a/phoneapp/phoneuistates/inc/cphoneconferenceandwaiting.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuistates/inc/cphoneconferenceandwaiting.h	Fri Apr 16 14:58:25 2010 +0300
@@ -65,13 +65,12 @@
         virtual void HandleKeyEventL(
             const TKeyEvent& aKeyEvent,
             TEventCode aEventCode );
-        // <-- QT PHONE START -->        
+
         /**
         * Handles user selected UI commands.
         * @param aCommand - selected command
         */    
         TBool HandleCommandL( TInt aCommand );
-        // <-- QT PHONE END -->     
 
     protected:
 
@@ -107,12 +106,10 @@
          
          void HandleWentOneToOneL( TInt aCallId );
          
-         // <-- QT PHONE START -->
          /**
-         *  Handles received EPhoneCmdUpdateUiControls command.
-         */
+          *  Handles received EPhoneCmdUpdateUiControls command.
+          */
          void UpdateUiControlsL();
-         // <-- QT PHONE END -->   
       
      private:
         TInt iRingingCallId;
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuistates/inc/cphonesingleandwaiting.h
--- a/phoneapp/phoneuistates/inc/cphonesingleandwaiting.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuistates/inc/cphonesingleandwaiting.h	Fri Apr 16 14:58:25 2010 +0300
@@ -166,12 +166,10 @@
         */
         void HandleDisconnectingL( TInt aCallId );
 
-// <-- QT PHONE START -->
         /**
         *  Handles received EPhoneCmdUpdateUiControls command.
         */
         void UpdateUiControlsL();
-// <-- QT PHONE END -->        
         
     private: //Data
             
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuistates/inc/cphonetwosinglesandwaiting.h
--- a/phoneapp/phoneuistates/inc/cphonetwosinglesandwaiting.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuistates/inc/cphonetwosinglesandwaiting.h	Fri Apr 16 14:58:25 2010 +0300
@@ -74,13 +74,11 @@
         IMPORT_C virtual void HandleErrorL( 
             const TPEErrorInfo& aErrorInfo );
 
-// <-- QT PHONE START -->        
         /**
         * Handles user selected UI commands.
         * @param aCommand - selected command
         */    
         TBool HandleCommandL( TInt aCommand );
-// <-- QT PHONE END -->        
         
     protected:
 
@@ -119,12 +117,10 @@
         */ 
         void HandleNumberEntryClearedL();
         
-// <-- QT PHONE START -->
         /**
         *  Handles received EPhoneCmdUpdateUiControls command.
         */
         void UpdateUiControlsL();
-// <-- QT PHONE END -->        
         
         // call id of ringing call
         TInt iRingingCallId;
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuistates/src/cphonealerting.cpp
--- a/phoneapp/phoneuistates/src/cphonealerting.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphonealerting.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -21,9 +21,6 @@
 #include <mpeengineinfo.h>
 #include <mpeclientinformation.h>
 #include <MediatorDomainUIDs.h>
-// <-- QT PHONE START --> 
-//#include <videotelcontrolmediatorapi.h>
-// <-- QT PHONE END --> 
 #include "cphonealerting.h"
 #include "mphonestatemachine.h"
 #include "tphonecmdparamboolean.h"
@@ -378,15 +375,6 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates,  
             "CPhoneAlerting::HandleDisconnectingL()" );
-
-// <-- QT PHONE START --> 
-    /*if ( iStateMachine->PhoneEngineInfo()->CallOrigin( aCallId ) == EPECallOriginSAT )
-        {
-        // User has hangup alerting SAT call, complete sat request
-        CompleteSatRequestL( aCallId );
-        }*/
-// <-- QT PHONE END --> 
-    
     CPhoneGsmInCall::HandleDisconnectingL( aCallId );
     }
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuistates/src/cphonecallsetup.cpp
--- a/phoneapp/phoneuistates/src/cphonecallsetup.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphonecallsetup.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -18,9 +18,6 @@
 
 // INCLUDES
 #include <MediatorDomainUIDs.h>
-// <-- QT PHONE START --> 
-//#include <videotelcontrolmediatorapi.h>
-// <-- QT PHONE END --> 
 #include "cphonecallsetup.h"
 #include "mphonestatemachine.h"
 #include "tphonecmdparamboolean.h"
@@ -163,6 +160,12 @@
     iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
         &globalNotifierParam );
 
+    // Home screen to foreground after call
+    TPhoneCmdParamBoolean booleanParam;
+    booleanParam.SetBoolean( ETrue );
+    iViewCommandHandle->ExecuteCommand( EPhoneViewHsToForegroundAfterCall,
+        &booleanParam );
+    
     // Stop capturing keys
     CaptureKeysDuringCallNotificationL( EFalse );
     
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuistates/src/cphonecallsetupandwaiting.cpp
--- a/phoneapp/phoneuistates/src/cphonecallsetupandwaiting.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphonecallsetupandwaiting.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,9 +20,6 @@
 #include <pevirtualengine.h>
 #include <StringLoader.h>
 #include <MediatorDomainUIDs.h>
-// <-- QT PHONE START --> 
-//#include <videotelcontrolmediatorapi.h>
-// <-- QT PHONE END --> 
 
 #include "cphonecallsetupandwaiting.h"
 #include "tphonecmdparamboolean.h"
@@ -46,10 +43,10 @@
 // C++ default constructor can NOT contain any code, that
 // might leave.
 //
-CPhoneCallSetupAndWaiting::CPhoneCallSetupAndWaiting( 
-    MPhoneStateMachine* aStateMachine, 
+CPhoneCallSetupAndWaiting::CPhoneCallSetupAndWaiting(
+    MPhoneStateMachine* aStateMachine,
     MPhoneViewCommandHandle* aViewCommandHandle,
-    MPhoneCustomization* aPhoneCustomization ) : 
+    MPhoneCustomization* aPhoneCustomization ) :
     CPhoneGsmInCall( aStateMachine, aViewCommandHandle, aPhoneCustomization )
     {
     }
@@ -81,18 +78,18 @@
 // (other items were commented in a header).
 // -----------------------------------------------------------
 //
-CPhoneCallSetupAndWaiting* CPhoneCallSetupAndWaiting::NewL( 
-    MPhoneStateMachine* aStateMachine, 
+CPhoneCallSetupAndWaiting* CPhoneCallSetupAndWaiting::NewL(
+    MPhoneStateMachine* aStateMachine,
     MPhoneViewCommandHandle* aViewCommandHandle,
     MPhoneCustomization* aPhoneCustomization )
     {
-    CPhoneCallSetupAndWaiting* self = new( ELeave ) CPhoneCallSetupAndWaiting( 
+    CPhoneCallSetupAndWaiting* self = new( ELeave ) CPhoneCallSetupAndWaiting(
         aStateMachine, aViewCommandHandle, aPhoneCustomization );
-    
+
     CleanupStack::PushL( self );
     self->ConstructL();
     CleanupStack::Pop( self );
-    
+
     return self;
     }
 
@@ -100,11 +97,11 @@
 // CPhoneCallSetupAndWaiting::HandlePhoneEngineMessageL
 // -----------------------------------------------------------
 //
-void CPhoneCallSetupAndWaiting::HandlePhoneEngineMessageL( 
-    const TInt aMessage, 
+void CPhoneCallSetupAndWaiting::HandlePhoneEngineMessageL(
+    const TInt aMessage,
     TInt aCallId )
     {
-    __LOGMETHODSTARTEND( EPhoneUIStates, 
+    __LOGMETHODSTARTEND( EPhoneUIStates,
         "CPhoneCallSetupAndWaiting::HandlePhoneEngineMessageL()");
     switch ( aMessage )
         {
@@ -115,7 +112,7 @@
         case MEngineMonitor::EPEMessageConnected:
             HandleConnectedL( aCallId );
             break;
-            
+
         default:
             CPhoneGsmInCall::HandlePhoneEngineMessageL( aMessage, aCallId );
             break;
@@ -128,7 +125,7 @@
 //
 void CPhoneCallSetupAndWaiting::OpenMenuBarL()
     {
-    __LOGMETHODSTARTEND( EPhoneUIStates, 
+    __LOGMETHODSTARTEND( EPhoneUIStates,
         "CPhoneCallSetupAndWaiting::OpenMenuBarL()");
     TInt resourceId;
 
@@ -146,10 +143,10 @@
         }
 
     TPhoneCmdParamInteger integerParam;
-    integerParam.SetInteger( 
+    integerParam.SetInteger(
         CPhoneMainResourceResolver::Instance()->
         ResolveResourceID( resourceId ) );
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen, 
+    iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen,
         &integerParam );
     }
 
@@ -159,12 +156,12 @@
 //
 void CPhoneCallSetupAndWaiting::HandleIdleL( TInt aCallId )
     {
-    __LOGMETHODSTARTEND( EPhoneUIStates, 
+    __LOGMETHODSTARTEND( EPhoneUIStates,
         "CPhoneCallSetupAndWaiting::HandleIdleL()");
-        
+
     BeginUiUpdateLC();
-            
-    // Remove call 
+
+    // Remove call
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
 
     // Close menu bar, if it is displayed
@@ -173,9 +170,9 @@
     // Find out do we have waiting or outgoing call left
     TPhoneCmdParamCallStateData callStateData;
     callStateData.SetCallState( EPEStateRinging );
-    iViewCommandHandle->HandleCommandL( EPhoneViewGetCallIdByState, 
+    iViewCommandHandle->HandleCommandL( EPhoneViewGetCallIdByState,
         &callStateData );
-        
+
     if( callStateData.CallId() > KErrNotFound )
         {
         // Idle message came for callSetup
@@ -184,52 +181,53 @@
             {
             CloseDTMFEditorL();
             }
-                
+
         // Display ringing bubble
         TPhoneCmdParamCallHeaderData callHeaderParam;
         callHeaderParam.SetCallState( EPEStateRinging );
-         
+
         SetCallHeaderTextsForCallComingInL( callStateData.CallId(), EFalse, &callHeaderParam );
-        
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, 
-            callStateData.CallId(), 
+
+        iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble,
+            callStateData.CallId(),
             &callHeaderParam );
-        
+
         // Show incoming call buttons
-        SetTouchPaneButtons( EPhoneIncomingCallButtons ); 
+        SetTouchPaneButtons( EPhoneIncomingCallButtons );
         SetTouchPaneButtonEnabled( EPhoneCallComingCmdSilent );
-        
-        // Bring up callhandling view       
-        BringIncomingToForegroundL();   
-        
+
+        // Bring up callhandling view
+        BringIncomingToForegroundL();
+
         // state changes to Incoming
         iCbaManager->UpdateIncomingCbaL( callStateData.CallId() );
         UpdateSilenceButtonDimming();
         SetRingingTonePlaybackL( callStateData.CallId() );
-        iStateMachine->ChangeState( EPhoneStateIncoming );    
-        }    
-    
+        SetBackButtonActive(EFalse);
+        iStateMachine->ChangeState( EPhoneStateIncoming );
+        }
+
     else
         {
         // Show call setup buttons
         CPhoneState::SetTouchPaneButtons( EPhoneCallSetupButtons );
         // Waiting call was terminated
         UpdateCbaL( EPhoneCallHandlingInCallCBA );
-        iStateMachine->ChangeState( EPhoneStateAlerting );            
+        iStateMachine->ChangeState( EPhoneStateAlerting );
         }
-    
-    EndUiUpdate();        
+
+    EndUiUpdate();
     }
-        
+
 // -----------------------------------------------------------
 // CPhoneCallSetupAndWaiting::UpdateInCallCbaL
 // -----------------------------------------------------------
 //
 void CPhoneCallSetupAndWaiting::UpdateInCallCbaL()
     {
-    __LOGMETHODSTARTEND( EPhoneControl, 
+    __LOGMETHODSTARTEND( EPhoneControl,
         "CPhoneCallSetupAndWaiting::UpdateInCallCbaL() ");
-        
+
     UpdateCbaL( EPhoneCallHandlingIncomingRejectCBA );
     }
 
@@ -243,21 +241,21 @@
 
     // Close menu bar, if it is displayed
     iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
-    
+
     CPhoneState::BeginUiUpdateLC();
 
     // Update bubble
     TPhoneCmdParamCallHeaderData callHeaderParam;
     callHeaderParam.SetCallState( EPEStateConnected );
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, 
+    iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId,
         &callHeaderParam );
-      
-    // Update Touch buttons    
+
+    // Update Touch buttons
     CPhoneState::SetTouchPaneButtons( EPhoneWaitingCallButtons );
     SetToolbarDimming( EFalse );
-    
+
     CPhoneState::EndUiUpdate();
- 
+
     if ( CPhoneState::IsNumberEntryUsedL() )
         {
         // Show number entry
@@ -265,10 +263,10 @@
         booleanParam.SetBoolean( ETrue );
         iViewCommandHandle->ExecuteCommandL( EPhoneViewSetNumberEntryVisible, &booleanParam );
         }
- 
-    // Go to Single And Waiting state 
-    UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );   
-    iStateMachine->ChangeState( EPhoneStateWaitingInSingle );        
+
+    // Go to Single And Waiting state
+    UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
+    iStateMachine->ChangeState( EPhoneStateWaitingInSingle );
     }
-    
+
 // End of File
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuistates/src/cphoneconference.cpp
--- a/phoneapp/phoneuistates/src/cphoneconference.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphoneconference.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -260,13 +260,7 @@
 //
 void CPhoneConference::UpdateInCallCbaL()
     {
-// <-- QT PHONE START -->
-    //if ( iViewCommandHandle->HandleCommandL( EPhoneViewIsConferenceInExpandedMode ) 
-    //    != EPhoneViewResponseSuccess )
-    //    {
     UpdateCbaL( EPhoneCallHandlingInCallCBA );
-    //    }
-// <-- QT PHONE END -->    
     }
 
 // -----------------------------------------------------------
@@ -497,9 +491,7 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneConference::HandleHeldConferenceL()");
     TPhoneCmdParamCallHeaderData callHeaderParam;
-    // <-- QT PHONE START --> 
     callHeaderParam.SetCallState( EPEStateHeldConference );
-    // <-- QT PHONE END -->
     
     TInt callLabelId;
     TBuf<KPhoneCallHeaderLabelMaxLength> labelText( KNullDesC );
@@ -524,9 +516,7 @@
         }
     
     SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate );
-    // <-- QT PHONE START --> 
     SetTouchPaneButtons( EPhoneConferenceButtons );
-    // <-- QT PHONE END -->
     UpdateInCallCbaL();
     }
 
@@ -581,9 +571,7 @@
         "CPhoneConference::HandleConnectedConferenceL()");
     // Update call state
     TPhoneCmdParamCallHeaderData callHeaderParam;
-    // <-- QT PHONE START -->
     callHeaderParam.SetCallState( EPEStateConnectedConference );
-    // <-- QT PHONE END -->
     
     TBuf<KPhoneCallHeaderLabelMaxLength> conferenceText( KNullDesC );
     TInt callLabelId = CPhoneMainResourceResolver::Instance()->
@@ -609,9 +597,7 @@
         }
     
     SetTouchPaneButtonEnabled( EPhoneInCallCmdPrivate );
-    // <-- QT PHONE START --> 
     SetTouchPaneButtons( EPhoneConferenceButtons );
-    // <-- QT PHONE END -->
     
     UpdateInCallCbaL();
     }
@@ -950,12 +936,10 @@
     // Check if HW Keys or Call UI should be disabled
     CheckDisableHWKeysAndCallUIL();
     
-// <-- QT PHONE START -->
     // Display incoming call
     DisplayIncomingCallL( aCallId, dialerParam );
     
     SetTouchPaneButtons( EPhoneWaitingCallButtons );
-// <-- QT PHONE END -->
 
     EndUiUpdate();
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp
--- a/phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -57,10 +57,8 @@
         {
         TPhoneCmdParamBoolean dtmfSendFlag;
         dtmfSendFlag.SetBoolean( EFalse );
-// <-- QT PHONE START -->
         iViewCommandHandle->ExecuteCommand( EPhoneViewSetDtmfOptionsFlag, 
             &dtmfSendFlag );
-// <-- QT PHONE END -->         
         }
     }
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp
--- a/phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -62,10 +62,8 @@
         {
         TPhoneCmdParamBoolean dtmfSendFlag;
         dtmfSendFlag.SetBoolean( EFalse );
-// <-- QT PHONE START -->
         iViewCommandHandle->ExecuteCommand( EPhoneViewSetDtmfOptionsFlag, 
             &dtmfSendFlag );
-// <-- QT PHONE END -->         
         }
     }
 
@@ -307,9 +305,7 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndSingle::HandleConnectedConferenceL");
     // Update call state
     TPhoneCmdParamCallHeaderData callHeaderParam;
-    // <-- QT PHONE START -->
     callHeaderParam.SetCallState( EPEStateConnectedConference );
-    // <-- QT PHONE END -->
 
     TBuf<KPhoneCallHeaderLabelMaxLength> conferenceText( KNullDesC );
     TInt callLabelId = CPhoneMainResourceResolver::Instance()->
@@ -346,9 +342,7 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndSingle::HandleHeldConferenceL");
     TPhoneCmdParamCallHeaderData callHeaderParam;
-    // <-- QT PHONE START -->
     callHeaderParam.SetCallState( EPEStateHeldConference );
-    // <-- QT PHONE END -->
     
     TInt callLabelId;
     TBuf<KPhoneCallHeaderLabelMaxLength> labelText( KNullDesC );
@@ -389,9 +383,7 @@
     iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, 
         &callHeaderParam );
 
-    // <-- QT PHONE START --> 
     SetTouchPaneButtons( EPhoneConferenceButtons );
-    // <-- QT PHONE END -->
     }
 
 // -----------------------------------------------------------
@@ -418,9 +410,7 @@
     iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, 
         &callHeaderParam );      
     
-    // <-- QT PHONE START --> 
     SetTouchPaneButtons( EPhoneConferenceButtons );
-    // <-- QT PHONE END -->
     }
 
 // -----------------------------------------------------------
@@ -491,14 +481,12 @@
     // Check if HW Keys or Call UI should be disabled
     CheckDisableHWKeysAndCallUIL();
     
-    // <-- QT PHONE START -->
     // Display incoming call
     DisplayIncomingCallL( aCallId, dialerParam  );
 
     // Set touch controls
     SetTouchPaneButtonDisabled( EPhoneCallComingCmdAnswer );
     SetTouchPaneButtons( EPhoneWaitingCallButtons );
-    // <-- QT PHONE END -->
     
     EndUiUpdate();
 
@@ -508,7 +496,7 @@
         &conferenceAndSingleFlag );
     
     // Go to Conference And Single And Waiting state
-    UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
+    UpdateCbaL( EPhoneCallHandlingIncomingRejectCBA );
     iStateMachine->ChangeState( EPhoneStateConferenceAndSingleAndWaiting );                
     }
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuistates/src/cphoneconferenceandsingleandwaiting.cpp
--- a/phoneapp/phoneuistates/src/cphoneconferenceandsingleandwaiting.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandsingleandwaiting.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2008 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2005-2008 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -41,10 +41,10 @@
 // C++ default constructor can NOT contain any code, that
 // might leave.
 //
-CPhoneConferenceAndSingleAndWaiting::CPhoneConferenceAndSingleAndWaiting( 
-    MPhoneStateMachine* aStateMachine, 
+CPhoneConferenceAndSingleAndWaiting::CPhoneConferenceAndSingleAndWaiting(
+    MPhoneStateMachine* aStateMachine,
     MPhoneViewCommandHandle* aViewCommandHandle,
-    MPhoneCustomization* aPhoneCustomization ) : 
+    MPhoneCustomization* aPhoneCustomization ) :
     CPhoneConferenceAndSingle( aStateMachine, aViewCommandHandle, aPhoneCustomization )
     {
     }
@@ -62,10 +62,8 @@
         {
         TPhoneCmdParamBoolean dtmfSendFlag;
         dtmfSendFlag.SetBoolean( EFalse );
-// <-- QT PHONE START -->
-        iViewCommandHandle->ExecuteCommand( EPhoneViewSetDtmfOptionsFlag, 
+        iViewCommandHandle->ExecuteCommand( EPhoneViewSetDtmfOptionsFlag,
             &dtmfSendFlag );
-// <-- QT PHONE END -->
         }
     }
 
@@ -86,18 +84,18 @@
 // (other items were commented in a header).
 // -----------------------------------------------------------
 //
-CPhoneConferenceAndSingleAndWaiting* CPhoneConferenceAndSingleAndWaiting::NewL( 
-    MPhoneStateMachine* aStateMachine, 
+CPhoneConferenceAndSingleAndWaiting* CPhoneConferenceAndSingleAndWaiting::NewL(
+    MPhoneStateMachine* aStateMachine,
     MPhoneViewCommandHandle* aViewCommandHandle,
     MPhoneCustomization* aPhoneCustomization )
     {
-    CPhoneConferenceAndSingleAndWaiting* self = new( ELeave ) CPhoneConferenceAndSingleAndWaiting( 
+    CPhoneConferenceAndSingleAndWaiting* self = new( ELeave ) CPhoneConferenceAndSingleAndWaiting(
         aStateMachine, aViewCommandHandle, aPhoneCustomization );
-    
+
     CleanupStack::PushL( self );
     self->ConstructL();
     CleanupStack::Pop( self );
-    
+
     return self;
     }
 
@@ -105,23 +103,23 @@
 // CPhoneConferenceAndSingleAndWaiting::HandlePhoneEngineMessageL
 // -----------------------------------------------------------
 //
-void CPhoneConferenceAndSingleAndWaiting::HandlePhoneEngineMessageL( 
-    const TInt aMessage, 
+void CPhoneConferenceAndSingleAndWaiting::HandlePhoneEngineMessageL(
+    const TInt aMessage,
     TInt aCallId )
     {
     __LOGMETHODSTARTEND(EPhoneControl, "CPhoneConferenceAndSingleAndWaiting::HandlePhoneEngineMessageL()");
     switch ( aMessage )
-        {           
+        {
         case MEngineMonitor::EPEMessageAddedConferenceMember:
             HandleAddedConferenceMemberL( aCallId );
             break;
-            
+
         case MEngineMonitor::EPEMessageIdle:
             HandleIdleL( aCallId );
             break;
-            
+
         default:
-            CPhoneConferenceAndSingle::HandlePhoneEngineMessageL( aMessage, 
+            CPhoneConferenceAndSingle::HandlePhoneEngineMessageL( aMessage,
                 aCallId );
             break;
         }
@@ -133,20 +131,20 @@
 //
 void CPhoneConferenceAndSingleAndWaiting::OpenMenuBarL()
     {
-    __LOGMETHODSTARTEND( EPhoneUIStates, 
+    __LOGMETHODSTARTEND( EPhoneUIStates,
         "CPhoneConferenceAndSingleAndWaiting::OpenMenuBarL()");
     TInt resourceId = NULL;
 
    // Set specific flag to view so that DTMF menu item available
     TPhoneCmdParamBoolean dtmfSendFlag;
     dtmfSendFlag.SetBoolean( ETrue );
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewSetDtmfOptionsFlag, 
+    iViewCommandHandle->ExecuteCommandL( EPhoneViewSetDtmfOptionsFlag,
         &dtmfSendFlag );
-  
+
 
     TPhoneCmdParamCallStateData callStateData;
     callStateData.SetCallState( EPEStateHeld );
-    iViewCommandHandle->HandleCommandL( EPhoneViewGetCallIdByState, 
+    iViewCommandHandle->HandleCommandL( EPhoneViewGetCallIdByState,
         &callStateData );
     if( callStateData.CallId() == KConferenceCallId )
         {
@@ -157,8 +155,8 @@
             }
         else if ( IsConferenceBubbleInSelectionMode() )
             {
-            resourceId = EPhoneConfCallParticipantsDropMenubar;    
-            }                    
+            resourceId = EPhoneConfCallParticipantsDropMenubar;
+            }
         else
             {
             resourceId = EPhoneCallActiveHeldConfAndWaitingMenubar;
@@ -173,8 +171,8 @@
             }
         else if ( IsConferenceBubbleInSelectionMode() )
             {
-            resourceId = EPhoneConfCallParticipantsDropMenubar;    
-            }                    
+            resourceId = EPhoneConfCallParticipantsDropMenubar;
+            }
         else
             {
             resourceId = EPhoneConfCallActiveHeldAndWaitingMenubar;
@@ -182,14 +180,14 @@
         }
     else
         {
-        return; // negative call id, don't do anything            
+        return; // negative call id, don't do anything
         }
 
     TPhoneCmdParamInteger integerParam;
-    integerParam.SetInteger( 
+    integerParam.SetInteger(
         CPhoneMainResourceResolver::Instance()->
         ResolveResourceID( resourceId ) );
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen, 
+    iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen,
         &integerParam );
     }
 
@@ -199,46 +197,46 @@
 //
 void CPhoneConferenceAndSingleAndWaiting::HandleIdleL( TInt aCallId )
     {
-    __LOGMETHODSTARTEND( EPhoneUIStates, 
+    __LOGMETHODSTARTEND( EPhoneUIStates,
         "CPhoneConferenceAndSingleAndWaiting::HandleIdleL()");
-        
+
     // Effect is shown when dialer exist.
     TBool effectStarted ( EFalse );
     if ( !NeedToSendToBackgroundL() )
         {
         BeginTransEffectLC( ENumberEntryOpen );
-        effectStarted = ETrue; 
+        effectStarted = ETrue;
         }
-         
-    BeginUiUpdateLC();    
+
+    BeginUiUpdateLC();
     // Set touch controls
     SetTouchPaneButtonEnabled( EPhoneCallComingCmdAnswer );
     SetTouchPaneButtons( EPhoneWaitingCallButtons );
-       
+
 
     TPhoneCmdParamBoolean conferenceExistsForCallId;
     iViewCommandHandle->ExecuteCommandL( EPhoneViewGetCallExistsInConference,
         aCallId, &conferenceExistsForCallId );
-    
+
     if( conferenceExistsForCallId.Boolean() )
         {
         // Remove conference member from conference bubble
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveFromConference, 
-            aCallId );            
+        iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveFromConference,
+            aCallId );
         }
     else
         {
-        // Remove call 
+        // Remove call
         iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
 
         TPhoneCmdParamBoolean conferenceBubbleExists;
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewGetIsConference, 
-            &conferenceBubbleExists );                            
+        iViewCommandHandle->ExecuteCommandL( EPhoneViewGetIsConference,
+            &conferenceBubbleExists );
         if( !conferenceBubbleExists.Boolean() )
             {
             // Idle message came for conference member.
             MakeTransitionAccordingToActiveCallsL();
-            }            
+            }
         else
             {
             TPhoneCmdParamCallStateData callStateData;
@@ -248,19 +246,19 @@
             if( callStateData.CallId() >= 0 )
                 {
                 // We have Conference and Waiting calls left
-                MakeStateTransitionToConferenceAndWaitingL( aCallId );            
+                MakeStateTransitionToConferenceAndWaitingL( aCallId );
                 }
             else
                 {
                 // We have Conference and Single calls left
                 MakeStateTransitionToConferenceAndSingleL( aCallId );
-                }                
+                }
             }
         }
     EndUiUpdate();
     if ( effectStarted )
         {
-        EndTransEffect();    
+        EndTransEffect();
         }
     }
 
@@ -276,7 +274,7 @@
 
     UpdateConferenceSecurityStatusL( aCallId );
 
-    MakeStateTransitionToConferenceAndWaitingL( KConferenceCallId );        
+    MakeStateTransitionToConferenceAndWaitingL( KConferenceCallId );
     }
 
 // -----------------------------------------------------------
@@ -285,17 +283,17 @@
 //
 void CPhoneConferenceAndSingleAndWaiting::MakeStateTransitionToConferenceAndWaitingL( TInt /*aCallId*/ )
     {
-    __LOGMETHODSTARTEND( EPhoneUIStates, 
+    __LOGMETHODSTARTEND( EPhoneUIStates,
         "CPhoneConferenceAndSingleAndWaiting::MakeStateTransitionToConferenceAndWaitingL()");
     if ( !IsNumberEntryUsedL() )
         {
         // Close menu bar, if number entry isnt open.
         iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
         }
-  
-    SetTouchPaneButtons( EPhoneWaitingCallButtons ); 
+
+    SetTouchPaneButtons( EPhoneWaitingCallButtons );
     SetTouchPaneButtonEnabled( EPhoneCallComingCmdAnswer );
-    
+
     // Check if HW Keys or Call UI should be disabled
     CheckDisableHWKeysAndCallUIL();
 
@@ -310,22 +308,22 @@
 //
 void CPhoneConferenceAndSingleAndWaiting::MakeStateTransitionToConferenceAndSingleL( TInt /*aCallId*/ )
     {
-    __LOGMETHODSTARTEND( EPhoneUIStates, 
+    __LOGMETHODSTARTEND( EPhoneUIStates,
         "CPhoneConferenceAndSingleAndWaiting::MakeStateTransitionToConferenceAndSingleL()");
 
-    if( /*FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke ) 
+    if( /*FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke )
         */ 1 &&  iStateMachine->PhoneStorage()->IsScreenLocked() )
         {
         EnableCallUIL();
         }
-    
+
     // Reset blocked keys list
     iStateMachine->PhoneStorage()->ResetBlockedKeysList();
-    
+
     if ( !IsNumberEntryUsedL() )
         {
         // Close menu bar, if number entry isnt open.
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );       
+        iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
         }
 
     if ( IsNumberEntryUsedL() )
@@ -336,33 +334,33 @@
             iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground );
 
             iViewCommandHandle->ExecuteCommandL( EPhoneViewSetControlAndVisibility );
- 
+
             UpdateCbaL( EPhoneCallHandlingInCallCBA );
             }
         else
             {
             // Show the number entry if it exists
-            SetNumberEntryVisibilityL(ETrue);    
+            SetNumberEntryVisibilityL(ETrue);
             }
         }
     else
         {
         UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA );
-        // If numberentry is not open just check NeedToSendToBackgroundL and 
+        // If numberentry is not open just check NeedToSendToBackgroundL and
         // sendbackround if needed.
         if ( NeedToSendToBackgroundL() )
             {
             // Return phone to the background if send to background is needed.
             iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground );
             }
-        }  
+        }
 
-    SetTouchPaneButtons( EPhoneConferenceAndSingleButtons );       
+    SetTouchPaneButtons( EPhoneConferenceAndSingleButtons );
     SetTouchPaneButtonEnabled( EPhoneCallComingCmdAnswer );
     SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate );
     // Go to conference and single state
     // CBA updates in above if-else conditions
-    iStateMachine->ChangeState( EPhoneStateConferenceAndSingle );                             
+    iStateMachine->ChangeState( EPhoneStateConferenceAndSingle );
     }
 
 // -----------------------------------------------------------
@@ -371,13 +369,13 @@
 //
 void CPhoneConferenceAndSingleAndWaiting::HandleConferenceIdleL()
     {
-    __LOGMETHODSTARTEND( EPhoneUIStates, 
+    __LOGMETHODSTARTEND( EPhoneUIStates,
         "CPhoneConferenceAndSingleAndWaiting::HandleConferenceIdleL()");
-    
-    BeginUiUpdateLC();    
-    
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveConferenceBubble );    
-        
+
+    BeginUiUpdateLC();
+
+    iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveConferenceBubble );
+
     // Close menu bar, if it is displayed
     iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
 
@@ -385,19 +383,19 @@
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs );
 
     MakeTransitionAccordingToActiveCallsL();
-    
-    EndUiUpdate();          
+
+    EndUiUpdate();
     }
 
 // --------------------------------------------------------------
 // CPhoneConferenceAndSingleAndWaiting::HandleKeyMessageL
 // --------------------------------------------------------------
 //
-void CPhoneConferenceAndSingleAndWaiting::HandleKeyMessageL( 
+void CPhoneConferenceAndSingleAndWaiting::HandleKeyMessageL(
     TPhoneKeyEventMessages aMessage,
     TKeyCode aCode )
     {
-    __LOGMETHODSTARTEND( EPhoneUIStates, 
+    __LOGMETHODSTARTEND( EPhoneUIStates,
         "CPhoneConferenceAndSingleAndWaiting::HandleKeyMessageL()");
     switch ( aCode )
         {
@@ -405,16 +403,16 @@
         case EKeyYes:
             if( IsNumberEntryVisibleL() )
                 {
-                CallFromNumberEntryL();                         
+                CallFromNumberEntryL();
                 }
             else
                 {
                 // Not allowed to answer
-                SendGlobalWarningNoteL( 
-                    EPhoneNoteTextCallNotAllowed );                     
+                SendGlobalWarningNoteL(
+                    EPhoneNoteTextCallNotAllowed );
                 }
             break;
-            
+
         default:
             // do base operation
             CPhoneConferenceAndSingle::HandleKeyMessageL( aMessage, aCode );
@@ -445,7 +443,7 @@
 void CPhoneConferenceAndSingleAndWaiting::UpdateInCallCbaL()
     {
     __LOGMETHODSTARTEND(EPhoneControl, "CPhoneConferenceAndSingleAndWaiting::UpdateInCallCbaL() ");
-    
+
     UpdateCbaL ( EPhoneCallHandlingCallWaitingCBA );
     }
 
@@ -458,50 +456,51 @@
     TPhoneCmdParamInteger activeCallCount;
     iViewCommandHandle->ExecuteCommandL(
         EPhoneViewGetCountOfActiveCalls, &activeCallCount );
-    
+
     switch( activeCallCount.Integer() )
          {
          case ENoActiveCalls: // Go to incoming state
             {
             // Get Waiting call's Call Id
-            TPhoneCmdParamCallStateData callStateData;    
+            TPhoneCmdParamCallStateData callStateData;
             callStateData.SetCallState( EPEStateRinging );
-            iViewCommandHandle->HandleCommandL( EPhoneViewGetCallIdByState, 
+            iViewCommandHandle->HandleCommandL( EPhoneViewGetCallIdByState,
                 &callStateData );
-            
+
             if ( callStateData.CallId() != KErrNotFound )
                 {
                 // Display ringing bubble
                 TPhoneCmdParamCallHeaderData callHeaderParam;
                 callHeaderParam.SetCallState( EPEStateRinging );
-                
+
                 SetCallHeaderTextsForCallComingInL( callStateData.CallId(), EFalse, &callHeaderParam );
-                
-                iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, 
-                    callStateData.CallId(), 
+
+                iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble,
+                    callStateData.CallId(),
                     &callHeaderParam );
-        
+
                 // Capture keys when there is an incoming call
-                CaptureKeysDuringCallNotificationL( ETrue );    
-                
+                CaptureKeysDuringCallNotificationL( ETrue );
+
                 // Go to Incoming state
                 iCbaManager->UpdateIncomingCbaL( callStateData.CallId() );
 
                 // Check if HW Keys or Call UI should be disabled
                 CheckDisableHWKeysAndCallUIL();
-                
+
                 SetTouchPaneButtons( EPhoneIncomingCallButtons );
                 UpdateSilenceButtonDimming();
                 SetTouchPaneButtonEnabled( EPhoneCallComingCmdAnswer );
-                SetRingingTonePlaybackL( callStateData.CallId() );      
+                SetRingingTonePlaybackL( callStateData.CallId() );
                 SetToolbarDimming( ETrue );
-                iStateMachine->ChangeState( EPhoneStateIncoming );          
+                SetBackButtonActive(EFalse);
+                iStateMachine->ChangeState( EPhoneStateIncoming );
                 }
             else
                 {
                 SetDefaultFlagsL();
                 UpdateCbaL( EPhoneEmptyCBA );
-                iStateMachine->ChangeState( EPhoneStateIdle );          
+                iStateMachine->ChangeState( EPhoneStateIdle );
                 }
             }
             break;
@@ -509,13 +508,13 @@
             {
             // Go to Single And Waiting state
             UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
-            SetTouchPaneButtons( EPhoneWaitingCallButtons );        
+            SetTouchPaneButtons( EPhoneWaitingCallButtons );
             SetTouchPaneButtonEnabled( EPhoneCallComingCmdAnswer );
 
             // Check if HW Keys or Call UI should be disabled
             CheckDisableHWKeysAndCallUIL();
 
-            iStateMachine->ChangeState( EPhoneStateWaitingInSingle );        
+            iStateMachine->ChangeState( EPhoneStateWaitingInSingle );
             }
             break;
          case ETwoActiveCalls:
@@ -526,18 +525,18 @@
             // Check if HW Keys or Call UI should be disabled
             CheckDisableHWKeysAndCallUIL();
 
-            SetTouchPaneButtons( EPhoneWaitingCallButtons );        
+            SetTouchPaneButtons( EPhoneWaitingCallButtons );
             iStateMachine->ChangeState( EPhoneStateTwoSinglesAndWaiting );
             }
             break;
          default:
            // Too many active calls to handle reliable state change now.
            // Waiting for all conference member idles
-           // This case may happen when 'End all calls' because conferenceIdle may 
+           // This case may happen when 'End all calls' because conferenceIdle may
            // come earlier than idle for conference member
             break;
          }
 
     }
-    
+
 // End of File
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp
--- a/phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -130,7 +130,6 @@
             HandleWentOneToOneL( aCallId );
             break;
 
-// <-- QT PHONE START -->
         case MEngineMonitor::EPEMessageHeldConference:            
         case MEngineMonitor::EPEMessageConnectedConference:
             {
@@ -147,7 +146,6 @@
                 }
             }
             break;
-// <-- QT PHONE END -->
             
         default:
             CPhoneConference::HandlePhoneEngineMessageL( aMessage, 
@@ -314,9 +312,6 @@
         if ( NeedToSendToBackgroundL() )
             {
             // Return phone to the background if send to background is needed.
-// <-- QT PHONE START -->            
-            //iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground );
-// <-- QT PHONE END -->                        
             iViewCommandHandle->ExecuteCommandL( EPhoneViewSetControlAndVisibility );
             
             UpdateCbaL( EPhoneCallHandlingInCallCBA );
@@ -332,13 +327,6 @@
         UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA );
         // If numberentry is not open just check NeedToSendToBackgroundL and 
         // sendbackround if needed.
-// <-- QT PHONE START -->        
-        /*if ( NeedToSendToBackgroundL() )
-            {
-            // Return phone to the background if send to background is needed.
-            iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground );
-            }*/
-// <-- QT PHONE END -->            
         }
     SetTouchPaneButtons( EPhoneConferenceAndSingleButtons );
     SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate );
@@ -519,6 +507,7 @@
             SetTouchPaneButtonEnabled( EPhoneCallComingCmdSilent );
             SetRingingTonePlaybackL( iRingingCallId );          
             SetToolbarDimming( ETrue );
+            SetBackButtonActive(EFalse);
             iStateMachine->ChangeState( EPhoneStateIncoming );
             break;   
             }   
@@ -647,7 +636,6 @@
     EndUiUpdate();
     }
 
-// <-- QT PHONE START -->
 // -----------------------------------------------------------
 // CPhoneConferenceAndWaiting::HandleCommandL
 // -----------------------------------------------------------
@@ -683,7 +671,4 @@
     UpdateCbaL( EPhoneCallHandlingInCallCBA );
     }
 
-// <-- QT PHONE END -->
-
-
 // End of File
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp
--- a/phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -59,10 +59,8 @@
         {
         TPhoneCmdParamBoolean dtmfSendFlag;
         dtmfSendFlag.SetBoolean( EFalse );
-// <-- QT PHONE START -->
         iViewCommandHandle->ExecuteCommand( EPhoneViewSetDtmfOptionsFlag, 
             &dtmfSendFlag );
-// <-- QT PHONE END -->        
         }
     }
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuistates/src/cphoneemergency.cpp
--- a/phoneapp/phoneuistates/src/cphoneemergency.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphoneemergency.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -41,9 +41,7 @@
 #include "cphonepubsubproxy.h"
 #include "cphonekeys.h"
 #include "tphonecmdparamaudiooutput.h"
-// <-- QT PHONE START -->
 #include "phoneresourceids.h"
-// <-- QT PHONE END -->
 
 // ================= MEMBER FUNCTIONS =======================
 
@@ -380,9 +378,7 @@
 
         // Enable the volume display
         iViewCommandHandle->ExecuteCommandL( EPhoneViewShowNaviPaneAudioVolume );
-
         
-// <-- QT PHONE START -->
         BeginUiUpdateLC();
         
         TPhoneCmdParamEmergencyCallHeaderData emergencyHeaderParam;
@@ -423,17 +419,12 @@
             &headerParam );
 
         SetTouchPaneButtons( EPhoneEmergencyCallButtons );
-        
-        TPhoneCmdParamBoolean val;
-        val.SetBoolean(EFalse);
-        iViewCommandHandle->ExecuteCommand(
-            EPhoneViewBackButtonVisible, &val );
+        SetBackButtonActive(EFalse);
         
         EndUiUpdate();        
 
         // ShowNoteL( EPhoneEmergencyConnectWaitNote );
         UpdateSetupCbaL();
-// <-- QT PHONE END -->        
         }
     }
 // -----------------------------------------------------------
@@ -477,42 +468,6 @@
     // Remove emergency connecting note
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNote );
 
-// <-- QT PHONE START -->    
-    /*TPhoneCmdParamEmergencyCallHeaderData emergencyHeaderParam;
-    // Set call header
-    TBuf<KPhoneCallHeaderLabelMaxLength> headerText( KNullDesC );
-    StringLoader::Load(
-        headerText,
-        CPhoneMainResourceResolver::Instance()->ResolveResourceID(
-            EPhoneEmergencyCallHeader ),
-        CCoeEnv::Static() );
-    emergencyHeaderParam.SetHeaderText( headerText );
-
-    // Set call header ciphering status
-    emergencyHeaderParam.SetCiphering(
-        iStateMachine->PhoneEngineInfo()->IsSecureCall( aCallId ) );
-    emergencyHeaderParam.SetCipheringIndicatorAllowed(
-        iStateMachine->PhoneEngineInfo()->SecureSpecified() );
-
-    BeginUiUpdateLC();
-
-    // Notify the view
-    iViewCommandHandle->ExecuteCommandL(
-        EPhoneViewCreateEmergencyCallHeader,
-        aCallId,
-        &emergencyHeaderParam );
-
-    TPhoneCmdParamCallHeaderData headerParam;
-    headerParam.SetCallState( EPEStateConnecting );
-    // Notify the view
-    iViewCommandHandle->ExecuteCommandL(
-        EPhoneViewUpdateBubble,
-        aCallId,
-        &headerParam );
-
-    EndUiUpdate();*/
-// <-- QT PHONE END -->
-
     TPhoneCmdParamCallHeaderData headerParam;
     headerParam.SetCallState( EPEStateConnecting );
     // Notify the view
@@ -544,12 +499,7 @@
         aCallId,
         &emergencyHeaderParam );
 
-// <-- QT PHONE START -->
-    TPhoneCmdParamBoolean val;
-    val.SetBoolean(ETrue);
-    iViewCommandHandle->ExecuteCommand(
-        EPhoneViewBackButtonVisible, &val );
-// <-- QT PHONE END -->
+    SetBackButtonActive(ETrue);
 
     EndUiUpdate();
     SetToolbarDimming( ETrue );
@@ -594,63 +544,7 @@
 void CPhoneEmergency::UpdateInCallCbaL()
     {
     __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneEmergency::UpdateInCallCbaL() ");
-// <-- QT PHONE START -->    
-    /*TInt resourceId = EPhoneCallHandlingEmergencyCBA;
-    const TPEAudioOutput audioOutput =
-        iStateMachine->PhoneEngineInfo()->AudioOutput();
-    const TBool btAvailable =
-        iStateMachine->PhoneEngineInfo()->AudioOutputAvailable( EPEBTAudioAccessory );
-
-    __PHONELOG2( EOnlyFatal, EPhoneUIStates,
-            "CPhoneEmergency - AudioOutput: %d, BTAvailable: %d",
-            audioOutput, btAvailable );
-
-    if ( IsNumberEntryVisibleL() )
-        {
-        if ( IsDTMFDialerVisibleL() )
-            {
-            resourceId = EPhoneDtmfDialerCBA;
-            }
-        else
-            {
-            resourceId = EPhoneInCallNumberAcqCBA;
-            }
-        }
-    else if ( iDeviceLockOn || SimState() != EPESimUsable || iStartupInterrupted )
-        {
-        if ( audioOutput == EPEWiredAudioAccessory || IsSwivelClosed() )
-            {
-            resourceId = EPhoneCallHandlingEmergencyNoOptionsNoIhfCBA;
-            }
-        else if ( audioOutput == EPELoudspeaker )
-            {
-            resourceId = EPhoneCallHandlingEmergencyNoOptionsHandsetCBA;
-            }
-        else
-            {
-            resourceId = EPhoneCallHandlingEmergencyNoOptionsCBA;
-            }
-        }
-    else
-        {
-        if ( audioOutput == EPEWiredAudioAccessory || IsSwivelClosed() )
-            {
-            resourceId = EPhoneCallHandlingEmergencyNoIhfCBA;
-            }
-        else if ( ( audioOutput == EPELoudspeaker ) ||
-                  ( audioOutput == EPEBTAudioAccessory ) )
-            {
-            resourceId = EPhoneCallHandlingEmergencyHandsetCBA;
-            }
-        else if ( ( audioOutput == EPEHandset ) &&
-                  ( btAvailable ) )
-            {
-            resourceId = EPhoneCallHandlingInCallBtaaCBA;
-            }
-        }*/
-    
-    TInt resourceId = EPhoneCallHandlingEmergencyCBA;        
-// <-- QT PHONE END -->        
+    TInt resourceId = EPhoneCallHandlingEmergencyCBA;
     iCbaManager->SetCbaL( resourceId );
     }
 
@@ -943,38 +837,8 @@
 void CPhoneEmergency::UpdateSetupCbaL()
     {
     __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneEmergency::UpdateSetupCbaL() ");
-// <-- QT PHONE START -->
-    /*TInt resourceId = EPhoneCallHandlingCallSetupCBA;
-
-    const TPEAudioOutput audioOutput =
-        iStateMachine->PhoneEngineInfo()->AudioOutput();
-
-    if ( iCallSetup && audioOutput != EPENotActive)
-        {
-        if ( audioOutput == EPELoudspeaker )
-            {
-            resourceId = EPhoneCallHandlingCallSetupToHandsetCBA;
-            }
-        else if ( audioOutput == EPEHandset )
-            {
-            resourceId =  EPhoneCallHandlingCallSetupToIhfCBA;
-            }
-        else
-            {
-            resourceId = EPhoneCallHandlingCallSetupCBA;
-            }
-        TPhoneCmdParamInteger integerParam;
-        integerParam.SetInteger(
-                CPhoneMainResourceResolver::Instance()->
-                ResolveResourceID( resourceId ) );
-
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateNoteSoftkeys,
-                &integerParam );
-        }*/
-
    TInt resourceId = EPhoneCallHandlingEmergencyCBA;        
    iCbaManager->SetCbaL( resourceId );
-// <-- QT PHONE END -->        
     }
 
 // ---------------------------------------------------------
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuistates/src/cphonegsmincall.cpp
--- a/phoneapp/phoneuistates/src/cphonegsmincall.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphonegsmincall.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -409,18 +409,12 @@
        {
        TPhoneCmdParamCallHeaderData divertData;
     
-// <-- QT PHONE START --> 
-//       divertData.SetCallFlag( CBubbleManager::EDiverted );
         divertData.SetDiverted( ETrue );
-// <-- QT PHONE END --> 
        
        GetRemoteInfoDataL( ringingCallId, remoteInfoText );
        divertData.SetCLIText( 
                   remoteInfoText,
-// <-- QT PHONE START -->
-//                  CBubbleManager::ERight );
                   TPhoneCmdParamCallHeaderData::ERight );
-// <-- QT PHONE END --> 
        
        divertData.SetCiphering(
            iStateMachine->PhoneEngineInfo()->IsSecureCall( ringingCallId ) );
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuistates/src/cphoneincoming.cpp
--- a/phoneapp/phoneuistates/src/cphoneincoming.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphoneincoming.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -202,7 +202,7 @@
     // Close fast swap window if it's displayed
     CEikonEnv::Static()->DismissTaskList();
     
-        // If the 1st incoming call became Connected, this is waiting call
+    // If the 1st incoming call became Connected, this is waiting call
     // If the 1st incoming call went just Idle, this is a normal call
     if ( connectedCall > KErrNotFound )
         {
@@ -220,12 +220,11 @@
     
     SetToolbarDimming( EFalse );
     
-// <-- QT PHONE START -->
     // Display incoming call
     DisplayIncomingCallL( aCallId, dialerParam );
     
     SetTouchPaneButtons( EPhoneWaitingCallButtons );
-// <-- QT PHONE END -->
+
     if( FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke ) 
             && !CPhoneCenRepProxy::Instance()->
             IsTelephonyFeatureSupported( KTelephonyLVFlagAllowUnlockOnIncoming ) 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuistates/src/cphoneresourceresolvergsm.cpp
--- a/phoneapp/phoneuistates/src/cphoneresourceresolvergsm.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphoneresourceresolvergsm.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -29,11 +29,7 @@
 #include "phonerssgsm.h"
 #include "phonerssbase.h"
 #include "phonelogger.h"
-// <-- QT PHONE START -->
-//#include <phoneui.rsg>
 #include "phoneresourceids.h"
-// <-- QT PHONE END --> 
-
 
 // ============================ MEMBER FUNCTIONS ===============================
 
@@ -54,13 +50,8 @@
 //
 EXPORT_C void CPhoneResourceResolverGSM::ConstructL()
     {
-    
     __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneResourceResolverGSM::ConstructL");
 
-// <-- QT PHONE START -->    
-//    BaseConstructL();
-// <-- QT PHONE END -->    
-    
     // Register resolver
     CPhoneMainResourceResolver::Instance()->RegisterResolver( this );
     }
@@ -83,15 +74,6 @@
 // Destructor
 EXPORT_C CPhoneResourceResolverGSM::~CPhoneResourceResolverGSM()
     {   
-// <-- QT PHONE START -->    
-    // Remove resource file
-    /*iEnv.DeleteResourceFile( iResourceOffset );
-    if ( FeatureManager::FeatureSupported( KFeatureIdTouchCallHandling ) )
-        {
-        iEnv.DeleteResourceFile( iCUIResourceOffset );
-        iEnv.DeleteResourceFile( iPTCHResourceOffset );
-        }*/
-// <-- QT PHONE END -->    
     }
 
 // -----------------------------------------------------------------------------
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuistates/src/cphonesingleandcallsetupandwaiting.cpp
--- a/phoneapp/phoneuistates/src/cphonesingleandcallsetupandwaiting.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphonesingleandcallsetupandwaiting.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -571,9 +571,7 @@
 // CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesL
 // -----------------------------------------------------------
 //
-// <-- QT PHONE START --> 
 void CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesL( TInt /*aCallId*/ )
-// <-- QT PHONE END --> 
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesL()");
@@ -594,9 +592,7 @@
 // CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesAndWaitingL
 // -----------------------------------------------------------
 //
-// <-- QT PHONE START --> 
 void CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesAndWaitingL( TInt /*aCallId*/ )
-// <-- QT PHONE END --> 
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesAndWaitingL()");
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuistates/src/cphonesingleandwaiting.cpp
--- a/phoneapp/phoneuistates/src/cphonesingleandwaiting.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphonesingleandwaiting.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -66,7 +66,6 @@
 //
 CPhoneSingleAndWaiting::~CPhoneSingleAndWaiting()
     {
-// <-- QT PHONE START -->
     if ( iViewCommandHandle )
         {
         TPhoneCmdParamBoolean dtmfSendFlag;
@@ -74,7 +73,6 @@
         iViewCommandHandle->ExecuteCommand( EPhoneViewSetVideoCallDTMFVisibilityFlag,
                 &dtmfSendFlag );
         }
-// <-- QT PHONE END -->
     }
 
 // -----------------------------------------------------------
@@ -220,11 +218,9 @@
                 MPEPhoneModel::EPEMessageReject );
             break;
 
-// <-- QT PHONE START -->
         case EPhoneCmdUpdateUiControls:
             UpdateUiControlsL();
             break;
-// <-- QT PHONE END -->            
 
         default:
             commandStatus = CPhoneGsmInCall::HandleCommandL( aCommand );
@@ -450,8 +446,9 @@
             // Play ringtone
             SetRingingTonePlaybackL( callStateData.CallId() );
             }
+        SetToolbarDimming( ETrue );
+        SetBackButtonActive(EFalse);
         EndUiUpdate();
-        SetToolbarDimming( ETrue );
 
         iStateMachine->ChangeState( EPhoneStateIncoming );
         }
@@ -539,9 +536,7 @@
     TInt callLabelId = CPhoneMainResourceResolver::Instance()->
             ResolveResourceID( EPhoneCallOnHold );
 
-// <-- QT PHONE START --> 
     StringLoader::Load( labelText, callLabelId, CCoeEnv::Static() );        
-// <-- QT PHONE END --> 
     callHeaderParam.SetLabelText( labelText );
 
     iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId,
@@ -559,9 +554,7 @@
 
     UpdateInCallCbaL();
     
-    // <-- QT PHONE START -->
     SetTouchPaneButtons( EPhoneWaitingCallButtons ); 
-    // <-- QT PHONE END -->
     }
 
 // -----------------------------------------------------------
@@ -620,13 +613,10 @@
         HandleHoldNoteL( aCallId, EFalse );
         }
 
-    // <-- QT PHONE START -->
-    
     // Set CBAs
     UpdateInCallCbaL();
     
     SetTouchPaneButtons( EPhoneWaitingCallButtons ); 
-    // <-- QT PHONE END -->
     }
 
 // -----------------------------------------------------------
@@ -684,16 +674,6 @@
         {
         // Set Two singles softkeys
         UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA );
-
-        // If numberentry is not open just check NeedToSendToBackgroundL and
-        // sendbackround if needed.
-// <-- QT PHONE START -->        
-        /*if ( NeedToSendToBackgroundL() )
-            {
-            // Return phone to the background if send to background is needed.
-            iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground );
-            }*/
-// <-- QT PHONE END -->            
         }
 
     // Close dtmf dialer if exist.
@@ -813,7 +793,6 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates,
         "CPhoneSingleAndWaiting::UpdateInCallCbaL() ");
-// <-- QT PHONE START -->    
     TPhoneCmdParamInteger callIdParam;
     iViewCommandHandle->ExecuteCommandL( 
             EPhoneViewGetExpandedBubbleCallId, &callIdParam );
@@ -826,7 +805,6 @@
         {
         iCbaManager->SetCbaL(  EPhoneCallHandlingCallWaitingCBA );
         }
-// <-- QT PHONE END -->    
     }
 
 // -----------------------------------------------------------
@@ -872,7 +850,6 @@
         }
     }
 
-// <-- QT PHONE START -->
 // -----------------------------------------------------------
 // CPhoneSingleAndWaiting::UpdateUiControlsL
 // -----------------------------------------------------------
@@ -883,6 +860,5 @@
     
     UpdateInCallCbaL();
     }
-// <-- QT PHONE END -->
 
 // End of File
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuistates/src/cphonesinglecall.cpp
--- a/phoneapp/phoneuistates/src/cphonesinglecall.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphonesinglecall.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -25,9 +25,7 @@
 #include <mpeengineinfo.h>
 #include <cpephonemodelif.h>
 #include <connect/sbdefs.h>
-// <-- QT PHONE START --> 
 #include <videotelcontrolmediatorapi.h>
-// <-- QT PHONE END --> 
 #include <MediatorDomainUIDs.h>
 #include <telephonyvariant.hrh>
 
@@ -306,8 +304,6 @@
                         if( IsVideoCall( iCallId ) )
                         {
                            // Video call can be released only after we get response to VT Shutdown Command
-// <-- QT PHONE START -->
- 
                            CPhoneMediatorFactory::Instance()->Sender()->IssueCommand( KMediatorVideoTelephonyDomain,
                                                                                       KCatPhoneToVideotelCommands, 
                                                                                       EVtCmdReleaseDataport,
@@ -316,8 +312,6 @@
                                                                                             KPhoneToVideotelCmdVersionBuild ),
                                                                                       KNullDesC8,
                                                                                       CPhoneSwitchToVideoOrVoiceCommand::NewL( *iStateMachine ) );
-
-// <-- QT PHONE END --> 
                         }
                         else
                         {
@@ -437,9 +431,7 @@
         }
 
     UpdateInCallCbaL();
-// <-- QT PHONE START -->
     SetTouchPaneButtons( EPhoneIncallHeldButtons );
-// <-- QT PHONE END -->
     }
     
 // -----------------------------------------------------------
@@ -474,9 +466,7 @@
         }
 
     UpdateInCallCbaL();  
-// <-- QT PHONE START -->
     SetTouchPaneButtons( EPhoneIncallButtons );
-// <-- QT PHONE END -->
     }
     
 // -----------------------------------------------------------
@@ -488,7 +478,6 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneSingleCall::ToggleHoldL()");
 
-    // <-- QT PHONE START --> 
     TPECallControlCaps callControlCaps =
         iStateMachine->PhoneEngineInfo()->CallControlCaps( iCallId );
     
@@ -508,7 +497,6 @@
         {
         SendGlobalInfoNoteL( EPhoneNoteTextNotAllowed );    
         }
-    // <-- QT PHONE END -->
     }
         
 // -----------------------------------------------------------
@@ -528,17 +516,11 @@
     // Get allow waiting call header param value.
     AllowShowingOfWaitingCallHeaderL( dialerParam );    
 
-    // Close fast swap window if it's displayed
-// <-- QT PHONE START --> 
-//    CEikonEnv::Static()->DismissTaskList();
- 
-
     // Display incoming call
     DisplayIncomingCallL( aCallId, dialerParam );
     
     // Show incoming call buttons
     SetTouchPaneButtons( EPhoneWaitingCallButtons ); 
-// <-- QT PHONE END -->
     
     if( FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke ) 
             && !CPhoneCenRepProxy::Instance()->
@@ -663,13 +645,11 @@
     
     SetNumberEntryVisibilityL(EFalse);
 
-    //QT PHONE START
     // Display call setup 
     DisplayCallSetupL( aCallId );
     
     // Show incoming call buttons
     SetTouchPaneButtons( EPhoneCallSetupAndSingleButtons );
-    //QT PHONE END
 
     EndUiUpdate();
     
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuistates/src/cphonetwosingles.cpp
--- a/phoneapp/phoneuistates/src/cphonetwosingles.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphonetwosingles.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -297,9 +297,7 @@
     iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, 
         &callHeaderParam );
     
-    // <-- QT PHONE START --> 
     SetTouchPaneButtons( EPhoneIncallButtons );
-    // <-- QT PHONE END -->
     }
     
 // -----------------------------------------------------------
@@ -327,9 +325,7 @@
     iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, 
         &callHeaderParam );
     
-    // <-- QT PHONE START --> 
     SetTouchPaneButtons( EPhoneIncallButtons );
-    // <-- QT PHONE END -->
     }
     
 // -----------------------------------------------------------
@@ -363,11 +359,9 @@
         conferenceText, 
         callLabelId, 
         CCoeEnv::Static() );
-// <-- QT PHONE START --> 
     callHeaderParam.SetCLIText( conferenceText, TPhoneCmdParamCallHeaderData::ERight );
     
     callHeaderParam.SetCallState(EPEStateConnectedConference);
-// <-- QT PHONE END --> 
     BeginUiUpdateLC();
     
     callHeaderParam.SetCiphering(
@@ -434,9 +428,7 @@
     EndUiUpdate();
 
     // Go to incoming state
-// <-- QT PHONE START -->    
-    iCbaManager->SetCbaL( EPhoneCallHandlingIncomingSoftRejectCBA );
-// <-- QT PHONE END -->    
+    iCbaManager->SetCbaL( EPhoneCallHandlingIncomingRejectCBA );
     
     iStateMachine->ChangeState( EPhoneStateTwoSinglesAndWaiting );        
     }
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuistates/src/cphonetwosinglesandwaiting.cpp
--- a/phoneapp/phoneuistates/src/cphonetwosinglesandwaiting.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphonetwosinglesandwaiting.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -336,7 +336,6 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneTwoSinglesAndWaiting::StateTransitionToSingleAndWaitingL()");
     // Go to two singles state
-    // <-- QT PHONE START -->    
     TPhoneCmdParamInteger callIdParam;
     iViewCommandHandle->ExecuteCommandL( 
             EPhoneViewGetExpandedBubbleCallId, &callIdParam );
@@ -349,7 +348,6 @@
         {
         iCbaManager->SetCbaL( EPhoneCallHandlingCallWaitingCBA );
         }
-    // <-- QT PHONE END -->    
   
     // Set touch controls
     SetTouchPaneButtonEnabled( EPhoneCallComingCmdAnswer );
@@ -383,11 +381,9 @@
         conferenceText, 
         callLabelId, 
         CCoeEnv::Static() );        
-// <-- QT PHONE START --> 
     callHeaderParam.SetCLIText( conferenceText, TPhoneCmdParamCallHeaderData::ERight );
     
     callHeaderParam.SetCallState(EPEStateConnectedConference);
-// <-- QT PHONE END --> 
     
     callHeaderParam.SetCiphering(
         iStateMachine->PhoneEngineInfo()->IsSecureCall( aCallId ) );
@@ -395,7 +391,6 @@
     callHeaderParam.SetCipheringIndicatorAllowed(
         iStateMachine->PhoneEngineInfo()->SecureSpecified() );
 
-// <-- QT PHONE START -->
     // Service identifier must be given so that service specific settings
     // can be taken into account at phoneuiview.
     callHeaderParam.SetServiceId( 
@@ -420,7 +415,6 @@
     
     UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
     
-// <-- QT PHONE END -->
     EndUiUpdate();
     // Go to Conference And Waiting state
     // No need for CBA update
@@ -436,7 +430,6 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneTwoSinglesAndWaiting::UpdateInCallCbaL()");
 
-// <-- QT PHONE START -->    
     TPhoneCmdParamInteger callIdParam;
     iViewCommandHandle->ExecuteCommandL( 
             EPhoneViewGetExpandedBubbleCallId, &callIdParam );
@@ -449,7 +442,6 @@
         {
         iCbaManager->SetCbaL( EPhoneCallHandlingIncomingSoftRejectCBA );
         }
-// <-- QT PHONE END -->    
     }
 
 // -----------------------------------------------------------
@@ -463,7 +455,6 @@
     UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
     }
 
-// <-- QT PHONE START -->
 // -----------------------------------------------------------
 // CPhoneTwoSinglesAndWaiting::HandleCommandL
 // -----------------------------------------------------------
@@ -498,7 +489,4 @@
     UpdateInCallCbaL();
     }
 
-// <-- QT PHONE END -->
-
-
 // End of File
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiutils/group/phoneuiutils.mmp
--- a/phoneapp/phoneuiutils/group/phoneuiutils.mmp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiutils/group/phoneuiutils.mmp	Fri Apr 16 14:58:25 2010 +0300
@@ -41,7 +41,7 @@
 SOURCE          cphonekeys.cpp
 SOURCE          cphonelangsettingmonitor.cpp
 SOURCE          cphonelibrarycontainer.cpp
-SOURCE          cphoneLogger.cpp
+SOURCE          cphonelogger.cpp
 SOURCE          cphonemainresourceresolver.cpp
 SOURCE          cphonemainerrormessageshandler.cpp
 SOURCE          cphonepublishsubscriberao.cpp
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiutils/inc/phoneconstants.h
--- a/phoneapp/phoneuiutils/inc/phoneconstants.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiutils/inc/phoneconstants.h	Fri Apr 16 14:58:25 2010 +0300
@@ -236,7 +236,7 @@
 
 // Paths to CentRep
 _LIT( KGSMProtocol, "phoneuistates.dll" );
-_LIT( KVoIPExtension, "PhoneUIVoIPExtension.dll" );
+_LIT( KVoIPExtension, "phoneuivoipextension.dll" );
 
 // Literals for formatting log messages
 _LIT( KPEDefaultMsgToPhoneUI,   "PE ----> PHONEUI <%S> message from PE. CallId: %d.");
@@ -430,7 +430,7 @@
 const TInt KPhoneUiMediatorIfTimeout = 10000;
 
 // Name of Call UI dll which is loaded polymorficly in CPhoneQueryController
-_LIT( KPhoneCaUiLoadedLib, "CaUiEngine.dll" );
+_LIT( KPhoneCaUiLoadedLib, "cauiengine.dll" );
 
 // CPhoneTextQuery constants
 const TInt KLeftCbaId = 0;
@@ -489,6 +489,8 @@
 // Video call setup failed query timeout
 const TInt KPhoneVideoCallSetupFailedQueryTimeout = 5; 
 
+// Key event value for long press
+const TInt EEventLongPress = 1100;
 
 #endif  // PHONECONSTANTS_H
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiutils/inc/phonerssbase.h
--- a/phoneapp/phoneuiutils/inc/phonerssbase.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiutils/inc/phonerssbase.h	Fri Apr 16 14:58:25 2010 +0300
@@ -383,16 +383,15 @@
     EPhoneWaitingCallButtons,
     EPhoneCallSetupAndSingleButtons,
     
-// Video call error notes
+    // Video call error notes
     EPhoneNotePhoneOutOf3GCoverage, // cause 3,31,69
     EPhoneNoteVideoCallOnlyPossibleUnder3GCoverage, // cause 50
     EPhoneNoteUnableToMakeVideoCallNotSupportedByOtherPhone, // cause 57,88 
     EPhoneNoteCalledNumberHasBarredIncomingCalls, // cause 21
     
-// <-- QT PHONE START -->
     EPhoneIncallHeldButtons,
     EPhoneAttemptingEmergencyText,
-// <-- QT PHONE END -->
+
     // Last
     EPhoneRssBaseLast
     };
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiutils/inc/tphonecmdparamcallheaderdata.h
--- a/phoneapp/phoneuiutils/inc/tphonecmdparamcallheaderdata.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiutils/inc/tphonecmdparamcallheaderdata.h	Fri Apr 16 14:58:25 2010 +0300
@@ -23,14 +23,9 @@
 //  INCLUDES
 
 #include <w32std.h>
-// <-- QT PHONE START -->
 #include <cntdef.h>
-// <-- QT PHONE START -->
 #include "tphonecommandparam.h"
 #include "phoneconstants.h"
-// <-- QT PHONE START -->
-//#include "bmbubblemanager.h"
-// <-- QT PHONE START -->
 
 // DATA TYPES
 
@@ -50,13 +45,11 @@
             EPhoneParticipantCNAPText,                
             };
 
-// <-- QT PHONE START -->         
         enum TPhoneTextClippingDirection
             {
             ERight,
             ELeft
             };
-// <-- QT PHONE END --> 
            
     public:  
         
@@ -108,24 +101,16 @@
         * @param aCLI is the CLI text
         * @param aDirection Clipping direction of the CLI text.
         */
-// <-- QT PHONE START --> 
-//        IMPORT_C void SetCLIText( const TDesC& aCLIText, 
-//                                  CBubbleManager::TPhoneClippingDirection aDirection );
         IMPORT_C void SetCLIText( const TDesC& aCLIText, 
                                   TPhoneTextClippingDirection aDirection );
-// <-- QT PHONE END --> 
 
         /**
         * Sets the call header CNAP text
         * @param aCNAP is the CNAP text
         * @param aDirection Clipping direction of the CNAP text.
         */
-// <-- QT PHONE START -->
-//        IMPORT_C void SetCNAPText( const TDesC& aCNAPText,
-//                CBubbleManager::TPhoneClippingDirection aDirection );
         IMPORT_C void SetCNAPText( const TDesC& aCNAPText,
                                    TPhoneTextClippingDirection aDirection );
-// <-- QT PHONE END -->
 
         /**
         * Sets the call header picture
@@ -133,20 +118,11 @@
         */
         IMPORT_C void SetPicture( const TDesC& aPicture );
 
-// <-- QT PHONE START -->         
-        /**
-        * Sets the call flag
-        * @param call flag
-        */
-//        IMPORT_C void SetCallFlag(
-//          CBubbleManager::TPhoneCallTypeFlags aCallFlag );
-
         /**
         * Sets the call header diverted status.
         * @param call flag
         */
         IMPORT_C void SetDiverted( TBool aDiverted );
-// <-- QT PHONE END --> 
             
         /**
         * Sets the call header line2 status.
@@ -155,15 +131,6 @@
         IMPORT_C void SetLine2( TBool aLine2 );
             
         /**
-        * Adds the call flag
-        * @param call flag
-        */
-// <-- QT PHONE START -->
-//        IMPORT_C void AddCallFlag( 
-//            CBubbleManager::TPhoneCallTypeFlags aCallFlag );
-// <-- QT PHONE END -->
-
-        /**
         * Returns the call header label text
         * @return Returns the label
         */
@@ -209,7 +176,6 @@
          * Returns the clipping direction of the CLI text.
          * @return  Clipping direction of the CLI text.
          */
-// <-- QT PHONE START -->         
         IMPORT_C TPhoneTextClippingDirection CLITextClippingDirection() const;
 
         /**
@@ -217,7 +183,6 @@
          * @return  Clipping direction of the CNAP text.
          */
         IMPORT_C TPhoneTextClippingDirection CNAPTextClippingDirection() const;
-// <-- QT PHONE END -->         
         
         /**
         * Returns the call header CNAP text.
@@ -231,19 +196,11 @@
         */
         IMPORT_C const TDesC& Picture() const;
         
-// <-- QT PHONE START -->         
-        /**
-        * Returns the call flag
-        * @return Returns the call flag
-        */
-//      IMPORT_C TUint32 CallFlag() const;
-
         /**
         * Returns call diverted status.
         * @return Returns ETrue if diverted call.
         */
         IMPORT_C TBool Diverted() const;
-// <-- QT PHONE END -->         
         
         /**
         * Returns the call header line 2 active.
@@ -389,17 +346,13 @@
         /**
          * Clipping direction of the CLI text.
          */
-// <-- QT PHONE START -->         
         TPhoneTextClippingDirection iCLITextClippingDirection;
-// <-- QT PHONE END -->
        
         /**
          * Clipping direction of the CLI text.
          */
-// <-- QT PHONE START -->
 //        CBubbleManager::TPhoneClippingDirection iCNAPTextClippingDirection;
         TPhoneTextClippingDirection iCNAPTextClippingDirection;
-// <-- QT PHONE END -->
         
         /**
         * Call header CNAP Text
@@ -411,14 +364,6 @@
         */
         TPtrC iPicture;
         
-// <-- QT PHONE START -->         
-        /**
-        * Call flag.
-        */
-//        TUint32     iCallFlag;
-// <-- QT PHONE END -->         
-
-        
         TBool iLine2;
         
         /**
@@ -463,12 +408,10 @@
          */
         TPtrC iRemotePhoneNumber;
 
-// <-- QT PHONE START -->                 
         /**
          * Call divert status.
          */
         TBool iDiverted;        
-// <-- QT PHONE END -->         
     };
 
 #endif // __TPHONECMDPARAMCALLHEADERDATA_H   
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiutils/inc/tphonecmdparamquery.h
--- a/phoneapp/phoneuiutils/inc/tphonecmdparamquery.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiutils/inc/tphonecmdparamquery.h	Fri Apr 16 14:58:25 2010 +0300
@@ -161,16 +161,14 @@
         * @param aParamId command id
         */
         IMPORT_C void SetCommandParamId( TPhoneCommandParam::TPhoneParamId aParamId );
-        // <-- QT PHONE START -->
+
         /**
         * Sets the timeout in milliseconds.
         * Query will destroyed after this time 
         * @param aTimeOut is integer value
         */
-        // <-- QT PHONE END -->
         IMPORT_C void SetTimeOut( TInt aTimeOut );
 
-
         /**
         * Gets the timeout of global query.
         */
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiutils/src/cphonecallthememonitor.cpp
--- a/phoneapp/phoneuiutils/src/cphonecallthememonitor.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiutils/src/cphonecallthememonitor.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -54,20 +54,7 @@
     __LOGMETHODSTARTEND( EPhoneUIUtils, "CPhoneCallThemeMonitor::ConstructL ()" );    
 
     // Get all current values
-    TRAP_IGNORE( ReadAllL() );
-    
-// <-- QT PHONE START-->    
-    // Start listen changes in setting and image path
-    /*CPhoneCenRepProxy::Instance()->NotifyChangeL(
-        KCRUidThemes, 
-        KThemesCallImagePath,
-        this );
-    
-    CPhoneCenRepProxy::Instance()->NotifyChangeL(
-        KCRUidThemes, 
-        KThemesCallImageSetting,
-        this );*/
-// <-- QT PHONE END-->        
+    TRAP_IGNORE( ReadAllL() );    
     }
 
 // -----------------------------------------------------------------------------
@@ -179,14 +166,6 @@
         iCallerImageThemePath = NULL;
         iCallerImageThemePath = HBufC::NewL( KMaxFilePathLength );
         TPtr imagePtr ( iCallerImageThemePath->Des() );
-
-// <-- QT PHONE START-->        
-        // Get image file path
-        /*CPhoneCenRepProxy::Instance()->GetString(
-            KCRUidThemes,
-            KThemesCallImagePath,
-            imagePtr );*/
-// <-- QT PHONE END-->
             
         __PHONELOG1( EBasic, EPhoneUIUtils,
             "CPhoneCallThemeMonitor::ReadAllL -> image path = %S", &imagePtr );
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiutils/src/cphonecenrepproxy.cpp
--- a/phoneapp/phoneuiutils/src/cphonecenrepproxy.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiutils/src/cphonecenrepproxy.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -146,21 +146,6 @@
     
     User::LeaveIfError( GetTelephonyVariantData() );
     User::LeaveIfError( GetPhoneUIVariantData() );
-
-// <-- QT PHONE START-->
-/*    iCenRepAccessoryEventHandler = CPhoneCenRepEventHandler::NewL( 
-        KCRUidAccessorySettings );
-    iCenRepNetworkEventHandler = CPhoneCenRepEventHandler::NewL( 
-        KCRUidNetworkSettings );
-    iCenRepThemesEventHandler = CPhoneCenRepEventHandler::NewL( 
-        KCRUidThemes );
-    iCenRepLanguageEventHandler = CPhoneCenRepEventHandler::NewL( 
-        KCRUidAknFep );
-    iCenRepQwertyEventHandler = CPhoneCenRepEventHandler::NewL( 
-        KCRUidAvkon );
-    iCenRepKDRMHelperEventHandler = CPhoneCenRepEventHandler::NewL( 
-        KCRUidDRMHelperServer );*/
-// <-- QT PHONE END-->        
     }
 
 // ---------------------------------------------------------
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiutils/src/cphonelangsettingmonitor.cpp
--- a/phoneapp/phoneuiutils/src/cphonelangsettingmonitor.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiutils/src/cphonelangsettingmonitor.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -50,14 +50,7 @@
 void CPhoneLangSettingMonitor::ConstructL()
     {
     TInt language(1); // english
-
-// <-- QT PHONE START-->
-    /*TInt err( CPhoneCenRepProxy::Instance()->GetInt(
-        KCRUidAknFep,
-        KAknFepInputTxtLang,
-        language ));*/
     TInt err = KErrNone;
-// <-- QT PHONE END-->    
     
     if ( err == KErrNone )
         {
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiutils/src/cphoneqwertymodemonitor.cpp
--- a/phoneapp/phoneuiutils/src/cphoneqwertymodemonitor.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiutils/src/cphoneqwertymodemonitor.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -44,25 +44,8 @@
 //
 void CPhoneQwertyModeMonitor::ConstructL()
     {
-    // Current Call state.
-    iQwertyMode = GetQwertyMode();
-
-// <-- QT PHONE START-->
-/*    CPhonePubSubProxy::Instance()->NotifyChangeL(
-        KCRUidAvkon, 
-        KAknQwertyInputModeActive,
-        this );*/
-     
-
-     iKeyboard = GetKeyboard();
-    
-#ifdef RD_INTELLIGENT_TEXT_INPUT
-/*    CPhonePubSubProxy::Instance()->NotifyChangeL(
-        KCRUidAvkon, 
-        KAknKeyBoardLayout,
-        this );*/
-#endif
-// <-- QT PHONE END-->
+    iQwertyMode = GetQwertyMode();     
+    iKeyboard = GetKeyboard();    
     }
 
 // -----------------------------------------------------------------------------
@@ -188,14 +171,7 @@
 //
 TInt CPhoneQwertyModeMonitor::GetKeyboard() const
     {
-    // Get call state.
-// <-- QT PHONE START-->    
-/*    TInt keyboard( CPhonePubSubProxy::Instance()->Value(
-        KCRUidAvkon,
-        KAknKeyBoardLayout ) );*/
-    TInt keyboard(0);
-// <-- QT PHONE END-->    
-    
+    TInt keyboard(0);    
     return keyboard;
     }
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiutils/src/cphoneresourceresolverbase.cpp
--- a/phoneapp/phoneuiutils/src/cphoneresourceresolverbase.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiutils/src/cphoneresourceresolverbase.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -31,12 +31,7 @@
 #include "phonelogger.h"
 #include "cphonecenrepproxy.h"
 
-// <-- QT PHONE START --> 
 #include "phoneresourceids.h"
-//#include <phoneui.rsg>
-//#include <callhandlingui.rsg>
-//#include <phoneuitouch.rsg>
-// <-- QT PHONE END --> 
 #include "tphonetouchbuttonconfig.h"
 #include <data_caging_path_literals.hrh>
 
@@ -655,14 +650,6 @@
 
         case EPhoneCallHandlingInCallHandsetCBA:
             if ( iVariationFlags & EOnscreenDialer )
-// <-- QT PHONE START -->                
-/* 
-                {
-                retVal = R_PHONEUI_INCALL_DIALER_CBA;
-                }
-            else
-*/
-// <-- QT PHONE END -->                
                 {
                 retVal = R_PHONEUI_CALLHANDLING_INCALL_HANDSET_CBA;
                 }
@@ -670,14 +657,6 @@
 
         case EPhoneCallHandlingInCallBtaaCBA:
             if ( iVariationFlags & EOnscreenDialer )
-// <-- QT PHONE START -->                
-/* 
-                {
-                retVal = R_PHONEUI_INCALL_DIALER_CBA;
-                }
-            else
-*/
-// <-- QT PHONE END -->                
                 {
                 retVal = R_PHONEUI_CALLHANDLING_INCALL_BTAA_CBA;
                 }
@@ -685,14 +664,6 @@
             break;
 
         case EPhoneCallHandlingEmergencyCBA:
-// <-- QT PHONE START -->        
-/*            if ( iVariationFlags & EOnscreenDialer )
-                {
-                retVal = R_PHONEUI_INCALL_DIALER_CBA;
-                }
-            else
-*/            
-// <-- QT PHONE END -->              
                 {
                 retVal = R_PHONEUI_CALLHANDLING_EMERGENCY_CBA;
                 }
@@ -1006,9 +977,7 @@
             break;
 
         case EPhoneCallDurationFormatString:
-// <-- QT PHONE START --> 
             retVal = R_PHONEUI_TIME_DURAT_LONG_WITH_ZERO;
-// <-- QT PHONE END --> 
             break;
 
         case EPhoneDtmfNumberQuery:
@@ -1535,7 +1504,7 @@
         case EPhoneCallHandlingEmergencyInCallNoOptions:
             retVal = R_PHONEUI_CALLHANDLING_EMERGENCY_INCALL_NO_OPTIONS;
             break;
-// <-- QT PHONE START -->
+
         case EPhoneIncallHeldButtons:
             retVal = R_PHONEUI_INCALL_HELD_BUTTONS;
             break;
@@ -1543,7 +1512,6 @@
         case EPhoneAttemptingEmergencyText:
             retVal = R_PHONEUI_ATTEMPTING_EMERGENCY_CALL_TEXT;
             break;
-// <-- QT PHONE END -->
 
         default:
             Panic( EPhoneUtilsResourcePhoneappNotFound );
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiutils/src/tphonecmdparamcallheaderdata.cpp
--- a/phoneapp/phoneuiutils/src/tphonecmdparamcallheaderdata.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiutils/src/tphonecmdparamcallheaderdata.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -39,9 +39,6 @@
     iCLIText( KNullDesC ),
     iCNAPText( KNullDesC ),
     iPicture( KNullDesC ),
-// <-- QT PHONE START -->         
-//    iCallFlag( CBubbleManager::ENormal ),
-// <-- QT PHONE END -->         
     iLine2 ( EFalse ),
     iThumbnail( NULL ),
     iCallerText( KNullDesC ),
@@ -49,9 +46,7 @@
     iCipheringIndicatorAllowed( ETrue ),
     iContactLink( KNullDesC8 ),
     iRemotePhoneNumber( KNullDesC )
-// <-- QT PHONE START -->         
     ,iDiverted( EFalse )
-// <-- QT PHONE END -->         
     {
     iParamId = EPhoneParamIdCallHeaderData;
     }
@@ -133,9 +128,7 @@
 //
 EXPORT_C void TPhoneCmdParamCallHeaderData::SetCLIText( 
    const TDesC& aCLIText,
-// <-- QT PHONE START -->         
    TPhoneTextClippingDirection aDirection )
-// <-- QT PHONE END -->         
    {
    iCLIText = aCLIText;
    iCLITextClippingDirection = aDirection; 
@@ -149,9 +142,7 @@
 //
 EXPORT_C void TPhoneCmdParamCallHeaderData::SetCNAPText( 
    const TDesC& aCNAPText,
-// <-- QT PHONE START -->         
    TPhoneTextClippingDirection aDirection )
-// <-- QT PHONE END -->         
    {
    iCNAPText = aCNAPText;
    iCNAPTextClippingDirection = aDirection; 
@@ -175,27 +166,11 @@
 // (other items were commented in a header).
 // ---------------------------------------------------------
 //
-// <-- QT PHONE START -->         
 EXPORT_C void TPhoneCmdParamCallHeaderData::SetDiverted(
     TBool aDiverted )
     {
     iDiverted = aDiverted;        
     }
-// <-- QT PHONE END -->         
-
-// ---------------------------------------------------------
-// TPhoneCmdParamCallHeaderData::AddCallFlag
-// Adds the call flag
-// (other items were commented in a header).
-// ---------------------------------------------------------
-//
-// <-- QT PHONE START -->
-/*EXPORT_C void TPhoneCmdParamCallHeaderData::AddCallFlag(
-    const CBubbleManager::TPhoneCallTypeFlags aCallFlag )
-    {
-    iCallFlag |= aCallFlag;
-    }*/
-// <-- QT PHONE END -->
 
 // ---------------------------------------------------------
 // TPhoneCmdParamCallHeaderData::SetLine2
@@ -290,9 +265,7 @@
 // (other items were commented in a header).
 // ---------------------------------------------------------
 //
-// <-- QT PHONE START -->         
 EXPORT_C TPhoneCmdParamCallHeaderData::TPhoneTextClippingDirection 
-// <-- QT PHONE END -->         
 TPhoneCmdParamCallHeaderData::CLITextClippingDirection() const
     {
     return iCLITextClippingDirection;
@@ -304,9 +277,7 @@
 // (other items were commented in a header).
 // ---------------------------------------------------------
 //
-// <-- QT PHONE START -->         
 EXPORT_C TPhoneCmdParamCallHeaderData::TPhoneTextClippingDirection 
-// <-- QT PHONE END -->         
 TPhoneCmdParamCallHeaderData::CNAPTextClippingDirection() const
     {
     return iCNAPTextClippingDirection;
@@ -340,12 +311,10 @@
 // (other items were commented in a header).
 // ---------------------------------------------------------
 //
-// <-- QT PHONE START -->         
 EXPORT_C TBool TPhoneCmdParamCallHeaderData::Diverted() const
     {
     return iDiverted;        
     }
-// <-- QT PHONE END -->         
 
 // ---------------------------------------------------------
 // TPhoneCmdParamCallHeaderData::Line2
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiutils/src/tphonecmdparamkeycapture.cpp
--- a/phoneapp/phoneuiutils/src/tphonecmdparamkeycapture.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiutils/src/tphonecmdparamkeycapture.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -18,7 +18,7 @@
 
 // INCLUDE FILES
 
-#include "tphonecmdparamKeycapture.h"
+#include "tphonecmdparamkeycapture.h"
 
 // ================= MEMBER FUNCTIONS =======================
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiutils/src/tphonecmdparamquery.cpp
--- a/phoneapp/phoneuiutils/src/tphonecmdparamquery.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiutils/src/tphonecmdparamquery.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -217,9 +217,6 @@
 //
 EXPORT_C TDes* TPhoneCmdParamQuery::DataText() const
     {
-    // <-- QT PHONE START -->
-    //__ASSERT_DEBUG( iDataText, Panic( EPhoneUtilsInvariant ) );
-    // <-- QT PHONE END -->
     return iDataText;
     }
    
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiutils/src/tphonetouchbuttonconfig.cpp
--- a/phoneapp/phoneuiutils/src/tphonetouchbuttonconfig.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiutils/src/tphonetouchbuttonconfig.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -17,9 +17,6 @@
 
 // INCLUDE FILES
 #include "cphonecenrepproxy.h"
-// <-- QT PHONE START -->
-//#include <callhandlingui.rsg>
-// <-- QT PHONE END -->
 #include <barsread.h>
 #include <coemain.h>
 
@@ -97,29 +94,6 @@
 void TPhoneTouchButtonConfig::ReadConfigResourceL( 
     const TFixedArray<TInt,KTelButtonsConfigKeyCount>& /*aKeyValues*/ )
     {
-// <-- QT PHONE START -->
-    /*TResourceReader reader;
-    CCoeEnv::Static()->CreateResourceReaderLC( 
-            reader, 
-            R_PHONEUI_TOUCH_BUTTON_CONFIG );
-
-    TInt configItemCount = reader.ReadInt16();
-    for ( TInt i=0; i < configItemCount; i++ )
-        {
-        TInt buttonSetId = reader.ReadInt16();
-        TInt buttonSetCount = reader.ReadInt16();
-        for ( TInt j=0; j < buttonSetCount ; j++ )
-            {
-            TInt buttonSetResourceId = reader.ReadInt32();
-            if ( j == aKeyValues[ buttonSetId ] )
-                {
-                iConfiguration[ buttonSetId ] = buttonSetResourceId;
-                }
-            }
-        }
-    
-    CleanupStack::PopAndDestroy(); // reader*/
-// <-- QT PHONE END -->
     }
 
 // ---------------------------------------------------------------------------
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiview2/bwins/phoneuiqtviewu.def
--- a/phoneapp/phoneuiview2/bwins/phoneuiqtviewu.def	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiview2/bwins/phoneuiqtviewu.def	Fri Apr 16 14:58:25 2010 +0300
@@ -60,4 +60,6 @@
 	?setVolumeSliderValue@PhoneUIQtView@@UAEXHHHH@Z @ 59 NONAME ; void PhoneUIQtView::setVolumeSliderValue(int, int, int, int)
 	?clearAndHideDialpad@PhoneUIQtView@@UAEXXZ @ 60 NONAME ; void PhoneUIQtView::clearAndHideDialpad(void)
 	?isDisabled@PhoneAction@@QBE_NXZ @ 61 NONAME ; bool PhoneAction::isDisabled(void) const
+	?endKeyLongPress@PhoneUIQtView@@IAEXXZ @ 62 NONAME ; void PhoneUIQtView::endKeyLongPress(void)
+	?longEndKeyPressEvent@PhoneUIQtView@@QAEXXZ @ 63 NONAME ; void PhoneUIQtView::longEndKeyPressEvent(void)
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiview2/eabi/phoneuiqtviewu.def
--- a/phoneapp/phoneuiview2/eabi/phoneuiqtviewu.def	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiview2/eabi/phoneuiqtviewu.def	Fri Apr 16 14:58:25 2010 +0300
@@ -89,4 +89,6 @@
 	_ZThn28_N13PhoneUIQtView27clearParticipantListActionsEv @ 88 NONAME
 	_ZThn8_N13PhoneUIQtViewD0Ev @ 89 NONAME
 	_ZThn8_N13PhoneUIQtViewD1Ev @ 90 NONAME
+	_ZN13PhoneUIQtView15endKeyLongPressEv @ 91 NONAME
+	_ZN13PhoneUIQtView20longEndKeyPressEventEv @ 92 NONAME
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiview2/inc/phoneuiqtview.h
--- a/phoneapp/phoneuiview2/inc/phoneuiqtview.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiview2/inc/phoneuiqtview.h	Fri Apr 16 14:58:25 2010 +0300
@@ -29,6 +29,7 @@
 class HbToolBar;
 class HbVolumeSliderPopup;
 class Dialpad;
+class QTimer;
 
 #ifdef BUILD_PHONEUIQTVIEW
 #define PHONEUIQTVIEW_EXPORT Q_DECL_EXPORT
@@ -263,6 +264,13 @@
         Shutdown phone application.
     */
     void shutdownPhoneApp();
+    
+    /*!
+        \fn void PhoneUIQtView::longEndKeyPressEvent()
+        
+        This is called when end key's long press timer times out.
+    */
+    void longEndKeyPressEvent();
    
 signals:
 
@@ -279,6 +287,8 @@
         This signal is emitted when key is released.
     */
     void keyReleased (QKeyEvent *event);
+
+    void endKeyLongPress();
     
     /*!
         \fn void command(int command)
@@ -294,6 +304,7 @@
     */
     void dialpadIsAboutToClose();
     
+    
 protected:
 
     /*!
@@ -340,9 +351,9 @@
     QList<HbAction *>   m_participantListActions;
     int                 m_volumeCommandId;
     HbAction            *m_backAction;
-    HbAction            *m_emptyAction; 
     Dialpad             *m_dialpad;
     QSignalMapper       *m_menuSignalMapper;
+    QTimer              *m_longPressTimer;
 };
 
 #endif // PHONEUIQTVIEW_H
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiview2/src/phoneuiqtview.cpp
--- a/phoneapp/phoneuiview2/src/phoneuiqtview.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiview2/src/phoneuiqtview.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -1,5 +1,5 @@
 /*!
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -15,7 +15,8 @@
 *
 */
 #include <hbinstance.h>
-#include <QSignalMapper>
+#include <qsignalmapper>
+#include <qtimer>
 #include <hbaction.h>
 #include <hbtoolbar.h>
 #include <hbvolumesliderpopup.h>
@@ -29,53 +30,56 @@
 
 #include "phoneuiqtview.h"
 #include "phoneaction.h"
+#include "qtphonelog.h"
+const int LongKeyPressTimeOut(600);
 
 PhoneUIQtView::PhoneUIQtView (HbMainWindow &window, QGraphicsItem *parent) :
     HbView (parent),
     m_window(window),
-    m_volumeSlider (0), 
-    m_expandSignalMapper(0), 
+    m_volumeSlider (0),
+    m_expandSignalMapper(0),
     m_participantListSignalMapper(0),
-    m_volumeCommandId(0)
+    m_volumeCommandId(0),
+    m_longPressTimer(0)
 {
     setTitle(hbTrId("txt_phone_title_telephone"));
 
-    // call handling widget
+    // Call handling widget
     m_bubbleManager = new BubbleManager (this);
-
     setWidget(m_bubbleManager);
 
+    // Long press timer
+    m_longPressTimer = new QTimer(this);
+    m_longPressTimer->setSingleShot(true);
+    connect(m_longPressTimer, SIGNAL(timeout()), this, SLOT(longEndKeyPressEvent()));
+
     // Dialpad
-    m_dialpad = new Dialpad();
+    m_dialpad = new Dialpad(m_window);
     m_dialpad->setCallButtonEnabled(false);
+    m_dialpad->setTapOutsideDismiss(true);
     connect(&m_dialpad->editor(),SIGNAL(contentsChanged()),
             SLOT(onEditorContentChanged()));
     connect(m_dialpad,SIGNAL(aboutToClose()),this,
                 SLOT(dialpadClosed()));
-            
-    // Set event filter         
+
+    // Set event filter
     m_window.installEventFilter(this);
-    
-    
+
     m_signalMapper = new QSignalMapper (this);
     connect(m_signalMapper, SIGNAL (mapped (int)), this, SIGNAL (command (int)));
     connect(&m_window,SIGNAL(orientationChanged(Qt::Orientation)),
             this,SLOT(handleOrientationChange(Qt::Orientation)));
-    
+
     m_menuSignalMapper = new QSignalMapper(this);
     connect(m_menuSignalMapper, SIGNAL(mapped(int)), this, SIGNAL(command(int)));
-    
+
     m_bubbleManager->handleOrientationChange(m_window.orientation());
-    
-    // changed exit softkey to back button
-    m_backAction = new HbAction(Hb::BackAction,this);
+
+    // change exit softkey to back button
+    m_backAction = new HbAction(Hb::BackAction, this);
     connect(m_backAction, SIGNAL(triggered()), this, SLOT(backButtonClicked()));
-    HbAction *action = m_window.softKeyAction(Hb::SecondarySoftKey);
-    m_window.removeSoftKeyAction(Hb::SecondarySoftKey,action);
-    m_window.addSoftKeyAction(Hb::SecondarySoftKey,m_backAction);
-    
-    m_emptyAction = new HbAction(this);
-    
+    setNavigationAction(m_backAction);
+
     createToolBarActions();
 }
 
@@ -102,12 +106,12 @@
     HbAction* bubbleAction = new HbAction ();
     bubbleAction->setText (action.text());
     bubbleAction->setIcon (action.icon());
-    setActionRole(action,*bubbleAction);                    
+    setActionRole(action,*bubbleAction);
     m_bubbleManager->addAction (bubbleId, bubbleAction);
-    
+
     QList<int> bubbles = m_bubbleMap.keys();
     bool found(false);
-    
+
     for ( int i=0; i<bubbles.size(); ++i ) {
         if (bubbleId==bubbles[i]){
             connect(bubbleAction, SIGNAL (triggered ()), m_bubbleMap.value(bubbleId), SLOT (map ()));
@@ -116,7 +120,7 @@
             found = true;
         }
     }
-    
+
     if (!found) {
         QSignalMapper *mapper = new QSignalMapper();
         connect(mapper, SIGNAL (mapped (int)), this, SIGNAL (command (int)));
@@ -131,19 +135,19 @@
 
 void PhoneUIQtView::addParticipantListAction(
     int commandId,
-    const QString& text, 
+    const QString& text,
     const HbIcon& icon)
 {
     HbAction* action = new HbAction ();
     action->setText (text);
     action->setIcon (icon);
     m_bubbleManager->addParticipantListAction(action);
-    
+
     if (!m_participantListSignalMapper) {
         m_participantListSignalMapper = new QSignalMapper();
         connect(m_participantListSignalMapper, SIGNAL (mapped (int)), this, SIGNAL (command (int)));
     }
-    
+
     connect(action, SIGNAL (triggered ()), m_participantListSignalMapper, SLOT (map ()));
     m_participantListSignalMapper->setMapping (action, commandId);
     m_participantListActions.append( action );
@@ -151,15 +155,15 @@
 
 void PhoneUIQtView::clearParticipantListActions()
 {
-   
+
     if (m_participantListSignalMapper) {
         m_bubbleManager->clearParticipantListActions();
-        
+
         foreach (HbAction *action, m_participantListActions ) {
             m_participantListSignalMapper->removeMappings(action);
             delete action;
         }
-            
+
         m_participantListActions.clear();
         delete m_participantListSignalMapper;
         m_participantListSignalMapper = 0;
@@ -169,22 +173,22 @@
 
 void PhoneUIQtView::clearBubbleCommands (int bubbleId)
 {
-    m_bubbleManager->clearActions (bubbleId);   
+    m_bubbleManager->clearActions (bubbleId);
     QSignalMapper *mapper = m_bubbleMap.value(bubbleId);
-    
+
     if (mapper) {
         QList<HbAction *> *actions = m_bubbleActionMap.value(bubbleId);
-        
+
         foreach (HbAction *action, *actions ) {
             mapper->removeMappings(action);
             delete action;
         }
-            
+
         actions->clear();
         m_bubbleMap.remove(bubbleId);
         m_bubbleActionMap.remove(bubbleId);
         delete mapper;
-        delete actions;      
+        delete actions;
     }
 
 }
@@ -196,9 +200,9 @@
         m_signalMapper->removeMappings(
                 static_cast<HbAction*>(toolBar()->actions().at(i)));
     }
-    
+
     QList<QAction*> toolBarActions = toolBar()->actions();
-    
+
     if (toolBarActions.size()<actions.size()) {
         for (int i=toolBarActions.size(); i<actions.size(); ++i) {
             toolBar()->addAction(m_toolbarActions.at(i));
@@ -211,19 +215,19 @@
             }
         }
     }
-    
-    for (int i=0; i<toolBar()->actions().size(); ++i) {    
-    
+
+    for (int i=0; i<toolBar()->actions().size(); ++i) {
+
         if (i<actions.count()) {
             HbAction* action = static_cast<HbAction*>(toolBar()->actions().at(i));
             action->setText(actions.at(i)->text());
-            action->setIcon(actions.at(i)->icon());            
+            action->setIcon(actions.at(i)->icon());
             action->setDisabled(actions.at(i)->isDisabled());
-            
+
             m_signalMapper->setMapping(action, actions.at(i)->command());
         }
     }
-    
+
     if ( m_window.orientation() == Qt::Horizontal ) {
         toolBar()->setOrientation(Qt::Horizontal);
     }
@@ -238,7 +242,7 @@
 
 void PhoneUIQtView::showToolbar ()
 {
-    setFocus();       
+    setFocus();
     toolBar()->show();
 }
 
@@ -255,7 +259,7 @@
 {
     if (m_volumeSlider) {
         if (m_volumeSlider->isVisible()) {
-            m_volumeSlider->hide();   
+            m_volumeSlider->hide();
         }
         m_volumeSlider->deleteLater();
         m_volumeSlider = 0;
@@ -271,7 +275,7 @@
         int value, int commandId, int maxVolumeValue, int minVolumeValue)
 {
     m_volumeCommandId = commandId;
-    
+
     if (!m_volumeSlider) {
         m_volumeSlider = new HbVolumeSliderPopup ();
         m_volumeSlider->setDismissPolicy(HbDialog::TapOutside);
@@ -279,16 +283,16 @@
         connect(m_volumeSlider, SIGNAL(valueChanged(int)), this, SLOT(volumeSliderChanged(int)));
         connect(m_volumeSlider, SIGNAL(aboutToClose()), this, SLOT(volumeSliderClosed()));
     }
-        
+
 
     if (m_volumeSlider->minimum() != minVolumeValue ||
             m_volumeSlider->maximum() !=  maxVolumeValue  ) {
         m_volumeSlider->setRange (minVolumeValue, maxVolumeValue);
     }
-    
+
     if (value != m_volumeSlider->value())
         m_volumeSlider->setValue (value);
-    
+
     if (false == m_volumeSlider->isVisible()) {
         m_volumeSlider->show();
     }
@@ -297,25 +301,25 @@
 void PhoneUIQtView::volumeSliderChanged(int value)
 {
     Q_UNUSED (value);
-    emit command (m_volumeCommandId);   
+    emit command (m_volumeCommandId);
 }
 
 void PhoneUIQtView::setExpandAction(int bubbleId, int commandId)
 {
     removeExpandAction(bubbleId);
-    
+
     HbAction* action = new HbAction();
     m_bubbleManager->setExpandAction(bubbleId, action);
-    
+
     if (!m_expandSignalMapper) {
         m_expandSignalMapper = new QSignalMapper(this);
-        connect(m_expandSignalMapper, SIGNAL (mapped (int)), 
+        connect(m_expandSignalMapper, SIGNAL (mapped (int)),
                 this, SIGNAL (command (int)));
     }
-    
+
     connect(action, SIGNAL (triggered ()), m_expandSignalMapper, SLOT (map ()));
     m_expandSignalMapper->setMapping(action, commandId);
-    
+
     m_expandActionMap.insert(bubbleId,action);
 }
 
@@ -327,7 +331,7 @@
         m_expandSignalMapper->removeMappings(action);
         m_expandActionMap.remove(bubbleId);
         delete action;
-    }   
+    }
 }
 
 void PhoneUIQtView::showDialpad()
@@ -344,17 +348,17 @@
         m_dialpad->closeDialpad();
 }
 
-bool PhoneUIQtView::isDialpadVisible()   
+bool PhoneUIQtView::isDialpadVisible()
 {
     return m_dialpad->isVisible();
 }
 
-QString PhoneUIQtView::dialpadText()   
+QString PhoneUIQtView::dialpadText()
 {
     return m_dialpad->editor().text();
 }
 
-void PhoneUIQtView::clearAndHideDialpad()   
+void PhoneUIQtView::clearAndHideDialpad()
 {
     m_dialpad->editor().setText(QString(""));
     hideDialpad();
@@ -375,7 +379,7 @@
         menu()->removeAction(action);
         delete action;
     }
-    
+
     for (int i=0; i<actions.count(); ++i) {
         HbAction* action = new HbAction();
         action->setText(actions.at(i)->text());
@@ -398,7 +402,7 @@
     }
 
     m_bubbleManager->handleOrientationChange(orientation);
-    
+
     setDialpadPosition();
 }
 
@@ -422,12 +426,17 @@
 {
     if (event->type() == QEvent::KeyPress) {
         QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
-        qDebug() << "PhoneUIQtView::eventFilter: pressed key " << keyEvent->key();
+        PHONE_DEBUG2("PhoneUIQtView::eventFilter pressed key:", keyEvent->key());
+        if(keyEvent->key() == Qt::Key_No) {
+            m_longPressTimer->stop();
+            m_longPressTimer->start(LongKeyPressTimeOut);
+        }
         emit keyPressed(keyEvent);
         return false;
     } else if (event->type() == QEvent::KeyRelease) {
+        m_longPressTimer->stop();
         QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
-        qDebug() << "PhoneUIQtView::eventFilter: released key " << keyEvent->key();
+        PHONE_DEBUG2("PhoneUIQtView::eventFilter released key:", keyEvent->key());
         emit keyReleased(keyEvent);
         return false;
     } else {
@@ -444,14 +453,14 @@
         m_dialpad->setPos(QPointF(screenRect.width()/2,
                                   this->scenePos().y()));
         m_dialpad->setPreferredSize(screenRect.width()/2,
-                                           (screenRect.height()-scenePos().y()));                                  
+                                           (screenRect.height()-scenePos().y()));
     } else {
         // dialpad takes 65% of the screen height
         qreal screenHeight = screenRect.height();
         m_dialpad->setPos(QPointF(0,
                                   screenHeight/2.25));
         m_dialpad->setPreferredSize(screenRect.width(),
-                                    screenHeight-screenHeight/2.25);        
+                                    screenHeight-screenHeight/2.25);
     }
 }
 
@@ -475,19 +484,23 @@
 
 void PhoneUIQtView::shutdownPhoneApp()
 {
-    qDebug() << "PhoneUIQtView::shutdownPhoneApp ";
+    PHONE_DEBUG("PhoneUIQtView::shutdownPhoneApp");
     QCoreApplication::quit();
 }
 
 void PhoneUIQtView::setBackButtonVisible(bool visible)
 {
-    HbAction *oldAction = m_window.softKeyAction(Hb::SecondarySoftKey);
-    m_window.removeSoftKeyAction(Hb::SecondarySoftKey, oldAction);
     if (visible) {
-        m_window.addSoftKeyAction(Hb::SecondarySoftKey, m_backAction);
+        setNavigationAction(m_backAction);
         }
     else {
-        m_window.addSoftKeyAction(Hb::SecondarySoftKey, m_emptyAction);
+        setNavigationAction(0);
     }
 }
 
+void PhoneUIQtView::longEndKeyPressEvent()
+{
+    Q_ASSERT(m_longPressTimer);
+    m_longPressTimer->stop();
+    emit endKeyLongPress();
+}
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuiview2/tsrc/ut_phoneuiqtview/unit_tests.cpp
--- a/phoneapp/phoneuiview2/tsrc/ut_phoneuiqtview/unit_tests.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuiview2/tsrc/ut_phoneuiqtview/unit_tests.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -19,6 +19,7 @@
 #include <QtGui>
 #include <QVariant>
 #include <QKeyEvent>
+#include <QTimer>
 #include <hbapplication.h>
 #include <QSignalSpy>
 #include <hbmainwindow.h>
@@ -38,6 +39,8 @@
 static const int KMINVOLUME = 0;
 static const int KVOLUMECOMMAND = 5;
 
+bool m_qtimer_stop_called;
+
 
 #define PHONE_QT_VIEW_TEST_MAIN(TestObject) \
 int main(int argc, char *argv[]) \
@@ -86,6 +89,7 @@
     void testShowDialpad();
     void testDialpadText();
     void testSetMenuActions();
+    void testLongEndKeyPressEvent();
 
 private:
     int createCallHeader();
@@ -96,7 +100,11 @@
 
 };
 
-
+void QTimer::stop()
+{
+    m_qtimer_stop_called = true;   
+}
+    
 TestPhoneUIQtView::TestPhoneUIQtView ()
 {    
 }
@@ -107,22 +115,22 @@
 
 void TestPhoneUIQtView::initTestCase ()
 {	
+    m_main_window = new HbMainWindow(); 
+    m_view = new PhoneUIQtView(*m_main_window);
 }
 
 void TestPhoneUIQtView::cleanupTestCase ()
 {
+    delete m_view;
 }
 
 void TestPhoneUIQtView::init ()
 {
-    m_main_window = new HbMainWindow(); 
-    m_view = new PhoneUIQtView(*m_main_window);
+    m_qtimer_stop_called = false;
 }
 
 void TestPhoneUIQtView::cleanup ()
 {
-    delete m_view;
-    delete m_main_window;
 }
 
 void TestPhoneUIQtView::testAddBubbleCommand ()
@@ -169,6 +177,7 @@
     m_view->showToolbar ();
     QCOMPARE (m_showCalled, true);
 }
+
 void TestPhoneUIQtView::testAddToolbarActions ()
 {
     m_actions.clear();
@@ -378,6 +387,14 @@
     return bubble;
 }
 
+void TestPhoneUIQtView::testLongEndKeyPressEvent()
+{
+    QSignalSpy spy(m_view, SIGNAL(endKeyLongPress()));
+    m_view->longEndKeyPressEvent();
+    QVERIFY(m_qtimer_stop_called == true);
+    QCOMPARE(spy.count(), 1);
+}
+
 PHONE_QT_VIEW_TEST_MAIN(TestPhoneUIQtView)
 Q_DECLARE_METATYPE(QKeyEvent *)
 #include "unit_tests.moc"
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuivoipextension/inc/cphonecustomizationvoip.h
--- a/phoneapp/phoneuivoipextension/inc/cphonecustomizationvoip.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuivoipextension/inc/cphonecustomizationvoip.h	Fri Apr 16 14:58:25 2010 +0300
@@ -37,9 +37,6 @@
 class CPhoneNewCallCmdHandler;
 class CEikMenuPaneItem;
 class CCoeEnv;
-// <-- QT PHONE START -->
-//class CPhoneVccHandler;
-// <-- QT PHONE END -->
 class CPhoneCallForwardQueryHandler;
 
 // CONSTANTS
@@ -171,7 +168,6 @@
         void HandleDialL( const TDesC& aNumber );
 
 // from base class MPhoneButtonCustomization
-// <-- QT PHONE START -->         
         /**
         * From MPhoneButtonCustomization.
         * Customizes touch pane buttons.
@@ -180,7 +176,6 @@
         */
         void CustomizeTouchPaneButtons(
                         /*MBubbleTouchPaneInterface& aTouchPane*/ );
-// <-- QT PHONE END -->         
     protected:
 
         CPhoneCustomizationVoip( 
@@ -286,17 +281,6 @@
         TBool CheckFeatureSupportByCallTypeL( 
                 TFeature aFeature );
 
-// <-- QT PHONE START -->         
-        /**
-        * Customizes touch pane buttons by extension.
-        * @leave KErrNotFound if extension not found.
-        * @param aTouchPane Interface to add and dimm
-        *                   bubble touch pane buttons.
-        */
-        /*void CustomizeTouchPaneUsingExtensionL(
-                        MBubbleTouchPaneInterface& aTouchPane );*/
-// <-- QT PHONE END --> 
-
         /**
         * Shows "Enabling %U service" wait note 
         */
@@ -409,13 +393,6 @@
         CPhoneNewCallCmdHandler* iNewCallCmdHandler;
         
         /**
-         * Pointer to VCC handler
-         */
-        // <-- QT PHONE START -->
-        //CPhoneVccHandler* iVccHandler;
-        // <-- QT PHONE END -->
-
-        /**
          * Call forward handler.
          */
         CPhoneCallForwardQueryHandler* iCallForwardHandler;
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuivoipextension/inc/cphoneextensionhandler.h
--- a/phoneapp/phoneuivoipextension/inc/cphoneextensionhandler.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuivoipextension/inc/cphoneextensionhandler.h	Fri Apr 16 14:58:25 2010 +0300
@@ -22,9 +22,6 @@
 // INCLUDES
 #include <telmenuextension.h>
 #include <spdefinitions.h>
-// <-- QT PHONE START --> 
-//#include "mphonebuttoncustomization.h"
-// <-- QT PHONE END -->
  
 // FORWARD DECLARATIONS
 class CPhMenuExtensionWrapper;
@@ -47,20 +44,6 @@
          * Creates the extension handler class
          */
         static CPhoneExtensionHandler* NewL();
-
-// <-- QT PHONE START -->         
-        /**
-         * Customizes touch pane buttons.
-         * @param aServiceId Service id of the call.
-         * @param aArray Active call array
-         * @param aTouchPane Interface to add and dimm
-         *                   bubble touch pane buttons.
-         */
-        /*void CustomizeTouchPaneButtonsL(
-                TUint aServiceId,
-                RArray<CTelMenuExtension::TCallInfo>& aArray,
-                MBubbleTouchPaneInterface& aTouchPane );*/
-// <-- QT PHONE END --> 
                         
         /**
          * Modifies menu when there is active call.
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuivoipextension/inc/tphonetouchpanewrapper.h
--- a/phoneapp/phoneuivoipextension/inc/tphonetouchpanewrapper.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuivoipextension/inc/tphonetouchpanewrapper.h	Fri Apr 16 14:58:25 2010 +0300
@@ -22,9 +22,6 @@
 // INCLUDES
 #include <e32base.h>
 #include <teltouchpaneextension.h>
-// <-- QT PHONE START --> 
-//#include <bmtouchpaneinterface.h>
-// <-- QT PHONE END --> 
 
 /**
  * Wrapper class to touch pane interface.
@@ -35,9 +32,7 @@
     {
 
 public:
-// <-- QT PHONE START --> 
-    TPhTouchPaneWrapper( /*MBubbleTouchPaneInterface& aTouchPane*/ );
-// <-- QT PHONE END -->
+    TPhTouchPaneWrapper();
      
     /**
      * Returns number of buttons in touch pane.
@@ -69,13 +64,6 @@
 
 private:
     
-    /**
-     * Reference to touch pane interface
-     * Not own.
-     */
-// <-- QT PHONE START --> 
-    //MBubbleTouchPaneInterface& iTouchPane;
-// <-- QT PHONE END -->     
     };
 
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuivoipextension/src/cphonecallforwardqueryhandler.cpp
--- a/phoneapp/phoneuivoipextension/src/cphonecallforwardqueryhandler.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuivoipextension/src/cphonecallforwardqueryhandler.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -34,11 +34,7 @@
 #include "cphonemainresourceresolver.h"
 #include "cphonestatemachinevoip.h"
 #include "tphonecmdparamstring.h"
-// <-- QT PHONE START --> 
 #include "phoneviewcommanddefinitions.h"
-// <-- QT PHONE END --> 
-
-
 
 // ======== MEMBER FUNCTIONS ========
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuivoipextension/src/cphonecustomizationvoip.cpp
--- a/phoneapp/phoneuivoipextension/src/cphonecustomizationvoip.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuivoipextension/src/cphonecustomizationvoip.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -22,15 +22,7 @@
 #include <spentry.h>
 #include <spproperty.h>
 #include <mpeengineinfo.h>
-// <-- QT PHONE START -->
-//#include <bmbubblemanager.h>
-// <-- QT PHONE END -->
-// <-- QT PHONE START --> 
-//#include <phoneui.rsg>
 #include "phoneresourceids.h"
-//#include <phoneui.rsg>
-//#include <phoneuivoip.rsg>
-// <-- QT PHONE END --> 
 #include <avkon.rsg>
 #include <StringLoader.h>
 #include <featmgr.h>
@@ -61,9 +53,6 @@
 #include "cphoneunattendedtransfercmdhandler.h"
 #include "tphonecmdparampointer.h"
 #include "cphonenewcallcmdhandler.h"
-// <-- QT PHONE START -->
-//#include "cphonevcchandler.h"
-// <-- QT PHONE END -->
 #include "cphonecallforwardqueryhandler.h"
 #include "cphonekeys.h"
 
@@ -101,9 +90,6 @@
     delete iPhoneViewCustomization;
     delete iTransferCmdHandler;
     delete iNewCallCmdHandler;
-    // <-- QT PHONE START -->
-    //delete iVccHandler;
-    // <-- QT PHONE END -->
     }
 
 
@@ -138,14 +124,7 @@
         
     iNewCallCmdHandler = CPhoneNewCallCmdHandler::NewL( 
         iStateMachine, iViewCommandHandle );
-    
-    // <-- QT PHONE START -->    
-    /*if ( FeatureManager::FeatureSupported( KFeatureIdFfVoiceCallContinuity ) )
-        {
-        iVccHandler = CPhoneVccHandler::NewL( iStateMachine, iViewCommandHandle );
-        }*/
-    // <-- QT PHONE END -->
-    
+        
     iCallForwardHandler = CPhoneCallForwardQueryHandler::NewL( 
         iStateMachine, iViewCommandHandle );
     }
@@ -323,18 +302,13 @@
                     {
                     // Telephone UI specification, 4.2.1 Call identification:
                     // display name is used as the CLI if available.
-// <-- QT PHONE START --> 
                     aCommandParam->SetCLIText( 
                         engineInfo.RemotePartyName( aCallId ), 
                         TPhoneCmdParamCallHeaderData::ERight );
-// <-- QT PHONE END --> 
                     // use line reserved for CNAP to show SIP URI
                     aCommandParam->SetCNAPText( 
                         engineInfo.RemotePhoneNumber( aCallId ), 
-// <-- QT PHONE START -->
-//                        CBubbleManager::ERight
                         TPhoneCmdParamCallHeaderData::ERight
-// <-- QT PHONE END -->
                        );
                     }
                 else
@@ -346,14 +320,9 @@
                         sipURI,
                         sipURIDomainPart );
                     
-// <-- QT PHONE START --> 
                     aCommandParam->SetCLIText( sipURI, TPhoneCmdParamCallHeaderData::ERight );
-// <-- QT PHONE END --> 
                     aCommandParam->SetCNAPText( sipURIDomainPart,
-// <-- QT PHONE START -->
-//                        CBubbleManager::ERight );
                         TPhoneCmdParamCallHeaderData::ERight );
-// <-- QT PHONE END -->
                     }
                 }
             else
@@ -362,17 +331,11 @@
                     {
                     // Display name not available, set incall number text as a
                     // CLI text. Text could be 'Call 1', 'Call 2', ...
-// <-- QT PHONE START --> 
                     aCommandParam->SetCLIText( aInCallNumberText,
                         TPhoneCmdParamCallHeaderData::ERight );
-// <-- QT PHONE END --> 
-                    // change clipping direction of CNAP text
                     aCommandParam->SetCNAPText( 
                         aCommandParam->CNAPText(),
-// <-- QT PHONE START -->
-//                        CBubbleManager::ERight );
                         TPhoneCmdParamCallHeaderData::ERight );
-// <-- QT PHONE END -->
                     }
                 }
             }
@@ -440,17 +403,11 @@
             break;
             
         case EPhoneCmdHandoverToGsm:
-            // <-- QT PHONE START -->
-            //iVccHandler->StartManualHandoverL( EPhoneVoIPWaitHandoverFromWlan );
-            // <-- QT PHONE END -->
             handled = ETrue;
             break;
 
         
         case EPhoneCmdHandoverToWlan:
-            // <-- QT PHONE START -->
-            //iVccHandler->StartManualHandoverL( EPhoneVoIPWaitHandoverFromGsm );
-            // <-- QT PHONE END -->
             handled = ETrue;
             break;
             
@@ -653,43 +610,11 @@
 // CPhoneCustomizationVoip::CustomizeTouchPaneButtons
 // -----------------------------------------------------------
 //
-// <-- QT PHONE START --> 
-void CPhoneCustomizationVoip::CustomizeTouchPaneButtons(
-        /*MBubbleTouchPaneInterface& aTouchPane*/ )
+void CPhoneCustomizationVoip::CustomizeTouchPaneButtons()
     {
     __LOGMETHODSTARTEND( PhoneUIVoIPExtension, 
         "CPhoneCustomizationVoip::CustomizeTouchPaneButtons" );
-    
-    /*TRAPD( err, CustomizeTouchPaneUsingExtensionL( aTouchPane ) );
-    
-    if ( KErrNone != err )
-        {
-        // Extension plugin didn't handle touch pane dimming.
-        TInt buttonCount = aTouchPane.NumberOfButtonsInPane();
-            
-        for ( TInt i=0; i < buttonCount; i++ )    
-            {
-            TInt commandId = aTouchPane.ButtonCommandId( i );
-        
-            switch ( commandId )
-                {              
-                case EPhoneInCallCmdCreateConference:
-                case EPhoneInCallCmdJoin:
-                    {
-                    if ( !IsFeatureSupported( EFeatureConference ) )
-                        {
-                        // Conference not supported -> set item dimmed
-                        aTouchPane.SetButtonDimmed( commandId, ETrue );
-                        }               
-                    break;  
-                    }
-                default:
-                    break;                    
-                } // switch
-            } // for    
-        }*/
     }
-// <-- QT PHONE END --> 
 
 // -----------------------------------------------------------
 // CPhoneCustomizationVoip::VoIPSupportedL
@@ -1140,36 +1065,6 @@
     return supported;
     }
 
-
-// -----------------------------------------------------------
-// CPhoneCustomizationVoip::CustomizeTouchPaneUsingExtensionL
-// -----------------------------------------------------------
-//
-// <-- QT PHONE START --> 
-/*void CPhoneCustomizationVoip::CustomizeTouchPaneUsingExtensionL(
-        MBubbleTouchPaneInterface& aTouchPane )
-    {
-    __LOGMETHODSTARTEND( PhoneUIVoIPExtension, 
-        "CPhoneCustomizationVoip::CustomizeTouchPaneUsingExtensionL" );
-    
-    RArray<CTelMenuExtension::TCallInfo> array;
-    CleanupClosePushL( array );
-    
-    GetActiveCallArrayL( array );
-
-    // Use extensions for touch pane buttons dimming 
-    iExtensionHandler->CustomizeTouchPaneButtonsL(
-            ServiceIdForActivestCallL( array ),
-            array,
-            aTouchPane );
-    
-    __PHONELOG( EBasic, PhoneUIVoIPExtension,
-        "CPhoneCustomizationVoip::ModifyInCallMenuL() plugin exists" );
-    
-    CleanupStack::PopAndDestroy( &array );    
-    }*/
-// <-- QT PHONE END --> 
-
 // -----------------------------------------------------------
 // CPhoneCustomizationVoip::LaunchEnablingServiceNoteL
 // -----------------------------------------------------------
@@ -1201,10 +1096,9 @@
     queryParam.SetDataText( &noteText );  
     queryParam.SetDefaultCba( R_AVKON_SOFTKEYS_CANCEL );
     
-    // <-- QT PHONE START -->
     const TInt KEnableServiceTimeOutInMilliSecs = 60000;
     queryParam.SetTimeOut( KEnableServiceTimeOutInMilliSecs );
-    // <-- QT PHONE END -->
+
     // configure custom command mappings for user responses
     queryParam.SetCbaCommandMapping( 
         EAknSoftkeyCancel, EPhoneCmdCancelServiceEnabling );
@@ -1411,25 +1305,6 @@
     {
     __LOGMETHODSTARTEND( PhoneUIVoIPExtension, 
         "CPhoneCustomizationVoip::AddHandoverMenuItemIfNeededL" );
-    
-    // Menu items to be added
-    // <-- QT PHONE START -->
-    /*if ( iVccHandler && AllowAlphaNumericMode() &&
-        ( aResourceId == R_PHONEUI_CALLHANDLING_INCALL_OPTIONS_MENU ||
-          aResourceId == R_PHONEUI_CALLWAITING_OPTIONS_MENU ||
-          aResourceId == R_PHONEUI_ACTIVEANDHELDCALL_OPTIONS_MENU ||
-          aResourceId == R_PHONEUI_ACTIVEANDHELDCONFCALL_OPTIONS_MENU ||
-          aResourceId == R_PHONEUI_CALLACTIVEHELDANDWAITING_OPTIONS_MENU 
-        ))
-        {        
-        RArray<CTelMenuExtension::TCallInfo> array;
-        CleanupClosePushL( array );
-        GetActiveCallArrayL( array );
-        
-        iVccHandler->AddHandoverMenuItemL( array, aResourceId, aMenuPane );
-        CleanupStack::PopAndDestroy( &array );   
-        }*/
-    // <-- QT PHONE END -->
     }
     
 // -----------------------------------------------------------
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuivoipextension/src/cphoneextensionhandler.cpp
--- a/phoneapp/phoneuivoipextension/src/cphoneextensionhandler.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuivoipextension/src/cphoneextensionhandler.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -21,11 +21,7 @@
 #include <spsettings.h>
 #include <spentry.h>
 #include <spproperty.h>
-// <-- QT PHONE START --> 
-//#include <phoneui.rsg>
 #include "phoneresourceids.h"
-//#include <phoneuivoip.rsg>
-// <-- QT PHONE END --> 
 #include <avkon.rsg>
 #include <StringLoader.h>
 
@@ -99,32 +95,6 @@
     return interface->HandleCommandL( aCommand );
     }
 
- 
-
-// -----------------------------------------------------------
-// CPhoneExtensionHandler::CustomizeTouchPaneButtonsL
-// -----------------------------------------------------------
-//
-// <-- QT PHONE START --> 
-/*void CPhoneExtensionHandler::CustomizeTouchPaneButtonsL(
-        TUint aServiceId,
-        RArray<CTelMenuExtension::TCallInfo>& aArray,
-        MBubbleTouchPaneInterface& aTouchPane )
-    {
-    __LOGMETHODSTARTEND( PhoneUIVoIPExtension, 
-        "CPhoneExtensionHandler::CustomizeTouchPaneButtonsL" );
-
-    // <-- QT PHONE START -->
-    CTelMenuExtension* interface = MenuExtensionL( aServiceId );
-    
-    TPhTouchPaneWrapper wrapper( aTouchPane );    
-    interface->ModifyExtensionsTouchPaneButtonsL(
-        aArray,
-        wrapper);
-    // <-- QT PHONE END -->
-    }*/
-// <-- QT PHONE END --> 
-
 // -----------------------------------------------------------
 // CPhoneExtensionHandler::ModifyInCallMenuL
 // -----------------------------------------------------------
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuivoipextension/src/cphoneresourceresolvervoip.cpp
--- a/phoneapp/phoneuivoipextension/src/cphoneresourceresolvervoip.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuivoipextension/src/cphoneresourceresolvervoip.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -19,10 +19,7 @@
 // INCLUDE FILES
 #include <bautils.h>
 #include <AknUtils.h>
-// <-- QT PHONE START -->
-//#include <phoneuivoip.rsg>
 #include "phoneresourceids.h"
-// <-- QT PHONE END -->
 #include <data_caging_path_literals.hrh>
 #include "cphoneresourceresolvervoip.h"
 #include "cphonemainresourceresolver.h"
@@ -47,20 +44,6 @@
 //
 void CPhoneResourceResolverVoIP::ConstructL()
     {
-    // Add resource file
-    // Create path to default resource file name
-// <-- QT PHONE START -->    
-    /*TFileName path( KDriveZ );
-    path.Append( KDC_APP_RESOURCE_DIR );
-    path.Append( KPhoneResourceFileVoIP );
-
-    RFs &fsSession= iEnv.FsSession();
-    BaflUtils::NearestLanguageFile( fsSession, path );
-    iVoIPResourceOffset = iEnv.AddResourceFileL( path );
-
-    LoadGSMResourcesL();*/
-// <-- QT PHONE END -->    
-    
     // Register resolver
     CPhoneMainResourceResolver::Instance()->RegisterResolver( this );
     }
@@ -83,9 +66,6 @@
 // Destructor
 CPhoneResourceResolverVoIP::~CPhoneResourceResolverVoIP()
     {
-// <-- QT PHONE START -->    
-//    iEnv.DeleteResourceFile( iVoIPResourceOffset );
-// <-- QT PHONE END -->    
     }
 
 // -----------------------------------------------------------------------------
@@ -211,9 +191,6 @@
             retVal = R_VOIP_CALL_TYPE_INTERNET;
             break;
         case EPhoneVoIPNumberAcqXSPCall:
-// <-- QT PHONE START -->    
-            //retVal = R_PHONEUI_NUMBERACQ_OPTIONS_CALL_MENU_ITEM_XSP;
-// <-- QT PHONE END -->
             break;
         case EPhoneVoIPUnattendedTransferOption:  
             retVal = R_VOIP_UNATTENDED_TRANSFER_OPTION;       
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuivoipextension/src/cphonestatealertingvoip.cpp
--- a/phoneapp/phoneuivoipextension/src/cphonestatealertingvoip.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuivoipextension/src/cphonestatealertingvoip.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -17,9 +17,6 @@
 
 
 // INCLUDES
-// <-- QT PHONE START -->
-//#include <bmbubblemanager.h>
-// <-- QT PHONE END -->
 #include <mpeengineinfo.h>
 
 #include "cphonestatealertingvoip.h"
@@ -117,9 +114,7 @@
 
     if( iStateMachine->PhoneEngineInfo()->CallType( aCallId ) == EPECallTypeVoIP )
         {
-// <-- QT PHONE START --> 
         SetCallHeaderType( EPECallTypeVoIP );
-// <-- QT PHONE END -->             
         }
 
     CPhoneAlerting::HandleConnectedL( aCallId );        
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuivoipextension/src/cphonestatecallsetupvoip.cpp
--- a/phoneapp/phoneuivoipextension/src/cphonestatecallsetupvoip.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuivoipextension/src/cphonestatecallsetupvoip.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -17,9 +17,6 @@
 
 
 // INCLUDES
-// <-- QT PHONE START -->
-//#include <bmbubblemanager.h>
-// <-- QT PHONE END -->
 #include <mpeengineinfo.h>
 
 #include "cphonestatecallsetupvoip.h"
@@ -116,9 +113,7 @@
 
     if( iStateMachine->PhoneEngineInfo()->CallType( aCallId ) == EPECallTypeVoIP )
         {
-// <-- QT PHONE START --> 
         SetCallHeaderType( EPECallTypeVoIP );   
-// <-- QT PHONE END -->         
         }
         
     CPhoneCallSetup::HandleConnectingL( aCallId );      
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuivoipextension/src/cphonestateidlevoip.cpp
--- a/phoneapp/phoneuivoipextension/src/cphonestateidlevoip.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuivoipextension/src/cphonestateidlevoip.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -195,9 +195,7 @@
 
     if( iStateMachine->PhoneEngineInfo()->CallType( aCallId ) == EPECallTypeVoIP )
         {
-// <-- QT PHONE START --> 
         SetCallHeaderType( EPECallTypeVoIP );       
-// <-- QT PHONE END -->     
         }
 
     CPhoneIdle::HandleDialingL( aCallId );
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuivoipextension/src/cphonetransferdialercontroller.cpp
--- a/phoneapp/phoneuivoipextension/src/cphonetransferdialercontroller.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuivoipextension/src/cphonetransferdialercontroller.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -22,22 +22,10 @@
 #include <akntoolbar.h>
 #include <AknsItemID.h>
 #include <StringLoader.h>
-
-
-// <-- QT PHONE START -->
-//#include <phoneui.mbg>
 #include "phoneresourceids.h"
-//#include <phoneui.rsg>
-//#include <phoneuivoip.rsg>
-// <-- QT PHONE END -->
-
 #include "phoneui.pan"
 #include "phonelogger.h"
-// <-- QT PHONE START -->
-//#include "cphonebubblewrapper.h" // For KDC_APP_BITMAP_DIR
 #include <data_caging_path_literals.hrh>
-// <-- QT PHONE END -->
-
 #include "cphonetransferdialercontroller.h"
 #include "cphonemainresourceresolver.h"
 #include "phonerssvoip.h"
@@ -48,33 +36,6 @@
 // CONSTANTS
 _LIT ( KPhoneMifFileName, "phoneui.mif" );
 
-// Number of buttons 
-const TInt KButtonCount = 2;
-
-// <-- QT PHONE START -->
-/*
-class TPhoneDialerToolbarButton 
-    {
-public:
-    TInt iIconIndex;
-    TInt iMaskIndex;
-    TInt iCommandId;    
-    };
-
-const TPhoneDialerToolbarButton bArray[KButtonCount] = 
-        {  
-            { EMbmPhoneuiQgn_indi_button_send_dtmf,
-              EMbmPhoneuiQgn_indi_button_send_dtmf_mask,
-              EPhoneCmdTransferDialerOk
-            },
-            { EMbmPhoneuiQgn_indi_dialer_contacts,
-              EMbmPhoneuiQgn_indi_dialer_contacts_mask,
-              EPhoneCmdTransferDialerSearch
-            }                 
-        };  
-        
- */
-// <-- QT PHONE END -->
 // ================= MEMBER FUNCTIONS =======================
 
 // C++ default constructor can NOT contain any code, that
@@ -126,31 +87,6 @@
                 "Toolbar control count:=%d", 
                 aToolbar.CountComponentControls());
         iToolbar = &aToolbar;
-        // Create transfer specific buttons and add them to the 
-        // toolbar starting from index 0
- // <-- QT PHONE START --> 
-        //CAknButton* button( NULL );
-  
- /*
-        for( TInt i = 0; i < KButtonCount; i++ )
-            {
-           
-            TAknsItemID skinId = SkinId( bArray[i].iIconIndex );
-            // Load tooltip text.
-            HBufC* tooltipText = GetTooltipTextL( bArray[i].iCommandId );  
-            CleanupStack::PushL( tooltipText );
-            button = CreateButtonLC(
-                    bArray[i].iIconIndex, 
-                    bArray[i].iMaskIndex, 
-                    *tooltipText, 
-                    skinId );
-            // Toolbar takes ownership of the button                    
-            iToolbar->AddItemL( button, EAknCtButton, bArray[i].iCommandId, 0, i );
-            CleanupStack::Pop( button );
-            CleanupStack::PopAndDestroy( tooltipText );
-            } 
-            */
- // <-- QT PHONE END -->        
         iIsInitialized = ETrue;
         }
    
@@ -224,20 +160,12 @@
     __LOGMETHODSTARTEND( PhoneUIVoIPExtension, 
         "CPhoneTransferDialerController::ShowButtons()");
     __ASSERT_DEBUG( iToolbar, Panic( EPhoneCtrlInvariant ) );
-    for( TInt i = 0; i < KButtonCount; i++ )
-        {
-// <-- QT PHONE START -->   
-        //iToolbar->HideItem( bArray[ i ].iCommandId, !aShow, EFalse );
-        }
     if ( aShow )
         {
         iToolbar->SetItemDimmed( EPhoneCmdTransferDialerOk, ETrue, EFalse ); 
         iToolbar->SetItemDimmed( EPhoneCmdTransferDialerSearch, EFalse, EFalse ); 
         iToolbar->SetItemDimmed( EPhoneDialerCmdClear, ETrue, EFalse ); 
         }
-    
-    //iToolbar->DrawDeferred();
-// <-- QT PHONE END --> 
     }
 
 // ---------------------------------------------------------------------------
@@ -314,23 +242,6 @@
 TAknsItemID CPhoneTransferDialerController::SkinId( TInt /*aIconIndex*/ ) const
     {
     TAknsItemID skinId;
- // <-- QT PHONE START -->
- /*
-    switch ( aIconIndex )
-        {
-        
-        case EMbmPhoneuiQgn_indi_button_send_dtmf:
-            skinId = KAknsIIDQgnIndiButtonSendDtmf;
-            break;
-        case EMbmPhoneuiQgn_indi_dialer_contacts:
-            skinId = KAknsIIDQgnIndiDialerContacts;
-            break;                     
-        default:
-            skinId = KAknsIIDNone;        
-            break;            
-        }
-  */
-  skinId = KAknsIIDNone; 
-// <-- QT PHONE END -->     
+    skinId = KAknsIIDNone; 
     return skinId;  
     }
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuivoipextension/src/cphonevcchandler.cpp
--- a/phoneapp/phoneuivoipextension/src/cphonevcchandler.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuivoipextension/src/cphonevcchandler.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -16,12 +16,7 @@
 */
 
 // INCLUDES
-// <-- QT PHONE START --> 
-//#include <phoneui.rsg>
 #include "phoneresourceids.h"
-//#include <avkon.rsg>
-//#include <phoneuivoip.rsg>
-// <-- QT PHONE END --> 
 #include <StringLoader.h>
 #include <avkon.rsg>
 #include <mpeengineinfo.h>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuivoipextension/src/cphonevoiperrormessageshandler.cpp
--- a/phoneapp/phoneuivoipextension/src/cphonevoiperrormessageshandler.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuivoipextension/src/cphonevoiperrormessageshandler.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -20,18 +20,11 @@
 #include <ccpdefs.h>
 #include <mpeengineinfo.h>
 #include <StringLoader.h>
-
-// <-- QT PHONE START -->
-//#include <ccherror.h>
-// <-- QT PHONE END -->
-
 #include <spsettings.h>
 #include <spentry.h>
-
 #include <telephonydomainpskeys.h>
 #include <UikonInternalPSKeys.h>
 #include <aknnotedialog.h>
-
 #include "cphonevoiperrormessageshandler.h"
 #include "cphonemainerrormessageshandler.h"
 #include "cphoneerrormessageshandler.h"
@@ -382,60 +375,7 @@
     __LOGMETHODSTARTEND( PhoneUIVoIPExtension, 
               "CPhoneVoIPErrorMessagesHandler::ShowRegistrationErrorNotesL()" );
     // Dismiss service enabling wait note
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveGlobalWaitNote );
-    
-    // <-- QT PHONE START -->
-    /*switch ( aErrorCode )
-        {
-        case KCCHErrorAccessPointNotDefined:
-            {
-            TUint32 serviceId = 
-                iStateMachine->PhoneEngineInfo()->ServiceIdCommand();
-            ShowErrorNoteWithServiceNameL( EPhoneVoIPNoConnectionsDefined,
-                serviceId );
-            break;
-            }
-        case KCCHErrorBandwidthInsufficient:   
-            {
-            TUint32 serviceId = 
-                iStateMachine->PhoneEngineInfo()->ServiceIdCommand();
-            ShowErrorNoteWithServiceNameL( EPhoneVoIPCallsNotSupported,
-                serviceId );
-            break;
-            }
-        case KCCHErrorInvalidSettings:
-            {
-            TUint32 serviceId = 
-                iStateMachine->PhoneEngineInfo()->ServiceIdCommand();
-            ShowErrorNoteWithServiceNameL( EPhoneVoIPDefectiveSettings,
-                serviceId );
-            break;
-            }
-        case KCCHErrorAuthenticationFailed:
-            {
-            SendGlobalErrorNoteL( EPhoneVoIPAuthenticationFailed );
-            break;
-            }
-        case KCCHErrorInvalidIap:
-        case KCCHErrorNetworkLost:
-        case KCCHErrorServiceNotResponding:
-            {
-            TUint32 serviceId = 
-                iStateMachine->PhoneEngineInfo()->ServiceIdCommand();
-            ShowErrorNoteWithServiceNameL( EPhoneVoIPNoConnectionsAvailable,
-                serviceId );
-            break;
-            }
-        default:
-            {
-            TUint32 serviceId = 
-               iStateMachine->PhoneEngineInfo()->ServiceIdCommand();
-            ShowErrorNoteWithServiceNameL( EPhoneVoIPServiceUnavailable,
-               serviceId );
-            break;
-            }
-        }*/
-    // <-- QT PHONE END -->
+    iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveGlobalWaitNote );    
     }
 
 // ---------------------------------------------------------
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuivoipextension/src/tphonetouchpanewrapper.cpp
--- a/phoneapp/phoneuivoipextension/src/tphonetouchpanewrapper.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuivoipextension/src/tphonetouchpanewrapper.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -28,10 +28,7 @@
 // might leave.
 // -----------------------------------------------------------------------------
 //
-// <-- QT PHONE START --> 
-TPhTouchPaneWrapper::TPhTouchPaneWrapper( 
-        /*MBubbleTouchPaneInterface& aTouchPane*/ ) :
-        //iTouchPane( aTouchPane )    
+TPhTouchPaneWrapper::TPhTouchPaneWrapper()
     {
     }
 
@@ -42,7 +39,7 @@
 //
 TInt TPhTouchPaneWrapper::NumberOfButtonsInPane() const
     {
-    return KErrNotSupported; //iTouchPane.NumberOfButtonsInPane();
+    return KErrNotSupported;
     }
 
 // ---------------------------------------------------------
@@ -53,7 +50,7 @@
 TInt TPhTouchPaneWrapper::ButtonCommandId( 
         TInt /*aButtonIndex*/ ) const
     {
-    return KErrNotSupported; //iTouchPane.ButtonCommandId( aButtonIndex );
+    return KErrNotSupported;
     }
 
 // ---------------------------------------------------------
@@ -63,9 +60,6 @@
 //
 void TPhTouchPaneWrapper::SetButtonDimmed( TInt /*aCommand*/, TBool /*aDimmed*/ )
    {
-   //iTouchPane.SetButtonDimmed( aCommand, aDimmed );   
    }
 
-// <-- QT PHONE END --> 
-
 //  End of File
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/silenceactionplugin/group/bld.inf
--- a/phoneapp/silenceactionplugin/group/bld.inf	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/silenceactionplugin/group/bld.inf	Fri Apr 16 14:58:25 2010 +0300
@@ -29,7 +29,7 @@
 ../data/silence.rul\
     /epoc32/data/z/private/10282bc4/rules/silence.rul
 
-../data/silenceactionplugin_stub.SIS\
+../data/silenceactionplugin_stub.sis\
     /epoc32/data/z/system/install/silenceactionplugin_stub.sis
     
 ../rom/silenceactionplugin.iby\
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/silenceactionplugin/rom/silenceactionplugin.iby
--- a/phoneapp/silenceactionplugin/rom/silenceactionplugin.iby	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/silenceactionplugin/rom/silenceactionplugin.iby	Fri Apr 16 14:58:25 2010 +0300
@@ -23,7 +23,7 @@
 
 ECOM_PLUGIN( silenceactionplugin.dll, silenceactionplugin.rsc )
 data=\epoc32\data\Z\private\10282BC4\Rules\silence.rul    private\10282BC4\Rules\silence.rul
-data=ZSYSTEM\install\silenceactionplugin_stub.SIS     System\Install\silenceactionplugin_stub.SIS
+data=ZSYSTEM\install\silenceactionplugin_stub.sis     System\Install\silenceactionplugin_stub.sis
 
 #endif  // RD_CONTEXT_FRAMEWORK
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/audiohandling/src/cpeaudiodtmftoneplayer.cpp
--- a/phoneengine/audiohandling/src/cpeaudiodtmftoneplayer.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/audiohandling/src/cpeaudiodtmftoneplayer.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -32,9 +32,6 @@
 // None
 
 // CONSTANTS
-// <-- QT PHONE START --> 
-//const TInt KDtmfSilent = 0;
-// <-- QT PHONE END --> 
 const TInt KDtmfPauseAfterTone = 100000;
 const TInt KDtmfToneZero = 0;
 const TInt KBufSize = 10;
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/audiohandling/src/cpeaudioroutingmonitor.cpp
--- a/phoneengine/audiohandling/src/cpeaudioroutingmonitor.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/audiohandling/src/cpeaudioroutingmonitor.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -18,7 +18,7 @@
 
 
 // INCLUDES
-#include <talogger.h>
+#include "talogger.h"
 #include "cpeaudioroutingmonitor.h"
 #include "cpeaudiodata.h"
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/callhandling/inc/cpegprstermination.h
--- a/phoneengine/callhandling/inc/cpegprstermination.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/callhandling/inc/cpegprstermination.h	Fri Apr 16 14:58:25 2010 +0300
@@ -23,10 +23,6 @@
 //  INCLUDES
 #include    <e32base.h>
 
-// FORWARD DECLARATIONS
-// <-- QT PHONE START --> 
-//class CCoUtlInterface;
-// <-- QT PHONE END -->
  
 // CLASS DECLARATION
 
@@ -76,10 +72,6 @@
         void DoCancel();
 
     private:
-// <-- QT PHONE START --> 
-        // Owned GPRS termination instance.
-        //CCoUtlInterface* iInterface;
-// <-- QT PHONE END --> 
 
     };
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/callhandling/src/cpecallhandling.cpp
--- a/phoneengine/callhandling/src/cpecallhandling.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/callhandling/src/cpecallhandling.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -471,7 +471,7 @@
                 {
                 MCCECall& call = callData->Call();
                 iModel.DataStore()->SetRemotePartyName( call.RemotePartyName(), aCallId );
-                iModel.DataStore()->SetRemotePhoneNumber( call.RemoteParty(), aCallId );
+                iModel.DataStore()->SetRemotePhoneNumber( call.RemoteParty().Left( KPEPhoneNumberMaxLength ), aCallId );
                 iModel.DataStore()->SetCallIndex(call.CallIndex(), aCallId );
                 }
             break;
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/callhandling/src/cpegprstermination.cpp
--- a/phoneengine/callhandling/src/cpegprstermination.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/callhandling/src/cpegprstermination.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -16,10 +16,8 @@
 */
 
 
-// <-- QT PHONE START --> 
 // INCLUDE FILES
 #include "cpegprstermination.h"
-// #include<ccoutlinterface.h> <CCoUtlInterface.h>
 #include <talogger.h>
 
 // ============================ MEMBER FUNCTIONS ===============================
@@ -43,7 +41,6 @@
     {
     TEFLOGSTRING( KTAOBJECT, "cpecall: CPEGprsTermination::~CPEGprsTermination" );
     Cancel();
-    //delete iInterface;
     }
 
 // -----------------------------------------------------------------------------
@@ -53,15 +50,6 @@
 void CPEGprsTermination::StartL()
     {
     TEFLOGSTRING( KTAINT, "cpecall: CPEGprsTermination::StartL" );
-
-    /*Cancel();
-    delete iInterface;
-    iInterface = NULL;
-
-    iInterface = CCoUtlInterface::NewL();
-    TEFLOGSTRING( KTAREQOUT, "cpecall: CPEGprsTermination::StartL CCoUtlInterface::Terminate()" );
-    iInterface->Terminate( iStatus );
-    SetActive();*/
     }
 
 // -----------------------------------------------------------------------------
@@ -71,20 +59,6 @@
 TBool CPEGprsTermination::IsTerminating() const
     {
     TEFLOGSTRING( KTAINT, "cpecall: CPEGprsTermination::IsTerminating" );
-    /*if ( !iInterface )
-        {
-        return EFalse;
-        }
-    else
-        {
-        CCoUtlInterface::TState current = 
-            iInterface->CurrentState();
-            
-        return 
-            ( current != CCoUtlInterface::EIdle ) &&
-            ( current != CCoUtlInterface::EConfirm );
-        }*/
-    
     return EFalse;
     }
 
@@ -95,8 +69,6 @@
 void CPEGprsTermination::RunL()
     {
     TEFLOGSTRING2( KTAREQEND, "cpecall: CPEGprsTermination::RunL status: %d", iStatus.Int() );
-    /*delete iInterface;
-    iInterface = NULL;*/
     }
 
 // -----------------------------------------------------------------------------
@@ -106,12 +78,6 @@
 void CPEGprsTermination::DoCancel()
     {
     TEFLOGSTRING( KTAREQEND, "cpecall: CPEGprsTermination::DoCancel" );
-    /*if( iInterface )
-        {
-        iInterface->Cancel();
-        }*/
     }
 
-// <-- QT PHONE END -->
- 
 //  End of File  
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/engineinfo/inc/cpeengineinfoimpl.h
--- a/phoneengine/engineinfo/inc/cpeengineinfoimpl.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/engineinfo/inc/cpeengineinfoimpl.h	Fri Apr 16 14:58:25 2010 +0300
@@ -1530,7 +1530,6 @@
          */
         void SetCallOrigin( TPECallOrigin aOrigin, TInt aCallId );
       
-// <-- QT PHONE START -->
         /**
         * Sets call Phonebook contact identifier.
         * @param aContactId is the contact identifier for a call
@@ -1541,7 +1540,6 @@
          * Returns Phonebook contact identifier.
          */
         TInt ContactId2() const;
-// <-- QT PHONE END -->
           
     private:
           /**
@@ -1581,12 +1579,10 @@
          */
         CCCECallParameters *iCallParams;
 
-// <-- QT PHONE START -->
         /**
          * Phonebook contact identifier.
          */
         TInt iContactId;
-// <-- QT PHONE END -->
     };
 
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/engineinfo/inc/mpeengineinfo.h
--- a/phoneengine/engineinfo/inc/mpeengineinfo.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/engineinfo/inc/mpeengineinfo.h	Fri Apr 16 14:58:25 2010 +0300
@@ -22,9 +22,7 @@
 
 //  INCLUDES
 #include <pevirtualengine.h>
-// <-- QT PHONE START -->
 #include "mpecallsettersif.h" 
-// <-- QT PHONE END --> 
 
 // CONSTANTS
 // None
@@ -43,9 +41,7 @@
 *  @lib phoneengine.lib
 *  @since Series 60 4.0
 */
-// <-- QT PHONE START --> 
 NONSHARABLE_CLASS( MPEEngineInfo ) : public MPECallSettersIF
-// <-- QT PHONE END --> 
     {
 
     public:
@@ -703,12 +699,11 @@
          */
         virtual TPECallOrigin CallOrigin( const TInt aCallId ) const = 0;
         
-// <-- QT PHONE START --> 
         /**
          * Returns Phonebook contact identifier.
          */
         virtual TInt ContactId2 () const = 0;
-// <-- QT PHONE END -->  
+
     }; // MPEEngineInfo
     
 #endif      //MPEENGINEINFO_H
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/engineinfo/src/cpeengineinfoimpl.cpp
--- a/phoneengine/engineinfo/src/cpeengineinfoimpl.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/engineinfo/src/cpeengineinfoimpl.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -35,10 +35,7 @@
 //
 CPEEngineInfoImpl::CPEEngineInfoImpl()
     : iCurrentCalls( KPEMaximumNumberOfCalls )
-// <-- QT PHONE START -->
     ,iContactId( KErrNotFound )
-// <-- QT PHONE END -->
-
     {
     iCallCommandInfo.iPhoneNumber = KNullDesC;
     iCallCommandInfo.iCallId = 0;
@@ -104,10 +101,8 @@
     iBasicInfo.iSwitchToOngoing = EFalse;
     iConferenceCallInfo.iConferenceCallState = EPEStateConferenceIdle;
     
-    // <-- QT PHONE START --> 
     //TODO remove after profile information is available
     iBasicInfo.iRingingVolume = 10;
-    // <-- QT PHONE END --> 
     }
 
 // -----------------------------------------------------------------------------
@@ -2624,7 +2619,7 @@
       }
     return stateExists;
     }
-// <-- QT PHONE START -->
+
 // -----------------------------------------------------------------------------
 // CPEEngineInfoImpl::SetContactId
 // -----------------------------------------------------------------------------
@@ -2645,6 +2640,5 @@
     TEFLOGSTRING2( KTAINT, "ContactId: %d", iContactId );
     return iContactId;      
     }
-// <-- QT PHONE END -->
 
 // End of File
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/group/bld.inf
--- a/phoneengine/group/bld.inf	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/group/bld.inf	Fri Apr 16 14:58:25 2010 +0300
@@ -18,14 +18,9 @@
       
 #include "../audiohandling/group/bld.inf"
 #include "../callhandling/group/bld.inf"
-// <-- QT PHONE START -->         
 #include "../contacthandling2/group/bld.inf"
-// <-- QT PHONE END -->         
 #include "../loghandling/group/bld.inf"
 #include "../engineinfo/group/bld.inf"
-// <-- QT PHONE START -->
-//#include "../phonemodel/group/bld.inf"
-// <-- QT PHONE END -->
 #include "../servicehandling/group/bld.inf"
 
 // End of File
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/loghandling/src/cpelogevent.cpp
--- a/phoneengine/loghandling/src/cpelogevent.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/loghandling/src/cpelogevent.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -21,9 +21,6 @@
 #include "cpeloginfo.h"
 #include "cpeloghandling.h"
 #include "cpeloghandlingcommand.h"
-// <-- QT PHONE START -->
-//#include <pbkfields.hrh>
-// <-- QT PHONE END -->
 #include <talogger.h>
 #include <logcli.h>
 #include <LogsApiConsts.h>
@@ -306,8 +303,6 @@
     TBuf<KPhonebookTypeIdLength> subject;
     subject.Zero();
 
-// <-- QT PHONE START -->
-    
     switch ( iLogInfo->PhoneNumberId() )
         {
         case EPEMobileNumber:
@@ -332,9 +327,6 @@
             subject.AppendNum( EPEUnknownNumber );
             break;
         }
-        
-// <-- QT PHONE END -->
-    
 
     if ( subject.Length() > 0 )
         {
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/parserrecognizer/parserrecognizer.pro
--- a/phoneengine/parserrecognizer/parserrecognizer.pro	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/parserrecognizer/parserrecognizer.pro	Fri Apr 16 14:58:25 2010 +0300
@@ -25,7 +25,7 @@
     DEFINES += BUILD_PARSERRECOGNIZER
     
     INCLUDEPATH += ../../inc \
-                   ../phonemodel/inc \
+                   ../phonemodel/inc 
     INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
     
     parserDefFiles = \
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/parserrecognizer/src/parserrecognizer.cpp
--- a/phoneengine/parserrecognizer/src/parserrecognizer.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/parserrecognizer/src/parserrecognizer.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -16,10 +16,10 @@
 *
 */
 
-#include <QDebug>
 #include <xqservicerequest.h>
 #include <pevirtualengine.h>
 #include "parserrecognizer.h"
+#include "qtphonelog.h"
 
 ParserRecognizer::ParserRecognizer(QObject* parent) : QObject (parent)
 {
@@ -32,7 +32,7 @@
 void ParserRecognizer::sendMessage(const int message, const int callId)
 {
     Q_UNUSED(callId); // for now
-    qDebug () << "ParserRecognizer::sendMessage message:" << message;
+    PHONE_DEBUG2("ParserRecognizer::sendMessage message:", message);
     QString api;
     QString method;
     bool recognized = true;
@@ -94,8 +94,8 @@
     }
     
     if(recognized) {
-        qDebug () << "ParserRecognizer::sendMessage api:" << api;
-        qDebug () << "ParserRecognizer::sendMessage method:" << method;
+        PHONE_DEBUG2("ParserRecognizer::sendMessage api:", api);
+        PHONE_DEBUG2("ParserRecognizer::sendMessage method:", method);
         XQServiceRequest snd(api, method);
         QVariant err;
         snd.send(err);
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/phonecntfinder2/rom/phonecntfinder.iby
--- a/phoneengine/phonecntfinder2/rom/phonecntfinder.iby	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/phonecntfinder2/rom/phonecntfinder.iby	Fri Apr 16 14:58:25 2010 +0300
@@ -19,6 +19,6 @@
 #define __PHONECNTFINDER_IBY__
 
 file=ABI_DIR\BUILD_DIR\phonecntfinder.dll           SHARED_LIB_DIR\phonecntfinder.dll
-data=ZSYSTEM\install\phonecntfinder_stub.SIS        System\Install\phonecntfinder_stub.SIS
+data=ZSYSTEM\install\phonecntfinder_stub.sis        System\Install\phonecntfinder_stub.sis
 
 #endif
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/phonecntfinder2/src/cphcntcontactidimpl2.cpp
--- a/phoneengine/phonecntfinder2/src/cphcntcontactidimpl2.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/phonecntfinder2/src/cphcntcontactidimpl2.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -14,7 +14,6 @@
 * Description:  Wraps the QContact for the legacy handling in the phone engine
 */
 
-#include <QDebug>
 #include <e32base.h>
 #include <utf.h>
 #include <qcontact.h>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/phonecntfinder2/src/cphcntfactoryimpl2.cpp
--- a/phoneengine/phonecntfinder2/src/cphcntfactoryimpl2.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/phonecntfinder2/src/cphcntfactoryimpl2.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -17,7 +17,6 @@
 
 
 // INCLUDE FILES
-#include    <QDebug>
 #include    <qglobal.h>
 #include    <e32cmn.h>  
 #include    <qcontactmanager.h>
@@ -27,6 +26,7 @@
 #include    <QString>
 #include    "cphcntfactoryimpl2.h"
 #include    "cphcntmatcherimpl2.h"
+#include    "qtphonelog.h"
 
 
 static const QString SYMBIAN_CONTACTS_BACKEND  = "symbian";
@@ -39,13 +39,13 @@
 //
 CPhCntFactoryImpl2* CPhCntFactoryImpl2::NewL()
     {
-    qDebug()<<"CPhCntFactoryImpl2::NewL - enter";
+    PHONE_DEBUG("CPhCntFactoryImpl2::NewL - enter");
     CPhCntFactoryImpl2* self = new (ELeave) CPhCntFactoryImpl2;
 
     CleanupStack::PushL( self );
     self->ConstructL();
     CleanupStack::Pop();
-    qDebug()<<"CPhCntFactoryImpl2::cntfinder2 is ready. lets rock.";
+    PHONE_DEBUG("CPhCntFactoryImpl2::cntfinder2 is ready. lets rock.");
     return self;
     }
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/phonecntfinder2/src/cphcntmatch2.cpp
--- a/phoneengine/phonecntfinder2/src/cphcntmatch2.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/phonecntfinder2/src/cphcntmatch2.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -14,7 +14,6 @@
 * Description:
 *
 */
-#include <QDebug>
 #include <qcontact.h>
 #include <qcontactdetail.h>
 #include <qcontactname.h>
@@ -23,6 +22,7 @@
 #include <qtcontactsglobal.h>
 #include "cphcntmatch2.h"
 #include "cphcntcontactidimpl2.h"
+#include "qtphonelog.h"
 
 // ======== MEMBER FUNCTIONS ========
 
@@ -31,7 +31,7 @@
 // ---------------------------------------------------------------------------
 //
 CPhCntMatch2::CPhCntMatch2(const QContact aContact):
-iContact(aContact), iNumber(NULL)
+iContact(aContact), iNumber(NULL), iContactId(NULL), iDummyArray(NULL)
     {
     }
 
@@ -267,7 +267,7 @@
         {
         returnValue = details.first().value(key);        
         }
-    qDebug()<<"CPhCntMatch2::FieldValue:: key is : "<< key << "..value is : "  << returnValue;
+    PHONE_DEBUG4("CPhCntMatch2::FieldValue:: key is :", key, "..value is :", returnValue);
     return returnValue.utf16();    
 }
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/phonecntfinder2/src/cphcntmatcherimpl2.cpp
--- a/phoneengine/phonecntfinder2/src/cphcntmatcherimpl2.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/phonecntfinder2/src/cphcntmatcherimpl2.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -15,7 +15,6 @@
 *
 */
 
-#include <QDebug>
 #include <QList>
 #include <QString>
 #include <QChar>
@@ -27,7 +26,7 @@
 
 #include "cphcntmatcherimpl2.h"
 #include "cphcntmatch2.h"
-
+#include "qtphonelog.h"
 
 
 
@@ -70,8 +69,8 @@
     filter.setDetailDefinitionName(QContactPhoneNumber::DefinitionName, QContactPhoneNumber::FieldNumber);
     filter.setValue(telnumber);
     QList<QContactLocalId> contacts;
-    contacts = iContactManager->contacts(filter);
-    qDebug()<<"CPhCntMatcherImpl2::MatchNumber(): matched contacts count is: " << contacts.count();
+    contacts = iContactManager->contactIds(filter);
+    PHONE_DEBUG2("CPhCntMatcherImpl2::MatchNumber(): matched contacts count is:", contacts.count());
     //only 1 exact match returns a contact to be used 
     if (contacts.isEmpty() || contacts.count() > 1 )
         {
@@ -85,7 +84,7 @@
         if (!err)
         {
             aMatch = iMatch;
-            qDebug()<<"CPhCntMatcherImpl2::MatchNumber() -- matched contact is ready";
+            PHONE_DEBUG("CPhCntMatcherImpl2::MatchNumber() -- matched contact is ready");
         }
         return err;
         }
@@ -177,7 +176,7 @@
     if (!err)
     {   
         aMatch = iMatch;
-        qDebug()<<"CPhCntMatcherImpl2::MatchNumber(ContactId) -- matched contact is ready";
+        PHONE_DEBUG("CPhCntMatcherImpl2::MatchNumber(ContactId) -- matched contact is ready");
     }
     return err;
     }
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/phonemodel/api_headers.pri
--- a/phoneengine/phonemodel/api_headers.pri	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/phonemodel/api_headers.pri	Fri Apr 16 14:58:25 2010 +0300
@@ -26,4 +26,5 @@
                           ./inc/mpephonemodelinternal.h \
                           ./inc/mpeexternaldatahandler.h \
                           ./inc/talogger.h \
-                          ./inc/pepanic.pan
+                          ./inc/pepanic.pan \
+                          ./inc/qtphonelog.h
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/phonemodel/conf/s60telephony.confml
Binary file phoneengine/phonemodel/conf/s60telephony.confml has changed
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/phonemodel/inc/cpecalldurationdisplaysettingmonitor.h
--- a/phoneengine/phonemodel/inc/cpecalldurationdisplaysettingmonitor.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/phonemodel/inc/cpecalldurationdisplaysettingmonitor.h	Fri Apr 16 14:58:25 2010 +0300
@@ -37,6 +37,7 @@
 public:
     static CPECallDurationDisplaySettingMonitor* NewL();
     ~CPECallDurationDisplaySettingMonitor();
+    TInt GetValue(TInt& aValue);
 protected: // From base class
     virtual void UpdateL();
 protected:
@@ -44,6 +45,7 @@
     void ConstructL();
 private:
     TBool iDisplayCallDuration;
+    TInt iError;
 };
 
 #endif // CPECALLDURATIONDISPLAYSETTINGMONITOR_H
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/phonemodel/inc/cpedevicemodehandler.h
--- a/phoneengine/phonemodel/inc/cpedevicemodehandler.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/phonemodel/inc/cpedevicemodehandler.h	Fri Apr 16 14:58:25 2010 +0300
@@ -22,9 +22,7 @@
 
 //  INCLUDES
 #include <e32base.h>
-// <-- QT PHONE START --> 
 #include <mphonedevicemodeobserver.h>
-// <-- QT PHONE END --> 
 
 // FORWARD DECLARATIONS
 class MPECallHandling;
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/phonemodel/inc/cpemessagehandler.h
--- a/phoneengine/phonemodel/inc/cpemessagehandler.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/phonemodel/inc/cpemessagehandler.h	Fri Apr 16 14:58:25 2010 +0300
@@ -22,14 +22,12 @@
 
 //  INCLUDES
 #include <pevirtualengine.h>
-#include "DosSvrServices.h"
+#include <DosSvrServices.h>
 #include <cphcltcommandhandler.h>
 #include <cphcltdialdata.h>
 
 #include "mpecallhandling.h"
-// <-- QT PHONE START -->
 #include "mpecallcontrolif.h" 
-// <-- QT PHONE END --> 
 
 // CONSTANTS
 const TInt KModeNormal = 0;  // Normal System mode  
@@ -107,9 +105,7 @@
 *  @lib phoneenginebase.dll
 *  @since S60_5.0
 */
-// <-- QT PHONE START --> 
 NONSHARABLE_CLASS( CPEMessageHandler ) : public CBase, public MPECallControlIF
-// <-- QT PHONE END --> 
     {
     public:  // Destructor
 
@@ -597,13 +593,11 @@
         */     
         void HandleDisableService();
 
-// <-- QT PHONE START -->   
         /**
         * Handle dial service call
         */ 
         TInt HandleDialServiceCall(
             const TBool aClientCall );
-// <-- QT PHONE END -->
         
     private: // New functions
         
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/phonemodel/inc/cpeparserphonenumberhandler.h
--- a/phoneengine/phonemodel/inc/cpeparserphonenumberhandler.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/phonemodel/inc/cpeparserphonenumberhandler.h	Fri Apr 16 14:58:25 2010 +0300
@@ -80,11 +80,12 @@
     
         /**
         * Removes non-GSM standard postfix characters before dialling attempt.
+        * Leaves with ECCPErrorInvalidPhoneNumber if recognizes + char.
         * @since 5.0
         * @param aPostfix postfix to modify.
         * @return modified postfix.
         */
-        TPtrC FilterPostfix( TPtrC aPostfix );
+        TPtrC FilterPostfixL( TPtrC aPostfix );
 
         /**
         * Checks if phone is offline
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/phonemodel/inc/cpephonemodel.h
--- a/phoneengine/phonemodel/inc/cpephonemodel.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/phonemodel/inc/cpephonemodel.h	Fri Apr 16 14:58:25 2010 +0300
@@ -46,10 +46,8 @@
 class CPEAudioFactory;
 class MPEServiceHandling;
 class CPERemotePartyInfoMediator;
-// <-- QT PHONE START --> 
 class PhoneServices;
 class ParserRecognizer;
-// <-- QT PHONE END --> 
 
 // CLASS DECLARATION
 
@@ -80,10 +78,8 @@
             EPELogHandlingPhaseTwo,
             EPEContactHandlingPhaseTwo,
             EPEMediatorCommandHandler
-// <-- QT PHONE START --> 
            ,EPEPhoneServices
            ,EPEParserRecognizer
-// <-- QT PHONE END --> 
             };
 
         /**
@@ -330,11 +326,9 @@
         // Mediator command handler
         CPERemotePartyInfoMediator* iMediatorCommunicationHandler;
         
-// <-- QT PHONE START --> 
         // Phone Services offered via Qt Highway
         PhoneServices* iPhoneServices;
         ParserRecognizer* iParserRecognizer;
-// <-- QT PHONE END --> 
 
     };
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/phonemodel/inc/pevirtualengine.h
--- a/phoneengine/phonemodel/inc/pevirtualengine.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/phonemodel/inc/pevirtualengine.h	Fri Apr 16 14:58:25 2010 +0300
@@ -845,9 +845,7 @@
 
         EPEMessageDoUnattendedTransfer,
         EPEMessageForwardCallToAddress,
-// <-- QT PHONE START --> 
         EPEMessageDialServiceCall,
-// <-- QT PHONE END --> 
         // Contact messages                   3000 - 3999
 
         // Error messages                     4000 - 4999
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/phonemodel/inc/qtphonelog.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneengine/phonemodel/inc/qtphonelog.h	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,54 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Provides macros for logging
+*
+*/
+
+
+
+#ifndef __QTPHONELOG_H__
+#define __QTPHONELOG_H__
+
+//  INCLUDES
+#include <e32def.h>
+#include <QDebug>
+
+// Q_FUNC_INFO does not print function signature in Symbian..
+
+#ifdef _DEBUG
+#define PHONE_DEBUG(A)                   qDebug() <<A;
+#define PHONE_DEBUG2(A, B)               qDebug() <<A <<B
+#define PHONE_DEBUG3(A, B, C)            qDebug() <<A <<B <<C
+#define PHONE_DEBUG4(A, B, C, D)         qDebug() <<A <<B <<C <<D
+
+#define PHONE_TRACE                      qDebug() <<__PRETTY_FUNCTION__;
+#define PHONE_TRACE1(A)                  qDebug() <<__PRETTY_FUNCTION__ <<A;
+#define PHONE_TRACE2(A, B)               qDebug() <<__PRETTY_FUNCTION__ <<A <<B
+#define PHONE_TRACE3(A, B, C)            qDebug() <<__PRETTY_FUNCTION__ <<A <<B <<C
+#define PHONE_TRACE4(A, B, C, D)         qDebug() <<__PRETTY_FUNCTION__ <<A <<B <<C <<D
+#else
+#define PHONE_DEBUG(A)
+#define PHONE_DEBUG2(A, B)
+#define PHONE_DEBUG3(A, B, C)
+#define PHONE_DEBUG4(A, B, C, D)
+
+#define PHONE_TRACE
+#define PHONE_TRACE1(A)
+#define PHONE_TRACE2(A, B)
+#define PHONE_TRACE3(A, B, C)
+#define PHONE_TRACE4(A, B, C, D)
+#endif
+
+#endif
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/phonemodel/rom/phonengengine.iby
--- a/phoneengine/phonemodel/rom/phonengengine.iby	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/phonemodel/rom/phonengengine.iby	Fri Apr 16 14:58:25 2010 +0300
@@ -22,23 +22,23 @@
 #include <data_caging_paths_for_iby.hrh>
 
 // Phone Engine
-file=ABI_DIR\BUILD_DIR\PHONEENGINE.DLL        SHARED_LIB_DIR\PHONEENGINE.DLL
+file=ABI_DIR\BUILD_DIR\phoneengine.dll        SHARED_LIB_DIR\phoneengine.dll
 
 // Engine Info
-file=ABI_DIR\BUILD_DIR\ENGINEINFO.DLL        SHARED_LIB_DIR\ENGINEINFO.DLL
+file=ABI_DIR\BUILD_DIR\engineinfo.dll        SHARED_LIB_DIR\engineinfo.dll
 
 // Audio Handling
-file=ABI_DIR\BUILD_DIR\AUDIOHANDLING.DLL    SHARED_LIB_DIR\AUDIOHANDLING.DLL
+file=ABI_DIR\BUILD_DIR\audiohandling.dll    SHARED_LIB_DIR\audiohandling.dll
 data=MULTI_LINGUIFY(RSC DATAZ_\RESOURCE_FILES_DIR\defaultbeep RESOURCE_FILES_DIR\defaultbeep)
 
 // Call Handling
-file=ABI_DIR\BUILD_DIR\CALLHANDLING.DLL     SHARED_LIB_DIR\CALLHANDLING.DLL
+file=ABI_DIR\BUILD_DIR\callhandling.dll     SHARED_LIB_DIR\callhandling.dll
 
 // Contact Handling
-file=ABI_DIR\BUILD_DIR\CONTACTHANDLING.DLL  SHARED_LIB_DIR\CONTACTHANDLING.DLL
+file=ABI_DIR\BUILD_DIR\contacthandling.dll  SHARED_LIB_DIR\contacthandling.dll
 
 // Log Handling
-file=ABI_DIR\BUILD_DIR\LOGHANDLING.DLL      SHARED_LIB_DIR\LOGHANDLING.DLL
+file=ABI_DIR\BUILD_DIR\loghandling.dll      SHARED_LIB_DIR\loghandling.dll
 
 // Service Handling
 file=ABI_DIR\BUILD_DIR\peservicehandling.dll      SHARED_LIB_DIR\peservicehandling.dll
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/phonemodel/src/cpecalldurationdisplaysettingmonitor.cpp
--- a/phoneengine/phonemodel/src/cpecalldurationdisplaysettingmonitor.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/phonemodel/src/cpecalldurationdisplaysettingmonitor.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -75,10 +75,20 @@
 //
 void CPECallDurationDisplaySettingMonitor::UpdateL()
     {
-    // Resubmit notification request
     // Retrieve current value for call duration display
-    User::LeaveIfError( Get( iDisplayCallDuration ) );
+    iError = Get( iDisplayCallDuration );
+    User::LeaveIfError( iError );
     TEFLOGSTRING2( KTAINT, "CPECallDurationDisplaySettingMonitor::UpdateL %d", iDisplayCallDuration );
     }
+
+// -----------------------------------------------------------------------------
+// CPECallDurationDisplaySettingMonitor::GetValue
+// -----------------------------------------------------------------------------
+//
+TInt CPECallDurationDisplaySettingMonitor::GetValue(TInt& aValue)
+    {
+    aValue = (TInt)iDisplayCallDuration;
+    return iError;
+    }
     
 // End of file
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/phonemodel/src/cpecenrepmonitor.cpp
--- a/phoneengine/phonemodel/src/cpecenrepmonitor.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/phonemodel/src/cpecenrepmonitor.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -56,6 +56,10 @@
     {
     // Create repository instance
     iRepository = CRepository::NewL( aRepositoryUid );
+
+    // Store current value
+    UpdateL();
+
     // Start monitoring
     SubmitNotifyRequestL();
     }
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/phonemodel/src/cpedevicemodehandler.cpp
--- a/phoneengine/phonemodel/src/cpedevicemodehandler.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/phonemodel/src/cpedevicemodehandler.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -26,7 +26,7 @@
 
 // CONSTANTS
 
-_LIT( KPhoneTelDevModeLoadedLib, "TelephonyDeviceMode.dll" );
+_LIT( KPhoneTelDevModeLoadedLib, "telephonydevicemode.dll" );
 const TInt KPhoneTelDevModeOrdinal = 1;
 
 // ============================ MEMBER FUNCTIONS ===============================
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/phonemodel/src/cpeexternaldatahandler.cpp
--- a/phoneengine/phonemodel/src/cpeexternaldatahandler.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/phonemodel/src/cpeexternaldatahandler.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -31,12 +31,6 @@
 #include <telephonyvariant.hrh>
 #include <telinternalcrkeys.h>
 
-
-// CONSTANTS
-// <-- QT PHONE START -->
-//const TInt KPrefixLength = 10;
-// <-- QT PHONE END -->
-
 CPEExternalDataHandler* CPEExternalDataHandler::NewL( MPEPhoneModelInternal& aModel )
     {
     CPEExternalDataHandler* self = new ( ELeave ) CPEExternalDataHandler( *aModel.DataStore() );
@@ -88,7 +82,6 @@
 
     // Instantiate monitor objects
     iAudioOutputPreferenceMonitor = CPEAudioOutputPreferenceMonitor::NewL( aModel );
-    // <-- QT PHONE START -->
     iEarVolumeSetting = CPEIncallEarVolumeSettingMonitor::NewL( aModel );
     iLoudspeakerVolumeSetting = CPEIncallLoudspeakerVolumeSettingMonitor::NewL( aModel );
     iCallDurationDisplay = CPECallDurationDisplaySettingMonitor::NewL(); 
@@ -105,7 +98,6 @@
     iTelephonyVariationRepository = CRepository::NewL( KCRUidTelVariation );
     //iCoreApplicationRepository = CRepository::NewL( KCRUidCoreApplicationUIs ); 
     TEFLOGSTRING( KTAOBJECT, "PE CPEExternalDataHandler::BaseConstructL 2" );
-    // <-- QT PHONE END -->
     }
 
 // -----------------------------------------------------------------------------
@@ -120,7 +112,6 @@
     {
     TInt errorCode( KErrNotFound );
 
-    // <-- QT PHONE START -->
     //TODO
 
     if ( EPETelephonyVariationFlags == aSetting )
@@ -145,7 +136,7 @@
         }
     else if ( EPECallDurationDisplaySetting == aSetting )
         {
-        errorCode = iCallDurationDisplay->Get( aValue );
+        errorCode = iCallDurationDisplay->GetValue( aValue );
         TEFLOGSTRING2( KTAINT, "CPEExternalDataHandler::Get EPECallDurationDisplaySetting, error code: %d", errorCode );
         }
     else
@@ -155,99 +146,6 @@
         }
     
     // Process Common id
-    /*switch ( aSetting )
-        {
-        case EPEAutomaticAnswerHeadsetSetting:
-            {
-            errorCode = GetAutomaticAnswer( KSettingsHeadsetAutomaticAnswer, aValue );
-            TEFLOGSTRING2( KTAINT, "CPEExternalDataHandler::Get EPEAutomaticAnswerHeadsetSetting, error code: %d",errorCode );
-            break;
-            }        
-        case EPEAutomaticAnswerLoopsetSetting:
-            {
-            errorCode = GetAutomaticAnswer( KSettingsLoopsetAutomaticAnswer, aValue );
-            TEFLOGSTRING2( KTAINT, "CPEExternalDataHandler::Get EPEAutomaticAnswerLoopsetSetting, error code: %d", errorCode );
-            break;
-            }        
-        case EPEAutomaticAnswerCarkitSetting:
-            {
-            errorCode = GetAutomaticAnswer( KSettingsCarKitAutomaticAnswer, aValue );
-            TEFLOGSTRING2( KTAINT, "CPEExternalDataHandler::Get EPEAutomaticAnswerCarkitSetting, error code: %d", errorCode );
-            break;
-            }        
-        case EPEAutomaticAnswerMusicStandSetting:
-            {
-            errorCode = GetAutomaticAnswer( KSettingsMusicStandAutomaticAnswer, aValue );
-            TEFLOGSTRING2( KTAINT, "CPEExternalDataHandler::Get EPEAutomaticAnswerMusicStandSetting, error code: %d", errorCode );
-            break;
-            }        
-        case EPEAutomaticAnswerWirelessCarkitSetting:
-            {
-            errorCode = GetAutomaticAnswer( KSettingsWirelessCarkitAutomaticAnswer, aValue );
-            TEFLOGSTRING2( KTAINT, "CPEExternalDataHandler::Get EPEAutomaticAnswerWirelessCarkitSetting, error code: %d", errorCode );
-            break;
-            }
-        case EPEAudioOutputPreference:
-            {
-            errorCode = iAudioOutputPreferenceMonitor->Get( aValue );
-            TEFLOGSTRING2( KTAINT, "CPEExternalDataHandler::Get EPEAudioOutputPreference, error code: %d", errorCode );
-            break;
-            }
-        case EPEDialPrefixChangeSetting:
-            {
-            errorCode = iTelephonySettingsRepository->Get( KSettingsDialPrefixChangeMode, aValue );
-            TEFLOGSTRING2( KTAINT, "CPEExternalDataHandler::Get EPEDialPrefixChangeSetting, error code: %d", errorCode );
-            break;
-            }
-        case EPEIncallEarVolumeSetting:
-            {
-            errorCode = iEarVolumeSetting->Get( aValue );
-            TEFLOGSTRING2( KTAINT, "CPEExternalDataHandler::Get EPEIncallEarVolumeSetting, error code: %d", errorCode );
-            break;
-            }
-        case EPEIncallLoudspeakerVolumeSetting:
-            {
-            errorCode = iLoudspeakerVolumeSetting->Get( aValue );
-            TEFLOGSTRING2( KTAINT, "CPEExternalDataHandler::Get EPEIncallLoudspeakerVolumeSetting, error code: %d", errorCode );
-            break;
-            }
-        case EPENetworkRegistrationStatus:
-            {
-            errorCode = iNetworkRegistrationStatus->Get( aValue );
-            TEFLOGSTRING2( KTAINT, "CPEExternalDataHandler::Get EPENetworkRegistrationStatus, error code: %d", errorCode );
-            break;
-            }
-        case EPETelephonyVariationFlags:
-            {
-            errorCode = iTelephonyVariationRepository->Get( KTelVariationFlags, aValue );
-            TEFLOGSTRING2( KTAINT, "CPEExternalDataHandler::Get EPETelephonyVariationFlags, error code: %d", errorCode );
-            break;
-            }
-        case EPEAccessoryMode:            
-            {
-            errorCode = KErrNone;
-            aValue = iAccessoryModeMonitor->AccessoryMode();
-            TEFLOGSTRING2( KTAINT, "CPEExternalDataHandler::Get EPEAccessoryMode, error code: %d", errorCode );
-            break;
-            }
-        case EPENetworkConnectionAllowedSetting:
-            {
-            // Fetches setting that indicates if network connection is allowed,
-            // i.e. is the phone in off-line mode. This method is used while
-            // attempting an emergency call, so no memory may be consumed.
-            errorCode = iCoreApplicationRepository
-                ->Get( KCoreAppUIsNetworkConnectionAllowed, aValue );
-            TEFLOGSTRING2( KTAINT, "CPEGsmExternalDataHandler::Get EPENetworkConnectionAllowedSetting, error code: %d",errorCode );
-            break;
-            }
-        default:
-            {
-            TEFLOGSTRING2( KTAERROR, 
-                "PE CPEEXTERNALDATAHANDLER::GET UNKNOWN SETTING ID ! %d", aSetting );
-            break;
-            }
-        }*/
-    // <-- QT PHONE END -->
     return errorCode;
     }
 
@@ -262,34 +160,9 @@
         TDesC& aValue ) const
     {
     TInt errorCode( KErrNotFound );
-    // <-- QT PHONE START -->
     //TODO
     aValue = KNullDesC;
     errorCode = KErrNone;
-    // Process Common id
-    /*switch ( aSetting )
-        {
-        case EPEDialPrefixTextSetting:
-            {
-            TBuf<KPrefixLength> prefixTextSetting;
-            
-            errorCode = iTelephonySettingsRepository->Get( 
-                KSettingsDialPrefixText, 
-                prefixTextSetting );
-                
-            aValue = prefixTextSetting;
-            
-            TEFLOGSTRING2( KTAINT, "CPEExternalDataHandler::GetText EPEDialPrefixTextSetting, error code: %d", errorCode );
-            break;
-            }
-        default:
-            {
-            TEFLOGSTRING2( KTAERROR, 
-                "PE CPEEXTERNALDATAHANDLER::GETTEXT UNKNOWN SETTING ID ! %d", aSetting );
-            break;
-            }
-        }*/
-    // <-- QT PHONE END -->
     return errorCode;
     }
 
@@ -305,11 +178,8 @@
     TInt errorCode( KErrNotFound );
     
     TEFLOGSTRING( KTAINT, "CPEExternalDataHandler::GetAutomaticAnswer" );
-    // <-- QT PHONE START -->
-    //errorCode = iAccessorySettingsRepository->Get( aSetting, aValue );
     errorCode = KErrNone;
     aValue = 0;
-    // <-- QT PHONE END -->
     return errorCode;
     }
 
@@ -326,7 +196,6 @@
 
     switch ( aSetting )
         {
-        // <-- QT PHONE START -->
         case EPEIncallEarVolumeSetting:
             {
             errorCode = iEarVolumeSetting->Set( aValue );
@@ -337,7 +206,6 @@
             errorCode = iLoudspeakerVolumeSetting->Set( aValue );
             break;
             }
-        // <-- QT PHONE END -->
         case EPEEmergencyCallInfo:
             {
             errorCode = RProperty::Set( KPSUidCtsyEmergencyCallInfo, 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/phonemodel/src/cpemessagehandler.cpp
--- a/phoneengine/phonemodel/src/cpemessagehandler.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/phonemodel/src/cpemessagehandler.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -2996,7 +2996,6 @@
         }
     }
 
-    // <-- QT PHONE START -->
 // -----------------------------------------------------------------------------
 // CPEMessageHandler::HandleDialCall
 // Handles dial message from dial service
@@ -3012,6 +3011,5 @@
     iModel.HandleInternalMessage( MPEPhoneModel::EPEMessageDialServiceCall );
     return errorCode;
     }
-// <-- QT PHONE END -->
 
 //  End of File  
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/phonemodel/src/cpeparserphonenumberhandler.cpp
--- a/phoneengine/phonemodel/src/cpeparserphonenumberhandler.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/phonemodel/src/cpeparserphonenumberhandler.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -92,7 +92,7 @@
     if( processType != EPECallTypeVideo )
         {
         // TSY not accept phone number that include + or w chartes.
-        TPEPhoneNumber postfix = FilterPostfix( aDtmfPostfix );
+        TPEPhoneNumber postfix = FilterPostfixL( aDtmfPostfix );
         if( postfix.Length() )
             {
             phoneNumber.Append( postfix );
@@ -166,7 +166,7 @@
 // CPEParserPhoneNumberHandler::FilterPostfix
 // -----------------------------------------------------------------------------
 // 
-TPtrC CPEParserPhoneNumberHandler::FilterPostfix( TPtrC aPostfix )
+TPtrC CPEParserPhoneNumberHandler::FilterPostfixL( TPtrC aPostfix )
     {
     TLex input( aPostfix );
     TInt stripStart = KErrNotFound;
@@ -174,8 +174,11 @@
     for ( TInt i = 0; i != postfixLength; i ++ )
         {
         TChar ch( input.Peek() );
-        if ( ch == KDtmfWait ||
-             ch == KDtmfPlus )
+        if (ch == KDtmfPlus)
+            {
+            User::Leave ( ECCPErrorInvalidPhoneNumber );
+            }
+        else if ( ch == KDtmfWait )
             {
             if ( i < stripStart || stripStart == KErrNotFound )
                 {
@@ -217,12 +220,9 @@
         {
         isPhoneOffline = ETrue;
         }
-    // <-- QT PHONE START -->
     //TODO
     isPhoneOffline = EFalse;
-    return isPhoneOffline; //isPhoneOffline;
-    // <-- QT PHONE END -->
+    return isPhoneOffline;
     }
-
     
 //  End of File
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/phonemodel/src/cpephonemodel.cpp
--- a/phoneengine/phonemodel/src/cpephonemodel.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/phonemodel/src/cpephonemodel.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -39,10 +39,8 @@
 #include <mccedtmfinterface.h>
 #include <mpecontacthandling.h>
 #include <mpeloghandling.h>
-// <-- QT PHONE START --> 
 #include "phoneservices.h"
 #include "parserrecognizer.h"
-// <-- QT PHONE END --> 
 
 // CONSTANTS
 const TInt KDriveProfile ( 6 );
@@ -163,10 +161,8 @@
         {
         delete iIdleStatusMonitor;
         } 
-// <-- QT PHONE START --> 
     delete iPhoneServices;
     delete iParserRecognizer;
-// <-- QT PHONE END --> 
     }// ~CPEPhoneModel
 
 // -----------------------------------------------------------------------------
@@ -237,10 +233,8 @@
             return MESSAGE("EPEMessageClientDial");
         case MPEPhoneModel::EPEMessageClientDialEmergency:
             return MESSAGE("EPEMessageClientDialEmergency");
-// <-- QT PHONE START -->
         case MPEPhoneModel::EPEMessageDialServiceCall:
             return MESSAGE("EPEMessageDialServiceCall");
-// <-- QT PHONE END -->
         case MPEPhoneModel::EPEMessageContinueEmergencyCallInitialization:
             return MESSAGE("EPEMessageContinueEmergencyCallInitialization");
         case MPEPhoneModel::EPEMessageContinueDTMFSending:
@@ -845,11 +839,9 @@
         case MPEPhoneModel::EPEMessageDisableService:
             iMessageHandler->HandleDisableService();
             break;
-// <-- QT PHONE START -->
         case MPEPhoneModel::EPEMessageDialServiceCall:  //Make Dial request
             errorCode = iMessageHandler->HandleDialCall( EFalse );
             break;
-// <-- QT PHONE END -->
         default:
             errorCode = ECCPErrorNotFound;
             break;
@@ -1032,13 +1024,10 @@
             aCallId );
         }
 
-// <-- QT PHONE START -->
         if( iParserRecognizer )
             {
             iParserRecognizer->sendMessage( aMessage, aCallId );
             }
-// <-- QT PHONE END -->
-
 
     }// SendMessage( 2 params )
 
@@ -1410,26 +1399,16 @@
         case CPEPhoneModel::EPEContactHandlingPhaseTwo:
             {
             TEFLOGSTRING( KTAOBJECT, "CPEPhoneModel::StepL: 15.1" );
-// <-- QT PHONE START -->
-            // Start Idle State monitor to finalize ContactHandling contruction
-            //iIdleStatusMonitor = CPEIdleStatusMonitor::NewL (*this ); 
             static_cast< CPEContactHandlingProxy* >( iContactHandling )->
                    CreateSecondPhaseL( *this, iFsSession );
             TEFLOGSTRING( KTAOBJECT, "CPEPhoneModel::StepL: 15.2" );
-
-            // This should be set after the last case
- 
-//            continueStepping = EFalse;
-// <-- QT PHONE END --> 
             break; 
             }
         case CPEPhoneModel::EPEMediatorCommandHandler:
             {
             TEFLOGSTRING( KTAOBJECT, "CPEPhoneModel::StepL: 16.1" );
             // Start Mediator command listener
-// <-- QT PHONE START -->
             iMediatorCommunicationHandler = CPERemotePartyInfoMediator::NewL( *this );
-            
             break; 
             }
         case CPEPhoneModel::EPEPhoneServices:
@@ -1450,7 +1429,7 @@
             continueStepping = EFalse;
             break;
             }
-// <-- QT PHONE END --> 
+
         default:
             {
             Panic( EPEPanicIndexOutOfRange );
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/phoneservices/inc/dialservice.h
--- a/phoneengine/phoneservices/inc/dialservice.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/phoneservices/inc/dialservice.h	Fri Apr 16 14:58:25 2010 +0300
@@ -137,6 +137,14 @@
         snd << "address@domain" << 123 << 12345;        
     */
     void dialVoipService(const QString& address, int serviceId, int contactId);
+    
+private:
+    /*!
+        \fn QString simplified(QString& number)
+        
+        Returns a string that has whitespaces, '(', ')', '-', '[', and ']' chars removed 
+    */
+    static QString simplified(const QString &number) Q_REQUIRED_RESULT;
 
 
 private:
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/phoneservices/phoneservices.pro
--- a/phoneengine/phoneservices/phoneservices.pro	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/phoneservices/phoneservices.pro	Fri Apr 16 14:58:25 2010 +0300
@@ -25,7 +25,7 @@
     DEFINES += BUILD_PHONESERVICES
     
     INCLUDEPATH += ../../inc \
-                   ../phonemodel/inc \
+                   ../phonemodel/inc 
     INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 
     servicesDefFiles = \
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/phoneservices/src/dialservice.cpp
--- a/phoneengine/phoneservices/src/dialservice.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/phoneservices/src/dialservice.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -15,10 +15,12 @@
 *
 */
 
-#include <QDebug>
 #include <xqserviceutil.h>
 #include <e32base.h>
+#include <qregexp.h>
 #include "dialservice.h"
+#include "qtphonelog.h"
+
 
 DialService::DialService(MPECallControlIF &call, MPECallSettersIF &parameters, QObject* parent) : 
     XQServiceProvider(QLatin1String("com.nokia.services.telephony"), parent), m_call (call), m_parameters (parameters)
@@ -32,7 +34,7 @@
 
 int DialService::dial(const QString& number)
 {
-    qDebug () << "DialService::dial number:" << number;
+    PHONE_DEBUG2("DialService::dial number:", number);
     TPtrC16 numberPtr (reinterpret_cast<const TUint16*>(number.utf16 ()));
     m_parameters.SetPhoneNumber (numberPtr);
     m_parameters.SetCallTypeCommand (EPECallTypeCSVoice);
@@ -41,9 +43,9 @@
 
 int DialService::dial(const QString& number, int contactId)
 {
-    qDebug () << "DialService::dial number:" << number;
-    qDebug () << "DialService::dial contactId:" << contactId;
-    TPtrC16 numberPtr (reinterpret_cast<const TUint16*>(number.utf16 ()));
+    PHONE_DEBUG4("DialService::dial number:", number, "contactId:", contactId);
+    QString simplifiedNumber = simplified(number);
+    TPtrC16 numberPtr (reinterpret_cast<const TUint16*>(simplifiedNumber.utf16 ()));
     m_parameters.SetPhoneNumber (numberPtr);
     m_parameters.SetCallTypeCommand (EPECallTypeCSVoice);
     m_parameters.SetContactId2 (contactId);
@@ -52,7 +54,7 @@
 
 void DialService::dialVideo(const QString& number)
 {
-    qDebug () << "DialService::dialVideo number:" << number;
+    PHONE_DEBUG2("DialService::dialVideo number:", number);
     TPtrC16 numberPtr (reinterpret_cast<const TUint16*>(number.utf16 ()));
     m_parameters.SetPhoneNumber (numberPtr);
     m_parameters.SetCallTypeCommand (EPECallTypeVideo);
@@ -61,9 +63,9 @@
 
 void DialService::dialVideo(const QString& number, int contactId)
 {
-    qDebug () << "DialService::dialVideo number:" << number;
-    qDebug () << "DialService::dialVideo contactId:" << contactId;
-    TPtrC16 numberPtr (reinterpret_cast<const TUint16*>(number.utf16 ()));
+    PHONE_DEBUG4("DialService::dialVideo number:", number, "contactId:", contactId);
+    QString simplifiedNumber = simplified(number);
+    TPtrC16 numberPtr (reinterpret_cast<const TUint16*>(simplifiedNumber.utf16 ()));
     m_parameters.SetPhoneNumber (numberPtr);
     m_parameters.SetCallTypeCommand (EPECallTypeVideo);
     m_parameters.SetContactId2 (contactId);
@@ -72,7 +74,7 @@
 
 void DialService::dialVoip(const QString& address)
 {
-    qDebug () << "DialService::dialVoip number:" << address;
+    PHONE_DEBUG2("DialService::dialVoip number:", address);
     TPtrC16 numberPtr(reinterpret_cast<const TUint16*>(address.utf16 ()));
     m_parameters.SetPhoneNumber(numberPtr);
     m_parameters.SetCallTypeCommand(EPECallTypeVoIP);
@@ -81,8 +83,7 @@
 
 void DialService::dialVoip(const QString& address, int contactId)
 {
-    qDebug () << "DialService::dialVoip number:" << address;
-    qDebug () << "DialService::dialVoip contactId:" << contactId;
+    PHONE_DEBUG4("DialService::dialVoip number:", address, "contactId:", contactId);
     TPtrC16 numberPtr (reinterpret_cast<const TUint16*>(address.utf16 ()));
     m_parameters.SetPhoneNumber(numberPtr);
     m_parameters.SetCallTypeCommand(EPECallTypeVoIP);
@@ -92,8 +93,7 @@
 
 void DialService::dialVoipService(const QString& address, int serviceId)
 {
-    qDebug () << "DialService::dialVoipService number:" << address;
-    qDebug () << "DialService::dialVoipService serviceId:" << serviceId;
+    PHONE_DEBUG4("DialService::dialVoipService number:", address, "serviceId:", serviceId);
     TPtrC16 numberPtr (reinterpret_cast<const TUint16*>(address.utf16 ()));
     m_parameters.SetPhoneNumber(numberPtr);
     m_parameters.SetCallTypeCommand(EPECallTypeVoIP);
@@ -104,9 +104,9 @@
 void DialService::dialVoipService(
         const QString& address, int serviceId, int contactId)
 {
-    qDebug () << "DialService::dialVoipService number:" << address;
-    qDebug () << "DialService::dialVoipService serviceId:" << serviceId;
-    qDebug () << "DialService::dialVoipService contactId:" << contactId;
+    PHONE_DEBUG2("DialService::dialVoipService number:", address);
+    PHONE_DEBUG2("DialService::dialVoipService serviceId:", serviceId);
+    PHONE_DEBUG2("DialService::dialVoipService contactId:", contactId);
     TPtrC16 numberPtr (reinterpret_cast<const TUint16*>(address.utf16 ()));
     m_parameters.SetPhoneNumber(numberPtr);
     m_parameters.SetCallTypeCommand(EPECallTypeVoIP);
@@ -114,3 +114,11 @@
     m_parameters.SetContactId2(contactId);
     m_call.HandleDialServiceCall();    
 }
+
+QString DialService::simplified(const QString &number)
+{
+    QString simplifiedNumber = number;
+    QRegExp rx(QString("[\\s,.\\[\\]\\(\\)\\-]"));
+    simplifiedNumber.remove(rx);
+    return simplifiedNumber;
+}
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/phoneservices/src/dtmfservice.cpp
--- a/phoneengine/phoneservices/src/dtmfservice.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/phoneservices/src/dtmfservice.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -15,10 +15,10 @@
 *
 */
 
-#include <QDebug>
 #include <xqserviceutil.h>
 #include <e32base.h>
 #include "dtmfservice.h"
+#include "qtphonelog.h"
 
 DTMFService::DTMFService(MPECallControlIF &call, MPECallSettersIF &parameters, QObject* parent) : 
     XQServiceProvider(QLatin1String("com.nokia.services.telephony.dtmf"), parent), m_call (call), m_parameters (parameters)
@@ -32,20 +32,20 @@
 
 void DTMFService::executeKeySequence(const QString& keySequence)
 {
-    qDebug () << "DTMFService::executeKeySequence keySequence:" << keySequence;
+    PHONE_DEBUG2("DTMFService::executeKeySequence keySequence:", keySequence);
     TPtrC16 keySequencePtr (reinterpret_cast<const TUint16*>(keySequence.utf16 ()));
     m_parameters.SetPhoneNumber (keySequencePtr);   
 }
 
 void DTMFService::playDTMFTone(const QChar& keyToPlay)
 {
-    qDebug () << "DTMFService::playDTMFTone keyToPlay:" << keyToPlay;
+    PHONE_DEBUG2("DTMFService::playDTMFTone keyToPlay:", keyToPlay);
     m_parameters.SetKeyCode(keyToPlay.unicode());
     TRAP_IGNORE( m_call.HandlePlayDTMFL() );
 }
 
 void DTMFService::stopDTMFPlay()
 {
-    qDebug () << "DTMFService::stopDTMFPlay";
+    PHONE_DEBUG("DTMFService::stopDTMFPlay");
     m_call.HandleEndDTMF(); 
 }
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/phoneservices/src/phoneservices.cpp
--- a/phoneengine/phoneservices/src/phoneservices.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/phoneservices/src/phoneservices.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -15,15 +15,15 @@
 *
 */
 
-#include <QDebug>
 #include "phoneservices.h"
 #include "dialservice.h"
 #include "dtmfservice.h"
+#include "qtphonelog.h"
 
 PhoneServices::PhoneServices(MPECallControlIF &call, MPECallSettersIF &parameters, QObject* parent) : 
     QObject(parent)
 {
-    qDebug () << "PhoneServices::PhoneServices";
+    PHONE_DEBUG("PhoneServices::PhoneServices");
     dialService = new DialService(call, parameters, this);
     dtmfService = new DTMFService(call, parameters, this);
 }
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/phoneservices/tsrc/ut_dialservice/unit_tests.cpp
--- a/phoneengine/phoneservices/tsrc/ut_dialservice/unit_tests.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/phoneservices/tsrc/ut_dialservice/unit_tests.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -46,6 +46,7 @@
 private slots:
     void testDial ();
     void testDial2 ();
+    void testDial3();
     void testDialVideo ();
     void testDialVideo2 ();
     void testDialVoip();
@@ -184,6 +185,14 @@
     QVERIFY (m_clientCall == false);
 }
 
+void TestDialService::testDial3()
+{
+    m_DialService->dial(QString("[+358] (0) 50-1234 5.6,7"), 3127);
+    QString _number((QChar*)m_phoneNumber.Ptr(), m_phoneNumber.Length());
+    QVERIFY (m_setPhoneNumberCalled == true);
+    QCOMPARE(_number, QString("+3580501234567"));
+}
+
 void TestDialService::testDialVideo()
 {
     m_DialService->dialVideo(QString("0501234567"));
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/servicehandling/inc/cpeservicehandling.h
--- a/phoneengine/servicehandling/inc/cpeservicehandling.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/servicehandling/inc/cpeservicehandling.h	Fri Apr 16 14:58:25 2010 +0300
@@ -20,9 +20,6 @@
 #define C_PESERVICEHANDLING_H
 
 #include <e32base.h>
-// <-- QT PHONE START -->
-// #include <cch.h>
-// <-- QT PHONE END -->
 #include "mpeservicehandling.h"
 
 class  MPEPhoneModelInternal;
@@ -35,9 +32,6 @@
  *  @since S60 v5.0
  */
 NONSHARABLE_CLASS( CPEServiceHandling ): public CBase,
-// <-- QT PHONE START -->
-                                         //public MCchServiceStatusObserver,
-// <-- QT PHONE END -->
                                          public MPEServiceHandling
     {
 
@@ -84,21 +78,6 @@
          */ 
         void DisableService() const;
     
-    public: // from MCchServiceStatusObserver
-        
-        /**
-         * From MCchServiceStatusObserver.
-         * Signaled when service status or error changes.
-         *
-         * @param   aServiceId      Identifier of the service.
-         * @param   aType           Service type.
-         * @param   aServiceStatus  Service status.
-         */
-        // <-- QT PHONE START -->
-        /*void ServiceStatusChanged( TInt aServiceId, 
-                                   const TCCHSubserviceType aType,
-                                   const TCchServiceStatus& aServiceStatus );*/
-        // <-- QT PHONE END -->
     private: // Constructors
 
         /**
@@ -110,40 +89,10 @@
          * By default Symbian 2nd phase constructor is private.
          */
         void ConstructL();
-        
-    private: // functions
-    
-        /**
-         * Enable service, if not already enabled.
-         *
-         * @param  aState       Service state.
-         * @param  aService     Service.
-         * @return Error code.
-         */
-        // <-- QT PHONE START -->
-        /*TInt EnableServiceIfNeeded( const TCCHSubserviceState& aState, 
-                                    CCchService& aService );*/
-        
-        /**
-        * Sends ServiceHandlingError message to PhoneEngine and saves 
-        * errorcode to member variable.
-        * 
-        * @param  aErrorCode, Cch errorcode.
-        */      
-        //void SendErrorMessage( TInt aErrorCode );
-        // <-- QT PHONE END -->
-       
+               
     private: // data
         
         /**
-         * CCH client.
-         * Own.
-         */
-        // <-- QT PHONE START -->
-        //CCch* iCchClient;
-        // <-- QT PHONE END -->
-
-        /**
          * PhoneModel.
          * Not own.
          */
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneengine/servicehandling/src/cpeservicehandling.cpp
--- a/phoneengine/servicehandling/src/cpeservicehandling.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneengine/servicehandling/src/cpeservicehandling.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -20,8 +20,8 @@
 #include <mpedatastore.h>
 #include <pevirtualengine.h>
 #include <e32debug.h>
-#include <talogger.h>
 
+#include "talogger.h"
 #include "cpeservicehandling.h"
 
 // ======== MEMBER FUNCTIONS ========
@@ -75,12 +75,8 @@
 EXPORT_C CPEServiceHandling::~CPEServiceHandling()
     {
     TEFLOGSTRING( KTAOBJECT, "PE CPEServiceHandling::~CPEServiceHandling" );
-    // <-- QT PHONE START -->
-    // delete iCchClient;
-    // <-- QT PHONE END -->
     }
 
-// <-- QT PHONE START -->
 // ---------------------------------------------------------------------------
 // CPEServiceHandling::EnableService
 // ---------------------------------------------------------------------------
@@ -88,173 +84,9 @@
 void CPEServiceHandling::EnableServiceL( TInt /*aServiceId*/ )
     {
     TEFLOGSTRING( KTAREQIN, "PE CPEServiceHandling::EnableServiceL" );
-        
-    /*if ( !iCchClient )
-        {
-        iCchClient = CCch::NewL();
-        }
-
-    CCchService* service = iCchClient->GetService( aServiceId );
-    
-    TInt error( KErrNotFound );
-    if( service )
-        {
-        iCurrentServiceId = aServiceId;
-        
-        TCchServiceStatus serviceStatus;
-        error = service->GetStatus( ECCHVoIPSub, serviceStatus );
-        TCCHSubserviceState state = serviceStatus.State();
-    
-        if( error == KErrNone )
-            {
-            if ( serviceStatus.Error() == KErrNone )
-                {
-                error = EnableServiceIfNeeded( state, *service );
-                }
-            else
-                {
-                TEFLOGSTRING2( KTAERROR,
-                        "PE CPEServiceHandling::EnableServiceL, error: %d"
-                        , serviceStatus.Error() );
-                SendErrorMessage( serviceStatus.Error());
-                }
-            }
-        }
-    
-    if ( error != KErrNone )
-        {
-        if ( error == KErrNotFound )
-             {
-             iModel.SendMessage( MEngineMonitor::EPEMessageNoService );
-             }
-         else
-             {
-             TEFLOGSTRING2( KTAERROR,
-                      "PE CPEServiceHandling::EnableServiceL, Error: %d"
-                      , error );
-             SendErrorMessage( error );
-             }
-        }
-    
-    TEFLOGSTRING2( KTAINT, 
-            "PE CPEServiceHandling::EnableServiceL, error: %d", error );*/
-
     User::LeaveIfError( 0 );
     iModel.SendMessage( MEngineMonitor::EPEMessageServiceEnabled );
-    
-    // <-- QT PHONE END -->
     }
-
-// <-- QT PHONE START -->
-// ---------------------------------------------------------------------------
-// CPEServiceHandling::EnableServiceIfNeeded
-// ---------------------------------------------------------------------------
-//
-/*TInt CPEServiceHandling::EnableServiceIfNeeded( 
-        const TCCHSubserviceState& aState, 
-        CCchService& aService )
-    {
-    TEFLOGSTRING( KTAINT, "PE CPEServiceHandling::EnableServiceIfNeeded" );
-    TInt error = KErrNone;
-    
-    TEFLOGSTRING2( KTAINT, 
-            "PE CPEServiceHandling::EnableServiceIfNeeded, aState: %d", aState );
-    switch ( aState )
-        {
-        case ECCHEnabled:
-            {
-            iModel.SendMessage( MEngineMonitor::EPEMessageServiceEnabled );
-            }
-            break;
-        case ECCHUninitialized:
-        case ECCHDisabled:
-        case ECCHConnecting:
-            {
-            // Temporary solution, it will be fixed as soon as possible. 
-            // Message have to send before enable is called. Reason is so that progress bar 
-            //(global note) doesn't hide Networks's "Connection Needed" global note.
-            iModel.SendMessage( MEngineMonitor::EPEMessageServiceEnabling );
-            aService.AddObserver( *this );
-            error = aService.Enable( ECCHUnknown );  
-            }
-            break;
-        case ECCHDisconnecting:
-            {
-            error = KErrNotFound;
-            }
-            break;
-        default:
-            break;
-        }
-    TEFLOGSTRING2( KTAINT, 
-            "PE CPEServiceHandling::EnableServiceIfNeeded, error: %d", error );
-    return error;
-    }
-    
-// ---------------------------------------------------------------------------
-// CPEServiceHandling::ServiceStatusChanged
-// ---------------------------------------------------------------------------
-//
-void CPEServiceHandling::ServiceStatusChanged(
-    TInt aServiceId,
-    const TCCHSubserviceType aType,
-    const TCchServiceStatus& aServiceStatus )
-    {
-    TEFLOGSTRING( KTAINT, "PE CPEServiceHandling::ServiceStatusChanged <" );
-    
-    if( aServiceId == iCurrentServiceId && aType == ECCHVoIPSub )
-        {
-        TEFLOGSTRING3( KTAINT,
-                "PE CPEServiceHandling::ServiceStatusChanged, state: %d, error: %d"
-                , aServiceStatus.State()
-                , aServiceStatus.Error() );
-
-        CCchService* service = iCchClient->GetService( aServiceId );
-        if( service )
-            {
-            if( aServiceStatus.Error() != KErrNone )
-                {
-                TEFLOGSTRING( KTAERROR, 
-                        "PE CPEServiceHandling::ServiceStatusChanged, error" );
-                SendErrorMessage( aServiceStatus.Error());
-                CancelServiceEnabling();
-                }
-            else 
-                {
-                if( aServiceStatus.State() == ECCHEnabled )
-                    {
-                    TEFLOGSTRING( KTAINT, 
-                             "PE CPEServiceHandling::ServiceStatusChanged, enabled" );
-                    iModel.SendMessage( MEngineMonitor::EPEMessageServiceEnabled );
-                    }
-
-
-                // Notify UI, that service is disabled.
-                else if( aServiceStatus.State() == ECCHDisabled ) 
-                     {
-                     TEFLOGSTRING( KTAERROR, 
-                              "PE CPEServiceHandling::ServiceStatusChanged, disabled" );
-                     iModel.SendMessage( MEngineMonitor::EPEMessageServiceDisabled );
-                     }
-                }
-            
-            // don't remove observer, if state are connecting or disconnecting
-            if ( aServiceStatus.State() != ECCHConnecting && 
-                 aServiceStatus.State() != ECCHDisconnecting )
-                {
-                service->RemoveObserver( *this );
-                }
-            }//if( service )
-        else
-            {
-            TEFLOGSTRING( KTAERROR, 
-                    "PE CPEServiceHandling::ServiceStatusChanged, no service" );
-            }
-        }
-    TEFLOGSTRING( KTAINT, "PE CPEServiceHandling::ServiceStatusChanged >" );
-    }*/
-
-
     
 // ---------------------------------------------------------------------------
 // CPEServiceHandling::CancelServiceEnabling
@@ -263,61 +95,15 @@
 void CPEServiceHandling::CancelServiceEnabling() const
     {
     TEFLOGSTRING( KTAREQIN, "PE CPEServiceHandling::CancelServiceEnabling" );
-    
-    /*if ( iCchClient )
-        {
-        CCchService* service = iCchClient->GetService( iCurrentServiceId );
-        
-        if ( service )
-            {
-            TCchServiceStatus serviceStatus;
-            TInt error = service->GetStatus( ECCHVoIPSub, serviceStatus );
-            TCCHSubserviceState state = serviceStatus.State();
-            
-            // Disable only, if service is connecting state
-            if ( error == KErrNone && state == ECCHConnecting )
-                {
-                TEFLOGSTRING( KTAREQOUT,
-                  "PE CPEServiceHandling::CancelServiceEnabling, CCchService->Disable" );
-                service->Disable( ECCHUnknown );
-                }
-            }
-        }*/
     }
         
 // -----------------------------------------------------------------------------
-// CPEServiceHandling::SendErrorMessage
-// -----------------------------------------------------------------------------
-//
-/*void CPEServiceHandling::SendErrorMessage(
-        TInt aErrorCode )
-    {
-    TEFLOGSTRING2( KTAINT, 
-        "PE CPEServiceHandling::SendErrorMessage, aErrorCode: %d", 
-        aErrorCode );
-
-    iModel.DataStore()->SetErrorCode( aErrorCode );
-    iModel.SendMessage( MEngineMonitor::EPEMessageServiceHandlingError );
-    }*/
-
-// -----------------------------------------------------------------------------
 // CPEServiceHandling::DisableService
 // -----------------------------------------------------------------------------
 //
 void CPEServiceHandling::DisableService() const
     {
     TEFLOGSTRING( KTAREQIN, "PE CPEServiceHandling::DisableService" );
-
-    /*CCchService* service = iCchClient->GetService( iCurrentServiceId );
-    
-    if ( service )
-        {
-        TEFLOGSTRING( KTAREQOUT,
-          "PE CPEServiceHandling::DisableService, CCchService->Disable" );
-        service->Disable( ECCHUnknown );
-        }*/
     } 
 
-// <-- QT PHONE END -->
-
 //  End of File
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/csplugin/data/102828e3.rss
--- a/phoneplugins/csplugin/data/102828e3.rss	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneplugins/csplugin/data/102828e3.rss	Fri Apr 16 14:58:25 2010 +0300
@@ -53,4 +53,5 @@
         // Place additional interfaces here
         };
     }
-// End of File
\ No newline at end of file
+// End of File
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/hsdialerwidgetplugin/hsdialerwidgetplugin.pro
--- a/phoneplugins/hsdialerwidgetplugin/hsdialerwidgetplugin.pro	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneplugins/hsdialerwidgetplugin/hsdialerwidgetplugin.pro	Fri Apr 16 14:58:25 2010 +0300
@@ -28,12 +28,12 @@
 DEPENDPATH += ./inc \
               ./src
 
-INCLUDEPATH += ./inc
+INCLUDEPATH += ./inc \
+               ../../inc
 
 symbian: {
     LIBS += -lxqservice \
-            -llogsservices \
-            -lxqsettingsmanager
+            -lxqtelephonyservice
 
     TARGET.UID3 = 0x20022F44
     TARGET.EPOCALLOWDLLDATA=1
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/hsdialerwidgetplugin/inc/hsdialerwidget.h
--- a/phoneplugins/hsdialerwidgetplugin/inc/hsdialerwidget.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneplugins/hsdialerwidgetplugin/inc/hsdialerwidget.h	Fri Apr 16 14:58:25 2010 +0300
@@ -30,7 +30,7 @@
 
 HOMESCREEN_TEST_CLASS(TestDialerWidgetPlugin)
 
-class XQSettingsManager;
+class XQCallInfo;
 
 class HsDialerWidget : public HbWidget
 {
@@ -51,7 +51,7 @@
     void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
 
 private:
-    XQSettingsManager *mSetManager;
+    XQCallInfo *mXQCallInfo;
     HOMESCREEN_TEST_FRIEND_CLASS(TestDialerWidgetPlugin)
 };
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/hsdialerwidgetplugin/inc/hsdialerwidgetplugin.h
--- a/phoneplugins/hsdialerwidgetplugin/inc/hsdialerwidgetplugin.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneplugins/hsdialerwidgetplugin/inc/hsdialerwidgetplugin.h	Fri Apr 16 14:58:25 2010 +0300
@@ -21,11 +21,9 @@
 
 #include <QObject>
 #include <qserviceplugininterface.h>
-//#include <hstest_global.h>
 
 QTM_USE_NAMESPACE
 
-//HOMESCREEN_TEST_CLASS(TestDialerWidgetPlugin)
 
 /**
  * @ingroup group_hsdialerwidgetplugin
@@ -47,7 +45,6 @@
                             QServiceContext *context,
                             QAbstractSecuritySession *session);
 
-//HOMESCREEN_TEST_FRIEND_CLASS(TestDialerWidgetPlugin)
 };
 
 #endif //HSDIALERWIDGETPLUGIN_H
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/hsdialerwidgetplugin/resource/hsdialerwidgetplugin.s60xml
--- a/phoneplugins/hsdialerwidgetplugin/resource/hsdialerwidgetplugin.s60xml	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneplugins/hsdialerwidgetplugin/resource/hsdialerwidgetplugin.s60xml	Fri Apr 16 14:58:25 2010 +0300
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <service>
     <name>hsdialerwidgetplugin</name>
-    <filepath>z:/private/20022F35/import/widgetregistry/20022F44/hsdialerwidgetplugin.qtplugin</filepath>
+    <filepath>hsdialerwidgetplugin</filepath>
     <description>Dialer widget</description>
     <interface>
-        <name>com.nokia.homescreen.widget</name>
+        <name>com.nokia.symbian.IHomeScreenWidget</name>
         <version>1.0</version>
         <description>The dialer widget displays dialing menu</description>
         <capabilities></capabilities>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/hsdialerwidgetplugin/resource/hsdialerwidgetplugin.xml
--- a/phoneplugins/hsdialerwidgetplugin/resource/hsdialerwidgetplugin.xml	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneplugins/hsdialerwidgetplugin/resource/hsdialerwidgetplugin.xml	Fri Apr 16 14:58:25 2010 +0300
@@ -4,7 +4,7 @@
     <filepath>hsdialerwidgetplugin</filepath>
     <description>Dialer widget</description>
     <interface>
-        <name>com.nokia.homescreen.widget</name>
+        <name>com.nokia.symbian.IHomeScreenWidget</name>
         <version>1.0</version>
         <description>The dialer widget displays dialing menu</description>
         <capabilities></capabilities>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/hsdialerwidgetplugin/src/hsdialerwidget.cpp
--- a/phoneplugins/hsdialerwidgetplugin/src/hsdialerwidget.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneplugins/hsdialerwidgetplugin/src/hsdialerwidget.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -19,8 +19,9 @@
 #include <HbIconItem>
 #include "hsdialerwidget.h"
 #ifdef Q_OS_SYMBIAN
+#include "qtphonelog.h"
 #include <xqservicerequest.h>
-#include <XQSettingsManager>
+#include <xqcallinfo.h>
 #include <xqpublishandsubscribeutils.h>
 #include <ctsydomainpskeys.h>
 #include <logsservices.h>
@@ -44,7 +45,7 @@
 */
 HsDialerWidget::HsDialerWidget(QGraphicsItem *parent, Qt::WindowFlags flags)
   : HbWidget(parent, flags),
-    mSetManager(0)
+    mXQCallInfo(0)
 {
     HbIconItem *iconItem = new HbIconItem;
     HbIcon icon(KDialerWidgetIcon);
@@ -63,9 +64,6 @@
 */
 HsDialerWidget::~HsDialerWidget()
 {
-#ifdef Q_OS_SYMBIAN
-    delete mSetManager;
-#endif
 }
 
 /*!
@@ -76,27 +74,28 @@
 void HsDialerWidget::startDialer()
 {
 #ifdef Q_OS_SYMBIAN
-    const quint32 KKCTsyCallState = 0x00000001;
-    const qint32 KKPSUidCtsyCallInformation = {0x102029AC};
-    if  (!mSetManager) {
-        mSetManager = new XQSettingsManager();
-        }
-
-    XQPublishAndSubscribeSettingsKey callStateKey(KKPSUidCtsyCallInformation, KKCTsyCallState);
-    int callState = mSetManager->readItemValue(callStateKey).toInt();
-    if( (callState != EPSCTsyCallStateNone ) && (callState != EPSCTsyCallStateUninitialized) ) {
+    PHONE_DEBUG("HsDialerWidget::startDialer");
+    
+    if (!mXQCallInfo) {
+        mXQCallInfo = XQCallInfo::create();
+        mXQCallInfo->setParent(this);
+    }
+    
+    QList<CallInfo> calls;
+    mXQCallInfo->getCalls(calls);
+        
+    if( 0 < calls.count() ){
+        PHONE_DEBUG("call ongoing, bring Telephone to foreground");
+        
+        // ToDo: should telephone + dialpad be opened when there is a waiting call?
         int dialer(1);
-
-        // ToDo: should telephone + dialpad be opened when there is a waiting call? 
-        //if (callState == EPSCTsyCallStateRinging) {
-        //dialer = 0;
-        //}
         XQServiceRequest snd("com.nokia.services.telephony.uistarter", "start(int)", false);
         snd << dialer;
         QVariant retValue;
         snd.send(retValue);
     }
     else {
+        PHONE_DEBUG("no calls, open Dialer");
         XQServiceRequest snd("com.nokia.services.logsservices.starter",
             "start(int,bool)", false);
         snd << (int)LogsServices::ViewAll;
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/hsdialerwidgetplugin/src/hsdialerwidgetplugin.cpp
--- a/phoneplugins/hsdialerwidgetplugin/src/hsdialerwidgetplugin.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneplugins/hsdialerwidgetplugin/src/hsdialerwidgetplugin.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -21,6 +21,7 @@
 
 #include "hsdialerwidgetplugin.h"
 #include "hsdialerwidget.h"
+#include "qtphonelog.h"
 
 #ifdef COVERAGE_MEASUREMENT
 #pragma CTC SKIP
@@ -30,10 +31,12 @@
                                              QServiceContext *context,
                                              QAbstractSecuritySession *session)
 {
+    PHONE_DEBUG("HsDialerWidgetPlugin::createInstance");
     Q_UNUSED(context);
     Q_UNUSED(session);
 
-    if (descriptor.interfaceName() == QLatin1String("com.nokia.homescreen.widget")) {
+    if (descriptor.interfaceName() == QLatin1String("com.nokia.symbian.IHomeScreenWidget")) {
+        PHONE_DEBUG("creating HsDialerWidget instance");
         return new HsDialerWidget();
     } else {
         return 0;
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetplugin.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetplugin.pro	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,23 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+# 
+# Description: Project file for building Phone components
+#
+#
+
+TEMPLATE = subdirs
+CONFIG += ordered
+
+SUBDIRS = infowidgetprovider infowidgetproviderinstaller
+
+          
\ No newline at end of file
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/inc/infowidgetlogging.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/inc/infowidgetlogging.h	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:  
+ *
+ */
+
+#ifndef INFOWIDGETLOGGING_H
+#define INFOWIDGETLOGGING
+
+#include <QDebug>
+
+
+/*!
+  Define MSG_OUTPUT_RDEBUG 
+  for enabling RDebug prints in development tracing. 
+  Shouldn't be used in release code.
+  */
+#undef MSG_OUTPUT_RDEBUG
+
+
+#ifdef MSG_OUTPUT_RDEBUG
+#ifdef Q_OS_SYMBIAN
+#include <e32debug.h>
+
+static void cpPhoneSettingsPluginsMsgOutput(QtMsgType type, const char *msg)
+{
+    switch (type) {
+    
+    case QtDebugMsg:
+        RDebug::Printf("InfoWidget Debug: %s\n", msg);
+        break;
+        
+    case QtWarningMsg:
+        RDebug::Printf("InfoWidget Warning: %s\n", msg);
+        break;
+
+    case QtCriticalMsg:
+        RDebug::Printf("InfoWidget Critical: %s\n", msg);
+        break;
+        
+    case QtFatalMsg:
+        RDebug::Printf("InfoWidget Fatal: %s\n", msg);
+        abort();
+    }
+}
+
+    #define INSTALL_TRACE_MSG_HANDLER qInstallMsgHandler(cpPhoneSettingsPluginsMsgOutput)
+    #define UNINSTALL_TRACE_MSG_HANDLER qInstallMsgHandler(0)
+#endif //Q_OS_SYMBIAN
+#else 
+    #define INSTALL_TRACE_MSG_HANDLER 
+    #define UNINSTALL_TRACE_MSG_HANDLER 
+#endif //MSG_OUTPUT_RDEBUG
+
+/*!
+  Debug macros
+  */
+#define DPRINT qDebug() << __PRETTY_FUNCTION__
+
+
+#endif // INFOWIDGETLOGGING
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/inc/infowidgetprovider.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/inc/infowidgetprovider.h	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:  
+ *
+ */
+
+#ifndef INFOWIDGETPROVIDER_H
+#define INFOWIDGETPROVIDER_H
+
+#include <QObject>
+#include <qserviceplugininterface.h>
+
+QTM_USE_NAMESPACE
+
+class InfoWidgetProvider : public QObject, public QServicePluginInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(QtMobility::QServicePluginInterface)
+
+public:
+    QObject *createInstance(const QServiceInterfaceDescriptor &descriptor,
+                            QServiceContext *context,
+                            QAbstractSecuritySession *session);
+
+};
+
+#endif // INFOWIDGETPROVIDER_H
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/inc/infowidget.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/inc/infowidget.h	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:  
+ *
+ */
+
+#ifndef INFOWIDGET_H
+#define INFOWIDGET_H
+
+#include <hbwidget.h>
+#include <QGraphicsSceneMouseEvent>
+#include <QFlags>
+#include "infowidgetlayoutmanager.h"
+
+class QLabel;
+class QGraphicsLinearLayout; 
+class HbDialog;
+class HbIconItem; 
+class HbMarqueeItem;
+class HbLabel; 
+class HbCheckBox; 
+class HbPushButton; 
+class InfoWidgetEngine; 
+class InfoWidgetPreferences;
+
+class InfoWidget : public HbWidget
+{
+    Q_OBJECT
+
+public:    
+    InfoWidget(QGraphicsItem *parent = 0, Qt::WindowFlags flags = 0);
+    ~InfoWidget();
+
+public: // From QGraphicsItem.
+    QRectF boundingRect() const;
+    QPainterPath shape() const; 
+    QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint) const;  
+    QSizePolicy sizePolicy () const;  
+    
+public: // Property definitions with read and write functions
+    Q_PROPERTY(QString homeZoneDisplay READ homeZoneDisplay WRITE setHomeZoneDisplay)
+    Q_PROPERTY(QString mcnDisplay READ mcnDisplay WRITE setMcnDisplay)
+    Q_PROPERTY(QString activeLineDisplay READ activeLineDisplay WRITE setActiveLineDisplay)
+    Q_PROPERTY(QString satDisplay READ satDisplay WRITE setSatDisplay)
+    QString homeZoneDisplay();
+    void setHomeZoneDisplay(QString value);
+    QString mcnDisplay();
+    void setMcnDisplay(QString value);
+    QString activeLineDisplay();
+    void setActiveLineDisplay(QString value);
+    QString satDisplay();
+    void setSatDisplay(QString value);
+    
+protected:
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); 
+    void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); 
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event); 
+    
+    void updateInfoDisplay();
+    void initializePreferences(); 
+    
+    void changeEvent(QEvent *event);
+    
+private: 
+    void updateItemsVisibility();
+    void layoutInfoDisplay(); 
+    void layoutSettingsDisplay(); 
+    
+    void initializeInfoDisplayItems(); 
+    void initializeSettingsDisplayItems(); 
+     
+    void startChanges(); 
+    void endChanges(); 
+    
+public slots: 
+    // Slots from HsWidget
+    void onInitialize();
+    void onUninitialize();
+    void onShow();
+    void onHide();
+
+    // Info widget specific slots 
+    void readModel(); 
+    void handleModelError(int operation,int errorCode);  
+    void homeZoneDisplaySettingChanged(int state);
+    void mcnDisplaySettingChanged(int state);
+    void activeLineDisplaySettingChanged(int state);
+    void satDisplaySettingChanged(int state);
+
+    void settingsEditingFinished();
+    
+signals: 
+    void setPreferences(const QStringList &names);
+
+private:
+    Q_DISABLE_COPY(InfoWidget)
+    
+    // Engine for widget      
+    InfoWidgetEngine *m_engine;
+    
+    // Widget preference store  
+    InfoWidgetPreferences *m_preferences;
+
+    // Layout for widget
+    InfoWidgetLayoutManager *m_layoutManager;    
+    QGraphicsLinearLayout *m_layout; 
+    
+    bool m_layoutChanging; 
+    bool m_isDragEvent; 
+    QColor m_backGroundColor;
+    
+};
+
+
+#endif // INFOWIDGET_H
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/inc/infowidgetengine.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/inc/infowidgetengine.h	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:  
+ *
+ */
+
+#ifndef INFOWIDGETENGINE_H_
+#define INFOWIDGETENGINE_H_
+
+
+#include <QObject>
+#include <QString>
+
+class InfoWidgetNetworkHandler;
+class InfoWidgetSatHandler;
+class InfoWidgetLineHandler;
+
+class InfoWidgetEngine : public QObject 
+    {
+    Q_OBJECT
+    
+public:     
+    
+    enum HandlerEntity {
+        NotDefined = 0, 
+        NetworkHandler, 
+        SatHandler, 
+        LineHandler
+    };
+    
+    class ModelData {    
+    public: 
+        int mcnIndicatorType() const { return m_mcnIndicatorType; }; 
+        void setMcnIndicatorType(const int type){ m_mcnIndicatorType = type; };
+        
+        int homeZoneIndicatorType() const { return m_homeZoneIndicatorType; }; 
+        void setHomeZoneIndicatorType(const int type){ m_homeZoneIndicatorType = type; };
+
+        int activeLine() const { return m_activeLine; }; 
+        void setActiveLine(const int line){ m_activeLine = line; };
+
+        const QString& mcnName() const { return m_mcnName; };
+        void setMcnName(const QString& name){ m_mcnName = name; };
+
+        const QString& serviceProviderName() const { return m_serviceProviderName; };
+        void setServiceProviderName(const QString& name){ m_serviceProviderName = name; };
+        
+        const QString& homeZoneTextTag() const { return m_homeZoneTextTag; };
+        void setHomeZoneTextTag(const QString& tag){ m_homeZoneTextTag = tag; };
+
+        const QString& satDisplayText() const { return m_satDisplayText; };
+        void setSatDisplayText(const QString& text){ m_satDisplayText = text; };
+        
+    private: 
+        int m_mcnIndicatorType; 
+        int m_homeZoneIndicatorType;
+        int m_activeLine; 
+        
+        QString m_mcnName;
+        QString m_serviceProviderName;
+        QString m_homeZoneTextTag;
+        QString m_satDisplayText;
+    }; 
+    
+public:
+    InfoWidgetEngine(QObject *parent = 0);
+    ~InfoWidgetEngine();    
+    
+    const InfoWidgetEngine::ModelData &modelData() const;  
+    
+    void logModelData();
+    
+signals:
+    void modelError(int operation, int errorCode);
+    void modelChanged(); 
+    
+public slots: 
+    void updateNetworkDataToModel();
+    void updateSatDataToModel();
+    void updateLineDataToModel();
+
+    void handleNetworkError(int operation, int errorCode); 
+    void handleSatError(int operation, int errorCode); 
+    void handleLineError(int operation, int errorCode);
+    
+private: 
+    ModelData m_modelData;
+    
+    // Own
+    QScopedPointer<InfoWidgetNetworkHandler> m_networkHandler;
+    }; 
+
+#endif /* INFOWIDGETENGINE_H_ */
+
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/inc/infowidgetlayoutmanager.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/inc/infowidgetlayoutmanager.h	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:  
+ *
+ */
+
+#ifndef INFOWIDGETLAYOUTMANAGER_H
+#define INFOWIDGETLAYOUTMANAGER_H
+
+#include <QObject>
+#include <QList>
+#include <QSizeF>
+#include <QRectF>
+#include <QMap>
+#include <hbdocumentloader.h>
+
+class QGraphicsLayout; 
+class QGraphicsWidget;
+class HbLabel;
+class HbIconItem;
+class HbPushButton;
+class HbMarqueeItem;
+class HbCheckBox; 
+
+/*!
+ */
+class InfoWidgetDocumentLoader : public HbDocumentLoader
+{
+public:
+    InfoWidgetDocumentLoader();
+    virtual QObject *createObject(const QString& type,
+                                  const QString &name);
+};
+
+class InfoWidgetLayoutManager : public QObject
+{
+    Q_OBJECT
+    
+public: 
+    
+    enum LayoutItemRole {
+        RoleUndefined = 0,
+        // Content widget, the main widget from document 
+        RoleContent,
+        // Marquee items 
+        RoleMcnMarqueeItem, 
+        // Labels 
+        RoleHomeZoneLabel, 
+        RoleMcnLabel, 
+        RoleActiveLineLabel, 
+        RoleSatTextLabel,
+        // Icons 
+        RoleHomeZoneIcon, 
+        RoleMcnIcon, 
+        RoleActiveLineIcon, 
+        RoleSatTextIcon, 
+        // Check boxes 
+        RoleHomeZoneCheckBox, 
+        RoleMcnCheckBox, 
+        RoleActiveLineCheckBox, 
+        RoleSatTextCheckBox,
+        // Buttons 
+        RoleOkButton,
+        // Layout containers
+        RoleContainer, 
+        RoleSettingsContainer, 
+        // Must be the last enumeration        
+        RoleLastEnum
+        }; 
+    
+    enum DisplayRole {
+        InfoDisplay,
+        SettingsDisplay
+        }; 
+    
+    InfoWidgetLayoutManager(QObject *parent = 0);
+    ~InfoWidgetLayoutManager();
+    
+    DisplayRole currentDisplayRole(); 
+    QList<LayoutItemRole> currentWidgetRoles(); 
+    
+    int layoutRows() const; 
+    void setLayoutRows(int rows); 
+    
+    QGraphicsLayout* layoutInfoDisplay();
+    QGraphicsLayout* layoutSettingsDisplay(); 
+    
+    const QList<InfoWidgetLayoutManager::LayoutItemRole> widgetRoles(
+            DisplayRole displayRole) const; 
+    
+    bool loadWidgets(const DisplayRole displayRole, 
+            const QList<LayoutItemRole> &displayWidgets,
+            QMap<LayoutItemRole, QGraphicsWidget *> &widgetMap);
+    
+    QGraphicsWidget* loadWidget(InfoWidgetDocumentLoader &loader, 
+            DisplayRole displayRole, 
+            LayoutItemRole widgetRole);
+    
+    QGraphicsWidget* getWidget(LayoutItemRole itemRole);
+    QGraphicsWidget* contentWidget();
+    
+    void hideWidget(LayoutItemRole itemRole);
+    void hideAll();
+    void showAll();
+    
+private:
+    QMap<LayoutItemRole, QGraphicsWidget *> m_widgets; 
+    QMap<LayoutItemRole, QGraphicsWidget *> m_infoDisplayWidgets; 
+    QMap<LayoutItemRole, QGraphicsWidget *> m_settingsDisplayWidgets; 
+
+    InfoWidgetDocumentLoader *m_documentLoader;
+    DisplayRole m_displayRole; 
+    int m_layoutRows;
+    
+};
+
+
+#endif // INFOWIDGETLAYOUTMANAGER_H
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/inc/infowidgetlinehandler.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/inc/infowidgetlinehandler.h	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:  
+ *
+ */
+
+#ifndef INFOWIDGETLINEHANDLER_H_
+#define INFOWIDGETLINEHANDLER_H_
+
+
+#include <QObject>
+
+class InfoWidgetLineHandler: public QObject 
+    {
+    Q_OBJECT
+    
+public:    
+    InfoWidgetLineHandler(QObject *parent = NULL);
+    ~InfoWidgetLineHandler();    
+
+    void logCurrentInfo(); 
+
+    int activeLine() const; 
+    void setActiveLine(int line);
+    
+signals: 
+    void handleMessage( int message );
+    void handleError( int operation, int errorCode );
+    
+private: 
+    int m_activeLine; 
+    }; 
+
+#endif /* INFOWIDGETLINEHANDLER_H_ */
+
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/inc/infowidgetnetworkhandler.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/inc/infowidgetnetworkhandler.h	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:  
+ *
+ */
+
+#ifndef INFOWIDGETNETWORKHANDLER_H_
+#define INFOWIDGETNETWORKHANDLER_H_
+
+
+#include <QObject>
+#include <nwhandlingengine.h>
+
+class CNWSession; 
+
+class InfoWidgetNetworkHandler : public QObject, public MNWMessageObserver 
+    {
+    Q_OBJECT
+    
+public:
+    InfoWidgetNetworkHandler(QObject *parent = NULL);
+    ~InfoWidgetNetworkHandler();    
+    
+    QString homeZoneTextTag() const; 
+    int homeZoneIndicatorType() const; 
+    
+    QString mcnName() const; 
+    int mcnIndicatorType() const; 
+
+    void logCurrentInfo(); 
+
+public: // From MNWMessageObserver
+    void HandleNetworkMessage(const TNWMessages aMessage);
+    void HandleNetworkError(const TNWOperation aOperation, TInt aErrorCode);
+    
+signals: 
+    void networkDataChanged();
+    void networkError(int operation, int errorCode);
+    
+private:
+    TNWInfo m_nwInfo;
+    QScopedPointer<CNWSession> m_nwSession;
+    }; 
+
+#endif /* INFOWIDGETNETWORKHANDLER_H_ */
+
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/inc/infowidgetpreferences.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/inc/infowidgetpreferences.h	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:  
+ *
+ */
+
+#ifndef INFOWIDGETPREFERENCES_H
+#define INFOWIDGETPREFERENCES_H
+
+#include <QObject>
+#include <QFlags>
+
+// Preference string values
+const char DISPLAY_SETTING_ON[]    = "On";
+const char DISPLAY_SETTING_OFF[]     = "Off";
+
+class InfoWidgetPreferences : public QObject
+{
+    Q_OBJECT
+
+public: 
+    enum DisplaySetting {
+        DisplayOff = 0, 
+        DisplayOn    
+    }; 
+    
+    enum Option {
+        DisplayHomeZone = 0x1,
+        DisplayMcn = 0x2,
+        DisplayActiveLine = 0x4, 
+        DisplaySatText = 0x8 
+    };
+    Q_DECLARE_FLAGS(Options, Option)
+
+public:
+    InfoWidgetPreferences(QObject *parent = NULL);
+    ~InfoWidgetPreferences();
+
+    void loadPreferences();
+    void storePreferences();
+    
+public:
+    QString preference(Option preferenceId) const;
+    void setPreference(Option preferenceId, const QString &preferenceString);
+    
+    int visibleItemCount(); 
+    
+private:
+    Q_DISABLE_COPY(InfoWidgetPreferences)
+
+    InfoWidgetPreferences::Options m_options; 
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(InfoWidgetPreferences::Options)
+
+#endif // INFOWIDGETPREFERENCES_H
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/inc/infowidgetsathandler.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/inc/infowidgetsathandler.h	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:  
+ *
+ */
+
+#ifndef INFOWIDGETSATHANDLER_H_
+#define INFOWIDGETSATHANDLER_H_
+
+#include <QObject>
+
+class InfoWidgetSatHandler: public QObject 
+    {
+    Q_OBJECT
+    
+public:    
+    InfoWidgetSatHandler(QObject *parent = NULL);
+    ~InfoWidgetSatHandler();    
+
+    const QString& satDisplayText() const; 
+    void setSatDisplayText(const QString& displayText);
+
+    void logCurrentInfo(); 
+
+signals: 
+    void handleMessage( int message );
+    void handleError( int operation, int errorCode );
+
+    
+private: 
+    QString m_displayText; 
+    }; 
+
+#endif /* INFOWIDGETSATHANDLER_H_ */
+
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/src/infowidget.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/src/infowidget.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,833 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ */
+
+#include "infowidget.h"
+
+#include <hbanchorlayout.h>
+#include <hbiconitem.h>
+#include <hbmarqueeitem.h>
+#include <hbfontspec.h>
+#include <hbdialog.h>
+#include <hblabel.h>
+#include <hbaction.h>
+#include <hbcheckbox.h>
+#include <hbpushbutton.h>
+#include <hbevent.h>
+#include <hbcolorscheme.h>
+#include <QPainter>
+#include <QPainterPath>
+#include <QBrush>
+#include <QGraphicsLinearLayout>
+#include <QApplication>
+#include <QLocale>
+#include <QTranslator>
+#include "infowidgetlogging.h"
+#include "infowidgetengine.h"
+#include "infowidgetlayoutmanager.h"
+#include "infowidgetpreferences.h"
+
+const int INFOWIDGET_LINE_WIDTH = 0; 
+const int INFOWIDGET_MARGIN = 5;
+const int INFOWIDGET_ROUNDING = 15;
+
+
+/*!
+    InfoWidget::InfoWidget() 
+*/
+InfoWidget::InfoWidget(QGraphicsItem* parent, Qt::WindowFlags flags)
+    : HbWidget(parent, flags),
+    m_engine(NULL), 
+    m_preferences(NULL),
+    m_layoutManager(NULL),
+    m_layout(NULL),
+    m_layoutChanging(false),
+    m_isDragEvent(false)
+{
+    INSTALL_TRACE_MSG_HANDLER; 
+    
+    DPRINT << ": IN";
+    
+    // Localization file loading
+    QTranslator translator; 
+    QString lang = QLocale::system().name();
+    QString path = "z:/resource/qt/translations/";
+    DPRINT << ": loading translation: " << QString(path + "operator_widget_" + lang);
+    bool translatorLoaded = translator.load(path + "operator_widget_" + lang);
+    DPRINT << ": translator loaded: " << translatorLoaded; 
+    if (translatorLoaded) {
+        qApp->installTranslator(&translator);
+        DPRINT << ": translator installed"; 
+    }
+    
+    m_layoutManager = new InfoWidgetLayoutManager(this);
+    Q_ASSERT(m_layoutManager); 
+    
+    // Create network engine  
+    m_engine = new InfoWidgetEngine(this); 
+
+    // Create widget preference handler 
+    m_preferences = new InfoWidgetPreferences(this);
+
+    DPRINT << ": reading preferences from meta-object properties";
+    initializePreferences();
+
+    // Create widget main layout 
+    m_layout = new QGraphicsLinearLayout;    
+    m_layout->setSpacing(0); 
+    m_layout->setContentsMargins(0,0,0,0); 
+    
+    // Layout info display
+    layoutInfoDisplay();
+
+    setLayout(m_layout);
+
+    // Read initial data from model
+    updateInfoDisplay(); 
+    
+    QObject::connect(m_engine, SIGNAL(modelChanged()), 
+            this, SLOT(readModel())); 
+    
+    m_backGroundColor = HbColorScheme::color("popupbackground");
+
+    DPRINT << ": OUT";
+}
+
+/*!
+    InfoWidget::~InfoWidget() 
+*/
+InfoWidget::~InfoWidget()
+{
+    DPRINT << ": IN"; 
+    
+    // Clean layout container, 
+    // layout manager handles layout item cleanup
+    for (int i=0; i < m_layout->count(); i++) {
+        DPRINT << ": item(" << i << ") removed from layout";
+        m_layout->removeAt(i);
+        } 
+    
+    DPRINT << ": OUT"; 
+    UNINSTALL_TRACE_MSG_HANDLER;
+}
+
+/*!
+    InfoWidget::boundingRect() const
+*/
+QRectF InfoWidget::boundingRect() const
+{
+    DPRINT;
+    
+    QRectF rectF = rect();
+    rectF.adjust(-INFOWIDGET_MARGIN, -INFOWIDGET_MARGIN, 
+            INFOWIDGET_MARGIN, INFOWIDGET_MARGIN);
+    
+    return rectF;
+}
+
+/*!
+    InfoWidget::shape() const
+    Return shape
+*/
+QPainterPath InfoWidget::shape() const
+{
+    DPRINT;    
+    
+    QPainterPath path;
+    path.addRoundRect(boundingRect(), INFOWIDGET_ROUNDING, INFOWIDGET_ROUNDING);
+    return path;
+}
+
+/*!
+    InfoWidget::sizeHint() 
+*/
+QSizeF InfoWidget::sizeHint(Qt::SizeHint which, const QSizeF & constraint) const   
+{
+    Q_UNUSED(which);
+    Q_UNUSED(constraint); 
+    
+    QSizeF requiredSize(70,160);
+    
+    // Try to get size hint from docml content, if not found use default  
+    // size preference 
+    if (m_layoutManager->currentDisplayRole() == 
+                InfoWidgetLayoutManager::InfoDisplay) {
+        if (m_layoutManager->contentWidget()) {
+            requiredSize = m_layoutManager->contentWidget()->minimumSize();
+            }
+    }
+    else if (m_layoutManager->currentDisplayRole() == 
+            InfoWidgetLayoutManager::SettingsDisplay) {
+        requiredSize = QSizeF(250,250);
+        if (m_layoutManager->contentWidget()) {
+            requiredSize = m_layoutManager->contentWidget()->preferredSize();
+            }
+    } 
+
+    DPRINT << ": returning size: " << requiredSize;
+    return requiredSize; 
+}
+
+/*!
+    InfoWidget::sizePolicy() 
+*/
+QSizePolicy InfoWidget::sizePolicy () const 
+{
+    DPRINT;
+
+    // Size tells the exact size for the widget    
+    return QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); 
+}
+
+/*!
+    InfoWidget::onInitialize() 
+*/
+void InfoWidget::onInitialize()
+{
+    DPRINT << ": IN";
+    
+    // Initialize preferences from meta-object data 
+    // set by homescreen framework. Homescreen framework 
+    // has restored the properties before calling onInitialize  
+    DPRINT << ": reading preferences from meta-object properties";
+    initializePreferences();
+    
+    DPRINT << ": OUT";
+}
+
+/*!
+    InfoWidget::onUninitialize() 
+*/
+void InfoWidget::onUninitialize()
+{
+    DPRINT;
+}
+
+/*!
+    InfoWidget::onShow() 
+*/
+void InfoWidget::onShow()
+{
+    DPRINT;
+}
+
+/*!
+    InfoWidget::onHide() 
+*/
+void InfoWidget::onHide()
+{
+    DPRINT;
+}
+
+/*!
+    InfoWidget::updateItemsVisibility() 
+*/
+void InfoWidget::updateItemsVisibility()
+{
+    DPRINT <<": IN"; 
+    int layoutRows = 0; 
+    QList<QGraphicsWidget *> widgetsToHide; 
+    
+    // Update layout according to item visibility settings
+    // 1. read visible items
+    if (m_preferences->preference(InfoWidgetPreferences::DisplayHomeZone).compare(
+            DISPLAY_SETTING_ON) == 0) {
+        layoutRows++;
+    } else if (m_layoutManager->currentDisplayRole() != InfoWidgetLayoutManager::SettingsDisplay) {
+        m_layoutManager->hideWidget(InfoWidgetLayoutManager::RoleHomeZoneLabel); 
+        m_layoutManager->hideWidget(InfoWidgetLayoutManager::RoleHomeZoneIcon); 
+    }
+    
+    if (m_preferences->preference(InfoWidgetPreferences::DisplayMcn).compare(
+            DISPLAY_SETTING_ON) == 0) {
+        layoutRows++;
+    } else if (m_layoutManager->currentDisplayRole() != InfoWidgetLayoutManager::SettingsDisplay) {
+        m_layoutManager->hideWidget(InfoWidgetLayoutManager::RoleMcnMarqueeItem); 
+        m_layoutManager->hideWidget(InfoWidgetLayoutManager::RoleMcnIcon); 
+    }
+
+    if (m_preferences->preference(InfoWidgetPreferences::DisplayActiveLine).compare(
+            DISPLAY_SETTING_ON) == 0) {
+        layoutRows++;
+    } else if (m_layoutManager->currentDisplayRole() != InfoWidgetLayoutManager::SettingsDisplay) {
+        m_layoutManager->hideWidget(InfoWidgetLayoutManager::RoleActiveLineLabel); 
+        m_layoutManager->hideWidget(InfoWidgetLayoutManager::RoleActiveLineIcon); 
+    }
+    
+    if (m_preferences->preference(InfoWidgetPreferences::DisplaySatText).compare(
+            DISPLAY_SETTING_ON) == 0) {
+        layoutRows++;
+    } else if (m_layoutManager->currentDisplayRole() != InfoWidgetLayoutManager::SettingsDisplay) {
+        m_layoutManager->hideWidget(InfoWidgetLayoutManager::RoleSatTextLabel); 
+        m_layoutManager->hideWidget(InfoWidgetLayoutManager::RoleSatTextIcon); 
+    }
+    
+    DPRINT << ": visible layout rows count: " << layoutRows;
+    m_layoutManager->setLayoutRows(layoutRows);
+}
+
+/*!
+    InfoWidget::layoutInfoDisplay()
+    
+    Layout info display    
+*/
+void InfoWidget::layoutInfoDisplay()
+{  
+    startChanges(); 
+    
+    QGraphicsLayout *infoDisplayLayout = 
+        m_layoutManager->layoutInfoDisplay(); 
+    
+    DPRINT << ": IN";
+    if (infoDisplayLayout) {
+        DPRINT << ": infoDisplayLayout has been returned from layout manager";
+
+        QGraphicsWidget *contentWidget = m_layoutManager->contentWidget();
+        if (contentWidget) {
+            DPRINT << ": contentWidget has been returned from layout manager";
+            
+            // Remove old data from layout. 
+            for (int i=0; i < m_layout->count(); i++) {
+                DPRINT << ": item(" << i << ") removed from layout";
+                m_layout->removeAt(i);
+                } 
+            
+            // Add content widget to main layout 
+            m_layout->addItem(contentWidget);
+            
+            resize(contentWidget->preferredSize()); 
+        }       
+    }
+    
+    m_layoutManager->showAll(); 
+    updateItemsVisibility(); 
+
+    endChanges(); 
+    
+    DPRINT << ": OUT";
+}
+
+/*!
+    InfoWidget::layoutSettingsDisplay()
+    
+    Switch to settings display layout   
+*/
+void InfoWidget::layoutSettingsDisplay()
+{  
+    startChanges(); 
+    
+    QGraphicsLayout *settingDisplayLayout = 
+        m_layoutManager->layoutSettingsDisplay(); 
+    
+    DPRINT << ": IN";
+    if (settingDisplayLayout) {
+        DPRINT << ": settingDisplayLayout has been returned from layout manager";
+
+        QGraphicsWidget *contentWidget = m_layoutManager->contentWidget();
+        if (contentWidget) {
+            DPRINT << ": contentWidget has been returned from layout manager";
+                
+            // Remove old data from layout. 
+            for (int i=0; i < m_layout->count(); i++) {
+                DPRINT << ": item(" << i << ") removed from layout";
+                m_layout->removeAt(i);
+                } 
+            
+            // Add content widget to main layout 
+            m_layout->addItem(contentWidget); 
+
+            resize(contentWidget->preferredSize()); 
+        }
+        
+        // Connect settings display widget signals 
+        initializeSettingsDisplayItems(); 
+    }
+     
+    m_layoutManager->showAll(); 
+
+    endChanges(); 
+    
+    DPRINT << ": OUT";
+}
+
+/*!
+    InfoWidget::initializeInfoDisplayItems()
+*/
+void InfoWidget::initializeInfoDisplayItems()
+{  
+    DPRINT;
+}
+
+/*!
+    InfoWidget::initializeSettingsDisplayItems()
+    
+    Set up initial check box states, lock check boxes 
+    if needed and connect signals to local slots  
+*/
+void InfoWidget::initializeSettingsDisplayItems()
+{  
+    DPRINT << ": IN";
+    
+    HbPushButton *okButton = qobject_cast<HbPushButton *>(m_layoutManager->getWidget(
+            InfoWidgetLayoutManager::RoleOkButton));
+    if (okButton) {
+        DPRINT << ": okButton has been returned from layout manager, connecting signal";
+        QObject::connect(okButton, SIGNAL(clicked()), 
+                this, SLOT(settingsEditingFinished())); 
+    }
+
+    // Connect display setting check boxes
+    HbCheckBox *homeZoneBox = qobject_cast<HbCheckBox *>(m_layoutManager->getWidget(
+            InfoWidgetLayoutManager::RoleHomeZoneCheckBox));
+    if (homeZoneBox) {
+        DPRINT << ": homeZoneBox has been returned from layout manager, initializing";
+        // Make checkable when home zone display is supported
+        homeZoneBox->setCheckable(false); 
+        QObject::connect(homeZoneBox, SIGNAL(stateChanged(int)), 
+                this, SLOT(homeZoneDisplaySettingChanged(int))); 
+    }
+    
+    HbCheckBox *mcnCheckBox = qobject_cast<HbCheckBox *>(m_layoutManager->getWidget(
+            InfoWidgetLayoutManager::RoleMcnCheckBox));
+    if (mcnCheckBox) {
+        mcnCheckBox->setChecked(true);
+        
+        DPRINT << ": mcnCheckBox has been returned from layout manager, connecting signal";
+        QObject::connect(mcnCheckBox, SIGNAL(stateChanged(int)), 
+                this, SLOT(mcnDisplaySettingChanged(int))); 
+    }
+    
+    HbCheckBox *activeLineCheckBox = qobject_cast<HbCheckBox *>(m_layoutManager->getWidget(
+            InfoWidgetLayoutManager::RoleActiveLineCheckBox));
+    if (activeLineCheckBox) {
+        // Make checkable when active line display is supported
+        activeLineCheckBox->setCheckable(false); 
+
+        DPRINT << ": activeLineCheckBox has been returned from layout manager, connecting signal";
+        QObject::connect(activeLineCheckBox, SIGNAL(stateChanged(int)), 
+                this, SLOT(activeLineDisplaySettingChanged(int))); 
+    }
+    
+    HbCheckBox *satTextCheckBox = qobject_cast<HbCheckBox *>(m_layoutManager->getWidget(
+            InfoWidgetLayoutManager::RoleSatTextCheckBox));
+    if (satTextCheckBox) {
+        // Make checkable when sat text display is supported
+        satTextCheckBox->setCheckable(false); 
+
+        DPRINT << ": satTextCheckBox has been returned from layout manager, connecting signal";
+        QObject::connect(satTextCheckBox, SIGNAL(stateChanged(int)), 
+                this, SLOT(satDisplaySettingChanged(int))); 
+    }
+    
+    DPRINT << ": OUT";
+}
+
+/*!
+    InfoWidget::updateInfoDisplay() 
+*/
+void InfoWidget::updateInfoDisplay()
+{
+    DPRINT; 
+    
+    QString text;
+    InfoWidgetEngine::ModelData modelData = m_engine->modelData(); 
+
+    HbLabel *homeZoneLabel = qobject_cast<HbLabel *>(m_layoutManager->getWidget(
+            InfoWidgetLayoutManager::RoleHomeZoneLabel));
+    if (homeZoneLabel && 
+            m_layoutManager->currentDisplayRole() == InfoWidgetLayoutManager::InfoDisplay) {
+        text = modelData.homeZoneTextTag(); 
+        homeZoneLabel->setPlainText(text);
+    }        
+    
+    HbMarqueeItem *mcnMarqueeItem = qobject_cast<HbMarqueeItem *>(m_layoutManager->getWidget(
+            InfoWidgetLayoutManager::RoleMcnMarqueeItem));
+    if (mcnMarqueeItem && 
+            m_layoutManager->currentDisplayRole() == InfoWidgetLayoutManager::InfoDisplay) {
+        text = modelData.mcnName(); 
+        if (text.length()) {
+            mcnMarqueeItem->setText(text);
+                
+            // Set marquee animation looping mode to infinite
+            mcnMarqueeItem->setLoopCount(-1); 
+            
+            // Finally, start marquee animation
+            DPRINT << ": mcnMarqueeItem->isAnimating()"; 
+            if (!mcnMarqueeItem->isAnimating()) {
+                DPRINT << ": mcnMarqueeItem->startAnimation()";   
+                mcnMarqueeItem->startAnimation();
+            }
+        }
+    }
+
+    HbLabel *activeLineLabel = qobject_cast<HbLabel *>(m_layoutManager->getWidget(
+            InfoWidgetLayoutManager::RoleActiveLineLabel));
+    if (activeLineLabel && 
+            m_layoutManager->currentDisplayRole() == InfoWidgetLayoutManager::InfoDisplay) {
+        text.setNum(modelData.activeLine());
+        text.insert(0, hbTrId("Line: "));
+    
+        if (text.length()) {
+            activeLineLabel->setPlainText(text);
+        }
+    }    
+
+    HbLabel *satTextLabel = qobject_cast<HbLabel *>(m_layoutManager->getWidget(
+            InfoWidgetLayoutManager::RoleSatTextLabel));
+    if (satTextLabel && 
+            m_layoutManager->currentDisplayRole() == InfoWidgetLayoutManager::InfoDisplay) {
+
+        text = modelData.satDisplayText(); 
+
+        if (text.length()) {
+            satTextLabel->setPlainText(text);
+        }
+    }    
+
+}
+
+/*!
+    InfoWidget::readModel() 
+    
+    Read model data. Model's modelChanged - signal is connected to this slot.  
+*/
+void InfoWidget::readModel()
+{
+    DPRINT << ": IN"; 
+
+    if (m_layoutManager->currentDisplayRole() == InfoWidgetLayoutManager::InfoDisplay) { 
+        updateInfoDisplay(); 
+    }
+    DPRINT << ": OUT";
+}
+
+/*!
+    InfoWidget::handleModelError() 
+    
+    Model error signal is connected to this slot 
+*/
+void InfoWidget::handleModelError(int operation,int errorCode)
+{
+    Q_UNUSED(operation); 
+    Q_UNUSED(errorCode); 
+    DPRINT;
+}
+
+/*!
+    InfoWidget::paint() 
+*/
+void InfoWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option); 
+    Q_UNUSED(widget);
+    DPRINT;
+
+    if (!m_layoutChanging) {
+        QBrush brush(Qt::white); 
+        if (m_backGroundColor.isValid()) {
+            brush.setColor(m_backGroundColor);
+        }
+        QRectF drawRect = boundingRect(); 
+        drawRect.adjust( INFOWIDGET_LINE_WIDTH, INFOWIDGET_LINE_WIDTH, 
+                         -INFOWIDGET_LINE_WIDTH, -INFOWIDGET_LINE_WIDTH );
+        
+        QPainterPath path;
+        path.addRoundRect(drawRect, INFOWIDGET_ROUNDING, INFOWIDGET_ROUNDING);
+    
+        painter->save();
+        painter->fillPath(path, brush);
+        painter->restore();
+    }
+}
+
+/*!
+    InfoWidget::mousePressEvent() 
+*/
+
+void InfoWidget::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_UNUSED(event);
+    DPRINT; 
+    
+    // Initialize flag 
+    m_isDragEvent = false; 
+    
+    DPRINT; 
+}
+
+/*!
+    InfoWidget::mouseReleaseEvent() 
+*/
+void InfoWidget::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_UNUSED(event);
+
+    // If in info display and widget wasn't dragged 
+    // change to settings display
+    if ((!m_isDragEvent) && 
+          m_layoutManager->currentDisplayRole() == 
+                  InfoWidgetLayoutManager::InfoDisplay) {
+        DPRINT << ": layout settings display";
+        layoutSettingsDisplay(); 
+    }
+    
+    m_isDragEvent = false; 
+}
+
+/*!
+    InfoWidget::mouseMoveEvent() 
+*/
+void InfoWidget::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_UNUSED(event);
+    
+    // Mouse is moving after mouse press event
+    m_isDragEvent = true; 
+}
+
+/*!
+    InfoWidget::homeZoneDisplaySettingChanged() 
+*/
+void InfoWidget::homeZoneDisplaySettingChanged(int state)
+{
+    DPRINT << ": state: " << state;
+    if (state == Qt::Checked){
+        m_preferences->setPreference(InfoWidgetPreferences::DisplayHomeZone, DISPLAY_SETTING_ON);
+    } else {
+        m_preferences->setPreference(InfoWidgetPreferences::DisplayHomeZone, DISPLAY_SETTING_OFF);
+    }
+}
+
+/*!
+    InfoWidget::mcnDisplaySettingChanged() 
+*/
+void InfoWidget::mcnDisplaySettingChanged(int state)
+{
+    DPRINT << ": state: " << state; 
+    if (state == Qt::Checked){
+        m_preferences->setPreference(InfoWidgetPreferences::DisplayMcn, DISPLAY_SETTING_ON);
+    } else {
+        m_preferences->setPreference(InfoWidgetPreferences::DisplayMcn, DISPLAY_SETTING_OFF);
+    }
+}
+
+/*!
+    InfoWidget::activeLineDisplaySettingChanged() 
+*/
+void InfoWidget::activeLineDisplaySettingChanged(int state)
+{
+    DPRINT << ": state: " << state; 
+    if (state == Qt::Checked){
+        m_preferences->setPreference(InfoWidgetPreferences::DisplayActiveLine, DISPLAY_SETTING_ON);
+    } else {
+        m_preferences->setPreference(InfoWidgetPreferences::DisplayActiveLine, DISPLAY_SETTING_OFF);
+    }
+}
+
+/*!
+    InfoWidget::satDisplaySettingChanged() 
+*/
+void InfoWidget::satDisplaySettingChanged(int state)
+{
+    DPRINT << ": state: " << state; 
+    if (state == Qt::Checked){
+        m_preferences->setPreference(InfoWidgetPreferences::DisplaySatText, DISPLAY_SETTING_ON);
+    } else {
+        m_preferences->setPreference(InfoWidgetPreferences::DisplaySatText, DISPLAY_SETTING_OFF);
+    }
+}
+
+/*!
+    InfoWidget::mcnDisplay() 
+    
+    Getter function for Meta-object property "mcnDisplay"
+*/
+QString InfoWidget::mcnDisplay()
+{
+    DPRINT; 
+    return m_preferences->preference(InfoWidgetPreferences::DisplayMcn); 
+}
+
+/*!
+    InfoWidget::setMcnDisplay() 
+    
+    Setter function for Meta-object property "mcnDisplay"
+*/
+void InfoWidget::setMcnDisplay(QString value)
+{
+    DPRINT;
+    m_preferences->setPreference(InfoWidgetPreferences::DisplayMcn, value);
+    }
+
+/*!
+    InfoWidget::homeZoneDisplay() 
+    
+    Getter function for Meta-object property "homeZoneDisplay"
+*/
+QString InfoWidget::homeZoneDisplay()
+{
+    DPRINT; 
+    return m_preferences->preference(InfoWidgetPreferences::DisplayHomeZone); 
+}
+
+/*!
+    InfoWidget::setHomeZoneDisplay()
+    
+    Setter function for Meta-object property "homeZoneDisplay" 
+*/
+void InfoWidget::setHomeZoneDisplay(QString value)
+{
+    DPRINT; 
+    m_preferences->setPreference(InfoWidgetPreferences::DisplayHomeZone, value);
+}
+
+/*!
+    InfoWidget::activeLineDisplay() 
+    
+    Getter function for Meta-object property "activeLineDisplay"
+*/
+QString InfoWidget::activeLineDisplay()
+{
+    DPRINT; 
+    return m_preferences->preference(InfoWidgetPreferences::DisplayActiveLine);
+}
+
+/*!
+    InfoWidget::setActiveLineDisplay() 
+    
+    Setter function for Meta-object property "activeLineDisplay"
+*/
+void InfoWidget::setActiveLineDisplay(QString value)
+{
+    DPRINT; 
+    m_preferences->setPreference(InfoWidgetPreferences::DisplayActiveLine, value);
+}
+
+/*!
+    InfoWidget::satDisplay()
+    
+    Getter function for Meta-object property "satDisplay" 
+*/
+QString InfoWidget::satDisplay()
+{
+    DPRINT; 
+    return m_preferences->preference(InfoWidgetPreferences::DisplaySatText);
+}
+
+/*!
+    InfoWidget::setSatDisplay()
+    
+    Setter function for Meta-object property "satDisplay" 
+*/
+void InfoWidget::setSatDisplay(QString value)
+{
+    DPRINT;
+    m_preferences->setPreference(InfoWidgetPreferences::DisplaySatText, value);
+}
+
+/*!
+    InfoWidget::initializePreferences()
+    
+    Read initial Meta-object properties and store to preference handler. 
+    Restores preferences from previous session.   
+*/
+void InfoWidget::initializePreferences()
+{
+    DPRINT << ": IN";
+    QString propertyValue;
+    
+    propertyValue = QObject::property("homeZoneDisplay").toString();
+    m_preferences->setPreference(InfoWidgetPreferences::DisplayHomeZone, 
+            propertyValue);
+    
+    propertyValue = QObject::property("mcnDisplay").toString();
+    m_preferences->setPreference(InfoWidgetPreferences::DisplayMcn, 
+            propertyValue);
+    
+    propertyValue = QObject::property("activeLineDisplay").toString();
+    m_preferences->setPreference(InfoWidgetPreferences::DisplayActiveLine, 
+            propertyValue);
+    
+    propertyValue = QObject::property("satDisplay").toString();
+    m_preferences->setPreference(InfoWidgetPreferences::DisplaySatText, 
+            propertyValue);
+
+    // Check that at least one item is set visible. If not 
+    // set default item(s) visible. TBD which items and how selected.   
+    if (m_preferences->visibleItemCount() == 0) {
+        DPRINT << ": no visible items initially, setting MCN on by default"; 
+        m_preferences->setPreference(InfoWidgetPreferences::DisplayMcn, 
+                DISPLAY_SETTING_ON);
+    }
+        
+    DPRINT << ": OUT"; 
+}
+
+/*!
+    InfoWidget::settingsEditingFinished()
+*/
+void InfoWidget::settingsEditingFinished()
+{
+    DPRINT << ": IN";
+    
+    layoutInfoDisplay();
+    
+    updateInfoDisplay(); 
+    
+    DPRINT << ": OUT";
+}
+
+/*!
+    InfoWidget::startChanges()
+*/
+void InfoWidget::startChanges()
+{
+    DPRINT << ": IN";
+    
+    m_layoutChanging = true;
+    
+    DPRINT << ": OUT";
+}
+
+/*!
+    InfoWidget::endChanges()
+*/
+void InfoWidget::endChanges()
+{
+    DPRINT << ": IN";
+    
+    m_layoutChanging = false;
+    
+    DPRINT << ": OUT";
+}
+
+/*!
+   \reimp
+*/
+void InfoWidget::changeEvent(QEvent *event)
+{
+   DPRINT << ": IN";
+   
+   if (event->type() == HbEvent::ThemeChanged) {
+       m_backGroundColor = HbColorScheme::color("popupbackground");
+   }
+   HbWidget::changeEvent( event );
+   
+   DPRINT << ": OUT";
+}
+
+// End of File. 
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/src/infowidgetengine.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/src/infowidgetengine.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ */
+
+#include "infowidgetengine.h"
+#include "infowidgetnetworkhandler.h"
+#include <networkhandlingproxy.h>
+#include "infowidgetlogging.h"
+#include <xqsettingsmanager.h>
+#include <xqsettingskey.h>
+#include <settingsinternalcrkeys.h>
+
+/*!
+   InfoWidgetEngine::InfoWidgetEngine
+ */
+InfoWidgetEngine::InfoWidgetEngine(QObject *parent): 
+    QObject(parent),
+    m_networkHandler(new InfoWidgetNetworkHandler)
+{
+    DPRINT << ": IN";
+    
+    QObject::connect(
+        m_networkHandler.data(), SIGNAL(networkError(int, int)),
+        this, SLOT(handleNetworkError(int, int))); 
+    
+    QObject::connect(
+        m_networkHandler.data(), SIGNAL(networkDataChanged()),
+        this, SLOT(updateNetworkDataToModel()));
+    
+    XQSettingsManager *settingsManager = new XQSettingsManager(0); 
+    XQSettingsKey settingsKey(XQSettingsKey::TargetCentralRepository, 
+        KCRUidNetworkSettings.iUid, KSettingsMcnDisplay); 
+    bool result = settingsManager->writeItemValue(settingsKey, 1 );
+    delete settingsManager;
+
+    updateNetworkDataToModel(); 
+    
+    DPRINT << ": OUT";
+}
+
+/*!
+   InfoWidgetEngine::~InfoWidgetEngine
+ */
+InfoWidgetEngine::~InfoWidgetEngine()
+{
+    DPRINT;
+}    
+
+/*!
+   InfoWidgetEngine::logModelData
+   
+   Utility function for logging model data
+ */
+void InfoWidgetEngine::logModelData()
+{
+    DPRINT << ": mcn name: " << m_modelData.mcnName(); 
+    DPRINT << ": service provider name: " << m_modelData.serviceProviderName();
+    DPRINT << ": homezone text tag: " << m_modelData.homeZoneTextTag();
+    
+    DPRINT << ": mcn type: " << m_modelData.mcnIndicatorType(); 
+    DPRINT << ": active line: " << m_modelData.activeLine(); 
+    DPRINT << ": homezone indicator type: " << m_modelData.homeZoneIndicatorType(); 
+} 
+
+/*!
+   InfoWidgetEngine::modelData
+   
+   Getter for model data. 
+ */
+const InfoWidgetEngine::ModelData& InfoWidgetEngine::modelData() const
+{
+    DPRINT;
+    return m_modelData; 
+}
+
+/*!
+   InfoWidgetEngine::updateNetworkDataToModel
+ */
+void InfoWidgetEngine::updateNetworkDataToModel()
+{
+    DPRINT << ": IN"; 
+    
+    m_networkHandler->logCurrentInfo();
+    
+    // Read network handler data to model data
+    m_modelData.setHomeZoneIndicatorType(
+        m_networkHandler->homeZoneIndicatorType());
+    m_modelData.setHomeZoneTextTag(m_networkHandler->homeZoneTextTag()); 
+    m_modelData.setMcnName(m_networkHandler->mcnName()); 
+    m_modelData.setMcnIndicatorType(m_networkHandler->mcnIndicatorType());
+    
+    emit modelChanged();
+    
+    DPRINT << ": OUT";
+}
+
+/*!
+   InfoWidgetEngine::updateSatDataToModel
+ */
+void InfoWidgetEngine::updateSatDataToModel()
+{
+    DPRINT;
+}
+
+/*!
+   InfoWidgetEngine::updateLineDataToModel
+ */
+void InfoWidgetEngine::updateLineDataToModel()
+{
+    DPRINT;
+}
+
+/*!
+   InfoWidgetEngine::handleNetworkError
+ */
+void InfoWidgetEngine::handleNetworkError(int operation, int errorCode)
+{
+    DPRINT << ": operation: " << operation << " error code: " << errorCode; 
+}
+
+/*!
+   InfoWidgetEngine::handleSatError
+ */
+void InfoWidgetEngine::handleSatError(int operation, int errorCode)
+{
+    DPRINT << ": operation: " << operation << " error code: " << errorCode; 
+}
+
+/*!
+   InfoWidgetEngine::handleLineError
+ */
+void InfoWidgetEngine::handleLineError(int operation, int errorCode)
+{
+    DPRINT << ": operation: " << operation << " error code: " << errorCode; 
+}
+
+// End of File. 
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/src/infowidgetengine_s.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/src/infowidgetengine_s.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ */
+
+#include "infowidgetengine.h"
+#include "infowidgetlogging.h"
+
+/*!
+   InfoWidgetEngine::InfoWidgetEngine
+ */
+InfoWidgetEngine::InfoWidgetEngine(QObject *parent): 
+    QObject(parent)
+{
+    DPRINT;
+}
+
+/*!
+   InfoWidgetEngine::~InfoWidgetEngine
+ */
+InfoWidgetEngine::~InfoWidgetEngine()
+{
+DPRINT;
+}    
+
+/*!
+   InfoWidgetEngine::logModelData
+   
+   Utility function for logging model data
+ */
+void InfoWidgetEngine::logModelData()
+{
+    DPRINT << ": mcn name: " << m_modelData.mcnName(); 
+    DPRINT << ": service provider name: " << m_modelData.serviceProviderName();
+    DPRINT << ": homezone text tag: " << m_modelData.homeZoneTextTag();
+    
+    DPRINT << ": mcn type: " << m_modelData.mcnIndicatorType(); 
+    DPRINT << ": active line: " << m_modelData.activeLine(); 
+    DPRINT << ": homezone indicator type: " << m_modelData.homeZoneIndicatorType(); 
+} 
+
+/*!
+   InfoWidgetEngine::modelData
+   
+   Getter for model data. 
+ */
+const InfoWidgetEngine::ModelData& InfoWidgetEngine::modelData() const
+{
+    DPRINT;
+    return m_modelData; 
+}
+
+/*!
+   InfoWidgetEngine::setModelData
+   
+   Enables setting model initial data to engine.   
+ */
+void InfoWidgetEngine::setModelData(const InfoWidgetEngine::ModelData &data)
+{
+    DPRINT; 
+    m_modelData = data;
+}
+
+/*!
+   InfoWidgetEngine::updateNetworkDataToModel
+ */
+void InfoWidgetEngine::updateNetworkDataToModel()
+{
+    DPRINT;
+}
+
+/*!
+   InfoWidgetEngine::updateSatDataToModel
+ */
+void InfoWidgetEngine::updateSatDataToModel()
+{
+    DPRINT;
+}
+
+/*!
+   InfoWidgetEngine::updateLineDataToModel
+ */
+void InfoWidgetEngine::updateLineDataToModel()
+{
+    DPRINT;
+}
+
+
+void InfoWidgetEngine::handleNetworkError(int operation, int errorCode)
+{
+    DPRINT << ": operation: " << operation << " error code: " << errorCode; 
+}
+
+void InfoWidgetEngine::handleSatError(int operation, int errorCode)
+{
+    DPRINT << ": operation: " << operation << " error code: " << errorCode; 
+}
+
+void InfoWidgetEngine::handleLineError(int operation, int errorCode)
+{
+    DPRINT << ": operation: " << operation << " error code: " << errorCode; 
+}
+
+// End of File. 
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/src/infowidgetlayoutmanager.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/src/infowidgetlayoutmanager.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,494 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ */
+
+#include "infowidgetlayoutmanager.h"
+#include <QtGlobal>
+#include <QObject>
+#include <QGraphicsWidget>
+#include <hbdocumentloader.h>
+#include <hblabel.h>
+#include <hbmarqueeitem.h>
+#include <hbiconitem.h> 
+#include <hbpushbutton.h>
+#include "infowidgetlogging.h"
+
+
+const char INFOWIDGET_DOCML_FILE[] = ":/resource/infowidget.docml";
+
+// Docml widget name mappings 
+const char LAYOUT_PREFIX_INFO_DISPLAY[] = "id:";
+const char LAYOUT_PREFIX_SETTINGS_DISPLAY[] = "sd:";
+const char LAYOUT_NAME_CONTENT[] = "content";
+const char LAYOUT_NAME_MCNMARQUEEITEM[] = "mcnMarqueeItem";
+const char LAYOUT_NAME_MCNLABEL[] = "mcnLabel";
+const char LAYOUT_NAME_HOMEZONELABEL[] = "homeZoneLabel";
+const char LAYOUT_NAME_ACTIVELINELABEL[] = "activeLineLabel";
+const char LAYOUT_NAME_SATTEXTLABEL[] = "satTextLabel";
+const char LAYOUT_NAME_HOMEZONEICON[] = "homeZoneIcon";
+const char LAYOUT_NAME_MCNICON[] = "mcnIcon";
+const char LAYOUT_NAME_ACTIVELINEICON[] = "activeLineIcon";
+const char LAYOUT_NAME_SATTEXTICON[] = "satTextIcon";
+const char LAYOUT_NAME_HOMEZONECHECKBOX[] = "homeZoneCheckBox";
+const char LAYOUT_NAME_MCNCHECKBOX[] = "mcnCheckBox";
+const char LAYOUT_NAME_ACTIVELINECHECKBOX[] = "activeLineCheckBox";
+const char LAYOUT_NAME_SATTEXTCHECKBOX[] = "satTextCheckBox";
+const char LAYOUT_NAME_OKBUTTON[] = "okButton";
+const char LAYOUT_NAME_CONTAINER[] = "container";
+const char LAYOUT_NAME_SETTINGSCONTAINER[] = "settingsContainer";
+
+
+/*!
+  InfoWidgetDocumentLoader::InfoWidgetDocumentLoader()
+ */
+InfoWidgetDocumentLoader::InfoWidgetDocumentLoader()
+{
+}
+
+/*!
+  InfoWidgetDocumentLoader::createObject()
+ */
+QObject *InfoWidgetDocumentLoader::createObject(
+    const QString &type,
+    const QString &name)
+{
+    DPRINT << ": IN";
+    
+    DPRINT << ": type: "<< type;
+    DPRINT << ": name: "<< name;
+    
+    if ( type == HbMarqueeItem::staticMetaObject.className() ) {
+        DPRINT << ": HbMarqueeItem";
+        QObject *object = new HbMarqueeItem;
+        object->setObjectName(name);
+        DPRINT << ": HbMarqueeitem found, OUT";
+        return object;
+    }
+
+    DPRINT << ": OUT";
+    
+    return HbDocumentLoader::createObject(type, name);
+}
+
+/*!
+ */
+InfoWidgetLayoutManager::InfoWidgetLayoutManager(QObject *parent) 
+: QObject(parent), 
+  m_documentLoader(NULL), 
+  m_displayRole(InfoDisplay),
+  m_layoutRows(0)
+{
+    DPRINT << ": IN"; 
+    
+    // Fill supported layout item roles for info display
+    QList<LayoutItemRole> displayWidgetRoles = widgetRoles(InfoDisplay);
+    
+    // Try to load all widgets in list by widget role 
+    bool loadResult = loadWidgets(InfoDisplay, 
+            displayWidgetRoles,
+            m_infoDisplayWidgets); 
+    DPRINT << ": info display widget load result: " << loadResult;
+  
+    // Fill supported layout item roles for settings display
+    displayWidgetRoles = widgetRoles(SettingsDisplay);
+  
+    // Try to load all widgets in list by widget role 
+    loadResult = loadWidgets(SettingsDisplay, 
+            displayWidgetRoles,
+            m_settingsDisplayWidgets); 
+    DPRINT << ": settings display widget load result: " << loadResult;
+
+    DPRINT << ": OUT";
+}
+
+/*!
+ */
+InfoWidgetLayoutManager::~InfoWidgetLayoutManager()
+{
+    DPRINT << ": IN";
+    
+    if (m_documentLoader) { 
+        delete m_documentLoader;
+    }
+    
+    DPRINT << ": OUT";
+}
+
+/*!
+ */
+InfoWidgetLayoutManager::DisplayRole InfoWidgetLayoutManager::currentDisplayRole() 
+{
+    DPRINT; 
+    return m_displayRole;
+} 
+
+/*!
+ */
+QList<InfoWidgetLayoutManager::LayoutItemRole> InfoWidgetLayoutManager::currentWidgetRoles() 
+{
+    DPRINT; 
+    return m_widgets.keys(); 
+} 
+
+int InfoWidgetLayoutManager::layoutRows() const 
+{
+    DPRINT; 
+    return m_layoutRows;
+} 
+
+void InfoWidgetLayoutManager::setLayoutRows(int rows) 
+{
+    DPRINT; 
+    m_layoutRows = rows; 
+} 
+
+/*!
+   InfoWidgetLayoutManager::contentWidget()
+*/
+QGraphicsWidget* InfoWidgetLayoutManager::contentWidget()
+{
+    DPRINT; 
+    return getWidget(RoleContent); 
+}
+
+/*!
+   InfoWidgetLayoutManager::getWidget();
+*/
+QGraphicsWidget* InfoWidgetLayoutManager::getWidget(LayoutItemRole itemRole)
+{
+    DPRINT << ": item role: " << itemRole;
+    
+    QGraphicsWidget *widget = m_widgets.value(itemRole); 
+    if (widget) {
+        DPRINT << ": widget: " << widget;
+    }
+    
+    return widget; 
+}
+
+/*!
+   InfoWidgetLayoutManager::hideWidget();
+*/
+void InfoWidgetLayoutManager::hideWidget(LayoutItemRole itemRole)
+{
+    DPRINT << ": item role: " << itemRole;
+    
+    QGraphicsWidget *widget = m_widgets.value(itemRole); 
+    if (widget) {
+        DPRINT << ": hiding widget: " << widget;
+        widget->hide(); 
+    }
+}
+
+/*!
+   InfoWidgetLayoutManager::hideAll();
+*/
+void InfoWidgetLayoutManager::hideAll()
+{
+    DPRINT << ": IN";
+    
+    QMapIterator<LayoutItemRole, QGraphicsWidget *> iterator(m_widgets);
+    while (iterator.hasNext()) {
+        iterator.next();
+        QGraphicsWidget *widget = iterator.value(); 
+        if (widget) {
+            widget->hide(); 
+        }
+    }
+    
+    DPRINT << ": OUT";
+}
+
+
+/*!
+   InfoWidgetLayoutManager::showAll();
+*/
+void InfoWidgetLayoutManager::showAll()
+{
+    DPRINT << ": IN";
+    
+    QMapIterator<LayoutItemRole, QGraphicsWidget *> iterator(m_widgets);
+    while (iterator.hasNext()) {
+        iterator.next();
+        QGraphicsWidget *widget = iterator.value(); 
+        if (widget) {
+            widget->show(); 
+        }
+    }
+    
+    DPRINT << ": OUT";
+}
+
+/*!
+    InfoWidgetLayoutManager::layoutInfoDisplay()
+*/
+QGraphicsLayout* InfoWidgetLayoutManager::layoutInfoDisplay()
+{   
+    DPRINT << ": IN";
+
+    hideAll(); 
+
+    m_displayRole = InfoDisplay;
+    m_widgets = m_infoDisplayWidgets; 
+           
+    QGraphicsLayout *activeLayout(NULL); 
+    DPRINT << ": getting content item and using its layout for activeLayout";
+    QGraphicsWidget *content = getWidget(RoleContent); 
+    if (content) {
+        DPRINT << ": content found, getting layout";
+        activeLayout = content->layout(); 
+    }
+
+    DPRINT  << ": OUT";
+    return activeLayout; 
+}
+
+/*!
+    InfoWidgetLayoutManager::layoutSettingsDisplay()
+*/
+QGraphicsLayout* InfoWidgetLayoutManager::layoutSettingsDisplay()
+{   
+    DPRINT << ": IN";
+    
+    hideAll(); 
+    
+    m_displayRole = SettingsDisplay;
+    m_widgets = m_settingsDisplayWidgets; 
+    
+    QGraphicsLayout *activeLayout(NULL); 
+    DPRINT << ": getting content item and using its layout for activeLayout";
+    QGraphicsWidget *content = getWidget(RoleContent); 
+    if (content) {
+        DPRINT << ": content found, getting layout";
+        activeLayout = content->layout(); 
+    }
+
+    DPRINT  << ": OUT";
+    return activeLayout; 
+}
+
+/*!
+    InfoWidgetLayoutManager::loadWidgets()
+*/
+bool InfoWidgetLayoutManager::loadWidgets(const DisplayRole displayRole, 
+        const QList<LayoutItemRole> &displayWidgets,
+        QMap<LayoutItemRole, QGraphicsWidget *> &widgetMap)
+{
+    DPRINT << ": IN";
+    bool loadResult(true); 
+
+    // Cleanup previously loaded content in case of any data  
+    widgetMap.clear(); 
+    
+    if (!m_documentLoader) {
+        m_documentLoader = new InfoWidgetDocumentLoader;
+    }
+    
+    Q_ASSERT(m_documentLoader); 
+    
+    bool loaded = false;
+    m_documentLoader->load(INFOWIDGET_DOCML_FILE, &loaded);
+        
+    if (!loaded) {
+        qWarning() << "Unable to load .docml:  " << INFOWIDGET_DOCML_FILE;
+    }
+    else {
+        DPRINT << ": document " << INFOWIDGET_DOCML_FILE << " loaded successfully"; 
+        
+        QGraphicsWidget *widget(NULL);
+        LayoutItemRole currentWidgetRole;
+        bool allWidgetsLoaded(true); 
+        
+        foreach (currentWidgetRole, displayWidgets) {
+            DPRINT << ": iterating displayWidgets, current role: " << static_cast<int>(currentWidgetRole);
+            
+            widget = loadWidget(*m_documentLoader, displayRole, currentWidgetRole);
+               if (widget) {
+                   DPRINT << ": widget found, inserting to widget map";
+                   widgetMap.insert(currentWidgetRole, widget);
+                   widget = NULL;
+               } else {
+                   allWidgetsLoaded = false; 
+                   DPRINT << ": ERROR, widget not found!";
+               }
+        }
+        
+        DPRINT << ": allWidgetsLoaded: " << allWidgetsLoaded;
+                
+        int widgetCount = widgetMap.count(); 
+        DPRINT << ": loaded widgets count: " << widgetCount;
+        if (widgetCount == displayWidgets.count()) {
+            DPRINT << ": all widgets loaded";
+            loadResult = true;
+            } else {
+                DPRINT << ": error, all widgets were not loaded";
+                loadResult = false;
+            }        
+    }
+        
+    DPRINT << ": OUT";
+    return loadResult; 
+}
+
+/*!
+    InfoWidgetLayoutManager::loadWidget()
+    
+    Initialize loader with corresponding document file before calling this single widget loader utility   
+*/
+QGraphicsWidget* InfoWidgetLayoutManager::loadWidget(InfoWidgetDocumentLoader &loader, 
+        DisplayRole displayRole, 
+        LayoutItemRole widgetRole)
+{
+    DPRINT << ": IN";
+     
+    QString widgetPrefix; 
+    if (displayRole == InfoDisplay) {
+        widgetPrefix = LAYOUT_PREFIX_INFO_DISPLAY;
+    } else if (displayRole == SettingsDisplay) {
+        widgetPrefix = LAYOUT_PREFIX_SETTINGS_DISPLAY;
+    }
+        
+    QGraphicsWidget *widget(NULL);
+    QString widgetName = widgetPrefix;
+    
+    switch (widgetRole) 
+        {
+        case RoleContent: 
+            widgetName.append(LAYOUT_NAME_CONTENT);
+        break;     
+        case RoleMcnMarqueeItem: 
+            widgetName.append(LAYOUT_NAME_MCNMARQUEEITEM);
+        break; 
+        case RoleHomeZoneLabel: 
+            widgetName.append(LAYOUT_NAME_HOMEZONELABEL);
+        break;
+        case RoleMcnLabel: 
+            widgetName.append(LAYOUT_NAME_MCNLABEL);
+        break;
+        case RoleActiveLineLabel: 
+            widgetName.append(LAYOUT_NAME_ACTIVELINELABEL);
+        break; 
+        case RoleSatTextLabel: 
+            widgetName.append(LAYOUT_NAME_SATTEXTLABEL);
+        break; 
+        case RoleHomeZoneIcon: 
+            widgetName.append(LAYOUT_NAME_HOMEZONEICON);
+        break; 
+        case RoleMcnIcon: 
+            widgetName.append(LAYOUT_NAME_MCNICON);
+        break; 
+        case RoleActiveLineIcon: 
+            widgetName.append(LAYOUT_NAME_ACTIVELINEICON);
+        break; 
+        case RoleSatTextIcon: 
+            widgetName.append(LAYOUT_NAME_SATTEXTICON);
+        break;
+        case RoleHomeZoneCheckBox: 
+            widgetName.append(LAYOUT_NAME_HOMEZONECHECKBOX);
+        break; 
+        case RoleMcnCheckBox: 
+            widgetName.append(LAYOUT_NAME_MCNCHECKBOX);
+        break; 
+        case RoleActiveLineCheckBox: 
+            widgetName.append(LAYOUT_NAME_ACTIVELINECHECKBOX);
+        break; 
+        case RoleSatTextCheckBox: 
+            widgetName.append(LAYOUT_NAME_SATTEXTCHECKBOX);
+        break; 
+        case RoleOkButton: 
+            widgetName.append(LAYOUT_NAME_OKBUTTON);
+        break; 
+        case RoleContainer: 
+            widgetName.append(LAYOUT_NAME_CONTAINER);
+        break; 
+        case RoleSettingsContainer: 
+            widgetName.append(LAYOUT_NAME_SETTINGSCONTAINER);
+        break; 
+
+        case RoleUndefined: // Fall through 
+        default: 
+            break; 
+        }
+    
+    widget = qobject_cast<QGraphicsWidget *>(loader.findWidget(widgetName));
+    
+    if (widget) {
+        DPRINT << ": widget found: " << widgetName;
+    } else {
+        DPRINT << ": ERROR, widget not found!";
+    }
+           
+    DPRINT << ": OUT";
+    return widget; 
+}
+
+/*!
+    InfoWidgetLayoutManager::widgetRoles()
+    
+    Returns supported widget roles for specific display
+*/
+const QList<InfoWidgetLayoutManager::LayoutItemRole> InfoWidgetLayoutManager::widgetRoles(
+        DisplayRole displayRole) const
+{
+    DPRINT << ": IN";
+    
+    QList<LayoutItemRole> widgetRoles; 
+    
+    switch (displayRole) {
+        case SettingsDisplay: 
+            // Fill supported layout item roles for settings display
+            widgetRoles.append(RoleContent); 
+            widgetRoles.append(RoleHomeZoneLabel);
+            widgetRoles.append(RoleMcnLabel); 
+            widgetRoles.append(RoleActiveLineLabel);
+            widgetRoles.append(RoleSatTextLabel);
+            widgetRoles.append(RoleHomeZoneIcon);
+            widgetRoles.append(RoleMcnIcon);
+            widgetRoles.append(RoleActiveLineIcon);
+            widgetRoles.append(RoleSatTextIcon);
+            widgetRoles.append(RoleHomeZoneCheckBox);
+            widgetRoles.append(RoleMcnCheckBox);
+            widgetRoles.append(RoleActiveLineCheckBox);
+            widgetRoles.append(RoleSatTextCheckBox);
+            widgetRoles.append(RoleOkButton);
+            widgetRoles.append(RoleSettingsContainer); 
+            break;
+        case InfoDisplay: 
+            // Fill supported layout item roles for info display
+            widgetRoles.append(RoleContent); 
+            widgetRoles.append(RoleHomeZoneLabel);
+            widgetRoles.append(RoleMcnMarqueeItem);
+            widgetRoles.append(RoleActiveLineLabel);
+            widgetRoles.append(RoleSatTextLabel);
+            widgetRoles.append(RoleHomeZoneIcon);
+            widgetRoles.append(RoleMcnIcon);
+            widgetRoles.append(RoleActiveLineIcon);
+            widgetRoles.append(RoleSatTextIcon);
+            widgetRoles.append(RoleSettingsContainer); 
+            break;
+            
+        default: 
+            break; 
+    }
+    
+    DPRINT << ": widgetRoles.count() : " << widgetRoles.count();
+    DPRINT << ": OUT";
+    return widgetRoles; 
+}    
+    
+// End of File. 
+
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/src/infowidgetlinehandler.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/src/infowidgetlinehandler.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ */
+
+
+#include "infowidgetlinehandler.h"
+#include "infowidgetlogging.h"
+
+
+/*!
+ */
+InfoWidgetLineHandler::InfoWidgetLineHandler(QObject *parent):
+    QObject(parent), 
+    m_activeLine(1)
+{
+    DPRINT << ": IN";
+    DPRINT << ": OUT";
+}
+
+/*!
+ */
+InfoWidgetLineHandler::~InfoWidgetLineHandler()
+{
+    DPRINT << ": IN";
+    DPRINT << ": OUT";
+}    
+
+/*!
+ */
+void InfoWidgetLineHandler::logCurrentInfo()
+{
+    DPRINT << ": IN"; 
+    DPRINT << ": OUT";
+    
+} 
+
+/*!
+ */
+int InfoWidgetLineHandler::activeLine() const
+{
+    DPRINT << ": active line: " << m_activeLine;
+    return m_activeLine; 
+}
+    
+/*!
+ */
+void InfoWidgetLineHandler::setActiveLine(int line)
+{
+    DPRINT << ": active line: " << line; 
+    m_activeLine = line; 
+}
+
+// End of File. 
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/src/infowidgetnetworkhandler.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/src/infowidgetnetworkhandler.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,218 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ */
+
+#include <networkhandlingproxy.h>
+#include <cnwsession.h>
+#include "infowidgetnetworkhandler.h"
+#include "infowidgetlogging.h"
+
+
+/*!
+ * InfoWidgetNetworkHandler::InfoWidgetNetworkHandler
+ */
+InfoWidgetNetworkHandler::InfoWidgetNetworkHandler(QObject *parent) 
+    : 
+    QObject(parent), 
+    m_nwSession(0)
+{
+    DPRINT << ": IN";
+    
+    CNWSession *session = 0;
+    QT_TRAP_THROWING(session = CreateL(*this, m_nwInfo));
+    m_nwSession.reset(session);
+    
+    DPRINT << ": OUT";
+}
+
+/*!
+ * InfoWidgetNetworkHandler::~InfoWidgetNetworkHandler
+ */
+InfoWidgetNetworkHandler::~InfoWidgetNetworkHandler()
+{
+    DPRINT << ": IN";
+    
+    DPRINT << ": OUT";
+}    
+
+/*!
+ * InfoWidgetNetworkHandler::homeZoneTextTag
+ */
+QString InfoWidgetNetworkHandler::homeZoneTextTag() const 
+{
+    DPRINT;
+    QString qBuf;
+    qBuf = QString((QChar*)m_nwInfo.iViagTextTag.Ptr(), 
+        m_nwInfo.iViagTextTag.Length());
+    DPRINT << ": homeZoneTextTag: " << qBuf;
+    
+    return qBuf; 
+}
+
+/*!
+ * InfoWidgetNetworkHandler::homeZoneIndicatorType
+ */
+int InfoWidgetNetworkHandler::homeZoneIndicatorType() const 
+{
+    DPRINT;
+    int indicatorType = m_nwInfo.iViagIndicatorType;
+    DPRINT << ": homeZoneIndicatorType: " << indicatorType;
+    
+    return indicatorType; 
+}
+
+/*!
+ * InfoWidgetNetworkHandler::mcnName
+ */
+QString InfoWidgetNetworkHandler::mcnName() const 
+{
+    DPRINT;
+    QString qBuf;
+    qBuf = QString((QChar*)m_nwInfo.iMCNName.Ptr(),
+        m_nwInfo.iMCNName.Length());
+    DPRINT << ": mcnName: " << qBuf;
+    
+    return qBuf; 
+}
+
+/*!
+ * InfoWidgetNetworkHandler::mcnIndicatorType
+ */
+int InfoWidgetNetworkHandler::mcnIndicatorType() const 
+{
+    DPRINT;
+    int indicatorType = m_nwInfo.iMCNIndicatorType;
+    DPRINT << ": mcnIndicatorType: " << indicatorType;
+    
+    return indicatorType; 
+}
+
+/*!
+ * InfoWidgetNetworkHandler::logCurrentInfo
+ */
+void InfoWidgetNetworkHandler::logCurrentInfo()
+{
+    DPRINT << ": IN"; 
+    
+    DPRINT << "iRegistrationStatus " << m_nwInfo.iRegistrationStatus;
+    DPRINT << "iNetworkMode " << m_nwInfo.iNetworkMode;      
+    DPRINT << "iStatus " << m_nwInfo.iStatus;           
+    QString qBuf; 
+    
+    qBuf = QString((QChar*)m_nwInfo.iCountryCode.Ptr(),
+        m_nwInfo.iCountryCode.Length());
+    DPRINT << "iCountryCode " << qBuf;       
+    
+    qBuf = QString((QChar*)m_nwInfo.iNetworkId.Ptr(),
+        m_nwInfo.iNetworkId.Length());
+    DPRINT << "iNetworkId " << qBuf; 
+    
+    qBuf = QString((QChar*)m_nwInfo.iDisplayTag.Ptr(),
+        m_nwInfo.iDisplayTag.Length());
+    DPRINT << "iDisplayTag " << qBuf;
+    
+    qBuf = QString((QChar*)m_nwInfo.iShortName.Ptr(),
+        m_nwInfo.iShortName.Length());
+    DPRINT << "iShortName " << qBuf;       
+    
+    qBuf = QString((QChar*)m_nwInfo.iLongName.Ptr(),
+        m_nwInfo.iLongName.Length());
+    DPRINT << "iLongName " << qBuf;
+    
+    DPRINT << "iViagIndicatorType " << m_nwInfo.iViagIndicatorType; 
+
+    qBuf = QString((QChar*)m_nwInfo.iViagTextTag.Ptr(),
+        m_nwInfo.iViagTextTag.Length());
+    DPRINT << "iViagTextTag " << qBuf;
+    
+    DPRINT << "iMCNIndicatorType " << m_nwInfo.iMCNIndicatorType;  
+    
+    qBuf = QString((QChar*)m_nwInfo.iMCNName.Ptr(),
+        m_nwInfo.iMCNName.Length());
+    DPRINT << "iMCNName " << qBuf;
+    
+    qBuf = QString((QChar*)m_nwInfo.iSPName.Ptr(),m_nwInfo.iSPName.Length());
+    DPRINT << "iSPName " << qBuf;
+    
+    DPRINT << "iServiceProviderNameDisplayReq " 
+        << m_nwInfo.iServiceProviderNameDisplayReq;
+    
+    qBuf = QString((QChar*)m_nwInfo.iNPName.Ptr(), m_nwInfo.iNPName.Length());
+    DPRINT << "iNPName " << qBuf;
+    
+    qBuf = QString((QChar*)m_nwInfo.iOperatorNameInfo.iName.Ptr(),
+        m_nwInfo.iOperatorNameInfo.iName.Length());
+    DPRINT << "iOperatorNameInfo iName" << qBuf;
+    DPRINT << "iOperatorNameInfo iType" << m_nwInfo.iOperatorNameInfo.iType;
+    
+    DPRINT << "iNoServerMode " << m_nwInfo.iNoServerMode;
+    
+    DPRINT << "iVoicePrivacyStatus " << m_nwInfo.iVoicePrivacyStatus;
+    
+    qBuf = QString((QChar*)m_nwInfo.iPLMNField.Ptr(),
+        m_nwInfo.iPLMNField.Length());
+    DPRINT << "iPLMNField " << qBuf;                    
+    
+    DPRINT << ": OUT";
+} 
+
+/*!
+ * InfoWidgetNetworkHandler::HandleNetworkMessage
+ */
+void InfoWidgetNetworkHandler::HandleNetworkMessage( 
+    const TNWMessages aMessage )
+{   
+    DPRINT << ": message: " << aMessage;
+    
+    bool acceptedMessage = false;
+    switch (aMessage) {
+        case ENWMessageCurrentCellInfoMessage:
+            acceptedMessage = true;
+            break;
+        default:
+            // not interesting message, filter out
+            DPRINT << ": message filtered out";
+            acceptedMessage = false;
+    }
+    
+    if (acceptedMessage) {
+        int result = 0;
+        QT_TRYCATCH_ERROR(result, emit networkDataChanged());
+        if (0 != result) {
+            DPRINT << ": Exception occured while emitting signal:" << result;
+        }
+    }
+}
+
+/*!
+ * InfoWidgetNetworkHandler::HandleNetworkError
+ */
+void InfoWidgetNetworkHandler::HandleNetworkError( 
+    const TNWOperation aOperation, 
+    TInt aErrorCode )
+{
+    DPRINT << ": operation: " << aOperation <<  
+        " error code: " << aErrorCode;
+    
+    int result = 0;
+    QT_TRYCATCH_ERROR(result, emit networkError( 
+        static_cast<int>(aOperation), static_cast<int>(aErrorCode)));
+    if (0 != result) {
+        DPRINT << ": Exception occured while emitting signal:" << result;
+    }
+}
+
+// End of File. 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/src/infowidgetpreferences.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/src/infowidgetpreferences.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ */
+
+#include "infowidgetpreferences.h"
+#include "infowidgetlogging.h"
+
+
+/*!
+    InfoWidgetPreferences::InfoWidgetPreferences() 
+*/
+InfoWidgetPreferences::InfoWidgetPreferences(QObject *parent): 
+    QObject(parent)
+{
+    DPRINT;
+}
+
+/*!
+    InfoWidgetPreferences::~InfoWidgetPreferences() 
+*/
+InfoWidgetPreferences::~InfoWidgetPreferences()
+{
+    DPRINT;
+}
+
+/*!
+    InfoWidgetPreferences::loadPreferences() 
+*/
+void InfoWidgetPreferences::loadPreferences()
+{
+    DPRINT;
+}
+
+/*!
+    InfoWidgetPreferences::storePreferences() 
+*/
+void InfoWidgetPreferences::storePreferences()
+{
+    DPRINT;
+}
+
+/*!
+    InfoWidgetPreferences::preference() 
+*/
+QString InfoWidgetPreferences::preference(Option preferenceId) const
+{
+    DPRINT << ": preference id: " << static_cast<int>(preferenceId); 
+    
+    QString preferenceString;
+    if (m_options.testFlag(preferenceId)) {
+        preferenceString = DISPLAY_SETTING_ON; 
+    } else {
+        preferenceString = DISPLAY_SETTING_OFF;  
+    } 
+    
+    return preferenceString;
+}
+
+/*!
+    InfoWidgetPreferences::setPreference() 
+*/
+void InfoWidgetPreferences::setPreference(Option preferenceId, 
+    const QString& preferenceString)
+{
+    DPRINT << ": preference id: " << static_cast<int>(preferenceId);
+    DPRINT << ": preference string: " << preferenceString; 
+    DPRINT << ": initial options: " << m_options;
+    
+    if (preferenceString.compare(DISPLAY_SETTING_ON) == 0) {
+        m_options |= preferenceId; 
+    } else {
+        m_options &= ~preferenceId; 
+    }
+    
+    DPRINT << ": modified options: " << m_options;
+}
+
+/*!
+    InfoWidgetPreferences::visibleItemCount() 
+*/
+int InfoWidgetPreferences::visibleItemCount() 
+{
+    DPRINT << ": IN";
+    
+    int visibleItems = 0;
+    if (m_options.testFlag(DisplayHomeZone)){
+        visibleItems++; 
+    }
+    if (m_options.testFlag(DisplayMcn)){
+        visibleItems++; 
+    }
+    if (m_options.testFlag(DisplayActiveLine)){
+        visibleItems++; 
+    }
+    if (m_options.testFlag(DisplaySatText)){
+        visibleItems++; 
+    }
+    
+    DPRINT << ": visible item count: " << visibleItems;
+    return visibleItems; 
+}
+
+// End of File. 
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/src/infowidgetpreferences_s.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/src/infowidgetpreferences_s.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ */
+
+#include "infowidgetpreferences.h"
+#include "infowidgetlogging.h"
+
+// ---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
+//
+InfoWidgetPreferences::InfoWidgetPreferences(IHsWidgetPreferenceService &preferenceService, 
+    QObject* parent)
+    : QObject(parent)
+{
+    DPRINT << "DUMMY IMPLEMENTATION";
+
+    m_options = InfoWidgetPreferences::DisplayActiveLine|
+            InfoWidgetPreferences::DisplayMcn|
+            InfoWidgetPreferences::DisplaySatText|
+            InfoWidgetPreferences::DisplayHomeZone;
+}
+
+// ---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
+//
+InfoWidgetPreferences::~InfoWidgetPreferences()
+{
+    DPRINT << "DUMMY IMPLEMENTATION";
+}
+
+// ---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
+//
+void InfoWidgetPreferences::loadPreferences()
+{
+    DPRINT << "DUMMY IMPLEMENTATION";
+}
+
+// ---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
+//
+void InfoWidgetPreferences::storePreferences()
+{
+    DPRINT << "DUMMY IMPLEMENTATION";
+}
+
+
+/*!
+    InfoWidgetPreferences::preference() 
+*/
+QString InfoWidgetPreferences::preference(Option preferenceId)
+{
+    DPRINT << "DUMMY IMPLEMENTATION";
+    DPRINT << ": preference id: " << static_cast<int>(preferenceId); 
+    
+    QString preferenceString;
+    if (m_options.testFlag(preferenceId)) {
+        preferenceString = DISPLAY_SETTING_ON; 
+    } else {
+        preferenceString = DISPLAY_SETTING_OFF;  
+    } 
+    
+    return preferenceString; 
+}
+
+/*!
+    InfoWidgetPreferences::setPreference() 
+*/
+void InfoWidgetPreferences::setPreference(Option preferenceId, 
+        QString preferenceString)
+{
+    DPRINT << "DUMMY IMPLEMENTATION";
+    DPRINT << ": preference id: " << static_cast<int>(preferenceId);
+    DPRINT << ": preference string: " << preferenceString; 
+
+    DPRINT << ": initial options: " << m_options;
+    
+    if (preferenceString.compare(DISPLAY_SETTING_ON) == 0) {
+        m_options |= preferenceId; 
+    } else {
+        m_options &= ~preferenceId; 
+    }
+    
+    DPRINT << ": modified options: " << m_options;
+}
+
+// End of File.
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/src/infowidgetsathandler.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/infowidget/src/infowidgetsathandler.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ */
+
+
+#include "infowidgetsathandler.h"
+#include "infowidgetlogging.h"
+
+
+/*!
+ */
+InfoWidgetSatHandler::InfoWidgetSatHandler(QObject *parent):
+    QObject(parent)
+{
+    DPRINT << ": IN";
+    
+    // ToDo: remove when SAT implemented / releasing 
+    DPRINT << ": setting DUMMY DATA to sat display text";
+    m_displayText = "SAT DISPLAY TEXT"; 
+    
+    DPRINT << ": OUT";
+}
+
+/*!
+ */
+InfoWidgetSatHandler::~InfoWidgetSatHandler()
+{
+    DPRINT << ": IN";
+    DPRINT << ": OUT";
+}    
+
+/*!
+ */
+void InfoWidgetSatHandler::logCurrentInfo()
+{
+    DPRINT << ": IN"; 
+    DPRINT << ": OUT";
+    
+} 
+
+/*!
+ */
+const QString& InfoWidgetSatHandler::satDisplayText() const
+{
+    DPRINT << ": text: " << m_displayText; 
+    return m_displayText;
+}
+
+/*!
+ */
+void InfoWidgetSatHandler::setSatDisplayText(const QString& displayText)
+{
+    DPRINT << ": display text: " << displayText;
+    m_displayText = displayText;
+}
+
+// End of File. 
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/infowidgetprovider.pri
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/infowidgetprovider.pri	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,68 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+#
+
+HEADERS += ./inc/infowidgetprovider.h \
+           ./inc/infowidgetlogging.h \
+           ./infowidget/inc/infowidget.h \
+           ./infowidget/inc/infowidgetlayoutmanager.h \
+           ./infowidget/inc/infowidgetpreferences.h \
+           ./infowidget/inc/infowidgetengine.h 
+
+symbian: {
+    HEADERS += ./infowidget/inc/infowidgetnetworkhandler.h \
+               ./infowidget/inc/infowidgetsathandler.h \
+               ./infowidget/inc/infowidgetlinehandler.h
+} 
+           
+SOURCES += ./src/infowidgetprovider.cpp \
+            ./infowidget/src/infowidget.cpp \
+           ./infowidget/src/infowidgetlayoutmanager.cpp \
+           ./infowidget/src/infowidgetengine.cpp 
+                    
+symbian: {
+    SOURCES += ./infowidget/src/infowidgetpreferences.cpp \
+               ./infowidget/src/infowidgetnetworkhandler.cpp \
+               ./infowidget/src/infowidgetsathandler.cpp \
+               ./infowidget/src/infowidgetlinehandler.cpp 
+} else: { 
+    SOURCES += ./infowidget/src/infowidgetengine_s.cpp \
+               ./infowidget/src/infowidgetpreferences_s.cpp
+}
+
+defineTest(exportResources) {
+    symbian {
+        for(subdirs, 1) {
+            entries = $$files($$subdirs)
+            for(entry, entries) : BLD_INF_RULES.prj_exports += "./$$entry z:/$$replace(2, ^/,)/$$basename(entry)"
+        }
+        export ( BLD_INF_RULES.prj_exports)
+    }
+}
+
+symbian: plugin { # copy qtstub and manifest
+
+    pluginstub.sources = $${TARGET}.dll
+    pluginstub.path = $$PLUGIN_SUBDIR
+
+    DEPLOYMENT += pluginstub
+
+    qtplugins.path = $$PLUGIN_SUBDIR
+    qtplugins.sources += qmakepluginstubs/$${TARGET}.qtplugin
+    contains(MOBILITY, serviceframework):BLD_INF_RULES.prj_exports += "resource/$${TARGET}.s60xml z:$$qtplugins.path/$${TARGET}.xml"
+    
+    for(qtplugin, qtplugins.sources):BLD_INF_RULES.prj_exports += "./$$qtplugin z:$$qtplugins.path/$$basename(qtplugin)"
+}
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/infowidgetprovider.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/infowidgetprovider.pro	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,79 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+#
+ 
+
+TEMPLATE = lib
+CONFIG += plugin hb svg mobility
+MOBILITY = serviceframework
+
+TRANSLATIONS = operator_widget.ts
+
+MOC_DIR = moc
+RCC_DIR = rcc
+
+symbian: {
+LIBS += -lhswidgetmodel \
+    -lnetworkhandling \
+    -lcbsclient \
+    -lcbsmcnclient \
+    -lxqsettingsmanager
+}
+   
+INCLUDEPATH += ./inc \
+    ./infowidget/inc 
+    
+symbian: { 
+    load(data_caging_paths)
+    INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
+    TARGET.UID3 = 0x20029F28
+    TARGET.EPOCALLOWDLLDATA = 1
+    TARGET.CAPABILITY = ALL \
+        -TCB
+    deploy.path = c:
+    
+    DEPLOYMENT += exportheaders  
+        
+    BLD_INF_RULES.prj_exports +=  \
+     "$${LITERAL_HASH}include <platform_paths.hrh>" \
+     "./rom/infowidgetprovider.iby    CORE_APP_LAYER_IBY_EXPORT_PATH(infowidgetprovider.iby)" \
+	 "./rom/infowidgetprovider_resources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(infowidgetprovider_resources.iby)" 
+}
+win32: { 
+    INCLUDEPATH += ../../../../homescreensrv/homescreensrv_plat/hswidgetmodel_api
+    include(infowidgetprovider_installs_win32.pri)
+}
+RESOURCES = infowidgetprovider.qrc
+
+symbian: PLUGIN_SUBDIR = /private/20022F35/import/widgetregistry/20029F28
+win32: PLUGIN_SUBDIR = /hsresources/import/widgetregistry/20029F28
+OUTPUT_DIR = ./bin
+SOURCE_DIR = ./inc
+OBJECTS_DIR = $$OUTPUT_DIR/tmp/$$TARGET
+DESTDIR = $$OUTPUT_DIR
+MOC_DIR = $$OUTPUT_DIR/tmp/$$TARGET/moc
+RCC_DIR = $$OUTPUT_DIR/tmp/$$TARGET/rcc
+UI_DIR = $$OUTPUT_DIR/tmp/$$TARGET/ui
+LIBS += -L$$DESTDIR
+DEPENDPATH += . $$SOURCE_DIR
+INCLUDEPATH += . $$SOURCE_DIR
+INCLUDEPATH += $$MOC_DIR
+plugin: !isEmpty(PLUGIN_SUBDIR): DESTDIR = $$OUTPUT_DIR/$$PLUGIN_SUBDIR
+
+include(infowidgetprovider.pri)
+
+exportResources(./resource/*.manifest, $$PLUGIN_SUBDIR)
+exportResources(./resource/*.png, $$PLUGIN_SUBDIR)
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/infowidgetprovider.qrc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/infowidgetprovider.qrc	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,12 @@
+<RCC>
+    <qresource prefix="/" >
+        <file>resource/infowidget.png</file>        
+        <file>resource/infowidget.docml</file>        
+        <file>resource/qgn_prop_network_2g.svg</file>
+        <file>resource/qgn_prop_pb_call.svg</file>
+        <file>resource/qgn_prop_pb_sim.svg</file>
+        <file>resource/qgn_stat_zone_home_uni.svg</file>
+    </qresource>
+</RCC>
+
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/infowidgetprovider_hw.pkg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/infowidgetprovider_hw.pkg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,42 @@
+;
+; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+; Language
+&EN
+
+; SIS header: name, uid, version
+#{"infowidgetprovider"},(0x20029F28),1,0,0
+
+; Localised Vendor name
+%{"Vendor"}
+
+; Unique Vendor name
+:"Vendor"
+
+; Manual PKG pre-rules from PRO files
+; Default HW/platform dependencies
+[0x101F7961],0,0,0,{"S60ProductID"}
+[0x102032BE],0,0,0,{"S60ProductID"}
+[0x102752AE],0,0,0,{"S60ProductID"}
+[0x1028315F],0,0,0,{"S60ProductID"}
+
+; DEPLOYMENT
+"/epoc32/release/armv5/urel/infowidgetprovider.dll"    - "c:\sys\bin\infowidgetprovider.dll"
+"/epoc32/data/z/private/20022F35/import/widgetregistry/20029F28/infowidgetprovider.qtplugin"  - "c:/private/20022F35/import/widgetregistry/20029F28/infowidgetprovider.qtplugin"
+"/epoc32/data/z/private/20022F35/import/widgetregistry/20029F28/infowidgetprovider.manifest"  - "c:/private/20022F35/import/widgetregistry/20029F28/infowidgetprovider.manifest"
+"/epoc32/data/z/private/20022F35/import/widgetregistry/20029F28/infowidget.png"       - "c:/private/20022F35/import/widgetregistry/20029F28/infowidget.png"
+
+; Manual PKG post-rules from PRO files
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/infowidgetprovider_installs_win32.pri
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/infowidgetprovider_installs_win32.pri	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,37 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+
+#
+# Release
+#
+
+r01.path = ../../../bin/release/hsresources/import/widgetregistry/20029F28
+r01.files = ./release/*.dll \
+            ./resource/*.manifest \
+            ./resource/*.png
+
+INSTALLS += r01
+
+#
+# Debug
+#
+
+d01.path = ../../../../bin/debug/hsresources/import/widgetregistry/20029F28
+d01.files = ./debug/*.dll \
+            ./resource/*.manifest \
+            ./resource/*.png
+
+INSTALLS += d01
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/resource/infowidget.png
Binary file phoneplugins/infowidgetplugin/infowidgetprovider/resource/infowidget.png has changed
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/resource/infowidgetprovider.manifest
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/resource/infowidgetprovider.manifest	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<widgetprovider>
+    <widget library="infowidgetprovider"
+            uri="infowidgetprovider"
+            title="Operator info"
+            description="Info widget for operator info."/>
+</widgetprovider>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/resource/infowidgetprovider.s60xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/resource/infowidgetprovider.s60xml	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<service>
+    <name>infowidgetprovider</name>
+    <filepath>infowidgetprovider</filepath>
+    <description>Operator widget</description>
+    <interface>
+        <name>com.nokia.symbian.IHomeScreenWidget</name>
+        <version>1.0</version>
+        <description></description>
+        <capabilities></capabilities>
+        <customproperty key="title">Operator</customproperty>
+    </interface>
+</service>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/resource/infowidgetprovider.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/resource/infowidgetprovider.xml	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<service>
+    <name>infowidgetprovider</name>
+    <filepath>infowidgetprovider</filepath>
+    <description>Operator widget</description>
+    <interface>
+        <name>com.nokia.symbian.IHomeScreenWidget</name>
+        <version>1.0</version>
+        <description></description>
+        <capabilities></capabilities>
+        <customproperty key="title">Operator</customproperty>
+    </interface>
+</service>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/resource/qgn_prop_network_2g.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/resource/qgn_prop_network_2g.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<polygon fill="#030303" fill-opacity="0.7" points="6.248,15.004 6.248,8.396 1.02,3.418 0.998,0 15,0   15,3.418 9.752,8.396 9.752,15.004 " stroke-opacity="0.7"/>
+<path d="M2.006,1v1.479l5.25,5.502L7.25,14h1.5l0.006-6.02l5.25-5.48V1H2.006z M7.256,5.85L4.053,2.5h3.203  V5.85z M8.756,5.85V2.5h3.303L8.756,5.85z" fill="url(#SVGID_1_)"/>
+<rect fill="none" height="16" width="16"/>
+<defs>
+<linearGradient gradientTransform="matrix(1 0 0 -1 0.1377 14.834)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="7.8682" x2="7.8682" y1="17.3789" y2="-1.5303">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#B2B2B2"/>
+</linearGradient>
+</defs>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/resource/qgn_prop_pb_call.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/resource/qgn_prop_pb_call.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="16" width="16"/>
+<path d="M9.402,0.102C5.703,2.756,3.136,5.486,0.096,9.423  c-0.053,0.323-0.581,2.854,1.544,5.083c0.422,0.32,1.041,0.957,2.242-0.053c0.42-0.573,1.636-2.156,2-2.666  c0.767-1.167,0.22-1.678-0.597-2.764C5.977,8.334,8.338,5.97,9.027,5.279c0.859,0.607,1.642,1.518,2.734,0.62  c0,0,2.547-1.925,2.775-2.089c1.062-1.219-0.043-2.187,0.025-2.125C12.234-0.574,9.521,0.086,9.402,0.102z" fill="#030303" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M13.271,1.917C12.3,1.238,11.16,0.859,9.811,1.051L9.809,1.053c-3.475,2.65-6.211,5.209-8.75,8.753  L1.057,9.809c-0.208,1.717,0.474,2.99,1.085,3.756c0.362,0.434,0.645,0.558,0.933,0.281l2.021-2.689  c0.139-0.174,0.273-0.401,0-0.674c0,0-0.671-0.674-1.008-1.684L8.8,4.082c1.013,0.335,1.685,1.009,1.685,1.009  c0.272,0.274,0.502,0.139,0.674,0c0,0,2.561-1.896,2.691-2.02C14.176,2.756,14.125,2.533,13.271,1.917z" fill="url(#SVGID_1_)"/>
+<defs>
+<linearGradient gradientTransform="matrix(1 0 0 -1 0.1377 14.834)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="7.3892" x2="7.3892" y1="9.834" y2="-13.1661">
+<stop offset="0" style="stop-color:#3687FF"/>
+<stop offset="1" style="stop-color:#051F7D"/>
+</linearGradient>
+</defs>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/resource/qgn_prop_pb_sim.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/resource/qgn_prop_pb_sim.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<polygon fill="#030303" fill-opacity="0.7" points="16,14 0,14 0,5.588 3.586,2 16,2 " stroke-opacity="0.7"/>
+<polygon fill="none" points="16,16 0.008,16 0,0 15.992,0 "/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 0.1377 14.834)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="7.8623" x2="7.8623" y1="9.4336" y2="0.2336">
+<stop offset="0" style="stop-color:#B2B2B2"/>
+<stop offset="1" style="stop-color:#666666"/>
+</linearGradient>
+<polygon fill="url(#SVGID_1_)" points="4,3 1,6.001 1,13 15,13 15,3 "/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 0.1377 14.834)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="9.0293" x2="9.0293" y1="9.1592" y2="0.4069">
+<stop offset="0" style="stop-color:#FFE23D"/>
+<stop offset="0.2239" style="stop-color:#FAD337"/>
+<stop offset="0.6537" style="stop-color:#EFAB26"/>
+<stop offset="1" style="stop-color:#E48717"/>
+</linearGradient>
+<path d="M9.459,9.676h3.791V8.159H9.459V9.676z M12.666,6.001H9.459v1.575h3.791V6.584  C13.25,6.262,12.988,6.001,12.666,6.001z M5.084,6.584v0.992h3.791V6.001H5.667C5.344,6.001,5.084,6.262,5.084,6.584z M5.084,9.676  h3.791V8.159H5.084V9.676z M9.459,11.834h3.207c0.322,0,0.584-0.262,0.584-0.584v-0.991H9.459V11.834z M5.084,11.25  c0,0.322,0.26,0.584,0.582,0.584h3.209v-1.575H5.084V11.25z" fill="url(#SVGID_2_)"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/resource/qgn_stat_zone_home_uni.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/resource/qgn_stat_zone_home_uni.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="8" version="1.1" viewBox="0 0 12 8" width="12" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<path d="M6.364,0.764L0.648,3.34l0.016,0.008L0.658,3.35h0.001L0.648,4.221l0.974-0.24v3.25c0.849,0.013,1.593,0,2.442,0V5.143  h2.342V7.23c1.601,0,3.124,0,4.62,0V3.994l0.973,0.246V3.367H12L6.364,0.764z"/>
+<rect fill="none" height="8" width="12"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/rom/infowidgetprovider.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/rom/infowidgetprovider.iby	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,28 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef __INFOWIDGETPROVIDER_IBY__
+#define __INFOWIDGETPROVIDER_IBY__
+
+file=ABI_DIR\BUILD_DIR\infowidgetprovider.dll                                               SHARED_LIB_DIR\infowidgetprovider.dll
+data=ZPRIVATE\20022f35\import\widgetregistry\20029F28\infowidgetprovider.qtplugin           private\20022f35\import\widgetregistry\20029F28\infowidgetprovider.qtplugin
+data=ZPRIVATE\20022f35\import\widgetregistry\20029F28\infowidgetprovider.manifest           private\20022f35\import\widgetregistry\20029F28\infowidgetprovider.manifest
+data=ZPRIVATE\20022f35\import\widgetregistry\20029F28\infowidget.png                        private\20022f35\import\widgetregistry\20029F28\infowidget.png
+data=ZPRIVATE\20022f35\import\widgetregistry\20029F28\infowidgetprovider.xml                private\20022f35\import\widgetregistry\20029F28\infowidgetprovider.xml
+
+
+#endif //__INFOWIDGETPROVIDER_IBY__
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/rom/infowidgetprovider_resources.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/rom/infowidgetprovider_resources.iby	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,25 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef __INFOWIDGETPROVIDER_RESOURCE_IBY__
+#define __INFOWIDGETPROVIDER_RESOURCE_IBY__
+
+#include <data_caging_paths_for_iby.hrh>
+
+data=DATAZ_\QT_TRANSLATIONS_DIR\operator_widget.qm QT_TRANSLATIONS_DIR\operator_widget.qm 
+
+#endif 
\ No newline at end of file
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/src/infowidgetprovider.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/src/infowidgetprovider.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:  
+ *
+ */
+
+#include <qserviceinterfacedescriptor.h>
+#include <qabstractsecuritysession.h>
+#include <qservicecontext.h>
+
+#include "infowidgetprovider.h"
+#include "infowidget.h"
+
+
+/*!
+  \class InfoWidgetProvider
+  
+  \brief Homescreen Widget for providing operator information   
+*/
+QObject *InfoWidgetProvider::createInstance(const QServiceInterfaceDescriptor &descriptor,
+                                             QServiceContext *context,
+                                             QAbstractSecuritySession *session)
+{
+    Q_UNUSED(context);
+    Q_UNUSED(session);
+
+    if (descriptor.interfaceName() == QLatin1String("com.nokia.symbian.IHomeScreenWidget")) {
+        return new InfoWidget();
+    } else {
+        return 0;
+    }
+}
+
+
+Q_EXPORT_PLUGIN2(infowidgetprovider, InfoWidgetProvider)
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/common/qtestmains60.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/common/qtestmains60.h	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,40 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef QTESTMAINS60
+#define QTESTMAINS60
+
+#define QTEST_MAIN_S60(TestObject) \
+int main(int argc, char *argv[]) \
+{ \
+char *new_argv[3]; \
+QCoreApplication app(argc, argv); \
+\
+QString str = "C:\\data\\" + QFileInfo(QCoreApplication::applicationFilePath()).baseName() + ".log"; \
+QByteArray   bytes  = str.toAscii(); \
+\
+char arg1[] = "-o"; \
+\
+new_argv[0] = argv[0]; \
+new_argv[1] = arg1; \
+new_argv[2] = bytes.data(); \
+\
+TestObject tc; \
+return QTest::qExec(&tc, 3, new_argv); \
+}
+
+#endif
\ No newline at end of file
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_hbcolorscheme.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_hbcolorscheme.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,33 @@
+/* 
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include <QDebug>
+#include <smcmockclassincludes.h>
+#include <hbcolorscheme.h>
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// QString::color
+// -----------------------------------------------------------------------------
+//
+QColor HbColorScheme::color( 
+        const QString & colorRole )
+    {
+    SMC_MOCK_METHOD1( QColor, const QString &, colorRole )
+    }
+
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_hbdocumentloader.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_hbdocumentloader.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,182 @@
+/* 
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include <QDebug>
+#include <smcmockclassincludes.h>
+#include <hbmainwindow.h>
+#include <QString>
+#include <QGraphicsWidget>
+#include <QFile>
+
+#include "hbdocumentloader.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// HbDocumentLoader::HbDocumentLoader
+// -----------------------------------------------------------------------------
+//
+HbDocumentLoader::HbDocumentLoader(  )
+    : d_ptr(0)
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbDocumentLoader::HbDocumentLoader
+// -----------------------------------------------------------------------------
+//
+HbDocumentLoader::HbDocumentLoader( 
+        const HbMainWindow * window )
+    : d_ptr(0)    
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbDocumentLoader::~HbDocumentLoader
+// -----------------------------------------------------------------------------
+//
+HbDocumentLoader::~HbDocumentLoader(  )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbDocumentLoader::load
+// -----------------------------------------------------------------------------
+//
+QObjectList HbDocumentLoader::load( 
+        const QString & fileName,
+        const QString & section,
+        bool * ok )
+    {
+    SMC_MOCK_METHOD3( QObjectList, const QString &, fileName, 
+        const QString &, section, 
+        bool *, ok )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbDocumentLoader::load
+// -----------------------------------------------------------------------------
+//
+QObjectList HbDocumentLoader::load( 
+        QIODevice * device,
+        const QString & section,
+        bool * ok )
+    {
+    SMC_MOCK_METHOD3( QObjectList, QIODevice *, device, 
+        const QString &, section, 
+        bool *, ok )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbDocumentLoader::load
+// -----------------------------------------------------------------------------
+//
+QObjectList HbDocumentLoader::load( 
+        const QString & fileName,
+        bool * ok )
+    {
+    SMC_MOCK_METHOD2( QObjectList, const QString &, fileName, 
+        bool *, ok )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbDocumentLoader::load
+// -----------------------------------------------------------------------------
+//
+QObjectList HbDocumentLoader::load( 
+        QIODevice * device,
+        bool * ok )
+    {
+    SMC_MOCK_METHOD2( QObjectList, QIODevice *, device, 
+        bool *, ok )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbDocumentLoader::findWidget
+// -----------------------------------------------------------------------------
+//
+QGraphicsWidget * HbDocumentLoader::findWidget( 
+        const QString & name ) const
+    {
+    SMC_MOCK_METHOD1( QGraphicsWidget *, const QString &, name )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbDocumentLoader::findObject
+// -----------------------------------------------------------------------------
+//
+QObject * HbDocumentLoader::findObject( 
+        const QString & name ) const
+    {
+    SMC_MOCK_METHOD1( QObject *, const QString &, name )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbDocumentLoader::setObjectTree
+// -----------------------------------------------------------------------------
+//
+bool HbDocumentLoader::setObjectTree( 
+        QObjectList roots )
+    {
+    SMC_MOCK_METHOD1( bool, QObjectList, roots )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbDocumentLoader::reset
+// -----------------------------------------------------------------------------
+//
+void HbDocumentLoader::reset(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbDocumentLoader::version
+// -----------------------------------------------------------------------------
+//
+QString HbDocumentLoader::version(  )
+    {
+    SMC_MOCK_METHOD0( QString )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbDocumentLoader::createObject
+// -----------------------------------------------------------------------------
+//
+QObject * HbDocumentLoader::createObject( 
+        const QString & type,
+        const QString & name )
+    {
+    SMC_MOCK_METHOD2( QObject *, const QString &, type, 
+        const QString &, name )
+    }
+
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_hblabel.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_hblabel.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,326 @@
+/** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include <QDebug>
+#include <smcmockclassincludes.h>
+#include <hbstyleoptionlabel.h>
+#include <hblabel.h>
+
+
+
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// HbLabel::Q_PROPERTY
+// -----------------------------------------------------------------------------
+//
+//void HbLabel::Q_PROPERTY( 
+//        QString plainText READ plainText WRITE setPlainText ) Q_PROPERTY ( QString html READ html WRITE setHtml ) Q_PROPERTY ( Qt::Alignment alignment READ alignment WRITE setAlignment ) Q_PROPERTY ( Qt::TextElideMode elideMode READ elideMode WRITE setElideMode ) Q_PROPERTY ( Hb::TextWrapping textWrapping READ textWrapping WRITE setTextWrapping ) Q_PROPERTY ( QColor textColor READ textColor WRITE setTextColor ) Q_PROPERTY ( HbIcon icon READ icon WRITE setIcon ) Q_PROPERTY ( Qt::AspectRatioMode aspectRatioMode READ aspectRatioMode WRITE setAspectRatioMode ):HbLabel ( QGraphicsItem * parent )
+//    {
+//    SMC_MOCK_METHOD1( void, QString plainText READ plainText WRITE setPlainText ) Q_PROPERTY ( QString html READ html WRITE setHtml ) Q_PROPERTY ( Qt::Alignment alignment READ alignment WRITE setAlignment ) Q_PROPERTY ( Qt::TextElideMode elideMode READ elideMode WRITE setElideMode ) Q_PROPERTY ( Hb::TextWrapping textWrapping READ textWrapping WRITE setTextWrapping ) Q_PROPERTY ( QColor textColor READ textColor WRITE setTextColor ) Q_PROPERTY ( HbIcon icon READ icon WRITE setIcon ) Q_PROPERTY ( Qt::AspectRatioMode aspectRatioMode READ aspectRatioMode WRITE setAspectRatioMode ):HbLabel ( QGraphicsItem *, parent )
+//    }
+
+
+// -----------------------------------------------------------------------------
+// HbLabel::HbLabel
+// -----------------------------------------------------------------------------
+//
+HbLabel::HbLabel( 
+        const QString & displayText,
+        QGraphicsItem * parent )
+    {
+    }
+
+// -----------------------------------------------------------------------------
+// HbLabel::HbLabel
+// -----------------------------------------------------------------------------
+//
+HbLabel::HbLabel(QGraphicsItem *parent)
+    {
+    }
+
+// -----------------------------------------------------------------------------
+// HbLabel::~HbLabel
+// -----------------------------------------------------------------------------
+//
+HbLabel::~HbLabel(  )
+    {
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLabel::plainText
+// -----------------------------------------------------------------------------
+//
+QString HbLabel::plainText(  ) const
+    {
+    SMC_MOCK_METHOD0( QString )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLabel::html
+// -----------------------------------------------------------------------------
+//
+QString HbLabel::html(  ) const
+    {
+    SMC_MOCK_METHOD0( QString )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLabel::setElideMode
+// -----------------------------------------------------------------------------
+//
+void HbLabel::setElideMode( 
+        Qt::TextElideMode elideMode )
+    {
+    SMC_MOCK_METHOD1( void, Qt::TextElideMode, elideMode )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLabel::elideMode
+// -----------------------------------------------------------------------------
+//
+Qt::TextElideMode HbLabel::elideMode(  ) const
+    {
+    SMC_MOCK_METHOD0( Qt::TextElideMode )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLabel::setTextWrapping
+// -----------------------------------------------------------------------------
+//
+void HbLabel::setTextWrapping( 
+        Hb::TextWrapping mode )
+    {
+    SMC_MOCK_METHOD1( void, Hb::TextWrapping, mode )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLabel::textWrapping
+// -----------------------------------------------------------------------------
+//
+Hb::TextWrapping HbLabel::textWrapping(  ) const
+    {
+    SMC_MOCK_METHOD0( Hb::TextWrapping )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLabel::setIcon
+// -----------------------------------------------------------------------------
+//
+void HbLabel::setIcon( 
+        const HbIcon & icon )
+    {
+    SMC_MOCK_METHOD1( void, const HbIcon &, icon )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLabel::icon
+// -----------------------------------------------------------------------------
+//
+HbIcon HbLabel::icon(  ) const
+    {
+    SMC_MOCK_METHOD0( HbIcon )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLabel::setAspectRatioMode
+// -----------------------------------------------------------------------------
+//
+void HbLabel::setAspectRatioMode( 
+        Qt::AspectRatioMode mode )
+    {
+    SMC_MOCK_METHOD1( void, Qt::AspectRatioMode, mode )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLabel::aspectRatioMode
+// -----------------------------------------------------------------------------
+//
+Qt::AspectRatioMode HbLabel::aspectRatioMode(  ) const
+    {
+    SMC_MOCK_METHOD0( Qt::AspectRatioMode )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLabel::setAlignment
+// -----------------------------------------------------------------------------
+//
+void HbLabel::setAlignment( 
+        Qt::Alignment alignment )
+    {
+    //SMC_MOCK_METHOD1( void, Qt::Alignment, alignment )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLabel::alignment
+// -----------------------------------------------------------------------------
+//
+Qt::Alignment HbLabel::alignment(  ) const
+    {
+    //SMC_MOCK_METHOD0( Qt::Alignment )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLabel::setTextColor
+// -----------------------------------------------------------------------------
+//
+void HbLabel::setTextColor( 
+        const QColor & textColor )
+    {
+    SMC_MOCK_METHOD1( void, const QColor &, textColor )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLabel::textColor
+// -----------------------------------------------------------------------------
+//
+QColor HbLabel::textColor(  ) const
+    {
+    SMC_MOCK_METHOD0( QColor )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLabel::isEmpty
+// -----------------------------------------------------------------------------
+//
+bool HbLabel::isEmpty(  ) const
+    {
+    SMC_MOCK_METHOD0( bool )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLabel::primitive
+// -----------------------------------------------------------------------------
+//
+QGraphicsItem * HbLabel::primitive( 
+        HbStyle::Primitive primitive ) const
+    {
+    SMC_MOCK_METHOD1( QGraphicsItem *, HbStyle::Primitive, primitive )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLabel::type
+// -----------------------------------------------------------------------------
+//
+int HbLabel::type(  ) const
+    {
+    SMC_MOCK_METHOD0( int )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLabel::setPlainText
+// -----------------------------------------------------------------------------
+//
+void HbLabel::setPlainText( 
+        const QString & text )
+    {
+    SMC_MOCK_METHOD1( void, const QString &, text )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLabel::setHtml
+// -----------------------------------------------------------------------------
+//
+void HbLabel::setHtml( 
+        const QString & text )
+    {
+    SMC_MOCK_METHOD1( void, const QString &, text )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLabel::setNumber
+// -----------------------------------------------------------------------------
+//
+void HbLabel::setNumber( 
+        int number )
+    {
+    SMC_MOCK_METHOD1( void, int, number )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLabel::setNumber
+// -----------------------------------------------------------------------------
+//
+void HbLabel::setNumber( 
+        qreal number )
+    {
+    SMC_MOCK_METHOD1( void, qreal, number )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLabel::updatePrimitives
+// -----------------------------------------------------------------------------
+//
+void HbLabel::updatePrimitives(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLabel::clear
+// -----------------------------------------------------------------------------
+//
+void HbLabel::clear(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLabel::HbLabel
+// -----------------------------------------------------------------------------
+//
+HbLabel::HbLabel( 
+        HbLabelPrivate & dd,
+        QGraphicsItem * parent )
+    {
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLabel::initStyleOption
+// -----------------------------------------------------------------------------
+//
+void HbLabel::initStyleOption( 
+        HbStyleOptionLabel * option ) const
+    {
+    SMC_MOCK_METHOD1( void, HbStyleOptionLabel *, option )
+    }
+
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_hbmarqueeitem.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_hbmarqueeitem.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,233 @@
+/* 
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include <QDebug>
+#include <smcmockclassincludes.h>
+#include <hbmarqueeitem.h>
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// HbMarqueeItem::HbMarqueeItem
+// -----------------------------------------------------------------------------
+//
+HbMarqueeItem::HbMarqueeItem( 
+        QGraphicsItem * parent )
+    //:
+    //HbWidgetBase( /*parent*/ )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbMarqueeItem::HbMarqueeItem
+// -----------------------------------------------------------------------------
+//
+HbMarqueeItem::HbMarqueeItem( 
+        const QString & text,
+        QGraphicsItem * parent )
+    //:
+    //HbWidgetBase( /*text, parent*/ )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbMarqueeItem::~HbMarqueeItem
+// -----------------------------------------------------------------------------
+//
+HbMarqueeItem::~HbMarqueeItem(  )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbMarqueeItem::text
+// -----------------------------------------------------------------------------
+//
+QString HbMarqueeItem::text(  ) const
+    {
+    SMC_MOCK_METHOD0( QString )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbMarqueeItem::setTextColor
+// -----------------------------------------------------------------------------
+//
+void HbMarqueeItem::setTextColor( 
+        const QColor & color )
+    {
+    SMC_MOCK_METHOD1( void, const QColor &, color )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbMarqueeItem::textColor
+// -----------------------------------------------------------------------------
+//
+QColor HbMarqueeItem::textColor(  ) const
+    {
+    SMC_MOCK_METHOD0( QColor )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbMarqueeItem::isAnimating
+// -----------------------------------------------------------------------------
+//
+bool HbMarqueeItem::isAnimating(  ) const
+    {
+    SMC_MOCK_METHOD0( bool )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbMarqueeItem::loopCount
+// -----------------------------------------------------------------------------
+//
+int HbMarqueeItem::loopCount(  ) const
+    {
+    SMC_MOCK_METHOD0( int )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbMarqueeItem::setLoopCount
+// -----------------------------------------------------------------------------
+//
+void HbMarqueeItem::setLoopCount( 
+        int count )
+    {
+    SMC_MOCK_METHOD1( void, int, count )
+    }
+
+// -----------------------------------------------------------------------------
+// HbMarqueeItem::setText
+// -----------------------------------------------------------------------------
+//
+void HbMarqueeItem::setText( 
+        const QString & text )
+    {
+    SMC_MOCK_METHOD1( void, const QString &, text )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbMarqueeItem::startAnimation
+// -----------------------------------------------------------------------------
+//
+void HbMarqueeItem::startAnimation(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbMarqueeItem::stopAnimation
+// -----------------------------------------------------------------------------
+//
+void HbMarqueeItem::stopAnimation(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbMarqueeItem::animationStarted
+// -----------------------------------------------------------------------------
+//
+void HbMarqueeItem::animationStarted(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbMarqueeItem::animationStopped
+// -----------------------------------------------------------------------------
+//
+void HbMarqueeItem::animationStopped(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbMarqueeItem::sizeHint
+// -----------------------------------------------------------------------------
+//
+QSizeF HbMarqueeItem::sizeHint( 
+        Qt::SizeHint which,
+        const QSizeF & constraint ) const
+    {
+    SMC_MOCK_METHOD2( QSizeF, Qt::SizeHint, which, 
+        const QSizeF &, constraint )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbMarqueeItem::changeEvent
+// -----------------------------------------------------------------------------
+//
+void HbMarqueeItem::changeEvent( 
+        QEvent * event )
+    {
+    SMC_MOCK_METHOD1( void, QEvent *, event )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbMarqueeItem::resizeEvent
+// -----------------------------------------------------------------------------
+//
+void HbMarqueeItem::resizeEvent( 
+        QGraphicsSceneResizeEvent *  )
+    {
+    //SMC_MOCK_METHOD1( void, QGraphicsSceneResizeEvent *, event )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbMarqueeItem::itemChange
+// -----------------------------------------------------------------------------
+//
+QVariant HbMarqueeItem::itemChange( 
+        GraphicsItemChange change,
+        const QVariant & value )
+    {
+    SMC_MOCK_METHOD2( QVariant, GraphicsItemChange, change, 
+        const QVariant &, value )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbMarqueeItem::HbMarqueeItem
+// -----------------------------------------------------------------------------
+//
+HbMarqueeItem::HbMarqueeItem( 
+        HbMarqueeItemPrivate & dd,
+        QGraphicsItem * parent )
+    //:
+    //HbWidgetBase( /*dd, parent*/ )
+    {
+    
+    }
+
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_hbstyleoptionlabel.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_hbstyleoptionlabel.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,56 @@
+/** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include <QDebug>
+#include <smcmockclassincludes.h>
+#include "hbstyleoptionlabel.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// HbStyleOptionLabel::HbStyleOptionLabel
+// -----------------------------------------------------------------------------
+//
+HbStyleOptionLabel::HbStyleOptionLabel(  )
+    //:
+    //HbStyleOption( /**/ )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbStyleOptionLabel::HbStyleOptionLabel
+// -----------------------------------------------------------------------------
+//
+HbStyleOptionLabel::HbStyleOptionLabel( 
+        const HbStyleOptionLabel & other )
+    //:
+    //HbStyleOption( /*other*/ )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbStyleOptionLabel::~HbStyleOptionLabel
+// -----------------------------------------------------------------------------
+//
+HbStyleOptionLabel::~HbStyleOptionLabel(  )
+    {
+    
+    }
+
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_hbwidget.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_hbwidget.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,485 @@
+/* 
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include <QDebug>
+#include <smcmockclassincludes.h>
+#include <hbwidget.h>
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// HbWidget::HbWidget
+// -----------------------------------------------------------------------------
+//
+HbWidget::HbWidget( 
+        QGraphicsItem * ,
+        Qt::WindowFlags  )
+    //:
+    //HbWidgetBase( /*parent, wFlags*/ )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::~HbWidget
+// -----------------------------------------------------------------------------
+//
+HbWidget::~HbWidget(  )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::event
+// -----------------------------------------------------------------------------
+//
+bool HbWidget::event( 
+        QEvent *  )
+    {
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::setStyle
+// -----------------------------------------------------------------------------
+//
+void HbWidget::setStyle( 
+        HbStyle *  )
+    {
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::style
+// -----------------------------------------------------------------------------
+//
+HbStyle * HbWidget::style(  ) const
+    {
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::clearActions
+// -----------------------------------------------------------------------------
+//
+void HbWidget::clearActions(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::pluginBaseId
+// -----------------------------------------------------------------------------
+//
+int HbWidget::pluginBaseId(  ) const
+    {
+    SMC_MOCK_METHOD0( int )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::mainWindow
+// -----------------------------------------------------------------------------
+//
+HbMainWindow * HbWidget::mainWindow(  ) const
+    {
+   // SMC_MOCK_METHOD0( HbMainWindow * )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::primitive
+// -----------------------------------------------------------------------------
+//
+QGraphicsItem * HbWidget::primitive( 
+        HbStyle::Primitive  ) const
+    {
+  //  SMC_MOCK_METHOD1( QGraphicsItem *, HbStyle::Primitive, primitive )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::setFocusOrientation
+// -----------------------------------------------------------------------------
+//
+void HbWidget::setFocusOrientation( 
+        Qt::Orientations ,
+        Qt::Orientations  )
+    {
+   // SMC_MOCK_METHOD2( void, Qt::Orientations, previous, 
+     //   Qt::Orientations, next )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::keyForFocusNextChild
+// -----------------------------------------------------------------------------
+//
+QKeySequence HbWidget::keyForFocusNextChild(  ) const
+    {
+   // SMC_MOCK_METHOD0( QKeySequence )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::keyForFocusPreviousChild
+// -----------------------------------------------------------------------------
+//
+QKeySequence HbWidget::keyForFocusPreviousChild(  ) const
+    {
+  //  SMC_MOCK_METHOD0( QKeySequence )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::setKeyFocusMode
+// -----------------------------------------------------------------------------
+//
+void HbWidget::setKeyFocusMode( 
+        const QKeySequence &  )
+    {
+//    SMC_MOCK_METHOD1( void, const QKeySequence &, key )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::keyFocusMode
+// -----------------------------------------------------------------------------
+//
+QKeySequence HbWidget::keyFocusMode(  ) const
+    {
+//    SMC_MOCK_METHOD0( QKeySequence )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::lastFocusedChild
+// -----------------------------------------------------------------------------
+//
+QGraphicsItem * HbWidget::lastFocusedChild(  ) const
+    {
+ //   SMC_MOCK_METHOD0( QGraphicsItem * )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::setFocusOrder
+// -----------------------------------------------------------------------------
+//
+void HbWidget::setFocusOrder( 
+        QGraphicsItem * ,
+        QGraphicsItem *  )
+    {
+   // SMC_MOCK_METHOD2( void, QGraphicsItem *, first, 
+     //   QGraphicsItem *, second )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::setFocusDelegation
+// -----------------------------------------------------------------------------
+//
+void HbWidget::setFocusDelegation( 
+        HbWidget::FocusDelegation  )
+    {
+ //   SMC_MOCK_METHOD1( void, HbWidget::FocusDelegation, focusDelegation )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::focusDelegation
+// -----------------------------------------------------------------------------
+//
+HbWidget::FocusDelegation HbWidget::focusDelegation(  ) const
+    {
+  //  SMC_MOCK_METHOD0( HbWidget::FocusDelegation )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::setFocusLooping
+// -----------------------------------------------------------------------------
+//
+void HbWidget::setFocusLooping( 
+        bool enable )
+    {
+    SMC_MOCK_METHOD1( void, bool, enable )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::hasFocusLooping
+// -----------------------------------------------------------------------------
+//
+bool HbWidget::hasFocusLooping(  ) const
+    {
+    SMC_MOCK_METHOD0( bool )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::setFocusMode
+// -----------------------------------------------------------------------------
+//
+void HbWidget::setFocusMode( 
+        HbWidget::FocusMode )
+    {
+   // SMC_MOCK_METHOD1( void, HbWidget::, FocusMode )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::focusMode
+// -----------------------------------------------------------------------------
+//
+HbWidget::FocusMode HbWidget::focusMode(  ) const
+    {
+  //  SMC_MOCK_METHOD0( HbWidget::FocusMode )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::setFocusHighlight
+// -----------------------------------------------------------------------------
+//
+void HbWidget::setFocusHighlight( 
+        HbStyle::Primitive ,
+        HbWidget::FocusHighlight  )
+    {
+  //  SMC_MOCK_METHOD2( void, HbStyle::Primitive, type, 
+    //    HbWidget::FocusHighlight, focusHighlight )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::focusHighlight
+// -----------------------------------------------------------------------------
+//
+HbStyle::Primitive HbWidget::focusHighlight( 
+        HbWidget::FocusHighlight  )
+    {
+ //   SMC_MOCK_METHOD1( HbStyle::Primitive, HbWidget::FocusHighlight, focusHighlight )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::setBackgroundItem
+// -----------------------------------------------------------------------------
+//
+void HbWidget::setBackgroundItem( 
+        HbStyle::Primitive ,
+        int  )
+    {
+  //  SMC_MOCK_METHOD2( void, HbStyle::Primitive, type, 
+    //    int, zValue )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::setBackgroundItem
+// -----------------------------------------------------------------------------
+//
+void HbWidget::setBackgroundItem( 
+        QGraphicsItem * ,
+        int  )
+    {
+   // SMC_MOCK_METHOD2( void, QGraphicsItem *, item, 
+     //   int, zValue )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::backgroundItem
+// -----------------------------------------------------------------------------
+//
+QGraphicsItem * HbWidget::backgroundItem(  ) const
+    {
+   // SMC_MOCK_METHOD0( QGraphicsItem * )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::overrideFeedback
+// -----------------------------------------------------------------------------
+//
+HbFeedback::InstantEffect HbWidget::overrideFeedback( 
+        Hb::InstantInteraction  ) const
+    {
+  //  SMC_MOCK_METHOD1( HbFeedback::InstantEffect, Hb::InstantInteraction, interaction )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::overrideContinuousFeedback
+// -----------------------------------------------------------------------------
+//
+HbFeedback::ContinuousEffect HbWidget::overrideContinuousFeedback( 
+        Hb::ContinuousInteraction ,
+        int *  ) const
+    {
+  //  SMC_MOCK_METHOD2( HbFeedback::ContinuousEffect, Hb::ContinuousInteraction, interaction, 
+    //    int *, intensity )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::recreatePrimitives
+// -----------------------------------------------------------------------------
+//
+void HbWidget::recreatePrimitives(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::updatePrimitives
+// -----------------------------------------------------------------------------
+//
+void HbWidget::updatePrimitives(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::focusInEvent
+// -----------------------------------------------------------------------------
+//
+void HbWidget::focusInEvent( 
+        QFocusEvent *  )
+    {
+ //   SMC_MOCK_METHOD1( void, QFocusEvent *, event )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::focusOutEvent
+// -----------------------------------------------------------------------------
+//
+void HbWidget::focusOutEvent( 
+        QFocusEvent *  )
+    {
+  //  SMC_MOCK_METHOD1( void, QFocusEvent *, event )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::resizeEvent
+// -----------------------------------------------------------------------------
+//
+void HbWidget::resizeEvent( 
+        QGraphicsSceneResizeEvent *  )
+    {
+  //  SMC_MOCK_METHOD1( void, QGraphicsSceneResizeEvent *, event )
+    }
+
+// -----------------------------------------------------------------------------
+// HbWidget::changeEvent
+// -----------------------------------------------------------------------------
+//
+void HbWidget::changeEvent( 
+        QEvent * event )
+    {
+    SMC_MOCK_METHOD1( void, QEvent *, event )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::itemChange
+// -----------------------------------------------------------------------------
+//
+QVariant HbWidget::itemChange( 
+        GraphicsItemChange ,
+        const QVariant &  )
+    {
+ //   SMC_MOCK_METHOD2( QVariant, GraphicsItemChange, change, 
+   //     const QVariant &, value )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::polishEvent
+// -----------------------------------------------------------------------------
+//
+void HbWidget::polishEvent(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::polish
+// -----------------------------------------------------------------------------
+//
+void HbWidget::polish( 
+        HbStyleParameters &  )
+    {
+ //   SMC_MOCK_METHOD1( void, HbStyleParameters &, params )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::repolish
+// -----------------------------------------------------------------------------
+//
+void HbWidget::repolish(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::setPluginBaseId
+// -----------------------------------------------------------------------------
+//
+void HbWidget::setPluginBaseId( 
+        int baseId )
+    {
+    SMC_MOCK_METHOD1( void, int, baseId )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::gestureEvent
+// -----------------------------------------------------------------------------
+//
+void HbWidget::gestureEvent( 
+        QGestureEvent *  )
+    {
+  //  SMC_MOCK_METHOD1( void, QGestureEvent *, event )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::HbWidget
+// -----------------------------------------------------------------------------
+//
+HbWidget::HbWidget( 
+        HbWidgetPrivate & ,
+        QGraphicsItem * ,
+        Qt::WindowFlags  )
+    //:
+    //HbWidgetBase( /*dd, parent, wFlags*/ )
+    {
+    
+    }
+
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_infowidget.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_infowidget.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,380 @@
+/* 
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include <QDebug>
+#include <smcmockclassincludes.h>
+#include <hbanchorlayout.h>
+#include <hbwidget.h>
+#include <hbiconitem.h>
+#include <hbmarqueeitem.h>
+#include <hbfontspec.h>
+#include <hbdialog.h>
+#include <hblabel.h>
+#include <hbaction.h>
+#include <hbcheckbox.h>
+#include <hbpushbutton.h>
+#include <QPainter>
+#include <QPainterPath>
+#include <QBrush>
+#include <QGraphicsLinearLayout>
+#include "infowidget.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// InfoWidget::InfoWidget
+// -----------------------------------------------------------------------------
+//
+InfoWidget::InfoWidget( 
+        QGraphicsItem * parent,
+        Qt::WindowFlags flags )
+    : HbWidget(parent, flags)
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::~InfoWidget
+// -----------------------------------------------------------------------------
+//
+InfoWidget::~InfoWidget(  )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::boundingRect
+// -----------------------------------------------------------------------------
+//
+QRectF InfoWidget::boundingRect(  ) const
+    {
+    SMC_MOCK_METHOD0( QRectF )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::shape
+// -----------------------------------------------------------------------------
+//
+QPainterPath InfoWidget::shape(  ) const
+    {
+    SMC_MOCK_METHOD0( QPainterPath )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::sizeHint
+// -----------------------------------------------------------------------------
+//
+QSizeF InfoWidget::sizeHint( 
+        Qt::SizeHint which,
+        const QSizeF & constraint ) const
+    {
+    SMC_MOCK_METHOD2( QSizeF, Qt::SizeHint, which, 
+        const QSizeF &, constraint )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::sizePolicy
+// -----------------------------------------------------------------------------
+//
+QSizePolicy InfoWidget::sizePolicy(  ) const
+    {
+    SMC_MOCK_METHOD0( QSizePolicy )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::homeZoneDisplay
+// -----------------------------------------------------------------------------
+//
+QString InfoWidget::homeZoneDisplay()
+    {
+    SMC_MOCK_METHOD0( QString );
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::setHomeZoneDisplay
+// -----------------------------------------------------------------------------
+//
+void InfoWidget::setHomeZoneDisplay( 
+        QString value )
+    {
+    SMC_MOCK_METHOD1( void, QString, value )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::mcnDisplay
+// -----------------------------------------------------------------------------
+//
+QString InfoWidget::mcnDisplay(  )
+    {
+    SMC_MOCK_METHOD0( QString )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::setMcnDisplay
+// -----------------------------------------------------------------------------
+//
+void InfoWidget::setMcnDisplay( 
+        QString value )
+    {
+    SMC_MOCK_METHOD1( void, QString, value )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::activeLineDisplay
+// -----------------------------------------------------------------------------
+//
+QString InfoWidget::activeLineDisplay(  )
+    {
+    SMC_MOCK_METHOD0( QString )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::setActiveLineDisplay
+// -----------------------------------------------------------------------------
+//
+void InfoWidget::setActiveLineDisplay( 
+        QString value )
+    {
+    SMC_MOCK_METHOD1( void, QString, value )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::satDisplay
+// -----------------------------------------------------------------------------
+//
+QString InfoWidget::satDisplay(  )
+    {
+    SMC_MOCK_METHOD0( QString )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::setSatDisplay
+// -----------------------------------------------------------------------------
+//
+void InfoWidget::setSatDisplay( 
+        QString value )
+    {
+    SMC_MOCK_METHOD1( void, QString, value )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::onInitialize
+// -----------------------------------------------------------------------------
+//
+void InfoWidget::onInitialize(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::onUninitialize
+// -----------------------------------------------------------------------------
+//
+void InfoWidget::onUninitialize(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::onShow
+// -----------------------------------------------------------------------------
+//
+void InfoWidget::onShow(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::onHide
+// -----------------------------------------------------------------------------
+//
+void InfoWidget::onHide(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::readModel
+// -----------------------------------------------------------------------------
+//
+void InfoWidget::readModel(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::handleModelError
+// -----------------------------------------------------------------------------
+//
+void InfoWidget::handleModelError( 
+        int operation,
+        int errorCode )
+    {
+    SMC_MOCK_METHOD2( void, int, operation, 
+        int, errorCode )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::homeZoneDisplaySettingChanged
+// -----------------------------------------------------------------------------
+//
+void InfoWidget::homeZoneDisplaySettingChanged( 
+        int state )
+    {
+    SMC_MOCK_METHOD1( void, int, state )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::mcnDisplaySettingChanged
+// -----------------------------------------------------------------------------
+//
+void InfoWidget::mcnDisplaySettingChanged( 
+        int state )
+    {
+    SMC_MOCK_METHOD1( void, int, state )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::activeLineDisplaySettingChanged
+// -----------------------------------------------------------------------------
+//
+void InfoWidget::activeLineDisplaySettingChanged( 
+        int state )
+    {
+    SMC_MOCK_METHOD1( void, int, state )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::satDisplaySettingChanged
+// -----------------------------------------------------------------------------
+//
+void InfoWidget::satDisplaySettingChanged( 
+        int state )
+    {
+    SMC_MOCK_METHOD1( void, int, state )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::settingsEditingFinished
+// -----------------------------------------------------------------------------
+//
+void InfoWidget::settingsEditingFinished(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::paint
+// -----------------------------------------------------------------------------
+//
+void InfoWidget::paint( 
+        QPainter * painter,
+        const QStyleOptionGraphicsItem * option,
+        QWidget * widget )
+    {
+    SMC_MOCK_METHOD3( void, QPainter *, painter, 
+        const QStyleOptionGraphicsItem *, option, 
+        QWidget *, widget )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::mousePressEvent
+// -----------------------------------------------------------------------------
+//
+void InfoWidget::mousePressEvent( 
+        QGraphicsSceneMouseEvent * event )
+    {
+    SMC_MOCK_METHOD1( void, QGraphicsSceneMouseEvent *, event )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::mouseReleaseEvent
+// -----------------------------------------------------------------------------
+//
+void InfoWidget::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+    {
+    SMC_MOCK_METHOD1( void, QGraphicsSceneMouseEvent *, event )    
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::mouseMoveEvent
+// -----------------------------------------------------------------------------
+//
+void InfoWidget::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+    {
+    SMC_MOCK_METHOD1( void, QGraphicsSceneMouseEvent *, event )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::updateInfoDisplay
+// -----------------------------------------------------------------------------
+//
+void InfoWidget::updateInfoDisplay(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::initializePreferences
+// -----------------------------------------------------------------------------
+//
+void InfoWidget::initializePreferences(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidget::changeEvent
+// -----------------------------------------------------------------------------
+//
+void InfoWidget::changeEvent( 
+        QEvent * event )
+    {
+    SMC_MOCK_METHOD1( void, QEvent *, event )
+    }
+
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_infowidgetengine.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_infowidgetengine.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,133 @@
+/* 
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include <QDebug>
+#include <smcmockclassincludes.h>
+#include "infowidgetnetworkhandler.h"
+#include "infowidgetengine.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// InfoWidgetEngine::InfoWidgetEngine
+// -----------------------------------------------------------------------------
+//
+InfoWidgetEngine::InfoWidgetEngine( 
+        QObject * parent )
+    :QObject( parent )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetEngine::~InfoWidgetEngine
+// -----------------------------------------------------------------------------
+//
+InfoWidgetEngine::~InfoWidgetEngine(  )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetEngine::modelData
+// -----------------------------------------------------------------------------
+//
+const InfoWidgetEngine::ModelData & InfoWidgetEngine::modelData(  ) const
+    {
+    SMC_MOCK_METHOD0( const InfoWidgetEngine::ModelData & )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetEngine::logModelData
+// -----------------------------------------------------------------------------
+//
+void InfoWidgetEngine::logModelData(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+// -----------------------------------------------------------------------------
+// InfoWidgetEngine::updateNetworkDataToModel
+// -----------------------------------------------------------------------------
+//
+void InfoWidgetEngine::updateNetworkDataToModel(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetEngine::updateSatDataToModel
+// -----------------------------------------------------------------------------
+//
+void InfoWidgetEngine::updateSatDataToModel(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetEngine::updateLineDataToModel
+// -----------------------------------------------------------------------------
+//
+void InfoWidgetEngine::updateLineDataToModel(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetEngine::handleNetworkError
+// -----------------------------------------------------------------------------
+//
+void InfoWidgetEngine::handleNetworkError( 
+        int operation,
+        int errorCode )
+    {
+    SMC_MOCK_METHOD2( void, int, operation, 
+        int, errorCode )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetEngine::handleSatError
+// -----------------------------------------------------------------------------
+//
+void InfoWidgetEngine::handleSatError( 
+        int operation,
+        int errorCode )
+    {
+    SMC_MOCK_METHOD2( void, int, operation, 
+        int, errorCode )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetEngine::handleLineError
+// -----------------------------------------------------------------------------
+//
+void InfoWidgetEngine::handleLineError( 
+        int operation,
+        int errorCode )
+    {
+    SMC_MOCK_METHOD2( void, int, operation, 
+        int, errorCode )
+    }
+
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_infowidgetlayoutmanager.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_infowidgetlayoutmanager.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,229 @@
+/* 
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include <QDebug>
+#include <QObject>
+#include <smcmockclassincludes.h>
+#include "infowidgetlayoutmanager.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// InfoWidgetLayoutManager::InfoWidgetLayoutManager
+// -----------------------------------------------------------------------------
+//
+InfoWidgetLayoutManager::InfoWidgetLayoutManager( 
+        QObject * parent )
+    :QObject( parent )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetLayoutManager::~InfoWidgetLayoutManager
+// -----------------------------------------------------------------------------
+//
+InfoWidgetLayoutManager::~InfoWidgetLayoutManager(  )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetLayoutManager::currentDisplayRole
+// -----------------------------------------------------------------------------
+//
+InfoWidgetLayoutManager::DisplayRole InfoWidgetLayoutManager::currentDisplayRole(  )
+    {
+    SMC_MOCK_METHOD0( DisplayRole )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetLayoutManager::currentWidgetRoles
+// -----------------------------------------------------------------------------
+//
+QList <InfoWidgetLayoutManager::LayoutItemRole > 
+        InfoWidgetLayoutManager::currentWidgetRoles(  )
+    {
+    SMC_MOCK_METHOD0( QList <LayoutItemRole > )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetLayoutManager::layoutRows
+// -----------------------------------------------------------------------------
+//
+int InfoWidgetLayoutManager::layoutRows(  ) const
+    {
+    SMC_MOCK_METHOD0( int )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetLayoutManager::setLayoutRows
+// -----------------------------------------------------------------------------
+//
+void InfoWidgetLayoutManager::setLayoutRows( 
+        int rows )
+    {
+    SMC_MOCK_METHOD1( void, int, rows )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetLayoutManager::layoutInfoDisplay
+// -----------------------------------------------------------------------------
+//
+QGraphicsLayout * InfoWidgetLayoutManager::layoutInfoDisplay(  )
+    {
+    SMC_MOCK_METHOD0( QGraphicsLayout * )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetLayoutManager::layoutSettingsDisplay
+// -----------------------------------------------------------------------------
+//
+QGraphicsLayout * InfoWidgetLayoutManager::layoutSettingsDisplay(  )
+    {
+    SMC_MOCK_METHOD0( QGraphicsLayout * )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetLayoutManager::widgetRoles
+// -----------------------------------------------------------------------------
+//
+const QList <InfoWidgetLayoutManager::LayoutItemRole > 
+        InfoWidgetLayoutManager::widgetRoles(DisplayRole displayRole ) const
+    {
+    SMC_MOCK_METHOD1( 
+        const QList <InfoWidgetLayoutManager::LayoutItemRole >, 
+        DisplayRole, displayRole )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetLayoutManager::loadWidgets
+// -----------------------------------------------------------------------------
+//
+bool InfoWidgetLayoutManager::loadWidgets(
+        const DisplayRole displayRole, 
+        const QList<LayoutItemRole> &displayWidgets,
+        QMap<LayoutItemRole, QGraphicsWidget *> &widgetMap)
+    {
+    typedef QMap <LayoutItemRole, QGraphicsWidget *> & TYPE3;
+    SMC_MOCK_METHOD3( bool, const DisplayRole, displayRole, 
+        const QList<LayoutItemRole> &, displayWidgets, 
+        TYPE3, widgetMap )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetLayoutManager::loadWidget
+// -----------------------------------------------------------------------------
+//
+QGraphicsWidget* InfoWidgetLayoutManager::loadWidget(
+        InfoWidgetDocumentLoader &loader, 
+        DisplayRole displayRole, 
+        LayoutItemRole widgetRole)
+    {
+    SMC_MOCK_METHOD3( QGraphicsWidget *, InfoWidgetDocumentLoader &, loader, 
+        DisplayRole, displayRole, 
+        LayoutItemRole, widgetRole )
+    }
+
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetLayoutManager::getWidget
+// -----------------------------------------------------------------------------
+//
+QGraphicsWidget * InfoWidgetLayoutManager::getWidget( 
+        LayoutItemRole itemRole )
+    {
+    SMC_MOCK_METHOD1( QGraphicsWidget *, LayoutItemRole, itemRole )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetLayoutManager::contentWidget
+// -----------------------------------------------------------------------------
+//
+QGraphicsWidget * InfoWidgetLayoutManager::contentWidget(  )
+    {
+    SMC_MOCK_METHOD0( QGraphicsWidget * )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetLayoutManager::hideWidget
+// -----------------------------------------------------------------------------
+//
+void InfoWidgetLayoutManager::hideWidget( 
+        LayoutItemRole itemRole )
+    {
+    SMC_MOCK_METHOD1( void, LayoutItemRole, itemRole )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetLayoutManager::hideAll
+// -----------------------------------------------------------------------------
+//
+void InfoWidgetLayoutManager::hideAll(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetLayoutManager::showAll
+// -----------------------------------------------------------------------------
+//
+void InfoWidgetLayoutManager::showAll(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetDocumentLoader::InfoWidgetDocumentLoader
+// -----------------------------------------------------------------------------
+//
+InfoWidgetDocumentLoader::InfoWidgetDocumentLoader(  )
+    //:
+    //HbDocumentLoader( /**/ )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetDocumentLoader::createObject
+// -----------------------------------------------------------------------------
+//
+QObject * InfoWidgetDocumentLoader::createObject( 
+        const QString & type,
+        const QString & name )
+    {
+    SMC_MOCK_METHOD2( QObject *, const QString &, type, 
+        const QString &, name )
+    }
+
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_infowidgetnetworkhandler.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_infowidgetnetworkhandler.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,120 @@
+/* 
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include <QDebug>
+#include <smcmockclassincludes.h>
+#include <networkhandlingproxy.h>
+#include <cnwsession.h>
+#include "infowidgetnetworkhandler.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// InfoWidgetNetworkHandler::InfoWidgetNetworkHandler
+// -----------------------------------------------------------------------------
+//
+InfoWidgetNetworkHandler::InfoWidgetNetworkHandler( 
+        QObject * parent )
+    : 
+    QObject(parent), 
+    m_nwSession(0)
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetNetworkHandler::~InfoWidgetNetworkHandler
+// -----------------------------------------------------------------------------
+//
+InfoWidgetNetworkHandler::~InfoWidgetNetworkHandler(  )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetNetworkHandler::homeZoneTextTag
+// -----------------------------------------------------------------------------
+//
+QString InfoWidgetNetworkHandler::homeZoneTextTag(  ) const
+    {
+    SMC_MOCK_METHOD0( QString )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetNetworkHandler::homeZoneIndicatorType
+// -----------------------------------------------------------------------------
+//
+int InfoWidgetNetworkHandler::homeZoneIndicatorType(  ) const
+    {
+    SMC_MOCK_METHOD0( int )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetNetworkHandler::mcnName
+// -----------------------------------------------------------------------------
+//
+QString InfoWidgetNetworkHandler::mcnName(  ) const
+    {
+    SMC_MOCK_METHOD0( QString )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetNetworkHandler::mcnIndicatorType
+// -----------------------------------------------------------------------------
+//
+int InfoWidgetNetworkHandler::mcnIndicatorType(  ) const
+    {
+    SMC_MOCK_METHOD0( int )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetNetworkHandler::logCurrentInfo
+// -----------------------------------------------------------------------------
+//
+void InfoWidgetNetworkHandler::logCurrentInfo(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetNetworkHandler::HandleNetworkMessage
+// -----------------------------------------------------------------------------
+//
+void InfoWidgetNetworkHandler::HandleNetworkMessage( 
+        const TNWMessages aMessage )
+    {
+    SMC_MOCK_METHOD1( void, const TNWMessages, aMessage )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetNetworkHandler::HandleNetworkError
+// -----------------------------------------------------------------------------
+//
+void InfoWidgetNetworkHandler::HandleNetworkError( 
+        const TNWOperation aOperation,
+        TInt aErrorCode )
+    {
+    SMC_MOCK_METHOD2( void, const TNWOperation, aOperation, 
+        TInt, aErrorCode )
+    }
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_infowidgetpreferences.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_infowidgetpreferences.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,98 @@
+/* 
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include <QDebug>
+#include <smcmockclassincludes.h>
+#include "infowidgetpreferences.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// InfoWidgetPreferences::InfoWidgetPreferences
+// -----------------------------------------------------------------------------
+//
+InfoWidgetPreferences::InfoWidgetPreferences( 
+        QObject * parent ):
+    QObject( parent )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetPreferences::~InfoWidgetPreferences
+// -----------------------------------------------------------------------------
+//
+InfoWidgetPreferences::~InfoWidgetPreferences(  )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetPreferences::loadPreferences
+// -----------------------------------------------------------------------------
+//
+void InfoWidgetPreferences::loadPreferences(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetPreferences::storePreferences
+// -----------------------------------------------------------------------------
+//
+void InfoWidgetPreferences::storePreferences(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetPreferences::preference
+// -----------------------------------------------------------------------------
+//
+QString InfoWidgetPreferences::preference( 
+        Option preferenceId ) const
+    {
+    SMC_MOCK_METHOD1( QString, Option, preferenceId )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetPreferences::setPreference
+// -----------------------------------------------------------------------------
+//
+void InfoWidgetPreferences::setPreference( 
+        Option preferenceId,
+        const QString & preferenceString )
+    {
+    SMC_MOCK_METHOD2( void, Option, preferenceId, 
+        const QString &, preferenceString )
+    }
+
+
+// -----------------------------------------------------------------------------
+// InfoWidgetPreferences::visibleItemCount
+// -----------------------------------------------------------------------------
+//
+int InfoWidgetPreferences::visibleItemCount(  )
+    {
+    SMC_MOCK_METHOD0( int )
+    }
+
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_networkhandlingproxy.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_networkhandlingproxy.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,29 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  This file contains the header file of the class NetworkHandlingProxy.
+*
+*/
+
+#include <smcmockclassincludes.h>
+#include <networkhandlingproxy.h>
+#include <nwhandlingengine.h> 
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+CNWSession* CreateL( MNWMessageObserver& aMessage, TNWInfo& aTNWInfo )
+    {
+    SMC_MOCK_METHOD2(CNWSession*, 
+        MNWMessageObserver&, aMessage, 
+        TNWInfo&, aTNWInfo);
+    }
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_qserviceinterfacedescriptor.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_qserviceinterfacedescriptor.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,168 @@
+/* 
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include <QDebug>
+#include <QStringList>
+#include <smcmockclassincludes.h>
+#include "qserviceinterfacedescriptor.h"
+
+QTM_BEGIN_NAMESPACE
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// QServiceInterfaceDescriptor::QServiceInterfaceDescriptor
+// -----------------------------------------------------------------------------
+//
+QServiceInterfaceDescriptor::QServiceInterfaceDescriptor(  )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// QServiceInterfaceDescriptor::QServiceInterfaceDescriptor
+// -----------------------------------------------------------------------------
+//
+QServiceInterfaceDescriptor::QServiceInterfaceDescriptor( 
+        const QServiceInterfaceDescriptor & other )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// QServiceInterfaceDescriptor::~QServiceInterfaceDescriptor
+// -----------------------------------------------------------------------------
+//
+QServiceInterfaceDescriptor::~QServiceInterfaceDescriptor(  )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// QServiceInterfaceDescriptor::=
+// -----------------------------------------------------------------------------
+//
+QServiceInterfaceDescriptor & QServiceInterfaceDescriptor::operator=(const QServiceInterfaceDescriptor & other )
+    {
+    SMC_MOCK_METHOD1( QServiceInterfaceDescriptor &, const QServiceInterfaceDescriptor &, other )
+    }
+
+
+// -----------------------------------------------------------------------------
+// QServiceInterfaceDescriptor::=
+// -----------------------------------------------------------------------------
+//
+bool QServiceInterfaceDescriptor::operator==(const QServiceInterfaceDescriptor& other) const
+    {
+    SMC_MOCK_METHOD1( bool, const QServiceInterfaceDescriptor &, other )
+    }
+
+
+// -----------------------------------------------------------------------------
+// QServiceInterfaceDescriptor::serviceName
+// -----------------------------------------------------------------------------
+//
+QString QServiceInterfaceDescriptor::serviceName(  ) const
+    {
+    SMC_MOCK_METHOD0( QString )
+    }
+
+
+// -----------------------------------------------------------------------------
+// QServiceInterfaceDescriptor::interfaceName
+// -----------------------------------------------------------------------------
+//
+QString QServiceInterfaceDescriptor::interfaceName(  ) const
+    {
+    SMC_MOCK_METHOD0( QString )
+    }
+
+
+// -----------------------------------------------------------------------------
+// QServiceInterfaceDescriptor::majorVersion
+// -----------------------------------------------------------------------------
+//
+int QServiceInterfaceDescriptor::majorVersion(  ) const
+    {
+    SMC_MOCK_METHOD0( int )
+    }
+
+
+// -----------------------------------------------------------------------------
+// QServiceInterfaceDescriptor::minorVersion
+// -----------------------------------------------------------------------------
+//
+int QServiceInterfaceDescriptor::minorVersion(  ) const
+    {
+    SMC_MOCK_METHOD0( int )
+    }
+
+
+// -----------------------------------------------------------------------------
+// QServiceInterfaceDescriptor::isValid
+// -----------------------------------------------------------------------------
+//
+bool QServiceInterfaceDescriptor::isValid(  ) const
+    {
+    SMC_MOCK_METHOD0( bool )
+    }
+
+
+// -----------------------------------------------------------------------------
+// QServiceInterfaceDescriptor::scope
+// -----------------------------------------------------------------------------
+//
+QService::Scope QServiceInterfaceDescriptor::scope(  ) const
+    {
+    SMC_MOCK_METHOD0( QService::Scope )
+    }
+
+
+// -----------------------------------------------------------------------------
+// QServiceInterfaceDescriptor::attribute
+// -----------------------------------------------------------------------------
+//
+QVariant QServiceInterfaceDescriptor::attribute( 
+        QServiceInterfaceDescriptor::Attribute which ) const
+    {
+    SMC_MOCK_METHOD1( QVariant, QServiceInterfaceDescriptor::Attribute, which )
+    }
+
+
+// -----------------------------------------------------------------------------
+// QServiceInterfaceDescriptor::customAttribute
+// -----------------------------------------------------------------------------
+//
+QString QServiceInterfaceDescriptor::customAttribute( 
+        const QString & which ) const
+    {
+    SMC_MOCK_METHOD1( QString, const QString &, which )
+    }
+
+
+// -----------------------------------------------------------------------------
+// QServiceInterfaceDescriptor::customAttributes
+// -----------------------------------------------------------------------------
+//
+QStringList QServiceInterfaceDescriptor::customAttributes(  ) const
+    {
+    SMC_MOCK_METHOD0( QStringList )
+    }
+
+QTM_END_NAMESPACE
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_qserviceplugininterface.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_qserviceplugininterface.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,65 @@
+/* 
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include <QDebug>
+#include <smcmockclassincludes.h>
+#include <qserviceplugininterface.h>
+
+
+QTM_BEGIN_NAMESPACE
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// QServicePluginInterface::QServicePluginInterface
+// -----------------------------------------------------------------------------
+//
+QServicePluginInterface::QServicePluginInterface(  )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// QServicePluginInterface::~QServicePluginInterface
+// -----------------------------------------------------------------------------
+//
+QServicePluginInterface::~QServicePluginInterface(  )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// QServicePluginInterface::installService
+// -----------------------------------------------------------------------------
+//
+void QServicePluginInterface::installService(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// QServicePluginInterface::uninstallService
+// -----------------------------------------------------------------------------
+//
+void QServicePluginInterface::uninstallService(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+QTM_END_NAMESPACE
\ No newline at end of file
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_xqsettingskey.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_xqsettingskey.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,124 @@
+/* 
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include <QDebug>
+#include "xqsettingskey.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// XQSettingsKey::XQSettingsKey
+// -----------------------------------------------------------------------------
+//
+XQSettingsKey::XQSettingsKey( 
+        XQSettingsKey::Target target,
+        long int uid,
+        unsigned long int key )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// XQSettingsKey::~XQSettingsKey
+// -----------------------------------------------------------------------------
+//
+XQSettingsKey::~XQSettingsKey(  )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// XQSettingsKey::target
+// -----------------------------------------------------------------------------
+//
+XQSettingsKey::Target XQSettingsKey::target(  ) const
+    {
+    
+    XQSettingsKey::Target variable;
+    return variable;
+    }
+
+
+// -----------------------------------------------------------------------------
+// XQSettingsKey::uid
+// -----------------------------------------------------------------------------
+//
+long int XQSettingsKey::uid(  ) const
+    {
+    
+    return 0;
+    }
+
+
+// -----------------------------------------------------------------------------
+// XQSettingsKey::key
+// -----------------------------------------------------------------------------
+//
+unsigned long int XQSettingsKey::key(  ) const
+    {
+    
+    return 0;
+    }
+
+
+// -----------------------------------------------------------------------------
+// XQPublishAndSubscribeSettingsKey::XQPublishAndSubscribeSettingsKey
+// -----------------------------------------------------------------------------
+//
+XQPublishAndSubscribeSettingsKey::XQPublishAndSubscribeSettingsKey( 
+        long int categoryUid,
+        unsigned long int key ) : 
+        XQSettingsKey( XQSettingsKey::TargetPublishAndSubscribe, categoryUid, key )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// XQPublishAndSubscribeSettingsKey::~XQPublishAndSubscribeSettingsKey
+// -----------------------------------------------------------------------------
+//
+XQPublishAndSubscribeSettingsKey::~XQPublishAndSubscribeSettingsKey(  )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// XQCentralRepositorySettingsKey::XQCentralRepositorySettingsKey
+// -----------------------------------------------------------------------------
+//
+XQCentralRepositorySettingsKey::XQCentralRepositorySettingsKey( 
+        long int repositoryUid,
+        unsigned long int key ) : 
+        XQSettingsKey( XQSettingsKey::TargetCentralRepository, repositoryUid, key )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// XQCentralRepositorySettingsKey::~XQCentralRepositorySettingsKey
+// -----------------------------------------------------------------------------
+//
+XQCentralRepositorySettingsKey::~XQCentralRepositorySettingsKey(  )
+    {
+    
+    }
+
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_xqsettingsmanager.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/mocks/mock_xqsettingsmanager.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,111 @@
+/* 
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include <QDebug>
+#include <smcmockclassincludes.h>
+#include "xqsettingsmanager.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// XQSettingsManager::XQSettingsManager
+// -----------------------------------------------------------------------------
+//
+XQSettingsManager::XQSettingsManager( 
+        QObject * parent )
+    : QObject( parent )
+    {
+    
+    }
+
+// -----------------------------------------------------------------------------
+// XQSettingsManager::~XQSettingsManager
+// -----------------------------------------------------------------------------
+//
+XQSettingsManager::~XQSettingsManager(  )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// XQSettingsManager::readItemValue
+// -----------------------------------------------------------------------------
+//
+QVariant XQSettingsManager::readItemValue( 
+        const XQSettingsKey & key,
+        XQSettingsManager::Type type )
+    {
+    SMC_MOCK_METHOD2( QVariant, XQSettingsKey &, key, XQSettingsManager::Type, type )
+    }
+
+
+// -----------------------------------------------------------------------------
+// XQSettingsManager::writeItemValue
+// -----------------------------------------------------------------------------
+//
+bool XQSettingsManager::writeItemValue( 
+        const XQSettingsKey & key,
+        const QVariant & value )
+    {
+    Q_UNUSED( key )
+    Q_UNUSED( value )
+    bool variable;
+    return variable;
+    }
+
+
+// -----------------------------------------------------------------------------
+// XQSettingsManager::startMonitoring
+// -----------------------------------------------------------------------------
+//
+bool XQSettingsManager::startMonitoring( 
+        const XQSettingsKey & key,
+        XQSettingsManager::Type type )
+    {
+    Q_UNUSED( key )
+    Q_UNUSED( type )
+    bool variable;
+    return variable;
+    }
+
+
+// -----------------------------------------------------------------------------
+// XQSettingsManager::stopMonitoring
+// -----------------------------------------------------------------------------
+//
+bool XQSettingsManager::stopMonitoring( 
+        const XQSettingsKey & key )
+    {
+    Q_UNUSED( key )
+    bool variable;
+    return variable;
+    }
+
+
+// -----------------------------------------------------------------------------
+// XQSettingsManager::error
+// -----------------------------------------------------------------------------
+//
+XQSettingsManager::Error XQSettingsManager::error(  ) const
+    {
+    
+    XQSettingsManager::Error variable;
+    return variable;
+    }
+
+
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidget/inc/ut_infowidget.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidget/inc/ut_infowidget.h	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,99 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef UT_INFOWIDGET_H
+#define UT_INFOWIDGET_H
+
+#include <QtTest/QtTest>
+#include <hblabel.h>
+#include <hbstyleoptionlabel.h>
+#include <mockservice.h>
+#include <QColor>
+#include <QGraphicsWidget>
+#include "infowidgetengine.h"
+
+class InfoWidget;
+
+class UT_InfoWidget : public QObject, public MockService
+{
+    Q_OBJECT
+
+public:    
+    
+    UT_InfoWidget();
+    ~UT_InfoWidget();
+    
+private slots:
+
+    void init();
+    void cleanup();
+    
+    //From QGraphicsItem.
+    void t_boundingRect();
+    void t_shape();
+    void t_sizeHint();
+    void t_sizePolicy();
+    
+    void t_setHomeZoneDisplay(); 
+    void t_setMcnDisplay();
+    void t_setActiveLineDisplay();
+    void t_setSatDisplay();
+
+    void t_paint(); 
+    void t_mousePressEvent();
+    void t_mouseReleaseEvent(); 
+    void t_mouseMoveEvent(); 
+    void t_updateInfoDisplay();
+    void t_initializePreferences();
+    
+
+    void t_onInitialize();
+    void t_onUninitialize(); 
+    void t_onShow(); 
+    void t_onHide();
+    void t_readModel();
+    void t_handleModelError();
+    void t_homeZoneDisplaySettingChanged();
+    void t_mcnDisplaySettingChanged();
+    void t_activeLineDisplaySettingChanged();
+    void t_satDisplaySettingChanged();
+    void t_settingsEditingFinished();
+
+    // private implementation tests
+    void t_updateItemsVisibility();
+    void t_layoutInfoDisplay(); 
+    void t_layoutSettingsDisplay(); 
+    void t_initializeInfoDisplayItems();
+    void t_initializeSettingsDisplayItems();
+    void t_startChanges();
+    void t_endChanges();
+    
+    /*
+     * Not work from commmand prompt.
+     */
+    void t_changeEvent();
+    
+private:
+    
+    InfoWidget *m_infoWidget;
+    InfoWidgetEngine::ModelData m_modelData;
+    QColor m_qcolor;
+    QGraphicsWidget m_qgraphicswidget;
+
+};
+
+#endif // UT_INFOWIDGET_H
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidget/run_auto_tests_qt.bat
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidget/run_auto_tests_qt.bat	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,187 @@
+rem
+rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+rem All rights reserved.
+rem This component and the accompanying materials are made available
+rem under the terms of "Eclipse Public License v1.0"
+rem which accompanies this distribution, and is available
+rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
+rem
+rem Initial Contributors:
+rem Nokia Corporation - initial contribution.
+rem
+rem Contributors:
+rem
+rem Description:
+rem
+
+@echo off
+setlocal
+goto :startup 
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function DEFAULT
+::
+:: Modify this function
+::  - TESTED_SRC can be changed to match tested code.
+::    Specifies path from testcode group directory to
+::    tested code
+::  - Add test directories to be runned
+::    ie. "call :build ut_projectdirectory" or use
+::    "for /f %%a in ('dir /b ut_*') do call :build %%a"
+::    which compiles, instruments and runs all test directories
+::    starting with "ut_".
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:DEFAULT
+set TESTED_SRC=..\..\infowidget\src\*.cpp
+
+for /f %%a in ('dir /b ut_*') do call :build %%a
+if [%DOMODULESTESTS%] EQU [TRUE] (
+for /f %%a in ('dir /b mt_*') do call :build %%a
+)
+
+call :finish
+goto :END
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function STARTUP
+::
+:: Initializing script
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:STARTUP
+
+set BUILDTESTS=TRUE
+set RUNTESTS=TRUE
+set INSTRUMENT=TRUE
+set REMOVEINSTRUMENT=TRUE
+set DOMODULESTESTS=TRUE
+set ABLD_CALL=abld build winscw udeb -keepgoing
+set PATH_TO_DLL=\epoc32\release\winscw\udeb
+set PATH_TO_COVERAGE_DATA=\coverage_data
+
+if not exist %PATH_TO_COVERAGE_DATA% (
+mkdir %PATH_TO_COVERAGE_DATA%
+)
+
+if [%1] EQU [] ( goto default )
+
+call :%1
+call :%2
+call :%3
+call :%4
+call :%5
+echo Running tests = %RUNTESTS%
+echo Instrumenting tests = %INSTRUMENT%
+goto default
+
+:/NOCLEANUP
+set REMOVEINSTRUMENT=FALSE
+goto end
+
+:/NORUN
+set RUNTESTS=FALSE
+set REMOVEINSTRUMENT=FALSE
+goto end
+
+:/NOINSTRUMENT
+set INSTRUMENT=FALSE
+goto end
+
+:/NOBUILD
+set BUILDTESTS=FALSE
+goto end
+
+:/ONLYUNITTESTS
+set DOMODULESTESTS=FALSE
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function FINISH
+::
+:: Finishes run_auto_tests.bat
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:FINISH
+
+if [%RUNTESTS%] EQU [TRUE] (
+call :runtests
+)
+
+if [%INSTRUMENT%] EQU [TRUE] (
+call :calculatecoverage
+)
+
+if [%REMOVEINSTRUMENT%] EQU [TRUE] (
+call :removecoverage
+)
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function BUILD
+::    param directory
+::
+:: builds test from given directory
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:BUILD
+setlocal
+if [%BUILDTESTS%] EQU [FALSE] ( goto end )
+echo Building %1
+if not exist %1 ( 
+echo %1 Not found! 
+goto end
+)
+
+pushd .
+call cd %1
+call qmake
+call bldmake bldfiles
+call abld clean winscw udeb
+if [%INSTRUMENT%] EQU [TRUE] (
+call ctcwrap -n %PATH_TO_COVERAGE_DATA%\%1 -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=%TESTED_SRC%" %ABLD_CALL%
+) else (
+call %ABLD_CALL%
+)
+
+popd
+endlocal
+goto end
+
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function RUNTESTS
+::
+:: NOTE! Function assumes that test binary is named according to test directory.
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:RUNTESTS
+echo Running tests
+call %PATH_TO_DLL%\ut_infowidget.exe -- 
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function CALCULATECOVERAGE
+::
+:: Calculates test coverage. Generates html
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:CALCULATECOVERAGE
+echo Calculating coverage
+ctcpost %PATH_TO_COVERAGE_DATA%\*.sym | ctcmerge -i - -o profile.txt
+call ctc2html -t 70 -i profile.txt -o \coverage_result -nsb
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function REMOVECOVERAGE
+::
+:: Removes data from coverage directory
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:REMOVECOVERAGE
+echo Removing deleting coverage data
+call del %PATH_TO_COVERAGE_DATA%\*.sym
+call del %PATH_TO_COVERAGE_DATA%\*.dat
+call del profile.txt
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function END
+::
+:: Prints done
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:END
+echo Done!
\ No newline at end of file
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidget/src/ut_infowidget.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidget/src/ut_infowidget.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,647 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include <QString>
+#include <QPainter>
+#include <QEvent>
+#include <HbLabel>
+#include <HbStyleOptionLabel>
+#include <HbMarqueeItem>
+#include <HbPushButton>
+#include <HbCheckBox>
+#include <HbEvent>
+#include <HbColorScheme>
+#include "ut_infowidget.h"
+#include "qtestmains60.h"
+
+#define private friend class UT_InfoWidget;private
+#include "infowidget.h"
+
+// mocked dependencies
+#include "infowidgetpreferences.h"
+
+const QString KPreferenceOn("On"); 
+const QString KPreferenceOff("Off"); 
+const QString KMcnName("tnw1: 3233255435"); 
+
+/*!
+  UT_InfoWidget::UT_InfoWidget
+ */
+UT_InfoWidget::UT_InfoWidget() 
+    : m_infoWidget(0)
+{
+    m_modelData.setActiveLine(1);
+    m_modelData.setHomeZoneIndicatorType(1);
+    m_modelData.setMcnName(KMcnName);
+        
+    SmcDefaultValue<const InfoWidgetEngine::ModelData &>::SetL(m_modelData);
+    SmcDefaultValue<QColor>::SetL(m_qcolor);
+    SmcDefaultValue<QGraphicsWidget*>::SetL(&m_qgraphicswidget);
+}
+
+/*!
+  UT_InfoWidget::~UT_InfoWidget
+ */
+UT_InfoWidget::~UT_InfoWidget()
+{
+    delete m_infoWidget;
+}
+
+/*!
+  UT_InfoWidget::init
+ */
+void UT_InfoWidget::init()
+{
+    initialize();
+    
+    SmcDefaultValue<QString>::SetL("On");
+    SmcDefaultValue<InfoWidgetLayoutManager::DisplayRole>::SetL(
+        InfoWidgetLayoutManager::InfoDisplay);
+    m_infoWidget = new InfoWidget();
+    SmcDefaultValue<QString>::SetL("");
+    
+    QVERIFY(verify());
+}
+
+/*!
+  UT_InfoWidget::cleanup
+ */
+void UT_InfoWidget::cleanup()
+{
+    reset();
+    
+    delete m_infoWidget;
+    m_infoWidget = 0;
+}
+
+/*!
+  UT_InfoWidget::t_boundingRect
+ */
+void UT_InfoWidget::t_boundingRect()
+{
+    m_infoWidget->boundingRect();
+}
+
+/*!
+  UT_InfoWidget::t_shape
+ */
+void UT_InfoWidget::t_shape()
+{
+    m_infoWidget->shape();
+}
+
+/*!
+  UT_InfoWidget::t_sizeHint
+ */
+void UT_InfoWidget::t_sizeHint()
+{   
+    const QSizeF KMinimumSize(50, 50);
+    const QSizeF KPreferredSize(70, 70);
+    const QSizeF KDefaultSizeInfoDisplay(70, 160);
+    const QSizeF KDefaultSizeSettingsDisplay(250, 250);
+    
+    // current display is info display
+    EXPECT(InfoWidgetLayoutManager::currentDisplayRole)
+        .returns(InfoWidgetLayoutManager::InfoDisplay);
+    EXPECT(InfoWidgetLayoutManager::contentWidget);
+    m_qgraphicswidget.setMinimumSize(KMinimumSize);
+    m_qgraphicswidget.setPreferredSize(KPreferredSize);
+    Qt::SizeHint sizeHint = Qt::MinimumSize;
+    QSizeF constraint = QSizeF();
+    QVERIFY(KMinimumSize == m_infoWidget->sizeHint(sizeHint, constraint));
+    
+    // current display is settings display
+    EXPECT(InfoWidgetLayoutManager::currentDisplayRole)
+        .returns(InfoWidgetLayoutManager::SettingsDisplay);
+    EXPECT(InfoWidgetLayoutManager::currentDisplayRole)
+        .returns(InfoWidgetLayoutManager::SettingsDisplay);
+    EXPECT(InfoWidgetLayoutManager::contentWidget);
+    QVERIFY(KPreferredSize == m_infoWidget->sizeHint(sizeHint, constraint));
+    
+    QGraphicsWidget* nullPoiter(NULL);
+    // cannot fetch info display size from docml, default size to be used
+    EXPECT(InfoWidgetLayoutManager::currentDisplayRole)
+        .returns(InfoWidgetLayoutManager::InfoDisplay);
+    EXPECT(InfoWidgetLayoutManager::contentWidget).returns(nullPoiter);
+    QVERIFY(KDefaultSizeInfoDisplay == 
+        m_infoWidget->sizeHint(sizeHint, constraint));
+    
+    // cannot fetch settings display size from docml, default size to be used
+    EXPECT(InfoWidgetLayoutManager::currentDisplayRole)
+        .returns(InfoWidgetLayoutManager::SettingsDisplay);
+    EXPECT(InfoWidgetLayoutManager::currentDisplayRole)
+        .returns(InfoWidgetLayoutManager::SettingsDisplay);
+    EXPECT(InfoWidgetLayoutManager::contentWidget).returns(nullPoiter);
+    QVERIFY(KDefaultSizeSettingsDisplay == 
+        m_infoWidget->sizeHint(sizeHint, constraint)); 
+    
+    QVERIFY(verify());
+}
+
+/*!
+  UT_InfoWidget::t_sizePolicy
+ */
+void UT_InfoWidget::t_sizePolicy()
+{
+    QVERIFY(m_infoWidget->sizePolicy() == 
+        QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
+}
+
+/*!
+  UT_InfoWidget::t_setHomeZoneDisplay
+ */
+void UT_InfoWidget::t_setHomeZoneDisplay()
+{
+    EXPECT(InfoWidgetPreferences::setPreference)
+        .with(InfoWidgetPreferences::DisplayHomeZone, KPreferenceOn);
+    
+    m_infoWidget->setHomeZoneDisplay(KPreferenceOn); 
+    
+    QVERIFY(verify());
+}
+
+/*!
+  UT_InfoWidget::t_setMcnDisplay
+ */
+void UT_InfoWidget::t_setMcnDisplay()
+{
+    EXPECT(InfoWidgetPreferences::setPreference)
+        .with(InfoWidgetPreferences::DisplayMcn, KPreferenceOn);
+    
+    m_infoWidget->setMcnDisplay(KPreferenceOn);
+    
+    QVERIFY(verify());
+}
+
+/*!
+  UT_InfoWidget::t_setActiveLineDisplay
+ */
+void UT_InfoWidget::t_setActiveLineDisplay()
+{
+    EXPECT(InfoWidgetPreferences::setPreference)
+        .with(InfoWidgetPreferences::DisplayActiveLine, KPreferenceOn);
+    
+    m_infoWidget->setActiveLineDisplay(KPreferenceOn);
+    
+    QVERIFY(verify());
+}
+
+/*!
+  UT_InfoWidget::t_setSatDisplay
+ */
+void UT_InfoWidget::t_setSatDisplay()
+{
+    EXPECT(InfoWidgetPreferences::setPreference)
+        .with(InfoWidgetPreferences::DisplaySatText, KPreferenceOn);
+    
+    m_infoWidget->setSatDisplay(KPreferenceOn);
+    
+    QVERIFY(verify());
+}
+
+/*!
+  UT_InfoWidget::t_paint
+ */
+void UT_InfoWidget::t_paint()
+{
+    QScopedPointer<QPainter> painter(new QPainter());
+    QStyleOptionGraphicsItem *option = NULL;
+    QWidget *widget = NULL;
+    
+    m_infoWidget->paint(painter.data(), option, widget);
+    
+    // layout change ongoing while paint requested
+    m_infoWidget->startChanges();
+    m_infoWidget->paint(painter.data(), option, widget);
+}
+
+/*!
+  UT_InfoWidget::t_mousePressEvent
+ */
+void UT_InfoWidget::t_mousePressEvent()
+{
+    QGraphicsSceneMouseEvent event;
+    m_infoWidget->mousePressEvent(&event);
+}
+
+/*!
+  UT_InfoWidget::t_mouseReleaseEvent
+ */
+void UT_InfoWidget::t_mouseReleaseEvent()
+{
+    QGraphicsSceneMouseEvent event;
+    
+    // widget clicked while showing info display => 
+    // switch to settings display expected
+    EXPECT(InfoWidgetLayoutManager::currentDisplayRole)
+        .returns(InfoWidgetLayoutManager::InfoDisplay);
+    EXPECT(InfoWidgetLayoutManager::layoutSettingsDisplay);
+    m_infoWidget->mousePressEvent(&event);
+    m_infoWidget->mouseReleaseEvent(&event);
+    
+    // widget clicked while showing settings display => 
+    // no action expected
+    EXPECT(InfoWidgetLayoutManager::currentDisplayRole)
+        .returns(InfoWidgetLayoutManager::SettingsDisplay);
+    EXPECT(InfoWidgetLayoutManager::layoutSettingsDisplay).times(0);
+    m_infoWidget->mousePressEvent(&event);
+    m_infoWidget->mouseReleaseEvent(&event);
+    
+    // release event received after dragging widget => 
+    // no action expected
+    EXPECT(InfoWidgetLayoutManager::layoutSettingsDisplay).times(0);
+    m_infoWidget->mouseMoveEvent(&event);
+    m_infoWidget->mouseReleaseEvent(&event);
+    
+    QVERIFY(verify());
+}
+
+/*!
+  UT_InfoWidget::t_mouseMoveEvent
+ */
+void UT_InfoWidget::t_mouseMoveEvent()
+{
+    
+}
+
+/*!
+  UT_InfoWidget::t_updateInfoDisplay
+ */
+void UT_InfoWidget::t_updateInfoDisplay()
+{
+    HbLabel hbLabel;
+    QGraphicsWidget* pointerHbLabel(&hbLabel);
+    
+    EXPECT(InfoWidgetLayoutManager::getWidget)
+        .with(InfoWidgetLayoutManager::RoleHomeZoneLabel)
+        .returns(pointerHbLabel);
+    EXPECT(InfoWidgetLayoutManager::currentDisplayRole)
+        .returns(InfoWidgetLayoutManager::InfoDisplay);
+    
+    HbMarqueeItem mcnMarqueeItem; 
+    QGraphicsWidget* pointerMcnMarqueeItem(&mcnMarqueeItem);
+    EXPECT(InfoWidgetLayoutManager::getWidget)
+        .with(InfoWidgetLayoutManager::RoleMcnMarqueeItem)
+        .returns(pointerMcnMarqueeItem);
+    EXPECT(InfoWidgetLayoutManager::currentDisplayRole)
+        .returns(InfoWidgetLayoutManager::InfoDisplay);
+    EXPECT(HbMarqueeItem::isAnimating).returns(true);
+    
+    EXPECT(InfoWidgetLayoutManager::getWidget)
+        .with(InfoWidgetLayoutManager::RoleActiveLineLabel)
+        .returns(pointerHbLabel);
+    EXPECT(InfoWidgetLayoutManager::currentDisplayRole)
+        .returns(InfoWidgetLayoutManager::InfoDisplay);
+    
+    EXPECT(InfoWidgetLayoutManager::getWidget)
+        .with(InfoWidgetLayoutManager::RoleSatTextLabel)
+        .returns(pointerHbLabel);
+    EXPECT(InfoWidgetLayoutManager::currentDisplayRole)
+        .returns(InfoWidgetLayoutManager::InfoDisplay);
+    
+    m_infoWidget->updateInfoDisplay();
+    
+    QVERIFY(verify());
+}
+
+/*!
+  UT_InfoWidget::t_initializePreferences
+ */
+void UT_InfoWidget::t_initializePreferences()
+{    
+    EXPECT(InfoWidgetPreferences::preference)
+        .with(InfoWidgetPreferences::DisplayHomeZone)
+        .returns(KPreferenceOff);
+    EXPECT(InfoWidgetPreferences::setPreference)
+        .with(InfoWidgetPreferences::DisplayHomeZone, KPreferenceOff);
+
+    EXPECT(InfoWidgetPreferences::preference)
+        .with(InfoWidgetPreferences::DisplayMcn)
+        .returns(KPreferenceOff);
+    EXPECT(InfoWidgetPreferences::setPreference)
+        .with(InfoWidgetPreferences::DisplayMcn, KPreferenceOff);
+    
+    EXPECT(InfoWidgetPreferences::preference)
+        .with(InfoWidgetPreferences::DisplayActiveLine)
+        .returns(KPreferenceOff);
+    EXPECT(InfoWidgetPreferences::setPreference)
+        .with(InfoWidgetPreferences::DisplayActiveLine, KPreferenceOff);
+    
+    EXPECT(InfoWidgetPreferences::preference)
+        .with(InfoWidgetPreferences::DisplaySatText)
+        .returns(KPreferenceOff);
+    EXPECT(InfoWidgetPreferences::setPreference)
+        .with(InfoWidgetPreferences::DisplaySatText, KPreferenceOff);
+    
+    EXPECT(InfoWidgetPreferences::visibleItemCount).returns(0);
+    EXPECT(InfoWidgetPreferences::setPreference)
+        .with(InfoWidgetPreferences::DisplayMcn, KPreferenceOn);
+    
+    m_infoWidget->initializePreferences();
+    
+    QVERIFY(verify());
+    
+    // one visible item initially
+    EXPECT(InfoWidgetPreferences::visibleItemCount).returns(1);
+    
+    m_infoWidget->initializePreferences();
+    
+    QVERIFY(verify());
+}
+
+/*!
+  UT_InfoWidget::t_onInitialize
+ */
+void UT_InfoWidget::t_onInitialize()
+{
+    m_infoWidget->onInitialize(); 
+}
+
+/*!
+  UT_InfoWidget::t_onUninitialize
+ */
+void UT_InfoWidget::t_onUninitialize()
+{
+    m_infoWidget->onUninitialize(); 
+}
+
+/*!
+  UT_InfoWidget::t_onShow
+ */
+void UT_InfoWidget::t_onShow()
+{
+    m_infoWidget->onShow(); 
+}
+
+/*!
+  UT_InfoWidget::t_onHide
+ */
+void UT_InfoWidget::t_onHide()
+{
+    m_infoWidget->onHide(); 
+}
+
+/*!
+  UT_InfoWidget::t_readModel
+ */
+void UT_InfoWidget::t_readModel()
+{
+    EXPECT(InfoWidgetLayoutManager::currentDisplayRole)
+        .returns(InfoWidgetLayoutManager::InfoDisplay);
+    m_infoWidget->readModel();
+    
+    EXPECT(InfoWidgetLayoutManager::currentDisplayRole)
+        .returns(InfoWidgetLayoutManager::SettingsDisplay);
+    m_infoWidget->readModel();
+    
+    QVERIFY(verify());
+}
+
+/*!
+  UT_InfoWidget::t_handleModelError
+ */
+void UT_InfoWidget::t_handleModelError()
+{
+    int operation(0);
+    int errorCode(0); 
+    m_infoWidget->handleModelError(operation, errorCode); 
+}
+
+void UT_InfoWidget::t_homeZoneDisplaySettingChanged()
+{
+    // user enables home zone setting
+    EXPECT(InfoWidgetPreferences::setPreference)
+        .with(InfoWidgetPreferences::DisplayHomeZone, KPreferenceOn);
+    int setting(Qt::Checked);
+    m_infoWidget->homeZoneDisplaySettingChanged(setting);
+    
+    // user disables home zone setting
+    EXPECT(InfoWidgetPreferences::setPreference)
+        .with(InfoWidgetPreferences::DisplayHomeZone, KPreferenceOff);
+    setting = Qt::Unchecked;
+    m_infoWidget->homeZoneDisplaySettingChanged(setting);
+    
+    QVERIFY(verify());
+}
+
+void UT_InfoWidget::t_mcnDisplaySettingChanged()
+{
+    // user enables MCN setting
+    EXPECT(InfoWidgetPreferences::setPreference)
+        .with(InfoWidgetPreferences::DisplayMcn, KPreferenceOn);
+    int setting(Qt::Checked);
+    m_infoWidget->mcnDisplaySettingChanged(setting);
+    
+    // user disables MCN setting
+    EXPECT(InfoWidgetPreferences::setPreference)
+        .with(InfoWidgetPreferences::DisplayMcn, KPreferenceOff);
+    setting = Qt::Unchecked;
+    m_infoWidget->mcnDisplaySettingChanged(setting);
+    
+    QVERIFY(verify());
+}
+
+void UT_InfoWidget::t_activeLineDisplaySettingChanged()
+{
+    // user enables active line setting
+    EXPECT(InfoWidgetPreferences::setPreference)
+        .with(InfoWidgetPreferences::DisplayActiveLine, KPreferenceOn);
+    int setting(Qt::Checked);
+    m_infoWidget->activeLineDisplaySettingChanged(setting);
+    
+    // user disables active line setting
+    EXPECT(InfoWidgetPreferences::setPreference)
+        .with(InfoWidgetPreferences::DisplayActiveLine, KPreferenceOff);
+    setting = Qt::Unchecked;
+    m_infoWidget->activeLineDisplaySettingChanged(setting);
+    
+    QVERIFY(verify());
+}
+
+void UT_InfoWidget::t_satDisplaySettingChanged()
+{
+    // user enables SAT setting
+    EXPECT(InfoWidgetPreferences::setPreference)
+        .with(InfoWidgetPreferences::DisplaySatText, KPreferenceOn);
+    int setting(Qt::Checked);
+    m_infoWidget->satDisplaySettingChanged(setting);
+    
+    // user disables SAT setting
+    EXPECT(InfoWidgetPreferences::setPreference)
+        .with(InfoWidgetPreferences::DisplaySatText, KPreferenceOff);
+    setting = Qt::Unchecked;
+    m_infoWidget->satDisplaySettingChanged(setting);
+    
+    QVERIFY(verify());
+}
+
+void UT_InfoWidget::t_settingsEditingFinished()
+{
+    m_infoWidget->settingsEditingFinished(); 
+}
+
+void UT_InfoWidget::t_updateItemsVisibility()
+{
+    // all items visible
+    EXPECT(InfoWidgetLayoutManager::currentDisplayRole)
+        .returns(InfoWidgetLayoutManager::InfoDisplay);
+    EXPECT(InfoWidgetPreferences::preference)
+        .with(InfoWidgetPreferences::DisplayHomeZone)
+        .returns(KPreferenceOn);
+    EXPECT(InfoWidgetPreferences::preference)
+        .with(InfoWidgetPreferences::DisplayMcn)
+        .returns(KPreferenceOn);
+    EXPECT(InfoWidgetPreferences::preference)
+        .with(InfoWidgetPreferences::DisplayActiveLine)
+        .returns(KPreferenceOn);
+    EXPECT(InfoWidgetPreferences::preference)
+        .with(InfoWidgetPreferences::DisplaySatText)
+        .returns(KPreferenceOn);
+    EXPECT(InfoWidgetLayoutManager::setLayoutRows)
+        .with(4);
+    
+    m_infoWidget->updateItemsVisibility();
+
+    // none of items visible
+    EXPECT(InfoWidgetLayoutManager::currentDisplayRole)
+        .returns(InfoWidgetLayoutManager::InfoDisplay);
+    
+    EXPECT(InfoWidgetPreferences::preference)
+        .with(InfoWidgetPreferences::DisplayHomeZone)
+        .returns(KPreferenceOff);
+    EXPECT(InfoWidgetLayoutManager::hideWidget)
+        .with(InfoWidgetLayoutManager::RoleHomeZoneLabel);
+    EXPECT(InfoWidgetLayoutManager::hideWidget)
+        .with(InfoWidgetLayoutManager::RoleHomeZoneIcon);
+    
+    EXPECT(InfoWidgetPreferences::preference)
+        .with(InfoWidgetPreferences::DisplayMcn)
+        .returns(KPreferenceOff);
+    EXPECT(InfoWidgetLayoutManager::hideWidget)
+        .with(InfoWidgetLayoutManager::RoleMcnMarqueeItem);
+    EXPECT(InfoWidgetLayoutManager::hideWidget)
+        .with(InfoWidgetLayoutManager::RoleMcnIcon);
+    
+    EXPECT(InfoWidgetPreferences::preference)
+        .with(InfoWidgetPreferences::DisplayActiveLine)
+        .returns(KPreferenceOff);
+    EXPECT(InfoWidgetLayoutManager::hideWidget)
+        .with(InfoWidgetLayoutManager::RoleActiveLineLabel);
+    EXPECT(InfoWidgetLayoutManager::hideWidget)
+        .with(InfoWidgetLayoutManager::RoleActiveLineIcon);
+    
+    EXPECT(InfoWidgetPreferences::preference)
+        .with(InfoWidgetPreferences::DisplaySatText)
+        .returns(KPreferenceOff);
+    EXPECT(InfoWidgetLayoutManager::hideWidget)
+        .with(InfoWidgetLayoutManager::RoleSatTextLabel);
+    EXPECT(InfoWidgetLayoutManager::hideWidget)
+        .with(InfoWidgetLayoutManager::RoleSatTextIcon);
+    
+    EXPECT(InfoWidgetLayoutManager::setLayoutRows)
+        .with(0);
+    
+    m_infoWidget->updateItemsVisibility();
+    
+    QVERIFY(verify());
+}
+
+void UT_InfoWidget::t_layoutInfoDisplay()
+{
+    EXPECT(InfoWidgetLayoutManager::showAll);
+    EXPECT(InfoWidgetLayoutManager::currentDisplayRole)
+        .returns(InfoWidgetLayoutManager::SettingsDisplay);
+    
+    m_infoWidget->layoutInfoDisplay();
+    
+    QVERIFY(verify());
+}
+
+void UT_InfoWidget::t_layoutSettingsDisplay()
+{
+    EXPECT(InfoWidgetLayoutManager::showAll); 
+    
+    m_infoWidget->layoutSettingsDisplay();
+    
+    QVERIFY(verify());
+}
+
+void UT_InfoWidget::t_initializeInfoDisplayItems()
+{
+    m_infoWidget->initializeInfoDisplayItems();
+}
+
+void UT_InfoWidget::t_initializeSettingsDisplayItems()
+{
+    QGraphicsWidget okButton;
+    EXPECT(InfoWidgetLayoutManager::getWidget)
+        .with(InfoWidgetLayoutManager::RoleOkButton)
+        .returns(&okButton);
+    
+    QGraphicsWidget homeZoneBox;
+    EXPECT(InfoWidgetLayoutManager::getWidget)
+        .with(InfoWidgetLayoutManager::RoleHomeZoneCheckBox)
+        .returns(&homeZoneBox);
+
+    QGraphicsWidget mcnCheckBox;
+    EXPECT(InfoWidgetLayoutManager::getWidget)
+        .with(InfoWidgetLayoutManager::RoleMcnCheckBox)
+        .returns(&mcnCheckBox);
+    
+    QGraphicsWidget activeLineCheckBox;
+    EXPECT(InfoWidgetLayoutManager::getWidget)
+        .with(InfoWidgetLayoutManager::RoleActiveLineCheckBox)
+        .returns(&activeLineCheckBox);
+
+    QGraphicsWidget satTextCheckBox;
+    EXPECT(InfoWidgetLayoutManager::getWidget)
+        .with(InfoWidgetLayoutManager::RoleSatTextCheckBox)
+        .returns(&satTextCheckBox);
+    
+    m_infoWidget->initializeSettingsDisplayItems();
+    
+    QVERIFY(verify());
+}
+
+void UT_InfoWidget::t_startChanges()
+{
+    m_infoWidget->startChanges();
+}
+
+void UT_InfoWidget::t_endChanges()
+{
+    m_infoWidget->endChanges();
+}
+
+/*!
+  UT_InfoWidget::t_changeEvent
+ */
+void UT_InfoWidget::t_changeEvent()
+{
+    /*
+     * Not work from commmand prompt.
+     */
+    HbEvent event(HbEvent::ThemeChanged);
+    EXPECT(HbColorScheme::color);
+    m_infoWidget->changeEvent(&event);
+    QVERIFY(verify());
+    
+    HbEvent event2(HbEvent::ChildFocusIn);
+    m_infoWidget->changeEvent(&event2);
+    QVERIFY(verify());
+}
+
+QTEST_MAIN_S60(UT_InfoWidget)
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidget/ut_infowidget.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidget/ut_infowidget.pro	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,67 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+# 
+# Description: Project file for building unit test component
+#
+#
+
+CONFIG += qtestlib hb
+TEMPLATE = app
+TARGET = 
+DEPENDPATH  += . ../../infowidget/src ../../infowidget/inc
+INCLUDEPATH += .
+INCLUDEPATH += ../common
+INCLUDEPATH += ../../inc/
+INCLUDEPATH += ../../infowidget/inc/
+DEFINES += QT_NO_DEBUG_STREAM
+
+MOC_DIR = moc
+
+QT -= gui
+QT += testlib
+
+symbian: {
+  CONFIG += no_icon
+  INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
+  LIBS += -lmocklib 		\
+          -lsymbianmock 	\
+          -lhswidgetmodel
+}
+
+# test code
+HEADERS += ./inc/ut_infowidget.h
+SOURCES += ./src/ut_infowidget.cpp
+
+# code to be tested
+HEADERS += ../../infowidget/inc/infowidget.h
+SOURCES += ../../infowidget/src/infowidget.cpp
+
+# mocks needed for testing
+#HEADERS += hbdocumentloader.h
+#SOURCES += ../mocks/mock_hbdocumentloader.cpp
+
+HEADERS += ../../infowidget/inc/infowidgetpreferences.h
+SOURCES += ../mocks/mock_infowidgetpreferences.cpp
+HEADERS += ../../infowidget/inc/infowidgetengine.h
+SOURCES += ../mocks/mock_infowidgetengine.cpp
+HEADERS += ../../infowidget/inc/infowidgetlayoutmanager.h
+SOURCES += ../mocks/mock_infowidgetlayoutmanager.cpp
+HEADERS += ../../infowidget/inc/infowidgetnetworkhandler.h
+SOURCES += ../mocks/mock_infowidgetnetworkhandler.cpp
+
+SOURCES += ../mocks/mock_hbcolorscheme.cpp
+SOURCES += ../mocks/mock_hblabel.cpp
+SOURCES += ../mocks/mock_hbstyleoptionlabel.cpp
+SOURCES += ../mocks/mock_hbmarqueeitem.cpp
+SOURCES += ../mocks/mock_hbwidget.cpp
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetengine/inc/ut_infowidgetengine.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetengine/inc/ut_infowidgetengine.h	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,54 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef UT_INFOWIDGETENGINE_H
+#define UT_INFOWIDGETENGINE_H
+
+#include <QtTest/QtTest>
+#include <mockservice.h>
+
+class InfoWidgetEngine;
+
+class UT_InfoWidgetEngine : public QObject, public MockService
+{
+    Q_OBJECT
+
+public:    
+    
+    UT_InfoWidgetEngine();
+    ~UT_InfoWidgetEngine();
+    
+private slots:
+
+    void init();
+    void cleanup();
+
+    void t_modelData();
+    void t_updateNetworkDataToModel();
+    void t_updateSatDataToModel();
+    void t_updateLineDataToModel();
+    void t_handleNetworkError();
+    void t_handleSatError(); 
+    void t_handleLineError();
+    
+private:
+    
+    InfoWidgetEngine *m_infoWidgetEngine;
+
+};
+
+#endif // UT_INFOWIDGETENGINE_H
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetengine/run_auto_tests_qt.bat
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetengine/run_auto_tests_qt.bat	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,187 @@
+rem
+rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+rem All rights reserved.
+rem This component and the accompanying materials are made available
+rem under the terms of "Eclipse Public License v1.0"
+rem which accompanies this distribution, and is available
+rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
+rem
+rem Initial Contributors:
+rem Nokia Corporation - initial contribution.
+rem
+rem Contributors:
+rem
+rem Description:
+rem
+
+@echo off
+setlocal
+goto :startup 
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function DEFAULT
+::
+:: Modify this function
+::  - TESTED_SRC can be changed to match tested code.
+::    Specifies path from testcode group directory to
+::    tested code
+::  - Add test directories to be runned
+::    ie. "call :build ut_projectdirectory" or use
+::    "for /f %%a in ('dir /b ut_*') do call :build %%a"
+::    which compiles, instruments and runs all test directories
+::    starting with "ut_".
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:DEFAULT
+set TESTED_SRC=..\..\infowidget\src\*.cpp
+
+for /f %%a in ('dir /b ut_*') do call :build %%a
+if [%DOMODULESTESTS%] EQU [TRUE] (
+for /f %%a in ('dir /b mt_*') do call :build %%a
+)
+
+call :finish
+goto :END
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function STARTUP
+::
+:: Initializing script
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:STARTUP
+
+set BUILDTESTS=TRUE
+set RUNTESTS=TRUE
+set INSTRUMENT=TRUE
+set REMOVEINSTRUMENT=TRUE
+set DOMODULESTESTS=TRUE
+set ABLD_CALL=abld build winscw udeb -keepgoing
+set PATH_TO_DLL=\epoc32\release\winscw\udeb
+set PATH_TO_COVERAGE_DATA=\coverage_data
+
+if not exist %PATH_TO_COVERAGE_DATA% (
+mkdir %PATH_TO_COVERAGE_DATA%
+)
+
+if [%1] EQU [] ( goto default )
+
+call :%1
+call :%2
+call :%3
+call :%4
+call :%5
+echo Running tests = %RUNTESTS%
+echo Instrumenting tests = %INSTRUMENT%
+goto default
+
+:/NOCLEANUP
+set REMOVEINSTRUMENT=FALSE
+goto end
+
+:/NORUN
+set RUNTESTS=FALSE
+set REMOVEINSTRUMENT=FALSE
+goto end
+
+:/NOINSTRUMENT
+set INSTRUMENT=FALSE
+goto end
+
+:/NOBUILD
+set BUILDTESTS=FALSE
+goto end
+
+:/ONLYUNITTESTS
+set DOMODULESTESTS=FALSE
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function FINISH
+::
+:: Finishes run_auto_tests.bat
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:FINISH
+
+if [%RUNTESTS%] EQU [TRUE] (
+call :runtests
+)
+
+if [%INSTRUMENT%] EQU [TRUE] (
+call :calculatecoverage
+)
+
+if [%REMOVEINSTRUMENT%] EQU [TRUE] (
+call :removecoverage
+)
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function BUILD
+::    param directory
+::
+:: builds test from given directory
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:BUILD
+setlocal
+if [%BUILDTESTS%] EQU [FALSE] ( goto end )
+echo Building %1
+if not exist %1 ( 
+echo %1 Not found! 
+goto end
+)
+
+pushd .
+call cd %1
+call qmake
+call bldmake bldfiles
+call abld clean winscw udeb
+if [%INSTRUMENT%] EQU [TRUE] (
+call ctcwrap -n %PATH_TO_COVERAGE_DATA%\%1 -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=%TESTED_SRC%" %ABLD_CALL%
+) else (
+call %ABLD_CALL%
+)
+
+popd
+endlocal
+goto end
+
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function RUNTESTS
+::
+:: NOTE! Function assumes that test binary is named according to test directory.
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:RUNTESTS
+echo Running tests
+call %PATH_TO_DLL%\ut_infowidgetengine.exe -dtextshell --
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function CALCULATECOVERAGE
+::
+:: Calculates test coverage. Generates html
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:CALCULATECOVERAGE
+echo Calculating coverage
+ctcpost %PATH_TO_COVERAGE_DATA%\*.sym | ctcmerge -i - -o profile.txt
+call ctc2html -t 70 -i profile.txt -o \coverage_result -nsb
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function REMOVECOVERAGE
+::
+:: Removes data from coverage directory
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:REMOVECOVERAGE
+echo Removing deleting coverage data
+call del %PATH_TO_COVERAGE_DATA%\*.sym
+call del %PATH_TO_COVERAGE_DATA%\*.dat
+call del profile.txt
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function END
+::
+:: Prints done
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:END
+echo Done!
\ No newline at end of file
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetengine/src/ut_infowidgetengine.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetengine/src/ut_infowidgetengine.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,168 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include "ut_infowidgetengine.h"
+#include "infowidgetengine.h"
+#include "qtestmains60.h"
+// mocked dependencies of the class under test
+#include "infowidgetnetworkhandler.h"
+
+const QString KHomeZoneTextTag("HomeZoneText0");    // max length 13
+const TNWViagIndicatorType 
+    KHomeZoneIndicatorType = ENWViagIndicatorTypeHomeZone;
+
+const QString KMcnName("McnNameMcnNameMcnNam");     // max length 20 
+const TNWMCNIndicatorType 
+    KMcnIndicatorType = ENWMCNIndicatorTypeActive;
+
+/*!
+  UT_InfoWidgetEngine::UT_InfoWidgetEngine
+ */
+UT_InfoWidgetEngine::UT_InfoWidgetEngine() 
+    : 
+    m_infoWidgetEngine(0)
+{
+    
+}
+
+
+/*!
+  UT_InfoWidgetEngine::~UT_InfoWidgetEngine
+ */
+UT_InfoWidgetEngine::~UT_InfoWidgetEngine()
+{
+    delete m_infoWidgetEngine;
+}
+
+
+/*!
+  UT_InfoWidgetEngine::init
+ */
+void UT_InfoWidgetEngine::init()
+{
+    initialize();
+    
+    EXPECT(InfoWidgetNetworkHandler::logCurrentInfo);
+    EXPECT(InfoWidgetNetworkHandler::homeZoneTextTag)
+        .returns(KHomeZoneTextTag);
+    EXPECT(InfoWidgetNetworkHandler::homeZoneIndicatorType)
+        .returns(KHomeZoneIndicatorType);
+    EXPECT(InfoWidgetNetworkHandler::mcnName).returns(KMcnName);
+    EXPECT(InfoWidgetNetworkHandler::mcnIndicatorType)
+        .returns(KMcnIndicatorType);
+    
+    m_infoWidgetEngine = new InfoWidgetEngine();
+    
+    QVERIFY(verify());
+}
+
+
+/*!
+  UT_InfoWidgetEngine::cleanup
+ */
+void UT_InfoWidgetEngine::cleanup()
+{
+    reset();
+    
+    delete m_infoWidgetEngine;
+    m_infoWidgetEngine = 0;
+}
+
+
+/*!
+  UT_InfoWidgetEngine::t_modelData
+ */
+void UT_InfoWidgetEngine::t_modelData()
+{
+    const InfoWidgetEngine::ModelData& data = m_infoWidgetEngine->modelData();
+    QVERIFY(data.homeZoneTextTag() == KHomeZoneTextTag);
+    QVERIFY(data.homeZoneIndicatorType() == KHomeZoneIndicatorType);
+    QVERIFY(data.mcnName() == KMcnName);
+    QVERIFY(data.mcnIndicatorType() == KMcnIndicatorType);
+}
+
+
+/*!
+  UT_InfoWidgetEngine::t_updateNetworkDataToModel
+ */
+void UT_InfoWidgetEngine::t_updateNetworkDataToModel()
+{
+    EXPECT(InfoWidgetNetworkHandler::logCurrentInfo);
+    EXPECT(InfoWidgetNetworkHandler::homeZoneTextTag)
+        .returns(KHomeZoneTextTag);
+    EXPECT(InfoWidgetNetworkHandler::homeZoneIndicatorType)
+        .returns(KHomeZoneIndicatorType);
+    EXPECT(InfoWidgetNetworkHandler::mcnName).returns(KMcnName);
+    EXPECT(InfoWidgetNetworkHandler::mcnIndicatorType)
+        .returns(KMcnIndicatorType);
+    QSignalSpy spy(m_infoWidgetEngine, SIGNAL(modelChanged()));
+    
+    m_infoWidgetEngine->updateNetworkDataToModel();
+    
+    const int KExpectedNumOfSignalEmissions = 1;
+    QCOMPARE(spy.count(), KExpectedNumOfSignalEmissions);
+    const QList<QVariant> &arguments = spy.at(0);
+    QCOMPARE(arguments.count(), 0);
+    
+    QVERIFY(verify());
+}
+
+
+/*!
+  UT_InfoWidgetEngine::t_updateSatDataToModel
+ */
+void UT_InfoWidgetEngine::t_updateSatDataToModel()
+{
+    m_infoWidgetEngine->updateSatDataToModel();
+}
+
+
+/*!
+  UT_InfoWidgetEngine::t_updateLineDataToModel
+ */
+void UT_InfoWidgetEngine::t_updateLineDataToModel()
+{
+    m_infoWidgetEngine->updateLineDataToModel();
+}
+
+
+/*!
+  UT_InfoWidgetEngine::t_handleNetworkError
+ */
+void UT_InfoWidgetEngine::t_handleNetworkError()
+{
+    m_infoWidgetEngine->handleNetworkError(0, 0);
+}
+
+
+/*!
+  UT_InfoWidgetEngine::t_handleSatError
+ */
+void UT_InfoWidgetEngine:: t_handleSatError()
+{
+    m_infoWidgetEngine->handleSatError(0, 0);
+}
+
+
+/*!
+  UT_InfoWidgetEngine::t_handleLineError
+ */
+void UT_InfoWidgetEngine:: t_handleLineError()
+{
+    m_infoWidgetEngine->handleLineError(0, 0);    
+}
+
+QTEST_MAIN_S60(UT_InfoWidgetEngine)
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetengine/ut_infowidgetengine.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetengine/ut_infowidgetengine.pro	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,54 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+# 
+# Description: Project file for building unit test component
+#
+#
+
+CONFIG += qtestlib hb
+TEMPLATE = app
+TARGET = 
+DEPENDPATH  += . ../../infowidget/src ../../infowidget/inc
+INCLUDEPATH += .
+INCLUDEPATH += ../common
+INCLUDEPATH += ../../inc/
+INCLUDEPATH += ../../infowidget/inc/
+DEFINES += XQSETTINGSMANAGER_NO_LIBRARY
+DEFINES += QT_NO_DEBUG_STREAM
+
+QT -= gui
+QT += testlib
+
+symbian: {
+  CONFIG += no_icon
+  INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
+  LIBS += -lmocklib 		\
+          -lsymbianmock 	\
+          -lcpframework
+}
+    
+# test code
+HEADERS += ./inc/ut_infowidgetengine.h
+SOURCES += ./src/ut_infowidgetengine.cpp
+
+# code to be tested
+HEADERS += ../../infowidget/inc/infowidgetengine.h
+SOURCES += ../../infowidget/src/infowidgetengine.cpp
+
+# mocks needed for testing
+HEADERS += ../../infowidget/inc/infowidgetnetworkhandler.h
+HEADERS += /epoc32/include/mw/xqsettingskey.h \
+           /epoc32/include/mw/xqsettingsmanager.h
+SOURCES += ../mocks/mock_xqsettingsmanager.cpp \
+           ../mocks/mock_xqsettingskey.cpp     \
+           ../mocks/mock_infowidgetnetworkhandler.cpp
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetlayoutmanager/inc/ut_infowidgetlayoutmanager.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetlayoutmanager/inc/ut_infowidgetlayoutmanager.h	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,76 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef UT_INFOWIDGETLAYOUTMANAGER_H
+#define UT_INFOWIDGETLAYOUTMANAGER_H
+
+#include <QtTest/QtTest>
+#include <mockservice.h>
+
+class InfoWidgetLayoutManager;
+class InfoWidgetDocumentLoader;
+
+class UT_InfoWidgetLayoutManager : public QObject, public MockService
+{
+    Q_OBJECT
+
+public:  
+    UT_InfoWidgetLayoutManager();
+    ~UT_InfoWidgetLayoutManager();
+
+private:     
+    void fillDisplayContainers();
+    void fillCurrentWidgetsContainer();
+    
+private slots:
+    void init();
+    void cleanup();
+    
+    void t_currentDisplayRole();
+    void t_currentWidgetRoles();
+    
+    void t_layoutRows(); 
+    void t_setLayoutRows();
+    
+    void t_layoutInfoDisplay();
+    void t_layoutSettingsDisplay();
+    
+    void t_widgetRoles();
+    void t_loadWidgets();
+    void t_loadWidget();
+    void t_getWidget();
+    void t_contentWidget();
+    void t_hideWidget();
+    void t_hideAll();
+    void t_showAll();
+    
+    // InfoWidgetDocumentLoader tests 
+    void t_createObject();
+    
+private:    
+    InfoWidgetLayoutManager *m_layoutManager;
+    InfoWidgetDocumentLoader *m_documentLoader;
+    
+    QGraphicsWidget *m_checkBoxPtr; 
+    QGraphicsWidget *m_iconPtr;
+    QGraphicsWidget *m_marqueeItemPtr;
+    QGraphicsWidget *m_labelPtr;
+    QGraphicsWidget *m_graphicsWidgetPtr;
+    
+};
+
+#endif // UT_INFOWIDGETLAYOUTMANAGER_H
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetlayoutmanager/run_auto_tests_qt.bat
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetlayoutmanager/run_auto_tests_qt.bat	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,187 @@
+rem
+rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+rem All rights reserved.
+rem This component and the accompanying materials are made available
+rem under the terms of "Eclipse Public License v1.0"
+rem which accompanies this distribution, and is available
+rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
+rem
+rem Initial Contributors:
+rem Nokia Corporation - initial contribution.
+rem
+rem Contributors:
+rem
+rem Description:
+rem
+
+@echo off
+setlocal
+goto :startup 
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function DEFAULT
+::
+:: Modify this function
+::  - TESTED_SRC can be changed to match tested code.
+::    Specifies path from testcode group directory to
+::    tested code
+::  - Add test directories to be runned
+::    ie. "call :build ut_projectdirectory" or use
+::    "for /f %%a in ('dir /b ut_*') do call :build %%a"
+::    which compiles, instruments and runs all test directories
+::    starting with "ut_".
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:DEFAULT
+set TESTED_SRC=..\..\infowidget\src\*.cpp
+
+for /f %%a in ('dir /b ut_*') do call :build %%a
+if [%DOMODULESTESTS%] EQU [TRUE] (
+for /f %%a in ('dir /b mt_*') do call :build %%a
+)
+
+call :finish
+goto :END
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function STARTUP
+::
+:: Initializing script
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:STARTUP
+
+set BUILDTESTS=TRUE
+set RUNTESTS=TRUE
+set INSTRUMENT=TRUE
+set REMOVEINSTRUMENT=TRUE
+set DOMODULESTESTS=TRUE
+set ABLD_CALL=abld build winscw udeb -keepgoing
+set PATH_TO_DLL=\epoc32\release\winscw\udeb
+set PATH_TO_COVERAGE_DATA=\coverage_data
+
+if not exist %PATH_TO_COVERAGE_DATA% (
+mkdir %PATH_TO_COVERAGE_DATA%
+)
+
+if [%1] EQU [] ( goto default )
+
+call :%1
+call :%2
+call :%3
+call :%4
+call :%5
+echo Running tests = %RUNTESTS%
+echo Instrumenting tests = %INSTRUMENT%
+goto default
+
+:/NOCLEANUP
+set REMOVEINSTRUMENT=FALSE
+goto end
+
+:/NORUN
+set RUNTESTS=FALSE
+set REMOVEINSTRUMENT=FALSE
+goto end
+
+:/NOINSTRUMENT
+set INSTRUMENT=FALSE
+goto end
+
+:/NOBUILD
+set BUILDTESTS=FALSE
+goto end
+
+:/ONLYUNITTESTS
+set DOMODULESTESTS=FALSE
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function FINISH
+::
+:: Finishes run_auto_tests.bat
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:FINISH
+
+if [%RUNTESTS%] EQU [TRUE] (
+call :runtests
+)
+
+if [%INSTRUMENT%] EQU [TRUE] (
+call :calculatecoverage
+)
+
+if [%REMOVEINSTRUMENT%] EQU [TRUE] (
+call :removecoverage
+)
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function BUILD
+::    param directory
+::
+:: builds test from given directory
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:BUILD
+setlocal
+if [%BUILDTESTS%] EQU [FALSE] ( goto end )
+echo Building %1
+if not exist %1 ( 
+echo %1 Not found! 
+goto end
+)
+
+pushd .
+call cd %1
+call qmake
+call bldmake bldfiles
+call abld clean winscw udeb
+if [%INSTRUMENT%] EQU [TRUE] (
+call ctcwrap -n %PATH_TO_COVERAGE_DATA%\%1 -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=%TESTED_SRC%" %ABLD_CALL%
+) else (
+call %ABLD_CALL%
+)
+
+popd
+endlocal
+goto end
+
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function RUNTESTS
+::
+:: NOTE! Function assumes that test binary is named according to test directory.
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:RUNTESTS
+echo Running tests
+call %PATH_TO_DLL%\ut_infowidgetlayoutmanager.exe -dtextshell --
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function CALCULATECOVERAGE
+::
+:: Calculates test coverage. Generates html
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:CALCULATECOVERAGE
+echo Calculating coverage
+ctcpost %PATH_TO_COVERAGE_DATA%\*.sym | ctcmerge -i - -o profile.txt
+call ctc2html -t 70 -i profile.txt -o \coverage_result -nsb
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function REMOVECOVERAGE
+::
+:: Removes data from coverage directory
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:REMOVECOVERAGE
+echo Removing deleting coverage data
+call del %PATH_TO_COVERAGE_DATA%\*.sym
+call del %PATH_TO_COVERAGE_DATA%\*.dat
+call del profile.txt
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function END
+::
+:: Prints done
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:END
+echo Done!
\ No newline at end of file
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetlayoutmanager/src/ut_infowidgetlayoutmanager.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetlayoutmanager/src/ut_infowidgetlayoutmanager.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,406 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include "ut_infowidgetlayoutmanager.h"
+
+#include <QGraphicsWidget>
+
+#define private public
+#include "infowidgetlayoutmanager.h"
+#include "qtestmains60.h"
+
+
+const int KNumOfSettingsDisplayRoles = 15;
+const int KNumOfInfoDisplayRoles = 10;
+const QString KInfoWidgetDocmlFile = ":/resource/infowidget.docml";
+
+/*!
+  UT_InfoWidgetLayoutManager::UT_InfoWidgetLayoutManager
+ */
+UT_InfoWidgetLayoutManager::UT_InfoWidgetLayoutManager() 
+    : 
+    m_layoutManager(NULL),
+    m_documentLoader(NULL)
+{
+    m_checkBoxPtr = new QGraphicsWidget;  
+    m_iconPtr = new QGraphicsWidget; 
+    m_marqueeItemPtr = new QGraphicsWidget; 
+    m_labelPtr = new QGraphicsWidget; 
+    m_graphicsWidgetPtr = new QGraphicsWidget;
+}
+
+
+/*!
+  UT_InfoWidgetLayoutManager::~UT_InfoWidgetLayoutManager
+ */
+UT_InfoWidgetLayoutManager::~UT_InfoWidgetLayoutManager()
+{
+    delete m_layoutManager;
+    delete m_checkBoxPtr;  
+    delete m_iconPtr; 
+    delete m_marqueeItemPtr; 
+    delete m_labelPtr; 
+    delete m_graphicsWidgetPtr; 
+}
+
+
+/*!
+  UT_InfoWidgetLayoutManager::init
+ */
+void UT_InfoWidgetLayoutManager::init()
+{
+    initialize();
+    
+    QObjectList objectList;
+    EXPECT(HbDocumentLoader::load)
+        .with(KInfoWidgetDocmlFile, false)
+        .returns(&objectList);
+    EXPECT(HbDocumentLoader::load)
+        .with(KInfoWidgetDocmlFile, false)
+        .returns(&objectList);
+    m_layoutManager = new InfoWidgetLayoutManager();
+    
+    m_documentLoader = new InfoWidgetDocumentLoader; 
+    
+    QVERIFY(verify());
+}
+
+
+/*!
+  UT_InfoWidgetLayoutManager::cleanup
+ */
+void UT_InfoWidgetLayoutManager::cleanup()
+{
+    reset();
+    
+    delete m_layoutManager;
+    m_layoutManager = NULL; 
+    
+    delete m_documentLoader; 
+    m_documentLoader = NULL; 
+}
+
+/*!
+  UT_InfoWidgetLayoutManager::fillDisplayContainers
+ */
+void UT_InfoWidgetLayoutManager::fillDisplayContainers()
+{
+    InfoWidgetLayoutManager::LayoutItemRole currentRole; 
+    
+    QList<InfoWidgetLayoutManager::LayoutItemRole> infoDisplayWidgetRoles = 
+            m_layoutManager->widgetRoles(InfoWidgetLayoutManager::InfoDisplay); 
+    foreach (currentRole, infoDisplayWidgetRoles) {
+        m_layoutManager->m_infoDisplayWidgets.insert(currentRole, m_graphicsWidgetPtr);    
+    }
+     
+    QList<InfoWidgetLayoutManager::LayoutItemRole> settingsDisplayWidgetRoles = 
+            m_layoutManager->widgetRoles(InfoWidgetLayoutManager::SettingsDisplay); 
+    foreach (currentRole, settingsDisplayWidgetRoles) {
+        m_layoutManager->m_settingsDisplayWidgets.insert(currentRole, m_graphicsWidgetPtr);    
+    }
+
+}
+
+/*!
+  UT_InfoWidgetLayoutManager::fillCurrentWidgetsContainer
+ */
+void UT_InfoWidgetLayoutManager::fillCurrentWidgetsContainer()
+{
+    InfoWidgetLayoutManager::LayoutItemRole currentRole; 
+    
+    QList<InfoWidgetLayoutManager::LayoutItemRole> infoDisplayWidgetRoles = 
+            m_layoutManager->widgetRoles(InfoWidgetLayoutManager::InfoDisplay); 
+    foreach (currentRole, infoDisplayWidgetRoles) {
+        m_layoutManager->m_widgets.insert(currentRole, m_graphicsWidgetPtr);    
+    }
+}
+
+/*!
+  UT_InfoWidgetLayoutManager::t_currentDisplayRole
+ */
+void UT_InfoWidgetLayoutManager::t_currentDisplayRole()
+{
+    InfoWidgetLayoutManager::DisplayRole role =
+        m_layoutManager->currentDisplayRole();
+    
+    QVERIFY(InfoWidgetLayoutManager::InfoDisplay == role);
+}
+
+
+/*!
+  UT_InfoWidgetLayoutManager::t_currentWidgetRoles
+ */
+void UT_InfoWidgetLayoutManager::t_currentWidgetRoles()
+{
+    // Initial state after layout manager construction 
+    QList<InfoWidgetLayoutManager::LayoutItemRole> roles =
+        m_layoutManager->currentWidgetRoles();
+    QVERIFY(roles.count() == 0);
+    
+    // Fill display container data 
+    fillDisplayContainers();
+    
+    QGraphicsLayout *activeLayout;    
+    activeLayout= m_layoutManager->layoutInfoDisplay(); 
+    QVERIFY(!activeLayout);
+    
+    roles = m_layoutManager->currentWidgetRoles();
+            
+    QVERIFY(roles.count() == KNumOfInfoDisplayRoles);
+    if (roles.count() == KNumOfInfoDisplayRoles) {
+        QVERIFY(0 <= roles.indexOf(
+            InfoWidgetLayoutManager::RoleContent));
+        QVERIFY(0 <= roles.indexOf(
+            InfoWidgetLayoutManager::RoleHomeZoneLabel));
+        QVERIFY(0 <= roles.indexOf(
+            InfoWidgetLayoutManager::RoleMcnMarqueeItem));
+        QVERIFY(0 <= roles.indexOf(
+            InfoWidgetLayoutManager::RoleActiveLineLabel));
+        QVERIFY(0 <= roles.indexOf(
+            InfoWidgetLayoutManager::RoleSatTextLabel));
+        QVERIFY(0 <= roles.indexOf(
+            InfoWidgetLayoutManager::RoleHomeZoneIcon));
+        QVERIFY(0 <= roles.indexOf(
+            InfoWidgetLayoutManager::RoleMcnIcon));
+        QVERIFY(0 <= roles.indexOf(
+            InfoWidgetLayoutManager::RoleActiveLineIcon));
+        QVERIFY(0 <= roles.indexOf(
+            InfoWidgetLayoutManager::RoleSatTextIcon));
+        QVERIFY(0 <= roles.indexOf(
+            InfoWidgetLayoutManager::RoleSettingsContainer));
+    }
+    
+    activeLayout= m_layoutManager->layoutSettingsDisplay(); 
+    QVERIFY(!activeLayout);
+
+    roles = m_layoutManager->currentWidgetRoles();
+    int dVar = roles.count();  
+    QVERIFY(roles.count() == KNumOfSettingsDisplayRoles);
+
+}
+
+
+/*!
+  UT_InfoWidgetLayoutManager::t_layoutRows
+ */
+void UT_InfoWidgetLayoutManager::t_layoutRows()
+{
+    int rows = m_layoutManager->layoutRows();
+    QVERIFY(0 == rows);
+}
+
+
+/*!
+  UT_InfoWidgetLayoutManager::t_setLayoutRows
+ */
+void UT_InfoWidgetLayoutManager::t_setLayoutRows()
+{
+    const int KLayoutRows = 1;
+    m_layoutManager->setLayoutRows(KLayoutRows);
+    QVERIFY(KLayoutRows == m_layoutManager->layoutRows());
+}
+
+
+/*!
+  UT_InfoWidgetLayoutManager::t_layoutInfoDisplay
+ */
+void UT_InfoWidgetLayoutManager::t_layoutInfoDisplay()
+{
+    m_layoutManager->layoutInfoDisplay();
+}
+
+
+/*!
+  UT_InfoWidgetLayoutManager::t_layoutSettingsDisplay
+ */
+void UT_InfoWidgetLayoutManager::t_layoutSettingsDisplay()
+{
+    m_layoutManager->layoutSettingsDisplay();
+}
+
+/*!
+  UT_InfoWidgetLayoutManager::t_widgetRoles
+ */
+void UT_InfoWidgetLayoutManager::t_widgetRoles()
+{
+    const QList<InfoWidgetLayoutManager::LayoutItemRole> settingDisplayRoles =
+        m_layoutManager->widgetRoles(InfoWidgetLayoutManager::SettingsDisplay);
+    
+    QVERIFY(settingDisplayRoles.count() == KNumOfSettingsDisplayRoles);
+    if (settingDisplayRoles.count() == KNumOfSettingsDisplayRoles) {
+        QVERIFY(0 <= settingDisplayRoles.indexOf(
+            InfoWidgetLayoutManager::RoleContent));
+        QVERIFY(0 <= settingDisplayRoles.indexOf(
+            InfoWidgetLayoutManager::RoleHomeZoneLabel));
+        QVERIFY(0 <= settingDisplayRoles.indexOf(
+            InfoWidgetLayoutManager::RoleMcnLabel));
+        QVERIFY(0 <= settingDisplayRoles.indexOf(
+            InfoWidgetLayoutManager::RoleActiveLineLabel));
+        QVERIFY(0 <= settingDisplayRoles.indexOf(
+            InfoWidgetLayoutManager::RoleSatTextLabel));
+        QVERIFY(0 <= settingDisplayRoles.indexOf(
+            InfoWidgetLayoutManager::RoleHomeZoneIcon));
+        QVERIFY(0 <= settingDisplayRoles.indexOf(
+            InfoWidgetLayoutManager::RoleMcnIcon));
+        QVERIFY(0 <= settingDisplayRoles.indexOf(
+            InfoWidgetLayoutManager::RoleActiveLineIcon));
+        QVERIFY(0 <= settingDisplayRoles.indexOf(
+            InfoWidgetLayoutManager::RoleSatTextIcon));
+        QVERIFY(0 <= settingDisplayRoles.indexOf(
+            InfoWidgetLayoutManager::RoleHomeZoneCheckBox));
+        QVERIFY(0 <= settingDisplayRoles.indexOf(
+            InfoWidgetLayoutManager::RoleMcnCheckBox));
+        QVERIFY(0 <= settingDisplayRoles.indexOf(
+            InfoWidgetLayoutManager::RoleActiveLineCheckBox));
+        QVERIFY(0 <= settingDisplayRoles.indexOf(
+            InfoWidgetLayoutManager::RoleSatTextCheckBox));
+        QVERIFY(0 <= settingDisplayRoles.indexOf(
+            InfoWidgetLayoutManager::RoleOkButton));
+        QVERIFY(0 <= settingDisplayRoles.indexOf(
+            InfoWidgetLayoutManager::RoleSettingsContainer));
+    }
+    
+    const QList<InfoWidgetLayoutManager::LayoutItemRole> infoDisplayRoles =
+        m_layoutManager->widgetRoles(InfoWidgetLayoutManager::InfoDisplay);
+    QVERIFY(infoDisplayRoles.count() == KNumOfInfoDisplayRoles);
+    if (infoDisplayRoles.count() == KNumOfInfoDisplayRoles) {
+        QVERIFY(0 <= infoDisplayRoles.indexOf(
+            InfoWidgetLayoutManager::RoleContent));
+        QVERIFY(0 <= infoDisplayRoles.indexOf(
+            InfoWidgetLayoutManager::RoleHomeZoneLabel));
+        QVERIFY(0 <= infoDisplayRoles.indexOf(
+            InfoWidgetLayoutManager::RoleMcnMarqueeItem));
+        QVERIFY(0 <= infoDisplayRoles.indexOf(
+            InfoWidgetLayoutManager::RoleActiveLineLabel));
+        QVERIFY(0 <= infoDisplayRoles.indexOf(
+            InfoWidgetLayoutManager::RoleSatTextLabel));
+        QVERIFY(0 <= infoDisplayRoles.indexOf(
+            InfoWidgetLayoutManager::RoleHomeZoneIcon));
+        QVERIFY(0 <= infoDisplayRoles.indexOf(
+            InfoWidgetLayoutManager::RoleMcnIcon));
+        QVERIFY(0 <= infoDisplayRoles.indexOf(
+            InfoWidgetLayoutManager::RoleActiveLineIcon));
+        QVERIFY(0 <= infoDisplayRoles.indexOf(
+            InfoWidgetLayoutManager::RoleSatTextIcon));
+        QVERIFY(0 <= infoDisplayRoles.indexOf(
+            InfoWidgetLayoutManager::RoleSettingsContainer));
+    }
+}
+
+
+/*!
+  UT_InfoWidgetLayoutManager::t_loadWidgets
+ */
+void UT_InfoWidgetLayoutManager::t_loadWidgets()
+{
+    bool loadResult; 
+    //m_layoutManager->loadWidgets();
+}
+
+/*!
+  UT_InfoWidgetLayoutManager::t_loadWidget
+ */
+void UT_InfoWidgetLayoutManager::t_loadWidget()
+{
+    QGraphicsWidget *currentWidget; 
+    InfoWidgetLayoutManager::LayoutItemRole currentRole; 
+    
+    QList<InfoWidgetLayoutManager::LayoutItemRole> 
+        infoDisplayWidgetRoles = m_layoutManager->widgetRoles(
+                InfoWidgetLayoutManager::InfoDisplay); 
+
+    foreach (currentRole, infoDisplayWidgetRoles) {
+        currentWidget = m_layoutManager->loadWidget(*m_documentLoader,
+                InfoWidgetLayoutManager::InfoDisplay,
+                currentRole);
+    }
+    
+    QList<InfoWidgetLayoutManager::LayoutItemRole> 
+        settingsDisplayWidgetRoles = m_layoutManager->widgetRoles(
+                InfoWidgetLayoutManager::SettingsDisplay); 
+    
+    foreach (currentRole, settingsDisplayWidgetRoles) {
+        currentWidget = m_layoutManager->loadWidget(*m_documentLoader,
+                InfoWidgetLayoutManager::SettingsDisplay,
+                currentRole);
+    }
+
+}
+
+/*!
+  UT_InfoWidgetLayoutManager::t_getWidget
+ */
+void UT_InfoWidgetLayoutManager::t_getWidget()
+{
+    fillCurrentWidgetsContainer();
+    
+    m_layoutManager->getWidget(InfoWidgetLayoutManager::RoleUndefined);
+    m_layoutManager->getWidget(InfoWidgetLayoutManager::RoleContent);
+    m_layoutManager->getWidget(InfoWidgetLayoutManager::RoleLastEnum);
+}
+
+
+/*!
+  UT_InfoWidgetLayoutManager::t_contentWidget
+ */
+void UT_InfoWidgetLayoutManager::t_contentWidget()
+{
+    fillCurrentWidgetsContainer();
+    
+    m_layoutManager->contentWidget();
+}
+
+
+/*!
+  UT_InfoWidgetLayoutManager::t_hideWidget
+ */
+void UT_InfoWidgetLayoutManager::t_hideWidget()
+{
+    fillCurrentWidgetsContainer();
+    
+    m_layoutManager->hideWidget(InfoWidgetLayoutManager::RoleUndefined);
+    m_layoutManager->hideWidget(InfoWidgetLayoutManager::RoleContent);
+    m_layoutManager->hideWidget(InfoWidgetLayoutManager::RoleLastEnum);
+}
+
+
+/*!
+  UT_InfoWidgetLayoutManager::t_hideAll
+ */
+void UT_InfoWidgetLayoutManager::t_hideAll()
+{
+    fillCurrentWidgetsContainer();
+    
+    m_layoutManager->hideAll();
+}
+
+
+/*!
+  UT_InfoWidgetLayoutManager::t_showAll
+ */
+void UT_InfoWidgetLayoutManager::t_showAll()
+{
+    fillCurrentWidgetsContainer();
+    
+    m_layoutManager->showAll();
+}
+
+void UT_InfoWidgetLayoutManager::t_createObject()
+{
+    m_documentLoader->createObject(QString(), QString());
+}
+
+QTEST_MAIN_S60(UT_InfoWidgetLayoutManager)
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetlayoutmanager/ut_infowidgetlayoutmanager.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetlayoutmanager/ut_infowidgetlayoutmanager.pro	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,44 @@
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+# Contributors:
+# Description: Project file for building unit test component
+CONFIG += qtestlib \
+    hb
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += . \
+    ../../infowidget/src \
+    ../../infowidget/inc
+INCLUDEPATH += .
+INCLUDEPATH += ../common
+INCLUDEPATH += ../../inc/
+INCLUDEPATH += ../../infowidget/inc/
+DEFINES += XQSETTINGSMANAGER_NO_LIBRARY
+DEFINES += QT_NO_DEBUG_STREAM
+QT -= gui
+QT += testlib
+symbian: { 
+    CONFIG += no_icon
+    INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
+    LIBS += -lmocklib \
+        -lsymbianmock \
+        -lcpframework
+}
+
+# test code
+HEADERS += ./inc/ut_infowidgetlayoutmanager.h
+SOURCES += ./src/ut_infowidgetlayoutmanager.cpp
+
+# code to be tested
+HEADERS += ../../infowidget/inc/infowidgetlayoutmanager.h
+SOURCES += ../../infowidget/src/infowidgetlayoutmanager.cpp
+
+# mocks needed for testing
+SOURCES += ../mocks/mock_hbdocumentloader.cpp
+RESOURCES = ../../infowidgetprovider.qrc
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetlinehandler/inc/ut_infowidgetlinehandler.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetlinehandler/inc/ut_infowidgetlinehandler.h	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,50 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef UT_INFOWIDGETLINEHANDLER_H
+#define UT_INFOWIDGETLINEHANDLER_H
+
+#include <QtTest/QtTest>
+#include <mockservice.h>
+
+class InfoWidgetLineHandler;
+
+class UT_InfoWidgetLineHandler : public QObject, public MockService
+{
+    Q_OBJECT
+
+public:    
+    
+    UT_InfoWidgetLineHandler();
+    ~UT_InfoWidgetLineHandler();
+    
+private slots:
+
+    void init();
+    void cleanup();
+    
+    void t_logCurrentInfo(); 
+    void t_activeLine(); 
+    void t_setActiveLine();
+    
+private:
+    
+    InfoWidgetLineHandler *m_lineHandler;
+
+};
+
+#endif // UT_INFOWIDGETLINEHANDLER_H
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetlinehandler/run_auto_tests_qt.bat
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetlinehandler/run_auto_tests_qt.bat	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,187 @@
+rem
+rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+rem All rights reserved.
+rem This component and the accompanying materials are made available
+rem under the terms of "Eclipse Public License v1.0"
+rem which accompanies this distribution, and is available
+rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
+rem
+rem Initial Contributors:
+rem Nokia Corporation - initial contribution.
+rem
+rem Contributors:
+rem
+rem Description:
+rem
+
+@echo off
+setlocal
+goto :startup 
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function DEFAULT
+::
+:: Modify this function
+::  - TESTED_SRC can be changed to match tested code.
+::    Specifies path from testcode group directory to
+::    tested code
+::  - Add test directories to be runned
+::    ie. "call :build ut_projectdirectory" or use
+::    "for /f %%a in ('dir /b ut_*') do call :build %%a"
+::    which compiles, instruments and runs all test directories
+::    starting with "ut_".
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:DEFAULT
+set TESTED_SRC=..\..\infowidget\src\*.cpp
+
+for /f %%a in ('dir /b ut_*') do call :build %%a
+if [%DOMODULESTESTS%] EQU [TRUE] (
+for /f %%a in ('dir /b mt_*') do call :build %%a
+)
+
+call :finish
+goto :END
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function STARTUP
+::
+:: Initializing script
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:STARTUP
+
+set BUILDTESTS=TRUE
+set RUNTESTS=TRUE
+set INSTRUMENT=TRUE
+set REMOVEINSTRUMENT=TRUE
+set DOMODULESTESTS=TRUE
+set ABLD_CALL=abld build winscw udeb -keepgoing
+set PATH_TO_DLL=\epoc32\release\winscw\udeb
+set PATH_TO_COVERAGE_DATA=\coverage_data
+
+if not exist %PATH_TO_COVERAGE_DATA% (
+mkdir %PATH_TO_COVERAGE_DATA%
+)
+
+if [%1] EQU [] ( goto default )
+
+call :%1
+call :%2
+call :%3
+call :%4
+call :%5
+echo Running tests = %RUNTESTS%
+echo Instrumenting tests = %INSTRUMENT%
+goto default
+
+:/NOCLEANUP
+set REMOVEINSTRUMENT=FALSE
+goto end
+
+:/NORUN
+set RUNTESTS=FALSE
+set REMOVEINSTRUMENT=FALSE
+goto end
+
+:/NOINSTRUMENT
+set INSTRUMENT=FALSE
+goto end
+
+:/NOBUILD
+set BUILDTESTS=FALSE
+goto end
+
+:/ONLYUNITTESTS
+set DOMODULESTESTS=FALSE
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function FINISH
+::
+:: Finishes run_auto_tests.bat
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:FINISH
+
+if [%RUNTESTS%] EQU [TRUE] (
+call :runtests
+)
+
+if [%INSTRUMENT%] EQU [TRUE] (
+call :calculatecoverage
+)
+
+if [%REMOVEINSTRUMENT%] EQU [TRUE] (
+call :removecoverage
+)
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function BUILD
+::    param directory
+::
+:: builds test from given directory
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:BUILD
+setlocal
+if [%BUILDTESTS%] EQU [FALSE] ( goto end )
+echo Building %1
+if not exist %1 ( 
+echo %1 Not found! 
+goto end
+)
+
+pushd .
+call cd %1
+call qmake
+call bldmake bldfiles
+call abld clean winscw udeb
+if [%INSTRUMENT%] EQU [TRUE] (
+call ctcwrap -n %PATH_TO_COVERAGE_DATA%\%1 -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=%TESTED_SRC%" %ABLD_CALL%
+) else (
+call %ABLD_CALL%
+)
+
+popd
+endlocal
+goto end
+
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function RUNTESTS
+::
+:: NOTE! Function assumes that test binary is named according to test directory.
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:RUNTESTS
+echo Running tests
+call %PATH_TO_DLL%\ut_infowidgetlinehandler.exe -dtextshell --
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function CALCULATECOVERAGE
+::
+:: Calculates test coverage. Generates html
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:CALCULATECOVERAGE
+echo Calculating coverage
+ctcpost %PATH_TO_COVERAGE_DATA%\*.sym | ctcmerge -i - -o profile.txt
+call ctc2html -t 70 -i profile.txt -o \coverage_result -nsb
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function REMOVECOVERAGE
+::
+:: Removes data from coverage directory
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:REMOVECOVERAGE
+echo Removing deleting coverage data
+call del %PATH_TO_COVERAGE_DATA%\*.sym
+call del %PATH_TO_COVERAGE_DATA%\*.dat
+call del profile.txt
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function END
+::
+:: Prints done
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:END
+echo Done!
\ No newline at end of file
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetlinehandler/src/ut_infowidgetlinehandler.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetlinehandler/src/ut_infowidgetlinehandler.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,91 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include "ut_infowidgetlinehandler.h"
+#include "infowidgetlinehandler.h"
+#include "qtestmains60.h"
+
+/*!
+  UT_InfoWidgetLineHandler::UT_InfoWidgetLineHandler
+ */
+UT_InfoWidgetLineHandler::UT_InfoWidgetLineHandler() 
+    : 
+    m_lineHandler(0)
+{
+    
+}
+
+
+/*!
+  UT_InfoWidgetLineHandler::~UT_InfoWidgetLineHandler
+ */
+UT_InfoWidgetLineHandler::~UT_InfoWidgetLineHandler()
+{
+    delete m_lineHandler;
+}
+
+/*!
+  UT_InfoWidgetLineHandler::init
+ */
+void UT_InfoWidgetLineHandler::init()
+{
+    initialize();
+    
+    m_lineHandler =  new InfoWidgetLineHandler();
+    
+    QVERIFY(verify());
+}
+
+
+/*!
+  UT_InfoWidgetLineHandler::cleanup
+ */
+void UT_InfoWidgetLineHandler::cleanup()
+{
+    reset();
+    
+    delete m_lineHandler;
+    m_lineHandler = 0;
+}
+
+/*!
+  UT_InfoWidgetLineHandler::t_logCurrentInfo
+ */
+void UT_InfoWidgetLineHandler::t_logCurrentInfo()
+{
+    m_lineHandler->logCurrentInfo();
+}
+
+
+/*!
+  UT_InfoWidgetLineHandler::t_activeLine
+ */
+void UT_InfoWidgetLineHandler::t_activeLine()
+{
+    int activeLine = m_lineHandler->activeLine();
+}
+
+
+/*!
+  UT_InfoWidgetLineHandler::t_setActiveLine
+ */
+void UT_InfoWidgetLineHandler::t_setActiveLine()
+{
+    const int KActiveLine = 0;
+    m_lineHandler->setActiveLine(KActiveLine);
+}
+
+QTEST_MAIN_S60(UT_InfoWidgetLineHandler)
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetlinehandler/ut_infowidgetlinehandler.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetlinehandler/ut_infowidgetlinehandler.pro	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,47 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+# 
+# Description: Project file for building unit test component
+#
+#
+
+CONFIG += qtestlib hb
+TEMPLATE = app
+TARGET = 
+DEPENDPATH  += . ../../infowidget/src
+INCLUDEPATH += .
+INCLUDEPATH += ../common
+INCLUDEPATH += ../../inc/
+INCLUDEPATH += ../../infowidget/inc/
+
+QT -= gui
+QT += testlib
+
+symbian: {
+  CONFIG += no_icon
+  INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
+  LIBS += -lmocklib 		\
+          -lsymbianmock 	\
+          -lcpframework
+}
+    
+# test code
+HEADERS += ./inc/ut_infowidgetlinehandler.h
+SOURCES += ./src/ut_infowidgetlinehandler.cpp
+
+# code to be tested
+HEADERS += ../../infowidget/inc/infowidgetlinehandler.h
+SOURCES += ../../infowidget/src/infowidgetlinehandler.cpp
+
+# mocks needed for testing
+#SOURCES += ../mocks/mock_networkhandlingproxy.cpp
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetnetworkhandler/inc/ut_infowidgetnetworkhandler.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetnetworkhandler/inc/ut_infowidgetnetworkhandler.h	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,66 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef UT_INFOWIDGETNETWORKHANDLER_H
+#define UT_INFOWIDGETNETWORKHANDLER_H
+
+#include <QtTest/QtTest>
+#include <mockservice.h>
+
+class MNWMessageObserver;
+class InfoWidgetNetworkHandler;
+class TNWInfo;
+
+class UT_InfoWidgetNetworkHandler : public QObject, public MockService
+{
+    Q_OBJECT
+
+public:    
+    
+    UT_InfoWidgetNetworkHandler();
+    ~UT_InfoWidgetNetworkHandler();
+    
+public slots:
+    void generateException();
+    
+private slots:
+
+    void init();
+    void cleanup();
+    
+    void t_homeZoneTextTag();
+    void t_homeZoneIndicatorType();
+    void t_mcnName();
+    void t_mcnIndicatorType();
+    void t_HandleNetworkMessage();
+    void t_HandleNetworkMessageExceptionWhileEmittingSignal();
+    void t_HandleNetworkError();
+    void t_HandleNetworkErrorExceptionWhileEmittingSignal();
+    
+private:
+    
+    void initializeNetworkInfo(
+        MNWMessageObserver& aMessage, 
+        TNWInfo& aTNWInfo);
+    
+private:
+    
+    InfoWidgetNetworkHandler *m_networkHandler;
+
+};
+
+#endif // UT_INFOWIDGETNETWORKHANDLER_H
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetnetworkhandler/run_auto_tests_qt.bat
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetnetworkhandler/run_auto_tests_qt.bat	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,187 @@
+rem
+rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+rem All rights reserved.
+rem This component and the accompanying materials are made available
+rem under the terms of "Eclipse Public License v1.0"
+rem which accompanies this distribution, and is available
+rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
+rem
+rem Initial Contributors:
+rem Nokia Corporation - initial contribution.
+rem
+rem Contributors:
+rem
+rem Description:
+rem
+
+@echo off
+setlocal
+goto :startup 
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function DEFAULT
+::
+:: Modify this function
+::  - TESTED_SRC can be changed to match tested code.
+::    Specifies path from testcode group directory to
+::    tested code
+::  - Add test directories to be runned
+::    ie. "call :build ut_projectdirectory" or use
+::    "for /f %%a in ('dir /b ut_*') do call :build %%a"
+::    which compiles, instruments and runs all test directories
+::    starting with "ut_".
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:DEFAULT
+set TESTED_SRC=..\..\infowidget\src\*.cpp
+
+for /f %%a in ('dir /b ut_*') do call :build %%a
+if [%DOMODULESTESTS%] EQU [TRUE] (
+for /f %%a in ('dir /b mt_*') do call :build %%a
+)
+
+call :finish
+goto :END
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function STARTUP
+::
+:: Initializing script
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:STARTUP
+
+set BUILDTESTS=TRUE
+set RUNTESTS=TRUE
+set INSTRUMENT=TRUE
+set REMOVEINSTRUMENT=TRUE
+set DOMODULESTESTS=TRUE
+set ABLD_CALL=abld build winscw udeb -keepgoing
+set PATH_TO_DLL=\epoc32\release\winscw\udeb
+set PATH_TO_COVERAGE_DATA=\coverage_data
+
+if not exist %PATH_TO_COVERAGE_DATA% (
+mkdir %PATH_TO_COVERAGE_DATA%
+)
+
+if [%1] EQU [] ( goto default )
+
+call :%1
+call :%2
+call :%3
+call :%4
+call :%5
+echo Running tests = %RUNTESTS%
+echo Instrumenting tests = %INSTRUMENT%
+goto default
+
+:/NOCLEANUP
+set REMOVEINSTRUMENT=FALSE
+goto end
+
+:/NORUN
+set RUNTESTS=FALSE
+set REMOVEINSTRUMENT=FALSE
+goto end
+
+:/NOINSTRUMENT
+set INSTRUMENT=FALSE
+goto end
+
+:/NOBUILD
+set BUILDTESTS=FALSE
+goto end
+
+:/ONLYUNITTESTS
+set DOMODULESTESTS=FALSE
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function FINISH
+::
+:: Finishes run_auto_tests.bat
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:FINISH
+
+if [%RUNTESTS%] EQU [TRUE] (
+call :runtests
+)
+
+if [%INSTRUMENT%] EQU [TRUE] (
+call :calculatecoverage
+)
+
+if [%REMOVEINSTRUMENT%] EQU [TRUE] (
+call :removecoverage
+)
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function BUILD
+::    param directory
+::
+:: builds test from given directory
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:BUILD
+setlocal
+if [%BUILDTESTS%] EQU [FALSE] ( goto end )
+echo Building %1
+if not exist %1 ( 
+echo %1 Not found! 
+goto end
+)
+
+pushd .
+call cd %1
+call qmake
+call bldmake bldfiles
+call abld clean winscw udeb
+if [%INSTRUMENT%] EQU [TRUE] (
+call ctcwrap -n %PATH_TO_COVERAGE_DATA%\%1 -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=%TESTED_SRC%" %ABLD_CALL%
+) else (
+call %ABLD_CALL%
+)
+
+popd
+endlocal
+goto end
+
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function RUNTESTS
+::
+:: NOTE! Function assumes that test binary is named according to test directory.
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:RUNTESTS
+echo Running tests
+call %PATH_TO_DLL%\ut_infowidgetnetworkhandler.exe -dtextshell --
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function CALCULATECOVERAGE
+::
+:: Calculates test coverage. Generates html
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:CALCULATECOVERAGE
+echo Calculating coverage
+ctcpost %PATH_TO_COVERAGE_DATA%\*.sym | ctcmerge -i - -o profile.txt
+call ctc2html -t 70 -i profile.txt -o \coverage_result -nsb
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function REMOVECOVERAGE
+::
+:: Removes data from coverage directory
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:REMOVECOVERAGE
+echo Removing deleting coverage data
+call del %PATH_TO_COVERAGE_DATA%\*.sym
+call del %PATH_TO_COVERAGE_DATA%\*.dat
+call del profile.txt
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function END
+::
+:: Prints done
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:END
+echo Done!
\ No newline at end of file
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetnetworkhandler/src/ut_infowidgetnetworkhandler.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetnetworkhandler/src/ut_infowidgetnetworkhandler.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,257 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include <networkhandlingproxy.h>
+#include <nwhandlingengine.h>
+#include "ut_infowidgetnetworkhandler.h"
+#include "infowidgetnetworkhandler.h"
+#include "qtestmains60.h"
+
+const QString KHomeZoneTextTag("HomeZoneText0");    // max length 13
+const TNWViagIndicatorType 
+    KHomeZoneIndicatorType = ENWViagIndicatorTypeHomeZone;
+
+const QString KMcnName("McnNameMcnNameMcnNam");     // max length 20 
+const TNWMCNIndicatorType 
+    KMcnIndicatorType = ENWMCNIndicatorTypeActive;
+
+/*!
+  UT_InfoWidgetNetworkHandler::UT_InfoWidgetNetworkHandler
+ */
+UT_InfoWidgetNetworkHandler::UT_InfoWidgetNetworkHandler() 
+    : 
+    m_networkHandler(0)
+{
+    
+}
+
+
+/*!
+  UT_InfoWidgetNetworkHandler::~UT_InfoWidgetNetworkHandler
+ */
+UT_InfoWidgetNetworkHandler::~UT_InfoWidgetNetworkHandler()
+{
+    delete m_networkHandler;
+}
+
+/*!
+  UT_InfoWidgetNetworkHandler::generateException
+ */
+void UT_InfoWidgetNetworkHandler::generateException()
+{
+    throw std::bad_alloc();
+}
+
+/*!
+  UT_InfoWidgetNetworkHandler::init
+ */
+void UT_InfoWidgetNetworkHandler::init()
+{
+    initialize();
+    
+    EXPECT(CreateL).willOnce(invoke(this, &initializeNetworkInfo));
+    m_networkHandler =  new InfoWidgetNetworkHandler();
+    
+    QVERIFY(verify());
+}
+
+
+/*!
+  UT_InfoWidgetNetworkHandler::cleanup
+ */
+void UT_InfoWidgetNetworkHandler::cleanup()
+{
+    reset();
+    
+    delete m_networkHandler;
+    m_networkHandler = 0;
+}
+
+/*!
+  UT_InfoWidgetNetworkHandler::t_homeZoneTextTag
+ */
+void UT_InfoWidgetNetworkHandler::t_homeZoneTextTag()
+{
+    QVERIFY(m_networkHandler->homeZoneTextTag() == KHomeZoneTextTag);
+}
+
+
+/*!
+  UT_InfoWidgetNetworkHandler::t_homeZoneIndicatorType
+ */
+void UT_InfoWidgetNetworkHandler::t_homeZoneIndicatorType()
+{
+    QVERIFY(
+        m_networkHandler->homeZoneIndicatorType() == KHomeZoneIndicatorType);
+}
+
+
+/*!
+  UT_InfoWidgetNetworkHandler::t_mcnName
+ */
+void UT_InfoWidgetNetworkHandler::t_mcnName()
+{
+    QVERIFY(m_networkHandler->mcnName() == KMcnName);
+}
+
+
+/*!
+  UT_InfoWidgetNetworkHandler::t_mcnIndicatorType
+ */
+void UT_InfoWidgetNetworkHandler::t_mcnIndicatorType()
+{
+    QVERIFY(m_networkHandler->mcnIndicatorType() == KMcnIndicatorType);
+}
+
+
+/*!
+  UT_InfoWidgetNetworkHandler::t_HandleNetworkMessage
+ */
+void UT_InfoWidgetNetworkHandler::t_HandleNetworkMessage()
+{
+    QSignalSpy spy(m_networkHandler, SIGNAL(networkDataChanged()));
+    
+    // TODO: investigate, which messages indicate cell info change
+// ACCEPTED MESSAGES    
+    m_networkHandler->HandleNetworkMessage(
+        MNWMessageObserver::ENWMessageCurrentCellInfoMessage);
+    
+// MESSAGES TO BE FILTERED OUT
+// COMMON NETWORK MESSAGES                      0 - 99
+    m_networkHandler->HandleNetworkMessage(
+        MNWMessageObserver::ENWMessageNetworkInfoChange);
+    m_networkHandler->HandleNetworkMessage(
+        MNWMessageObserver::ENWMessageNetworkModeChange);
+    m_networkHandler->HandleNetworkMessage(
+        MNWMessageObserver::ENWMessageNetworkRegistrationStatusChange);
+    m_networkHandler->HandleNetworkMessage(
+        MNWMessageObserver::ENWMessageProgrammableOperatorInfoChange);
+    m_networkHandler->HandleNetworkMessage(
+        MNWMessageObserver::ENWMessageNetworkProviderNameChange);
+    m_networkHandler->HandleNetworkMessage(
+        MNWMessageObserver::ENWMessageServiceProviderNameChange);
+    m_networkHandler->HandleNetworkMessage(
+        MNWMessageObserver::ENWMessageProgrammableOperatorInfoUpdating);
+    m_networkHandler->HandleNetworkMessage(
+        MNWMessageObserver::ENWMessageNetworkProviderNameUpdating);
+    m_networkHandler->HandleNetworkMessage(
+        MNWMessageObserver::ENWMessageServiceProviderNameUpdating);
+    m_networkHandler->HandleNetworkMessage(
+        MNWMessageObserver::ENWMessageAllowRefresh);
+    m_networkHandler->HandleNetworkMessage(
+        MNWMessageObserver::ENWMessageNetworkSelectionSettingChange);
+// GSM SPECIFIC MESSAGES                        100 - 199
+    m_networkHandler->HandleNetworkMessage(
+        MNWMessageObserver::ENWMessageNetworkCellReselection);
+    m_networkHandler->HandleNetworkMessage(
+        MNWMessageObserver::ENWMessageNetworkConnectionFailure);
+//    m_networkHandler->HandleNetworkMessage(
+//        MNWMessageObserver::ENWMessageCurrentCellInfoMessage);
+    m_networkHandler->HandleNetworkMessage(
+        MNWMessageObserver::ENWMessageCurrentHomeZoneMessage);
+    m_networkHandler->HandleNetworkMessage(
+        MNWMessageObserver::ENWMessageNetworkIndicatorChange);
+// CDMA SPECIFIC MESSAGES                       200 - 299
+    m_networkHandler->HandleNetworkMessage(
+        MNWMessageObserver::ENWMessageNetworkEmergencyMode); 
+    m_networkHandler->HandleNetworkMessage(
+        MNWMessageObserver::ENWMessageVoicePrivacyStatusChange);
+    m_networkHandler->HandleNetworkMessage(
+        MNWMessageObserver::ENWMessageStartSystemSearchRequestCompleteOk);
+    m_networkHandler->HandleNetworkMessage(
+        MNWMessageObserver::ENWMessageStartSystemSearchRequestCompleteFail);
+    m_networkHandler->HandleNetworkMessage(
+        MNWMessageObserver::ENWMessageStopProtocolStackRequestCompleteOk);
+    m_networkHandler->HandleNetworkMessage(
+        MNWMessageObserver::ENWMessageStopProtocolStackRequestCompleteFail);
+    
+    const int KExpectedNumOfSignalEmissions = 1;
+    QCOMPARE(spy.count(), KExpectedNumOfSignalEmissions);
+    
+    const QList<QVariant> &arguments = spy.at(0);
+    QCOMPARE(arguments.count(), 0);
+}
+
+
+/*!
+  UT_InfoWidgetNetworkHandler::t_HandleNetworkMessageExceptionWhileEmittingSignal
+ */
+void UT_InfoWidgetNetworkHandler::t_HandleNetworkMessageExceptionWhileEmittingSignal()
+{
+    QObject::connect(
+        m_networkHandler, SIGNAL(networkDataChanged()),
+        this, SLOT(generateException())); 
+    
+    m_networkHandler->HandleNetworkMessage(
+        MNWMessageObserver::ENWMessageCurrentCellInfoMessage);
+}
+
+
+/*!
+  UT_InfoWidgetNetworkHandler::t_HandleNetworkError
+ */
+Q_DECLARE_METATYPE(MNWMessageObserver::TNWOperation)
+void UT_InfoWidgetNetworkHandler::t_HandleNetworkError()
+{
+    QSignalSpy spy(m_networkHandler, SIGNAL(networkError(int, int)));
+    qRegisterMetaType<MNWMessageObserver::TNWOperation>
+        ("MNWMessageObserver::TNWOperation");
+    
+    MNWMessageObserver::TNWOperation operation = MNWMessageObserver::ENWNone;
+    const int errorCode = -4;
+    m_networkHandler->HandleNetworkError(operation, errorCode);
+    
+    const int KExpectedNumOfSignalEmissions = 1;
+    QCOMPARE(spy.count(), KExpectedNumOfSignalEmissions);
+    const QList<QVariant> &arguments = spy.at(0);
+    QCOMPARE(arguments.count(), 2);
+    
+    QCOMPARE(
+        qvariant_cast<MNWMessageObserver::TNWOperation>(arguments.at(0)), 
+        operation);
+    QCOMPARE(arguments.at(1).toInt(), errorCode);
+}
+
+
+/*!
+  UT_InfoWidgetNetworkHandler::t_HandleNetworkErrorExceptionWhileEmittingSignal
+ */
+void UT_InfoWidgetNetworkHandler::t_HandleNetworkErrorExceptionWhileEmittingSignal()
+{
+    QObject::connect(
+        m_networkHandler, SIGNAL(networkError(int, int)),
+        this, SLOT(generateException())); 
+    
+    MNWMessageObserver::TNWOperation operation = MNWMessageObserver::ENWNone;
+    const int errorCode = -4;
+    m_networkHandler->HandleNetworkError(operation, errorCode);
+}
+
+
+/*!
+  UT_InfoWidgetNetworkHandler::initializeNetworkInfo
+ */
+void UT_InfoWidgetNetworkHandler::initializeNetworkInfo(
+    MNWMessageObserver& /*aObserver*/, TNWInfo& aTNWInfo)
+{
+    aTNWInfo.iViagTextTag.Copy(KHomeZoneTextTag.utf16());
+    aTNWInfo.iViagIndicatorType = KHomeZoneIndicatorType;
+    
+    aTNWInfo.iMCNName.Copy(KMcnName.utf16());
+    aTNWInfo.iMCNIndicatorType = KMcnIndicatorType;
+}
+
+QTEST_MAIN_S60(UT_InfoWidgetNetworkHandler)
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetnetworkhandler/ut_infowidgetnetworkhandler.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetnetworkhandler/ut_infowidgetnetworkhandler.pro	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,47 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+# 
+# Description: Project file for building unit test component
+#
+#
+
+CONFIG += qtestlib hb
+TEMPLATE = app
+TARGET = 
+DEPENDPATH  += . ../../infowidget/src
+INCLUDEPATH += .
+INCLUDEPATH += ../common
+INCLUDEPATH += ../../inc/
+INCLUDEPATH += ../../infowidget/inc/
+
+QT -= gui
+QT += testlib
+
+symbian: {
+  CONFIG += no_icon
+  INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
+  LIBS += -lmocklib 		\
+          -lsymbianmock 	\
+          -lcpframework
+}
+    
+# test code
+HEADERS += ./inc/ut_infowidgetnetworkhandler.h
+SOURCES += ./src/ut_infowidgetnetworkhandler.cpp
+
+# code to be tested
+HEADERS += ../../infowidget/inc/infowidgetnetworkhandler.h
+SOURCES += ../../infowidget/src/infowidgetnetworkhandler.cpp
+
+# mocks needed for testing
+SOURCES += ../mocks/mock_networkhandlingproxy.cpp
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetpreferences/inc/ut_infowidgetpreferences.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetpreferences/inc/ut_infowidgetpreferences.h	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,52 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef UT_INFOWIDGETPREFERENCES_H
+#define UT_INFOWIDGETPREFERENCES_H
+
+#include <QtTest/QtTest>
+#include <mockservice.h>
+
+class InfoWidgetPreferences;
+
+class UT_InfoWidgetPreferences : public QObject, public MockService
+{
+    Q_OBJECT
+
+public:    
+    
+    UT_InfoWidgetPreferences();
+    ~UT_InfoWidgetPreferences();
+    
+private slots:
+
+    void init();
+    void cleanup();
+
+    void t_loadPreferences();
+    void t_storePreferences();
+    void t_preference();
+    void t_setPreference();
+    void t_visibleItemCount();
+    
+private:
+    
+    InfoWidgetPreferences *m_infoWidgetPreferences;
+
+};
+
+#endif // UT_INFOWIDGETPREFERENCES_H
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetpreferences/run_auto_tests_qt.bat
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetpreferences/run_auto_tests_qt.bat	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,187 @@
+rem
+rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+rem All rights reserved.
+rem This component and the accompanying materials are made available
+rem under the terms of "Eclipse Public License v1.0"
+rem which accompanies this distribution, and is available
+rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
+rem
+rem Initial Contributors:
+rem Nokia Corporation - initial contribution.
+rem
+rem Contributors:
+rem
+rem Description:
+rem
+
+@echo off
+setlocal
+goto :startup 
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function DEFAULT
+::
+:: Modify this function
+::  - TESTED_SRC can be changed to match tested code.
+::    Specifies path from testcode group directory to
+::    tested code
+::  - Add test directories to be runned
+::    ie. "call :build ut_projectdirectory" or use
+::    "for /f %%a in ('dir /b ut_*') do call :build %%a"
+::    which compiles, instruments and runs all test directories
+::    starting with "ut_".
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:DEFAULT
+set TESTED_SRC=..\..\infowidget\src\*.cpp
+
+for /f %%a in ('dir /b ut_*') do call :build %%a
+if [%DOMODULESTESTS%] EQU [TRUE] (
+for /f %%a in ('dir /b mt_*') do call :build %%a
+)
+
+call :finish
+goto :END
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function STARTUP
+::
+:: Initializing script
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:STARTUP
+
+set BUILDTESTS=TRUE
+set RUNTESTS=TRUE
+set INSTRUMENT=TRUE
+set REMOVEINSTRUMENT=TRUE
+set DOMODULESTESTS=TRUE
+set ABLD_CALL=abld build winscw udeb -keepgoing
+set PATH_TO_DLL=\epoc32\release\winscw\udeb
+set PATH_TO_COVERAGE_DATA=\coverage_data
+
+if not exist %PATH_TO_COVERAGE_DATA% (
+mkdir %PATH_TO_COVERAGE_DATA%
+)
+
+if [%1] EQU [] ( goto default )
+
+call :%1
+call :%2
+call :%3
+call :%4
+call :%5
+echo Running tests = %RUNTESTS%
+echo Instrumenting tests = %INSTRUMENT%
+goto default
+
+:/NOCLEANUP
+set REMOVEINSTRUMENT=FALSE
+goto end
+
+:/NORUN
+set RUNTESTS=FALSE
+set REMOVEINSTRUMENT=FALSE
+goto end
+
+:/NOINSTRUMENT
+set INSTRUMENT=FALSE
+goto end
+
+:/NOBUILD
+set BUILDTESTS=FALSE
+goto end
+
+:/ONLYUNITTESTS
+set DOMODULESTESTS=FALSE
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function FINISH
+::
+:: Finishes run_auto_tests.bat
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:FINISH
+
+if [%RUNTESTS%] EQU [TRUE] (
+call :runtests
+)
+
+if [%INSTRUMENT%] EQU [TRUE] (
+call :calculatecoverage
+)
+
+if [%REMOVEINSTRUMENT%] EQU [TRUE] (
+call :removecoverage
+)
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function BUILD
+::    param directory
+::
+:: builds test from given directory
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:BUILD
+setlocal
+if [%BUILDTESTS%] EQU [FALSE] ( goto end )
+echo Building %1
+if not exist %1 ( 
+echo %1 Not found! 
+goto end
+)
+
+pushd .
+call cd %1
+call qmake
+call bldmake bldfiles
+call abld clean winscw udeb
+if [%INSTRUMENT%] EQU [TRUE] (
+call ctcwrap -n %PATH_TO_COVERAGE_DATA%\%1 -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=%TESTED_SRC%" %ABLD_CALL%
+) else (
+call %ABLD_CALL%
+)
+
+popd
+endlocal
+goto end
+
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function RUNTESTS
+::
+:: NOTE! Function assumes that test binary is named according to test directory.
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:RUNTESTS
+echo Running tests
+call %PATH_TO_DLL%\ut_infowidgetpreferences.exe -dtextshell --
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function CALCULATECOVERAGE
+::
+:: Calculates test coverage. Generates html
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:CALCULATECOVERAGE
+echo Calculating coverage
+ctcpost %PATH_TO_COVERAGE_DATA%\*.sym | ctcmerge -i - -o profile.txt
+call ctc2html -t 70 -i profile.txt -o \coverage_result -nsb
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function REMOVECOVERAGE
+::
+:: Removes data from coverage directory
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:REMOVECOVERAGE
+echo Removing deleting coverage data
+call del %PATH_TO_COVERAGE_DATA%\*.sym
+call del %PATH_TO_COVERAGE_DATA%\*.dat
+call del profile.txt
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function END
+::
+:: Prints done
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:END
+echo Done!
\ No newline at end of file
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetpreferences/src/ut_infowidgetpreferences.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetpreferences/src/ut_infowidgetpreferences.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,158 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include "ut_infowidgetpreferences.h"
+#include "infowidgetpreferences.h"
+#include "qtestmains60.h"
+
+/*!
+  UT_InfoWidgetPreferences::UT_InfoWidgetPreferences
+ */
+UT_InfoWidgetPreferences::UT_InfoWidgetPreferences() 
+    : 
+    m_infoWidgetPreferences(0)
+{
+    
+}
+
+
+/*!
+  UT_InfoWidgetPreferences::~UT_InfoWidgetPreferences
+ */
+UT_InfoWidgetPreferences::~UT_InfoWidgetPreferences()
+{
+    delete m_infoWidgetPreferences;
+}
+
+
+/*!
+  UT_InfoWidgetPreferences::init
+ */
+void UT_InfoWidgetPreferences::init()
+{
+    initialize();
+    
+    m_infoWidgetPreferences = new InfoWidgetPreferences();
+    
+    QVERIFY(verify());
+}
+
+
+/*!
+  UT_InfoWidgetPreferences::cleanup
+ */
+void UT_InfoWidgetPreferences::cleanup()
+{
+    reset();
+    
+    delete m_infoWidgetPreferences;
+    m_infoWidgetPreferences = 0;
+}
+
+
+/*!
+  UT_InfoWidgetPreferences::t_loadPreferences
+ */
+void UT_InfoWidgetPreferences::t_loadPreferences()
+{
+    m_infoWidgetPreferences->loadPreferences();
+}
+
+
+/*!
+  UT_InfoWidgetPreferences::t_storePreferences
+ */
+void UT_InfoWidgetPreferences::t_storePreferences()
+{
+    m_infoWidgetPreferences->storePreferences();
+}
+
+
+/*!
+  UT_InfoWidgetPreferences::t_preference
+ */
+void UT_InfoWidgetPreferences::t_preference()
+{
+    QString preferenceValue = m_infoWidgetPreferences->preference(
+        InfoWidgetPreferences::DisplayHomeZone);
+    QVERIFY(DISPLAY_SETTING_OFF == preferenceValue);
+    
+    preferenceValue = m_infoWidgetPreferences->preference(
+        InfoWidgetPreferences::DisplayMcn);
+    QVERIFY(DISPLAY_SETTING_OFF == preferenceValue);
+    
+    preferenceValue = m_infoWidgetPreferences->preference(
+        InfoWidgetPreferences::DisplayActiveLine);
+    QVERIFY(DISPLAY_SETTING_OFF == preferenceValue);
+    
+    preferenceValue = m_infoWidgetPreferences->preference(
+        InfoWidgetPreferences::DisplaySatText);
+    QVERIFY(DISPLAY_SETTING_OFF == preferenceValue);
+}
+
+
+/*!
+  UT_InfoWidgetPreferences::t_setPreference
+ */
+void UT_InfoWidgetPreferences::t_setPreference()
+{
+    m_infoWidgetPreferences->setPreference(
+        InfoWidgetPreferences::DisplayHomeZone, DISPLAY_SETTING_ON);
+    QVERIFY(DISPLAY_SETTING_ON == m_infoWidgetPreferences->preference(
+        InfoWidgetPreferences::DisplayHomeZone));
+    
+    m_infoWidgetPreferences->setPreference(
+        InfoWidgetPreferences::DisplayMcn, DISPLAY_SETTING_ON);
+    QVERIFY(DISPLAY_SETTING_ON == m_infoWidgetPreferences->preference(
+        InfoWidgetPreferences::DisplayMcn));
+    
+    m_infoWidgetPreferences->setPreference(
+        InfoWidgetPreferences::DisplayActiveLine, DISPLAY_SETTING_ON);
+    QVERIFY(DISPLAY_SETTING_ON == m_infoWidgetPreferences->preference(
+        InfoWidgetPreferences::DisplayActiveLine));
+    
+    m_infoWidgetPreferences->setPreference(
+        InfoWidgetPreferences::DisplaySatText, DISPLAY_SETTING_ON);
+    QVERIFY(DISPLAY_SETTING_ON == m_infoWidgetPreferences->preference(
+        InfoWidgetPreferences::DisplaySatText));
+    
+    m_infoWidgetPreferences->setPreference(
+        InfoWidgetPreferences::DisplaySatText, DISPLAY_SETTING_OFF);
+    QVERIFY(DISPLAY_SETTING_OFF == m_infoWidgetPreferences->preference(
+        InfoWidgetPreferences::DisplaySatText));
+}
+
+/*!
+  UT_InfoWidgetPreferences::t_visibleItemCount
+ */
+void UT_InfoWidgetPreferences::t_visibleItemCount()
+{
+    int visibleItems = m_infoWidgetPreferences->visibleItemCount();
+    QVERIFY(visibleItems == 0);
+    
+    m_infoWidgetPreferences->setPreference(
+        InfoWidgetPreferences::DisplayHomeZone, DISPLAY_SETTING_ON);
+    m_infoWidgetPreferences->setPreference(
+        InfoWidgetPreferences::DisplayMcn, DISPLAY_SETTING_ON);
+    m_infoWidgetPreferences->setPreference(
+        InfoWidgetPreferences::DisplayActiveLine, DISPLAY_SETTING_ON);
+    m_infoWidgetPreferences->setPreference(
+        InfoWidgetPreferences::DisplaySatText, DISPLAY_SETTING_ON);
+    visibleItems = m_infoWidgetPreferences->visibleItemCount();
+    QVERIFY(visibleItems == 4);
+}
+
+QTEST_MAIN_S60(UT_InfoWidgetPreferences)
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetpreferences/ut_infowidgetpreferences.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetpreferences/ut_infowidgetpreferences.pro	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,46 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+# 
+# Description: Project file for building unit test component
+#
+#
+
+CONFIG += qtestlib hb
+TEMPLATE = app
+TARGET = 
+DEPENDPATH  += . ../../infowidget/src ../../infowidget/inc
+INCLUDEPATH += .
+INCLUDEPATH += ../common
+INCLUDEPATH += ../../inc/
+INCLUDEPATH += ../../infowidget/inc/
+DEFINES += XQSETTINGSMANAGER_NO_LIBRARY
+DEFINES += QT_NO_DEBUG_STREAM
+
+QT -= gui
+QT += testlib
+
+symbian: {
+  CONFIG += no_icon
+  INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
+  LIBS += -lmocklib 		\
+          -lsymbianmock 	\
+          -lcpframework
+}
+    
+# test code
+HEADERS += ./inc/ut_infowidgetpreferences.h
+SOURCES += ./src/ut_infowidgetpreferences.cpp
+
+# code to be tested
+HEADERS += ../../infowidget/inc/infowidgetpreferences.h
+SOURCES += ../../infowidget/src/infowidgetpreferences.cpp
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetprovider/inc/ut_infowidgetprovider.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetprovider/inc/ut_infowidgetprovider.h	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,50 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef UT_INFOWIDGETPROVIDER_H
+#define UT_INFOWIDGETPROVIDER_H
+
+#include <QtTest/QtTest>
+#include <mockservice.h>
+#include <qserviceplugininterface.h>
+
+QTM_USE_NAMESPACE
+
+class InfoWidgetProvider;
+
+class UT_InfoWidgetProvider : public QObject, public MockService
+{
+    Q_OBJECT
+
+public:    
+    
+    UT_InfoWidgetProvider();
+    ~UT_InfoWidgetProvider();
+    
+private slots:
+
+    void init();
+    void cleanup();
+    void t_createInstance(); 
+    
+private:
+    
+    InfoWidgetProvider *m_infoWidgetProvider;
+
+};
+
+#endif // UT_INFOWIDGET_H
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetprovider/run_auto_tests_qt.bat
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetprovider/run_auto_tests_qt.bat	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,187 @@
+rem
+rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+rem All rights reserved.
+rem This component and the accompanying materials are made available
+rem under the terms of "Eclipse Public License v1.0"
+rem which accompanies this distribution, and is available
+rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
+rem
+rem Initial Contributors:
+rem Nokia Corporation - initial contribution.
+rem
+rem Contributors:
+rem
+rem Description:
+rem
+
+@echo off
+setlocal
+goto :startup 
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function DEFAULT
+::
+:: Modify this function
+::  - TESTED_SRC can be changed to match tested code.
+::    Specifies path from testcode group directory to
+::    tested code
+::  - Add test directories to be runned
+::    ie. "call :build ut_projectdirectory" or use
+::    "for /f %%a in ('dir /b ut_*') do call :build %%a"
+::    which compiles, instruments and runs all test directories
+::    starting with "ut_".
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:DEFAULT
+set TESTED_SRC=..\..\src\*.cpp
+
+for /f %%a in ('dir /b ut_*') do call :build %%a
+if [%DOMODULESTESTS%] EQU [TRUE] (
+for /f %%a in ('dir /b mt_*') do call :build %%a
+)
+
+call :finish
+goto :END
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function STARTUP
+::
+:: Initializing script
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:STARTUP
+
+set BUILDTESTS=TRUE
+set RUNTESTS=TRUE
+set INSTRUMENT=TRUE
+set REMOVEINSTRUMENT=TRUE
+set DOMODULESTESTS=TRUE
+set ABLD_CALL=abld build winscw udeb -keepgoing
+set PATH_TO_DLL=\epoc32\release\winscw\udeb
+set PATH_TO_COVERAGE_DATA=\coverage_data
+
+if not exist %PATH_TO_COVERAGE_DATA% (
+mkdir %PATH_TO_COVERAGE_DATA%
+)
+
+if [%1] EQU [] ( goto default )
+
+call :%1
+call :%2
+call :%3
+call :%4
+call :%5
+echo Running tests = %RUNTESTS%
+echo Instrumenting tests = %INSTRUMENT%
+goto default
+
+:/NOCLEANUP
+set REMOVEINSTRUMENT=FALSE
+goto end
+
+:/NORUN
+set RUNTESTS=FALSE
+set REMOVEINSTRUMENT=FALSE
+goto end
+
+:/NOINSTRUMENT
+set INSTRUMENT=FALSE
+goto end
+
+:/NOBUILD
+set BUILDTESTS=FALSE
+goto end
+
+:/ONLYUNITTESTS
+set DOMODULESTESTS=FALSE
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function FINISH
+::
+:: Finishes run_auto_tests.bat
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:FINISH
+
+if [%RUNTESTS%] EQU [TRUE] (
+call :runtests
+)
+
+if [%INSTRUMENT%] EQU [TRUE] (
+call :calculatecoverage
+)
+
+if [%REMOVEINSTRUMENT%] EQU [TRUE] (
+call :removecoverage
+)
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function BUILD
+::    param directory
+::
+:: builds test from given directory
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:BUILD
+setlocal
+if [%BUILDTESTS%] EQU [FALSE] ( goto end )
+echo Building %1
+if not exist %1 ( 
+echo %1 Not found! 
+goto end
+)
+
+pushd .
+call cd %1
+call qmake
+call bldmake bldfiles
+call abld clean winscw udeb
+if [%INSTRUMENT%] EQU [TRUE] (
+call ctcwrap -n %PATH_TO_COVERAGE_DATA%\%1 -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=%TESTED_SRC%" %ABLD_CALL%
+) else (
+call %ABLD_CALL%
+)
+
+popd
+endlocal
+goto end
+
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function RUNTESTS
+::
+:: NOTE! Function assumes that test binary is named according to test directory.
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:RUNTESTS
+echo Running tests
+call %PATH_TO_DLL%\ut_infowidgetprovider.exe -dtextshell --
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function CALCULATECOVERAGE
+::
+:: Calculates test coverage. Generates html
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:CALCULATECOVERAGE
+echo Calculating coverage
+ctcpost %PATH_TO_COVERAGE_DATA%\*.sym | ctcmerge -i - -o profile.txt
+call ctc2html -t 70 -i profile.txt -o \coverage_result -nsb
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function REMOVECOVERAGE
+::
+:: Removes data from coverage directory
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:REMOVECOVERAGE
+echo Removing deleting coverage data
+call del %PATH_TO_COVERAGE_DATA%\*.sym
+call del %PATH_TO_COVERAGE_DATA%\*.dat
+call del profile.txt
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function END
+::
+:: Prints done
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:END
+echo Done!
\ No newline at end of file
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetprovider/src/ut_infowidgetprovider.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetprovider/src/ut_infowidgetprovider.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,118 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include "ut_infowidgetprovider.h"
+#include "infowidgetprovider.h"
+#include "qtestmains60.h"
+
+#include <qserviceinterfacedescriptor.h>
+#include <qabstractsecuritysession.h>
+#include <qservicecontext.h>
+#include <QString>
+
+
+class MyQServiceInterfaceDescriptor : public QServiceInterfaceDescriptor
+{}; 
+
+class MyQServiceContext : public QServiceContext
+{
+public: 
+    virtual void notify( ContextType type, const QVariant& variant){};
+}; 
+
+class MyQAbstractSecuritySession : public QAbstractSecuritySession
+{
+public: 
+    virtual bool isAllowed(const QStringList& capabilityList){return true;};
+}; 
+
+QString KValidInfoWidgetInterfaceName("com.nokia.homescreen.widget"); 
+QString KInvalidInfoWidgetInterfaceName("com");
+
+
+/*!
+  UT_InfoWidgetProvider::UT_InfoWidgetProvider
+ */
+UT_InfoWidgetProvider::UT_InfoWidgetProvider() 
+    : 
+    m_infoWidgetProvider(0)
+{
+    
+}
+
+
+/*!
+  UT_InfoWidgetProvider::~UT_InfoWidgetProvider
+ */
+UT_InfoWidgetProvider::~UT_InfoWidgetProvider()
+{
+    delete m_infoWidgetProvider;
+}
+
+
+/*!
+  UT_InfoWidgetProvider::init
+ */
+void UT_InfoWidgetProvider::init()
+{
+    initialize();
+    
+    m_infoWidgetProvider = new InfoWidgetProvider();
+    
+    QVERIFY(verify());
+}
+
+
+/*!
+  UT_InfoWidgetProvider::cleanup
+ */
+void UT_InfoWidgetProvider::cleanup()
+{
+    reset();
+    
+    delete m_infoWidgetProvider;
+    m_infoWidgetProvider = 0;
+}
+
+
+void UT_InfoWidgetProvider::t_createInstance()
+    {
+    MyQServiceInterfaceDescriptor myServiceInterfaceDescriptor; 
+    MyQServiceContext myQServiceContext; 
+    MyQAbstractSecuritySession myAbstractSecuritySession; 
+    
+    QObject *instanceValue = NULL; 
+
+    // Test: instance creation with valid interface name
+    expect("QtMobility::QServiceInterfaceDescriptor::interfaceName").returns(KValidInfoWidgetInterfaceName);
+    expect("InfoWidget::InfoWidget"); 
+    instanceValue = m_infoWidgetProvider->createInstance(myServiceInterfaceDescriptor,
+                                             &myQServiceContext,
+                                             &myAbstractSecuritySession);
+    Q_ASSERT(instanceValue); 
+    
+    // Test: instance creation with invalid interface name
+    expect("QtMobility::QServiceInterfaceDescriptor::interfaceName").returns(KInvalidInfoWidgetInterfaceName);
+    instanceValue = m_infoWidgetProvider->createInstance(myServiceInterfaceDescriptor,
+                                             &myQServiceContext,
+                                             &myAbstractSecuritySession);
+    Q_ASSERT(instanceValue == NULL); 
+    
+
+}
+
+
+QTEST_MAIN_S60(UT_InfoWidgetProvider)
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetprovider/ut_infowidgetprovider.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetprovider/ut_infowidgetprovider.pro	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,51 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+# 
+# Description: Project file for building unit test component
+#
+#
+
+CONFIG += qtestlib hb mobility
+MOBILITY = serviceframework
+TEMPLATE = app
+TARGET = 
+INCLUDEPATH += .
+INCLUDEPATH += ../common
+INCLUDEPATH += ../../inc/
+INCLUDEPATH += ../../infowidget/inc/
+DEFINES += QT_NO_DEBUG_STREAM
+
+QT -= gui
+QT += testlib
+
+symbian: {
+  CONFIG += no_icon
+  INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
+  LIBS += -lmocklib 		\
+          -lsymbianmock     \
+          -lhswidgetmodel
+}
+
+# test code
+HEADERS += ./inc/ut_infowidgetprovider.h
+SOURCES += ./src/ut_infowidgetprovider.cpp
+
+# code to be tested
+HEADERS += ../../inc/infowidgetprovider.h
+SOURCES += ../../src/infowidgetprovider.cpp
+
+# mocks needed for testing
+HEADERS += ../../infowidget/inc/infowidget.h
+SOURCES += ../mocks/mock_infowidget.cpp
+SOURCES += ../mocks/mock_qserviceplugininterface.cpp
+SOURCES += ../mocks/mock_qserviceinterfacedescriptor.cpp
\ No newline at end of file
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetsathandler/inc/ut_infowidgetsathandler.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetsathandler/inc/ut_infowidgetsathandler.h	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,50 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef UT_INFOWIDGETSATHANDLER_H
+#define UT_INFOWIDGETSATHANDLER_H
+
+#include <QtTest/QtTest>
+#include <mockservice.h>
+
+class InfoWidgetSatHandler;
+
+class UT_InfoWidgetSatHandler : public QObject, public MockService
+{
+    Q_OBJECT
+
+public:    
+    
+    UT_InfoWidgetSatHandler();
+    ~UT_InfoWidgetSatHandler();
+    
+private slots:
+
+    void init();
+    void cleanup();
+    
+    void t_satDisplayText(); 
+    void t_setSatDisplayText();
+    void t_logCurrentInfo(); 
+    
+private:
+    
+    InfoWidgetSatHandler *m_satHandler;
+
+};
+
+#endif // UT_INFOWIDGETSATHANDLER_H
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetsathandler/run_auto_tests_qt.bat
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetsathandler/run_auto_tests_qt.bat	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,187 @@
+rem
+rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+rem All rights reserved.
+rem This component and the accompanying materials are made available
+rem under the terms of "Eclipse Public License v1.0"
+rem which accompanies this distribution, and is available
+rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
+rem
+rem Initial Contributors:
+rem Nokia Corporation - initial contribution.
+rem
+rem Contributors:
+rem
+rem Description:
+rem
+
+@echo off
+setlocal
+goto :startup 
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function DEFAULT
+::
+:: Modify this function
+::  - TESTED_SRC can be changed to match tested code.
+::    Specifies path from testcode group directory to
+::    tested code
+::  - Add test directories to be runned
+::    ie. "call :build ut_projectdirectory" or use
+::    "for /f %%a in ('dir /b ut_*') do call :build %%a"
+::    which compiles, instruments and runs all test directories
+::    starting with "ut_".
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:DEFAULT
+set TESTED_SRC=..\..\infowidget\src\*.cpp
+
+for /f %%a in ('dir /b ut_*') do call :build %%a
+if [%DOMODULESTESTS%] EQU [TRUE] (
+for /f %%a in ('dir /b mt_*') do call :build %%a
+)
+
+call :finish
+goto :END
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function STARTUP
+::
+:: Initializing script
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:STARTUP
+
+set BUILDTESTS=TRUE
+set RUNTESTS=TRUE
+set INSTRUMENT=TRUE
+set REMOVEINSTRUMENT=TRUE
+set DOMODULESTESTS=TRUE
+set ABLD_CALL=abld build winscw udeb -keepgoing
+set PATH_TO_DLL=\epoc32\release\winscw\udeb
+set PATH_TO_COVERAGE_DATA=\coverage_data
+
+if not exist %PATH_TO_COVERAGE_DATA% (
+mkdir %PATH_TO_COVERAGE_DATA%
+)
+
+if [%1] EQU [] ( goto default )
+
+call :%1
+call :%2
+call :%3
+call :%4
+call :%5
+echo Running tests = %RUNTESTS%
+echo Instrumenting tests = %INSTRUMENT%
+goto default
+
+:/NOCLEANUP
+set REMOVEINSTRUMENT=FALSE
+goto end
+
+:/NORUN
+set RUNTESTS=FALSE
+set REMOVEINSTRUMENT=FALSE
+goto end
+
+:/NOINSTRUMENT
+set INSTRUMENT=FALSE
+goto end
+
+:/NOBUILD
+set BUILDTESTS=FALSE
+goto end
+
+:/ONLYUNITTESTS
+set DOMODULESTESTS=FALSE
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function FINISH
+::
+:: Finishes run_auto_tests.bat
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:FINISH
+
+if [%RUNTESTS%] EQU [TRUE] (
+call :runtests
+)
+
+if [%INSTRUMENT%] EQU [TRUE] (
+call :calculatecoverage
+)
+
+if [%REMOVEINSTRUMENT%] EQU [TRUE] (
+call :removecoverage
+)
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function BUILD
+::    param directory
+::
+:: builds test from given directory
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:BUILD
+setlocal
+if [%BUILDTESTS%] EQU [FALSE] ( goto end )
+echo Building %1
+if not exist %1 ( 
+echo %1 Not found! 
+goto end
+)
+
+pushd .
+call cd %1
+call qmake
+call bldmake bldfiles
+call abld clean winscw udeb
+if [%INSTRUMENT%] EQU [TRUE] (
+call ctcwrap -n %PATH_TO_COVERAGE_DATA%\%1 -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=%TESTED_SRC%" %ABLD_CALL%
+) else (
+call %ABLD_CALL%
+)
+
+popd
+endlocal
+goto end
+
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function RUNTESTS
+::
+:: NOTE! Function assumes that test binary is named according to test directory.
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:RUNTESTS
+echo Running tests
+call %PATH_TO_DLL%\ut_infowidgetsathandler.exe -dtextshell --
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function CALCULATECOVERAGE
+::
+:: Calculates test coverage. Generates html
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:CALCULATECOVERAGE
+echo Calculating coverage
+ctcpost %PATH_TO_COVERAGE_DATA%\*.sym | ctcmerge -i - -o profile.txt
+call ctc2html -t 70 -i profile.txt -o \coverage_result -nsb
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function REMOVECOVERAGE
+::
+:: Removes data from coverage directory
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:REMOVECOVERAGE
+echo Removing deleting coverage data
+call del %PATH_TO_COVERAGE_DATA%\*.sym
+call del %PATH_TO_COVERAGE_DATA%\*.dat
+call del profile.txt
+goto end
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: function END
+::
+:: Prints done
+::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:END
+echo Done!
\ No newline at end of file
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetsathandler/src/ut_infowidgetsathandler.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetsathandler/src/ut_infowidgetsathandler.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,95 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include "ut_infowidgetsathandler.h"
+#include "infowidgetsathandler.h"
+#include "qtestmains60.h"
+
+/*!
+  UT_InfoWidgetSatHandler::UT_InfoWidgetSatHandler
+ */
+UT_InfoWidgetSatHandler::UT_InfoWidgetSatHandler() 
+    : 
+    m_satHandler(0)
+{
+    
+}
+
+
+/*!
+  UT_InfoWidgetSatHandler::~UT_InfoWidgetSatHandler
+ */
+UT_InfoWidgetSatHandler::~UT_InfoWidgetSatHandler()
+{
+    delete m_satHandler;
+}
+
+/*!
+  UT_InfoWidgetSatHandler::init
+ */
+void UT_InfoWidgetSatHandler::init()
+{
+    initialize();
+    
+    m_satHandler =  new InfoWidgetSatHandler();
+    
+    QVERIFY(verify());
+}
+
+
+/*!
+  UT_InfoWidgetSatHandler::cleanup
+ */
+void UT_InfoWidgetSatHandler::cleanup()
+{
+    reset();
+    
+    delete m_satHandler;
+    m_satHandler = 0;
+}
+
+
+/*!
+  UT_InfoWidgetSatHandler::t_satDisplayText
+ */
+void UT_InfoWidgetSatHandler::t_satDisplayText()
+{
+    const QString& satDisplayText = m_satHandler->satDisplayText();
+    QVERIFY(satDisplayText == QString("SAT DISPLAY TEXT"));
+}
+
+
+/*!
+  UT_InfoWidgetSatHandler::t_setSatDisplayText
+ */
+void UT_InfoWidgetSatHandler::t_setSatDisplayText()
+{
+    QString satDisplayText("satDisplayText");
+    m_satHandler->setSatDisplayText(satDisplayText);
+    
+    QVERIFY(satDisplayText == m_satHandler->satDisplayText());
+}
+
+
+/*!
+  UT_InfoWidgetSatHandler::t_logCurrentInfo
+ */
+void UT_InfoWidgetSatHandler::t_logCurrentInfo()
+{
+    m_satHandler->logCurrentInfo();
+}
+
+QTEST_MAIN_S60(UT_InfoWidgetSatHandler)
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetsathandler/ut_infowidgetsathandler.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetprovider/tsrc/ut_infowidgetsathandler/ut_infowidgetsathandler.pro	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,47 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+# 
+# Description: Project file for building unit test component
+#
+#
+
+CONFIG += qtestlib hb
+TEMPLATE = app
+TARGET = 
+DEPENDPATH  += . ../../infowidget/src
+INCLUDEPATH += .
+INCLUDEPATH += ../common
+INCLUDEPATH += ../../inc/
+INCLUDEPATH += ../../infowidget/inc/
+
+QT -= gui
+QT += testlib
+
+symbian: {
+  CONFIG += no_icon
+  INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
+  LIBS += -lmocklib 		\
+          -lsymbianmock 	\
+          -lcpframework
+}
+    
+# test code
+HEADERS += ./inc/ut_infowidgetsathandler.h
+SOURCES += ./src/ut_infowidgetsathandler.cpp
+
+# code to be tested
+HEADERS += ../../infowidget/inc/infowidgetsathandler.h
+SOURCES += ../../infowidget/src/infowidgetsathandler.cpp
+
+# mocks needed for testing
+#SOURCES += ../mocks/mock_networkhandlingproxy.cpp
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetproviderinstaller/infowidgetproviderinstaller.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetproviderinstaller/infowidgetproviderinstaller.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,37 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Example of home screen widget
+*
+*/
+
+#include <qservicemanager.h>
+#include <QCoreApplication>
+#include <QFile>
+
+QTM_USE_NAMESPACE
+
+const QString xml = "z:/private/20022F35/import/widgetregistry/20029F28/infowidgetprovider.xml";
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication app(argc, argv);
+
+    QServiceManager s;
+
+	if (QFile::exists(xml)) {
+        s.addService(xml);
+	} else {
+		s.removeService("infowidgetprovider");
+	}
+}
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetproviderinstaller/infowidgetproviderinstaller.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetproviderinstaller/infowidgetproviderinstaller.pro	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,33 @@
+#
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: Homescreen Infowidget installer application
+#
+
+TEMPLATE = app
+
+QT = core
+CONFIG += no_icon
+
+CONFIG += mobility
+MOBILITY = serviceframework
+
+SOURCES += infowidgetproviderinstaller.cpp
+
+symbian {    
+    load(data_caging_paths)
+    TARGET.CAPABILITY = ALL -TCB
+    BLD_INF_RULES.prj_exports +=  \
+     "$${LITERAL_HASH}include <platform_paths.hrh>" \
+     "./rom/infowidgetproviderinstaller.iby    CORE_APP_LAYER_IBY_EXPORT_PATH(infowidgetproviderinstaller.iby)" 
+}
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetplugin/infowidgetproviderinstaller/rom/infowidgetproviderinstaller.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/infowidgetproviderinstaller/rom/infowidgetproviderinstaller.iby	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,23 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef __INFOWIDGETPROVIDERINSTALLER_IBY__
+#define __INFOWIDGETPROVIDERINSTALLER_IBY__
+
+S60_APP_EXE(infowidgetproviderinstaller)
+
+#endif //__INFOWIDGETPROVIDERINSTALLER_IBY__
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/inc/infowidgetlogging.h
--- a/phoneplugins/infowidgetprovider/inc/infowidgetlogging.h	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *
- */
-
-#ifndef INFOWIDGETLOGGING_H
-#define INFOWIDGETLOGGING
-
-#include <QDebug>
-
-
-/*!
-  Define MSG_OUTPUT_RDEBUG 
-  for enabling RDebug prints in development tracing. 
-  Shouldn't be used in release code.
-  */
-#undef MSG_OUTPUT_RDEBUG
-
-
-#ifdef MSG_OUTPUT_RDEBUG
-#ifdef Q_OS_SYMBIAN
-#include <e32debug.h>
-
-static void cpPhoneSettingsPluginsMsgOutput(QtMsgType type, const char *msg)
-{
-    switch (type) {
-    
-    case QtDebugMsg:
-        RDebug::Printf("InfoWidget Debug: %s\n", msg);
-        break;
-        
-    case QtWarningMsg:
-        RDebug::Printf("InfoWidget Warning: %s\n", msg);
-        break;
-
-    case QtCriticalMsg:
-        RDebug::Printf("InfoWidget Critical: %s\n", msg);
-        break;
-        
-    case QtFatalMsg:
-        RDebug::Printf("InfoWidget Fatal: %s\n", msg);
-        abort();
-    }
-}
-
-    #define INSTALL_TRACE_MSG_HANDLER qInstallMsgHandler(cpPhoneSettingsPluginsMsgOutput)
-    #define UNINSTALL_TRACE_MSG_HANDLER qInstallMsgHandler(0)
-#endif //Q_OS_SYMBIAN
-#else 
-    #define INSTALL_TRACE_MSG_HANDLER 
-    #define UNINSTALL_TRACE_MSG_HANDLER 
-#endif //MSG_OUTPUT_RDEBUG
-
-/*!
-  Debug macros
-  */
-#define DPRINT qDebug() << __PRETTY_FUNCTION__
-
-
-#endif // INFOWIDGETLOGGING
-
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/inc/infowidgetprovider.h
--- a/phoneplugins/infowidgetprovider/inc/infowidgetprovider.h	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *
- */
-
-#ifndef INFOWIDGETPROVIDER_H
-#define INFOWIDGETPROVIDER_H
-
-#include <QObject>
-#include <qserviceplugininterface.h>
-
-QTM_USE_NAMESPACE
-
-class InfoWidgetProvider : public QObject, public QServicePluginInterface
-{
-    Q_OBJECT
-    Q_INTERFACES(QtMobility::QServicePluginInterface)
-
-public:
-    QObject *createInstance(const QServiceInterfaceDescriptor &descriptor,
-                            QServiceContext *context,
-                            QAbstractSecuritySession *session);
-
-};
-
-#endif // INFOWIDGETPROVIDER_H
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/infowidget/inc/infowidget.h
--- a/phoneplugins/infowidgetprovider/infowidget/inc/infowidget.h	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *
- */
-
-#ifndef INFOWIDGET_H
-#define INFOWIDGET_H
-
-#include <hswidget.h>
-#include <QGraphicsSceneMouseEvent>
-#include <QFlags>
-#include "infowidgetlayoutmanager.h"
-
-class QLabel;
-class QGraphicsLinearLayout; 
-class HbDialog;
-class HbIconItem; 
-class HbMarqueeItem;
-class HbLabel; 
-class HbCheckBox; 
-class HbPushButton; 
-class InfoWidgetEngine; 
-class InfoWidgetPreferences;
-
-class InfoWidget : public HsWidget
-{
-    Q_OBJECT
-
-public:    
-    InfoWidget(QGraphicsItem *parent = 0, Qt::WindowFlags flags = 0);
-    ~InfoWidget();
-
-public: // From QGraphicsItem.
-    QRectF boundingRect() const;
-    QPainterPath shape() const; 
-    QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint) const;  
-    QSizePolicy sizePolicy () const;  
-    
-public: // Property definitions with read and write functions
-    Q_PROPERTY(QString homeZoneDisplay READ homeZoneDisplay WRITE setHomeZoneDisplay)
-    Q_PROPERTY(QString mcnDisplay READ mcnDisplay WRITE setMcnDisplay)
-    Q_PROPERTY(QString activeLineDisplay READ activeLineDisplay WRITE setActiveLineDisplay)
-    Q_PROPERTY(QString satDisplay READ satDisplay WRITE setSatDisplay)
-    QString homeZoneDisplay();
-    void setHomeZoneDisplay(QString value);
-    QString mcnDisplay();
-    void setMcnDisplay(QString value);
-    QString activeLineDisplay();
-    void setActiveLineDisplay(QString value);
-    QString satDisplay();
-    void setSatDisplay(QString value);
-    
-protected:
-    HsWidget::StartResult onStart();
-    HsWidget::StopResult onStop();
-    HsWidget::SuspendResult onSuspend();
-    HsWidget::ResumeResult onResume();
-    
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); 
-    void mousePressEvent(QGraphicsSceneMouseEvent *event);
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); 
-    void mouseMoveEvent(QGraphicsSceneMouseEvent *event); 
-    
-    void updateInfoDisplay();
-    void initializePreferences(); 
-    
-private: 
-    void updateItemsVisibility();
-    void layoutInfoDisplay(); 
-    void layoutSettingsDisplay(); 
-    
-    void initializeInfoDisplayItems(); 
-    void initializeSettingsDisplayItems(); 
-     
-    void startChanges(); 
-    void endChanges(); 
-    
-public slots: 
-    // Slots from HsWidget
-    void onInitialize();
-    void onUninitialize();
-    void onShow();
-    void onHide();
-
-    // Info widget specific slots 
-    void readModel(); 
-    void handleModelError(int operation,int errorCode);  
-    void homeZoneDisplaySettingChanged(int state);
-    void mcnDisplaySettingChanged(int state);
-    void activeLineDisplaySettingChanged(int state);
-    void satDisplaySettingChanged(int state);
-
-    void settingsEditingFinished();
-    
-signals: 
-    void setPreferences(const QStringList &names);
-
-private:
-    Q_DISABLE_COPY(InfoWidget)
-    
-    // Engine for widget      
-    InfoWidgetEngine *m_engine;
-    
-    // Widget preference store  
-    InfoWidgetPreferences *m_preferences;
-
-    // Layout for widget
-    InfoWidgetLayoutManager *m_layoutManager;    
-    QGraphicsLinearLayout *m_layout; 
-    
-    bool m_layoutChanging; 
-    bool m_isDragEvent; 
-    
-};
-
-
-#endif // INFOWIDGET_H
-
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/infowidget/inc/infowidgetengine.h
--- a/phoneplugins/infowidgetprovider/infowidget/inc/infowidgetengine.h	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *
- */
-
-#ifndef INFOWIDGETENGINE_H_
-#define INFOWIDGETENGINE_H_
-
-
-#include <QObject>
-#include <QString>
-
-class InfoWidgetNetworkHandler;
-class InfoWidgetSatHandler;
-class InfoWidgetLineHandler;
-
-class InfoWidgetEngine : public QObject 
-    {
-    Q_OBJECT
-    
-public:     
-    
-    enum HandlerEntity {
-        NotDefined = 0, 
-        NetworkHandler, 
-        SatHandler, 
-        LineHandler
-    };
-    
-    class ModelData {    
-    public: 
-        int mcnIndicatorType() const { return m_mcnIndicatorType; }; 
-        void setMcnIndicatorType(const int type){ m_mcnIndicatorType = type; };
-        
-        int homeZoneIndicatorType() const { return m_homeZoneIndicatorType; }; 
-        void setHomeZoneIndicatorType(const int type){ m_homeZoneIndicatorType = type; };
-
-        int activeLine() const { return m_activeLine; }; 
-        void setActiveLine(const int line){ m_activeLine = line; };
-
-        const QString& mcnName() const { return m_mcnName; };
-        void setMcnName(const QString& name){ m_mcnName = name; };
-
-        const QString& serviceProviderName() const { return m_serviceProviderName; };
-        void setServiceProviderName(const QString& name){ m_serviceProviderName = name; };
-        
-        const QString& homeZoneTextTag() const { return m_homeZoneTextTag; };
-        void setHomeZoneTextTag(const QString& tag){ m_homeZoneTextTag = tag; };
-
-        const QString& satDisplayText() const { return m_satDisplayText; };
-        void setSatDisplayText(const QString& text){ m_satDisplayText = text; };
-        
-    private: 
-        int m_mcnIndicatorType; 
-        int m_homeZoneIndicatorType;
-        int m_activeLine; 
-        
-        QString m_mcnName;
-        QString m_serviceProviderName;
-        QString m_homeZoneTextTag;
-        QString m_satDisplayText;
-    }; 
-    
-public:
-    InfoWidgetEngine(QObject *parent = 0);
-    ~InfoWidgetEngine();    
-    
-    const InfoWidgetEngine::ModelData &modelData() const;  
-    
-    void logModelData();
-    
-signals:
-    void modelError(int operation, int errorCode);
-    void modelChanged(); 
-    
-public slots: 
-    void updateNetworkDataToModel();
-    void updateSatDataToModel();
-    void updateLineDataToModel();
-
-    void handleNetworkError(int operation, int errorCode); 
-    void handleSatError(int operation, int errorCode); 
-    void handleLineError(int operation, int errorCode);
-    
-private: 
-    ModelData m_modelData;
-    
-    // Own
-    QScopedPointer<InfoWidgetNetworkHandler> m_networkHandler;
-    }; 
-
-#endif /* INFOWIDGETENGINE_H_ */
-
-
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/infowidget/inc/infowidgetlayoutmanager.h
--- a/phoneplugins/infowidgetprovider/infowidget/inc/infowidgetlayoutmanager.h	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *
- */
-
-#ifndef INFOWIDGETLAYOUTMANAGER_H
-#define INFOWIDGETLAYOUTMANAGER_H
-
-#include <QObject>
-#include <QList>
-#include <QSizeF>
-#include <QRectF>
-#include <QMap>
-#include <hbdocumentloader.h>
-
-class QGraphicsLayout; 
-class QGraphicsWidget;
-class HbLabel;
-class HbIconItem;
-class HbPushButton;
-class HbMarqueeItem;
-class HbCheckBox; 
-
-/*!
- */
-class InfoWidgetDocumentLoader : public HbDocumentLoader
-{
-public:
-    InfoWidgetDocumentLoader();
-    virtual QObject *createObject(const QString& type,
-                                  const QString &name);
-};
-
-class InfoWidgetLayoutManager : public QObject
-{
-    Q_OBJECT
-    
-public: 
-    
-    enum LayoutItemRole {
-        RoleUndefined = 0,
-        // Content widget, the main widget from document 
-        RoleContent,
-        // Marquee items 
-        RoleMcnMarqueeItem, 
-        // Labels 
-        RoleHomeZoneLabel, 
-        RoleMcnLabel, 
-        RoleActiveLineLabel, 
-        RoleSatTextLabel,
-        // Icons 
-        RoleHomeZoneIcon, 
-        RoleMcnIcon, 
-        RoleActiveLineIcon, 
-        RoleSatTextIcon, 
-        // Check boxes 
-        RoleHomeZoneCheckBox, 
-        RoleMcnCheckBox, 
-        RoleActiveLineCheckBox, 
-        RoleSatTextCheckBox,
-        // Buttons 
-        RoleOkButton,
-        // Layout containers
-        RoleContainer, 
-        RoleSettingsContainer, 
-        // Must be the last enumeration        
-        RoleLastEnum
-        }; 
-    
-    enum DisplayRole {
-        InfoDisplay,
-        SettingsDisplay
-        }; 
-    
-    InfoWidgetLayoutManager(QObject *parent = 0);
-    ~InfoWidgetLayoutManager();
-    
-    DisplayRole currentDisplayRole(); 
-    QList<LayoutItemRole> currentWidgetRoles(); 
-    
-    int layoutRows() const; 
-    void setLayoutRows(int rows); 
-    
-    QGraphicsLayout* layoutInfoDisplay();
-    QGraphicsLayout* layoutSettingsDisplay(); 
-    
-    const QList<InfoWidgetLayoutManager::LayoutItemRole> widgetRoles(
-            DisplayRole displayRole) const; 
-    
-    bool loadWidgets(const DisplayRole displayRole, 
-            const QList<LayoutItemRole> &displayWidgets,
-            QMap<LayoutItemRole, QGraphicsWidget *> &widgetMap);
-    
-    QGraphicsWidget* loadWidget(InfoWidgetDocumentLoader &loader, 
-            DisplayRole displayRole, 
-            LayoutItemRole widgetRole);
-    
-    QGraphicsWidget* getWidget(LayoutItemRole itemRole);
-    QGraphicsWidget* contentWidget();
-    
-    void hideWidget(LayoutItemRole itemRole);
-    void hideAll();
-    void showAll();
-    
-private:
-    QMap<LayoutItemRole, QGraphicsWidget *> m_widgets; 
-    QMap<LayoutItemRole, QGraphicsWidget *> m_infoDisplayWidgets; 
-    QMap<LayoutItemRole, QGraphicsWidget *> m_settingsDisplayWidgets; 
-
-    InfoWidgetDocumentLoader *m_documentLoader;
-    DisplayRole m_displayRole; 
-    int m_layoutRows;
-    
-};
-
-
-#endif // INFOWIDGETLAYOUTMANAGER_H
-
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/infowidget/inc/infowidgetlinehandler.h
--- a/phoneplugins/infowidgetprovider/infowidget/inc/infowidgetlinehandler.h	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *
- */
-
-#ifndef INFOWIDGETLINEHANDLER_H_
-#define INFOWIDGETLINEHANDLER_H_
-
-
-#include <QObject>
-
-class InfoWidgetLineHandler: public QObject 
-    {
-    Q_OBJECT
-    
-public:    
-    InfoWidgetLineHandler(QObject *parent = NULL);
-    ~InfoWidgetLineHandler();    
-
-    void logCurrentInfo(); 
-
-    int activeLine() const; 
-    void setActiveLine(int line);
-    
-signals: 
-    void handleMessage( int message );
-    void handleError( int operation, int errorCode );
-    
-private: 
-    int m_activeLine; 
-    }; 
-
-#endif /* INFOWIDGETLINEHANDLER_H_ */
-
-
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/infowidget/inc/infowidgetnetworkhandler.h
--- a/phoneplugins/infowidgetprovider/infowidget/inc/infowidgetnetworkhandler.h	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *
- */
-
-#ifndef INFOWIDGETNETWORKHANDLER_H_
-#define INFOWIDGETNETWORKHANDLER_H_
-
-
-#include <QObject>
-#include <nwhandlingengine.h>
-
-class CNWSession; 
-
-class InfoWidgetNetworkHandler : public QObject, public MNWMessageObserver 
-    {
-    Q_OBJECT
-    
-public:
-    InfoWidgetNetworkHandler(QObject *parent = NULL);
-    ~InfoWidgetNetworkHandler();    
-    
-    QString homeZoneTextTag() const; 
-    int homeZoneIndicatorType() const; 
-    
-    QString mcnName() const; 
-    int mcnIndicatorType() const; 
-
-    void logCurrentInfo(); 
-
-public: // From MNWMessageObserver
-    void HandleNetworkMessage(const TNWMessages aMessage);
-    void HandleNetworkError(const TNWOperation aOperation, TInt aErrorCode);
-    
-signals: 
-    void networkDataChanged();
-    void networkError(int operation, int errorCode);
-    
-private:
-    TNWInfo m_nwInfo;
-    QScopedPointer<CNWSession> m_nwSession;
-    }; 
-
-#endif /* INFOWIDGETNETWORKHANDLER_H_ */
-
-
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/infowidget/inc/infowidgetpreferences.h
--- a/phoneplugins/infowidgetprovider/infowidget/inc/infowidgetpreferences.h	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *
- */
-
-#ifndef INFOWIDGETPREFERENCES_H
-#define INFOWIDGETPREFERENCES_H
-
-#include <QObject>
-#include <QFlags>
-
-// Preference string values
-const char DISPLAY_SETTING_ON[]    = "On";
-const char DISPLAY_SETTING_OFF[]     = "Off";
-
-class InfoWidgetPreferences : public QObject
-{
-    Q_OBJECT
-
-public: 
-    enum DisplaySetting {
-        DisplayOff = 0, 
-        DisplayOn    
-    }; 
-    
-    enum Option {
-        DisplayHomeZone = 0x1,
-        DisplayMcn = 0x2,
-        DisplayActiveLine = 0x4, 
-        DisplaySatText = 0x8 
-    };
-    Q_DECLARE_FLAGS(Options, Option)
-
-public:
-    InfoWidgetPreferences(QObject *parent = NULL);
-    ~InfoWidgetPreferences();
-
-    void loadPreferences();
-    void storePreferences();
-    
-public:
-    QString preference(Option preferenceId) const;
-    void setPreference(Option preferenceId, const QString &preferenceString);
-    
-    int visibleItemCount(); 
-    
-private:
-    Q_DISABLE_COPY(InfoWidgetPreferences)
-
-    InfoWidgetPreferences::Options m_options; 
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(InfoWidgetPreferences::Options)
-
-#endif // INFOWIDGETPREFERENCES_H
-
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/infowidget/inc/infowidgetsathandler.h
--- a/phoneplugins/infowidgetprovider/infowidget/inc/infowidgetsathandler.h	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *
- */
-
-#ifndef INFOWIDGETSATHANDLER_H_
-#define INFOWIDGETSATHANDLER_H_
-
-#include <QObject>
-
-class InfoWidgetSatHandler: public QObject 
-    {
-    Q_OBJECT
-    
-public:    
-    InfoWidgetSatHandler(QObject *parent = NULL);
-    ~InfoWidgetSatHandler();    
-
-    const QString& satDisplayText() const; 
-    void setSatDisplayText(const QString& displayText);
-
-    void logCurrentInfo(); 
-
-signals: 
-    void handleMessage( int message );
-    void handleError( int operation, int errorCode );
-
-    
-private: 
-    QString m_displayText; 
-    }; 
-
-#endif /* INFOWIDGETSATHANDLER_H_ */
-
-
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/infowidget/src/infowidget.cpp
--- a/phoneplugins/infowidgetprovider/infowidget/src/infowidget.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,847 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:
- *
- */
-
-#include "infowidget.h"
-
-#include <hbanchorlayout.h>
-#include <hbiconitem.h>
-#include <hbmarqueeitem.h>
-#include <hbfontspec.h>
-#include <hbdialog.h>
-#include <hblabel.h>
-#include <hbaction.h>
-#include <hbcheckbox.h>
-#include <hbpushbutton.h>
-#include <QPainter>
-#include <QPainterPath>
-#include <QBrush>
-#include <QGraphicsLinearLayout>
-#include <QApplication>
-#include <QLocale>
-#include <QTranslator>
-#include "infowidgetlogging.h"
-#include "infowidgetengine.h"
-#include "infowidgetlayoutmanager.h"
-#include "infowidgetpreferences.h"
-
-const int INFOWIDGET_LINE_WIDTH = 0; 
-const int INFOWIDGET_MARGIN = 5;
-const int INFOWIDGET_ROUNDING = 15;
-
-
-/*!
-    InfoWidget::InfoWidget() 
-*/
-InfoWidget::InfoWidget(QGraphicsItem* parent, Qt::WindowFlags flags)
-    : HsWidget(parent, flags),
-    m_engine(NULL), 
-    m_preferences(NULL),
-    m_layoutManager(NULL),
-    m_layout(NULL),
-    m_layoutChanging(false),
-    m_isDragEvent(false)
-{
-    INSTALL_TRACE_MSG_HANDLER; 
-    
-    DPRINT << ": IN";
-    
-    // Localization file loading
-    QTranslator translator; 
-    QString lang = QLocale::system().name();
-    QString path = "z:/resource/qt/translations/";
-    DPRINT << ": loading translation: " << QString(path + "operator_widget_" + lang);
-    bool translatorLoaded = translator.load(path + "operator_widget_" + lang);
-    DPRINT << ": translator loaded: " << translatorLoaded; 
-    if (translatorLoaded) {
-        qApp->installTranslator(&translator);
-        DPRINT << ": translator installed"; 
-    }
-    
-    m_layoutManager = new InfoWidgetLayoutManager(this);
-    Q_ASSERT(m_layoutManager); 
-    
-    // Create network engine  
-    m_engine = new InfoWidgetEngine(this); 
-
-    // Create widget preference handler 
-    m_preferences = new InfoWidgetPreferences(this);
-
-    DPRINT << ": reading preferences from meta-object properties";
-    initializePreferences();
-
-    // Create widget main layout 
-    m_layout = new QGraphicsLinearLayout;    
-    m_layout->setSpacing(0); 
-    m_layout->setContentsMargins(0,0,0,0); 
-    
-    // Layout info display
-    layoutInfoDisplay();
-
-    setLayout(m_layout);
-
-    // Read initial data from model
-    updateInfoDisplay(); 
-    
-    QObject::connect(m_engine, SIGNAL(modelChanged()), 
-            this, SLOT(readModel())); 
-
-    DPRINT << ": OUT";
-}
-
-/*!
-    InfoWidget::~InfoWidget() 
-*/
-InfoWidget::~InfoWidget()
-{
-    DPRINT << ": IN"; 
-    
-    // Clean layout container, 
-    // layout manager handles layout item cleanup
-    for (int i=0; i < m_layout->count(); i++) {
-        DPRINT << ": item(" << i << ") removed from layout";
-        m_layout->removeAt(i);
-        } 
-    
-    DPRINT << ": OUT"; 
-    UNINSTALL_TRACE_MSG_HANDLER;
-}
-
-/*!
-    InfoWidget::boundingRect() const
-*/
-QRectF InfoWidget::boundingRect() const
-{
-    DPRINT;
-    
-    QRectF rectF = rect();
-    rectF.adjust(-INFOWIDGET_MARGIN, -INFOWIDGET_MARGIN, 
-            INFOWIDGET_MARGIN, INFOWIDGET_MARGIN);
-    
-    return rectF;
-}
-
-/*!
-    InfoWidget::shape() const
-    Return shape
-*/
-QPainterPath InfoWidget::shape() const
-{
-    DPRINT;    
-    
-    QPainterPath path;
-    path.addRoundRect(boundingRect(), INFOWIDGET_ROUNDING, INFOWIDGET_ROUNDING);
-    return path;
-}
-
-/*!
-    InfoWidget::sizeHint() 
-*/
-QSizeF InfoWidget::sizeHint(Qt::SizeHint which, const QSizeF & constraint) const   
-{
-    Q_UNUSED(which);
-    Q_UNUSED(constraint); 
-    
-    QSizeF requiredSize(70,160);
-    
-    // Try to get size hint from docml content, if not found use default  
-    // size preference 
-    if (m_layoutManager->currentDisplayRole() == 
-                InfoWidgetLayoutManager::InfoDisplay) {
-        if (m_layoutManager->contentWidget()) {
-            requiredSize = m_layoutManager->contentWidget()->minimumSize();
-            }
-    }
-    else if (m_layoutManager->currentDisplayRole() == 
-            InfoWidgetLayoutManager::SettingsDisplay) {
-        requiredSize = QSizeF(250,250);
-        if (m_layoutManager->contentWidget()) {
-            requiredSize = m_layoutManager->contentWidget()->preferredSize();
-            }
-    } 
-
-    DPRINT << ": returning size: " << requiredSize;
-    return requiredSize; 
-}
-
-/*!
-    InfoWidget::sizePolicy() 
-*/
-QSizePolicy InfoWidget::sizePolicy () const 
-{
-    DPRINT;
-
-    // Size tells the exact size for the widget    
-    return QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); 
-}
-
-/*!
-    InfoWidget::onInitialize() 
-*/
-void InfoWidget::onInitialize()
-{
-    DPRINT << ": IN";
-    
-    // Initialize preferences from meta-object data 
-    // set by homescreen framework. Homescreen framework 
-    // has restored the properties before calling onInitialize  
-    DPRINT << ": reading preferences from meta-object properties";
-    initializePreferences();
-    
-    DPRINT << ": OUT";
-}
-
-/*!
-    InfoWidget::onUninitialize() 
-*/
-void InfoWidget::onUninitialize()
-{
-    DPRINT;
-}
-
-/*!
-    InfoWidget::onShow() 
-*/
-void InfoWidget::onShow()
-{
-    DPRINT;
-}
-
-/*!
-    InfoWidget::onHide() 
-*/
-void InfoWidget::onHide()
-{
-    DPRINT;
-}
-
-/*!
-    InfoWidget::onStart() 
-*/
-HsWidget::StartResult InfoWidget::onStart()
-{
-    DPRINT; 
-    return HsWidget::StartResultRunning; 
-}
-
-/*!
-    InfoWidget::onStop() 
-*/
-HsWidget::StopResult InfoWidget::onStop()
-{
-    DPRINT; 
-    return HsWidget::StopResultFinished; 
-}
-
-/*!
-    InfoWidget::onSuspend() 
-*/
-HsWidget::SuspendResult InfoWidget::onSuspend()
-{
-    DPRINT; 
-    return HsWidget::SuspendResultSuspended; 
-}
-
-/*!
-    InfoWidget::onResume() 
-*/
-HsWidget::ResumeResult InfoWidget::onResume()
-{
-    DPRINT; 
-    return HsWidget::ResumeResultRunning; 
-}
-
-/*!
-    InfoWidget::updateItemsVisibility() 
-*/
-void InfoWidget::updateItemsVisibility()
-{
-    DPRINT <<": IN"; 
-    int layoutRows = 0; 
-    QList<QGraphicsWidget *> widgetsToHide; 
-    
-    // Update layout according to item visibility settings
-    // 1. read visible items
-    if (m_preferences->preference(InfoWidgetPreferences::DisplayHomeZone).compare(
-            DISPLAY_SETTING_ON) == 0) {
-        layoutRows++;
-    } else if (m_layoutManager->currentDisplayRole() != InfoWidgetLayoutManager::SettingsDisplay) {
-        m_layoutManager->hideWidget(InfoWidgetLayoutManager::RoleHomeZoneLabel); 
-        m_layoutManager->hideWidget(InfoWidgetLayoutManager::RoleHomeZoneIcon); 
-    }
-    
-    if (m_preferences->preference(InfoWidgetPreferences::DisplayMcn).compare(
-            DISPLAY_SETTING_ON) == 0) {
-        layoutRows++;
-    } else if (m_layoutManager->currentDisplayRole() != InfoWidgetLayoutManager::SettingsDisplay) {
-        m_layoutManager->hideWidget(InfoWidgetLayoutManager::RoleMcnMarqueeItem); 
-        m_layoutManager->hideWidget(InfoWidgetLayoutManager::RoleMcnIcon); 
-    }
-
-    if (m_preferences->preference(InfoWidgetPreferences::DisplayActiveLine).compare(
-            DISPLAY_SETTING_ON) == 0) {
-        layoutRows++;
-    } else if (m_layoutManager->currentDisplayRole() != InfoWidgetLayoutManager::SettingsDisplay) {
-        m_layoutManager->hideWidget(InfoWidgetLayoutManager::RoleActiveLineLabel); 
-        m_layoutManager->hideWidget(InfoWidgetLayoutManager::RoleActiveLineIcon); 
-    }
-    
-    if (m_preferences->preference(InfoWidgetPreferences::DisplaySatText).compare(
-            DISPLAY_SETTING_ON) == 0) {
-        layoutRows++;
-    } else if (m_layoutManager->currentDisplayRole() != InfoWidgetLayoutManager::SettingsDisplay) {
-        m_layoutManager->hideWidget(InfoWidgetLayoutManager::RoleSatTextLabel); 
-        m_layoutManager->hideWidget(InfoWidgetLayoutManager::RoleSatTextIcon); 
-    }
-    
-    DPRINT << ": visible layout rows count: " << layoutRows;
-    m_layoutManager->setLayoutRows(layoutRows);
-}
-
-/*!
-    InfoWidget::layoutInfoDisplay()
-    
-    Layout info display    
-*/
-void InfoWidget::layoutInfoDisplay()
-{  
-    startChanges(); 
-    
-    QGraphicsLayout *infoDisplayLayout = 
-        m_layoutManager->layoutInfoDisplay(); 
-    
-    DPRINT << ": IN";
-    if (infoDisplayLayout) {
-        DPRINT << ": infoDisplayLayout has been returned from layout manager";
-
-        QGraphicsWidget *contentWidget = m_layoutManager->contentWidget();
-        if (contentWidget) {
-            DPRINT << ": contentWidget has been returned from layout manager";
-            
-            // Remove old data from layout. 
-            for (int i=0; i < m_layout->count(); i++) {
-                DPRINT << ": item(" << i << ") removed from layout";
-                m_layout->removeAt(i);
-                } 
-            
-            // Add content widget to main layout 
-            m_layout->addItem(contentWidget);
-            
-            resize(contentWidget->preferredSize()); 
-        }       
-    }
-    
-    m_layoutManager->showAll(); 
-    updateItemsVisibility(); 
-
-    endChanges(); 
-    
-    DPRINT << ": OUT";
-}
-
-/*!
-    InfoWidget::layoutSettingsDisplay()
-    
-    Switch to settings display layout   
-*/
-void InfoWidget::layoutSettingsDisplay()
-{  
-    startChanges(); 
-    
-    QGraphicsLayout *settingDisplayLayout = 
-        m_layoutManager->layoutSettingsDisplay(); 
-    
-    DPRINT << ": IN";
-    if (settingDisplayLayout) {
-        DPRINT << ": settingDisplayLayout has been returned from layout manager";
-
-        QGraphicsWidget *contentWidget = m_layoutManager->contentWidget();
-        if (contentWidget) {
-            DPRINT << ": contentWidget has been returned from layout manager";
-                
-            // Remove old data from layout. 
-            for (int i=0; i < m_layout->count(); i++) {
-                DPRINT << ": item(" << i << ") removed from layout";
-                m_layout->removeAt(i);
-                } 
-            
-            // Add content widget to main layout 
-            m_layout->addItem(contentWidget); 
-
-            resize(contentWidget->preferredSize()); 
-        }
-        
-        // Connect settings display widget signals 
-        initializeSettingsDisplayItems(); 
-    }
-     
-    m_layoutManager->showAll(); 
-
-    endChanges(); 
-    
-    DPRINT << ": OUT";
-}
-
-/*!
-    InfoWidget::initializeInfoDisplayItems()
-*/
-void InfoWidget::initializeInfoDisplayItems()
-{  
-    DPRINT;
-}
-
-/*!
-    InfoWidget::initializeSettingsDisplayItems()
-    
-    Set up initial check box states, lock check boxes 
-    if needed and connect signals to local slots  
-*/
-void InfoWidget::initializeSettingsDisplayItems()
-{  
-    DPRINT << ": IN";
-    
-    HbPushButton *okButton = qobject_cast<HbPushButton *>(m_layoutManager->getWidget(
-            InfoWidgetLayoutManager::RoleOkButton));
-    if (okButton) {
-        DPRINT << ": okButton has been returned from layout manager, connecting signal";
-        QObject::connect(okButton, SIGNAL(clicked()), 
-                this, SLOT(settingsEditingFinished())); 
-    }
-
-    // Connect display setting check boxes
-    HbCheckBox *homeZoneBox = qobject_cast<HbCheckBox *>(m_layoutManager->getWidget(
-            InfoWidgetLayoutManager::RoleHomeZoneCheckBox));
-    if (homeZoneBox) {
-        DPRINT << ": homeZoneBox has been returned from layout manager, initializing";
-        // Make checkable when home zone display is supported
-        homeZoneBox->setCheckable(false); 
-        QObject::connect(homeZoneBox, SIGNAL(stateChanged(int)), 
-                this, SLOT(homeZoneDisplaySettingChanged(int))); 
-    }
-    
-    HbCheckBox *mcnCheckBox = qobject_cast<HbCheckBox *>(m_layoutManager->getWidget(
-            InfoWidgetLayoutManager::RoleMcnCheckBox));
-    if (mcnCheckBox) {
-        mcnCheckBox->setChecked(true);
-        
-        DPRINT << ": mcnCheckBox has been returned from layout manager, connecting signal";
-        QObject::connect(mcnCheckBox, SIGNAL(stateChanged(int)), 
-                this, SLOT(mcnDisplaySettingChanged(int))); 
-    }
-    
-    HbCheckBox *activeLineCheckBox = qobject_cast<HbCheckBox *>(m_layoutManager->getWidget(
-            InfoWidgetLayoutManager::RoleActiveLineCheckBox));
-    if (activeLineCheckBox) {
-        // Make checkable when active line display is supported
-        activeLineCheckBox->setCheckable(false); 
-
-        DPRINT << ": activeLineCheckBox has been returned from layout manager, connecting signal";
-        QObject::connect(activeLineCheckBox, SIGNAL(stateChanged(int)), 
-                this, SLOT(activeLineDisplaySettingChanged(int))); 
-    }
-    
-    HbCheckBox *satTextCheckBox = qobject_cast<HbCheckBox *>(m_layoutManager->getWidget(
-            InfoWidgetLayoutManager::RoleSatTextCheckBox));
-    if (satTextCheckBox) {
-        // Make checkable when sat text display is supported
-        satTextCheckBox->setCheckable(false); 
-
-        DPRINT << ": satTextCheckBox has been returned from layout manager, connecting signal";
-        QObject::connect(satTextCheckBox, SIGNAL(stateChanged(int)), 
-                this, SLOT(satDisplaySettingChanged(int))); 
-    }
-    
-    DPRINT << ": OUT";
-}
-
-/*!
-    InfoWidget::updateInfoDisplay() 
-*/
-void InfoWidget::updateInfoDisplay()
-{
-    DPRINT; 
-    
-    QString text;
-    InfoWidgetEngine::ModelData modelData = m_engine->modelData(); 
-
-    HbLabel *homeZoneLabel = qobject_cast<HbLabel *>(m_layoutManager->getWidget(
-            InfoWidgetLayoutManager::RoleHomeZoneLabel));
-    if (homeZoneLabel && 
-            m_layoutManager->currentDisplayRole() == InfoWidgetLayoutManager::InfoDisplay) {
-        text = modelData.homeZoneTextTag(); 
-        homeZoneLabel->setPlainText(text);
-    }        
-    
-    HbMarqueeItem *mcnMarqueeItem = qobject_cast<HbMarqueeItem *>(m_layoutManager->getWidget(
-            InfoWidgetLayoutManager::RoleMcnMarqueeItem));
-    if (mcnMarqueeItem && 
-            m_layoutManager->currentDisplayRole() == InfoWidgetLayoutManager::InfoDisplay) {
-        text = modelData.mcnName(); 
-        if (text.length()) {
-            mcnMarqueeItem->setText(text);
-                
-            // Set marquee animation looping mode to infinite
-            mcnMarqueeItem->setLoopCount(-1); 
-            
-            // Finally, start marquee animation
-            DPRINT << ": mcnMarqueeItem->isAnimating()"; 
-            if (!mcnMarqueeItem->isAnimating()) {
-                DPRINT << ": mcnMarqueeItem->startAnimation()";   
-                mcnMarqueeItem->startAnimation();
-            }
-        }
-    }
-
-    HbLabel *activeLineLabel = qobject_cast<HbLabel *>(m_layoutManager->getWidget(
-            InfoWidgetLayoutManager::RoleActiveLineLabel));
-    if (activeLineLabel && 
-            m_layoutManager->currentDisplayRole() == InfoWidgetLayoutManager::InfoDisplay) {
-        text.setNum(modelData.activeLine());
-        text.insert(0, hbTrId("Line: "));
-    
-        if (text.length()) {
-            activeLineLabel->setPlainText(text);
-        }
-    }    
-
-    HbLabel *satTextLabel = qobject_cast<HbLabel *>(m_layoutManager->getWidget(
-            InfoWidgetLayoutManager::RoleSatTextLabel));
-    if (satTextLabel && 
-            m_layoutManager->currentDisplayRole() == InfoWidgetLayoutManager::InfoDisplay) {
-
-        text = modelData.satDisplayText(); 
-
-        if (text.length()) {
-            satTextLabel->setPlainText(text);
-        }
-    }    
-
-}
-
-/*!
-    InfoWidget::readModel() 
-    
-    Read model data. Model's modelChanged - signal is connected to this slot.  
-*/
-void InfoWidget::readModel()
-{
-    DPRINT << ": IN"; 
-
-    if (m_layoutManager->currentDisplayRole() == InfoWidgetLayoutManager::InfoDisplay) { 
-        updateInfoDisplay(); 
-    }
-    DPRINT << ": OUT";
-}
-
-/*!
-    InfoWidget::handleModelError() 
-    
-    Model error signal is connected to this slot 
-*/
-void InfoWidget::handleModelError(int operation,int errorCode)
-{
-    Q_UNUSED(operation); 
-    Q_UNUSED(errorCode); 
-    DPRINT;
-}
-
-/*!
-    InfoWidget::paint() 
-*/
-void InfoWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
-{
-    Q_UNUSED(option); 
-    Q_UNUSED(widget);
-    DPRINT;
-
-    if (!m_layoutChanging) {
-
-        QBrush brush(Qt::white); 
-        brush.setStyle(Qt::SolidPattern); 
-        painter->setBackground(brush); 
-            
-        QRectF drawRect = boundingRect(); 
-        drawRect.adjust( INFOWIDGET_LINE_WIDTH, INFOWIDGET_LINE_WIDTH, 
-                         -INFOWIDGET_LINE_WIDTH, -INFOWIDGET_LINE_WIDTH );
-        
-        QPainterPath path;
-        path.addRoundRect(drawRect, INFOWIDGET_ROUNDING, INFOWIDGET_ROUNDING);
-    
-        painter->save();
-        
-        painter->fillPath(path, Qt::white);
-        painter->restore();
-    }
-}
-
-/*!
-    InfoWidget::mousePressEvent() 
-*/
-
-void InfoWidget::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_UNUSED(event);
-    DPRINT; 
-    
-    // Initialize flag 
-    m_isDragEvent = false; 
-    
-    DPRINT; 
-}
-
-/*!
-    InfoWidget::mouseReleaseEvent() 
-*/
-void InfoWidget::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_UNUSED(event);
-
-    // If in info display and widget wasn't dragged 
-    // change to settings display
-    if ((!m_isDragEvent) && 
-          m_layoutManager->currentDisplayRole() == 
-                  InfoWidgetLayoutManager::InfoDisplay) {
-        DPRINT << ": layout settings display";
-        layoutSettingsDisplay(); 
-    }
-    
-    m_isDragEvent = false; 
-}
-
-/*!
-    InfoWidget::mouseMoveEvent() 
-*/
-void InfoWidget::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_UNUSED(event);
-    
-    // Mouse is moving after mouse press event
-    m_isDragEvent = true; 
-}
-
-/*!
-    InfoWidget::homeZoneDisplaySettingChanged() 
-*/
-void InfoWidget::homeZoneDisplaySettingChanged(int state)
-{
-    DPRINT << ": state: " << state;
-    if (state == Qt::Checked){
-        m_preferences->setPreference(InfoWidgetPreferences::DisplayHomeZone, DISPLAY_SETTING_ON);
-    } else {
-        m_preferences->setPreference(InfoWidgetPreferences::DisplayHomeZone, DISPLAY_SETTING_OFF);
-    }
-}
-
-/*!
-    InfoWidget::mcnDisplaySettingChanged() 
-*/
-void InfoWidget::mcnDisplaySettingChanged(int state)
-{
-    DPRINT << ": state: " << state; 
-    if (state == Qt::Checked){
-        m_preferences->setPreference(InfoWidgetPreferences::DisplayMcn, DISPLAY_SETTING_ON);
-    } else {
-        m_preferences->setPreference(InfoWidgetPreferences::DisplayMcn, DISPLAY_SETTING_OFF);
-    }
-}
-
-/*!
-    InfoWidget::activeLineDisplaySettingChanged() 
-*/
-void InfoWidget::activeLineDisplaySettingChanged(int state)
-{
-    DPRINT << ": state: " << state; 
-    if (state == Qt::Checked){
-        m_preferences->setPreference(InfoWidgetPreferences::DisplayActiveLine, DISPLAY_SETTING_ON);
-    } else {
-        m_preferences->setPreference(InfoWidgetPreferences::DisplayActiveLine, DISPLAY_SETTING_OFF);
-    }
-}
-
-/*!
-    InfoWidget::satDisplaySettingChanged() 
-*/
-void InfoWidget::satDisplaySettingChanged(int state)
-{
-    DPRINT << ": state: " << state; 
-    if (state == Qt::Checked){
-        m_preferences->setPreference(InfoWidgetPreferences::DisplaySatText, DISPLAY_SETTING_ON);
-    } else {
-        m_preferences->setPreference(InfoWidgetPreferences::DisplaySatText, DISPLAY_SETTING_OFF);
-    }
-}
-
-/*!
-    InfoWidget::mcnDisplay() 
-    
-    Getter function for Meta-object property "mcnDisplay"
-*/
-QString InfoWidget::mcnDisplay()
-{
-    DPRINT; 
-    return m_preferences->preference(InfoWidgetPreferences::DisplayMcn); 
-}
-
-/*!
-    InfoWidget::setMcnDisplay() 
-    
-    Setter function for Meta-object property "mcnDisplay"
-*/
-void InfoWidget::setMcnDisplay(QString value)
-{
-    DPRINT;
-    m_preferences->setPreference(InfoWidgetPreferences::DisplayMcn, value);
-    }
-
-/*!
-    InfoWidget::homeZoneDisplay() 
-    
-    Getter function for Meta-object property "homeZoneDisplay"
-*/
-QString InfoWidget::homeZoneDisplay()
-{
-    DPRINT; 
-    return m_preferences->preference(InfoWidgetPreferences::DisplayHomeZone); 
-}
-
-/*!
-    InfoWidget::setHomeZoneDisplay()
-    
-    Setter function for Meta-object property "homeZoneDisplay" 
-*/
-void InfoWidget::setHomeZoneDisplay(QString value)
-{
-    DPRINT; 
-    m_preferences->setPreference(InfoWidgetPreferences::DisplayHomeZone, value);
-}
-
-/*!
-    InfoWidget::activeLineDisplay() 
-    
-    Getter function for Meta-object property "activeLineDisplay"
-*/
-QString InfoWidget::activeLineDisplay()
-{
-    DPRINT; 
-    return m_preferences->preference(InfoWidgetPreferences::DisplayActiveLine);
-}
-
-/*!
-    InfoWidget::setActiveLineDisplay() 
-    
-    Setter function for Meta-object property "activeLineDisplay"
-*/
-void InfoWidget::setActiveLineDisplay(QString value)
-{
-    DPRINT; 
-    m_preferences->setPreference(InfoWidgetPreferences::DisplayActiveLine, value);
-}
-
-/*!
-    InfoWidget::satDisplay()
-    
-    Getter function for Meta-object property "satDisplay" 
-*/
-QString InfoWidget::satDisplay()
-{
-    DPRINT; 
-    return m_preferences->preference(InfoWidgetPreferences::DisplaySatText);
-}
-
-/*!
-    InfoWidget::setSatDisplay()
-    
-    Setter function for Meta-object property "satDisplay" 
-*/
-void InfoWidget::setSatDisplay(QString value)
-{
-    DPRINT;
-    m_preferences->setPreference(InfoWidgetPreferences::DisplaySatText, value);
-}
-
-/*!
-    InfoWidget::initializePreferences()
-    
-    Read initial Meta-object properties and store to preference handler. 
-    Restores preferences from previous session.   
-*/
-void InfoWidget::initializePreferences()
-{
-    DPRINT << ": IN";
-    QString propertyValue;
-    
-    propertyValue = QObject::property("homeZoneDisplay").toString();
-    m_preferences->setPreference(InfoWidgetPreferences::DisplayHomeZone, 
-            propertyValue);
-    
-    propertyValue = QObject::property("mcnDisplay").toString();
-    m_preferences->setPreference(InfoWidgetPreferences::DisplayMcn, 
-            propertyValue);
-    
-    propertyValue = QObject::property("activeLineDisplay").toString();
-    m_preferences->setPreference(InfoWidgetPreferences::DisplayActiveLine, 
-            propertyValue);
-    
-    propertyValue = QObject::property("satTextDisplay").toString();
-    m_preferences->setPreference(InfoWidgetPreferences::DisplaySatText, 
-            propertyValue);
-
-    // Check that at least one item is set visible. If not 
-    // set default item(s) visible. TBD which items and how selected.   
-    if (m_preferences->visibleItemCount() == 0) {
-        DPRINT << ": no visible items initially, setting MCN on by default"; 
-        m_preferences->setPreference(InfoWidgetPreferences::DisplayMcn, 
-                DISPLAY_SETTING_ON);
-    }
-        
-    DPRINT << ": OUT"; 
-}
-
-/*!
-    InfoWidget::settingsEditingFinished()
-*/
-void InfoWidget::settingsEditingFinished()
-{
-    DPRINT << ": IN";
-    
-    layoutInfoDisplay();
-    
-    updateInfoDisplay(); 
-    
-    DPRINT << ": OUT";
-}
-
-void InfoWidget::startChanges()
-{
-    DPRINT << ": IN";
-    
-    m_layoutChanging = true;; 
-    
-    DPRINT << ": OUT";
-}
-
-void InfoWidget::endChanges()
-{
-    DPRINT << ": IN";
-    
-    m_layoutChanging = false;; 
-    
-    DPRINT << ": OUT";
-}
-
-
-// End of File. 
-
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/infowidget/src/infowidgetengine.cpp
--- a/phoneplugins/infowidgetprovider/infowidget/src/infowidgetengine.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,151 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:
- *
- */
-
-#include "infowidgetengine.h"
-#include "infowidgetnetworkhandler.h"
-#include <networkhandlingproxy.h>
-#include "infowidgetlogging.h"
-#include <xqsettingsmanager.h>
-#include <xqsettingskey.h>
-#include <SettingsInternalCRKeys.h>
-
-/*!
-   InfoWidgetEngine::InfoWidgetEngine
- */
-InfoWidgetEngine::InfoWidgetEngine(QObject *parent): 
-    QObject(parent),
-    m_networkHandler(new InfoWidgetNetworkHandler)
-{
-    DPRINT << ": IN";
-    
-    QObject::connect(
-        m_networkHandler.data(), SIGNAL(networkError(int, int)),
-        this, SLOT(handleNetworkError(int, int))); 
-    
-    QObject::connect(
-        m_networkHandler.data(), SIGNAL(networkDataChanged()),
-        this, SLOT(updateNetworkDataToModel()));
-    
-    XQSettingsManager *settingsManager = new XQSettingsManager(0); 
-    XQSettingsKey settingsKey(XQSettingsKey::TargetCentralRepository, 
-        KCRUidNetworkSettings.iUid, KSettingsMcnDisplay); 
-    bool result = settingsManager->writeItemValue(settingsKey, 1 );
-    delete settingsManager;
-
-    updateNetworkDataToModel(); 
-    
-    DPRINT << ": OUT";
-}
-
-/*!
-   InfoWidgetEngine::~InfoWidgetEngine
- */
-InfoWidgetEngine::~InfoWidgetEngine()
-{
-    DPRINT;
-}    
-
-/*!
-   InfoWidgetEngine::logModelData
-   
-   Utility function for logging model data
- */
-void InfoWidgetEngine::logModelData()
-{
-    DPRINT << ": mcn name: " << m_modelData.mcnName(); 
-    DPRINT << ": service provider name: " << m_modelData.serviceProviderName();
-    DPRINT << ": homezone text tag: " << m_modelData.homeZoneTextTag();
-    
-    DPRINT << ": mcn type: " << m_modelData.mcnIndicatorType(); 
-    DPRINT << ": active line: " << m_modelData.activeLine(); 
-    DPRINT << ": homezone indicator type: " << m_modelData.homeZoneIndicatorType(); 
-} 
-
-/*!
-   InfoWidgetEngine::modelData
-   
-   Getter for model data. 
- */
-const InfoWidgetEngine::ModelData& InfoWidgetEngine::modelData() const
-{
-    DPRINT;
-    return m_modelData; 
-}
-
-/*!
-   InfoWidgetEngine::updateNetworkDataToModel
- */
-void InfoWidgetEngine::updateNetworkDataToModel()
-{
-    DPRINT << ": IN"; 
-    
-    m_networkHandler->logCurrentInfo();
-    
-    // Read network handler data to model data
-    m_modelData.setHomeZoneIndicatorType(
-        m_networkHandler->homeZoneIndicatorType());
-    m_modelData.setHomeZoneTextTag(m_networkHandler->homeZoneTextTag()); 
-    m_modelData.setMcnName(m_networkHandler->mcnName()); 
-    m_modelData.setMcnIndicatorType(m_networkHandler->mcnIndicatorType());
-    
-    emit modelChanged();
-    
-    DPRINT << ": OUT";
-}
-
-/*!
-   InfoWidgetEngine::updateSatDataToModel
- */
-void InfoWidgetEngine::updateSatDataToModel()
-{
-    DPRINT;
-}
-
-/*!
-   InfoWidgetEngine::updateLineDataToModel
- */
-void InfoWidgetEngine::updateLineDataToModel()
-{
-    DPRINT;
-}
-
-/*!
-   InfoWidgetEngine::handleNetworkError
- */
-void InfoWidgetEngine::handleNetworkError(int operation, int errorCode)
-{
-    DPRINT << ": operation: " << operation << " error code: " << errorCode; 
-}
-
-/*!
-   InfoWidgetEngine::handleSatError
- */
-void InfoWidgetEngine::handleSatError(int operation, int errorCode)
-{
-    DPRINT << ": operation: " << operation << " error code: " << errorCode; 
-}
-
-/*!
-   InfoWidgetEngine::handleLineError
- */
-void InfoWidgetEngine::handleLineError(int operation, int errorCode)
-{
-    DPRINT << ": operation: " << operation << " error code: " << errorCode; 
-}
-
-// End of File. 
-
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/infowidget/src/infowidgetengine_s.cpp
--- a/phoneplugins/infowidgetprovider/infowidget/src/infowidgetengine_s.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:
- *
- */
-
-#include "infowidgetengine.h"
-#include "infowidgetlogging.h"
-
-/*!
-   InfoWidgetEngine::InfoWidgetEngine
- */
-InfoWidgetEngine::InfoWidgetEngine(QObject *parent): 
-    QObject(parent)
-{
-    DPRINT;
-}
-
-/*!
-   InfoWidgetEngine::~InfoWidgetEngine
- */
-InfoWidgetEngine::~InfoWidgetEngine()
-{
-DPRINT;
-}    
-
-/*!
-   InfoWidgetEngine::logModelData
-   
-   Utility function for logging model data
- */
-void InfoWidgetEngine::logModelData()
-{
-    DPRINT << ": mcn name: " << m_modelData.mcnName(); 
-    DPRINT << ": service provider name: " << m_modelData.serviceProviderName();
-    DPRINT << ": homezone text tag: " << m_modelData.homeZoneTextTag();
-    
-    DPRINT << ": mcn type: " << m_modelData.mcnIndicatorType(); 
-    DPRINT << ": active line: " << m_modelData.activeLine(); 
-    DPRINT << ": homezone indicator type: " << m_modelData.homeZoneIndicatorType(); 
-} 
-
-/*!
-   InfoWidgetEngine::modelData
-   
-   Getter for model data. 
- */
-const InfoWidgetEngine::ModelData& InfoWidgetEngine::modelData() const
-{
-    DPRINT;
-    return m_modelData; 
-}
-
-/*!
-   InfoWidgetEngine::setModelData
-   
-   Enables setting model initial data to engine.   
- */
-void InfoWidgetEngine::setModelData(const InfoWidgetEngine::ModelData &data)
-{
-    DPRINT; 
-    m_modelData = data;
-}
-
-/*!
-   InfoWidgetEngine::updateNetworkDataToModel
- */
-void InfoWidgetEngine::updateNetworkDataToModel()
-{
-    DPRINT;
-}
-
-/*!
-   InfoWidgetEngine::updateSatDataToModel
- */
-void InfoWidgetEngine::updateSatDataToModel()
-{
-    DPRINT;
-}
-
-/*!
-   InfoWidgetEngine::updateLineDataToModel
- */
-void InfoWidgetEngine::updateLineDataToModel()
-{
-    DPRINT;
-}
-
-
-void InfoWidgetEngine::handleNetworkError(int operation, int errorCode)
-{
-    DPRINT << ": operation: " << operation << " error code: " << errorCode; 
-}
-
-void InfoWidgetEngine::handleSatError(int operation, int errorCode)
-{
-    DPRINT << ": operation: " << operation << " error code: " << errorCode; 
-}
-
-void InfoWidgetEngine::handleLineError(int operation, int errorCode)
-{
-    DPRINT << ": operation: " << operation << " error code: " << errorCode; 
-}
-
-// End of File. 
-
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/infowidget/src/infowidgetlayoutmanager.cpp
--- a/phoneplugins/infowidgetprovider/infowidget/src/infowidgetlayoutmanager.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,494 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:
- *
- */
-
-#include "infowidgetlayoutmanager.h"
-#include <QtGlobal>
-#include <QObject>
-#include <QGraphicsWidget>
-#include <hbdocumentloader.h>
-#include <hblabel.h>
-#include <hbmarqueeItem.h>
-#include <hbiconitem.h> 
-#include <hbpushbutton.h>
-#include "infowidgetlogging.h"
-
-
-const char INFOWIDGET_DOCML_FILE[] = ":/resource/infowidget.docml";
-
-// Docml widget name mappings 
-const char LAYOUT_PREFIX_INFO_DISPLAY[] = "id:";
-const char LAYOUT_PREFIX_SETTINGS_DISPLAY[] = "sd:";
-const char LAYOUT_NAME_CONTENT[] = "content";
-const char LAYOUT_NAME_MCNMARQUEEITEM[] = "mcnMarqueeItem";
-const char LAYOUT_NAME_MCNLABEL[] = "mcnLabel";
-const char LAYOUT_NAME_HOMEZONELABEL[] = "homeZoneLabel";
-const char LAYOUT_NAME_ACTIVELINELABEL[] = "activeLineLabel";
-const char LAYOUT_NAME_SATTEXTLABEL[] = "satTextLabel";
-const char LAYOUT_NAME_HOMEZONEICON[] = "homeZoneIcon";
-const char LAYOUT_NAME_MCNICON[] = "mcnIcon";
-const char LAYOUT_NAME_ACTIVELINEICON[] = "activeLineIcon";
-const char LAYOUT_NAME_SATTEXTICON[] = "satTextIcon";
-const char LAYOUT_NAME_HOMEZONECHECKBOX[] = "homeZoneCheckBox";
-const char LAYOUT_NAME_MCNCHECKBOX[] = "mcnCheckBox";
-const char LAYOUT_NAME_ACTIVELINECHECKBOX[] = "activeLineCheckBox";
-const char LAYOUT_NAME_SATTEXTCHECKBOX[] = "satTextCheckBox";
-const char LAYOUT_NAME_OKBUTTON[] = "okButton";
-const char LAYOUT_NAME_CONTAINER[] = "container";
-const char LAYOUT_NAME_SETTINGSCONTAINER[] = "settingsContainer";
-
-
-/*!
-  InfoWidgetDocumentLoader::InfoWidgetDocumentLoader()
- */
-InfoWidgetDocumentLoader::InfoWidgetDocumentLoader()
-{
-}
-
-/*!
-  InfoWidgetDocumentLoader::createObject()
- */
-QObject *InfoWidgetDocumentLoader::createObject(
-    const QString &type,
-    const QString &name)
-{
-    DPRINT << ": IN";
-    
-    DPRINT << ": type: "<< type;
-    DPRINT << ": name: "<< name;
-    
-    if ( type == HbMarqueeItem::staticMetaObject.className() ) {
-        DPRINT << ": HbMarqueeItem";
-        QObject *object = new HbMarqueeItem;
-        object->setObjectName(name);
-        DPRINT << ": HbMarqueeitem found, OUT";
-        return object;
-    }
-
-    DPRINT << ": OUT";
-    
-    return HbDocumentLoader::createObject(type, name);
-}
-
-/*!
- */
-InfoWidgetLayoutManager::InfoWidgetLayoutManager(QObject *parent) 
-: QObject(parent), 
-  m_documentLoader(NULL), 
-  m_displayRole(InfoDisplay),
-  m_layoutRows(0)
-{
-    DPRINT << ": IN"; 
-    
-    // Fill supported layout item roles for info display
-    QList<LayoutItemRole> displayWidgetRoles = widgetRoles(InfoDisplay);
-    
-    // Try to load all widgets in list by widget role 
-    bool loadResult = loadWidgets(InfoDisplay, 
-            displayWidgetRoles,
-            m_infoDisplayWidgets); 
-    DPRINT << ": info display widget load result: " << loadResult;
-  
-    // Fill supported layout item roles for settings display
-    displayWidgetRoles = widgetRoles(SettingsDisplay);
-  
-    // Try to load all widgets in list by widget role 
-    loadResult = loadWidgets(SettingsDisplay, 
-            displayWidgetRoles,
-            m_settingsDisplayWidgets); 
-    DPRINT << ": settings display widget load result: " << loadResult;
-
-    DPRINT << ": OUT";
-}
-
-/*!
- */
-InfoWidgetLayoutManager::~InfoWidgetLayoutManager()
-{
-    DPRINT << ": IN";
-    
-    if (m_documentLoader) { 
-        delete m_documentLoader;
-    }
-    
-    DPRINT << ": OUT";
-}
-
-/*!
- */
-InfoWidgetLayoutManager::DisplayRole InfoWidgetLayoutManager::currentDisplayRole() 
-{
-    DPRINT; 
-    return m_displayRole;
-} 
-
-/*!
- */
-QList<InfoWidgetLayoutManager::LayoutItemRole> InfoWidgetLayoutManager::currentWidgetRoles() 
-{
-    DPRINT; 
-    return m_widgets.keys(); 
-} 
-
-int InfoWidgetLayoutManager::layoutRows() const 
-{
-    DPRINT; 
-    return m_layoutRows;
-} 
-
-void InfoWidgetLayoutManager::setLayoutRows(int rows) 
-{
-    DPRINT; 
-    m_layoutRows = rows; 
-} 
-
-/*!
-   InfoWidgetLayoutManager::contentWidget()
-*/
-QGraphicsWidget* InfoWidgetLayoutManager::contentWidget()
-{
-    DPRINT; 
-    return getWidget(RoleContent); 
-}
-
-/*!
-   InfoWidgetLayoutManager::getWidget();
-*/
-QGraphicsWidget* InfoWidgetLayoutManager::getWidget(LayoutItemRole itemRole)
-{
-    DPRINT << ": item role: " << itemRole;
-    
-    QGraphicsWidget *widget = m_widgets.value(itemRole); 
-    if (widget) {
-        DPRINT << ": widget: " << widget;
-    }
-    
-    return widget; 
-}
-
-/*!
-   InfoWidgetLayoutManager::hideWidget();
-*/
-void InfoWidgetLayoutManager::hideWidget(LayoutItemRole itemRole)
-{
-    DPRINT << ": item role: " << itemRole;
-    
-    QGraphicsWidget *widget = m_widgets.value(itemRole); 
-    if (widget) {
-        DPRINT << ": hiding widget: " << widget;
-        widget->hide(); 
-    }
-}
-
-/*!
-   InfoWidgetLayoutManager::hideAll();
-*/
-void InfoWidgetLayoutManager::hideAll()
-{
-    DPRINT << ": IN";
-    
-    QMapIterator<LayoutItemRole, QGraphicsWidget *> iterator(m_widgets);
-    while (iterator.hasNext()) {
-        iterator.next();
-        QGraphicsWidget *widget = iterator.value(); 
-        if (widget) {
-            widget->hide(); 
-        }
-    }
-    
-    DPRINT << ": OUT";
-}
-
-
-/*!
-   InfoWidgetLayoutManager::showAll();
-*/
-void InfoWidgetLayoutManager::showAll()
-{
-    DPRINT << ": IN";
-    
-    QMapIterator<LayoutItemRole, QGraphicsWidget *> iterator(m_widgets);
-    while (iterator.hasNext()) {
-        iterator.next();
-        QGraphicsWidget *widget = iterator.value(); 
-        if (widget) {
-            widget->show(); 
-        }
-    }
-    
-    DPRINT << ": OUT";
-}
-
-/*!
-    InfoWidgetLayoutManager::layoutInfoDisplay()
-*/
-QGraphicsLayout* InfoWidgetLayoutManager::layoutInfoDisplay()
-{   
-    DPRINT << ": IN";
-
-    hideAll(); 
-
-    m_displayRole = InfoDisplay;
-    m_widgets = m_infoDisplayWidgets; 
-           
-    QGraphicsLayout *activeLayout(NULL); 
-    DPRINT << ": getting content item and using its layout for activeLayout";
-    QGraphicsWidget *content = getWidget(RoleContent); 
-    if (content) {
-        DPRINT << ": content found, getting layout";
-        activeLayout = content->layout(); 
-    }
-
-    DPRINT  << ": OUT";
-    return activeLayout; 
-}
-
-/*!
-    InfoWidgetLayoutManager::layoutSettingsDisplay()
-*/
-QGraphicsLayout* InfoWidgetLayoutManager::layoutSettingsDisplay()
-{   
-    DPRINT << ": IN";
-    
-    hideAll(); 
-    
-    m_displayRole = SettingsDisplay;
-    m_widgets = m_settingsDisplayWidgets; 
-    
-    QGraphicsLayout *activeLayout(NULL); 
-    DPRINT << ": getting content item and using its layout for activeLayout";
-    QGraphicsWidget *content = getWidget(RoleContent); 
-    if (content) {
-        DPRINT << ": content found, getting layout";
-        activeLayout = content->layout(); 
-    }
-
-    DPRINT  << ": OUT";
-    return activeLayout; 
-}
-
-/*!
-    InfoWidgetLayoutManager::loadWidgets()
-*/
-bool InfoWidgetLayoutManager::loadWidgets(const DisplayRole displayRole, 
-        const QList<LayoutItemRole> &displayWidgets,
-        QMap<LayoutItemRole, QGraphicsWidget *> &widgetMap)
-{
-    DPRINT << ": IN";
-    bool loadResult(true); 
-
-    // Cleanup previously loaded content in case of any data  
-    widgetMap.clear(); 
-    
-    if (!m_documentLoader) {
-        m_documentLoader = new InfoWidgetDocumentLoader;
-    }
-    
-    Q_ASSERT(m_documentLoader); 
-    
-    bool loaded = false;
-    m_documentLoader->load(INFOWIDGET_DOCML_FILE, &loaded);
-        
-    if (!loaded) {
-        qWarning() << "Unable to load .docml:  " << INFOWIDGET_DOCML_FILE;
-    }
-    else {
-        DPRINT << ": document " << INFOWIDGET_DOCML_FILE << " loaded successfully"; 
-        
-        QGraphicsWidget *widget(NULL);
-        LayoutItemRole currentWidgetRole;
-        bool allWidgetsLoaded(true); 
-        
-        foreach (currentWidgetRole, displayWidgets) {
-            DPRINT << ": iterating displayWidgets, current role: " << static_cast<int>(currentWidgetRole);
-            
-            widget = loadWidget(*m_documentLoader, displayRole, currentWidgetRole);
-               if (widget) {
-                   DPRINT << ": widget found, inserting to widget map";
-                   widgetMap.insert(currentWidgetRole, widget);
-                   widget = NULL;
-               } else {
-                   allWidgetsLoaded = false; 
-                   DPRINT << ": ERROR, widget not found!";
-               }
-        }
-        
-        DPRINT << ": allWidgetsLoaded: " << allWidgetsLoaded;
-                
-        int widgetCount = widgetMap.count(); 
-        DPRINT << ": loaded widgets count: " << widgetCount;
-        if (widgetCount == displayWidgets.count()) {
-            DPRINT << ": all widgets loaded";
-            loadResult = true;
-            } else {
-                DPRINT << ": error, all widgets were not loaded";
-                loadResult = false;
-            }        
-    }
-        
-    DPRINT << ": OUT";
-    return loadResult; 
-}
-
-/*!
-    InfoWidgetLayoutManager::loadWidget()
-    
-    Initialize loader with corresponding document file before calling this single widget loader utility   
-*/
-QGraphicsWidget* InfoWidgetLayoutManager::loadWidget(InfoWidgetDocumentLoader &loader, 
-        DisplayRole displayRole, 
-        LayoutItemRole widgetRole)
-{
-    DPRINT << ": IN";
-     
-    QString widgetPrefix; 
-    if (displayRole == InfoDisplay) {
-        widgetPrefix = LAYOUT_PREFIX_INFO_DISPLAY;
-    } else if (displayRole == SettingsDisplay) {
-        widgetPrefix = LAYOUT_PREFIX_SETTINGS_DISPLAY;
-    }
-        
-    QGraphicsWidget *widget(NULL);
-    QString widgetName = widgetPrefix;
-    
-    switch (widgetRole) 
-        {
-        case RoleContent: 
-            widgetName.append(LAYOUT_NAME_CONTENT);
-        break;     
-        case RoleMcnMarqueeItem: 
-            widgetName.append(LAYOUT_NAME_MCNMARQUEEITEM);
-        break; 
-        case RoleHomeZoneLabel: 
-            widgetName.append(LAYOUT_NAME_HOMEZONELABEL);
-        break;
-        case RoleMcnLabel: 
-            widgetName.append(LAYOUT_NAME_MCNLABEL);
-        break;
-        case RoleActiveLineLabel: 
-            widgetName.append(LAYOUT_NAME_ACTIVELINELABEL);
-        break; 
-        case RoleSatTextLabel: 
-            widgetName.append(LAYOUT_NAME_SATTEXTLABEL);
-        break; 
-        case RoleHomeZoneIcon: 
-            widgetName.append(LAYOUT_NAME_HOMEZONEICON);
-        break; 
-        case RoleMcnIcon: 
-            widgetName.append(LAYOUT_NAME_MCNICON);
-        break; 
-        case RoleActiveLineIcon: 
-            widgetName.append(LAYOUT_NAME_ACTIVELINEICON);
-        break; 
-        case RoleSatTextIcon: 
-            widgetName.append(LAYOUT_NAME_SATTEXTICON);
-        break;
-        case RoleHomeZoneCheckBox: 
-            widgetName.append(LAYOUT_NAME_HOMEZONECHECKBOX);
-        break; 
-        case RoleMcnCheckBox: 
-            widgetName.append(LAYOUT_NAME_MCNCHECKBOX);
-        break; 
-        case RoleActiveLineCheckBox: 
-            widgetName.append(LAYOUT_NAME_ACTIVELINECHECKBOX);
-        break; 
-        case RoleSatTextCheckBox: 
-            widgetName.append(LAYOUT_NAME_SATTEXTCHECKBOX);
-        break; 
-        case RoleOkButton: 
-            widgetName.append(LAYOUT_NAME_OKBUTTON);
-        break; 
-        case RoleContainer: 
-            widgetName.append(LAYOUT_NAME_CONTAINER);
-        break; 
-        case RoleSettingsContainer: 
-            widgetName.append(LAYOUT_NAME_SETTINGSCONTAINER);
-        break; 
-
-        case RoleUndefined: // Fall through 
-        default: 
-            break; 
-        }
-    
-    widget = qobject_cast<QGraphicsWidget *>(loader.findWidget(widgetName));
-    
-    if (widget) {
-        DPRINT << ": widget found: " << widgetName;
-    } else {
-        DPRINT << ": ERROR, widget not found!";
-    }
-           
-    DPRINT << ": OUT";
-    return widget; 
-}
-
-/*!
-    InfoWidgetLayoutManager::widgetRoles()
-    
-    Returns supported widget roles for specific display
-*/
-const QList<InfoWidgetLayoutManager::LayoutItemRole> InfoWidgetLayoutManager::widgetRoles(
-        DisplayRole displayRole) const
-{
-    DPRINT << ": IN";
-    
-    QList<LayoutItemRole> widgetRoles; 
-    
-    switch (displayRole) {
-        case SettingsDisplay: 
-            // Fill supported layout item roles for settings display
-            widgetRoles.append(RoleContent); 
-            widgetRoles.append(RoleHomeZoneLabel);
-            widgetRoles.append(RoleMcnLabel); 
-            widgetRoles.append(RoleActiveLineLabel);
-            widgetRoles.append(RoleSatTextLabel);
-            widgetRoles.append(RoleHomeZoneIcon);
-            widgetRoles.append(RoleMcnIcon);
-            widgetRoles.append(RoleActiveLineIcon);
-            widgetRoles.append(RoleSatTextIcon);
-            widgetRoles.append(RoleHomeZoneCheckBox);
-            widgetRoles.append(RoleMcnCheckBox);
-            widgetRoles.append(RoleActiveLineCheckBox);
-            widgetRoles.append(RoleSatTextCheckBox);
-            widgetRoles.append(RoleOkButton);
-            widgetRoles.append(RoleSettingsContainer); 
-            break;
-        case InfoDisplay: 
-            // Fill supported layout item roles for info display
-            widgetRoles.append(RoleContent); 
-            widgetRoles.append(RoleHomeZoneLabel);
-            widgetRoles.append(RoleMcnMarqueeItem);
-            widgetRoles.append(RoleActiveLineLabel);
-            widgetRoles.append(RoleSatTextLabel);
-            widgetRoles.append(RoleHomeZoneIcon);
-            widgetRoles.append(RoleMcnIcon);
-            widgetRoles.append(RoleActiveLineIcon);
-            widgetRoles.append(RoleSatTextIcon);
-            widgetRoles.append(RoleSettingsContainer); 
-            break;
-            
-        default: 
-            break; 
-    }
-    
-    DPRINT << ": widgetRoles.count() : " << widgetRoles.count();
-    DPRINT << ": OUT";
-    return widgetRoles; 
-}    
-    
-// End of File. 
-
-
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/infowidget/src/infowidgetlinehandler.cpp
--- a/phoneplugins/infowidgetprovider/infowidget/src/infowidgetlinehandler.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:
- *
- */
-
-
-#include "infowidgetlinehandler.h"
-#include "infowidgetlogging.h"
-
-
-/*!
- */
-InfoWidgetLineHandler::InfoWidgetLineHandler(QObject *parent):
-    QObject(parent), 
-    m_activeLine(1)
-{
-    DPRINT << ": IN";
-    DPRINT << ": OUT";
-}
-
-/*!
- */
-InfoWidgetLineHandler::~InfoWidgetLineHandler()
-{
-    DPRINT << ": IN";
-    DPRINT << ": OUT";
-}    
-
-/*!
- */
-void InfoWidgetLineHandler::logCurrentInfo()
-{
-    DPRINT << ": IN"; 
-    DPRINT << ": OUT";
-    
-} 
-
-/*!
- */
-int InfoWidgetLineHandler::activeLine() const
-{
-    DPRINT << ": active line: " << m_activeLine;
-    return m_activeLine; 
-}
-    
-/*!
- */
-void InfoWidgetLineHandler::setActiveLine(int line)
-{
-    DPRINT << ": active line: " << line; 
-    m_activeLine = line; 
-}
-
-// End of File. 
-
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/infowidget/src/infowidgetnetworkhandler.cpp
--- a/phoneplugins/infowidgetprovider/infowidget/src/infowidgetnetworkhandler.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,218 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:
- *
- */
-
-#include <networkhandlingproxy.h>
-#include <cnwsession.h>
-#include "infowidgetnetworkhandler.h"
-#include "infowidgetlogging.h"
-
-
-/*!
- * InfoWidgetNetworkHandler::InfoWidgetNetworkHandler
- */
-InfoWidgetNetworkHandler::InfoWidgetNetworkHandler(QObject *parent) 
-    : 
-    QObject(parent), 
-    m_nwSession(0)
-{
-    DPRINT << ": IN";
-    
-    CNWSession *session = 0;
-    QT_TRAP_THROWING(session = CreateL(*this, m_nwInfo));
-    m_nwSession.reset(session);
-    
-    DPRINT << ": OUT";
-}
-
-/*!
- * InfoWidgetNetworkHandler::~InfoWidgetNetworkHandler
- */
-InfoWidgetNetworkHandler::~InfoWidgetNetworkHandler()
-{
-    DPRINT << ": IN";
-    
-    DPRINT << ": OUT";
-}    
-
-/*!
- * InfoWidgetNetworkHandler::homeZoneTextTag
- */
-QString InfoWidgetNetworkHandler::homeZoneTextTag() const 
-{
-    DPRINT;
-    QString qBuf;
-    qBuf = QString((QChar*)m_nwInfo.iViagTextTag.Ptr(), 
-        m_nwInfo.iViagTextTag.Length());
-    DPRINT << ": homeZoneTextTag: " << qBuf;
-    
-    return qBuf; 
-}
-
-/*!
- * InfoWidgetNetworkHandler::homeZoneIndicatorType
- */
-int InfoWidgetNetworkHandler::homeZoneIndicatorType() const 
-{
-    DPRINT;
-    int indicatorType = m_nwInfo.iViagIndicatorType;
-    DPRINT << ": homeZoneIndicatorType: " << indicatorType;
-    
-    return indicatorType; 
-}
-
-/*!
- * InfoWidgetNetworkHandler::mcnName
- */
-QString InfoWidgetNetworkHandler::mcnName() const 
-{
-    DPRINT;
-    QString qBuf;
-    qBuf = QString((QChar*)m_nwInfo.iMCNName.Ptr(),
-        m_nwInfo.iMCNName.Length());
-    DPRINT << ": mcnName: " << qBuf;
-    
-    return qBuf; 
-}
-
-/*!
- * InfoWidgetNetworkHandler::mcnIndicatorType
- */
-int InfoWidgetNetworkHandler::mcnIndicatorType() const 
-{
-    DPRINT;
-    int indicatorType = m_nwInfo.iMCNIndicatorType;
-    DPRINT << ": mcnIndicatorType: " << indicatorType;
-    
-    return indicatorType; 
-}
-
-/*!
- * InfoWidgetNetworkHandler::logCurrentInfo
- */
-void InfoWidgetNetworkHandler::logCurrentInfo()
-{
-    DPRINT << ": IN"; 
-    
-    DPRINT << "iRegistrationStatus " << m_nwInfo.iRegistrationStatus;
-    DPRINT << "iNetworkMode " << m_nwInfo.iNetworkMode;      
-    DPRINT << "iStatus " << m_nwInfo.iStatus;           
-    QString qBuf; 
-    
-    qBuf = QString((QChar*)m_nwInfo.iCountryCode.Ptr(),
-        m_nwInfo.iCountryCode.Length());
-    DPRINT << "iCountryCode " << qBuf;       
-    
-    qBuf = QString((QChar*)m_nwInfo.iNetworkId.Ptr(),
-        m_nwInfo.iNetworkId.Length());
-    DPRINT << "iNetworkId " << qBuf; 
-    
-    qBuf = QString((QChar*)m_nwInfo.iDisplayTag.Ptr(),
-        m_nwInfo.iDisplayTag.Length());
-    DPRINT << "iDisplayTag " << qBuf;
-    
-    qBuf = QString((QChar*)m_nwInfo.iShortName.Ptr(),
-        m_nwInfo.iShortName.Length());
-    DPRINT << "iShortName " << qBuf;       
-    
-    qBuf = QString((QChar*)m_nwInfo.iLongName.Ptr(),
-        m_nwInfo.iLongName.Length());
-    DPRINT << "iLongName " << qBuf;
-    
-    DPRINT << "iViagIndicatorType " << m_nwInfo.iViagIndicatorType; 
-
-    qBuf = QString((QChar*)m_nwInfo.iViagTextTag.Ptr(),
-        m_nwInfo.iViagTextTag.Length());
-    DPRINT << "iViagTextTag " << qBuf;
-    
-    DPRINT << "iMCNIndicatorType " << m_nwInfo.iMCNIndicatorType;  
-    
-    qBuf = QString((QChar*)m_nwInfo.iMCNName.Ptr(),
-        m_nwInfo.iMCNName.Length());
-    DPRINT << "iMCNName " << qBuf;
-    
-    qBuf = QString((QChar*)m_nwInfo.iSPName.Ptr(),m_nwInfo.iSPName.Length());
-    DPRINT << "iSPName " << qBuf;
-    
-    DPRINT << "iServiceProviderNameDisplayReq " 
-        << m_nwInfo.iServiceProviderNameDisplayReq;
-    
-    qBuf = QString((QChar*)m_nwInfo.iNPName.Ptr(), m_nwInfo.iNPName.Length());
-    DPRINT << "iNPName " << qBuf;
-    
-    qBuf = QString((QChar*)m_nwInfo.iOperatorNameInfo.iName.Ptr(),
-        m_nwInfo.iOperatorNameInfo.iName.Length());
-    DPRINT << "iOperatorNameInfo iName" << qBuf;
-    DPRINT << "iOperatorNameInfo iType" << m_nwInfo.iOperatorNameInfo.iType;
-    
-    DPRINT << "iNoServerMode " << m_nwInfo.iNoServerMode;
-    
-    DPRINT << "iVoicePrivacyStatus " << m_nwInfo.iVoicePrivacyStatus;
-    
-    qBuf = QString((QChar*)m_nwInfo.iPLMNField.Ptr(),
-        m_nwInfo.iPLMNField.Length());
-    DPRINT << "iPLMNField " << qBuf;                    
-    
-    DPRINT << ": OUT";
-} 
-
-/*!
- * InfoWidgetNetworkHandler::HandleNetworkMessage
- */
-void InfoWidgetNetworkHandler::HandleNetworkMessage( 
-    const TNWMessages aMessage )
-{   
-    DPRINT << ": message: " << aMessage;
-    
-    bool acceptedMessage = false;
-    switch (aMessage) {
-        case ENWMessageCurrentCellInfoMessage:
-            acceptedMessage = true;
-            break;
-        default:
-            // not interesting message, filter out
-            DPRINT << ": message filtered out";
-            acceptedMessage = false;
-    }
-    
-    if (acceptedMessage) {
-        int result = 0;
-        QT_TRYCATCH_ERROR(result, emit networkDataChanged());
-        if (0 != result) {
-            DPRINT << ": Exception occured while emitting signal:" << result;
-        }
-    }
-}
-
-/*!
- * InfoWidgetNetworkHandler::HandleNetworkError
- */
-void InfoWidgetNetworkHandler::HandleNetworkError( 
-    const TNWOperation aOperation, 
-    TInt aErrorCode )
-{
-    DPRINT << ": operation: " << aOperation <<  
-        " error code: " << aErrorCode;
-    
-    int result = 0;
-    QT_TRYCATCH_ERROR(result, emit networkError( 
-        static_cast<int>(aOperation), static_cast<int>(aErrorCode)));
-    if (0 != result) {
-        DPRINT << ": Exception occured while emitting signal:" << result;
-    }
-}
-
-// End of File. 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/infowidget/src/infowidgetpreferences.cpp
--- a/phoneplugins/infowidgetprovider/infowidget/src/infowidgetpreferences.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:
- *
- */
-
-#include "infowidgetpreferences.h"
-#include "infowidgetlogging.h"
-
-
-/*!
-    InfoWidgetPreferences::InfoWidgetPreferences() 
-*/
-InfoWidgetPreferences::InfoWidgetPreferences(QObject *parent): 
-    QObject(parent)
-{
-    DPRINT;
-}
-
-/*!
-    InfoWidgetPreferences::~InfoWidgetPreferences() 
-*/
-InfoWidgetPreferences::~InfoWidgetPreferences()
-{
-    DPRINT;
-}
-
-/*!
-    InfoWidgetPreferences::loadPreferences() 
-*/
-void InfoWidgetPreferences::loadPreferences()
-{
-    DPRINT;
-}
-
-/*!
-    InfoWidgetPreferences::storePreferences() 
-*/
-void InfoWidgetPreferences::storePreferences()
-{
-    DPRINT;
-}
-
-/*!
-    InfoWidgetPreferences::preference() 
-*/
-QString InfoWidgetPreferences::preference(Option preferenceId) const
-{
-    DPRINT << ": preference id: " << static_cast<int>(preferenceId); 
-    
-    QString preferenceString;
-    if (m_options.testFlag(preferenceId)) {
-        preferenceString = DISPLAY_SETTING_ON; 
-    } else {
-        preferenceString = DISPLAY_SETTING_OFF;  
-    } 
-    
-    return preferenceString;
-}
-
-/*!
-    InfoWidgetPreferences::setPreference() 
-*/
-void InfoWidgetPreferences::setPreference(Option preferenceId, 
-    const QString& preferenceString)
-{
-    DPRINT << ": preference id: " << static_cast<int>(preferenceId);
-    DPRINT << ": preference string: " << preferenceString; 
-    DPRINT << ": initial options: " << m_options;
-    
-    if (preferenceString.compare(DISPLAY_SETTING_ON) == 0) {
-        m_options |= preferenceId; 
-    } else {
-        m_options &= ~preferenceId; 
-    }
-    
-    DPRINT << ": modified options: " << m_options;
-}
-
-/*!
-    InfoWidgetPreferences::visibleItemCount() 
-*/
-int InfoWidgetPreferences::visibleItemCount() 
-{
-    DPRINT << ": IN";
-    
-    int visibleItems = 0;
-    if (m_options.testFlag(DisplayHomeZone)){
-        visibleItems++; 
-    }
-    if (m_options.testFlag(DisplayMcn)){
-        visibleItems++; 
-    }
-    if (m_options.testFlag(DisplayActiveLine)){
-        visibleItems++; 
-    }
-    if (m_options.testFlag(DisplaySatText)){
-        visibleItems++; 
-    }
-    
-    DPRINT << ": visible item count: " << visibleItems;
-    return visibleItems; 
-}
-
-// End of File. 
-
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/infowidget/src/infowidgetpreferences_s.cpp
--- a/phoneplugins/infowidgetprovider/infowidget/src/infowidgetpreferences_s.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:
- *
- */
-
-#include "infowidgetpreferences.h"
-#include "infowidgetlogging.h"
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-InfoWidgetPreferences::InfoWidgetPreferences(IHsWidgetPreferenceService &preferenceService, 
-    QObject* parent)
-    : QObject(parent)
-{
-    DPRINT << "DUMMY IMPLEMENTATION";
-
-    m_options = InfoWidgetPreferences::DisplayActiveLine|
-            InfoWidgetPreferences::DisplayMcn|
-            InfoWidgetPreferences::DisplaySatText|
-            InfoWidgetPreferences::DisplayHomeZone;
-}
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-InfoWidgetPreferences::~InfoWidgetPreferences()
-{
-    DPRINT << "DUMMY IMPLEMENTATION";
-}
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void InfoWidgetPreferences::loadPreferences()
-{
-    DPRINT << "DUMMY IMPLEMENTATION";
-}
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void InfoWidgetPreferences::storePreferences()
-{
-    DPRINT << "DUMMY IMPLEMENTATION";
-}
-
-
-/*!
-    InfoWidgetPreferences::preference() 
-*/
-QString InfoWidgetPreferences::preference(Option preferenceId)
-{
-    DPRINT << "DUMMY IMPLEMENTATION";
-    DPRINT << ": preference id: " << static_cast<int>(preferenceId); 
-    
-    QString preferenceString;
-    if (m_options.testFlag(preferenceId)) {
-        preferenceString = DISPLAY_SETTING_ON; 
-    } else {
-        preferenceString = DISPLAY_SETTING_OFF;  
-    } 
-    
-    return preferenceString; 
-}
-
-/*!
-    InfoWidgetPreferences::setPreference() 
-*/
-void InfoWidgetPreferences::setPreference(Option preferenceId, 
-        QString preferenceString)
-{
-    DPRINT << "DUMMY IMPLEMENTATION";
-    DPRINT << ": preference id: " << static_cast<int>(preferenceId);
-    DPRINT << ": preference string: " << preferenceString; 
-
-    DPRINT << ": initial options: " << m_options;
-    
-    if (preferenceString.compare(DISPLAY_SETTING_ON) == 0) {
-        m_options |= preferenceId; 
-    } else {
-        m_options &= ~preferenceId; 
-    }
-    
-    DPRINT << ": modified options: " << m_options;
-}
-
-// End of File.
-
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/infowidget/src/infowidgetsathandler.cpp
--- a/phoneplugins/infowidgetprovider/infowidget/src/infowidgetsathandler.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:
- *
- */
-
-
-#include "infowidgetsathandler.h"
-#include "infowidgetlogging.h"
-
-
-/*!
- */
-InfoWidgetSatHandler::InfoWidgetSatHandler(QObject *parent):
-    QObject(parent)
-{
-    DPRINT << ": IN";
-    
-    // ToDo: remove when SAT implemented / releasing 
-    DPRINT << ": setting DUMMY DATA to sat display text";
-    m_displayText = "SAT DISPLAY TEXT"; 
-    
-    DPRINT << ": OUT";
-}
-
-/*!
- */
-InfoWidgetSatHandler::~InfoWidgetSatHandler()
-{
-    DPRINT << ": IN";
-    DPRINT << ": OUT";
-}    
-
-/*!
- */
-void InfoWidgetSatHandler::logCurrentInfo()
-{
-    DPRINT << ": IN"; 
-    DPRINT << ": OUT";
-    
-} 
-
-/*!
- */
-const QString& InfoWidgetSatHandler::satDisplayText() const
-{
-    DPRINT << ": text: " << m_displayText; 
-    return m_displayText;
-}
-
-/*!
- */
-void InfoWidgetSatHandler::setSatDisplayText(const QString& displayText)
-{
-    DPRINT << ": display text: " << displayText;
-    m_displayText = displayText;
-}
-
-// End of File. 
-
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/infowidgetprovider.pri
--- a/phoneplugins/infowidgetprovider/infowidgetprovider.pri	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-#
-
-HEADERS += ./inc/infowidgetprovider.h \
-           ./inc/infowidgetlogging.h \
-           ./infowidget/inc/infowidget.h \
-           ./infowidget/inc/infowidgetlayoutmanager.h \
-           ./infowidget/inc/infowidgetpreferences.h \
-           ./infowidget/inc/infowidgetengine.h 
-
-symbian: {
-    HEADERS += ./infowidget/inc/infowidgetnetworkhandler.h \
-               ./infowidget/inc/infowidgetsathandler.h \
-               ./infowidget/inc/infowidgetlinehandler.h
-} 
-           
-SOURCES += ./src/infowidgetprovider.cpp \
-            ./infowidget/src/infowidget.cpp \
-           ./infowidget/src/infowidgetlayoutmanager.cpp \
-           ./infowidget/src/infowidgetengine.cpp 
-                    
-symbian: {
-    SOURCES += ./infowidget/src/infowidgetpreferences.cpp \
-               ./infowidget/src/infowidgetnetworkhandler.cpp \
-               ./infowidget/src/infowidgetsathandler.cpp \
-               ./infowidget/src/infowidgetlinehandler.cpp 
-} else: { 
-    SOURCES += ./infowidget/src/infowidgetengine_s.cpp \
-               ./infowidget/src/infowidgetpreferences_s.cpp
-}
-
-defineTest(exportResources) {
-    symbian {
-        for(subdirs, 1) {
-            entries = $$files($$subdirs)
-            for(entry, entries) : BLD_INF_RULES.prj_exports += "./$$entry z:/$$replace(2, ^/,)/$$basename(entry)"
-        }
-        export ( BLD_INF_RULES.prj_exports)
-    }
-}
-
-symbian: plugin { # copy qtstub and manifest
-
-    pluginstub.sources = $${TARGET}.dll
-    pluginstub.path = $$PLUGIN_SUBDIR
-
-    DEPLOYMENT += pluginstub
-
-    qtplugins.path = $$PLUGIN_SUBDIR
-    qtplugins.sources += qmakepluginstubs/$${TARGET}.qtplugin
-
-    message(Remove "contains(MOBILITY, serviceframework)" after the QtSF refactorig is done!)
-        
-    !contains(MOBILITY, serviceframework):qtplugins.sources += resource/$${TARGET}.manifest
-    contains(MOBILITY, serviceframework):BLD_INF_RULES.prj_exports += "resource/$${TARGET}.s60xml z:$$qtplugins.path/$${TARGET}.xml"
-    
-    for(qtplugin, qtplugins.sources):BLD_INF_RULES.prj_exports += "./$$qtplugin z:$$qtplugins.path/$$basename(qtplugin)"
-}
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/infowidgetprovider.pro
--- a/phoneplugins/infowidgetprovider/infowidgetprovider.pro	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-#
- 
-
-TEMPLATE = lib
-CONFIG += plugin hb svg mobility
-MOBILITY = serviceframework
-
-TRANSLATIONS = operator_widget.ts
-
-MOC_DIR = moc
-RCC_DIR = rcc
-
-symbian: {
-LIBS += -lhswidgetmodel \
-    -lnetworkhandling \
-    -lcbsclient \
-    -lcbsmcnclient \
-    -lxqsettingsmanager
-}
-   
-INCLUDEPATH += ./inc \
-    ./infowidget/inc 
-    
-symbian: { 
-    load(data_caging_paths)
-    INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
-    TARGET.UID3 = 0x20029F28
-    TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.CAPABILITY = ALL \
-        -TCB
-    deploy.path = c:
-    
-    DEPLOYMENT += exportheaders  
-        
-    BLD_INF_RULES.prj_exports +=  \
-     "$${LITERAL_HASH}include <platform_paths.hrh>" \
-     "./rom/infowidgetprovider.iby    CORE_APP_LAYER_IBY_EXPORT_PATH(infowidgetprovider.iby)" \
-	 "./rom/infowidgetprovider_resources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(infowidgetprovider_resources.iby)" 
-}
-win32: { 
-    INCLUDEPATH += ../../../../homescreensrv/homescreensrv_plat/hswidgetmodel_api
-    include(infowidgetprovider_installs_win32.pri)
-}
-RESOURCES = infowidgetprovider.qrc
-
-symbian: PLUGIN_SUBDIR = /private/20022F35/import/widgetregistry/20029F28
-OUTPUT_DIR = ./bin
-SOURCE_DIR = ./inc
-OBJECTS_DIR = $$OUTPUT_DIR/tmp/$$TARGET
-DESTDIR = $$OUTPUT_DIR
-MOC_DIR = $$OUTPUT_DIR/tmp/$$TARGET/moc
-RCC_DIR = $$OUTPUT_DIR/tmp/$$TARGET/rcc
-UI_DIR = $$OUTPUT_DIR/tmp/$$TARGET/ui
-LIBS += -L$$DESTDIR
-DEPENDPATH += . $$SOURCE_DIR
-INCLUDEPATH += . $$SOURCE_DIR
-INCLUDEPATH += $$MOC_DIR
-plugin: !isEmpty(PLUGIN_SUBDIR): DESTDIR = $$OUTPUT_DIR/$$PLUGIN_SUBDIR
-
-include(infowidgetprovider.pri)
-
-exportResources(./resource/*.manifest, $$PLUGIN_SUBDIR)
-exportResources(./resource/*.png, $$PLUGIN_SUBDIR)
-exportResources(./resource/*.svg, $$PLUGIN_SUBDIR)
\ No newline at end of file
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/infowidgetprovider.qrc
--- a/phoneplugins/infowidgetprovider/infowidgetprovider.qrc	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<RCC>
-    <qresource prefix="/" >
-        <file>resource/infowidget.png</file>        
-        <file>resource/infowidget.docml</file>        
-        <file>resource/qgn_prop_network_2g.svg</file>
-        <file>resource/qgn_prop_pb_call.svg</file>
-        <file>resource/qgn_prop_pb_sim.svg</file>
-        <file>resource/qgn_stat_zone_home_uni.svg</file>
-    </qresource>
-</RCC>
-
-
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/infowidgetprovider_hw.pkg
--- a/phoneplugins/infowidgetprovider/infowidgetprovider_hw.pkg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-;
-; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-; Language
-&EN
-
-; SIS header: name, uid, version
-#{"infowidgetprovider"},(0x20029F28),1,0,0
-
-; Localised Vendor name
-%{"Vendor"}
-
-; Unique Vendor name
-:"Vendor"
-
-; Manual PKG pre-rules from PRO files
-; Default HW/platform dependencies
-[0x101F7961],0,0,0,{"S60ProductID"}
-[0x102032BE],0,0,0,{"S60ProductID"}
-[0x102752AE],0,0,0,{"S60ProductID"}
-[0x1028315F],0,0,0,{"S60ProductID"}
-
-; DEPLOYMENT
-"/epoc32/release/armv5/urel/infowidgetprovider.dll"    - "c:\sys\bin\infowidgetprovider.dll"
-"/epoc32/data/z/private/20022F35/import/widgetregistry/20029F28/infowidgetprovider.qtplugin"  - "c:/private/20022F35/import/widgetregistry/20029F28/infowidgetprovider.qtplugin"
-"/epoc32/data/z/private/20022F35/import/widgetregistry/20029F28/infowidgetprovider.manifest"  - "c:/private/20022F35/import/widgetregistry/20029F28/infowidgetprovider.manifest"
-"/epoc32/data/z/private/20022F35/import/widgetregistry/20029F28/infowidget.png"       - "c:/private/20022F35/import/widgetregistry/20029F28/infowidget.png"
-
-; Manual PKG post-rules from PRO files
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/infowidgetprovider_installs_win32.pri
--- a/phoneplugins/infowidgetprovider/infowidgetprovider_installs_win32.pri	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
-#
-
-#
-# Release
-#
-
-r01.path = ../../../bin/release/hsresources/import/widgetregistry/20029F28
-r01.files = ./release/*.dll \
-            ./resource/*.manifest \
-            ./resource/*.png
-
-INSTALLS += r01
-
-#
-# Debug
-#
-
-d01.path = ../../../../bin/debug/hsresources/import/widgetregistry/20029F28
-d01.files = ./debug/*.dll \
-            ./resource/*.manifest \
-            ./resource/*.png
-
-INSTALLS += d01
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/resource/infowidget.png
Binary file phoneplugins/infowidgetprovider/resource/infowidget.png has changed
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/resource/infowidgetprovider.manifest
--- a/phoneplugins/infowidgetprovider/resource/infowidgetprovider.manifest	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<widgetprovider>
-    <widget library="infowidgetprovider"
-            uri="infowidgetprovider"
-            title="Operator info"/>
-</widgetprovider>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/resource/infowidgetprovider.s60xml
--- a/phoneplugins/infowidgetprovider/resource/infowidgetprovider.s60xml	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<service>
-    <name>infowidgetprovider</name>
-    <filepath>z:/private/20022F35/import/widgetregistry/20029F28/infowidgetprovider.qtplugin</filepath>
-    <description>Operator widget</description>
-    <interface>
-        <name>com.nokia.homescreen.widget</name>
-        <version>1.0</version>
-        <description>The Operator widget displays Operator menu</description>
-        <capabilities></capabilities>
-        <customproperty key="title">Operator</customproperty>
-    </interface>
-</service>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/resource/infowidgetprovider.xml
--- a/phoneplugins/infowidgetprovider/resource/infowidgetprovider.xml	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<service>
-    <name>infowidgetprovider</name>
-    <filepath>infowidgetprovider</filepath>
-    <description>Operator info widget.</description>
-    <interface>
-        <name>com.nokia.homescreen.widget</name>
-        <version>1.0</version>
-        <description>The info widget displays operator info.</description>
-        <capabilities></capabilities>
-        <customproperty key="title">Operator info widget</customproperty>
-    </interface>
-</service>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/resource/qgn_prop_network_2g.svg
--- a/phoneplugins/infowidgetprovider/resource/qgn_prop_network_2g.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon fill="#030303" fill-opacity="0.7" points="6.248,15.004 6.248,8.396 1.02,3.418 0.998,0 15,0   15,3.418 9.752,8.396 9.752,15.004 " stroke-opacity="0.7"/>
-<path d="M2.006,1v1.479l5.25,5.502L7.25,14h1.5l0.006-6.02l5.25-5.48V1H2.006z M7.256,5.85L4.053,2.5h3.203  V5.85z M8.756,5.85V2.5h3.303L8.756,5.85z" fill="url(#SVGID_1_)"/>
-<rect fill="none" height="16" width="16"/>
-<defs>
-<linearGradient gradientTransform="matrix(1 0 0 -1 0.1377 14.834)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="7.8682" x2="7.8682" y1="17.3789" y2="-1.5303">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#B2B2B2"/>
-</linearGradient>
-</defs>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/resource/qgn_prop_pb_call.svg
--- a/phoneplugins/infowidgetprovider/resource/qgn_prop_pb_call.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="16" width="16"/>
-<path d="M9.402,0.102C5.703,2.756,3.136,5.486,0.096,9.423  c-0.053,0.323-0.581,2.854,1.544,5.083c0.422,0.32,1.041,0.957,2.242-0.053c0.42-0.573,1.636-2.156,2-2.666  c0.767-1.167,0.22-1.678-0.597-2.764C5.977,8.334,8.338,5.97,9.027,5.279c0.859,0.607,1.642,1.518,2.734,0.62  c0,0,2.547-1.925,2.775-2.089c1.062-1.219-0.043-2.187,0.025-2.125C12.234-0.574,9.521,0.086,9.402,0.102z" fill="#030303" fill-opacity="0.7" stroke-opacity="0.7"/>
-<path d="M13.271,1.917C12.3,1.238,11.16,0.859,9.811,1.051L9.809,1.053c-3.475,2.65-6.211,5.209-8.75,8.753  L1.057,9.809c-0.208,1.717,0.474,2.99,1.085,3.756c0.362,0.434,0.645,0.558,0.933,0.281l2.021-2.689  c0.139-0.174,0.273-0.401,0-0.674c0,0-0.671-0.674-1.008-1.684L8.8,4.082c1.013,0.335,1.685,1.009,1.685,1.009  c0.272,0.274,0.502,0.139,0.674,0c0,0,2.561-1.896,2.691-2.02C14.176,2.756,14.125,2.533,13.271,1.917z" fill="url(#SVGID_1_)"/>
-<defs>
-<linearGradient gradientTransform="matrix(1 0 0 -1 0.1377 14.834)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="7.3892" x2="7.3892" y1="9.834" y2="-13.1661">
-<stop offset="0" style="stop-color:#3687FF"/>
-<stop offset="1" style="stop-color:#051F7D"/>
-</linearGradient>
-</defs>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/resource/qgn_prop_pb_sim.svg
--- a/phoneplugins/infowidgetprovider/resource/qgn_prop_pb_sim.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="16px" version="1.1" viewBox="0 0 16 16" width="16px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon fill="#030303" fill-opacity="0.7" points="16,14 0,14 0,5.588 3.586,2 16,2 " stroke-opacity="0.7"/>
-<polygon fill="none" points="16,16 0.008,16 0,0 15.992,0 "/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 0.1377 14.834)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="7.8623" x2="7.8623" y1="9.4336" y2="0.2336">
-<stop offset="0" style="stop-color:#B2B2B2"/>
-<stop offset="1" style="stop-color:#666666"/>
-</linearGradient>
-<polygon fill="url(#SVGID_1_)" points="4,3 1,6.001 1,13 15,13 15,3 "/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 0.1377 14.834)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="9.0293" x2="9.0293" y1="9.1592" y2="0.4069">
-<stop offset="0" style="stop-color:#FFE23D"/>
-<stop offset="0.2239" style="stop-color:#FAD337"/>
-<stop offset="0.6537" style="stop-color:#EFAB26"/>
-<stop offset="1" style="stop-color:#E48717"/>
-</linearGradient>
-<path d="M9.459,9.676h3.791V8.159H9.459V9.676z M12.666,6.001H9.459v1.575h3.791V6.584  C13.25,6.262,12.988,6.001,12.666,6.001z M5.084,6.584v0.992h3.791V6.001H5.667C5.344,6.001,5.084,6.262,5.084,6.584z M5.084,9.676  h3.791V8.159H5.084V9.676z M9.459,11.834h3.207c0.322,0,0.584-0.262,0.584-0.584v-0.991H9.459V11.834z M5.084,11.25  c0,0.322,0.26,0.584,0.582,0.584h3.209v-1.575H5.084V11.25z" fill="url(#SVGID_2_)"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/resource/qgn_stat_zone_home_uni.svg
--- a/phoneplugins/infowidgetprovider/resource/qgn_stat_zone_home_uni.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="8" version="1.1" viewBox="0 0 12 8" width="12" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<path d="M6.364,0.764L0.648,3.34l0.016,0.008L0.658,3.35h0.001L0.648,4.221l0.974-0.24v3.25c0.849,0.013,1.593,0,2.442,0V5.143  h2.342V7.23c1.601,0,3.124,0,4.62,0V3.994l0.973,0.246V3.367H12L6.364,0.764z"/>
-<rect fill="none" height="8" width="12"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/rom/infowidgetprovider.iby
--- a/phoneplugins/infowidgetprovider/rom/infowidgetprovider.iby	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef __INFOWIDGETPROVIDER_IBY__
-#define __INFOWIDGETPROVIDER_IBY__
-
-file=ABI_DIR\BUILD_DIR\infowidgetprovider.dll                                               SHARED_LIB_DIR\infowidgetprovider.dll
-data=ZPRIVATE\20022f35\import\widgetregistry\20029F28\infowidgetprovider.qtplugin           private\20022f35\import\widgetregistry\20029F28\infowidgetprovider.qtplugin
-data=ZPRIVATE\20022f35\import\widgetregistry\20029F28\infowidgetprovider.manifest           private\20022f35\import\widgetregistry\20029F28\infowidgetprovider.manifest
-data=ZPRIVATE\20022f35\import\widgetregistry\20029F28\infowidget.png                        private\20022f35\import\widgetregistry\20029F28\infowidget.png
-data=ZPRIVATE\20022f35\import\widgetregistry\20029F28\infowidgetprovider.xml                private\20022f35\import\widgetregistry\20029F28\infowidgetprovider.xml
-
-
-#endif //__INFOWIDGETPROVIDER_IBY__
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/rom/infowidgetprovider_resources.iby
--- a/phoneplugins/infowidgetprovider/rom/infowidgetprovider_resources.iby	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef __INFOWIDGETPROVIDER_RESOURCE_IBY__
-#define __INFOWIDGETPROVIDER_RESOURCE_IBY__
-
-#include <data_caging_paths_for_iby.hrh>
-
-data=DATAZ_\QT_TRANSLATIONS_DIR\operator_widget.qm QT_TRANSLATIONS_DIR\operator_widget.qm 
-
-#endif 
\ No newline at end of file
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/src/infowidgetprovider.cpp
--- a/phoneplugins/infowidgetprovider/src/infowidgetprovider.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *
- */
-
-#include <qserviceinterfacedescriptor.h>
-#include <qabstractsecuritysession.h>
-#include <qservicecontext.h>
-
-#include "infowidgetprovider.h"
-#include "infowidget.h"
-
-
-/*!
-  \class InfoWidgetProvider
-  
-  \brief Homescreen Widget for providing operator information   
-*/
-QObject *InfoWidgetProvider::createInstance(const QServiceInterfaceDescriptor &descriptor,
-                                             QServiceContext *context,
-                                             QAbstractSecuritySession *session)
-{
-    Q_UNUSED(context);
-    Q_UNUSED(session);
-
-    if (descriptor.interfaceName() == QLatin1String("com.nokia.homescreen.widget")) {
-        return new InfoWidget();
-    } else {
-        return 0;
-    }
-}
-
-
-Q_EXPORT_PLUGIN2(Infowidgetprovider, InfoWidgetProvider)
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/tsrc/common/qtestmains60.h
--- a/phoneplugins/infowidgetprovider/tsrc/common/qtestmains60.h	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef QTESTMAINS60
-#define QTESTMAINS60
-
-#define QTEST_MAIN_S60(TestObject) \
-int main(int argc, char *argv[]) \
-{ \
-char *new_argv[3]; \
-QCoreApplication app(argc, argv); \
-\
-QString str = "C:\\data\\" + QFileInfo(QCoreApplication::applicationFilePath()).baseName() + ".log"; \
-QByteArray   bytes  = str.toAscii(); \
-\
-char arg1[] = "-o"; \
-\
-new_argv[0] = argv[0]; \
-new_argv[1] = arg1; \
-new_argv[2] = bytes.data(); \
-\
-TestObject tc; \
-return QTest::qExec(&tc, 3, new_argv); \
-}
-
-#endif
\ No newline at end of file
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/tsrc/mocks/mock_infowidget.cpp
--- a/phoneplugins/infowidgetprovider/tsrc/mocks/mock_infowidget.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,399 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *
- */
-#include <QDebug>
-#include <smcmockclassincludes.h>
-#include "infowidget.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// InfoWidget::InfoWidget
-// -----------------------------------------------------------------------------
-//
-InfoWidget::InfoWidget( 
-        QGraphicsItem * parent,
-        Qt::WindowFlags flags )
-    //:
-    //HsWidget( /*parent, flags*/ )
-    {
-    
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::~InfoWidget
-// -----------------------------------------------------------------------------
-//
-InfoWidget::~InfoWidget(  )
-    {
-    
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::boundingRect
-// -----------------------------------------------------------------------------
-//
-QRectF InfoWidget::boundingRect(  ) const
-    {
-    SMC_MOCK_METHOD0( QRectF )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::shape
-// -----------------------------------------------------------------------------
-//
-QPainterPath InfoWidget::shape(  ) const
-    {
-    SMC_MOCK_METHOD0( QPainterPath )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::sizeHint
-// -----------------------------------------------------------------------------
-//
-QSizeF InfoWidget::sizeHint( 
-        Qt::SizeHint which,
-        const QSizeF & constraint ) const
-    {
-    SMC_MOCK_METHOD2( QSizeF, Qt::SizeHint, which, 
-        const QSizeF &, constraint )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::sizePolicy
-// -----------------------------------------------------------------------------
-//
-QSizePolicy InfoWidget::sizePolicy(  ) const
-    {
-    SMC_MOCK_METHOD0( QSizePolicy )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::Q_PROPERTY
-// -----------------------------------------------------------------------------
-//
-void InfoWidget::Q_PROPERTY( 
-        QString homeZoneDisplay READ homeZoneDisplay WRITE setHomeZoneDisplay ) Q_PROPERTY ( QString mcnDisplay READ mcnDisplay WRITE setMcnDisplay ) Q_PROPERTY ( QString activeLineDisplay READ activeLineDisplay WRITE setActiveLineDisplay ) Q_PROPERTY ( QString satDisplay READ satDisplay WRITE setSatDisplay ) QString homeZoneDisplay ( )
-    {
-    SMC_MOCK_METHOD1( void, QString homeZoneDisplay READ homeZoneDisplay WRITE setHomeZoneDisplay ) Q_PROPERTY ( QString mcnDisplay READ mcnDisplay WRITE setMcnDisplay ) Q_PROPERTY ( QString activeLineDisplay READ activeLineDisplay WRITE setActiveLineDisplay ) Q_PROPERTY ( QString satDisplay READ satDisplay WRITE setSatDisplay ) QString homeZoneDisplay, ( )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::setHomeZoneDisplay
-// -----------------------------------------------------------------------------
-//
-void InfoWidget::setHomeZoneDisplay( 
-        QString value )
-    {
-    SMC_MOCK_METHOD1( void, QString, value )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::mcnDisplay
-// -----------------------------------------------------------------------------
-//
-QString InfoWidget::mcnDisplay(  )
-    {
-    SMC_MOCK_METHOD0( QString )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::setMcnDisplay
-// -----------------------------------------------------------------------------
-//
-void InfoWidget::setMcnDisplay( 
-        QString value )
-    {
-    SMC_MOCK_METHOD1( void, QString, value )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::activeLineDisplay
-// -----------------------------------------------------------------------------
-//
-QString InfoWidget::activeLineDisplay(  )
-    {
-    SMC_MOCK_METHOD0( QString )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::setActiveLineDisplay
-// -----------------------------------------------------------------------------
-//
-void InfoWidget::setActiveLineDisplay( 
-        QString value )
-    {
-    SMC_MOCK_METHOD1( void, QString, value )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::satDisplay
-// -----------------------------------------------------------------------------
-//
-QString InfoWidget::satDisplay(  )
-    {
-    SMC_MOCK_METHOD0( QString )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::setSatDisplay
-// -----------------------------------------------------------------------------
-//
-void InfoWidget::setSatDisplay( 
-        QString value )
-    {
-    SMC_MOCK_METHOD1( void, QString, value )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::onInitialize
-// -----------------------------------------------------------------------------
-//
-void InfoWidget::onInitialize(  )
-    {
-    SMC_MOCK_METHOD0( void )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::onUninitialize
-// -----------------------------------------------------------------------------
-//
-void InfoWidget::onUninitialize(  )
-    {
-    SMC_MOCK_METHOD0( void )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::onShow
-// -----------------------------------------------------------------------------
-//
-void InfoWidget::onShow(  )
-    {
-    SMC_MOCK_METHOD0( void )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::onHide
-// -----------------------------------------------------------------------------
-//
-void InfoWidget::onHide(  )
-    {
-    SMC_MOCK_METHOD0( void )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::readModel
-// -----------------------------------------------------------------------------
-//
-void InfoWidget::readModel(  )
-    {
-    SMC_MOCK_METHOD0( void )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::handleModelError
-// -----------------------------------------------------------------------------
-//
-void InfoWidget::handleModelError( 
-        int operation,
-        int errorCode )
-    {
-    SMC_MOCK_METHOD2( void, int, operation, 
-        int, errorCode )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::homeZoneDisplaySettingChanged
-// -----------------------------------------------------------------------------
-//
-void InfoWidget::homeZoneDisplaySettingChanged( 
-        int state )
-    {
-    SMC_MOCK_METHOD1( void, int, state )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::mcnDisplaySettingChanged
-// -----------------------------------------------------------------------------
-//
-void InfoWidget::mcnDisplaySettingChanged( 
-        int state )
-    {
-    SMC_MOCK_METHOD1( void, int, state )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::activeLineDisplaySettingChanged
-// -----------------------------------------------------------------------------
-//
-void InfoWidget::activeLineDisplaySettingChanged( 
-        int state )
-    {
-    SMC_MOCK_METHOD1( void, int, state )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::satDisplaySettingChanged
-// -----------------------------------------------------------------------------
-//
-void InfoWidget::satDisplaySettingChanged( 
-        int state )
-    {
-    SMC_MOCK_METHOD1( void, int, state )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::settingsEditingFinished
-// -----------------------------------------------------------------------------
-//
-void InfoWidget::settingsEditingFinished(  )
-    {
-    SMC_MOCK_METHOD0( void )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::setPreferences
-// -----------------------------------------------------------------------------
-//
-void InfoWidget::setPreferences( 
-        const QStringList & names )
-    {
-    SMC_MOCK_METHOD1( void, const QStringList &, names )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::onStart
-// -----------------------------------------------------------------------------
-//
-HsWidget::StartResult InfoWidget::onStart(  )
-    {
-    SMC_MOCK_METHOD0( HsWidget::StartResult )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::onStop
-// -----------------------------------------------------------------------------
-//
-HsWidget::StopResult InfoWidget::onStop(  )
-    {
-    SMC_MOCK_METHOD0( HsWidget::StopResult )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::onSuspend
-// -----------------------------------------------------------------------------
-//
-HsWidget::SuspendResult InfoWidget::onSuspend(  )
-    {
-    SMC_MOCK_METHOD0( HsWidget::SuspendResult )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::onResume
-// -----------------------------------------------------------------------------
-//
-HsWidget::ResumeResult InfoWidget::onResume(  )
-    {
-    SMC_MOCK_METHOD0( HsWidget::ResumeResult )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::paint
-// -----------------------------------------------------------------------------
-//
-void InfoWidget::paint( 
-        QPainter * painter,
-        const QStyleOptionGraphicsItem * option,
-        QWidget * widget )
-    {
-    SMC_MOCK_METHOD3( void, QPainter *, painter, 
-        const QStyleOptionGraphicsItem *, option, 
-        QWidget *, widget )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::mouseDoubleClickEvent
-// -----------------------------------------------------------------------------
-//
-void InfoWidget::mouseDoubleClickEvent( 
-        QGraphicsSceneMouseEvent * event )
-    {
-    SMC_MOCK_METHOD1( void, QGraphicsSceneMouseEvent *, event )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::mousePressEvent
-// -----------------------------------------------------------------------------
-//
-void InfoWidget::mousePressEvent( 
-        QGraphicsSceneMouseEvent * event )
-    {
-    SMC_MOCK_METHOD1( void, QGraphicsSceneMouseEvent *, event )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::updateInfoDisplay
-// -----------------------------------------------------------------------------
-//
-void InfoWidget::updateInfoDisplay(  )
-    {
-    SMC_MOCK_METHOD0( void )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidget::initializePreferences
-// -----------------------------------------------------------------------------
-//
-void InfoWidget::initializePreferences(  )
-    {
-    SMC_MOCK_METHOD0( void )
-    }
-
-
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/tsrc/mocks/mock_infowidgetnetworkhandler.cpp
--- a/phoneplugins/infowidgetprovider/tsrc/mocks/mock_infowidgetnetworkhandler.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *
- */
-#include <QDebug>
-#include <smcmockclassincludes.h>
-#include <networkhandlingproxy.h>
-#include <cnwsession.h>
-#include "infowidgetnetworkhandler.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// InfoWidgetNetworkHandler::InfoWidgetNetworkHandler
-// -----------------------------------------------------------------------------
-//
-InfoWidgetNetworkHandler::InfoWidgetNetworkHandler( 
-        QObject * parent )
-    : 
-    QObject(parent), 
-    m_nwSession(0)
-    {
-    
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidgetNetworkHandler::~InfoWidgetNetworkHandler
-// -----------------------------------------------------------------------------
-//
-InfoWidgetNetworkHandler::~InfoWidgetNetworkHandler(  )
-    {
-    
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidgetNetworkHandler::homeZoneTextTag
-// -----------------------------------------------------------------------------
-//
-QString InfoWidgetNetworkHandler::homeZoneTextTag(  ) const
-    {
-    SMC_MOCK_METHOD0( QString )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidgetNetworkHandler::homeZoneIndicatorType
-// -----------------------------------------------------------------------------
-//
-int InfoWidgetNetworkHandler::homeZoneIndicatorType(  ) const
-    {
-    SMC_MOCK_METHOD0( int )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidgetNetworkHandler::mcnName
-// -----------------------------------------------------------------------------
-//
-QString InfoWidgetNetworkHandler::mcnName(  ) const
-    {
-    SMC_MOCK_METHOD0( QString )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidgetNetworkHandler::mcnIndicatorType
-// -----------------------------------------------------------------------------
-//
-int InfoWidgetNetworkHandler::mcnIndicatorType(  ) const
-    {
-    SMC_MOCK_METHOD0( int )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidgetNetworkHandler::logCurrentInfo
-// -----------------------------------------------------------------------------
-//
-void InfoWidgetNetworkHandler::logCurrentInfo(  )
-    {
-    SMC_MOCK_METHOD0( void )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidgetNetworkHandler::HandleNetworkMessage
-// -----------------------------------------------------------------------------
-//
-void InfoWidgetNetworkHandler::HandleNetworkMessage( 
-        const TNWMessages aMessage )
-    {
-    SMC_MOCK_METHOD1( void, const TNWMessages, aMessage )
-    }
-
-
-// -----------------------------------------------------------------------------
-// InfoWidgetNetworkHandler::HandleNetworkError
-// -----------------------------------------------------------------------------
-//
-void InfoWidgetNetworkHandler::HandleNetworkError( 
-        const TNWOperation aOperation,
-        TInt aErrorCode )
-    {
-    SMC_MOCK_METHOD2( void, const TNWOperation, aOperation, 
-        TInt, aErrorCode )
-    }
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/tsrc/mocks/mock_networkhandlingproxy.cpp
--- a/phoneplugins/infowidgetprovider/tsrc/mocks/mock_networkhandlingproxy.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  This file contains the header file of the class NetworkHandlingProxy.
-*
-*/
-
-#include <smcmockclassincludes.h>
-#include <networkhandlingproxy.h>
-#include <nwhandlingengine.h> 
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-CNWSession* CreateL( MNWMessageObserver& aMessage, TNWInfo& aTNWInfo )
-    {
-    SMC_MOCK_METHOD2(CNWSession*, 
-        MNWMessageObserver&, aMessage, 
-        TNWInfo&, aTNWInfo);
-    }
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/tsrc/mocks/mock_xqsettingskey.cpp
--- a/phoneplugins/infowidgetprovider/tsrc/mocks/mock_xqsettingskey.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-/* 
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-#include <QDebug>
-#include "xqsettingskey.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// XQSettingsKey::XQSettingsKey
-// -----------------------------------------------------------------------------
-//
-XQSettingsKey::XQSettingsKey( 
-        XQSettingsKey::Target target,
-        long int uid,
-        unsigned long int key )
-    {
-    
-    }
-
-
-// -----------------------------------------------------------------------------
-// XQSettingsKey::~XQSettingsKey
-// -----------------------------------------------------------------------------
-//
-XQSettingsKey::~XQSettingsKey(  )
-    {
-    
-    }
-
-
-// -----------------------------------------------------------------------------
-// XQSettingsKey::target
-// -----------------------------------------------------------------------------
-//
-XQSettingsKey::Target XQSettingsKey::target(  ) const
-    {
-    
-    XQSettingsKey::Target variable;
-    return variable;
-    }
-
-
-// -----------------------------------------------------------------------------
-// XQSettingsKey::uid
-// -----------------------------------------------------------------------------
-//
-long int XQSettingsKey::uid(  ) const
-    {
-    
-    return 0;
-    }
-
-
-// -----------------------------------------------------------------------------
-// XQSettingsKey::key
-// -----------------------------------------------------------------------------
-//
-unsigned long int XQSettingsKey::key(  ) const
-    {
-    
-    return 0;
-    }
-
-
-// -----------------------------------------------------------------------------
-// XQPublishAndSubscribeSettingsKey::XQPublishAndSubscribeSettingsKey
-// -----------------------------------------------------------------------------
-//
-XQPublishAndSubscribeSettingsKey::XQPublishAndSubscribeSettingsKey( 
-        long int categoryUid,
-        unsigned long int key ) : 
-        XQSettingsKey( XQSettingsKey::TargetPublishAndSubscribe, categoryUid, key )
-    {
-    
-    }
-
-
-// -----------------------------------------------------------------------------
-// XQPublishAndSubscribeSettingsKey::~XQPublishAndSubscribeSettingsKey
-// -----------------------------------------------------------------------------
-//
-XQPublishAndSubscribeSettingsKey::~XQPublishAndSubscribeSettingsKey(  )
-    {
-    
-    }
-
-
-// -----------------------------------------------------------------------------
-// XQCentralRepositorySettingsKey::XQCentralRepositorySettingsKey
-// -----------------------------------------------------------------------------
-//
-XQCentralRepositorySettingsKey::XQCentralRepositorySettingsKey( 
-        long int repositoryUid,
-        unsigned long int key ) : 
-        XQSettingsKey( XQSettingsKey::TargetCentralRepository, repositoryUid, key )
-    {
-    
-    }
-
-
-// -----------------------------------------------------------------------------
-// XQCentralRepositorySettingsKey::~XQCentralRepositorySettingsKey
-// -----------------------------------------------------------------------------
-//
-XQCentralRepositorySettingsKey::~XQCentralRepositorySettingsKey(  )
-    {
-    
-    }
-
-
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/tsrc/mocks/mock_xqsettingsmanager.cpp
--- a/phoneplugins/infowidgetprovider/tsrc/mocks/mock_xqsettingsmanager.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-/* 
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-#include <QDebug>
-#include <smcmockclassincludes.h>
-#include "xqsettingsmanager.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// XQSettingsManager::XQSettingsManager
-// -----------------------------------------------------------------------------
-//
-XQSettingsManager::XQSettingsManager( 
-        QObject * parent )
-    : QObject( parent )
-    {
-    
-    }
-
-// -----------------------------------------------------------------------------
-// XQSettingsManager::~XQSettingsManager
-// -----------------------------------------------------------------------------
-//
-XQSettingsManager::~XQSettingsManager(  )
-    {
-    
-    }
-
-
-// -----------------------------------------------------------------------------
-// XQSettingsManager::readItemValue
-// -----------------------------------------------------------------------------
-//
-QVariant XQSettingsManager::readItemValue( 
-        const XQSettingsKey & key,
-        XQSettingsManager::Type type )
-    {
-    SMC_MOCK_METHOD2( QVariant, XQSettingsKey &, key, XQSettingsManager::Type, type )
-    }
-
-
-// -----------------------------------------------------------------------------
-// XQSettingsManager::writeItemValue
-// -----------------------------------------------------------------------------
-//
-bool XQSettingsManager::writeItemValue( 
-        const XQSettingsKey & key,
-        const QVariant & value )
-    {
-    Q_UNUSED( key )
-    Q_UNUSED( value )
-    bool variable;
-    return variable;
-    }
-
-
-// -----------------------------------------------------------------------------
-// XQSettingsManager::startMonitoring
-// -----------------------------------------------------------------------------
-//
-bool XQSettingsManager::startMonitoring( 
-        const XQSettingsKey & key,
-        XQSettingsManager::Type type )
-    {
-    Q_UNUSED( key )
-    Q_UNUSED( type )
-    bool variable;
-    return variable;
-    }
-
-
-// -----------------------------------------------------------------------------
-// XQSettingsManager::stopMonitoring
-// -----------------------------------------------------------------------------
-//
-bool XQSettingsManager::stopMonitoring( 
-        const XQSettingsKey & key )
-    {
-    Q_UNUSED( key )
-    bool variable;
-    return variable;
-    }
-
-
-// -----------------------------------------------------------------------------
-// XQSettingsManager::error
-// -----------------------------------------------------------------------------
-//
-XQSettingsManager::Error XQSettingsManager::error(  ) const
-    {
-    
-    XQSettingsManager::Error variable;
-    return variable;
-    }
-
-
-
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/tsrc/ut_infowidget/inc/ut_infowidget.h
--- a/phoneplugins/infowidgetprovider/tsrc/ut_infowidget/inc/ut_infowidget.h	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef UT_INFOWIDGET_H
-#define UT_INFOWIDGET_H
-
-#include <QtTest/QtTest>
-#include <mockservice.h>
-#include "infowidgetengine.h"
-
-#define private public
-#include "infowidget.h"
-
-class InfoWidget;
-
-class UT_InfoWidget : public QObject, public MockService
-{
-    Q_OBJECT
-
-public:    
-    
-    UT_InfoWidget();
-    ~UT_InfoWidget();
-    
-private slots:
-
-    void init();
-    void cleanup();
-    
-    void t_setHomeZoneDisplay(); 
-    void t_setSatDisplay(); 
-    void t_setMcnDisplay();
-    void t_setActiveLineDisplay(); 
-    void t_readModel();
-    void t_handleModelError();
-    void t_onInitialize(); 
-    void t_onUninitialize(); 
-    void t_onShow(); 
-    void t_onHide();
-    void t_homeZoneDisplaySettingChanged();
-    void t_mcnDisplaySettingChanged();
-    void t_activeLineDisplaySettingChanged();
-    void t_satDisplaySettingChanged();
-    void t_settingsEditingFinished();
-
-    
-private:
-    
-    InfoWidget *m_infoWidget;
-    InfoWidgetEngine::ModelData m_modelData;
-
-};
-
-#endif // UT_INFOWIDGET_H
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/tsrc/ut_infowidget/run_auto_tests_qt.bat
--- a/phoneplugins/infowidgetprovider/tsrc/ut_infowidget/run_auto_tests_qt.bat	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,187 +0,0 @@
-rem
-rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-rem All rights reserved.
-rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
-rem which accompanies this distribution, and is available
-rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-rem
-rem Initial Contributors:
-rem Nokia Corporation - initial contribution.
-rem
-rem Contributors:
-rem
-rem Description:
-rem
-
-@echo off
-setlocal
-goto :startup 
-
-::::::::::::::::::::::::::::::::::::::::::::::::::::::
-:: function DEFAULT
-::
-:: Modify this function
-::  - TESTED_SRC can be changed to match tested code.
-::    Specifies path from testcode group directory to
-::    tested code
-::  - Add test directories to be runned
-::    ie. "call :build ut_projectdirectory" or use
-::    "for /f %%a in ('dir /b ut_*') do call :build %%a"
-::    which compiles, instruments and runs all test directories
-::    starting with "ut_".
-::::::::::::::::::::::::::::::::::::::::::::::::::::::
-:DEFAULT
-set TESTED_SRC=..\..\infowidget\src\*.cpp
-
-for /f %%a in ('dir /b ut_*') do call :build %%a
-if [%DOMODULESTESTS%] EQU [TRUE] (
-for /f %%a in ('dir /b mt_*') do call :build %%a
-)
-
-call :finish
-goto :END
-
-::::::::::::::::::::::::::::::::::::::::::::::::::::::
-:: function STARTUP
-::
-:: Initializing script
-::::::::::::::::::::::::::::::::::::::::::::::::::::::
-:STARTUP
-
-set BUILDTESTS=TRUE
-set RUNTESTS=TRUE
-set INSTRUMENT=TRUE
-set REMOVEINSTRUMENT=TRUE
-set DOMODULESTESTS=TRUE
-set ABLD_CALL=abld build winscw udeb -keepgoing
-set PATH_TO_DLL=\epoc32\release\winscw\udeb
-set PATH_TO_COVERAGE_DATA=\coverage_data
-
-if not exist %PATH_TO_COVERAGE_DATA% (
-mkdir %PATH_TO_COVERAGE_DATA%
-)
-
-if [%1] EQU [] ( goto default )
-
-call :%1
-call :%2
-call :%3
-call :%4
-call :%5
-echo Running tests = %RUNTESTS%
-echo Instrumenting tests = %INSTRUMENT%
-goto default
-
-:/NOCLEANUP
-set REMOVEINSTRUMENT=FALSE
-goto end
-
-:/NORUN
-set RUNTESTS=FALSE
-set REMOVEINSTRUMENT=FALSE
-goto end
-
-:/NOINSTRUMENT
-set INSTRUMENT=FALSE
-goto end
-
-:/NOBUILD
-set BUILDTESTS=FALSE
-goto end
-
-:/ONLYUNITTESTS
-set DOMODULESTESTS=FALSE
-goto end
-
-::::::::::::::::::::::::::::::::::::::::::::::::::::::
-:: function FINISH
-::
-:: Finishes run_auto_tests.bat
-::::::::::::::::::::::::::::::::::::::::::::::::::::::
-:FINISH
-
-if [%RUNTESTS%] EQU [TRUE] (
-call :runtests
-)
-
-if [%INSTRUMENT%] EQU [TRUE] (
-call :calculatecoverage
-)
-
-if [%REMOVEINSTRUMENT%] EQU [TRUE] (
-call :removecoverage
-)
-goto end
-
-::::::::::::::::::::::::::::::::::::::::::::::::::::::
-:: function BUILD
-::    param directory
-::
-:: builds test from given directory
-::::::::::::::::::::::::::::::::::::::::::::::::::::::
-:BUILD
-setlocal
-if [%BUILDTESTS%] EQU [FALSE] ( goto end )
-echo Building %1
-if not exist %1 ( 
-echo %1 Not found! 
-goto end
-)
-
-pushd .
-call cd %1
-call qmake
-call bldmake bldfiles
-call abld clean winscw udeb
-if [%INSTRUMENT%] EQU [TRUE] (
-call ctcwrap -n %PATH_TO_COVERAGE_DATA%\%1 -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=%TESTED_SRC%" %ABLD_CALL%
-) else (
-call %ABLD_CALL%
-)
-
-popd
-endlocal
-goto end
-
-
-::::::::::::::::::::::::::::::::::::::::::::::::::::::
-:: function RUNTESTS
-::
-:: NOTE! Function assumes that test binary is named according to test directory.
-::::::::::::::::::::::::::::::::::::::::::::::::::::::
-:RUNTESTS
-echo Running tests
-call %PATH_TO_DLL%\ut_infowidget.exe -- 
-goto end
-
-::::::::::::::::::::::::::::::::::::::::::::::::::::::
-:: function CALCULATECOVERAGE
-::
-:: Calculates test coverage. Generates html
-::::::::::::::::::::::::::::::::::::::::::::::::::::::
-:CALCULATECOVERAGE
-echo Calculating coverage
-ctcpost %PATH_TO_COVERAGE_DATA%\*.sym | ctcmerge -i - -o profile.txt
-call ctc2html -t 70 -i profile.txt -o \coverage_result -nsb
-goto end
-
-::::::::::::::::::::::::::::::::::::::::::::::::::::::
-:: function REMOVECOVERAGE
-::
-:: Removes data from coverage directory
-::::::::::::::::::::::::::::::::::::::::::::::::::::::
-:REMOVECOVERAGE
-echo Removing deleting coverage data
-call del %PATH_TO_COVERAGE_DATA%\*.sym
-call del %PATH_TO_COVERAGE_DATA%\*.dat
-call del profile.txt
-goto end
-
-::::::::::::::::::::::::::::::::::::::::::::::::::::::
-:: function END
-::
-:: Prints done
-::::::::::::::::::::::::::::::::::::::::::::::::::::::
-:END
-echo Done!
\ No newline at end of file
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/tsrc/ut_infowidget/src/ut_infowidget.cpp
--- a/phoneplugins/infowidgetprovider/tsrc/ut_infowidget/src/ut_infowidget.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,194 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-#include "ut_infowidget.h"
-#include "qtestmains60.h"
-#include <QString>
-
-const QString KPreferenceOn("On"); 
-const QString KPreferenceOff("Off"); 
-const QString KMcnName("tnw1: 3233255435"); 
-
-/*!
-  UT_InfoWidget::UT_InfoWidget
- */
-UT_InfoWidget::UT_InfoWidget() 
-    : m_infoWidget(0)
-{
-    SmcDefaultValue<QString>::SetL("On");
-    m_modelData.setActiveLine(1);
-    m_modelData.setHomeZoneIndicatorType(1);
-    m_modelData.setMcnName(KMcnName);
-        
-    SmcDefaultValue<const InfoWidgetEngine::ModelData &>::SetL(m_modelData);
-}
-
-/*!
-  UT_InfoWidget::~UT_InfoWidget
- */
-UT_InfoWidget::~UT_InfoWidget()
-{
-    delete m_infoWidget;
-}
-
-/*!
-  UT_InfoWidget::init
- */
-void UT_InfoWidget::init()
-{
-    initialize();
-    
-    m_infoWidget = new InfoWidget();
-    
-    QVERIFY(verify());
-}
-
-/*!
-  UT_InfoWidget::cleanup
- */
-void UT_InfoWidget::cleanup()
-{
-    reset();
-    
-    delete m_infoWidget;
-    m_infoWidget = 0;
-}
-
-/*!
-  UT_InfoWidget::t_setHomeZoneDisplay
- */
-void UT_InfoWidget::t_setHomeZoneDisplay()
-{
-    expect("InfoWidgetPreferences::setPreference");
-    m_infoWidget->setHomeZoneDisplay(KPreferenceOn); 
-    expect("InfoWidgetPreferences::preference");
-    QVERIFY(m_infoWidget->homeZoneDisplay() == KPreferenceOn);
-}
-
-/*!
-  UT_InfoWidget::t_setSatDisplay
- */
-void UT_InfoWidget::t_setSatDisplay()
-{
-    expect("InfoWidgetPreferences::setPreference");
-    m_infoWidget->setSatDisplay(KPreferenceOn); 
-    expect("InfoWidgetPreferences::preference");
-    QVERIFY(m_infoWidget->satDisplay() == KPreferenceOn);
-}
-
-/*!
-  UT_InfoWidget::t_setActiveLineDisplay
- */
-void UT_InfoWidget::t_setActiveLineDisplay()
-{
-    expect("InfoWidgetPreferences::setPreference");
-    m_infoWidget->setActiveLineDisplay(KPreferenceOn); 
-    expect("InfoWidgetPreferences::preference");
-    QVERIFY(m_infoWidget->activeLineDisplay() == KPreferenceOn);
-}
-
-/*!
-  UT_InfoWidget::t_setMcnDisplay
- */
-void UT_InfoWidget::t_setMcnDisplay()
-{
-    expect("InfoWidgetPreferences::setPreference");
-    m_infoWidget->setMcnDisplay(KPreferenceOn); 
-    expect("InfoWidgetPreferences::preference");
-    QVERIFY(m_infoWidget->mcnDisplay() == KPreferenceOn);
-}
-
-/*!
-  UT_InfoWidget::t_readModel
- */
-void UT_InfoWidget::t_readModel()
-{
-    m_infoWidget->readModel(); 
-}
-
-/*!
-  UT_InfoWidget::t_handleModelError
- */
-void UT_InfoWidget::t_handleModelError()
-{
-    int operation(0);
-    int errorCode(0); 
-    m_infoWidget->handleModelError(operation, errorCode); 
-}
-
-/*!
-  UT_InfoWidget::t_onInitialize
- */
-void UT_InfoWidget::t_onInitialize()
-{
-    m_infoWidget->onInitialize(); 
-}
-
-/*!
-  UT_InfoWidget::t_onUninitialize
- */
-void UT_InfoWidget::t_onUninitialize()
-{
-    m_infoWidget->onUninitialize(); 
-}
-
-/*!
-  UT_InfoWidget::t_onShow
- */
-void UT_InfoWidget::t_onShow()
-{
-    m_infoWidget->onShow(); 
-}
-
-/*!
-  UT_InfoWidget::t_onHide
- */
-void UT_InfoWidget::t_onHide()
-{
-    m_infoWidget->onHide(); 
-}
-
-void UT_InfoWidget::t_homeZoneDisplaySettingChanged()
-{
-    int setting(0); 
-    m_infoWidget->homeZoneDisplaySettingChanged(setting); 
-}
-
-void UT_InfoWidget::t_mcnDisplaySettingChanged()
-{
-    int setting(0);
-    m_infoWidget->mcnDisplaySettingChanged(setting); 
-}
-
-void UT_InfoWidget::t_activeLineDisplaySettingChanged()
-{
-    int setting(0);
-    m_infoWidget->activeLineDisplaySettingChanged(setting); 
-}
-
-void UT_InfoWidget::t_satDisplaySettingChanged()
-{
-    int setting(0);
-    m_infoWidget->satDisplaySettingChanged(setting); 
-}
-
-void UT_InfoWidget::t_settingsEditingFinished()
-{
-    m_infoWidget->settingsEditingFinished(); 
-}
-
-
-QTEST_MAIN_S60(UT_InfoWidget)
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/tsrc/ut_infowidget/ut_infowidget.pro
--- a/phoneplugins/infowidgetprovider/tsrc/ut_infowidget/ut_infowidget.pro	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-# 
-# Description: Project file for building unit test component
-#
-#
-
-CONFIG += qtestlib hb
-TEMPLATE = app
-TARGET = 
-DEPENDPATH  += . ../../infowidget/src ../../infowidget/inc
-INCLUDEPATH += .
-INCLUDEPATH += ../common
-INCLUDEPATH += ../../inc/
-INCLUDEPATH += ../../infowidget/inc/
-DEFINES += QT_NO_DEBUG_STREAM
-
-QT -= gui
-QT += testlib
-
-symbian: {
-  CONFIG += no_icon
-  INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
-  LIBS += -lmocklib 		\
-          -lsymbianmock 	\
-          -lhswidgetmodel
-}
-
-# test code
-HEADERS += ./inc/ut_infowidget.h
-SOURCES += ./src/ut_infowidget.cpp
-
-# code to be tested
-HEADERS += ../../infowidget/inc/infowidget.h
-SOURCES += ../../infowidget/src/infowidget.cpp
-
-# mocks needed for testing
-#HEADERS += hbdocumentloader.h
-#SOURCES += ../mocks/mock_hbdocumentloader.cpp
-
-HEADERS += ../../infowidget/inc/infowidgetpreferences.h
-SOURCES += ../mocks/mock_infowidgetpreferences.cpp
-HEADERS += ../../infowidget/inc/infowidgetengine.h
-SOURCES += ../mocks/mock_infowidgetengine.cpp
-HEADERS += ../../infowidget/inc/infowidgetlayoutmanager.h
-SOURCES += ../mocks/mock_infowidgetlayoutmanager.cpp
-HEADERS += ../../infowidget/inc/infowidgetnetworkhandler.h
-SOURCES += ../mocks/mock_infowidgetnetworkhandler.cpp
\ No newline at end of file
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/tsrc/ut_infowidgetengine/inc/ut_infowidgetengine.h
--- a/phoneplugins/infowidgetprovider/tsrc/ut_infowidgetengine/inc/ut_infowidgetengine.h	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef UT_INFOWIDGETENGINE_H
-#define UT_INFOWIDGETENGINE_H
-
-#include <QtTest/QtTest>
-#include <mockservice.h>
-
-class InfoWidgetEngine;
-
-class UT_InfoWidgetEngine : public QObject, public MockService
-{
-    Q_OBJECT
-
-public:    
-    
-    UT_InfoWidgetEngine();
-    ~UT_InfoWidgetEngine();
-    
-private slots:
-
-    void init();
-    void cleanup();
-
-    void t_modelData();
-    void t_updateNetworkDataToModel();
-    void t_updateSatDataToModel();
-    void t_updateLineDataToModel();
-    void t_handleNetworkError();
-    void t_handleSatError(); 
-    void t_handleLineError();
-    
-private:
-    
-    InfoWidgetEngine *m_infoWidgetEngine;
-
-};
-
-#endif // UT_INFOWIDGETENGINE_H
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/tsrc/ut_infowidgetengine/src/ut_infowidgetengine.cpp
--- a/phoneplugins/infowidgetprovider/tsrc/ut_infowidgetengine/src/ut_infowidgetengine.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,168 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-#include "ut_infowidgetengine.h"
-#include "infowidgetengine.h"
-#include "qtestmains60.h"
-// mocked dependencies of the class under test
-#include "infowidgetnetworkhandler.h"
-
-const QString KHomeZoneTextTag("HomeZoneText0");    // max length 13
-const TNWViagIndicatorType 
-    KHomeZoneIndicatorType = ENWViagIndicatorTypeHomeZone;
-
-const QString KMcnName("McnNameMcnNameMcnNam");     // max length 20 
-const TNWMCNIndicatorType 
-    KMcnIndicatorType = ENWMCNIndicatorTypeActive;
-
-/*!
-  UT_InfoWidgetEngine::UT_InfoWidgetEngine
- */
-UT_InfoWidgetEngine::UT_InfoWidgetEngine() 
-    : 
-    m_infoWidgetEngine(0)
-{
-    
-}
-
-
-/*!
-  UT_InfoWidgetEngine::~UT_InfoWidgetEngine
- */
-UT_InfoWidgetEngine::~UT_InfoWidgetEngine()
-{
-    delete m_infoWidgetEngine;
-}
-
-
-/*!
-  UT_InfoWidgetEngine::init
- */
-void UT_InfoWidgetEngine::init()
-{
-    initialize();
-    
-    EXPECT(InfoWidgetNetworkHandler::logCurrentInfo);
-    EXPECT(InfoWidgetNetworkHandler::homeZoneTextTag)
-        .returns(KHomeZoneTextTag);
-    EXPECT(InfoWidgetNetworkHandler::homeZoneIndicatorType)
-        .returns(KHomeZoneIndicatorType);
-    EXPECT(InfoWidgetNetworkHandler::mcnName).returns(KMcnName);
-    EXPECT(InfoWidgetNetworkHandler::mcnIndicatorType)
-        .returns(KMcnIndicatorType);
-    
-    m_infoWidgetEngine = new InfoWidgetEngine();
-    
-    QVERIFY(verify());
-}
-
-
-/*!
-  UT_InfoWidgetEngine::cleanup
- */
-void UT_InfoWidgetEngine::cleanup()
-{
-    reset();
-    
-    delete m_infoWidgetEngine;
-    m_infoWidgetEngine = 0;
-}
-
-
-/*!
-  UT_InfoWidgetEngine::t_modelData
- */
-void UT_InfoWidgetEngine::t_modelData()
-{
-    const InfoWidgetEngine::ModelData& data = m_infoWidgetEngine->modelData();
-    QVERIFY(data.homeZoneTextTag() == KHomeZoneTextTag);
-    QVERIFY(data.homeZoneIndicatorType() == KHomeZoneIndicatorType);
-    QVERIFY(data.mcnName() == KMcnName);
-    QVERIFY(data.mcnIndicatorType() == KMcnIndicatorType);
-}
-
-
-/*!
-  UT_InfoWidgetEngine::t_updateNetworkDataToModel
- */
-void UT_InfoWidgetEngine::t_updateNetworkDataToModel()
-{
-    EXPECT(InfoWidgetNetworkHandler::logCurrentInfo);
-    EXPECT(InfoWidgetNetworkHandler::homeZoneTextTag)
-        .returns(KHomeZoneTextTag);
-    EXPECT(InfoWidgetNetworkHandler::homeZoneIndicatorType)
-        .returns(KHomeZoneIndicatorType);
-    EXPECT(InfoWidgetNetworkHandler::mcnName).returns(KMcnName);
-    EXPECT(InfoWidgetNetworkHandler::mcnIndicatorType)
-        .returns(KMcnIndicatorType);
-    QSignalSpy spy(m_infoWidgetEngine, SIGNAL(modelChanged()));
-    
-    m_infoWidgetEngine->updateNetworkDataToModel();
-    
-    const int KExpectedNumOfSignalEmissions = 1;
-    QCOMPARE(spy.count(), KExpectedNumOfSignalEmissions);
-    const QList<QVariant> &arguments = spy.at(0);
-    QCOMPARE(arguments.count(), 0);
-    
-    QVERIFY(verify());
-}
-
-
-/*!
-  UT_InfoWidgetEngine::t_updateSatDataToModel
- */
-void UT_InfoWidgetEngine::t_updateSatDataToModel()
-{
-    m_infoWidgetEngine->updateSatDataToModel();
-}
-
-
-/*!
-  UT_InfoWidgetEngine::t_updateLineDataToModel
- */
-void UT_InfoWidgetEngine::t_updateLineDataToModel()
-{
-    m_infoWidgetEngine->updateLineDataToModel();
-}
-
-
-/*!
-  UT_InfoWidgetEngine::t_handleNetworkError
- */
-void UT_InfoWidgetEngine::t_handleNetworkError()
-{
-    m_infoWidgetEngine->handleNetworkError(0, 0);
-}
-
-
-/*!
-  UT_InfoWidgetEngine::t_handleSatError
- */
-void UT_InfoWidgetEngine:: t_handleSatError()
-{
-    m_infoWidgetEngine->handleSatError(0, 0);
-}
-
-
-/*!
-  UT_InfoWidgetEngine::t_handleLineError
- */
-void UT_InfoWidgetEngine:: t_handleLineError()
-{
-    m_infoWidgetEngine->handleLineError(0, 0);    
-}
-
-QTEST_MAIN_S60(UT_InfoWidgetEngine)
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/tsrc/ut_infowidgetengine/ut_infowidgetengine.pro
--- a/phoneplugins/infowidgetprovider/tsrc/ut_infowidgetengine/ut_infowidgetengine.pro	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-# 
-# Description: Project file for building unit test component
-#
-#
-
-CONFIG += qtestlib hb
-TEMPLATE = app
-TARGET = 
-DEPENDPATH  += . ../../infowidget/src ../../infowidget/inc
-INCLUDEPATH += .
-INCLUDEPATH += ../common
-INCLUDEPATH += ../../inc/
-INCLUDEPATH += ../../infowidget/inc/
-DEFINES += XQSETTINGSMANAGER_NO_LIBRARY
-DEFINES += QT_NO_DEBUG_STREAM
-
-QT -= gui
-QT += testlib
-
-symbian: {
-  CONFIG += no_icon
-  INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
-  LIBS += -lmocklib 		\
-          -lsymbianmock 	\
-          -lcpframework
-}
-    
-# test code
-HEADERS += ./inc/ut_infowidgetengine.h
-SOURCES += ./src/ut_infowidgetengine.cpp
-
-# code to be tested
-HEADERS += ../../infowidget/inc/infowidgetengine.h
-SOURCES += ../../infowidget/src/infowidgetengine.cpp
-
-# mocks needed for testing
-HEADERS += ../../infowidget/inc/infowidgetnetworkhandler.h
-HEADERS += /epoc32/include/mw/xqsettingskey.h \
-           /epoc32/include/mw/xqsettingsmanager.h
-SOURCES += ../mocks/mock_xqsettingsmanager.cpp \
-           ../mocks/mock_xqsettingskey.cpp     \
-           ../mocks/mock_infowidgetnetworkhandler.cpp
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/tsrc/ut_infowidgetlayoutmanager/inc/ut_infowidgetlayoutmanager.h
--- a/phoneplugins/infowidgetprovider/tsrc/ut_infowidgetlayoutmanager/inc/ut_infowidgetlayoutmanager.h	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef UT_INFOWIDGETLAYOUTMANAGER_H
-#define UT_INFOWIDGETLAYOUTMANAGER_H
-
-#include <QtTest/QtTest>
-#include <mockservice.h>
-
-class InfoWidgetLayoutManager;
-
-class UT_InfoWidgetLayoutManager : public QObject, public MockService
-{
-    Q_OBJECT
-
-public:    
-    
-    UT_InfoWidgetLayoutManager();
-    ~UT_InfoWidgetLayoutManager();
-    
-private slots:
-
-    void init();
-    void cleanup();
-    
-private:
-    
-    InfoWidgetLayoutManager *m_layoutManager;
-
-};
-
-#endif // UT_INFOWIDGETLAYOUTMANAGER_H
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/tsrc/ut_infowidgetlayoutmanager/src/ut_infowidgetlayoutmanager.cpp
--- a/phoneplugins/infowidgetprovider/tsrc/ut_infowidgetlayoutmanager/src/ut_infowidgetlayoutmanager.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-#include "ut_infowidgetlayoutmanager.h"
-#include "infowidgetlayoutmanager.h"
-#include "qtestmains60.h"
-
-/*!
-  UT_InfoWidgetLayoutManager::UT_InfoWidgetLayoutManager
- */
-UT_InfoWidgetLayoutManager::UT_InfoWidgetLayoutManager() 
-    : 
-    m_layoutManager(0)
-{
-    
-}
-
-
-/*!
-  UT_InfoWidgetLayoutManager::~UT_InfoWidgetLayoutManager
- */
-UT_InfoWidgetLayoutManager::~UT_InfoWidgetLayoutManager()
-{
-    delete m_layoutManager;
-}
-
-
-/*!
-  UT_InfoWidgetLayoutManager::init
- */
-void UT_InfoWidgetLayoutManager::init()
-{
-    initialize();
-    
-    m_layoutManager = new InfoWidgetLayoutManager();
-    
-    QVERIFY(verify());
-}
-
-
-/*!
-  UT_InfoWidgetLayoutManager::cleanup
- */
-void UT_InfoWidgetLayoutManager::cleanup()
-{
-    reset();
-    
-    delete m_layoutManager;
-    m_layoutManager = 0;
-}
-
-QTEST_MAIN_S60(UT_InfoWidgetLayoutManager)
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/tsrc/ut_infowidgetlayoutmanager/ut_infowidgetlayoutmanager.pro
--- a/phoneplugins/infowidgetprovider/tsrc/ut_infowidgetlayoutmanager/ut_infowidgetlayoutmanager.pro	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-# 
-# Description: Project file for building unit test component
-#
-#
-
-CONFIG += qtestlib hb
-TEMPLATE = app
-TARGET = 
-DEPENDPATH  += . ../../infowidget/src ../../infowidget/inc
-INCLUDEPATH += .
-INCLUDEPATH += ../common
-INCLUDEPATH += ../../inc/
-INCLUDEPATH += ../../infowidget/inc/
-DEFINES += XQSETTINGSMANAGER_NO_LIBRARY
-DEFINES += QT_NO_DEBUG_STREAM
-
-QT -= gui
-QT += testlib
-
-symbian: {
-  CONFIG += no_icon
-  INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
-  LIBS += -lmocklib 		\
-          -lsymbianmock 	\
-          -lcpframework
-}
-    
-# test code
-HEADERS += ./inc/ut_infowidgetlayoutmanager.h
-SOURCES += ./src/ut_infowidgetlayoutmanager.cpp
-
-# code to be tested
-HEADERS += ../../infowidget/inc/infowidgetlayoutmanager.h
-SOURCES += ../../infowidget/src/infowidgetlayoutmanager.cpp
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/tsrc/ut_infowidgetnetworkhandler/inc/ut_infowidgetnetworkhandler.h
--- a/phoneplugins/infowidgetprovider/tsrc/ut_infowidgetnetworkhandler/inc/ut_infowidgetnetworkhandler.h	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef UT_INFOWIDGETNETWORKHANDLER_H
-#define UT_INFOWIDGETNETWORKHANDLER_H
-
-#include <QtTest/QtTest>
-#include <mockservice.h>
-
-class MNWMessageObserver;
-class InfoWidgetNetworkHandler;
-class TNWInfo;
-
-class UT_InfoWidgetNetworkHandler : public QObject, public MockService
-{
-    Q_OBJECT
-
-public:    
-    
-    UT_InfoWidgetNetworkHandler();
-    ~UT_InfoWidgetNetworkHandler();
-    
-public slots:
-    void generateException();
-    
-private slots:
-
-    void init();
-    void cleanup();
-    
-    void t_homeZoneTextTag();
-    void t_homeZoneIndicatorType();
-    void t_mcnName();
-    void t_mcnIndicatorType();
-    void t_HandleNetworkMessage();
-    void t_HandleNetworkMessageExceptionWhileEmittingSignal();
-    void t_HandleNetworkError();
-    void t_HandleNetworkErrorExceptionWhileEmittingSignal();
-    
-private:
-    
-    void initializeNetworkInfo(
-        MNWMessageObserver& aMessage, 
-        TNWInfo& aTNWInfo);
-    
-private:
-    
-    InfoWidgetNetworkHandler *m_networkHandler;
-
-};
-
-#endif // UT_INFOWIDGETNETWORKHANDLER_H
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/tsrc/ut_infowidgetnetworkhandler/src/ut_infowidgetnetworkhandler.cpp
--- a/phoneplugins/infowidgetprovider/tsrc/ut_infowidgetnetworkhandler/src/ut_infowidgetnetworkhandler.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,257 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-#include <networkhandlingproxy.h>
-#include <nwhandlingengine.h>
-#include "ut_infowidgetnetworkhandler.h"
-#include "infowidgetnetworkhandler.h"
-#include "qtestmains60.h"
-
-const QString KHomeZoneTextTag("HomeZoneText0");    // max length 13
-const TNWViagIndicatorType 
-    KHomeZoneIndicatorType = ENWViagIndicatorTypeHomeZone;
-
-const QString KMcnName("McnNameMcnNameMcnNam");     // max length 20 
-const TNWMCNIndicatorType 
-    KMcnIndicatorType = ENWMCNIndicatorTypeActive;
-
-/*!
-  UT_InfoWidgetNetworkHandler::UT_InfoWidgetNetworkHandler
- */
-UT_InfoWidgetNetworkHandler::UT_InfoWidgetNetworkHandler() 
-    : 
-    m_networkHandler(0)
-{
-    
-}
-
-
-/*!
-  UT_InfoWidgetNetworkHandler::~UT_InfoWidgetNetworkHandler
- */
-UT_InfoWidgetNetworkHandler::~UT_InfoWidgetNetworkHandler()
-{
-    delete m_networkHandler;
-}
-
-/*!
-  UT_InfoWidgetNetworkHandler::generateException
- */
-void UT_InfoWidgetNetworkHandler::generateException()
-{
-    throw std::bad_alloc();
-}
-
-/*!
-  UT_InfoWidgetNetworkHandler::init
- */
-void UT_InfoWidgetNetworkHandler::init()
-{
-    initialize();
-    
-    EXPECT(CreateL).willOnce(invoke(this, &initializeNetworkInfo));
-    m_networkHandler =  new InfoWidgetNetworkHandler();
-    
-    QVERIFY(verify());
-}
-
-
-/*!
-  UT_InfoWidgetNetworkHandler::cleanup
- */
-void UT_InfoWidgetNetworkHandler::cleanup()
-{
-    reset();
-    
-    delete m_networkHandler;
-    m_networkHandler = 0;
-}
-
-/*!
-  UT_InfoWidgetNetworkHandler::t_homeZoneTextTag
- */
-void UT_InfoWidgetNetworkHandler::t_homeZoneTextTag()
-{
-    QVERIFY(m_networkHandler->homeZoneTextTag() == KHomeZoneTextTag);
-}
-
-
-/*!
-  UT_InfoWidgetNetworkHandler::t_homeZoneIndicatorType
- */
-void UT_InfoWidgetNetworkHandler::t_homeZoneIndicatorType()
-{
-    QVERIFY(
-        m_networkHandler->homeZoneIndicatorType() == KHomeZoneIndicatorType);
-}
-
-
-/*!
-  UT_InfoWidgetNetworkHandler::t_mcnName
- */
-void UT_InfoWidgetNetworkHandler::t_mcnName()
-{
-    QVERIFY(m_networkHandler->mcnName() == KMcnName);
-}
-
-
-/*!
-  UT_InfoWidgetNetworkHandler::t_mcnIndicatorType
- */
-void UT_InfoWidgetNetworkHandler::t_mcnIndicatorType()
-{
-    QVERIFY(m_networkHandler->mcnIndicatorType() == KMcnIndicatorType);
-}
-
-
-/*!
-  UT_InfoWidgetNetworkHandler::t_HandleNetworkMessage
- */
-void UT_InfoWidgetNetworkHandler::t_HandleNetworkMessage()
-{
-    QSignalSpy spy(m_networkHandler, SIGNAL(networkDataChanged()));
-    
-    // TODO: investigate, which messages indicate cell info change
-// ACCEPTED MESSAGES    
-    m_networkHandler->HandleNetworkMessage(
-        MNWMessageObserver::ENWMessageCurrentCellInfoMessage);
-    
-// MESSAGES TO BE FILTERED OUT
-// COMMON NETWORK MESSAGES                      0 - 99
-    m_networkHandler->HandleNetworkMessage(
-        MNWMessageObserver::ENWMessageNetworkInfoChange);
-    m_networkHandler->HandleNetworkMessage(
-        MNWMessageObserver::ENWMessageNetworkModeChange);
-    m_networkHandler->HandleNetworkMessage(
-        MNWMessageObserver::ENWMessageNetworkRegistrationStatusChange);
-    m_networkHandler->HandleNetworkMessage(
-        MNWMessageObserver::ENWMessageProgrammableOperatorInfoChange);
-    m_networkHandler->HandleNetworkMessage(
-        MNWMessageObserver::ENWMessageNetworkProviderNameChange);
-    m_networkHandler->HandleNetworkMessage(
-        MNWMessageObserver::ENWMessageServiceProviderNameChange);
-    m_networkHandler->HandleNetworkMessage(
-        MNWMessageObserver::ENWMessageProgrammableOperatorInfoUpdating);
-    m_networkHandler->HandleNetworkMessage(
-        MNWMessageObserver::ENWMessageNetworkProviderNameUpdating);
-    m_networkHandler->HandleNetworkMessage(
-        MNWMessageObserver::ENWMessageServiceProviderNameUpdating);
-    m_networkHandler->HandleNetworkMessage(
-        MNWMessageObserver::ENWMessageAllowRefresh);
-    m_networkHandler->HandleNetworkMessage(
-        MNWMessageObserver::ENWMessageNetworkSelectionSettingChange);
-// GSM SPECIFIC MESSAGES                        100 - 199
-    m_networkHandler->HandleNetworkMessage(
-        MNWMessageObserver::ENWMessageNetworkCellReselection);
-    m_networkHandler->HandleNetworkMessage(
-        MNWMessageObserver::ENWMessageNetworkConnectionFailure);
-//    m_networkHandler->HandleNetworkMessage(
-//        MNWMessageObserver::ENWMessageCurrentCellInfoMessage);
-    m_networkHandler->HandleNetworkMessage(
-        MNWMessageObserver::ENWMessageCurrentHomeZoneMessage);
-    m_networkHandler->HandleNetworkMessage(
-        MNWMessageObserver::ENWMessageNetworkIndicatorChange);
-// CDMA SPECIFIC MESSAGES                       200 - 299
-    m_networkHandler->HandleNetworkMessage(
-        MNWMessageObserver::ENWMessageNetworkEmergencyMode); 
-    m_networkHandler->HandleNetworkMessage(
-        MNWMessageObserver::ENWMessageVoicePrivacyStatusChange);
-    m_networkHandler->HandleNetworkMessage(
-        MNWMessageObserver::ENWMessageStartSystemSearchRequestCompleteOk);
-    m_networkHandler->HandleNetworkMessage(
-        MNWMessageObserver::ENWMessageStartSystemSearchRequestCompleteFail);
-    m_networkHandler->HandleNetworkMessage(
-        MNWMessageObserver::ENWMessageStopProtocolStackRequestCompleteOk);
-    m_networkHandler->HandleNetworkMessage(
-        MNWMessageObserver::ENWMessageStopProtocolStackRequestCompleteFail);
-    
-    const int KExpectedNumOfSignalEmissions = 1;
-    QCOMPARE(spy.count(), KExpectedNumOfSignalEmissions);
-    
-    const QList<QVariant> &arguments = spy.at(0);
-    QCOMPARE(arguments.count(), 0);
-}
-
-
-/*!
-  UT_InfoWidgetNetworkHandler::t_HandleNetworkMessageExceptionWhileEmittingSignal
- */
-void UT_InfoWidgetNetworkHandler::t_HandleNetworkMessageExceptionWhileEmittingSignal()
-{
-    QObject::connect(
-        m_networkHandler, SIGNAL(networkDataChanged()),
-        this, SLOT(generateException())); 
-    
-    m_networkHandler->HandleNetworkMessage(
-        MNWMessageObserver::ENWMessageCurrentCellInfoMessage);
-}
-
-
-/*!
-  UT_InfoWidgetNetworkHandler::t_HandleNetworkError
- */
-Q_DECLARE_METATYPE(MNWMessageObserver::TNWOperation)
-void UT_InfoWidgetNetworkHandler::t_HandleNetworkError()
-{
-    QSignalSpy spy(m_networkHandler, SIGNAL(networkError(int, int)));
-    qRegisterMetaType<MNWMessageObserver::TNWOperation>
-        ("MNWMessageObserver::TNWOperation");
-    
-    MNWMessageObserver::TNWOperation operation = MNWMessageObserver::ENWNone;
-    const int errorCode = -4;
-    m_networkHandler->HandleNetworkError(operation, errorCode);
-    
-    const int KExpectedNumOfSignalEmissions = 1;
-    QCOMPARE(spy.count(), KExpectedNumOfSignalEmissions);
-    const QList<QVariant> &arguments = spy.at(0);
-    QCOMPARE(arguments.count(), 2);
-    
-    QCOMPARE(
-        qvariant_cast<MNWMessageObserver::TNWOperation>(arguments.at(0)), 
-        operation);
-    QCOMPARE(arguments.at(1).toInt(), errorCode);
-}
-
-
-/*!
-  UT_InfoWidgetNetworkHandler::t_HandleNetworkErrorExceptionWhileEmittingSignal
- */
-void UT_InfoWidgetNetworkHandler::t_HandleNetworkErrorExceptionWhileEmittingSignal()
-{
-    QObject::connect(
-        m_networkHandler, SIGNAL(networkError(int, int)),
-        this, SLOT(generateException())); 
-    
-    MNWMessageObserver::TNWOperation operation = MNWMessageObserver::ENWNone;
-    const int errorCode = -4;
-    m_networkHandler->HandleNetworkError(operation, errorCode);
-}
-
-
-/*!
-  UT_InfoWidgetNetworkHandler::initializeNetworkInfo
- */
-void UT_InfoWidgetNetworkHandler::initializeNetworkInfo(
-    MNWMessageObserver& /*aObserver*/, TNWInfo& aTNWInfo)
-{
-    aTNWInfo.iViagTextTag.Copy(KHomeZoneTextTag.utf16());
-    aTNWInfo.iViagIndicatorType = KHomeZoneIndicatorType;
-    
-    aTNWInfo.iMCNName.Copy(KMcnName.utf16());
-    aTNWInfo.iMCNIndicatorType = KMcnIndicatorType;
-}
-
-QTEST_MAIN_S60(UT_InfoWidgetNetworkHandler)
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/tsrc/ut_infowidgetnetworkhandler/ut_infowidgetnetworkhandler.pro
--- a/phoneplugins/infowidgetprovider/tsrc/ut_infowidgetnetworkhandler/ut_infowidgetnetworkhandler.pro	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-# 
-# Description: Project file for building unit test component
-#
-#
-
-CONFIG += qtestlib hb
-TEMPLATE = app
-TARGET = 
-DEPENDPATH  += . ../../infowidget/src
-INCLUDEPATH += .
-INCLUDEPATH += ../common
-INCLUDEPATH += ../../inc/
-INCLUDEPATH += ../../infowidget/inc/
-
-QT -= gui
-QT += testlib
-
-symbian: {
-  CONFIG += no_icon
-  INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
-  LIBS += -lmocklib 		\
-          -lsymbianmock 	\
-          -lcpframework
-}
-    
-# test code
-HEADERS += ./inc/ut_infowidgetnetworkhandler.h
-SOURCES += ./src/ut_infowidgetnetworkhandler.cpp
-
-# code to be tested
-HEADERS += ../../infowidget/inc/infowidgetnetworkhandler.h
-SOURCES += ../../infowidget/src/infowidgetnetworkhandler.cpp
-
-# mocks needed for testing
-SOURCES += ../mocks/mock_networkhandlingproxy.cpp
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/tsrc/ut_infowidgetpreferences/inc/ut_infowidgetpreferences.h
--- a/phoneplugins/infowidgetprovider/tsrc/ut_infowidgetpreferences/inc/ut_infowidgetpreferences.h	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef UT_INFOWIDGETPREFERENCES_H
-#define UT_INFOWIDGETPREFERENCES_H
-
-#include <QtTest/QtTest>
-#include <mockservice.h>
-
-class InfoWidgetPreferences;
-
-class UT_InfoWidgetPreferences : public QObject, public MockService
-{
-    Q_OBJECT
-
-public:    
-    
-    UT_InfoWidgetPreferences();
-    ~UT_InfoWidgetPreferences();
-    
-private slots:
-
-    void init();
-    void cleanup();
-
-    void t_loadPreferences();
-    void t_storePreferences();
-    void t_preference();
-    void t_setPreference();
-    
-private:
-    
-    InfoWidgetPreferences *m_infoWidgetPreferences;
-
-};
-
-#endif // UT_INFOWIDGETPREFERENCES_H
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/tsrc/ut_infowidgetpreferences/src/ut_infowidgetpreferences.cpp
--- a/phoneplugins/infowidgetprovider/tsrc/ut_infowidgetpreferences/src/ut_infowidgetpreferences.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-#include "ut_infowidgetpreferences.h"
-#include "infowidgetpreferences.h"
-#include "qtestmains60.h"
-
-/*!
-  UT_InfoWidgetPreferences::UT_InfoWidgetPreferences
- */
-UT_InfoWidgetPreferences::UT_InfoWidgetPreferences() 
-    : 
-    m_infoWidgetPreferences(0)
-{
-    
-}
-
-
-/*!
-  UT_InfoWidgetPreferences::~UT_InfoWidgetPreferences
- */
-UT_InfoWidgetPreferences::~UT_InfoWidgetPreferences()
-{
-    delete m_infoWidgetPreferences;
-}
-
-
-/*!
-  UT_InfoWidgetPreferences::init
- */
-void UT_InfoWidgetPreferences::init()
-{
-    initialize();
-    
-    m_infoWidgetPreferences = new InfoWidgetPreferences();
-    
-    QVERIFY(verify());
-}
-
-
-/*!
-  UT_InfoWidgetPreferences::cleanup
- */
-void UT_InfoWidgetPreferences::cleanup()
-{
-    reset();
-    
-    delete m_infoWidgetPreferences;
-    m_infoWidgetPreferences = 0;
-}
-
-
-/*!
-  UT_InfoWidgetPreferences::t_loadPreferences
- */
-void UT_InfoWidgetPreferences::t_loadPreferences()
-{
-    m_infoWidgetPreferences->loadPreferences();
-}
-
-
-/*!
-  UT_InfoWidgetPreferences::t_storePreferences
- */
-void UT_InfoWidgetPreferences::t_storePreferences()
-{
-    m_infoWidgetPreferences->storePreferences();
-}
-
-
-/*!
-  UT_InfoWidgetPreferences::t_preference
- */
-void UT_InfoWidgetPreferences::t_preference()
-{
-    QString preferenceValue = m_infoWidgetPreferences->preference(
-        InfoWidgetPreferences::DisplayHomeZone);
-    QVERIFY(DISPLAY_SETTING_OFF == preferenceValue);
-    
-    preferenceValue = m_infoWidgetPreferences->preference(
-        InfoWidgetPreferences::DisplayMcn);
-    QVERIFY(DISPLAY_SETTING_OFF == preferenceValue);
-    
-    preferenceValue = m_infoWidgetPreferences->preference(
-        InfoWidgetPreferences::DisplayActiveLine);
-    QVERIFY(DISPLAY_SETTING_OFF == preferenceValue);
-    
-    preferenceValue = m_infoWidgetPreferences->preference(
-        InfoWidgetPreferences::DisplaySatText);
-    QVERIFY(DISPLAY_SETTING_OFF == preferenceValue);
-}
-
-
-/*!
-  UT_InfoWidgetPreferences::t_setPreference
- */
-void UT_InfoWidgetPreferences::t_setPreference()
-{
-    m_infoWidgetPreferences->setPreference(
-        InfoWidgetPreferences::DisplayHomeZone, DISPLAY_SETTING_ON);
-    QVERIFY(DISPLAY_SETTING_ON == m_infoWidgetPreferences->preference(
-        InfoWidgetPreferences::DisplayHomeZone));
-    
-    m_infoWidgetPreferences->setPreference(
-        InfoWidgetPreferences::DisplayMcn, DISPLAY_SETTING_ON);
-    QVERIFY(DISPLAY_SETTING_ON == m_infoWidgetPreferences->preference(
-        InfoWidgetPreferences::DisplayMcn));
-    
-    m_infoWidgetPreferences->setPreference(
-        InfoWidgetPreferences::DisplayActiveLine, DISPLAY_SETTING_ON);
-    QVERIFY(DISPLAY_SETTING_ON == m_infoWidgetPreferences->preference(
-        InfoWidgetPreferences::DisplayActiveLine));
-    
-    m_infoWidgetPreferences->setPreference(
-        InfoWidgetPreferences::DisplaySatText, DISPLAY_SETTING_ON);
-    QVERIFY(DISPLAY_SETTING_ON == m_infoWidgetPreferences->preference(
-        InfoWidgetPreferences::DisplaySatText));
-}
-
-QTEST_MAIN_S60(UT_InfoWidgetPreferences)
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/tsrc/ut_infowidgetpreferences/ut_infowidgetpreferences.pro
--- a/phoneplugins/infowidgetprovider/tsrc/ut_infowidgetpreferences/ut_infowidgetpreferences.pro	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-# 
-# Description: Project file for building unit test component
-#
-#
-
-CONFIG += qtestlib hb
-TEMPLATE = app
-TARGET = 
-DEPENDPATH  += . ../../infowidget/src ../../infowidget/inc
-INCLUDEPATH += .
-INCLUDEPATH += ../common
-INCLUDEPATH += ../../inc/
-INCLUDEPATH += ../../infowidget/inc/
-DEFINES += XQSETTINGSMANAGER_NO_LIBRARY
-DEFINES += QT_NO_DEBUG_STREAM
-
-QT -= gui
-QT += testlib
-
-symbian: {
-  CONFIG += no_icon
-  INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
-  LIBS += -lmocklib 		\
-          -lsymbianmock 	\
-          -lcpframework
-}
-    
-# test code
-HEADERS += ./inc/ut_infowidgetpreferences.h
-SOURCES += ./src/ut_infowidgetpreferences.cpp
-
-# code to be tested
-HEADERS += ../../infowidget/inc/infowidgetpreferences.h
-SOURCES += ../../infowidget/src/infowidgetpreferences.cpp
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/tsrc/ut_infowidgetprovider/inc/ut_infowidgetprovider.h
--- a/phoneplugins/infowidgetprovider/tsrc/ut_infowidgetprovider/inc/ut_infowidgetprovider.h	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef UT_INFOWIDGET_H
-#define UT_INFOWIDGET_H
-
-#include <QtTest/QtTest>
-#include <mockservice.h>
-
-class InfoWidgetProvider;
-
-class UT_InfoWidgetProvider : public QObject, public MockService
-{
-    Q_OBJECT
-
-public:    
-    
-    UT_InfoWidgetProvider();
-    ~UT_InfoWidgetProvider();
-    
-private slots:
-
-    void init();
-    void cleanup();
-    
-    void t_widgets();
-    void t_createWidget();
-    void t_createWidgetUnknownUri();
-
-private:
-    
-    InfoWidgetProvider *m_infoWidgetProvider;
-
-};
-
-#endif // UT_INFOWIDGET_H
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/tsrc/ut_infowidgetprovider/src/ut_infowidgetprovider.cpp
--- a/phoneplugins/infowidgetprovider/tsrc/ut_infowidgetprovider/src/ut_infowidgetprovider.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-#include "ut_infowidgetprovider.h"
-#include "infowidgetprovider.h"
-#include "qtestmains60.h"
-
-/*!
-  UT_InfoWidgetProvider::UT_InfoWidgetProvider
- */
-UT_InfoWidgetProvider::UT_InfoWidgetProvider() 
-    : 
-    m_infoWidgetProvider(0)
-{
-    
-}
-
-
-/*!
-  UT_InfoWidgetProvider::~UT_InfoWidgetProvider
- */
-UT_InfoWidgetProvider::~UT_InfoWidgetProvider()
-{
-    delete m_infoWidgetProvider;
-}
-
-
-/*!
-  UT_InfoWidgetProvider::init
- */
-void UT_InfoWidgetProvider::init()
-{
-    initialize();
-    
-    m_infoWidgetProvider = new InfoWidgetProvider();
-    
-    QVERIFY(verify());
-}
-
-
-/*!
-  UT_InfoWidgetProvider::cleanup
- */
-void UT_InfoWidgetProvider::cleanup()
-{
-    reset();
-    
-    delete m_infoWidgetProvider;
-    m_infoWidgetProvider = 0;
-}
-
-
-/*!
-  UT_InfoWidgetProvider::t_widgets
- */
-void UT_InfoWidgetProvider::t_widgets()
-{
-    QList<HsWidgetToken> widgets = m_infoWidgetProvider->widgets();
-    QVERIFY(widgets.count() == 1);
-    
-    const HsWidgetToken &widgetToken = widgets.at(0); 
-    QVERIFY(widgetToken.mLibrary == QString("infowidgetprovider.dll"));
-    QVERIFY(widgetToken.mUri == QString("infouri"));
-    QVERIFY(widgetToken.mTitle == QString("Info"));
-    QVERIFY(widgetToken.mIconUri == QString("info.png"));
-    QVERIFY(widgetToken.mDescription.isEmpty());
-    QVERIFY(widgetToken.mUserData.isNull());
-    QVERIFY(widgetToken.mPreferences.isEmpty());
-}
-
-
-/*!
-  UT_InfoWidgetProvider::t_createWidget
- */
-void UT_InfoWidgetProvider::t_createWidget()
-{
-    HsWidgetToken token;
-    token.mUri = QString("infouri");
-    QScopedPointer<HsWidget> widget(m_infoWidgetProvider->createWidget(token));
-    QVERIFY(0 != widget.data());
-}
-
-
-/*!
-  UT_InfoWidgetProvider::t_createWidgetUnknownUri
- */
-void UT_InfoWidgetProvider::t_createWidgetUnknownUri()
-{
-    HsWidgetToken token;
-    token.mUri = QString("invaliduri");
-    QScopedPointer<HsWidget> widget(m_infoWidgetProvider->createWidget(token));
-    QVERIFY(0 == widget.data());
-}
-
-QTEST_MAIN_S60(UT_InfoWidgetProvider)
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneplugins/infowidgetprovider/tsrc/ut_infowidgetprovider/ut_infowidgetprovider.pro
--- a/phoneplugins/infowidgetprovider/tsrc/ut_infowidgetprovider/ut_infowidgetprovider.pro	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-# 
-# Description: Project file for building unit test component
-#
-#
-
-CONFIG += qtestlib hb
-TEMPLATE = app
-TARGET = 
-INCLUDEPATH += .
-INCLUDEPATH += ../common
-INCLUDEPATH += ../../inc/
-INCLUDEPATH += ../../infowidget/inc/
-DEFINES += QT_NO_DEBUG_STREAM
-
-QT -= gui
-QT += testlib
-
-symbian: {
-  CONFIG += no_icon
-  INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
-  LIBS += -lmocklib 		\
-          -lsymbianmock     \
-          -lhswidgetmodel
-}
-
-# test code
-HEADERS += ./inc/ut_infowidgetprovider.h
-SOURCES += ./src/ut_infowidgetprovider.cpp
-
-# code to be tested
-HEADERS += ../../inc/infowidgetprovider.h
-SOURCES += ../../src/infowidgetprovider.cpp
-
-# mocks needed for testing
-HEADERS += ../../infowidget/inc/infowidget.h
-SOURCES += ../mocks/mock_infowidget.cpp
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/barringplugin/barringplugin.pro
--- a/phonesettings/cpphonesettingsplugins/barringplugin/barringplugin.pro	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/barringplugin/barringplugin.pro	Fri Apr 16 14:58:25 2010 +0300
@@ -29,6 +29,7 @@
 TRANSLATIONS = telephone_cp.ts
 
 LIBS += -lcpframework \
+        -lpsetwrapper \
         -lcptelephonyutils
 
 # Input
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/barringplugin/inc/cpbarringplugin.h
--- a/phonesettings/cpphonesettingsplugins/barringplugin/inc/cpbarringplugin.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/barringplugin/inc/cpbarringplugin.h	Fri Apr 16 14:58:25 2010 +0300
@@ -17,16 +17,16 @@
 #ifndef CPBARRINGPLUGIN_H
 #define CPBARRINGPLUGIN_H
 
-#include <cppluginplatinterface.h>
+#include <cpplugininterface.h>
 
 /*!
     \class CpBarringPlugin 
     \brief The class CpBarringPlugin implements call barring functionality. 
  */
-class CpBarringPlugin : public QObject, public CpPluginPlatInterface
+class CpBarringPlugin : public QObject, public CpPluginInterface
 {
     Q_OBJECT
-    Q_INTERFACES(CpPluginPlatInterface)
+    Q_INTERFACES(CpPluginInterface)
 
 public:
 
@@ -34,11 +34,12 @@
     
     ~CpBarringPlugin();
     
-    /*!
-     From CpPluginPlatInterface.
-     @see CpPluginPlatInterface.
+    /**
+     * From CpPluginInterface
+     * @see CpPluginInterface.
      */
-    CpSettingFormItemData *createSettingFormItemData(CpItemDataHelper &itemDataHelper) const;
+    QList<CpSettingFormItemData*> createSettingFormItemData(
+             CpItemDataHelper &itemDataHelper) const;
 };
 
 #endif // CPBARRINGPLUGIN
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/barringplugin/inc/cpbarringplugingroup.h
--- a/phonesettings/cpphonesettingsplugins/barringplugin/inc/cpbarringplugingroup.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/barringplugin/inc/cpbarringplugingroup.h	Fri Apr 16 14:58:25 2010 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
  * All rights reserved.
  * This component and the accompanying materials are made available
  * under the terms of "Eclipse Public License v1.0"
@@ -17,10 +17,13 @@
 #ifndef CPBARRINGPLUGINGROUP_H
 #define CPBARRINGPLUGINGROUP_H
 
+#include <QQueue>
 #include <cpsettingformitemdata.h>
-#include "cptelephonyutilsdefs.h"
+#include <psetcallbarringwrapper.h>
 
-using namespace CpTelephonyUtils;
+class PSetWrapper;
+class QModelIndex;
+class CpPhoneNotes;
 
 /*!
     \class CpBarringPluginGroup
@@ -33,12 +36,61 @@
 public:
 
     explicit CpBarringPluginGroup(CpItemDataHelper &helper);
+    ~CpBarringPluginGroup();
+
+public slots:
     
-    ~CpBarringPluginGroup();
+    void itemShown(const QModelIndex& item);
+    
+private:
+    
+    void setupLocalization();
+    void connectToWrapper();
+    
+    void createAllOutgoingBarringItem();
+    void createOutgoingInternationalBarringItem();
+    void createOutgoingInternationalExceptToHomeCountryBarringItem();
+    void createAllIncomingBarringItem();
+    void createIncomingWhenRoamingBarringItem();
+    
+    void processBarringStatusRequestQueue();
+    void revertCheckStateForItem(CpSettingFormItemData *barringItem);
+
+private slots:
+
+    void barringStatusRequestCompleted(
+        int result,
+        const QList<unsigned char> & basicServiceGroupIds,
+        PSetCallBarringWrapper::BarringStatus status);
+    
+    void enableBarringRequestCompleted(
+        int result,
+        PSetCallBarringWrapper::BarringType barringType,
+        PSetCallBarringWrapper::BarringStatus barringStatus, 
+        bool plural);
+
+    void disableBarringRequestCompleted(
+        int result,
+        PSetCallBarringWrapper::BarringType barringType,
+        PSetCallBarringWrapper::BarringStatus barringStatus, 
+        bool plural);
+    
+    void changeBarringStateRequested(int checkState);
     
 private: 
     
     CpItemDataHelper &m_helper;
+    PSetWrapper *m_pSetWrapper;
+    PSetCallBarringWrapper *m_barringWrapper;
+    CpSettingFormItemData *m_allOutgoingBarringItem;
+    CpSettingFormItemData *m_outgoingInternationalBarringItem;
+    CpSettingFormItemData *m_outgoingInternationalExceptToHomeCountryBarringItem;
+    CpSettingFormItemData *m_allIncomingBarringItem;
+    CpSettingFormItemData *m_incomingWhenRoamingBarringItem;
+    QQueue<CpSettingFormItemData *> m_barringRequestQueue;
+    bool m_barringStatusRequestOngoing;
+    int m_activeNoteId;
+    CpPhoneNotes* m_phoneNotes;
 };
 
 #endif // CPBARRINGPLUGINGROUP_H
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/barringplugin/src/cpbarringplugin.cpp
--- a/phonesettings/cpphonesettingsplugins/barringplugin/src/cpbarringplugin.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/barringplugin/src/cpbarringplugin.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
  * All rights reserved.
  * This component and the accompanying materials are made available
  * under the terms of "Eclipse Public License v1.0"
@@ -44,10 +44,13 @@
 /*!
     CpBarringPlugin::createSettingFormItemData.
  */
-CpSettingFormItemData *CpBarringPlugin::createSettingFormItemData(CpItemDataHelper &itemDataHelper) const
+QList<CpSettingFormItemData*> CpBarringPlugin::createSettingFormItemData(
+        CpItemDataHelper &itemDataHelper) const
 {
     DPRINT;
-    return new CpBarringPluginGroup(itemDataHelper);
+    QList<CpSettingFormItemData*> ret;
+    ret.append(new CpBarringPluginGroup(itemDataHelper));
+    return ret;
 }
 
 Q_EXPORT_PLUGIN2(CpBarringPlugin, CpBarringPlugin);
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/barringplugin/src/cpbarringplugingroup.cpp
--- a/phonesettings/cpphonesettingsplugins/barringplugin/src/cpbarringplugingroup.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/barringplugin/src/cpbarringplugingroup.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
  * All rights reserved.
  * This component and the accompanying materials are made available
  * under the terms of "Eclipse Public License v1.0"
@@ -15,47 +15,500 @@
  *
  */
 
+#include <hbdataformmodel.h>
 #include <hbdataformmodelitem.h>
+#include <HbCheckBox>
 #include <QTranslator>
 #include <QLocale>
 #include <QApplication>
+#include <QTimer>
 #include <cpitemdatahelper.h>
+#include <psetwrapper.h>
+#include <psetcallbarringwrapper.h>
 #include "cpbarringplugingroup.h"
 #include "cpplugincommon.h"
 #include "cpphonenotes.h"
 #include "cppluginlogging.h"
 
+Q_DECLARE_METATYPE(PSetCallBarringWrapper::BarringType)
+
+// TODO: use logical identifiers for texts
+// TODO: barring password implementation
+
 /*!
   CpBarringPluginGroup::CpBarringPluginGroup.
  */
 CpBarringPluginGroup::CpBarringPluginGroup(CpItemDataHelper &helper)
-     :CpSettingFormItemData(HbDataFormModelItem::GroupItem, hbTrId("Call barring"),0),
-       m_helper(helper)
+    :
+    CpSettingFormItemData(
+        HbDataFormModelItem::GroupItem, hbTrId("Call barring"), 0),
+    m_helper(helper),
+    m_pSetWrapper(0),
+    m_barringWrapper(0),
+    m_allOutgoingBarringItem(0),
+    m_outgoingInternationalBarringItem(0),
+    m_outgoingInternationalExceptToHomeCountryBarringItem(0),
+    m_allIncomingBarringItem(0),
+    m_incomingWhenRoamingBarringItem(0),
+    m_barringStatusRequestOngoing(false),
+    m_activeNoteId(0),
+    m_phoneNotes(NULL)
 {
     DPRINT << ": IN";
     
-    // Localization file loading
-    QTranslator translator; 
-    QString lang = QLocale::system().name();
-    QString path = "z:/resource/qt/translations/";
-    DPRINT << ": loading translation: " << QString(path + "telephone_cp_" + lang);
-    bool translatorLoaded = translator.load(path + "telephone_cp_" + lang);
-    DPRINT << ": translator loaded: " << translatorLoaded; 
-    if (translatorLoaded) {
-        qApp->installTranslator(&translator);
-        DPRINT << ": translator installed"; 
-    }
+    // Registration needed, because BarringType is used as a custom meta 
+    // information for barring items.
+    qRegisterMetaType<PSetCallBarringWrapper::BarringType>(
+        "PSetCallBarringWrapper::BarringType");
+    
+    setupLocalization();
+    
+    m_pSetWrapper = new PSetWrapper(this); 
+    m_barringWrapper = &m_pSetWrapper->callBarringWrapper(); 
+    connectToWrapper();
+    
+    // itemShown signal is used to trigger barring status query process 
+    helper.connectToForm(
+        SIGNAL(itemShown(QModelIndex)), 
+        this, SLOT(itemShown(QModelIndex)));
+    
+    createAllOutgoingBarringItem();
+    createOutgoingInternationalBarringItem();
+    createOutgoingInternationalExceptToHomeCountryBarringItem();
+    createAllIncomingBarringItem();
+    createIncomingWhenRoamingBarringItem();
+    
+    m_phoneNotes = CpPhoneNotes::instance();
     
     DPRINT << ": OUT";
 }
 
+
 /*!
   CpBarringPluginGroup::~CpBarringPluginGroup.
  */
 CpBarringPluginGroup::~CpBarringPluginGroup()
 {
     DPRINT << ": IN";
+    
     DPRINT << ": OUT";
 }
 
+
+/*!
+  CpBarringPluginGroup::itemShown.
+ */
+void CpBarringPluginGroup::itemShown(const QModelIndex& item)
+{
+    DPRINT << ": IN";
+    
+    CpSettingFormItemData* formItem = 
+        static_cast<CpSettingFormItemData*>(
+            qobject_cast<HbDataFormModel*>(model())->itemFromIndex(item));
+    
+    if (formItem->contentWidgetData("checkState").isValid()) {
+        // Initial status for the barring item is already queried. Do not 
+        // start querying again if user does close/open for the barring group.
+        return;
+    }
+    
+    // start barring status query
+    m_barringRequestQueue.enqueue(formItem);
+    processBarringStatusRequestQueue();
+}
+
+
+/*!
+  CpBarringPluginGroup::setupLocalization.
+ */
+void CpBarringPluginGroup::setupLocalization()
+{
+    DPRINT << ": IN";
+    
+    QTranslator translator; 
+    QString lang = QLocale::system().name();
+    QString path = "z:/resource/qt/translations/";
+    QString fullName = path + "telephone_cp_" + lang;
+    
+    DPRINT << ": loading translation:" << fullName;
+    bool translatorLoaded = translator.load(fullName);
+    DPRINT << ": translator loaded: " << translatorLoaded; 
+    
+    if (translatorLoaded) {
+        qApp->installTranslator(&translator);
+        DPRINT << ": translator installed"; 
+    }
+}
+
+
+/*!
+  CpBarringPluginGroup::connectToWrapper.
+ */
+void CpBarringPluginGroup::connectToWrapper()
+{
+    DPRINT << ": IN";
+    
+    QObject::connect(
+        m_barringWrapper, 
+        SIGNAL(barringStatusRequestCompleted(
+            int,
+            const QList<unsigned char> &, 
+            PSetCallBarringWrapper::BarringStatus)
+        ),
+        this, 
+        SLOT(barringStatusRequestCompleted(
+            int,
+            const QList<unsigned char> &, 
+            PSetCallBarringWrapper::BarringStatus)
+        )
+    );
+    
+    QObject::connect(
+        m_barringWrapper, 
+        SIGNAL(enableBarringRequestCompleted(
+            int,
+            PSetCallBarringWrapper::BarringType,
+            PSetCallBarringWrapper::BarringStatus,
+            bool)
+        ),
+        this, 
+        SLOT(enableBarringRequestCompleted(
+            int,
+            PSetCallBarringWrapper::BarringType,
+            PSetCallBarringWrapper::BarringStatus,
+            bool)
+        )
+    );
+    
+    QObject::connect(
+        m_barringWrapper, 
+        SIGNAL(disableBarringRequestCompleted(
+            int,
+            PSetCallBarringWrapper::BarringType,
+            PSetCallBarringWrapper::BarringStatus,
+            bool)
+        ),
+        this, 
+        SLOT(disableBarringRequestCompleted(
+            int,
+            PSetCallBarringWrapper::BarringType,
+            PSetCallBarringWrapper::BarringStatus,
+            bool)
+        )
+    );
+}
+
+
+/*!
+  CpBarringPluginGroup::createAllOutgoingBarringItem.
+ */
+void CpBarringPluginGroup::createAllOutgoingBarringItem()
+{
+    DPRINT << ": IN";
+    
+    m_allOutgoingBarringItem = new CpSettingFormItemData(
+        HbDataFormModelItem::CheckBoxItem, hbTrId(""), this);
+    
+    m_allOutgoingBarringItem->setContentWidgetData(
+        "text", QVariant(hbTrId("Outgoing calls")));
+    
+    QVariant value;
+    value.setValue(PSetCallBarringWrapper::BarringTypeAllOutgoing);
+    m_allOutgoingBarringItem->setProperty("barringType", value);
+    
+    appendChild(m_allOutgoingBarringItem);
+}
+
+
+/*!
+  CpBarringPluginGroup::createOutgoingInternationalBarringItem.
+ */
+void CpBarringPluginGroup::createOutgoingInternationalBarringItem()
+{
+    DPRINT << ": IN";
+    
+    m_outgoingInternationalBarringItem = new CpSettingFormItemData(
+        HbDataFormModelItem::CheckBoxItem, hbTrId(""), this);
+    
+    m_outgoingInternationalBarringItem->setContentWidgetData(
+        "text", QVariant(hbTrId("International calls")));
+    
+    QVariant value;
+    value.setValue(PSetCallBarringWrapper::BarringTypeOutgoingInternational);
+    m_outgoingInternationalBarringItem->setProperty("barringType", value);
+    
+    appendChild(m_outgoingInternationalBarringItem);
+}
+
+
+/*!
+  CpBarringPluginGroup::
+      createOutgoingInternationalExceptToHomeCountryBarringItem.
+ */
+void CpBarringPluginGroup::
+    createOutgoingInternationalExceptToHomeCountryBarringItem()
+{
+    DPRINT << ": IN";
+    
+    m_outgoingInternationalExceptToHomeCountryBarringItem = 
+        new CpSettingFormItemData(
+            HbDataFormModelItem::CheckBoxItem, hbTrId(""), this);
+    
+    m_outgoingInternationalExceptToHomeCountryBarringItem->setContentWidgetData(
+        "text", QVariant(hbTrId("International calls except to home country")));
+    
+    QVariant value;
+    value.setValue(PSetCallBarringWrapper::BarringTypeOutgoingInternationalExceptToHomeCountry);
+    m_outgoingInternationalExceptToHomeCountryBarringItem->setProperty(
+        "barringType", value);
+    
+    appendChild(m_outgoingInternationalExceptToHomeCountryBarringItem);
+    
+}
+
+
+/*!
+  CpBarringPluginGroup::createAllIncomingBarringItem.
+ */
+void CpBarringPluginGroup::createAllIncomingBarringItem()
+{
+    DPRINT << ": IN";
+    
+    m_allIncomingBarringItem = new CpSettingFormItemData(
+        HbDataFormModelItem::CheckBoxItem, hbTrId(""), this);
+    
+    m_allIncomingBarringItem->setContentWidgetData(
+        "text", QVariant(hbTrId("Incoming calls")));
+    
+    QVariant value;
+    value.setValue(PSetCallBarringWrapper::BarringTypeAllIncoming);
+    m_allIncomingBarringItem->setProperty("barringType", value);
+    
+    appendChild(m_allIncomingBarringItem);
+}
+
+
+/*!
+  CpBarringPluginGroup::createIncomingWhenRoamingBarringItem.
+ */
+void CpBarringPluginGroup::createIncomingWhenRoamingBarringItem()
+{
+    DPRINT << ": IN";
+    
+    m_incomingWhenRoamingBarringItem = new CpSettingFormItemData(
+        HbDataFormModelItem::CheckBoxItem, hbTrId(""), this);
+    
+    m_incomingWhenRoamingBarringItem->setContentWidgetData(
+        "text", QVariant(hbTrId("Incoming calls when abroad")));
+    
+    QVariant value;
+    value.setValue(PSetCallBarringWrapper::BarringTypeIncomingWhenRoaming);
+    m_incomingWhenRoamingBarringItem->setProperty("barringType", value);
+    
+    appendChild(m_incomingWhenRoamingBarringItem);
+}
+
+
+/*!
+  CpBarringPluginGroup::barringStatusRequestCompleted.
+ */
+void CpBarringPluginGroup::barringStatusRequestCompleted(
+    int result,
+    const QList<unsigned char> & basicServiceGroupIds,
+    PSetCallBarringWrapper::BarringStatus status)
+{
+    DPRINT << ": IN";
+    Q_UNUSED(result)
+    Q_UNUSED(basicServiceGroupIds)
+    
+    m_barringStatusRequestOngoing = false;
+    
+    if (PSetCallBarringWrapper::BarringErrorNone != result) {
+        // Stop status query process for this time. Statuses are tried to 
+        // query again for uncompleted items when user expands/opens barring 
+        // view again.
+        m_phoneNotes->cancelNote(m_activeNoteId);
+        m_phoneNotes->showGlobalErrorNote(m_activeNoteId, result);
+        m_barringRequestQueue.clear();
+        return;
+    }
+    
+    // Update check state to correct value. After setting valid value here
+    // status query will not be started again for the item when user collapses
+    // and expands view again.
+    Qt::CheckState checkState = 
+        (PSetCallBarringWrapper::BarringStatusActive == status) 
+            ? Qt::Checked 
+            : Qt::Unchecked;
+    CpSettingFormItemData *itemForCompletedRequest = 
+        m_barringRequestQueue.dequeue();
+    itemForCompletedRequest->setContentWidgetData(
+        "checkState", QVariant(checkState));
+    
+    // start to observe user initiated state changes
+    m_helper.addConnection(
+        itemForCompletedRequest, SIGNAL(stateChanged(int)),
+        this, SLOT(changeBarringStateRequested(int)));
+    
+    if (m_barringRequestQueue.isEmpty()) {
+        m_phoneNotes->cancelNote(m_activeNoteId);
+    } else {
+        processBarringStatusRequestQueue();
+    }
+}
+
+
+/*!
+  CpBarringPluginGroup::enableBarringRequestCompleted.
+ */
+void CpBarringPluginGroup::enableBarringRequestCompleted(
+    int result,
+    PSetCallBarringWrapper::BarringType barringType,
+    PSetCallBarringWrapper::BarringStatus barringStatus, 
+    bool plural)
+{
+    DPRINT << ": IN";
+    Q_UNUSED(barringType)
+    Q_UNUSED(barringStatus)
+    Q_UNUSED(plural)
+    
+    m_phoneNotes->cancelNote(m_activeNoteId);
+    
+    CpSettingFormItemData *barringItem = m_barringRequestQueue.dequeue();
+    if (PSetCallBarringWrapper::BarringErrorNone == result) {
+        m_phoneNotes->showGlobalNote(
+            m_activeNoteId, 
+            hbTrId("Barring activated"),
+            HbMessageBox::MessageTypeInformation);
+    } else {
+        revertCheckStateForItem(barringItem);
+        
+        m_phoneNotes->showGlobalErrorNote(m_activeNoteId, result);
+    }
+}
+
+
+/*!
+  CpBarringPluginGroup::disableBarringRequestCompleted.
+ */
+void CpBarringPluginGroup::disableBarringRequestCompleted(
+    int result,
+    PSetCallBarringWrapper::BarringType barringType,
+    PSetCallBarringWrapper::BarringStatus barringStatus, 
+    bool plural)
+{
+    DPRINT << ": IN";
+    Q_UNUSED(barringType)
+    Q_UNUSED(barringStatus)
+    Q_UNUSED(plural)
+    
+    m_phoneNotes->cancelNote(m_activeNoteId);
+    
+    CpSettingFormItemData *barringItem = m_barringRequestQueue.dequeue();
+    if (PSetCallBarringWrapper::BarringErrorNone == result) {
+        m_phoneNotes->showGlobalNote(
+            m_activeNoteId, 
+            hbTrId("Barring cancelled"),
+            HbMessageBox::MessageTypeInformation);
+    } else {
+        revertCheckStateForItem(barringItem);
+        
+        m_phoneNotes->showGlobalErrorNote(m_activeNoteId, result);
+    }
+}
+
+
+/*!
+  CpBarringPluginGroup::processBarringStatusRequestQueue.
+ */
+void CpBarringPluginGroup::processBarringStatusRequestQueue()
+{
+    DPRINT << ": IN";
+
+    if ((m_barringStatusRequestOngoing == false) && 
+        (!m_barringRequestQueue.isEmpty())) {
+        
+        CpSettingFormItemData *item = m_barringRequestQueue.head();
+        PSetCallBarringWrapper::BarringType barringType =
+            qvariant_cast<PSetCallBarringWrapper::BarringType>(
+                item->property("barringType"));
+        m_barringWrapper->barringStatus(ServiceGroupVoice, barringType);
+        
+        m_barringStatusRequestOngoing = true;
+        
+        if (0 == m_activeNoteId) {
+            // Status request note is very first note to show. Launch progress
+            // note only once for status update.
+            m_phoneNotes->showGlobalProgressNote(
+                m_activeNoteId, hbTrId("Requesting..."));
+        }
+    }
+}
+
+
+/*!
+  CpBarringPluginGroup::revertCheckStateForItem.
+ */
+void CpBarringPluginGroup::revertCheckStateForItem(
+    CpSettingFormItemData *barringItem)
+{
+    m_helper.removeConnection(
+        barringItem, SIGNAL(stateChanged(int)),
+        this, SLOT(changeBarringStateRequested(int)));
+    
+    HbDataFormModel *formModel = qobject_cast<HbDataFormModel*>(model());
+    QModelIndex modelIndex = formModel->indexFromItem(barringItem);
+    HbCheckBox *checkBox = static_cast<HbCheckBox*>(
+        m_helper.widgetFromModelIndex(modelIndex));
+    Qt::CheckState revertedCheckState = 
+        (checkBox->checkState() == Qt::Checked) ? Qt::Unchecked : Qt::Checked;
+    checkBox->setCheckState(revertedCheckState);
+    
+    m_helper.addConnection(
+        barringItem, SIGNAL(stateChanged(int)),
+        this, SLOT(changeBarringStateRequested(int)));
+}
+
+
+/*!
+  CpBarringPluginGroup::changeBarringStateRequested.
+ */
+void CpBarringPluginGroup::changeBarringStateRequested(int checkState)
+{
+    QObject *signalSender = sender();
+    
+    // find form item for which user has requested barring status change
+    HbDataFormModel *formModel = qobject_cast<HbDataFormModel*>(model());
+    CpSettingFormItemData* barringItem = NULL;
+    int numOfChilds = childCount();
+    for (int i = 0; (i < numOfChilds) && (barringItem == NULL); i++) {
+        HbDataFormModelItem* itemCandidate = childAt(i);
+        QModelIndex modelIndex = formModel->indexFromItem(itemCandidate);
+        if (signalSender == m_helper.widgetFromModelIndex(modelIndex)) {
+            barringItem = static_cast<CpSettingFormItemData*>(itemCandidate);
+        }
+    }
+    
+    // TODO: remove hardcoded password when setting of password is implemented
+    if (NULL != barringItem) {
+        if (Qt::Checked == checkState) {
+            m_barringWrapper->enableBarring(
+                ServiceGroupVoice,
+                qvariant_cast<PSetCallBarringWrapper::BarringType>(
+                    barringItem->property("barringType")), 
+                QString("1234"));
+        } else {
+            m_barringWrapper->disableBarring(
+                ServiceGroupVoice,
+                qvariant_cast<PSetCallBarringWrapper::BarringType>(
+                    barringItem->property("barringType")), 
+                QString("1234"));
+        }
+        
+        m_barringRequestQueue.enqueue(barringItem);
+        m_phoneNotes->showGlobalProgressNote(
+            m_activeNoteId, hbTrId("Requesting..."));
+    }
+}
+
 // End of File. 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_barringplugingroup/ut_barringplugingroup.cpp
--- a/phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_barringplugingroup/ut_barringplugingroup.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_barringplugingroup/ut_barringplugingroup.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -15,17 +15,28 @@
 *
 */
 
+#include <HbDataFormModel>
+#include <HbCheckBox>
+#include <psetwrapper.h>
 #include "ut_barringplugingroup.h"
 #include "qtestmains60.h"
-#define private public
+#include "cpitemdatahelper.h"
+#include "cpphonenotes.h"
+#define private friend class UT_CpBarringPluginGroup; private
 #include "cpbarringplugingroup.h"
-#include "cpitemdatahelper.h"
+
+void setNoteIdentifier(int &noteId, const QString& text)
+{
+    noteId = 1;
+}
 
 /*!
   UT_CpBarringPluginGroup::UT_CpBarringPluginGroup
  */
 UT_CpBarringPluginGroup::UT_CpBarringPluginGroup() 
-    : m_barringpluginGroup(NULL)
+    : 
+    m_barringpluginGroup(NULL),
+    m_barringWrapperMock(NULL)
 {
 
 }
@@ -36,6 +47,7 @@
 UT_CpBarringPluginGroup::~UT_CpBarringPluginGroup()
 {
     delete m_barringpluginGroup;
+    delete m_barringWrapperMock;
 }
 
 /*!
@@ -44,16 +56,21 @@
 void UT_CpBarringPluginGroup::init()
 {
     initialize();
+    
+    CPsetContainer &dummyContainer = reinterpret_cast<CPsetContainer &>(*this);
+    m_barringWrapperMock = new PSetCallBarringWrapper(dummyContainer);
+    EXPECT(PSetWrapper::callBarringWrapper).returns(m_barringWrapperMock);
+    
     CpItemDataHelper itemDataHelper;
-
-
-    QVERIFY(!m_barringpluginGroup);
     m_barringpluginGroup = new CpBarringPluginGroup(itemDataHelper);
-    QVERIFY(m_barringpluginGroup);
+    
+    m_dataFormModel = new HbDataFormModel();
+    m_barringpluginGroup->setModel(m_dataFormModel);
+    
+    QVERIFY(verify());
 }
 
 
-
 /*!
   UT_CpBarringPluginGroup::cleanup
  */
@@ -63,6 +80,8 @@
     
     delete m_barringpluginGroup;
     m_barringpluginGroup = NULL;
+    delete m_barringWrapperMock;
+    m_barringWrapperMock = NULL;
 }
 
 /*!
@@ -73,4 +92,210 @@
     
 }
 
+
+/*!
+  UT_CpBarringPluginGroup::t_barringStatusRequestCompletedWithAnError
+ */
+void UT_CpBarringPluginGroup::t_barringStatusRequestCompletedWithAnError()
+{
+    EXPECT(CpPhoneNotes::cancelNote);
+    EXPECT(CpPhoneNotes::showGlobalErrorNote);
+    EXPECT(CpItemDataHelper::addConnection).times(0);
+    
+    QList<unsigned char> basicServiceGroupIds;
+    const int errorCode = -1;
+    m_barringpluginGroup->barringStatusRequestCompleted(
+        errorCode,
+        basicServiceGroupIds, 
+        PSetCallBarringWrapper::BarringStatusUnavailable);
+    
+    QVERIFY(verify());
+}
+
+
+/*!
+  UT_CpBarringPluginGroup::t_getBarringStatuses
+  Tests functions 
+      CpBarringPluginGroup::itemShown, 
+      CpBarringPluginGroup::barringStatusRequestCompleted
+ */
+Q_DECLARE_METATYPE(QModelIndex)
+void UT_CpBarringPluginGroup::t_getBarringStatuses()
+{
+    qRegisterMetaType<QModelIndex>("QModelIndex");
+    
+    EXPECT(PSetCallBarringWrapper::barringStatus)
+        .with(ServiceGroupVoice, 
+            PSetCallBarringWrapper::BarringTypeAllOutgoing);
+    EXPECT(PSetCallBarringWrapper::barringStatus)
+        .with(ServiceGroupVoice, 
+            PSetCallBarringWrapper::BarringTypeOutgoingInternational);
+    EXPECT(PSetCallBarringWrapper::barringStatus)
+        .with(ServiceGroupVoice, 
+            PSetCallBarringWrapper::BarringTypeOutgoingInternationalExceptToHomeCountry);
+    EXPECT(PSetCallBarringWrapper::barringStatus)
+        .with(ServiceGroupVoice, 
+            PSetCallBarringWrapper::BarringTypeAllIncoming);
+    EXPECT(PSetCallBarringWrapper::barringStatus)
+        .with(ServiceGroupVoice, 
+            PSetCallBarringWrapper::BarringTypeIncomingWhenRoaming);
+    EXPECT(CpPhoneNotes::showGlobalProgressNote)
+        .willOnce(invoke(setNoteIdentifier));
+    EXPECT(CpItemDataHelper::addConnection).times(5);
+    
+    int numOfChilds = m_barringpluginGroup->childCount();
+    for (int childIndex = 0; childIndex < numOfChilds; childIndex++) {
+        HbDataFormModelItem *item = m_barringpluginGroup->childAt(childIndex);
+        m_dataFormModel->appendDataFormItem(item);
+        m_barringpluginGroup->itemShown(m_dataFormModel->indexFromItem(item));
+    }
+    
+    QSignalSpy spy(
+        m_dataFormModel, 
+        SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)));
+    QList<unsigned char> basicServiceGroupIds;
+    m_barringpluginGroup->barringStatusRequestCompleted(
+        PSetCallBarringWrapper::BarringErrorNone,
+        basicServiceGroupIds, PSetCallBarringWrapper::BarringStatusActive);
+    m_barringpluginGroup->barringStatusRequestCompleted(
+        PSetCallBarringWrapper::BarringErrorNone,
+        basicServiceGroupIds, PSetCallBarringWrapper::BarringStatusInactive);
+    m_barringpluginGroup->barringStatusRequestCompleted(
+        PSetCallBarringWrapper::BarringErrorNone,
+        basicServiceGroupIds, PSetCallBarringWrapper::BarringStatusNotProvisioned);
+    m_barringpluginGroup->barringStatusRequestCompleted(
+        PSetCallBarringWrapper::BarringErrorNone,
+        basicServiceGroupIds, PSetCallBarringWrapper::BarringStatusUnavailable);
+    m_barringpluginGroup->barringStatusRequestCompleted(
+        PSetCallBarringWrapper::BarringErrorNone,
+        basicServiceGroupIds, PSetCallBarringWrapper::BarringStatusUnknown);
+    
+    QCOMPARE(spy.count(), 5);
+    
+    // Verify that barring status checking is not started on item show if 
+    // status is already queried.
+    EXPECT(PSetCallBarringWrapper::barringStatus).times(0);
+    HbDataFormModelItem *item = m_barringpluginGroup->childAt(0);
+    item->setContentWidgetData("checkState", QVariant(Qt::Checked));
+    m_barringpluginGroup->itemShown(m_dataFormModel->indexFromItem(item));
+    
+    QVERIFY(verify());
+}
+
+
+/*!
+  UT_CpBarringPluginGroup::t_enableBarringRequestCompleted
+ */
+void UT_CpBarringPluginGroup::t_enableBarringRequestCompleted()
+{
+    connect(
+        this, SIGNAL(simulateCheckStateChange(int)), 
+        m_barringpluginGroup, SLOT(changeBarringStateRequested(int)));
+    
+// request completed succesfully -case
+    EXPECT(CpItemDataHelper::widgetFromModelIndex).returns(this).times(1);
+    EXPECT(CpPhoneNotes::cancelNote);
+    EXPECT(CpPhoneNotes::showGlobalNote);
+    
+    emit simulateCheckStateChange(Qt::Checked);
+    m_barringpluginGroup->enableBarringRequestCompleted(
+        0, 
+        PSetCallBarringWrapper::BarringTypeAllBarrings,
+        PSetCallBarringWrapper::BarringStatusActive,
+        false);
+    
+    QVERIFY(verify());
+    
+// request completed with an error -case
+    EXPECT(CpItemDataHelper::widgetFromModelIndex).returns(this).times(2);
+    EXPECT(CpPhoneNotes::cancelNote);
+    EXPECT(CpPhoneNotes::showGlobalErrorNote);
+    EXPECT(HbCheckBox::checkState).returns(Qt::Checked);    
+    EXPECT(HbCheckBox::setCheckState).with(Qt::Unchecked);
+    
+    emit simulateCheckStateChange(Qt::Checked);
+    m_barringpluginGroup->enableBarringRequestCompleted(
+        -1, 
+        PSetCallBarringWrapper::BarringTypeAllBarrings,
+        PSetCallBarringWrapper::BarringStatusActive,
+        false);
+    
+    QVERIFY(verify());
+}
+
+
+/*!
+  UT_CpBarringPluginGroup::t_disableBarringRequestCompleted
+ */
+void UT_CpBarringPluginGroup::t_disableBarringRequestCompleted()
+{
+    connect(
+        this, SIGNAL(simulateCheckStateChange(int)), 
+        m_barringpluginGroup, SLOT(changeBarringStateRequested(int)));
+    
+// request completed succesfully -case
+    EXPECT(CpItemDataHelper::widgetFromModelIndex).returns(this).times(1);
+    EXPECT(CpPhoneNotes::cancelNote);
+    EXPECT(CpPhoneNotes::showGlobalNote);
+    emit simulateCheckStateChange(Qt::Unchecked);
+    
+    m_barringpluginGroup->disableBarringRequestCompleted(
+        0, 
+        PSetCallBarringWrapper::BarringTypeAllBarrings,
+        PSetCallBarringWrapper::BarringStatusActive,
+        false);
+    
+    QVERIFY(verify());
+    
+// request completed with an error -case
+    EXPECT(CpItemDataHelper::widgetFromModelIndex).returns(this).times(2);
+    EXPECT(CpPhoneNotes::cancelNote);
+    EXPECT(CpPhoneNotes::showGlobalErrorNote);
+    EXPECT(HbCheckBox::checkState).returns(Qt::Unchecked);    
+    EXPECT(HbCheckBox::setCheckState).with(Qt::Checked);
+    
+    emit simulateCheckStateChange(Qt::Unchecked);
+    m_barringpluginGroup->disableBarringRequestCompleted(
+        -1, 
+        PSetCallBarringWrapper::BarringTypeAllBarrings,
+        PSetCallBarringWrapper::BarringStatusActive,
+        false);
+    
+    QVERIFY(verify());
+}
+
+
+/*!
+  UT_CpBarringPluginGroup::t_changeBarringStateRequested
+ */
+void UT_CpBarringPluginGroup::t_changeBarringStateRequested()
+{
+// barring enable request case
+    EXPECT(CpItemDataHelper::widgetFromModelIndex).returns(this);
+    EXPECT(PSetCallBarringWrapper::enableBarring)
+        .with(ServiceGroupVoice, 
+            PSetCallBarringWrapper::BarringTypeAllOutgoing, QString("1234"));
+    EXPECT(CpPhoneNotes::showGlobalProgressNote);
+    connect(
+        this, SIGNAL(simulateCheckStateChange(int)), 
+        m_barringpluginGroup, SLOT(changeBarringStateRequested(int)));
+    
+    emit simulateCheckStateChange(Qt::Checked);
+    
+// barring disable request case
+    EXPECT(CpItemDataHelper::widgetFromModelIndex).returns(this);
+    EXPECT(PSetCallBarringWrapper::disableBarring)
+        .with(ServiceGroupVoice, 
+            PSetCallBarringWrapper::BarringTypeAllOutgoing, QString("1234"));
+    EXPECT(CpPhoneNotes::showGlobalProgressNote);
+    emit simulateCheckStateChange(Qt::Unchecked);
+    
+// barring item not found case
+    EXPECT(PSetCallBarringWrapper::enableBarring).times(0);
+    EXPECT(CpPhoneNotes::showGlobalProgressNote).times(0);
+    emit simulateCheckStateChange(Qt::Checked);
+    
+    QVERIFY(verify());
+}
+
 QTEST_MAIN_S60(UT_CpBarringPluginGroup)
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_barringplugingroup/ut_barringplugingroup.h
--- a/phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_barringplugingroup/ut_barringplugingroup.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_barringplugingroup/ut_barringplugingroup.h	Fri Apr 16 14:58:25 2010 +0300
@@ -21,27 +21,41 @@
 #include <QtTest/QtTest>
 #include <mockservice.h>
 
-
 class CpBarringPluginGroup;
+class PSetCallBarringWrapper;
+class HbDataFormModel;
 
 class UT_CpBarringPluginGroup : public QObject, MockService
 {
     Q_OBJECT
 
 public:    
+    
     UT_CpBarringPluginGroup();
     ~UT_CpBarringPluginGroup();
     
 private slots:
 
     void init();
-
     void cleanup();
     
     void t_memleak();
+    void t_barringStatusRequestCompletedWithAnError();
+    void t_getBarringStatuses();
+    void t_enableBarringRequestCompleted();
+    void t_disableBarringRequestCompleted();
+    void t_changeBarringStateRequested();
+
+signals:
+    void simulateCheckStateChange(int checkState);
+    
 private:
+    
     CpBarringPluginGroup *m_barringpluginGroup;
-
+    PSetCallBarringWrapper *m_barringWrapperMock;
+    
+    /** Now own. Data form model. */
+    HbDataFormModel *m_dataFormModel;
 };
 
 #endif // UT_BARRINGPLUGINGROUP_H
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_barringplugingroup/ut_barringplugingroup.pro
--- a/phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_barringplugingroup/ut_barringplugingroup.pro	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_barringplugingroup/ut_barringplugingroup.pro	Fri Apr 16 14:58:25 2010 +0300
@@ -25,20 +25,24 @@
 INCLUDEPATH += .
 INCLUDEPATH += ../../../inc
 INCLUDEPATH += ../../../cptelephonyutils/inc
-DEFINES += BUILD_BARRINGPLUGIN
+DEFINES += BUILD_CPTELEPHONYUTILS BUILD_BARRINGPLUGIN \
+           BUILD_PSETWRAPPER BUILD_SSSETTINGSWRAPPER
+DEFINES += QT_NO_DEBUG_STREAM
 
 QT -= gui
 QT += testlib
 
 symbian: { 
     CONFIG += no_icon
+    
     INCLUDEPATH += /epoc32/include/mw/QtTest \
-        /epoc32/include/platform/mw \
-        /epoc32/include/mw/qt
+                   /epoc32/include/platform/mw \
+                   /epoc32/include/mw/qt
+    
     LIBS += -lmocklib \
         -lsymbianmock \
         -lcpframework 
-        }
+}
     
 # test code
 HEADERS += ut_barringplugingroup.h
@@ -46,10 +50,24 @@
     
 # code to be tested
 HEADERS += ../../inc/cpbarringplugin.h \
-           ../../inc/cpbarringplugingroup.h
+           ../../inc/cpbarringplugingroup.h \
+           ../../../cptelephonyutils/inc/cpphonenotes.h \
+           ../../../cptelephonyutils/inc/cpplugincommon.h \
+           /epoc32/include/platform/mw/psetwrapper.h \
+           /epoc32/include/platform/mw/psetcliwrapper.h \
+           /epoc32/include/platform/mw/sssettingswrapper.h \
+           /epoc32/include/platform/mw/psetcallwaitingwrapper.h \
+           /epoc32/include/platform/mw/psetcalldivertingwrapper.h \
+           /epoc32/include/platform/mw/psetnetworkwrapper.h \
+           /epoc32/include/platform/mw/psetcallbarringwrapper.h
 
-    
 SOURCES += ../../src/cpbarringplugingroup.cpp
-    
+
 # mocks needed for testing
 SOURCES += ../../../tsrc/mocks/mock_cpbarringplugin.cpp
+SOURCES += ../../../tsrc/mocks/mock_psetcallbarringwrapper.cpp
+SOURCES += ../../../tsrc/mocks/mock_psetwrapper.cpp
+SOURCES += ../../../tsrc/mocks/mock_cpphonenotes.cpp
+SOURCES += ../../../tsrc/mocks/mock_cpplugincommon.cpp
+SOURCES += ../../../tsrc/mocks/mock_cpitemdatahelper.cpp
+SOURCES += ../../../tsrc/mocks/mock_hbcheckbox.cpp
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_cpbarringplugin/ut_cpbarringplugin.cpp
--- a/phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_cpbarringplugin/ut_cpbarringplugin.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_cpbarringplugin/ut_cpbarringplugin.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -17,6 +17,7 @@
 
 #include "ut_cpbarringplugin.h"
 #include "qtestmains60.h"
+#include <cpsettingformitemdata.h>
 #define private public
 #include "cpbarringplugin.h"
 #include "cpitemdatahelper.h"
@@ -60,8 +61,9 @@
 {
     CpItemDataHelper itemDataHelper;
     CpBarringPlugin* p = (CpBarringPlugin*)qt_plugin_instance();
-    CpSettingFormItemData *pSettingFormItemData = p->createSettingFormItemData(itemDataHelper);
-
+    QList<CpSettingFormItemData*> list;
+    list.append(p->createSettingFormItemData(itemDataHelper));
+    qDeleteAll(list);
 }
 
 /*!
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/bwins/cptelephonyutilsu.def
--- a/phonesettings/cpphonesettingsplugins/bwins/cptelephonyutilsu.def	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/bwins/cptelephonyutilsu.def	Fri Apr 16 14:58:25 2010 +0300
@@ -29,39 +29,37 @@
 	?writeSoftRejectText@CpSettingsWrapper@@QAEHABVQString@@_N@Z @ 28 NONAME ; int CpSettingsWrapper::writeSoftRejectText(class QString const &, bool)
 	?showBasicServiceList@CpPhoneNotes@@QAEXABVQString@@ABV?$QList@E@@@Z @ 29 NONAME ; void CpPhoneNotes::showBasicServiceList(class QString const &, class QList<unsigned char> const &)
 	?setShowCallDuration@CpSettingsWrapper@@QAEH_N@Z @ 30 NONAME ; int CpSettingsWrapper::setShowCallDuration(bool)
-	?loadCpPlugin@Tools@@SAPAVCpPluginPlatInterface@@ABVQString@@@Z @ 31 NONAME ; class CpPluginPlatInterface * Tools::loadCpPlugin(class QString const &)
-	?qt_metacall@CpPhoneNotes@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 32 NONAME ; int CpPhoneNotes::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@Tools@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 33 NONAME ; int Tools::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?trUtf8@CpSettingsWrapper@@SA?AVQString@@PBD0@Z @ 34 NONAME ; class QString CpSettingsWrapper::trUtf8(char const *, char const *)
-	?tr@CpPhoneNotes@@SA?AVQString@@PBD0@Z @ 35 NONAME ; class QString CpPhoneNotes::tr(char const *, char const *)
-	??_ECpSettingsWrapper@@UAE@I@Z @ 36 NONAME ; CpSettingsWrapper::~CpSettingsWrapper(unsigned int)
-	?getStaticMetaObject@CpPhoneNotes@@SAABUQMetaObject@@XZ @ 37 NONAME ; struct QMetaObject const & CpPhoneNotes::getStaticMetaObject(void)
+	?qt_metacall@CpPhoneNotes@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 31 NONAME ; int CpPhoneNotes::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacall@Tools@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 32 NONAME ; int Tools::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?tr@CpPhoneNotes@@SA?AVQString@@PBD0@Z @ 33 NONAME ; class QString CpPhoneNotes::tr(char const *, char const *)
+	?getStaticMetaObject@CpPhoneNotes@@SAABUQMetaObject@@XZ @ 34 NONAME ; struct QMetaObject const & CpPhoneNotes::getStaticMetaObject(void)
+	?convertEtelMobileServiceCode@Tools@@SA?AW4BasicServiceGroups@CpTelephonyUtils@@H@Z @ 35 NONAME ; enum CpTelephonyUtils::BasicServiceGroups Tools::convertEtelMobileServiceCode(int)
+	?trUtf8@CpSettingsWrapper@@SA?AVQString@@PBD0@Z @ 36 NONAME ; class QString CpSettingsWrapper::trUtf8(char const *, char const *)
+	??_ECpSettingsWrapper@@UAE@I@Z @ 37 NONAME ; CpSettingsWrapper::~CpSettingsWrapper(unsigned int)
 	?progressNoteCanceled@CpPhoneNotes@@IAEXXZ @ 38 NONAME ; void CpPhoneNotes::progressNoteCanceled(void)
 	?trUtf8@CpSettingsWrapper@@SA?AVQString@@PBD0H@Z @ 39 NONAME ; class QString CpSettingsWrapper::trUtf8(char const *, char const *, int)
 	?staticMetaObject@CpPhoneNotes@@2UQMetaObject@@B @ 40 NONAME ; struct QMetaObject const CpPhoneNotes::staticMetaObject
 	??0CpPhoneNotes@@AAE@XZ @ 41 NONAME ; CpPhoneNotes::CpPhoneNotes(void)
-	?convertEtelMobileServiceCode@Tools@@SA?AW4BasicServiceGroups@CpTelephonyUtils@@H@Z @ 42 NONAME ; enum CpTelephonyUtils::BasicServiceGroups Tools::convertEtelMobileServiceCode(int)
-	?tr@Tools@@SA?AVQString@@PBD0@Z @ 43 NONAME ; class QString Tools::tr(char const *, char const *)
-	?showGlobalProgressNote@CpPhoneNotes@@QAEXAAHABVQString@@@Z @ 44 NONAME ; void CpPhoneNotes::showGlobalProgressNote(int &, class QString const &)
-	?voipSupported@Tools@@SA_NXZ @ 45 NONAME ; bool Tools::voipSupported(void)
-	?unloadCpPlugin@Tools@@SA_NABVQString@@@Z @ 46 NONAME ; bool Tools::unloadCpPlugin(class QString const &)
-	?qt_metacast@Tools@@UAEPAXPBD@Z @ 47 NONAME ; void * Tools::qt_metacast(char const *)
-	?trUtf8@CpPhoneNotes@@SA?AVQString@@PBD0@Z @ 48 NONAME ; class QString CpPhoneNotes::trUtf8(char const *, char const *)
-	?readCenrepValue@CpSettingsWrapper@@ABE?AVQVariant@@JK@Z @ 49 NONAME ; class QVariant CpSettingsWrapper::readCenrepValue(long, unsigned long) const
-	?trUtf8@Tools@@SA?AVQString@@PBD0H@Z @ 50 NONAME ; class QString Tools::trUtf8(char const *, char const *, int)
-	?tr@Tools@@SA?AVQString@@PBD0H@Z @ 51 NONAME ; class QString Tools::tr(char const *, char const *, int)
-	?qt_metacall@CpSettingsWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 52 NONAME ; int CpSettingsWrapper::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?showCallDivertDetails@CpPhoneNotes@@QAEXABVPSCallDivertingStatus@@@Z @ 53 NONAME ; void CpPhoneNotes::showCallDivertDetails(class PSCallDivertingStatus const &)
-	?numberGroupingSupported@CpSettingsWrapper@@QBE_NXZ @ 54 NONAME ; bool CpSettingsWrapper::numberGroupingSupported(void) const
-	?launchNextNoteIfReady@CpPhoneNotes@@AAEXXZ @ 55 NONAME ; void CpPhoneNotes::launchNextNoteIfReady(void)
-	?tr@CpSettingsWrapper@@SA?AVQString@@PBD0@Z @ 56 NONAME ; class QString CpSettingsWrapper::tr(char const *, char const *)
-	?cancelNote@CpPhoneNotes@@QAEXH@Z @ 57 NONAME ; void CpPhoneNotes::cancelNote(int)
-	?isFeatureCallWaitingDistiquishNotProvisionedEnabled@CpSettingsWrapper@@QAE_NXZ @ 58 NONAME ; bool CpSettingsWrapper::isFeatureCallWaitingDistiquishNotProvisionedEnabled(void)
-	?writeCenrepValue@CpSettingsWrapper@@ABEHJKABVQVariant@@@Z @ 59 NONAME ; int CpSettingsWrapper::writeCenrepValue(long, unsigned long, class QVariant const &) const
-	?staticMetaObject@Tools@@2UQMetaObject@@B @ 60 NONAME ; struct QMetaObject const Tools::staticMetaObject
-	?showBasicServiceCallDivertList@CpPhoneNotes@@QAEXABVQString@@ABV?$QList@PAVPSCallDivertingStatus@@@@AAHW4CallDivertType@CpTelephonyUtils@@AAW445@@Z @ 61 NONAME ; void CpPhoneNotes::showBasicServiceCallDivertList(class QString const &, class QList<class PSCallDivertingStatus *> const &, int &, enum CpTelephonyUtils::CallDivertType, enum CpTelephonyUtils::CallDivertType &)
-	?trUtf8@Tools@@SA?AVQString@@PBD0@Z @ 62 NONAME ; class QString Tools::trUtf8(char const *, char const *)
-	?staticMetaObject@CpSettingsWrapper@@2UQMetaObject@@B @ 63 NONAME ; struct QMetaObject const CpSettingsWrapper::staticMetaObject
-	??0CpSettingsWrapper@@QAE@PAVQObject@@@Z @ 64 NONAME ; CpSettingsWrapper::CpSettingsWrapper(class QObject *)
-	?noteShowing@CpPhoneNotes@@QAE_NXZ @ 65 NONAME ; bool CpPhoneNotes::noteShowing(void)
+	?tr@Tools@@SA?AVQString@@PBD0@Z @ 42 NONAME ; class QString Tools::tr(char const *, char const *)
+	?showGlobalProgressNote@CpPhoneNotes@@QAEXAAHABVQString@@@Z @ 43 NONAME ; void CpPhoneNotes::showGlobalProgressNote(int &, class QString const &)
+	?voipSupported@Tools@@SA_NXZ @ 44 NONAME ; bool Tools::voipSupported(void)
+	?qt_metacast@Tools@@UAEPAXPBD@Z @ 45 NONAME ; void * Tools::qt_metacast(char const *)
+	?trUtf8@CpPhoneNotes@@SA?AVQString@@PBD0@Z @ 46 NONAME ; class QString CpPhoneNotes::trUtf8(char const *, char const *)
+	?readCenrepValue@CpSettingsWrapper@@ABE?AVQVariant@@JK@Z @ 47 NONAME ; class QVariant CpSettingsWrapper::readCenrepValue(long, unsigned long) const
+	?trUtf8@Tools@@SA?AVQString@@PBD0H@Z @ 48 NONAME ; class QString Tools::trUtf8(char const *, char const *, int)
+	?tr@Tools@@SA?AVQString@@PBD0H@Z @ 49 NONAME ; class QString Tools::tr(char const *, char const *, int)
+	?qt_metacall@CpSettingsWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 50 NONAME ; int CpSettingsWrapper::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?noteShowing@CpPhoneNotes@@QAE_NXZ @ 51 NONAME ; bool CpPhoneNotes::noteShowing(void)
+	?showCallDivertDetails@CpPhoneNotes@@QAEXABVPSCallDivertingStatus@@@Z @ 52 NONAME ; void CpPhoneNotes::showCallDivertDetails(class PSCallDivertingStatus const &)
+	?numberGroupingSupported@CpSettingsWrapper@@QBE_NXZ @ 53 NONAME ; bool CpSettingsWrapper::numberGroupingSupported(void) const
+	?launchNextNoteIfReady@CpPhoneNotes@@AAEXXZ @ 54 NONAME ; void CpPhoneNotes::launchNextNoteIfReady(void)
+	?tr@CpSettingsWrapper@@SA?AVQString@@PBD0@Z @ 55 NONAME ; class QString CpSettingsWrapper::tr(char const *, char const *)
+	?cancelNote@CpPhoneNotes@@QAEXH@Z @ 56 NONAME ; void CpPhoneNotes::cancelNote(int)
+	?isFeatureCallWaitingDistiquishNotProvisionedEnabled@CpSettingsWrapper@@QAE_NXZ @ 57 NONAME ; bool CpSettingsWrapper::isFeatureCallWaitingDistiquishNotProvisionedEnabled(void)
+	?writeCenrepValue@CpSettingsWrapper@@ABEHJKABVQVariant@@@Z @ 58 NONAME ; int CpSettingsWrapper::writeCenrepValue(long, unsigned long, class QVariant const &) const
+	?staticMetaObject@Tools@@2UQMetaObject@@B @ 59 NONAME ; struct QMetaObject const Tools::staticMetaObject
+	?showBasicServiceCallDivertList@CpPhoneNotes@@QAEXABVQString@@ABV?$QList@PAVPSCallDivertingStatus@@@@AAHW4CallDivertType@CpTelephonyUtils@@AAW445@@Z @ 60 NONAME ; void CpPhoneNotes::showBasicServiceCallDivertList(class QString const &, class QList<class PSCallDivertingStatus *> const &, int &, enum CpTelephonyUtils::CallDivertType, enum CpTelephonyUtils::CallDivertType &)
+	?trUtf8@Tools@@SA?AVQString@@PBD0@Z @ 61 NONAME ; class QString Tools::trUtf8(char const *, char const *)
+	?staticMetaObject@CpSettingsWrapper@@2UQMetaObject@@B @ 62 NONAME ; struct QMetaObject const CpSettingsWrapper::staticMetaObject
+	??0CpSettingsWrapper@@QAE@PAVQObject@@@Z @ 63 NONAME ; CpSettingsWrapper::CpSettingsWrapper(class QObject *)
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/callsplugin/src/cpcallsplugin.cpp
--- a/phonesettings/cpphonesettingsplugins/callsplugin/src/cpcallsplugin.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/callsplugin/src/cpcallsplugin.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -45,11 +45,13 @@
 /*!
     CpCallsPlugin::createSettingFormItemData.
  */
-CpSettingFormItemData *CpCallsPlugin::createSettingFormItemData(
+QList<CpSettingFormItemData*> CpCallsPlugin::createSettingFormItemData(
         CpItemDataHelper &itemDataHelper) const
 {
-    DPRINT << ", itemDataHelper: " << reinterpret_cast<int>(&itemDataHelper);
-    return new CpCallsPluginGroup(itemDataHelper);
+    DPRINT;
+    QList<CpSettingFormItemData*> ret;
+    ret.append(new CpCallsPluginGroup(itemDataHelper));
+    return ret;
 }
 
 Q_EXPORT_PLUGIN2(cpcallsplugin, CpCallsPlugin);
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/callsplugin/src/cpcallsplugin.h
--- a/phonesettings/cpphonesettingsplugins/callsplugin/src/cpcallsplugin.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/callsplugin/src/cpcallsplugin.h	Fri Apr 16 14:58:25 2010 +0300
@@ -17,28 +17,28 @@
 #ifndef CPCALLSPLUGIN_H
 #define CPCALLSPLUGIN_H
 
-#include <cppluginplatinterface.h>
+#include <cpplugininterface.h>
 
 
 /*!
     \class CpCallsPlugin
     \brief The class CpCallsPlugin implements call settings functionality. 
  */
-class CpCallsPlugin: public QObject,public CpPluginPlatInterface
+class CpCallsPlugin: public QObject,public CpPluginInterface
 {
     Q_OBJECT
-    Q_INTERFACES(CpPluginPlatInterface)
+    Q_INTERFACES(CpPluginInterface)
 public:
     
     CpCallsPlugin();
     
     ~CpCallsPlugin();
 
-    /*!
-     From CpPluginPlatInterface.
-     @see CpPluginPlatInterface.
-     */    
-    virtual CpSettingFormItemData *createSettingFormItemData(
-            CpItemDataHelper &itemDataHelper) const;
+    /**
+     * From CpPluginInterface
+     * @see CpPluginInterface.
+     */
+    QList<CpSettingFormItemData*> createSettingFormItemData(
+        CpItemDataHelper &itemDataHelper) const;
 };
 #endif // CPCALLSPLUGIN_H
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/callsplugin/tsrc/ut_callsplugin/ut_callsplugin.cpp
--- a/phonesettings/cpphonesettingsplugins/callsplugin/tsrc/ut_callsplugin/ut_callsplugin.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/callsplugin/tsrc/ut_callsplugin/ut_callsplugin.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -17,6 +17,7 @@
 
 #include "ut_callsplugin.h"
 #include "qtestmains60.h"
+#include <cpsettingformitemdata.h>
 #define private public
 #include "cpcallsplugin.h"
 #include "cpitemdatahelper.h"
@@ -56,7 +57,9 @@
 {
     CpItemDataHelper itemDataHelper;
     CpCallsPlugin* p = (CpCallsPlugin*)qt_plugin_instance();
-    CpSettingFormItemData *pSettingFormItemData = p->createSettingFormItemData(itemDataHelper);
+    QList<CpSettingFormItemData*> list;
+    list.append(p->createSettingFormItemData(itemDataHelper));
+    qDeleteAll(list);
 }
 
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkplugin.cpp
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkplugin.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkplugin.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -40,15 +40,17 @@
 /*!
   CpNetworkPlugin::createSettingFormItemData
  */
-CpSettingFormItemData *CpNetworkPlugin::createSettingFormItemData(
-    CpItemDataHelper &itemDataHelper) const
+QList<CpSettingFormItemData*> CpNetworkPlugin::createSettingFormItemData(
+        CpItemDataHelper &itemDataHelper) const
 {
     DPRINT;
-    
-    return new CpSettingFormEntryItemDataImpl<CpNetworkPluginView>(
-        itemDataHelper,
-        hbTrId("Mobile network"), 
-        hbTrId("Mobile network settings"));
+
+    QList<CpSettingFormItemData*> ret;
+    ret.append(new CpSettingFormEntryItemDataImpl<CpNetworkPluginView>(
+            itemDataHelper,
+            hbTrId("Mobile network"), 
+            hbTrId("Mobile network settings")));
+    return ret;
 }
 
 Q_EXPORT_PLUGIN2(CpNetworkPlugin, CpNetworkPlugin);
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkplugin.h
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkplugin.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkplugin.h	Fri Apr 16 14:58:25 2010 +0300
@@ -19,12 +19,12 @@
 #define CPNETWORKPLUGIN_H
 
 #include <qobject.h>
-#include <cppluginplatinterface.h>
+#include <cpplugininterface.h>
 
-class CpNetworkPlugin : public QObject, public CpPluginPlatInterface
+class CpNetworkPlugin : public QObject, public CpPluginInterface
 {
     Q_OBJECT
-    Q_INTERFACES(CpPluginPlatInterface)
+    Q_INTERFACES(CpPluginInterface)
     
 public:
     
@@ -32,8 +32,13 @@
     
     ~CpNetworkPlugin();
     
-    virtual CpSettingFormItemData *createSettingFormItemData(
+    /**
+     * From CpPluginInterface
+     * @see CpPluginInterface.
+     */
+    QList<CpSettingFormItemData*> createSettingFormItemData(
         CpItemDataHelper &itemDataHelper) const;
+
 };
 
 #endif  // CPNETWORKPLUGIN_H
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/run_auto_tests_qt.bat
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/run_auto_tests_qt.bat	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/run_auto_tests_qt.bat	Fri Apr 16 14:58:25 2010 +0300
@@ -152,7 +152,7 @@
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::
 :RUNTESTS
 echo Running tests
-for /f %%a in ('dir /b ut_*') do call %PATH_TO_DLL%\%%a.exe -dtextshell --
+for /f %%a in ('dir /b ut_*') do call %PATH_TO_DLL%\%%a.exe
 goto end
 
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkplugin/ut_cpnetworkplugin.cpp
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkplugin/ut_cpnetworkplugin.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkplugin/ut_cpnetworkplugin.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -17,6 +17,7 @@
 
 #include "ut_cpnetworkplugin.h"
 #include "qtestmains60.h"
+#include <cpsettingformitemdata.h>
 #define private public
 #include "cpnetworkplugin.h"
 #include "cpitemdatahelper.h"
@@ -73,8 +74,9 @@
 {
     CpItemDataHelper itemDataHelper;
     CpNetworkPlugin* p = (CpNetworkPlugin*)qt_plugin_instance();
-    CpSettingFormItemData *pSettingFormItemData = 
-        p->createSettingFormItemData(itemDataHelper);
+    QList<CpSettingFormItemData*> list;
+    list.append(p->createSettingFormItemData(itemDataHelper));
+    qDeleteAll(list);
 }
 
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkplugin/ut_cpnetworkplugin.pro
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkplugin/ut_cpnetworkplugin.pro	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkplugin/ut_cpnetworkplugin.pro	Fri Apr 16 14:58:25 2010 +0300
@@ -43,7 +43,7 @@
 
 # code to be tested
 HEADERS += ../../src/cpnetworkplugin.h \
-           ../../src/cpnetworkpluginview.h \
+           ../../src/cpnetworkpluginview.h
        
 SOURCES += ../../src/cpnetworkplugin.cpp 
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkpluginform/qtestmains60ui.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkpluginform/qtestmains60ui.h	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,49 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef QTESTMAINS60
+#define QTESTMAINS60
+
+#include <hbapplication.h>
+#include <hbmainwindow.h>
+
+char *new_argv[3];
+HbMainWindow *mainWindow;
+#define QTEST_MAIN_S60UI(TestObject) \
+int main(int argc, char *argv[]) \
+{ \
+HbApplication *app = new HbApplication(argc, argv); \
+QString str = "C:\\data\\" + QFileInfo(QCoreApplication::applicationFilePath()).baseName() + ".log"; \
+QByteArray   bytes  = str.toAscii(); \
+\
+char arg1[] = "-o"; \
+\
+new_argv[0] = argv[0]; \
+new_argv[1] = arg1; \
+new_argv[2] = bytes.data(); \
+\
+TestObject tc; \
+QResource::registerResource("../hbcore.rcc"); \
+mainWindow = new HbMainWindow;\
+mainWindow->show(); \
+int ret = QTest::qExec(&tc, 3, new_argv); \
+delete mainWindow; \
+delete app; \
+return ret; \
+}
+
+#endif
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkpluginform/ut_cpnetworkpluginform.pro
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkpluginform/ut_cpnetworkpluginform.pro	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkpluginform/ut_cpnetworkpluginform.pro	Fri Apr 16 14:58:25 2010 +0300
@@ -31,7 +31,7 @@
 QT += testlib
 
 symbian: { 
-    CONFIG += no_icon
+    #CONFIG += no_icon
     INCLUDEPATH += /epoc32/include/mw/QtTest \
         /epoc32/include/platform/mw \
         /epoc32/include/mw/qt
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkpluginform/ut_networkpluginform.cpp
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkpluginform/ut_networkpluginform.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkpluginform/ut_networkpluginform.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 #include "ut_networkpluginform.h"
-#include "qtestmains60.h"
+#include "qtestmains60ui.h"
 #define private public
 #include "cpnetworkpluginform.h"
 #include "cpitemdatahelper.h"
@@ -253,4 +253,4 @@
     mode = m_NetworkSelectionMode;
 }
 
-QTEST_MAIN_S60(UT_CpNetworkPluginForm)
+QTEST_MAIN_S60UI(UT_CpNetworkPluginForm)
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/cptelephonyutils/cptelephonyutils.pro
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/cptelephonyutils.pro	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/cptelephonyutils.pro	Fri Apr 16 14:58:25 2010 +0300
@@ -43,8 +43,7 @@
     LIBS += -lsssettings    \
             -lphonesettings \
             -lxqsysinfo \
-            -lxqsettingsmanager \
-            -lcpframework
+            -lxqsettingsmanager
 
     INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
     TARGET.EPOCALLOWDLLDATA = 1 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/cptelephonyutils/inc/cpplugincommon.h
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/inc/cpplugincommon.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/inc/cpplugincommon.h	Fri Apr 16 14:58:25 2010 +0300
@@ -21,7 +21,6 @@
 #include <qvariant.h>
 #include "cptelephonyutilsdefs.h"
 
-class CpPluginPlatInterface;
 class XQSettingsManager;
 
 using namespace CpTelephonyUtils;
@@ -33,10 +32,6 @@
 class CPTELEPHONYUTILS_EXPORT Tools : public QObject
 {
     Q_OBJECT
-    
-public:
-    static CpPluginPlatInterface* loadCpPlugin( const QString& name );
-    static bool unloadCpPlugin( const QString& name );
 
 public:
     /*!
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpplugincommon.cpp
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpplugincommon.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpplugincommon.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -28,8 +28,6 @@
 #include <LogsDomainCRKeys.h>
 #include <BTSapDomainPSKeys.h>
 #include <NumberGroupingCRKeys.h>
-#include <QPluginLoader>
-#include <cppluginplatinterface.h>
 #include <hbglobal.h>
 #include <CoreApplicationUIsSDKCRKeys.h>
 #include "cptelephonyutilsdefs.h"
@@ -43,24 +41,6 @@
 const int SoftRejectTextUserDefined = 1; 
 
 /*!
-  Tools::loadCpPlugin
-*/
-CpPluginPlatInterface* Tools::loadCpPlugin(const QString& name)
-{
-    QPluginLoader loader("\\resource\\qt\\plugins\\controlpanel\\"+name+".qtplugin");
-    return qobject_cast<CpPluginPlatInterface*> (loader.instance());
-}
-
-/*!
-  Tools::unloadCpPlugin
-*/
-bool Tools::unloadCpPlugin(const QString& name)
-{
-    QPluginLoader loader("\\resource\\qt\\plugins\\controlpanel\\"+name+".qtplugin");
-    return loader.unload();
-}
-
-/*!
   Tools::voipSupported
 */
 bool Tools::voipSupported()
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpplugincommon_s.cpp
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpplugincommon_s.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpplugincommon_s.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -18,22 +18,8 @@
 #include "cpplugincommon.h"
 #include "cppluginlogging.h"
 #include <hbglobal.h>
-#include <cppluginplatinterface.h>
-#include <QPluginLoader>
 
 
-CpPluginPlatInterface* Tools::loadCpPlugin(const QString& name)
-{
-    QPluginLoader loader("C:/ControlPanel/debug/bin/"+name+".dll");
-    return qobject_cast<CpPluginPlatInterface*> (loader.instance());
-}
-
-bool Tools::unloadCpPlugin(const QString& name)
-{
-    QPluginLoader loader("C:/ControlPanel/debug/bin/"+name+".dll");
-    return loader.unload();
-}
-
 bool Tools::voipSupported()
 {
     DPRINT << "DUMMY WRAPPER";
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpphonenotes/qtestmains60ui.h
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpphonenotes/qtestmains60ui.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpphonenotes/qtestmains60ui.h	Fri Apr 16 14:58:25 2010 +0300
@@ -26,7 +26,7 @@
 #define QTEST_MAIN_S60UI(TestObject) \
 int main(int argc, char *argv[]) \
 { \
-\
+HbApplication app(argc, argv); \
 QString str = "C:\\data\\" + QFileInfo(QCoreApplication::applicationFilePath()).baseName() + ".log"; \
 QByteArray   bytes  = str.toAscii(); \
 \
@@ -36,7 +36,6 @@
 new_argv[1] = arg1; \
 new_argv[2] = bytes.data(); \
 \
-HbApplication app(argc, argv); \
 TestObject tc; \
 QResource::registerResource("../hbcore.rcc"); \
 mainWindow = new HbMainWindow;\
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.cpp
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -129,24 +129,6 @@
 }
 
 /*!
-  UT_CpPluginCommon::t_memleak
- */
-
-void UT_CpPluginCommon::t_loadCpPlugin()
-{
-    CpPluginPlatInterface* p = Tools::loadCpPlugin("hello");
-    QVERIFY( !p );
-}
-
-/*!
-  UT_CpPluginCommon::t_memleak
- */
-void UT_CpPluginCommon::t_unloadCpPlugin()
-{
-    QVERIFY( !Tools::unloadCpPlugin("hello") );
-}
-
-/*!
   UT_CpPluginCommon::t_voipSupported
  */
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.h
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.h	Fri Apr 16 14:58:25 2010 +0300
@@ -44,9 +44,6 @@
     void t_writeSoftRejectText();
     void t_numberGroupingSupported();
     
-    void t_loadCpPlugin();
-    void t_unloadCpPlugin();
-    
     void t_voipSupported();
     void t_videoSupported();
     void t_convertEtelMobileServiceCode();
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/divertplugin/src/cpdivertplugin.cpp
--- a/phonesettings/cpphonesettingsplugins/divertplugin/src/cpdivertplugin.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/divertplugin/src/cpdivertplugin.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -44,11 +44,13 @@
 /*!
     CpDivertPlugin::createSettingFormItemData.
  */
-CpSettingFormItemData *CpDivertPlugin::createSettingFormItemData(
+QList<CpSettingFormItemData*> CpDivertPlugin::createSettingFormItemData(
         CpItemDataHelper &itemDataHelper) const
 {
     DPRINT;
-    return new CpDivertPluginGroup(itemDataHelper);
+    QList<CpSettingFormItemData*> ret;
+    ret.append(new CpDivertPluginGroup(itemDataHelper));
+    return ret;
 }
 
 Q_EXPORT_PLUGIN2(cpdivertplugin, CpDivertPlugin);
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/divertplugin/src/cpdivertplugin.h
--- a/phonesettings/cpphonesettingsplugins/divertplugin/src/cpdivertplugin.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/divertplugin/src/cpdivertplugin.h	Fri Apr 16 14:58:25 2010 +0300
@@ -17,16 +17,16 @@
 #ifndef CPDIVERTPLUGIN_H
 #define CPDIVERTPLUGIN_H
 
-#include <cppluginplatinterface.h>
+#include <cpplugininterface.h>
 
 /*!
     \class CpDivertPlugin
     \brief The class CpDivertPlugin implements call divert functionality. 
  */
-class CpDivertPlugin : public QObject, public CpPluginPlatInterface
+class CpDivertPlugin : public QObject, public CpPluginInterface
 {
     Q_OBJECT
-    Q_INTERFACES(CpPluginPlatInterface)
+    Q_INTERFACES(CpPluginInterface)
 
 public:
 
@@ -34,11 +34,11 @@
     
     ~CpDivertPlugin();
     
-    /*!
-     From CpPluginPlatInterface.
-     @see CpPluginPlatInterface.
+    /**
+     * From CpPluginInterface
+     * @see CpPluginInterface.
      */
-    CpSettingFormItemData *createSettingFormItemData(
+    QList<CpSettingFormItemData*> createSettingFormItemData(
             CpItemDataHelper &itemDataHelper) const;
 };
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/divertplugin/src/cpdivertplugingroup.cpp
--- a/phonesettings/cpphonesettingsplugins/divertplugin/src/cpdivertplugingroup.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/divertplugin/src/cpdivertplugingroup.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -100,6 +100,10 @@
     // Create custom item prototype
     m_helper.addItemPrototype(new CpDivertSelectionItem());
     
+    // Listen form item visibility change
+    m_helper.connectToForm(
+            SIGNAL(itemShown(QModelIndex)), this, SLOT(itemShown(QModelIndex)));
+    
     // Create grouped setting items
     createVoiceCallItems();
     createVideoCallItems();
@@ -617,7 +621,9 @@
     DPRINT << ": IN : aReason:" << aReason;
     
     // Update view item for failed request
-    revertItemData(m_divertRequestQueue.head().item->condition());
+    if (m_divertRequestQueue.count()) {
+        revertItemData(m_divertRequestQueue.head().item->condition());
+    }
     
     // Clear queue
     m_divertRequestQueue.clear();
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/divertplugin/src/cpdivertselectioncustomitem.cpp
--- a/phonesettings/cpphonesettingsplugins/divertplugin/src/cpdivertselectioncustomitem.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/divertplugin/src/cpdivertselectioncustomitem.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -42,7 +42,7 @@
     layout->setRowMaximumHeight(1,0);
 
     checkbox = new HbCheckBox(this);
-    checkbox->setBackgroundItem(HbStyle::P_DataItemContentWidget_background);
+    checkbox->setBackgroundItem(HbStyle::P_DataItem_background);
 
     HbStyle::setItemName(checkbox, "dataItem_ContentWidget");
 
@@ -61,7 +61,7 @@
 
     timeoutLabel->hide();
     timeoutValueLabel = new HbLabel(this);
-    timeoutValueLabel->setBackgroundItem(HbStyle::P_DataItemContentWidget_background);
+    timeoutValueLabel->setBackgroundItem(HbStyle::P_DataItem_background);
     HbStyle::setItemName(timeoutValueLabel, "dataItem_ContentWidget");
     timeoutValueLabel->hide();
     layout->addItem(timeoutValueLabel, 1, 1);
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/divertplugin/tsrc/run_auto_tests_qt.bat
--- a/phonesettings/cpphonesettingsplugins/divertplugin/tsrc/run_auto_tests_qt.bat	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/divertplugin/tsrc/run_auto_tests_qt.bat	Fri Apr 16 14:58:25 2010 +0300
@@ -160,7 +160,7 @@
 echo 5) User selects othernumber and find
 echo 6) User selects other number and inserts number and timeout
 echo 7) User selects default number and and cancels in timeout query
-for /f %%a in ('dir /b ut_*') do call %PATH_TO_DLL%\%%a.exe -- 
+for /f %%a in ('dir /b ut_*') do call %PATH_TO_DLL%\%%a.exe 
 goto end
 
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/divertplugin/tsrc/ut_cpdivertplugin/qtestmains60ui.h
--- a/phonesettings/cpphonesettingsplugins/divertplugin/tsrc/ut_cpdivertplugin/qtestmains60ui.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/divertplugin/tsrc/ut_cpdivertplugin/qtestmains60ui.h	Fri Apr 16 14:58:25 2010 +0300
@@ -26,7 +26,7 @@
 #define QTEST_MAIN_S60UI(TestObject) \
 int main(int argc, char *argv[]) \
 { \
-\
+HbApplication *app = new HbApplication(argc, argv); \
 QString str = "C:\\data\\" + QFileInfo(QCoreApplication::applicationFilePath()).baseName() + ".log"; \
 QByteArray   bytes  = str.toAscii(); \
 \
@@ -36,7 +36,6 @@
 new_argv[1] = arg1; \
 new_argv[2] = bytes.data(); \
 \
-HbApplication *app = new HbApplication(argc, argv); \
 TestObject tc; \
 QResource::registerResource("../hbcore.rcc"); \
 mainWindow = new HbMainWindow;\
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/divertplugin/tsrc/ut_cpdivertplugin/ut_cpdivertplugin.cpp
--- a/phonesettings/cpphonesettingsplugins/divertplugin/tsrc/ut_cpdivertplugin/ut_cpdivertplugin.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/divertplugin/tsrc/ut_cpdivertplugin/ut_cpdivertplugin.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -30,6 +30,7 @@
 #include "cpitemdatahelper.h"
 #include "cpdivertitemdata.h"
 #include "psetwrappertypes.h"
+#include "cpdivertselectioncustomitem.h"
 
 #define private public
 #include "cpdivertplugin.h"
@@ -80,8 +81,9 @@
     QVERIFY(m_divertplugin);
     
     m_helper = new CpItemDataHelper;
-    m_divertpluginGroup = qobject_cast<CpDivertPluginGroup *>(
-            m_divertplugin->createSettingFormItemData(*m_helper));
+    QList<CpSettingFormItemData*> list;
+    list.append(m_divertplugin->createSettingFormItemData(*m_helper));
+    m_divertpluginGroup = qobject_cast<CpDivertPluginGroup *>(list.takeFirst());
     QVERIFY(m_divertpluginGroup);
     
     QVERIFY(verify());
@@ -124,8 +126,9 @@
     expect("PSetWrapper::callDivertingWrapper").returns(&tmpDivWrapper); 
     
     CpDivertPlugin* p = (CpDivertPlugin*)qt_plugin_instance();
-    CpSettingFormItemData *pSettingFormItemData = p->createSettingFormItemData(itemDataHelper);
-    
+    QList<CpSettingFormItemData*> list;
+    list.append(p->createSettingFormItemData(itemDataHelper));
+    qDeleteAll(list);
     QVERIFY(verify());
 }
 
@@ -138,14 +141,16 @@
     appendAction("All voice calls:", selectAction, "Cancel");
     expect("PSetCallDivertingWrapper::getDefaultNumbers");
     m_divertpluginGroup->m_DataItemAllVoiceCalls->setContentWidgetData("number", "");
+    m_divertpluginGroup->m_DataItemAllVoiceCalls->setContentWidgetData(
+            "state", CpDivertSelectionCustomitem::Disabled);
     m_divertpluginGroup->m_DataItemAllVoiceCalls->thisItemClicked();
     QVERIFY(verify());
     
     //except user selects vmb and inserts number
-    appendAction("All voice calls:", selectItem, "Voice mail box");
+    appendAction("All voice calls:", selectItem, "txt_phone_setlabel_voice_mbx");
     appendAction("Voice mail box number:", insertText, "12345");
     appendAction("Voice mail box number:", selectAction, "OK");
-     expect("PSetCallDivertingWrapper::getDefaultNumbers");
+    expect("PSetCallDivertingWrapper::getDefaultNumbers");
     expect("SsSettingsWrapper::get");
     expect("PSetCallDivertingWrapper::setCallDiverting");
     expect("CpPhoneNotes::noteShowing").returns(false);
@@ -163,6 +168,8 @@
 
     //except user selects one of the default numbers
     m_divertpluginGroup->m_DataItemAllVoiceCalls->setContentWidgetData("number","");
+    m_divertpluginGroup->m_DataItemAllVoiceCalls->setContentWidgetData(
+            "state", CpDivertSelectionCustomitem::Disabled);
     appendAction("All voice calls:", selectItem, "0401234567");
     expect("PSetCallDivertingWrapper::getDefaultNumbers");
     expect("SsSettingsWrapper::get");
@@ -273,6 +280,9 @@
     appendAction("If not answered:", selectItem, "0401234567");
     appendAction("Time out", selectAction, "Cancel");
     expect("PSetCallDivertingWrapper::getDefaultNumbers");
+    m_divertpluginGroup->m_DataItemIfNotAnswered->setContentWidgetData("number", "");
+    m_divertpluginGroup->m_DataItemIfNotAnswered->setContentWidgetData(
+            "state", CpDivertSelectionCustomitem::Disabled);
     m_divertpluginGroup->m_DataItemIfNotAnswered->thisItemClicked();
     QVERIFY(verify());
     
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/divertplugin/tsrc/ut_cpdivertselectionitem/qtestmains60ui.h
--- a/phonesettings/cpphonesettingsplugins/divertplugin/tsrc/ut_cpdivertselectionitem/qtestmains60ui.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/divertplugin/tsrc/ut_cpdivertselectionitem/qtestmains60ui.h	Fri Apr 16 14:58:25 2010 +0300
@@ -26,7 +26,7 @@
 #define QTEST_MAIN_S60UI(TestObject) \
 int main(int argc, char *argv[]) \
 { \
-\
+HbApplication *app = new HbApplication(argc, argv); \
 QString str = "C:\\data\\" + QFileInfo(QCoreApplication::applicationFilePath()).baseName() + ".log"; \
 QByteArray   bytes  = str.toAscii(); \
 \
@@ -36,7 +36,6 @@
 new_argv[1] = arg1; \
 new_argv[2] = bytes.data(); \
 \
-HbApplication *app = new HbApplication(argc, argv); \
 TestObject tc; \
 QResource::registerResource("../hbcore.rcc"); \
 mainWindow = new HbMainWindow;\
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/eabi/cptelephonyutilsu.def
--- a/phonesettings/cpphonesettingsplugins/eabi/cptelephonyutilsu.def	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/eabi/cptelephonyutilsu.def	Fri Apr 16 14:58:25 2010 +0300
@@ -36,30 +36,28 @@
 	_ZN17CpSettingsWrapperD2Ev @ 35 NONAME
 	_ZN5Tools11qt_metacallEN11QMetaObject4CallEiPPv @ 36 NONAME
 	_ZN5Tools11qt_metacastEPKc @ 37 NONAME
-	_ZN5Tools12loadCpPluginERK7QString @ 38 NONAME
+	_ZN12CpPhoneNotes11noteShowingEv @ 38 NONAME
 	_ZN5Tools13voipSupportedEv @ 39 NONAME
-	_ZN5Tools14unloadCpPluginERK7QString @ 40 NONAME
-	_ZN5Tools14videoSupportedEv @ 41 NONAME
-	_ZN5Tools16staticMetaObjectE @ 42 NONAME DATA 16
-	_ZN5Tools19getStaticMetaObjectEv @ 43 NONAME
-	_ZN5Tools20errorCodeTextMappingEiR7QString @ 44 NONAME
-	_ZN5Tools28convertEtelMobileServiceCodeEi @ 45 NONAME
-	_ZNK12CpPhoneNotes10metaObjectEv @ 46 NONAME
-	_ZNK12CpPhoneNotes17formatPhoneNumberE7QString @ 47 NONAME
-	_ZNK12CpPhoneNotes21basicServiceGroupNameEN16CpTelephonyUtils18BasicServiceGroupsE @ 48 NONAME
-	_ZNK12CpPhoneNotes28convertEtelMobileServiceCodeEi @ 49 NONAME
-	_ZNK17CpSettingsWrapper10metaObjectEv @ 50 NONAME
-	_ZNK17CpSettingsWrapper14isPhoneOfflineEv @ 51 NONAME
-	_ZNK17CpSettingsWrapper15readCenrepValueElm @ 52 NONAME
-	_ZNK17CpSettingsWrapper16readCenrepStringElm @ 53 NONAME
-	_ZNK17CpSettingsWrapper16writeCenrepValueElmRK8QVariant @ 54 NONAME
-	_ZNK17CpSettingsWrapper23numberGroupingSupportedEv @ 55 NONAME
-	_ZNK5Tools10metaObjectEv @ 56 NONAME
-	_ZTI12CpPhoneNotes @ 57 NONAME
-	_ZTI17CpSettingsWrapper @ 58 NONAME
-	_ZTI5Tools @ 59 NONAME
-	_ZTV12CpPhoneNotes @ 60 NONAME
-	_ZTV17CpSettingsWrapper @ 61 NONAME
-	_ZTV5Tools @ 62 NONAME
-	_ZN12CpPhoneNotes11noteShowingEv @ 63 NONAME
+	_ZN5Tools14videoSupportedEv @ 40 NONAME
+	_ZN5Tools16staticMetaObjectE @ 41 NONAME DATA 16
+	_ZN5Tools19getStaticMetaObjectEv @ 42 NONAME
+	_ZN5Tools20errorCodeTextMappingEiR7QString @ 43 NONAME
+	_ZN5Tools28convertEtelMobileServiceCodeEi @ 44 NONAME
+	_ZNK12CpPhoneNotes10metaObjectEv @ 45 NONAME
+	_ZNK12CpPhoneNotes17formatPhoneNumberE7QString @ 46 NONAME
+	_ZNK12CpPhoneNotes21basicServiceGroupNameEN16CpTelephonyUtils18BasicServiceGroupsE @ 47 NONAME
+	_ZNK12CpPhoneNotes28convertEtelMobileServiceCodeEi @ 48 NONAME
+	_ZNK17CpSettingsWrapper10metaObjectEv @ 49 NONAME
+	_ZNK17CpSettingsWrapper14isPhoneOfflineEv @ 50 NONAME
+	_ZNK17CpSettingsWrapper15readCenrepValueElm @ 51 NONAME
+	_ZNK17CpSettingsWrapper16readCenrepStringElm @ 52 NONAME
+	_ZNK17CpSettingsWrapper16writeCenrepValueElmRK8QVariant @ 53 NONAME
+	_ZNK17CpSettingsWrapper23numberGroupingSupportedEv @ 54 NONAME
+	_ZNK5Tools10metaObjectEv @ 55 NONAME
+	_ZTI12CpPhoneNotes @ 56 NONAME
+	_ZTI17CpSettingsWrapper @ 57 NONAME
+	_ZTI5Tools @ 58 NONAME
+	_ZTV12CpPhoneNotes @ 59 NONAME
+	_ZTV17CpSettingsWrapper @ 60 NONAME
+	_ZTV5Tools @ 61 NONAME
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonyplugin.cpp
--- a/phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonyplugin.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonyplugin.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -37,12 +37,15 @@
     UNINSTALL_TRACE_MSG_HANDLER; 
 }
 
-CpSettingFormItemData *CpTelephonyPlugin::createSettingFormItemData(
-    CpItemDataHelper &itemDataHelper) const
+QList<CpSettingFormItemData*> CpTelephonyPlugin::createSettingFormItemData(
+        CpItemDataHelper &itemDataHelper) const
 {
     DPRINT;
-    return new CpSettingFormEntryItemDataImpl<CpTelephonyPluginView>(
-            itemDataHelper, hbTrId("Telephony"), hbTrId(""));
+
+    QList<CpSettingFormItemData*> ret;
+    ret.append(new CpSettingFormEntryItemDataImpl<CpTelephonyPluginView>(
+            itemDataHelper, hbTrId("Telephony"), hbTrId("")));
+    return ret;
 }
 
 Q_EXPORT_PLUGIN2(cptelephonyplugin, CpTelephonyPlugin);
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonyplugin.h
--- a/phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonyplugin.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonyplugin.h	Fri Apr 16 14:58:25 2010 +0300
@@ -19,7 +19,7 @@
 #define CPTELEPHONYPLUGIN_H
 
 #include <qobject.h>
-#include <cppluginplatinterface.h>
+#include <cpplugininterface.h>
 
 /*!
     \class CpTelephonyPlugin
@@ -27,10 +27,10 @@
  */
 class CpTelephonyPlugin
         : public QObject,
-          public CpPluginPlatInterface
+          public CpPluginInterface
 {
     Q_OBJECT
-    Q_INTERFACES(CpPluginPlatInterface)
+    Q_INTERFACES(CpPluginInterface)
     
 public:
  
@@ -38,10 +38,11 @@
     ~CpTelephonyPlugin();
     
     /*!
-     From CpPluginPlatInterface.
-     @see CpPluginPlatInterface.
+     From CpPluginInterface.
+     @see CpPluginInterface.
      */
-    CpSettingFormItemData *createSettingFormItemData(CpItemDataHelper &itemDataHelper) const;
+    QList<CpSettingFormItemData*> createSettingFormItemData(
+            CpItemDataHelper &itemDataHelper) const;
 };
 
 #endif /* CPTELEPHONYPLUGIN_H */
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonypluginview.cpp
--- a/phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonypluginview.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonypluginview.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -16,19 +16,20 @@
 */
 
 #include "cptelephonypluginview.h"
-#include "cpplugincommon.h"
 #include "cppluginlogging.h"
 #include <QPluginLoader>
 #include <QApplication>
 #include <QLocale>
 #include <QTranslator>
 #include <hbdataformmodel.h>
-#include <cppluginplatinterface.h>
+#include <cpplugininterface.h>
 #include <cpsettingformitemdata.h>
 #include <cpitemdatahelper.h>
+#include <cppluginutility.h>
+#include <cppluginloader.h>
 
 CpTelephonyPluginView::CpTelephonyPluginView() : 
-    CpBaseSettingView(),
+    CpBaseSettingView(0,0),
     m_helper(NULL)
 {
     DPRINT << ": IN";
@@ -45,35 +46,32 @@
         DPRINT << ": translator installed"; 
     }
     
-    HbDataForm *form = settingForm();
+    HbDataForm *form = qobject_cast<HbDataForm*>(widget());
     if (form) {
         HbDataFormModel *model = new HbDataFormModel;
         form->setHeading(hbTrId("Telephone settings"));
         // Create and initialize plugin's item data helper
         m_helper = initializeItemDataHelper(); 
-        HbDataFormModelItem *item(NULL);
+        QList<CpSettingFormItemData*> items;
         
-        DPRINT << ": Loading cpcallsplugin";
         // Load calls plugin
-        item = groupItemFromPlugin("cpcallsplugin");
-        if (item) {
-            model->appendDataFormItem(item);
-        }
+        DPRINT << ": Loading cpcallsplugin";
+        items.append(groupItemFromPlugin("cpcallsplugin"));
         
         // Load diverts plugin
         DPRINT << ": Loading cpdivertsplugin";
-        item = groupItemFromPlugin("cpdivertplugin");
-        if (item) {
-            model->appendDataFormItem(item);
-        }
+        items.append(groupItemFromPlugin("cpdivertplugin"));
+        
 
         // Load call mailboxes plugin
         DPRINT << ": Loading vmbxcpplugin";
-        item = groupItemFromPlugin("vmbxcpplugin");
-        if (item) {
-            model->appendDataFormItem(item);
+        items.append(groupItemFromPlugin("vmbxcpplugin"));
+
+        // Insert items to form model
+        foreach (CpSettingFormItemData* i, items) {
+            model->appendDataFormItem(i);
         }
-
+        
         form->setModel(model);
     }
     
@@ -89,23 +87,16 @@
     DPRINT << ": OUT";
 }
 
-HbDataFormModelItem* CpTelephonyPluginView::groupItemFromPlugin( const QString& plugin )
+QList<CpSettingFormItemData*> CpTelephonyPluginView::groupItemFromPlugin( const QString& plugin )
 {
     DPRINT << ": IN";
  
-    CpSettingFormItemData *item(NULL);
-    CpPluginPlatInterface *p(NULL);
+    QList<CpSettingFormItemData*> items;
+    CpPluginInterface *p(NULL);
     try {
-        p = Tools::loadCpPlugin(plugin);
+        p = CpPluginLoader::loadCpPlugin(plugin);
         if (p && m_helper){
-            item = p->createSettingFormItemData(*m_helper);
-            if (item){
-                item->setType(HbDataFormModelItem::GroupItem);
-                QObject::connect(
-                        settingForm(), SIGNAL(itemShown(QModelIndex)),
-                        item, SLOT(itemShown(QModelIndex)));
-                DPRINT << "plugin:" << plugin;
-            }
+            items = p->createSettingFormItemData(*m_helper);
         }
     } catch(...) {
         DPRINT << "CATCH ERROR";
@@ -113,72 +104,13 @@
     }
     
     DPRINT << ": OUT";
-    return item;
-}
-
-void CpTelephonyPluginView::onConnectionAdded(HbDataFormModelItem *item,
-                                   const QString &signal,
-                                   QObject *receiver,
-                                   const QString &method)
-{
-    DPRINT << ": IN";
-    
-    if (HbDataForm *form = settingForm()) {
-        form->addConnection(item, signal.toAscii(), receiver, method.toAscii());
-    }
-    
-    DPRINT << ": OUT";
-}
-
-void CpTelephonyPluginView::onConnectionRemoved(HbDataFormModelItem *item,
-                                     const QString &signal,
-                                     QObject *receiver,
-                                     const QString &method)
-{
-    DPRINT << ": IN";
-    
-    if (HbDataForm *form = settingForm()) {
-        form->removeConnection(item, signal.toAscii(), receiver, method.toAscii());
-    }
-    
-    DPRINT << ": OUT";
-}
-
-void CpTelephonyPluginView::onPrototypeAdded(HbAbstractViewItem *prototype)
-{
-    DPRINT << ": IN";
-    
-    if (HbDataForm *form = settingForm()) {
-        QList<HbAbstractViewItem *> prototypes = form->itemPrototypes();
-        prototypes.append(prototype);
-        form->setItemPrototypes(prototypes);
-    }
-    
-    DPRINT << ": OUT";
+    return items;
 }
 
 CpItemDataHelper* CpTelephonyPluginView::initializeItemDataHelper()
 {
-    DPRINT << ": IN";
-    
-    CpItemDataHelper *itemDataHelper = new CpItemDataHelper;
-    DPRINT << "itemDataHelper:" << reinterpret_cast<int>(itemDataHelper);
-    itemDataHelper->bindToForm(settingForm());
-    connect(itemDataHelper, 
-        SIGNAL(connectionAdded(HbDataFormModelItem*, QString, QObject *, QString)),
-        this,
-        SLOT(onConnectionAdded(HbDataFormModelItem*, QString, QObject *, QString)));
-    connect(itemDataHelper,
-        SIGNAL(connectionRemoved(HbDataFormModelItem*, QString, QObject *, QString)),
-        this,
-        SLOT(onConnectionRemoved(HbDataFormModelItem*, QString, QObject *, QString)));
-    connect(itemDataHelper,
-        SIGNAL(prototypeAdded(HbAbstractViewItem *)),
-        this,
-        SLOT(onPrototypeAdded(HbAbstractViewItem *)));
-    
-    DPRINT << ": OUT : helper signals connected";
-    return itemDataHelper;
+    DPRINT;
+    return new CpItemDataHelper(qobject_cast<HbDataForm*>(widget()));
 }
 
 // End of File. 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonypluginview.h
--- a/phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonypluginview.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonypluginview.h	Fri Apr 16 14:58:25 2010 +0300
@@ -23,6 +23,7 @@
 #include <cpbasesettingview.h>
 
 class HbDataFormModelItem;
+class CpSettingFormItemData;
 
 /*!
     \class CpTelephonyPluginView
@@ -39,24 +40,10 @@
 private: 
     
     CpItemDataHelper* initializeItemDataHelper();
-    
-private slots: 
-
-    void onConnectionAdded(HbDataFormModelItem *item,
-            const QString &signal,
-            QObject *receiver,
-            const QString &method);
-    
-    void onConnectionRemoved(HbDataFormModelItem *item,
-            const QString &signal,
-            QObject *receiver,
-            const QString &method);
-    
-    void onPrototypeAdded(HbAbstractViewItem *prototype);
 
 private: 
  
-    HbDataFormModelItem* groupItemFromPlugin(const QString& plugin);
+    QList<CpSettingFormItemData*> groupItemFromPlugin(const QString& plugin);
     
 private:   // data
  
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonyplugin/qtestmains60ui.h
--- a/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonyplugin/qtestmains60ui.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonyplugin/qtestmains60ui.h	Fri Apr 16 14:58:25 2010 +0300
@@ -25,7 +25,7 @@
 #define QTEST_MAIN_S60UI(TestObject) \
 int main(int argc, char *argv[]) \
 { \
-\
+HbApplication app(argc, argv); \
 QString str = "C:\\data\\" + QFileInfo(QCoreApplication::applicationFilePath()).baseName() + ".log"; \
 QByteArray   bytes  = str.toAscii(); \
 \
@@ -35,7 +35,6 @@
 new_argv[1] = arg1; \
 new_argv[2] = bytes.data(); \
 \
-HbApplication app(argc, argv); \
 TestObject tc; \
 QResource::registerResource("../hbcore.rcc"); \
 HbMainWindow mainWindow; \
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonyplugin/ut_cptelephonyplugin.cpp
--- a/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonyplugin/ut_cptelephonyplugin.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonyplugin/ut_cptelephonyplugin.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -17,6 +17,7 @@
 
 #include "ut_cptelephonyplugin.h"
 #include "qtestmains60ui.h"
+#include <cpsettingformitemdata.h>
 #define private public
 #include "cptelephonyplugin.h"
 #include "cpitemdatahelper.h"
@@ -76,9 +77,13 @@
 void UT_CpTelephonyPlugin::t_createSettingFormItemData()
 {
     CpItemDataHelper itemDataHelper;
-    CpSettingFormItemData *pSettingFormItemData = 
+    QList<CpSettingFormItemData*> items = 
             m_callsplugin->createSettingFormItemData(itemDataHelper);
+    
+    QVERIFY(items.count()==1);
+    qDeleteAll(items);
 }
 
 
+
 QTEST_MAIN_S60UI(UT_CpTelephonyPlugin)
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonyplugin/ut_cptelephonyplugin.pro
--- a/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonyplugin/ut_cptelephonyplugin.pro	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonyplugin/ut_cptelephonyplugin.pro	Fri Apr 16 14:58:25 2010 +0300
@@ -13,6 +13,7 @@
 #
 # Description: 
 #
+#
 
 CONFIG += qtestlib hb
 TEMPLATE = app
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonypluginview/qtestmains60ui.h
--- a/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonypluginview/qtestmains60ui.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonypluginview/qtestmains60ui.h	Fri Apr 16 14:58:25 2010 +0300
@@ -25,7 +25,7 @@
 #define QTEST_MAIN_S60UI(TestObject) \
 int main(int argc, char *argv[]) \
 { \
-\
+HbApplication app(argc, argv); \
 QString str = "C:\\data\\" + QFileInfo(QCoreApplication::applicationFilePath()).baseName() + ".log"; \
 QByteArray   bytes  = str.toAscii(); \
 \
@@ -35,7 +35,6 @@
 new_argv[1] = arg1; \
 new_argv[2] = bytes.data(); \
 \
-HbApplication app(argc, argv); \
 TestObject tc; \
 QResource::registerResource("../hbcore.rcc"); \
 HbMainWindow mainWindow; \
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonypluginview/ut_cptelephonypluginview.cpp
--- a/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonypluginview/ut_cptelephonypluginview.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonypluginview/ut_cptelephonypluginview.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -17,29 +17,27 @@
 
 #include "ut_cptelephonypluginview.h"
 #include "qtestmains60ui.h"
-#include <CpPluginPlatInterface.h>
+#include <cpplugininterface.h>
 #include <cpitemdatahelper.h>
-#include <CpSettingFormItemData.h>
+#include <cpsettingformitemdata.h>
 #include <smcmockclassincludes.h>
-#include <HbDataForm.h>
-#include <HbDataFormModel.h>
+#include <hbdataform.h>
+#include <hbdataformmodel.h>
 #include <hbsettingformitem.h>
-#define private public
 #include "cptelephonypluginview.h"
 
 
-class DummyPlugin : public CpPluginPlatInterface
+class DummyPlugin : public CpPluginInterface
 {
 public:
     DummyPlugin(){}
     ~DummyPlugin(){}
     
-    CpSettingFormItemData *createSettingFormItemData(
+    QList<CpSettingFormItemData*> createSettingFormItemData(
             CpItemDataHelper &itemDataHelper) const
     {
-    SMC_MOCK_METHOD1( CpSettingFormItemData*, CpItemDataHelper &, itemDataHelper )
+        SMC_MOCK_METHOD1( QList<CpSettingFormItemData*>, CpItemDataHelper &, itemDataHelper )
     }
-    
 };
 
 /*!
@@ -67,17 +65,15 @@
 void UT_CpTelephonyPluginView::init()
 {
     initialize();
-    CpPluginPlatInterface *nullPlugin=0;
-    expect("Tools::loadCpPlugin").with(QString("cpcallsplugin")).returns(nullPlugin);
+    CpPluginInterface *nullPlugin=0;
+    expect("CpPluginLoader::loadCpPlugin").with(QString("cpcallsplugin")).returns(nullPlugin);
     DummyPlugin *ret = new DummyPlugin;
-    //CpSettingFormItemData *nullItemData=0;
-    //expect("Tools::loadCpPlugin").with(QString("cpdivertplugin")).returns(ret);
-    //expect("DummyPlugin::createSettingFormItemData").returns(nullItemData);
     
     //ret = new DummyPlugin;
-    CpSettingFormItemData *itemData = new CpSettingFormItemData;
-    expect("Tools::loadCpPlugin").with(QString("cpdivertplugin")).returns(ret); // cpnetworkplugin
-    expect("DummyPlugin::createSettingFormItemData").returns(itemData);
+    QList<CpSettingFormItemData*> list;
+    list.append(new CpSettingFormItemData);
+    expect("CpPluginLoader::loadCpPlugin").with(QString("cpdivertplugin")).returns(ret); // cpnetworkplugin
+    expect("DummyPlugin::createSettingFormItemData").returns(list);
     
     m_callspluginview = new CpTelephonyPluginView;
     QVERIFY( verify() );
@@ -99,53 +95,22 @@
  */
 void UT_CpTelephonyPluginView::t_memleak()
 {
-    CpSettingFormItemData *itemData = new CpSettingFormItemData;
+    QList<CpSettingFormItemData*> list;
+    list.append(new CpSettingFormItemData);
     DummyPlugin *ret = new DummyPlugin;
-    expect("Tools::loadCpPlugin").with(QString("cpcallsplugin")).returns(ret);
-    expect("DummyPlugin::createSettingFormItemData").returns(itemData);
+    expect("CpPluginLoader::loadCpPlugin").with(QString("cpcallsplugin")).returns(ret);
+    expect("DummyPlugin::createSettingFormItemData").returns(list);
     
     ret = new DummyPlugin;
-    expect("Tools::loadCpPlugin").with(QString("cpdivertplugin")).returns(ret);
-    expect("DummyPlugin::createSettingFormItemData").returns(itemData);
+    expect("CpPluginLoader::loadCpPlugin").with(QString("cpdivertplugin")).returns(ret);
+    expect("DummyPlugin::createSettingFormItemData").returns(list);
     
-    //CpPluginPlatInterface *nullPlugin=0;
-    //expect("Tools::loadCpPlugin").with(QString("cpnetworkplugin")).returns(nullPlugin);
     
     CpTelephonyPluginView *tmp = new CpTelephonyPluginView;
     QVERIFY( verify() );
     delete tmp;
 }
 
-/*!
-  UT_CpTelephonyPluginView::t_onConnectionRemoved
- */
-void UT_CpTelephonyPluginView::t_onConnectionRemoved()
-{
-    HbDataForm *w = m_callspluginview->settingForm();
-    HbDataFormModel *m = static_cast<HbDataFormModel *>(w->model());
-
-    m_callspluginview->m_helper->addConnection(
-            m->item(0),SIGNAL(currentIndexChanged(int)),
-            this, SLOT(tmp(int)));
-    
-    m_callspluginview->m_helper->removeConnection(
-            m->item(0),SIGNAL(currentIndexChanged(int)),
-            this, SLOT(tmp(int)));
-}
-
-/*!
-  UT_CpTelephonyPluginView::t_onPrototypeAdded
- */
-void UT_CpTelephonyPluginView::t_onPrototypeAdded()
-{
-    HbSettingFormItem* item= new HbSettingFormItem;
-    m_callspluginview->m_helper->addItemPrototype(item);
-    QVERIFY( m_callspluginview->settingForm()->
-        itemPrototypes().contains(item) );
-    
-    delete item;
-}
-
 
 
 QTEST_MAIN_S60UI(UT_CpTelephonyPluginView)
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonypluginview/ut_cptelephonypluginview.h
--- a/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonypluginview/ut_cptelephonypluginview.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonypluginview/ut_cptelephonypluginview.h	Fri Apr 16 14:58:25 2010 +0300
@@ -38,9 +38,7 @@
     void cleanup();
     
     void t_memleak();
-    
-    void t_onConnectionRemoved();
-    void t_onPrototypeAdded();
+
 private:
     CpTelephonyPluginView *m_callspluginview;
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonypluginview/ut_cptelephonypluginview.pro
--- a/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonypluginview/ut_cptelephonypluginview.pro	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonypluginview/ut_cptelephonypluginview.pro	Fri Apr 16 14:58:25 2010 +0300
@@ -13,6 +13,7 @@
 #
 # Description: 
 #
+#
 
 CONFIG += qtestlib hb
 TEMPLATE = app
@@ -20,7 +21,7 @@
 DEPENDPATH += . ../../src/
 INCLUDEPATH += .
 INCLUDEPATH +=../../../cptelephonyutils/inc
-DEFINES += BUILD_CPTELEPHONYUTILS
+DEFINES += BUILD_CP_FRAMEWORK
 
 QT -= gui
 QT += testlib
@@ -39,10 +40,10 @@
 SOURCES += ut_cptelephonypluginview.cpp
 
 # code to be tested
-HEADERS += ../../src/cptelephonypluginview.h \
-           ../../../cptelephonyutils/inc/cpplugincommon.h
+HEADERS += ../../src/cptelephonypluginview.h
            
 SOURCES += ../../src/cptelephonypluginview.cpp 
 
 # mocks needed for testing
-SOURCES += ../../../tsrc/mocks/mock_cpplugincommon.cpp
+SOURCES += ../../../tsrc/mocks/mock_cppluginloader.cpp
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpbarringplugin.cpp
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpbarringplugin.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpbarringplugin.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -16,6 +16,7 @@
 */
 #include <QDebug>
 #include "cpbarringplugin.h"
+#include <cpsettingformitemdata.h>
 
 // ============================ MEMBER FUNCTIONS ===============================
 
@@ -43,9 +44,9 @@
 // CpBarringPlugin::createSettingFormItemData
 // -----------------------------------------------------------------------------
 //
-CpSettingFormItemData * CpBarringPlugin::createSettingFormItemData( 
-        CpItemDataHelper & itemDataHelper ) const
+QList<CpSettingFormItemData*> CpBarringPlugin::createSettingFormItemData(
+        CpItemDataHelper &itemDataHelper) const
     {
     Q_UNUSED( itemDataHelper )
-    return NULL;
+    return QList<CpSettingFormItemData *> ();
     }
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpbarringplugingroup.cpp
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpbarringplugingroup.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpbarringplugingroup.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -14,7 +14,16 @@
 * Description:
 *
 */
+#include <smcmockclassincludes.h>
 #include <QDebug>
+#include <hbdataformmodel.h>
+#include <hbdataformmodelitem.h>
+#include <HbCheckBox>
+#include <QTranslator>
+#include <QLocale>
+#include <QApplication>
+#include <QTimer>
+#include <cpitemdatahelper.h>
 #include "cpbarringplugingroup.h"
 
 // ============================ MEMBER FUNCTIONS ===============================
@@ -41,5 +50,83 @@
     }
 
 
+// -----------------------------------------------------------------------------
+// CpBarringPluginGroup::itemShown
+// -----------------------------------------------------------------------------
+//
+void CpBarringPluginGroup::itemShown(const QModelIndex& item)
+{
+    SMC_MOCK_METHOD1( void, QModelIndex &, item )
+}
+
+
+// -----------------------------------------------------------------------------
+// CpBarringPluginGroup::barringStatusRequestCompleted
+// -----------------------------------------------------------------------------
+//
+void CpBarringPluginGroup::barringStatusRequestCompleted(
+    int result,
+    const QList<unsigned char> & basicServiceGroupIds,
+    PSetCallBarringWrapper::BarringStatus status)
+{
+    SMC_MOCK_METHOD3( void, 
+        int, result,
+        const QList<unsigned char> &, basicServiceGroupIds, 
+        PSetCallBarringWrapper::BarringStatus, status)
+}
 
 
+// -----------------------------------------------------------------------------
+// CpBarringPluginGroup::enableBarringRequestCompleted
+// -----------------------------------------------------------------------------
+//
+void CpBarringPluginGroup::enableBarringRequestCompleted(
+    int result,
+    PSetCallBarringWrapper::BarringType barringType,
+    PSetCallBarringWrapper::BarringStatus barringStatus, 
+    bool plural)
+{
+    SMC_MOCK_METHOD4( void, 
+        int, result,
+        PSetCallBarringWrapper::BarringType, barringType, 
+        PSetCallBarringWrapper::BarringStatus, barringStatus,
+        bool, plural)
+}
+
+
+// -----------------------------------------------------------------------------
+// CpBarringPluginGroup::disableBarringRequestCompleted
+// -----------------------------------------------------------------------------
+//
+void CpBarringPluginGroup::disableBarringRequestCompleted(
+    int result,
+    PSetCallBarringWrapper::BarringType barringType,
+    PSetCallBarringWrapper::BarringStatus barringStatus, 
+    bool plural)
+{
+    SMC_MOCK_METHOD4( void, 
+        int, result,
+        PSetCallBarringWrapper::BarringType, barringType, 
+        PSetCallBarringWrapper::BarringStatus, barringStatus,
+        bool, plural)
+}
+
+
+// -----------------------------------------------------------------------------
+// CpBarringPluginGroup::changeBarringStateRequested
+// -----------------------------------------------------------------------------
+//
+void CpBarringPluginGroup::changeBarringStateRequested(int checkState)
+{
+    SMC_MOCK_METHOD1( void, int, checkState)
+}
+
+
+// -----------------------------------------------------------------------------
+// CpBarringPluginGroup::processBarringStatusRequestQueue
+// -----------------------------------------------------------------------------
+//
+void CpBarringPluginGroup::processBarringStatusRequestQueue()
+{
+    SMC_MOCK_METHOD0( void )    
+}
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpbasesettingview.cpp
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpbasesettingview.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpbasesettingview.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -25,8 +25,8 @@
 // -----------------------------------------------------------------------------
 //
 CpBaseSettingView::CpBaseSettingView( 
-        HbDataForm *,
-        QGraphicsItem *)
+        QGraphicsWidget * ,
+        QGraphicsItem *  )
     //:
     //HbView( /*settingForm, parent*/ )
     {
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpcallsplugin.cpp
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpcallsplugin.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpcallsplugin.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -16,6 +16,7 @@
 */
 #include <QDebug>
 #include "cpcallsplugin.h"
+#include <cpsettingformitemdata.h>
 
 // ============================ MEMBER FUNCTIONS ===============================
 
@@ -43,9 +44,9 @@
 // CpCallsPlugin::createSettingFormItemData
 // -----------------------------------------------------------------------------
 //
-CpSettingFormItemData * CpCallsPlugin::createSettingFormItemData( 
-        CpItemDataHelper & itemDataHelper ) const
+QList<CpSettingFormItemData*> CpCallsPlugin::createSettingFormItemData(
+        CpItemDataHelper &itemDataHelper) const
     {
     Q_UNUSED( itemDataHelper )
-    return NULL;
+    return QList<CpSettingFormItemData *> ();
     }
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpitemdatahelper.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpitemdatahelper.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,147 @@
+/* 
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#include <QDebug>
+#include <smcmockclassincludes.h>
+#include <QList>
+#include <hbdataform.h>
+#include <hbdataformmodelitem.h>
+#include <hbdataformviewitem.h>
+#include "cpitemdatahelper.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// CpItemDataHelper::CpItemDataHelper
+// -----------------------------------------------------------------------------
+//
+CpItemDataHelper::CpItemDataHelper( 
+        HbDataForm * form )
+    //:
+    //QObject( /*form*/ )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// CpItemDataHelper::~CpItemDataHelper
+// -----------------------------------------------------------------------------
+//
+CpItemDataHelper::~CpItemDataHelper(  )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// CpItemDataHelper::bindToForm
+// -----------------------------------------------------------------------------
+//
+void CpItemDataHelper::bindToForm( 
+        HbDataForm * form )
+    {
+    SMC_MOCK_METHOD1( void, HbDataForm *, form )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CpItemDataHelper::addItemPrototype
+// -----------------------------------------------------------------------------
+//
+void CpItemDataHelper::addItemPrototype( 
+        HbAbstractViewItem * prototype )
+    {
+    SMC_MOCK_METHOD1( void, HbAbstractViewItem *, prototype )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CpItemDataHelper::addConnection
+// -----------------------------------------------------------------------------
+//
+void CpItemDataHelper::addConnection( 
+        HbDataFormModelItem * item,
+        const char * signal,
+        QObject * receiver,
+        const char * method )
+    {
+    SMC_MOCK_METHOD4( void, HbDataFormModelItem *, item, 
+        const char *, signal, 
+        QObject *, receiver, 
+        const char *, method )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CpItemDataHelper::removeConnection
+// -----------------------------------------------------------------------------
+//
+void CpItemDataHelper::removeConnection( 
+        HbDataFormModelItem * item,
+        const char * signal,
+        QObject * receiver,
+        const char * method )
+    {
+    SMC_MOCK_METHOD4( void, HbDataFormModelItem *, item, 
+        const char *, signal, 
+        QObject *, receiver, 
+        const char *, method )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CpItemDataHelper::connectToForm
+// -----------------------------------------------------------------------------
+//
+void CpItemDataHelper::connectToForm( 
+        const char * signal,
+        QObject * receiver,
+        const char * method )
+    {
+    SMC_MOCK_METHOD3( void, const char *, signal, 
+        QObject *, receiver, 
+        const char *, method )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CpItemDataHelper::disconnectFromForm
+// -----------------------------------------------------------------------------
+//
+void CpItemDataHelper::disconnectFromForm( 
+        const char * signal,
+        QObject * receiver,
+        const char * method )
+    {
+    SMC_MOCK_METHOD3( void, const char *, signal, 
+        QObject *, receiver, 
+        const char *, method )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CpItemDataHelper::widgetFromModelIndex
+// -----------------------------------------------------------------------------
+//
+HbWidget * CpItemDataHelper::widgetFromModelIndex( 
+        const QModelIndex & index )
+    {
+    SMC_MOCK_METHOD1( HbWidget *, const QModelIndex &, index )
+    }
+
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpnetworkplugin.cpp
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpnetworkplugin.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpnetworkplugin.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -16,6 +16,7 @@
 */
 #include <QDebug>
 #include "cpnetworkplugin.h"
+#include <cpsettingformitemdata.h>
 
 // ============================ MEMBER FUNCTIONS ===============================
 
@@ -43,9 +44,9 @@
 // CpNetworkPlugin::createSettingFormItemData
 // -----------------------------------------------------------------------------
 //
-CpSettingFormItemData * CpNetworkPlugin::createSettingFormItemData( 
-        CpItemDataHelper & itemDataHelper ) const
+QList<CpSettingFormItemData*> CpNetworkPlugin::createSettingFormItemData(
+        CpItemDataHelper &itemDataHelper) const
     {
     Q_UNUSED( itemDataHelper )
-    return NULL;
+    return QList<CpSettingFormItemData *> ();
     }
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpplugincommon.cpp
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpplugincommon.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpplugincommon.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -118,27 +118,6 @@
     SMC_MOCK_METHOD0( bool )
 }
 
-// -----------------------------------------------------------------------------
-// Tools::loadCpPlugin
-// -----------------------------------------------------------------------------
-//
-CpPluginPlatInterface * Tools::loadCpPlugin( 
-        const QString & name )
-    {
-    SMC_MOCK_METHOD1( CpPluginPlatInterface*, QString &, name )
-    }
-
-
-// -----------------------------------------------------------------------------
-// Tools::unloadCpPlugin
-// -----------------------------------------------------------------------------
-//
-bool Tools::unloadCpPlugin( 
-        const QString & name )
-    {
-    SMC_MOCK_METHOD1( CpPluginPlatInterface*, QString &, name )
-    }
-
 
 // -----------------------------------------------------------------------------
 // Tools::voipSupported
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cppluginloader.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cppluginloader.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,45 @@
+/* 
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#include <QDebug>
+#include <smcmockclassincludes.h>
+#include "cppluginloader.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// CpPluginLoader::loadCpPlugin
+// -----------------------------------------------------------------------------
+//
+CpPluginInterface * CpPluginLoader::loadCpPlugin( 
+        const QString & pluginFile )
+    {
+    SMC_MOCK_METHOD1( CpPluginInterface *, const QString &, pluginFile )
+    }
+
+
+// -----------------------------------------------------------------------------
+// CpPluginLoader::loadPlatCpPlugin
+// -----------------------------------------------------------------------------
+//
+CpPluginPlatInterface * CpPluginLoader::loadPlatCpPlugin( 
+        const QString & pluginFile )
+    {
+    SMC_MOCK_METHOD1( CpPluginPlatInterface *, const QString &, pluginFile )
+    }
+
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpsettingformentryitemdataimpl.cpp
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpsettingformentryitemdataimpl.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpsettingformentryitemdataimpl.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,17 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cptelephonypluginview.cpp
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cptelephonypluginview.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cptelephonypluginview.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -24,7 +24,7 @@
 // -----------------------------------------------------------------------------
 //
 CpTelephonyPluginView::CpTelephonyPluginView(  )
-    //: CpBaseSettingView( /**/ )
+    :CpBaseSettingView(0, 0)
     {
     
     }
@@ -38,24 +38,3 @@
     {
     
     }
-
-void CpTelephonyPluginView::onConnectionAdded(HbDataFormModelItem *item,
-                                   const QString &signal,
-                                   QObject *receiver,
-                                   const QString &method)
-{
-
-}
-
-void CpTelephonyPluginView::onConnectionRemoved(HbDataFormModelItem *item,
-                                     const QString &signal,
-                                     QObject *receiver,
-                                     const QString &method)
-{
-
-}
-
-void CpTelephonyPluginView::onPrototypeAdded(HbAbstractViewItem *prototype)
-{
-
-}
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_hblabel.cpp
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_hblabel.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_hblabel.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -20,27 +20,8 @@
 
 // ============================ MEMBER FUNCTIONS ===============================
 
-// -----------------------------------------------------------------------------
-// HbLabel::Q_PROPERTY
-// -----------------------------------------------------------------------------
-/*
-void HbLabel::Q_PROPERTY( 
-        QString plainText READ plainText WRITE setPlainText ) Q_PROPERTY ( QString html READ html WRITE setHtml ) Q_PROPERTY ( Qt::Alignment alignment READ alignment WRITE setAlignment ) Q_PROPERTY ( Qt::TextElideMode elideMode READ elideMode WRITE setElideMode ) Q_PROPERTY ( Hb::TextWrapping textWrapping READ textWrapping WRITE setTextWrapping ) Q_PROPERTY ( QColor textColor READ textColor WRITE setTextColor ) Q_PROPERTY ( HbIcon icon READ icon WRITE setIcon ) Q_PROPERTY ( Qt::AspectRatioMode aspectRatioMode READ aspectRatioMode WRITE setAspectRatioMode ) Q_ENUMS ( QIcon::Mode QIcon::State ) Q_PROPERTY ( QString text READ text WRITE setText NOTIFY textChanged USER true ) Q_PROPERTY ( QColor color READ color WRITE setColor ) Q_PROPERTY ( int textFlags READ textFlags WRITE setTextFlags ) Q_PROPERTY ( Hb::LogicalFontName logicalFont READ logicalFont WRITE setLogicalFont ) Q_PROPERTY ( QIcon::Mode mode READ mode WRITE setMode ) Q_PROPERTY ( QIcon::State state READ state WRITE setState ) Q_PROPERTY ( Qt::TextFormat textFormat READ textFormat WRITE setTextFormat ):HbLabel ( QGraphicsItem * parent )
-    {
-    SMC_MOCK_METHOD1( void, QString plainText READ plainText WRITE setPlainText ) Q_PROPERTY ( QString html READ html WRITE setHtml ) Q_PROPERTY ( Qt::Alignment alignment READ alignment WRITE setAlignment ) Q_PROPERTY ( Qt::TextElideMode elideMode READ elideMode WRITE setElideMode ) Q_PROPERTY ( Hb::TextWrapping textWrapping READ textWrapping WRITE setTextWrapping ) Q_PROPERTY ( QColor textColor READ textColor WRITE setTextColor ) Q_PROPERTY ( HbIcon icon READ icon WRITE setIcon ) Q_PROPERTY ( Qt::AspectRatioMode aspectRatioMode READ aspectRatioMode WRITE setAspectRatioMode ) Q_ENUMS ( QIcon::Mode QIcon::State ) Q_PROPERTY ( QString text READ text WRITE setText NOTIFY textChanged USER true ) Q_PROPERTY ( QColor color READ color WRITE setColor ) Q_PROPERTY ( int textFlags READ textFlags WRITE setTextFlags ) Q_PROPERTY ( Hb::LogicalFontName logicalFont READ logicalFont WRITE setLogicalFont ) Q_PROPERTY ( QIcon::Mode mode READ mode WRITE setMode ) Q_PROPERTY ( QIcon::State state READ state WRITE setState ) Q_PROPERTY ( Qt::TextFormat textFormat READ textFormat WRITE setTextFormat ):HbLabel ( QGraphicsItem *, parent )
-    }
-*/
 
-// -----------------------------------------------------------------------------
-// HbLabel::HbLabel
-// -----------------------------------------------------------------------------
-//
-HbLabel::HbLabel( 
-        QGraphicsItem * parent )
-    {
 
-    }
-    
 // -----------------------------------------------------------------------------
 // HbLabel::HbLabel
 // -----------------------------------------------------------------------------
@@ -220,17 +201,6 @@
 
 
 // -----------------------------------------------------------------------------
-// HbLabel::setGeometry
-// -----------------------------------------------------------------------------
-//
-void HbLabel::setGeometry( 
-        const QRectF & rect )
-    {
-  //  SMC_MOCK_METHOD1( void, const QRectF &, rect )
-    }
-
-
-// -----------------------------------------------------------------------------
 // HbLabel::primitive
 // -----------------------------------------------------------------------------
 //
@@ -245,191 +215,11 @@
 // HbLabel::type
 // -----------------------------------------------------------------------------
 //
-/*
 int HbLabel::type(  ) const
     {
     SMC_MOCK_METHOD0( int )
     }
 
-*/
-
-// -----------------------------------------------------------------------------
-// HbLabel::setColor
-// -----------------------------------------------------------------------------
-//
-void HbLabel::setColor( 
-        const QColor & textColor )
-    {
-  //  SMC_MOCK_METHOD1( void, const QColor &, textColor )
-    }
-
-
-// -----------------------------------------------------------------------------
-// HbLabel::color
-// -----------------------------------------------------------------------------
-//
-QColor HbLabel::color(  ) const
-    {
-   // SMC_MOCK_METHOD0( QColor )
-    }
-
-
-// -----------------------------------------------------------------------------
-// HbLabel::setLogicalFont
-// -----------------------------------------------------------------------------
-//
-void HbLabel::setLogicalFont( 
-        Hb::LogicalFontName logicalFont )
-    {
- //   SMC_MOCK_METHOD1( void, Hb::LogicalFontName, logicalFont )
-    }
-
-
-// -----------------------------------------------------------------------------
-// HbLabel::logicalFont
-// -----------------------------------------------------------------------------
-//
-Hb::LogicalFontName HbLabel::logicalFont(  ) const
-    {
-   // SMC_MOCK_METHOD0( Hb::LogicalFontName )
-    }
-
-
-// -----------------------------------------------------------------------------
-// HbLabel::text
-// -----------------------------------------------------------------------------
-//
-QString HbLabel::text(  ) const
-    {
-    SMC_MOCK_METHOD0( QString )
-    }
-
-
-// -----------------------------------------------------------------------------
-// HbLabel::setTextFlags
-// -----------------------------------------------------------------------------
-//
-void HbLabel::setTextFlags( 
-        int flags )
-    {
-    SMC_MOCK_METHOD1( void, int, flags )
-    }
-
-
-// -----------------------------------------------------------------------------
-// HbLabel::textFlags
-// -----------------------------------------------------------------------------
-//
-int HbLabel::textFlags(  ) const
-    {
-    SMC_MOCK_METHOD0( int )
-    }
-
-
-// -----------------------------------------------------------------------------
-// HbLabel::effectiveFont
-// -----------------------------------------------------------------------------
-//
-QFont HbLabel::effectiveFont(  ) const
-    {
-  //  SMC_MOCK_METHOD0( QFont )
-    }
-
-
-// -----------------------------------------------------------------------------
-// HbLabel::setMode
-// -----------------------------------------------------------------------------
-//
-void HbLabel::setMode( 
-        QIcon::Mode mode )
-    {
-   // SMC_MOCK_METHOD1( void, QIcon::Mode, mode )
-    }
-
-
-// -----------------------------------------------------------------------------
-// HbLabel::mode
-// -----------------------------------------------------------------------------
-//
-QIcon::Mode HbLabel::mode(  ) const
-    {
-   // SMC_MOCK_METHOD0( QIcon::Mode )
-    }
-
-
-// -----------------------------------------------------------------------------
-// HbLabel::setState
-// -----------------------------------------------------------------------------
-//
-void HbLabel::setState( 
-        QIcon::State state )
-    {
-  //  SMC_MOCK_METHOD1( void, QIcon::State, state )
-    }
-
-
-// -----------------------------------------------------------------------------
-// HbLabel::state
-// -----------------------------------------------------------------------------
-//
-QIcon::State HbLabel::state(  ) const
-    {
-  //  SMC_MOCK_METHOD0( QIcon::State )
-    }
-
-
-// -----------------------------------------------------------------------------
-// HbLabel::setTextFormat
-// -----------------------------------------------------------------------------
-//
-void HbLabel::setTextFormat( 
-        Qt::TextFormat textFormat )
-    {
- //   SMC_MOCK_METHOD1( void, Qt::TextFormat, textFormat )
-    }
-
-
-// -----------------------------------------------------------------------------
-// HbLabel::textFormat
-// -----------------------------------------------------------------------------
-//
-Qt::TextFormat HbLabel::textFormat(  ) const
-    {
- //   SMC_MOCK_METHOD0( Qt::TextFormat )
-    }
-
-
-// -----------------------------------------------------------------------------
-// HbLabel::setMirroringMode
-// -----------------------------------------------------------------------------
-//
-void HbLabel::setMirroringMode( 
-        HbIcon::MirroringMode mirroringMode )
-    {
- //   SMC_MOCK_METHOD1( void, HbIcon::MirroringMode, mirroringMode )
-    }
-
-
-// -----------------------------------------------------------------------------
-// HbLabel::setIconFlags
-// -----------------------------------------------------------------------------
-//
-void HbLabel::setIconFlags( 
-        HbIcon::Flags flags )
-    {
- //   SMC_MOCK_METHOD1( void, HbIcon::Flags, flags )
-    }
-
-
-// -----------------------------------------------------------------------------
-// HbLabel::isNull
-// -----------------------------------------------------------------------------
-//
-bool HbLabel::isNull(  ) const
-    {
-    SMC_MOCK_METHOD0( bool )
-    }
-
 
 // -----------------------------------------------------------------------------
 // HbLabel::setPlainText
@@ -496,49 +286,6 @@
 
 
 // -----------------------------------------------------------------------------
-// HbLabel::setText
-// -----------------------------------------------------------------------------
-//
-void HbLabel::setText( 
-        const QString & text )
-    {
-    SMC_MOCK_METHOD1( void, const QString &, text )
-    }
-
-
-// -----------------------------------------------------------------------------
-// HbLabel::setNum
-// -----------------------------------------------------------------------------
-//
-void HbLabel::setNum( 
-        int num )
-    {
-    SMC_MOCK_METHOD1( void, int, num )
-    }
-
-
-// -----------------------------------------------------------------------------
-// HbLabel::setNum
-// -----------------------------------------------------------------------------
-//
-void HbLabel::setNum( 
-        qreal num )
-    {
-    SMC_MOCK_METHOD1( void, qreal, num )
-    }
-
-
-// -----------------------------------------------------------------------------
-// HbLabel::toggleState
-// -----------------------------------------------------------------------------
-//
-void HbLabel::toggleState(  )
-    {
-    SMC_MOCK_METHOD0( void )
-    }
-
-
-// -----------------------------------------------------------------------------
 // HbLabel::HbLabel
 // -----------------------------------------------------------------------------
 //
@@ -546,30 +293,6 @@
         HbLabelPrivate & dd,
         QGraphicsItem * parent )
     {
- //   SMC_MOCK_METHOD2( void, HbLabelPrivate &, dd, 
- //       QGraphicsItem *, parent )
-    }
-
-
-// -----------------------------------------------------------------------------
-// HbLabel::resizeEvent
-// -----------------------------------------------------------------------------
-//
-void HbLabel::resizeEvent( 
-        QGraphicsSceneResizeEvent * event )
-    {
-  //  SMC_MOCK_METHOD1( void, QGraphicsSceneResizeEvent *, event )
-    }
-
-
-// -----------------------------------------------------------------------------
-// HbLabel::changeEvent
-// -----------------------------------------------------------------------------
-//
-void HbLabel::changeEvent( 
-        QEvent * event )
-    {
- //   SMC_MOCK_METHOD1( void, QEvent *, event )
     }
 
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_hbwidget.cpp
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_hbwidget.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_hbwidget.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -416,16 +416,6 @@
     }
 
 
-// -----------------------------------------------------------------------------
-// HbWidget::initStyleOption
-// -----------------------------------------------------------------------------
-//
-void HbWidget::initStyleOption( 
-        HbStyleOption * option ) const
-    {
- //   SMC_MOCK_METHOD1( void, HbStyleOption *, option )
-    }
-
 
 // -----------------------------------------------------------------------------
 // HbWidget::changeEvent
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetcallbarringwrapper.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetcallbarringwrapper.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,96 @@
+/* 
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#include <psetcontainer.h>
+#include <psetcallbarring.h>
+#include <psetcallbarringwrapper.h>
+#include <QDebug>
+#include <smcmockclassincludes.h>
+#include "psetcallbarringwrapper.h"
+
+class PSetCallBarringWrapperPrivate {
+public:
+    PSetCallBarringWrapperPrivate() {}
+    ~PSetCallBarringWrapperPrivate() {}
+};
+
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// PSetCallBarringWrapper::PSetCallBarringWrapper
+// -----------------------------------------------------------------------------
+//
+PSetCallBarringWrapper::PSetCallBarringWrapper( 
+        CPsetContainer & psetContainer,
+        QObject * parent )
+    :
+    QObject(parent)
+    {
+    Q_UNUSED(psetContainer)
+    }
+
+
+// -----------------------------------------------------------------------------
+// PSetCallBarringWrapper::~PSetCallBarringWrapper
+// -----------------------------------------------------------------------------
+//
+PSetCallBarringWrapper::~PSetCallBarringWrapper(  )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// PSetCallBarringWrapper::barringStatus
+// -----------------------------------------------------------------------------
+//
+void PSetCallBarringWrapper::barringStatus( 
+        PsServiceGroup serviceGroup,
+        BarringType barringType )
+    {
+    SMC_MOCK_METHOD2( void, int/*PsServiceGroup*/, static_cast<int>(serviceGroup), 
+        BarringType, barringType )
+    }
+
+
+// -----------------------------------------------------------------------------
+// PSetCallBarringWrapper::enableBarring
+// -----------------------------------------------------------------------------
+//
+void PSetCallBarringWrapper::enableBarring(
+    PsServiceGroup serviceGroup,
+    BarringType barringType,
+    QString barringPassword)
+    {
+    SMC_MOCK_METHOD3( void, int/*PsServiceGroup*/, static_cast<int>(serviceGroup), 
+        BarringType, barringType, QString, barringPassword )
+    }
+
+
+// -----------------------------------------------------------------------------
+// PSetCallBarringWrapper::disableBarring
+// -----------------------------------------------------------------------------
+//
+void PSetCallBarringWrapper::disableBarring(
+    PsServiceGroup serviceGroup,
+    BarringType barringType,
+    QString barringPassword)
+    {
+    SMC_MOCK_METHOD3( void, int/*PsServiceGroup*/, static_cast<int>(serviceGroup), 
+        BarringType, barringType, QString, barringPassword )
+    }
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetcalldivertingwrapper_p.cpp
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetcalldivertingwrapper_p.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetcalldivertingwrapper_p.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -14,8 +14,8 @@
 * Description:
 *
 */
-#include <MPsetDivertObs.h>
-#include <MPhCltEmergencyCallObserver.h>
+#include <mpsetdivertobs.h>
+#include <mphcltemergencycallobserver.h>
 #include <mmlist.h>
 #include <smcmockclassincludes.h>
 #include "psetcalldivertingwrapper_p.h"
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetcallwaitingwrapper_p.cpp
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetcallwaitingwrapper_p.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetcallwaitingwrapper_p.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -15,7 +15,7 @@
 *
 */
 #include <QObject>
-#include <RSSSettings.h>
+#include <rsssettings.h>
 #include <psetcontainer.h>
 #include <psetcallwaiting.h>
 #include <smcmockclassincludes.h>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetcliwrapper_p.cpp
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetcliwrapper_p.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetcliwrapper_p.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -15,7 +15,7 @@
 *
 */
 #include <QObject>
-#include <RSSSettings.h>
+#include <rsssettings.h>
 #include <psetcontainer.h>
 #include <psetcli.h>
 #include <psuiconstants.h>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetwrapper.cpp
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetwrapper.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_psetwrapper.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -16,7 +16,7 @@
 */
 #include <QDebug>
 #include <smcmockclassincludes.h>
-#include "psetwrapper.h"
+#include <psetwrapper.h>
 #include <psetcliwrapper.h>
 #include <psetcallwaitingwrapper.h> 
 #include <psetcalldivertingwrapper.h>
@@ -85,3 +85,11 @@
     }
 
 
+// -----------------------------------------------------------------------------
+// PSetWrapper::callBarringWrapper
+// -----------------------------------------------------------------------------
+//
+PSetCallBarringWrapper & PSetWrapper::callBarringWrapper(  )
+    {
+    SMC_MOCK_METHOD0( PSetCallBarringWrapper & )
+    }
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phonesettings/cpphonesettingsplugins/tsrc/mocks/ut_mockintegrity.pro
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/ut_mockintegrity.pro	Fri Mar 19 09:28:42 2010 +0200
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/ut_mockintegrity.pro	Fri Apr 16 14:58:25 2010 +0300
@@ -54,6 +54,7 @@
            /epoc32/include/platform/mw/psetcallwaitingwrapper.h \
            /epoc32/include/platform/mw/psetcalldivertingwrapper.h \
            /epoc32/include/platform/mw/psetnetworkwrapper.h     \
+           /epoc32/include/platform/mw/psetcallbarringwrapper.h \
            /epoc32/include/mw/xqsettingskey.h                   \
            /epoc32/include/mw/xqsettingsmanager.h               \
            /epoc32/include/mw/xqsysinfo.h
@@ -81,5 +82,6 @@
         mock_sssettingswrapper.cpp          \
         mock_xqsettingskey.cpp              \
         mock_xqsettingsmanager.cpp          \
-        mock_xqsysinfo.cpp
+        mock_xqsysinfo.cpp                  \
+        mock_psetcallbarringwrapper.cpp
   
\ No newline at end of file
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/TelephonyDeviceMode/group/TelephonyDeviceMode.mmp
--- a/phoneuis/TelephonyDeviceMode/group/TelephonyDeviceMode.mmp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/TelephonyDeviceMode/group/TelephonyDeviceMode.mmp	Fri Apr 16 14:58:25 2010 +0300
@@ -27,11 +27,11 @@
 UID             0x1000008d 0x1020299B
 
 SOURCEPATH      ../src
-SOURCE          CTelDMHandlerImpl.cpp
-SOURCE          CTelDMGripHandler.cpp
-SOURCE          CTelDMCallStateListener.cpp
-SOURCE          CTelDMCommandHandler.cpp
-SOURCE          CTelDMAudioAccessoryListener.cpp
+SOURCE          cteldmhandlerimpl.cpp
+SOURCE          cteldmgriphandler.cpp
+SOURCE          cteldmcallstatelistener.cpp
+SOURCE          cteldmcommandhandler.cpp
+SOURCE          cteldmaudioaccessorylistener.cpp
     
 USERINCLUDE     ../inc
 APP_LAYER_SYSTEMINCLUDE
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/TelephonyDeviceMode/group/bld.inf
--- a/phoneuis/TelephonyDeviceMode/group/bld.inf	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/TelephonyDeviceMode/group/bld.inf	Fri Apr 16 14:58:25 2010 +0300
@@ -22,13 +22,13 @@
 
 PRJ_EXPORTS
 
-telephonydevicemode_stub.SIS   /epoc32/data/z/system/install/telephonydevicemode_stub.SIS
+telephonydevicemode_stub.sis   /epoc32/data/z/system/install/telephonydevicemode_stub.sis
 
 // IBY files
 ../rom/telephonydevicemode.iby      CORE_APP_LAYER_IBY_EXPORT_PATH(telephonydevicemode.iby)
  
 PRJ_MMPFILES
-../Group/TelephonyDeviceMode.mmp
+../group/telephonydevicemode.mmp
 
 
 //  End of File  
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/TelephonyDeviceMode/inc/CTelDMAudioAccessoryListener.h
--- a/phoneuis/TelephonyDeviceMode/inc/CTelDMAudioAccessoryListener.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/TelephonyDeviceMode/inc/CTelDMAudioAccessoryListener.h	Fri Apr 16 14:58:25 2010 +0300
@@ -21,7 +21,7 @@
 
 //  INCLUDE FILES   
 #include <MTelephonyAudioRoutingObserver.h>
-#include "MTelDMAccessory.h"
+#include "mteldmaccessory.h"
 
 // FORWARD DECLARATIONS
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/TelephonyDeviceMode/inc/CTelDMCommandHandler.h
--- a/phoneuis/TelephonyDeviceMode/inc/CTelDMCommandHandler.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/TelephonyDeviceMode/inc/CTelDMCommandHandler.h	Fri Apr 16 14:58:25 2010 +0300
@@ -23,7 +23,7 @@
 
 #include    <e32base.h>
 #include    <aknkeylock.h>  
-#include    "MTelDMCallStateObserver.h"
+#include    "mteldmcallstateobserver.h"
 
 // FORWARD DECLARATIONS
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/TelephonyDeviceMode/rom/telephonydevicemode.iby
--- a/phoneuis/TelephonyDeviceMode/rom/telephonydevicemode.iby	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/TelephonyDeviceMode/rom/telephonydevicemode.iby	Fri Apr 16 14:58:25 2010 +0300
@@ -19,7 +19,7 @@
 #define __TELEPHONYDEVICEMODE_IBY__
 
 file=ABI_DIR\BUILD_DIR\telephonydevicemode.dll            SHARED_LIB_DIR\telephonydevicemode.dll
-data=ZSYSTEM\Install\telephonydevicemode_stub.SIS         \System\Install\telephonydevicemode_stub.SIS
+data=ZSYSTEM\Install\telephonydevicemode_stub.sis         \System\Install\telephonydevicemode_stub.sis
 
 #endif
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/TelephonyDeviceMode/src/CTelDMAudioAccessoryListener.cpp
--- a/phoneuis/TelephonyDeviceMode/src/CTelDMAudioAccessoryListener.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/TelephonyDeviceMode/src/CTelDMAudioAccessoryListener.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -17,8 +17,8 @@
 
 
 //  INCLUDE FILES
-#include    "CTelDMAudioAccessoryListener.h"               // this
-#include    "CTelDMDebug.h"
+#include    "cteldmaudioaccessorylistener.h"               // this
+#include    "cteldmdebug.h"
 #include    <TelephonyAudioRouting.h>
 
 //  CONSTANTS
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/TelephonyDeviceMode/src/CTelDMCallStateListener.cpp
--- a/phoneuis/TelephonyDeviceMode/src/CTelDMCallStateListener.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/TelephonyDeviceMode/src/CTelDMCallStateListener.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -18,9 +18,9 @@
 
 
 // INCLUDE FILES
-#include    "CTelDMCallStateListener.h"
-#include    "MTelDMCallStateObserver.h"
-#include    "MTelDMAccessory.h"
+#include    "cteldmcallstatelistener.h"
+#include    "mteldmcallstateobserver.h"
+#include    "mteldmaccessory.h"
 
 #include    <ctsydomainpskeys.h>
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/TelephonyDeviceMode/src/CTelDMCommandHandler.cpp
--- a/phoneuis/TelephonyDeviceMode/src/CTelDMCommandHandler.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/TelephonyDeviceMode/src/CTelDMCommandHandler.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -23,10 +23,10 @@
 #include    <PSVariables.h>
 #include    <ctsydomainpskeys.h>
 
-#include    "CTelDMCommandHandler.h"
-#include    "CTelDMCallStateListener.h"
-#include    "MTelDMAccessory.h"
-#include    "CTelDMDebug.h"
+#include    "cteldmcommandhandler.h"
+#include    "cteldmcallstatelistener.h"
+#include    "mteldmaccessory.h"
+#include    "cteldmdebug.h"
 #include     <coreapplicationuisdomainpskeys.h>
 
 // MODULE DATA STRUCTURES
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/TelephonyDeviceMode/src/CTelDMGripHandler.cpp
--- a/phoneuis/TelephonyDeviceMode/src/CTelDMGripHandler.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/TelephonyDeviceMode/src/CTelDMGripHandler.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -21,9 +21,9 @@
 
 #include    <mphonedevicemodeobserver.h>
 #include    <hwrmdomainpskeys.h>
-#include    "CTelDMGripHandler.h"
-#include    "MTelDMAccessory.h"
-#include    "CTelDMCommandHandler.h"
+#include    "cteldmgriphandler.h"
+#include    "mteldmaccessory.h"
+#include    "cteldmcommandhandler.h"
 #include    <settingsinternalcrkeys.h>
 #include    <centralrepository.h>
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/TelephonyDeviceMode/src/CTelDMHandlerImpl.cpp
--- a/phoneuis/TelephonyDeviceMode/src/CTelDMHandlerImpl.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/TelephonyDeviceMode/src/CTelDMHandlerImpl.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -21,12 +21,12 @@
 #include    <featmgr.h>
 #include    <mphonedevicemodeobserver.h>
 #include    <telinternalpskeys.h>
-#include    "CTelDMHandlerImpl.h"
-#include    "CTelDMGripHandler.h"
-#include    "CTelDMCommandHandler.h"
-#include    "CTelDMCallStateListener.h"
-#include    "CTelDMAudioAccessoryListener.h"
-#include    "CTelDMDebug.h"
+#include    "cteldmhandlerimpl.h"
+#include    "cteldmgriphandler.h"
+#include    "cteldmcommandhandler.h"
+#include    "cteldmcallstatelistener.h"
+#include    "cteldmaudioaccessorylistener.h"
+#include    "cteldmdebug.h"
  
 // MODULE DATA STRUCTURES
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/bubblecore.qrc
--- a/phoneuis/bubblemanager2/bubblecore/bubblecore.qrc	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/bubblecore/bubblecore.qrc	Fri Apr 16 14:58:25 2010 +0300
@@ -1,47 +1,57 @@
 <RCC>
     <qresource prefix="/">
-        <file>resources/qgn_indi_call_muted.svg</file>
         <file>xml/bubble_layout_1.docml</file>
         <file>xml/bubble_layout_2.docml</file>
         <file>xml/bubble_layout_3.docml</file>
         <file>xml/bubble_layout_4.docml</file>
         <file>xml/bubble_layout_5.docml</file>
-        <file>resources/qtg_fr_btn_red_pressed_tr.svg</file>
-        <file>resources/qtg_fr_btn_green_normal_b.svg</file>
-        <file>resources/qtg_fr_btn_green_normal_bl.svg</file>
-        <file>resources/qtg_fr_btn_green_normal_br.svg</file>
-        <file>resources/qtg_fr_btn_green_normal_c.svg</file>
-        <file>resources/qtg_fr_btn_green_normal_l.svg</file>
-        <file>resources/qtg_fr_btn_green_normal_r.svg</file>
-        <file>resources/qtg_fr_btn_green_normal_t.svg</file>
-        <file>resources/qtg_fr_btn_green_normal_tl.svg</file>
-        <file>resources/qtg_fr_btn_green_normal_tr.svg</file>
-        <file>resources/qtg_fr_btn_green_pressed_b.svg</file>
-        <file>resources/qtg_fr_btn_green_pressed_bl.svg</file>
-        <file>resources/qtg_fr_btn_green_pressed_br.svg</file>
-        <file>resources/qtg_fr_btn_green_pressed_c.svg</file>
-        <file>resources/qtg_fr_btn_green_pressed_l.svg</file>
-        <file>resources/qtg_fr_btn_green_pressed_r.svg</file>
-        <file>resources/qtg_fr_btn_green_pressed_t.svg</file>
-        <file>resources/qtg_fr_btn_green_pressed_tl.svg</file>
-        <file>resources/qtg_fr_btn_green_pressed_tr.svg</file>
-        <file>resources/qtg_fr_btn_red_normal_b.svg</file>
-        <file>resources/qtg_fr_btn_red_normal_bl.svg</file>
-        <file>resources/qtg_fr_btn_red_normal_br.svg</file>
-        <file>resources/qtg_fr_btn_red_normal_c.svg</file>
-        <file>resources/qtg_fr_btn_red_normal_l.svg</file>
-        <file>resources/qtg_fr_btn_red_normal_r.svg</file>
-        <file>resources/qtg_fr_btn_red_normal_t.svg</file>
-        <file>resources/qtg_fr_btn_red_normal_tl.svg</file>
-        <file>resources/qtg_fr_btn_red_normal_tr.svg</file>
-        <file>resources/qtg_fr_btn_red_pressed_b.svg</file>
-        <file>resources/qtg_fr_btn_red_pressed_bl.svg</file>
-        <file>resources/qtg_fr_btn_red_pressed_br.svg</file>
-        <file>resources/qtg_fr_btn_red_pressed_c.svg</file>
-        <file>resources/qtg_fr_btn_red_pressed_l.svg</file>
-        <file>resources/qtg_fr_btn_red_pressed_r.svg</file>
-        <file>resources/qtg_fr_btn_red_pressed_t.svg</file>
-        <file>resources/qtg_fr_btn_red_pressed_tl.svg</file>
-        <file>resources/qtg_large_avatar.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_large_avatar.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_b.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_bl.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_br.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_c.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_l.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_r.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_t.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_tl.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_tr.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_b.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_bl.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_br.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_c.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_l.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_r.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_t.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_tl.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_tr.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_b.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_bl.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_br.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_c.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_l.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_r.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_t.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_tl.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_tr.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_b.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_bl.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_br.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_c.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_l.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_r.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_t.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_tl.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_tr.svg</file>
+        <file>resources/qgn_indi_call_muted.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_large_waiting_call.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_large_active_call.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_large_end_call.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_large_video_dialled_call.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_large_video_missed_call.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_large_video_received_call.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_large_voip_dialled_call.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_large_voip_missed_call.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_large_voip_received_call.svg</file>
+        <file>themes/icons/hbdefault/scalable/qtg_mono_ciphering_off.svg</file>
     </qresource>
 </RCC>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_normal_b.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_normal_b.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="50px" height="10px" viewBox="0 0 50 10" enable-background="new 0 0 50 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="50" height="10"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="24.9995" y1="-39.8838" x2="24.9995" y2="10.0715">
-	<stop  offset="0" style="stop-color:#85BF24"/>
-	<stop  offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="50" height="10"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.9995" y1="-39.8838" x2="24.9995" y2="9.8873">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<rect y="9" opacity="0.35" fill="url(#SVGID_2_)" width="50" height="1"/>
-<rect fill="none" width="50" height="10"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_normal_bl.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_normal_bl.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="10" height="10"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="-39.8838" x2="5" y2="10.0715">
-	<stop  offset="0" style="stop-color:#85BF24"/>
-	<stop  offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M0,5c0,2.762,2.238,5,5,5h5V0H0V5z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="-39.8838" x2="5" y2="9.8873">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<path opacity="0.35" fill="url(#SVGID_2_)" d="M0,0v5c0,2.762,2.238,5,5,5h5V9H5C2.794,9,1,7.206,1,5V0H0z"/>
-<rect fill="none" width="10" height="10"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_normal_br.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_normal_br.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="10" height="10"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="-39.8838" x2="5" y2="10.0715">
-	<stop  offset="0" style="stop-color:#85BF24"/>
-	<stop  offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M0,10h5c2.762,0,5-2.238,5-5V0H0V10z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="-39.8838" x2="5" y2="9.8873">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<path opacity="0.35" fill="url(#SVGID_2_)" d="M9,5c0,2.206-1.794,4-4,4H0v1h5c2.762,0,5-2.238,5-5V0H9V5z"/>
-<rect fill="none" width="10" height="10"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_normal_c.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_normal_c.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="50px" height="30px" viewBox="0 0 50 30" enable-background="new 0 0 50 30" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="50" height="30"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="24.9995" y1="-9.8843" x2="24.9995" y2="40.0719">
-	<stop  offset="0" style="stop-color:#85BF24"/>
-	<stop  offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="50" height="30"/>
-<rect fill="none" width="50" height="30"/>
-<rect opacity="0.1" fill="#FFFFFF" width="50" height="9"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_normal_l.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_normal_l.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="30px" viewBox="0 0 10 30" enable-background="new 0 0 10 30" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="10" height="30"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="-9.8843" x2="5" y2="40.0719">
-	<stop  offset="0" style="stop-color:#85BF24"/>
-	<stop  offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="10" height="30"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="0.5" y1="-9.8843" x2="0.5" y2="39.8876">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<rect opacity="0.35" fill="url(#SVGID_2_)" width="1" height="30"/>
-<rect fill="none" width="10" height="30"/>
-<rect x="3" opacity="0.1" fill="#FFFFFF" width="7" height="9"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_normal_r.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_normal_r.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="30px" viewBox="0 0 10 30" enable-background="new 0 0 10 30" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="10" height="30"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="-9.8843" x2="5" y2="40.0719">
-	<stop  offset="0" style="stop-color:#85BF24"/>
-	<stop  offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="10" height="30"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="9.5" y1="-9.8843" x2="9.5" y2="39.8876">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<rect x="9" opacity="0.35" fill="url(#SVGID_2_)" width="1" height="30"/>
-<rect fill="none" width="10" height="30"/>
-<rect opacity="0.1" fill="#FFFFFF" width="7" height="9"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_normal_t.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_normal_t.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="50px" height="10px" viewBox="0 0 50 10" enable-background="new 0 0 50 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="50" height="10"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="24.9995" y1="0.1157" x2="24.9995" y2="50.071">
-	<stop  offset="0" style="stop-color:#85BF24"/>
-	<stop  offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="50" height="10"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.9995" y1="0.1157" x2="24.9995" y2="49.8868">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<rect opacity="0.35" fill="url(#SVGID_2_)" width="50" height="1"/>
-<rect fill="none" width="50" height="10"/>
-<rect y="3" opacity="0.1" fill="#FFFFFF" width="50" height="7"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_normal_tl.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_normal_tl.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="10" height="10"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="0.1157" x2="5" y2="50.071">
-	<stop  offset="0" style="stop-color:#85BF24"/>
-	<stop  offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M10,0H5C2.238,0,0,2.238,0,5v5h10V0z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="0.1157" x2="5" y2="49.8868">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<path opacity="0.35" fill="url(#SVGID_2_)" d="M1,5c0-2.206,1.794-4,4-4h5V0H5C2.238,0,0,2.238,0,5v5h1V5z"/>
-<rect fill="none" width="10" height="10"/>
-<path opacity="0.1" fill="#FFFFFF" d="M10,3H5C3.897,3,3,3.896,3,5v5h7V3z"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_normal_tr.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_normal_tr.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="10" height="10"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="0.1157" x2="5" y2="50.071">
-	<stop  offset="0" style="stop-color:#85BF24"/>
-	<stop  offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M10,5c0-2.762-2.238-5-5-5H0v10h10V5z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="0.1157" x2="5" y2="49.8868">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<path opacity="0.35" fill="url(#SVGID_2_)" d="M10,5c0-2.762-2.238-5-5-5H0v1h5c2.206,0,4,1.794,4,4v5h1V5z"/>
-<rect fill="none" width="10" height="10"/>
-<path opacity="0.1" fill="#FFFFFF" d="M7,5c0-1.104-0.896-2-2-2H0v7h7V5z"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_pressed_b.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_pressed_b.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="50px" height="10px" viewBox="0 0 50 10" enable-background="new 0 0 50 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="50" height="10"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="25.0005" y1="10.1279" x2="25.0005" y2="-39.7534">
-	<stop  offset="0" style="stop-color:#85BF24"/>
-	<stop  offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="50" height="10"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.9995" y1="-39.8838" x2="24.9995" y2="9.8873">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<rect y="9" opacity="0.35" fill="url(#SVGID_2_)" width="50" height="1"/>
-<rect fill="none" width="50" height="10"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_pressed_bl.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_pressed_bl.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="10" height="10"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="10.1279" x2="5" y2="-39.7534">
-	<stop  offset="0" style="stop-color:#85BF24"/>
-	<stop  offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M0,5c0,2.762,2.238,5,5,5h5V0H0V5z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="-39.8838" x2="5" y2="9.8873">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<path opacity="0.35" fill="url(#SVGID_2_)" d="M0,0v5c0,2.762,2.238,5,5,5h5V9H5C2.794,9,1,7.206,1,5V0H0z"/>
-<rect fill="none" width="10" height="10"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_pressed_br.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_pressed_br.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="10" height="10"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="10.1279" x2="5" y2="-39.7534">
-	<stop  offset="0" style="stop-color:#85BF24"/>
-	<stop  offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M0,10h5c2.762,0,5-2.238,5-5V0H0V10z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="-39.8838" x2="5" y2="9.8873">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<path opacity="0.35" fill="url(#SVGID_2_)" d="M9,5c0,2.206-1.794,4-4,4H0v1h5c2.762,0,5-2.238,5-5V0H9V5z"/>
-<rect fill="none" width="10" height="10"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_pressed_c.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_pressed_c.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="50px" height="30px" viewBox="0 0 50 30" enable-background="new 0 0 50 30" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="50" height="30"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="25.0005" y1="40.127" x2="25.0005" y2="-9.7536">
-	<stop  offset="0" style="stop-color:#85BF24"/>
-	<stop  offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="50" height="30"/>
-<rect fill="none" width="50" height="30"/>
-<rect opacity="0.1" fill="#FFFFFF" width="50" height="9"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_pressed_l.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_pressed_l.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="30px" viewBox="0 0 10 30" enable-background="new 0 0 10 30" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="10" height="30"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="40.127" x2="5" y2="-9.7536">
-	<stop  offset="0" style="stop-color:#85BF24"/>
-	<stop  offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="10" height="30"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="0.5" y1="-9.8843" x2="0.5" y2="39.8876">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<rect opacity="0.35" fill="url(#SVGID_2_)" width="1" height="30"/>
-<rect fill="none" width="10" height="30"/>
-<rect x="3" opacity="0.1" fill="#FFFFFF" width="7" height="9"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_pressed_r.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_pressed_r.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="30px" viewBox="0 0 10 30" enable-background="new 0 0 10 30" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="10" height="30"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="40.127" x2="5" y2="-9.7536">
-	<stop  offset="0" style="stop-color:#85BF24"/>
-	<stop  offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="10" height="30"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="9.5" y1="-9.8843" x2="9.5" y2="39.8876">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<rect x="9" opacity="0.35" fill="url(#SVGID_2_)" width="1" height="30"/>
-<rect fill="none" width="10" height="30"/>
-<rect opacity="0.1" fill="#FFFFFF" width="7" height="9"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_pressed_t.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_pressed_t.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="50px" height="10px" viewBox="0 0 50 10" enable-background="new 0 0 50 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="50" height="10"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="25.0005" y1="50.1279" x2="25.0005" y2="0.2466">
-	<stop  offset="0" style="stop-color:#85BF24"/>
-	<stop  offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="50" height="10"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.9995" y1="0.1157" x2="24.9995" y2="49.8868">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<rect opacity="0.35" fill="url(#SVGID_2_)" width="50" height="1"/>
-<rect fill="none" width="50" height="10"/>
-<rect y="3" opacity="0.1" fill="#FFFFFF" width="50" height="7"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_pressed_tl.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_pressed_tl.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="10" height="10"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="50.1279" x2="5" y2="0.2466">
-	<stop  offset="0" style="stop-color:#85BF24"/>
-	<stop  offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M10,0H5C2.238,0,0,2.238,0,5v5h10V0z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="0.1157" x2="5" y2="49.8868">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<path opacity="0.35" fill="url(#SVGID_2_)" d="M1,5c0-2.206,1.794-4,4-4h5V0H5C2.238,0,0,2.238,0,5v5h1V5z"/>
-<rect fill="none" width="10" height="10"/>
-<path opacity="0.1" fill="#FFFFFF" d="M10,3H5C3.897,3,3,3.897,3,5v5h7V3z"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_pressed_tr.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_green_pressed_tr.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="10" height="10"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="50.1279" x2="5" y2="0.2466">
-	<stop  offset="0" style="stop-color:#85BF24"/>
-	<stop  offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M10,5c0-2.762-2.238-5-5-5H0v10h10V5z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="0.1157" x2="5" y2="49.8868">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<path opacity="0.35" fill="url(#SVGID_2_)" d="M10,5c0-2.762-2.238-5-5-5H0v1h5c2.206,0,4,1.794,4,4v5h1V5z"/>
-<rect fill="none" width="10" height="10"/>
-<path opacity="0.1" fill="#FFFFFF" d="M7,5c0-1.103-0.896-2-2-2H0v7h7V5z"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_normal_b.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_normal_b.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="50px" height="10px" viewBox="0 0 50 10" enable-background="new 0 0 50 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="50" height="10"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="25.0005" y1="9.8145" x2="25.0005" y2="-39.8316">
-	<stop  offset="0" style="stop-color:#700000"/>
-	<stop  offset="1" style="stop-color:#CF1708"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="50" height="10"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.9995" y1="-39.8838" x2="24.9995" y2="9.8873">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<rect y="9" opacity="0.35" fill="url(#SVGID_2_)" width="50" height="1"/>
-<rect fill="none" width="50" height="10"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_normal_bl.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_normal_bl.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="10" height="10"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="9.8145" x2="5" y2="-39.8316">
-	<stop  offset="0" style="stop-color:#700000"/>
-	<stop  offset="1" style="stop-color:#CF1708"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M0,5c0,2.762,2.238,5,5,5h5V0H0V5z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="-39.8838" x2="5" y2="9.8873">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<path opacity="0.35" fill="url(#SVGID_2_)" d="M0,0v5c0,2.762,2.238,5,5,5h5V9H5C2.794,9,1,7.206,1,5V0H0z"/>
-<rect fill="none" width="10" height="10"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_normal_br.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_normal_br.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="10" height="10"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="9.8145" x2="5" y2="-39.8316">
-	<stop  offset="0" style="stop-color:#700000"/>
-	<stop  offset="1" style="stop-color:#CF1708"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M0,10h5c2.762,0,5-2.238,5-5V0H0V10z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="-39.8838" x2="5" y2="9.8873">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<path opacity="0.35" fill="url(#SVGID_2_)" d="M9,5c0,2.206-1.794,4-4,4H0v1h5c2.762,0,5-2.238,5-5V0H9V5z"/>
-<rect fill="none" width="10" height="10"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_normal_c.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_normal_c.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="50px" height="30px" viewBox="0 0 50 30" enable-background="new 0 0 50 30" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="50" height="30"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="25.0005" y1="39.8135" x2="25.0005" y2="-9.8318">
-	<stop  offset="0" style="stop-color:#700000"/>
-	<stop  offset="1" style="stop-color:#CF1708"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="50" height="30"/>
-<rect fill="none" width="50" height="30"/>
-<rect opacity="0.1" fill="#FFFFFF" width="50" height="9"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_normal_l.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_normal_l.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="30px" viewBox="0 0 10 30" enable-background="new 0 0 10 30" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="10" height="30"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="39.8135" x2="5" y2="-9.8318">
-	<stop  offset="0" style="stop-color:#700000"/>
-	<stop  offset="1" style="stop-color:#CF1708"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="10" height="30"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="0.5" y1="-9.8843" x2="0.5" y2="39.8876">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<rect opacity="0.35" fill="url(#SVGID_2_)" width="1" height="30"/>
-<rect fill="none" width="10" height="30"/>
-<rect x="3" opacity="0.1" fill="#FFFFFF" width="7" height="9"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_normal_r.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_normal_r.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="30px" viewBox="0 0 10 30" enable-background="new 0 0 10 30" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="10" height="30"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="39.8135" x2="5" y2="-9.8318">
-	<stop  offset="0" style="stop-color:#700000"/>
-	<stop  offset="1" style="stop-color:#CF1708"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="10" height="30"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="9.5" y1="-9.8843" x2="9.5" y2="39.8876">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<rect x="9" opacity="0.35" fill="url(#SVGID_2_)" width="1" height="30"/>
-<rect fill="none" width="10" height="30"/>
-<rect opacity="0.1" fill="#FFFFFF" width="7" height="9"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_normal_t.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_normal_t.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="50px" height="10px" viewBox="0 0 50 10" enable-background="new 0 0 50 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="50" height="10"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="25.0005" y1="49.8145" x2="25.0005" y2="0.1684">
-	<stop  offset="0" style="stop-color:#700000"/>
-	<stop  offset="1" style="stop-color:#CF1708"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="50" height="10"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.9995" y1="0.1157" x2="24.9995" y2="49.8868">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<rect opacity="0.35" fill="url(#SVGID_2_)" width="50" height="1"/>
-<rect fill="none" width="50" height="10"/>
-<rect y="3" opacity="0.1" fill="#FFFFFF" width="50" height="7"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_normal_tl.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_normal_tl.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="10" height="10"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="49.8145" x2="5" y2="0.1684">
-	<stop  offset="0" style="stop-color:#700000"/>
-	<stop  offset="1" style="stop-color:#CF1708"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M10,0H5C2.238,0,0,2.238,0,5v5h10V0z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="0.1157" x2="5" y2="49.8868">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<path opacity="0.35" fill="url(#SVGID_2_)" d="M1,5c0-2.206,1.794-4,4-4h5V0H5C2.238,0,0,2.238,0,5v5h1V5z"/>
-<rect fill="none" width="10" height="10"/>
-<path opacity="0.1" fill="#FFFFFF" d="M10,3H5C3.897,3,3,3.897,3,5v5h7V3z"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_normal_tr.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_normal_tr.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="10" height="10"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="49.8145" x2="5" y2="0.1684">
-	<stop  offset="0" style="stop-color:#700000"/>
-	<stop  offset="1" style="stop-color:#CF1708"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M10,5c0-2.762-2.238-5-5-5H0v10h10V5z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="0.1157" x2="5" y2="49.8868">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<path opacity="0.35" fill="url(#SVGID_2_)" d="M10,5c0-2.762-2.238-5-5-5H0v1h5c2.206,0,4,1.794,4,4v5h1V5z"/>
-<rect fill="none" width="10" height="10"/>
-<path opacity="0.1" fill="#FFFFFF" d="M7,5c0-1.103-0.896-2-2-2H0v7h7V5z"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_pressed_b.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_pressed_b.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="50px" height="10px" viewBox="0 0 50 10" enable-background="new 0 0 50 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="50" height="10"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="24.9995" y1="-39.667" x2="24.9995" y2="10.422">
-	<stop  offset="0" style="stop-color:#700000"/>
-	<stop  offset="1" style="stop-color:#CF1708"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="50" height="10"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.9995" y1="-39.8838" x2="24.9995" y2="9.8873">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<rect y="9" opacity="0.35" fill="url(#SVGID_2_)" width="50" height="1"/>
-<rect fill="none" width="50" height="10"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_pressed_bl.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_pressed_bl.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="10" height="10"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="-39.667" x2="5" y2="10.422">
-	<stop  offset="0" style="stop-color:#700000"/>
-	<stop  offset="1" style="stop-color:#CF1708"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M0,5c0,2.762,2.238,5,5,5h5V0H0V5z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="-39.8838" x2="5" y2="9.8873">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<path opacity="0.35" fill="url(#SVGID_2_)" d="M0,0v5c0,2.762,2.238,5,5,5h5V9H5C2.794,9,1,7.206,1,5V0H0z"/>
-<rect fill="none" width="10" height="10"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_pressed_br.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_pressed_br.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="10" height="10"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="-39.667" x2="5" y2="10.422">
-	<stop  offset="0" style="stop-color:#700000"/>
-	<stop  offset="1" style="stop-color:#CF1708"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M0,10h5c2.762,0,5-2.238,5-5V0H0V10z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="-39.8838" x2="5" y2="9.8873">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<path opacity="0.35" fill="url(#SVGID_2_)" d="M9,5c0,2.206-1.794,4-4,4H0v1h5c2.762,0,5-2.238,5-5V0H9V5z"/>
-<rect fill="none" width="10" height="10"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_pressed_c.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_pressed_c.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="50px" height="30px" viewBox="0 0 50 30" enable-background="new 0 0 50 30" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="50" height="30"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="24.9995" y1="-9.6675" x2="24.9995" y2="40.4223">
-	<stop  offset="0" style="stop-color:#700000"/>
-	<stop  offset="1" style="stop-color:#CF1708"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="50" height="30"/>
-<rect fill="none" width="50" height="30"/>
-<rect opacity="0.1" fill="#FFFFFF" width="50" height="9"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_pressed_l.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_pressed_l.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="30px" viewBox="0 0 10 30" enable-background="new 0 0 10 30" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="10" height="30"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="-9.6675" x2="5" y2="40.4223">
-	<stop  offset="0" style="stop-color:#700000"/>
-	<stop  offset="1" style="stop-color:#CF1708"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="10" height="30"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="0.5" y1="-9.8843" x2="0.5" y2="39.8876">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<rect opacity="0.35" fill="url(#SVGID_2_)" width="1" height="30"/>
-<rect fill="none" width="10" height="30"/>
-<rect x="3" opacity="0.1" fill="#FFFFFF" width="7" height="9"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_pressed_r.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_pressed_r.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="30px" viewBox="0 0 10 30" enable-background="new 0 0 10 30" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="10" height="30"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="-9.6675" x2="5" y2="40.4223">
-	<stop  offset="0" style="stop-color:#700000"/>
-	<stop  offset="1" style="stop-color:#CF1708"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="10" height="30"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="9.5" y1="-9.8843" x2="9.5" y2="39.8876">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<rect x="9" opacity="0.35" fill="url(#SVGID_2_)" width="1" height="30"/>
-<rect fill="none" width="10" height="30"/>
-<rect opacity="0.1" fill="#FFFFFF" width="7" height="9"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_pressed_t.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_pressed_t.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="50px" height="10px" viewBox="0 0 50 10" enable-background="new 0 0 50 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="50" height="10"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="24.9995" y1="0.3325" x2="24.9995" y2="50.4215">
-	<stop  offset="0" style="stop-color:#700000"/>
-	<stop  offset="1" style="stop-color:#CF1708"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" width="50" height="10"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.9995" y1="0.1157" x2="24.9995" y2="49.8868">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<rect opacity="0.35" fill="url(#SVGID_2_)" width="50" height="1"/>
-<rect fill="none" width="50" height="10"/>
-<rect y="3" opacity="0.1" fill="#FFFFFF" width="50" height="7"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_pressed_tl.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_pressed_tl.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="10" height="10"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="0.3325" x2="5" y2="50.4215">
-	<stop  offset="0" style="stop-color:#700000"/>
-	<stop  offset="1" style="stop-color:#CF1708"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M10,0H5C2.238,0,0,2.238,0,5v5h10V0z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="0.1157" x2="5" y2="49.8868">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<path opacity="0.35" fill="url(#SVGID_2_)" d="M1,5c0-2.206,1.794-4,4-4h5V0H5C2.238,0,0,2.238,0,5v5h1V5z"/>
-<rect fill="none" width="10" height="10"/>
-<path opacity="0.1" fill="#FFFFFF" d="M10,3H5C3.897,3,3,3.897,3,5v5h7V3z"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_pressed_tr.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_fr_btn_red_pressed_tr.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="10" height="10"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="0.3325" x2="5" y2="50.4215">
-	<stop  offset="0" style="stop-color:#700000"/>
-	<stop  offset="1" style="stop-color:#CF1708"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M10,5c0-2.762-2.238-5-5-5H0v10h10V5z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="0.1157" x2="5" y2="49.8868">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="1" style="stop-color:#999999"/>
-</linearGradient>
-<path opacity="0.35" fill="url(#SVGID_2_)" d="M10,5c0-2.762-2.238-5-5-5H0v1h5c2.206,0,4,1.794,4,4v5h1V5z"/>
-<rect fill="none" width="10" height="10"/>
-<path opacity="0.1" fill="#FFFFFF" d="M7,5c0-1.103-0.896-2-2-2H0v7h7V5z"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/resources/qtg_large_avatar.svg
--- a/phoneuis/bubblemanager2/bubblecore/resources/qtg_large_avatar.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g>
-<path d="M46.691,42.35c-1.665-0.866-9.918-3.756-10.072-3.936l-0.002,0.002  c-0.934-1.068-0.896-3.433-0.43-4.46c0.001-0.001,0.002-0.001,0.002-0.002c0.032-0.071,0.065-0.139,0.104-0.197  c0.113-0.177,0.219-0.354,0.326-0.533l0,0c0.813-1.329,1.494-2.651,2.054-3.892c1.009,0.349,2.307-0.59,2.95-2.18  c0.667-1.645,0.379-3.354-0.645-3.815c-0.058-0.026-0.119-0.03-0.178-0.048c0-0.001,0-0.002,0-0.002  c0.133-0.521,0.191-0.826,0.191-0.826c1.77-7.934-2.078-14.223-11.402-14.533c-3.832,0-5.617,0.578-7.039,2.398  c-2.313,0.357-6.039,3.642-3.453,12.927c-0.098,0.016-0.195,0.031-0.289,0.071c-1.032,0.436-1.355,2.128-0.724,3.782  c0.633,1.653,1.983,2.643,3.017,2.208c0.063-0.027,0.117-0.072,0.176-0.11c0.568,1.279,1.266,2.646,2.104,4.02H23.38  c0.022,0.037,0.046,0.073,0.067,0.11c0.023,0.038,0.045,0.076,0.068,0.114c0.002,0.003,0.005,0.005,0.007,0.008  c0.061,0.101,0.12,0.201,0.185,0.301c0.532,0.833,0.663,3.229-0.166,4.457c-0.208,0.283-8.346,3.135-10.23,4.136  c-2.161,1.147-5.688,3.782-5.688,9.723h44.756C52.378,46.132,48.354,43.216,46.691,42.35z" fill="url(#SVGID_1_)"/>
-<path d="M7.659,51.072c-0.022,0.323-0.037,0.655-0.037,1h44.756c0-0.345-0.017-0.676-0.042-1H7.659z" fill="#FFFFFF" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M22.551,11.326c1.422-1.82,3.207-2.398,7.039-2.398c7.565,0.252,11.524,4.44,11.804,10.248  C41.535,12.856,37.58,8.194,29.59,7.928c-3.832,0-5.617,0.578-7.039,2.398c-1.81,0.279-4.472,2.367-4.311,7.704  C18.419,13.429,20.858,11.588,22.551,11.326z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M36.617,38.416c-0.441-0.505-0.66-1.3-0.725-2.106c-0.086,1.09,0.098,2.389,0.725,3.106  l0.002-0.002c0.154,0.18,8.407,3.069,10.072,3.936c1.566,0.816,5.225,3.453,5.645,8.723h0.042c0-5.94-4.024-8.856-5.687-9.723  c-1.665-0.866-9.918-3.756-10.072-3.936L36.617,38.416z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M13.311,43.35c1.885-1.001,10.022-3.853,10.23-4.136c0.508-0.752,0.652-1.938,0.568-2.938  c-0.053,0.717-0.225,1.429-0.568,1.938c-0.208,0.283-8.346,3.135-10.23,4.136c-2.161,1.147-5.688,3.782-5.688,9.723h0.037  C8.029,46.833,11.275,44.431,13.311,43.35z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<rect fill="none" height="60" width="60"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9995" x2="29.9995" y1="8.5967" y2="52.3536">
-<stop offset="0" style="stop-color:#8E8E8E"/>
-<stop offset="1" style="stop-color:#444444"/>
-</linearGradient>
-</defs>
-</g>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/src/bubblebuttonstyle.cpp
--- a/phoneuis/bubblemanager2/bubblecore/src/bubblebuttonstyle.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/bubblecore/src/bubblebuttonstyle.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -70,9 +70,9 @@
                 frameGraphicsName = "qtg_fr_btn_disabled";
             } else if (mode == QIcon::Normal && state == QIcon::On) {
                 if (mButtonColor==Green) {
-                    frameGraphicsName = ":/resources/qtg_fr_btn_green_pressed";
+                    frameGraphicsName = "qtg_fr_btn_green_pressed";
                 } else if (mButtonColor==Red) {
-                    frameGraphicsName = ":/resources/qtg_fr_btn_red_pressed";
+                    frameGraphicsName = "qtg_fr_btn_red_pressed";
                 } else {
                     frameGraphicsName = "qtg_fr_btn_pressed";
                 }
@@ -80,9 +80,9 @@
                 frameGraphicsName = "qtg_fr_btn_highlight";
             } else {
                 if (mButtonColor==Green) {
-                    frameGraphicsName = ":/resources/qtg_fr_btn_green_normal";
+                    frameGraphicsName = "qtg_fr_btn_green_normal";
                 } else if (mButtonColor==Red) {
-                    frameGraphicsName = ":/resources/qtg_fr_btn_red_normal";
+                    frameGraphicsName = "qtg_fr_btn_red_normal";
                 } else {
                     frameGraphicsName = "qtg_fr_btn_normal";
                 }
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/src/bubbleconferencehandler.cpp
--- a/phoneuis/bubblemanager2/bubblecore/src/bubbleconferencehandler.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/bubblecore/src/bubbleconferencehandler.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -21,6 +21,7 @@
 #include <hbtextitem.h>
 #include <hblabel.h>
 #include <hblistview.h>
+#include <hbcolorscheme.h>
 
 #include "bubblemanager2.h"
 #include "bubbleconferencehandler.h"
@@ -87,23 +88,18 @@
 {  
     mHeader = 0;
 
-    mModel->reset();
-    mList->reset();
     mSelectionTimer->stop();
     mPrototype->clearActions();
     mTimerLabel->hide();
     mButtonCenter->hide();
     mButtonCenter->setDown(false);
     mButtonCenter->disconnect();
-    mButtonCenter->setText("");
     mButtonLeft->hide();
     mButtonLeft->setDown(false);
     mButtonLeft->disconnect();
-    mButtonLeft->setText("");
     mButtonRight->hide();
     mButtonRight->setDown(false);
     mButtonRight->disconnect();
-    mButtonRight->setText("");
 }
 
 void BubbleConferenceHandler::readBubbleHeader( const BubbleHeader& header )
@@ -114,9 +110,11 @@
     // populate participant list model
     QList<BubbleHeader*> participants = mHeader->headers();
     foreach(BubbleHeader* participant, participants) {
-         mModel->addParticipant(participant->bubbleId(),
-                                participant->cli(),
-                                (int)participant->callState());
+         mModel->addParticipant(
+            participant->bubbleId(),
+            participant->cli(),
+            (int)participant->callState(),
+            !(mHeader->callFlags()&BubbleManagerIF::NoCiphering));
     }
 
     // set actions to item prototype
@@ -126,14 +124,19 @@
         mPrototype->addAction(action);
     }
 
-    mList->reset();
-
     if (header.timerCost().length()) {
+        QColor color;
+        color = HbColorScheme::color("list_item_title_normal");
+        if (color.isValid()) {
+            mTimerLabel->setTextColor(color);
+        }
         mTimerLabel->setPlainText(header.timerCost());
         mTimerLabel->show();
     }
 
     setButtons(mHeader->actions());
+
+    clearSelection();
 }
 
 void BubbleConferenceHandler::setButtons(const QList<HbAction*>& actions)
@@ -200,3 +203,14 @@
 {
     mList->selectionModel()->clear();
 }
+
+void BubbleConferenceHandler::conferenceMemberRemoved(int bubbleId)
+{
+    mModel->removeParticipant(bubbleId);
+}
+
+void BubbleConferenceHandler::conferenceRemoved()
+{
+    mModel->reset();
+    mList->reset();
+}
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/src/bubbleconferencehandler.h
--- a/phoneuis/bubblemanager2/bubblecore/src/bubbleconferencehandler.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/bubblecore/src/bubbleconferencehandler.h	Fri Apr 16 14:58:25 2010 +0300
@@ -55,6 +55,10 @@
     
     void updateTimerDisplayNow();
 
+    void conferenceMemberRemoved(int bubbleId);
+
+    void conferenceRemoved();
+
 protected slots:
     void handleItemSelected(int row);
     void clearSelection();
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/src/bubbleexpandedhandler.cpp
--- a/phoneuis/bubblemanager2/bubblecore/src/bubbleexpandedhandler.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/bubblecore/src/bubbleexpandedhandler.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -65,15 +65,12 @@
     mButtonCenter->hide();
     mButtonCenter->setDown(false);
     mButtonCenter->disconnect();
-    mButtonCenter->setText("");
     mButtonLeft->hide();
     mButtonLeft->setDown(false);
     mButtonLeft->disconnect();
-    mButtonLeft->setText("");
     mButtonRight->hide();
     mButtonRight->setDown(false);
     mButtonRight->disconnect();
-    mButtonRight->setText("");
     mImage->hide();
     mHeading->reset();
 }
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/src/bubblehandler.cpp
--- a/phoneuis/bubblemanager2/bubblecore/src/bubblehandler.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/bubblecore/src/bubblehandler.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -38,3 +38,12 @@
 {
     return mWidgetManager.widget(mView,mContainer,widget);
 }
+
+void BubbleHandler::conferenceMemberRemoved(int bubbleId)
+{
+    Q_UNUSED(bubbleId);
+}
+
+void BubbleHandler::conferenceRemoved()
+{
+}
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/src/bubblehandler.h
--- a/phoneuis/bubblemanager2/bubblecore/src/bubblehandler.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/bubblecore/src/bubblehandler.h	Fri Apr 16 14:58:25 2010 +0300
@@ -43,6 +43,8 @@
     virtual QGraphicsWidget* graphicsWidgetForAction(
         HbAction* action ) const = 0;
     virtual void updateTimerDisplayNow() = 0;
+    virtual void conferenceMemberRemoved(int bubbleId);
+    virtual void conferenceRemoved();
 
 protected:
     QGraphicsWidget* widget(BubbleWidgetManager::Widget widget) const;
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/src/bubbleheadingwidget.cpp
--- a/phoneuis/bubblemanager2/bubblecore/src/bubbleheadingwidget.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/bubblecore/src/bubbleheadingwidget.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -28,7 +28,7 @@
 BubbleHeadingWidget::BubbleHeadingWidget(
     const QString& stylePluginName, QGraphicsItem* item)
     : HbWidget(item), mStylePluginName(stylePluginName), mStatusIcon(0),
-      mNumberTypeIcon(0), mText1(0), mText2(0), mText3(0)
+      mNumberTypeIcon(0), mCipheringIcon(0), mText1(0), mText2(0), mText3(0)
 {
     setPluginBaseId(style()->registerPlugin(mStylePluginName));
     Q_ASSERT(pluginBaseId()!=-1);
@@ -69,15 +69,20 @@
             (HbStyle::Primitive)(pluginBaseId()+BP_Text3_text), this);
     style()->setItemName( mText3, "text_line_3" );
 
+    delete mNumberTypeIcon;
+    mNumberTypeIcon = style()->createPrimitive(
+            (HbStyle::Primitive)(pluginBaseId()+BP_NumberType_icon), this);
+    style()->setItemName( mNumberTypeIcon, "number_type_icon" );
+
+    delete mCipheringIcon;
+    mCipheringIcon = style()->createPrimitive(
+            (HbStyle::Primitive)(pluginBaseId()+BP_Ciphering_icon), this);
+    style()->setItemName( mCipheringIcon, "ciphering_icon" );
+
     delete mStatusIcon;
     mStatusIcon = style()->createPrimitive(
             (HbStyle::Primitive)(pluginBaseId()+BP_CallStatus_icon), this);
     style()->setItemName( mStatusIcon, "status_icon" );
-
-    delete mNumberTypeIcon;
-    mNumberTypeIcon = style()->createPrimitive(
-            (HbStyle::Primitive)(pluginBaseId()+BP_NumberType_icon), this);
-    style()->setItemName( mNumberTypeIcon, "number_type_icon" );
 }
 
 void BubbleHeadingWidget::updatePrimitives()
@@ -120,6 +125,13 @@
                 &option);
     }
 
+    if (mCipheringIcon) {
+        style()->updatePrimitive(
+                mCipheringIcon,
+                (HbStyle::Primitive)(pluginBaseId()+BP_Ciphering_icon),
+                &option);
+    }
+
     repolish();
 }
 
@@ -176,6 +188,9 @@
 void BubbleHeadingWidget::setLineCount(int count)
 {
     lines = count;
+    if (isVisible()) {
+        repolish();        
+    }
 }
 
 QString BubbleHeadingWidget::layout() const
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/src/bubbleheadingwidget.h
--- a/phoneuis/bubblemanager2/bubblecore/src/bubbleheadingwidget.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/bubblecore/src/bubbleheadingwidget.h	Fri Apr 16 14:58:25 2010 +0300
@@ -64,6 +64,7 @@
     // primitives
     QGraphicsItem* mStatusIcon;
     QGraphicsItem* mNumberTypeIcon;
+    QGraphicsItem* mCipheringIcon;
     QGraphicsItem* mText1;
     QGraphicsItem* mText2;
     QGraphicsItem* mText3;
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/src/bubblemanager2.cpp
--- a/phoneuis/bubblemanager2/bubblecore/src/bubblemanager2.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/bubblecore/src/bubblemanager2.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -16,7 +16,6 @@
 */
 
 #include <QtGui>
-#include <QDebug>
 #include <QtAlgorithms>
 
 #include <hblabel.h>
@@ -459,7 +458,7 @@
     findActiveHeader( bubbleId, header );     
     Q_ASSERT( header );
 
-    header->setCallImage(":resources/qtg_large_avatar.svg");
+    header->setCallImage("qtg_large_avatar");
 }
 
 /**
@@ -570,6 +569,17 @@
             break;
         }
     }
+
+    QGraphicsWidget* view =
+        mWidgetManager->view(BubbleWidgetManager::ConferenceView);
+    if (view) {
+        QList<BubbleHandler*>* handlers = mWidgetManager->handlers(view);
+        if (handlers) {
+            foreach (BubbleHandler* handler, *handlers) {
+                handler->conferenceRemoved();
+            }
+        }
+    }
 }
 
 /**
@@ -599,6 +609,18 @@
     Q_ASSERT( mIsReadyToDraw > 0 );
     mConferenceHeader->removeHeader(bubbleId);
     mSortHeaders = true;
+
+    QGraphicsWidget* view =
+        mWidgetManager->view(BubbleWidgetManager::ConferenceView);
+
+    if (view) {
+        QList<BubbleHandler*>* handlers = mWidgetManager->handlers(view);
+        if (handlers) {
+            foreach (BubbleHandler* handler, *handlers) {
+                handler->conferenceMemberRemoved(bubbleId);
+            }
+        }
+    }
 }
 
 /**
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/src/bubbleparticipantlistitem.cpp
--- a/phoneuis/bubblemanager2/bubblecore/src/bubbleparticipantlistitem.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/bubblecore/src/bubbleparticipantlistitem.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -38,7 +38,9 @@
     mButtonStyle(buttonStyle),
     mBackground(0),
     mText(0),
-    mIcon(0),
+    mStatusIcon(0),
+    mCipheringIcon(0),
+    mExpandIcon(0),
     mButton1(0),
     mButton2(0),
     mExpanded(false)
@@ -81,11 +83,26 @@
         }
     }
 
-    if (!mIcon) {
-        mIcon = style()->createPrimitive(
+    if (!mCipheringIcon) {
+        mCipheringIcon = style()->createPrimitive(
+                (HbStyle::Primitive)(pluginBaseId()+BP_Ciphering_icon), this);
+        if ( mCipheringIcon ) {
+            style()->setItemName( mCipheringIcon, "ciphering" );
+        }
+    }
+
+    if (!mStatusIcon) {
+        mStatusIcon = style()->createPrimitive(
                 (HbStyle::Primitive)(pluginBaseId()+BP_CallStatus_icon), this);
-        if ( mIcon ) {
-            style()->setItemName( mIcon, "icon" );
+        if ( mStatusIcon ) {
+            style()->setItemName( mStatusIcon, "icon" );
+        }
+    }
+
+    if (!mExpandIcon) {
+        mExpandIcon = new HbIconItem(this);
+        if ( mExpandIcon ) {
+            style()->setItemName( mExpandIcon, "expand-indi" );
         }
     }
 
@@ -150,7 +167,10 @@
                          modelIndex().data(Qt::DecorationRole).toInt();
     option.mText1 = modelIndex().data(Qt::DisplayRole).toString();
     option.mCliLineNumber = 1;
-
+    bool ciphering = modelIndex().data(Qt::StatusTipRole).toBool();
+    if (!ciphering) {
+        option.mCallFlags = BubbleManagerIF::NoCiphering;
+    }
 
     if (mBackground) {
         style()->updatePrimitive(
@@ -166,13 +186,28 @@
             &option);
     }
 
-    if (mIcon) {
+    if (mStatusIcon) {
         style()->updatePrimitive(
-            mIcon,
+            mStatusIcon,
             (HbStyle::Primitive)(pluginBaseId()+BP_CallStatus_icon),
             &option );
     }
 
+    if (mCipheringIcon) {
+        style()->updatePrimitive(
+            mCipheringIcon,
+            (HbStyle::Primitive)(pluginBaseId()+BP_Ciphering_icon),
+            &option );
+    }
+
+    if (mExpandIcon) {
+        if (mExpanded) {
+            mExpandIcon->setIcon(HbIcon("qtg_small_expand"));
+        } else {
+            mExpandIcon->setIcon(HbIcon("qtg_small_collapse"));
+        }
+    }
+
     repolish();
 }
 
@@ -184,7 +219,7 @@
         setProperty("layoutOption","collapsed");
     }
 
-    HbWidget::polish(params);
+    HbListViewItem::polish(params);
 }
 
 void BubbleParticipantListItem::receivedFocus()
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/src/bubbleparticipantlistitem.h
--- a/phoneuis/bubblemanager2/bubblecore/src/bubbleparticipantlistitem.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/bubblecore/src/bubbleparticipantlistitem.h	Fri Apr 16 14:58:25 2010 +0300
@@ -24,6 +24,7 @@
 class HbPushButton;
 class BubbleButtonStyle;
 class HbAction;
+class HbIconItem;
 
 class BubbleParticipantListItem : public HbListViewItem
 {
@@ -58,7 +59,9 @@
     BubbleButtonStyle& mButtonStyle;
     QGraphicsItem* mBackground;
     QGraphicsItem* mText;
-    QGraphicsItem* mIcon;
+    QGraphicsItem* mStatusIcon;
+    QGraphicsItem* mCipheringIcon;
+    HbIconItem*    mExpandIcon;
     HbPushButton*  mButton1;
     HbPushButton*  mButton2;
     QList<HbAction*> mActions;
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/src/bubbleparticipantlistmodel.cpp
--- a/phoneuis/bubblemanager2/bubblecore/src/bubbleparticipantlistmodel.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/bubblecore/src/bubbleparticipantlistmodel.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -24,14 +24,19 @@
     int mBubbleId;
     QString mName;
     int mState;
+    bool mCiphering;
 
 public:
-    Participant(int bubbleId, const QString &name, int state);
+    Participant(int bubbleId, const QString &name, int state, bool ciphering);
 
 };
 
-Participant::Participant(int bubbleId, const QString &name, int state) :
-    mBubbleId(bubbleId), mName(name), mState(state)
+Participant::Participant(
+    int bubbleId,
+    const QString &name,
+    int state,
+    bool ciphering) :
+    mBubbleId(bubbleId), mName(name), mState(state), mCiphering(ciphering)
 {
 }
 
@@ -61,6 +66,8 @@
         return player->mName;
     } else if (role == Qt::DecorationRole) {
         return player->mState;
+    } else if (role == Qt::StatusTipRole) {
+        return player->mCiphering;
     } else {
         return QVariant();
     }
@@ -69,10 +76,73 @@
 void BubbleParticipantListModel::addParticipant(
     int bubbleId,
     const QString &name,
-    int state )
+    int state,
+    bool ciphering)
+{
+    bool itemExist=false;
+
+    // check, if existing item (bubble)
+    for (int i=0; i < mParticipants.count(); i++) {
+        Participant* p = mParticipants[i];
+        if (p->mBubbleId == bubbleId) {
+            if (isDataChanged(*p,name,state,ciphering)) {
+                updateData(*p,name,state,ciphering);
+                QModelIndex index = QAbstractListModel::createIndex(i,0);
+                emit dataChanged(index,index);
+            }
+            itemExist=true;
+            break;
+        }
+    }
+
+    if (!itemExist) {
+        // insert new item
+        beginInsertRows(QModelIndex(), mParticipants.count(), mParticipants.count());
+        Participant* p = new Participant(bubbleId,name,state, ciphering);
+        mParticipants.append(p);
+        endInsertRows();
+    }
+}
+
+bool BubbleParticipantListModel::isDataChanged(
+    const Participant& participant,
+    const QString &name,
+    int state,
+    bool ciphering) const
 {
-    Participant* p = new Participant(bubbleId,name,state);
-    mParticipants.append(p);
+    if ( participant.mName != name ||
+         participant.mState != state ||
+         participant.mCiphering != ciphering ) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+void BubbleParticipantListModel::updateData(
+    Participant& participant,
+    const QString &name,
+    int state,
+    bool ciphering) const
+{
+    participant.mName = name;
+    participant.mState = state;
+    participant.mCiphering = ciphering;
+}
+
+void BubbleParticipantListModel::removeParticipant(int bubbleId)
+{
+    QMutableListIterator<Participant*> i(mParticipants);
+    int j=0;
+    while(i.hasNext()) {
+        Participant* p = i.next();
+        if (p->mBubbleId == bubbleId) {
+            beginRemoveRows(QModelIndex(), j, j);
+            i.remove();
+            endRemoveRows();
+        }
+        j++;
+    }
 }
 
 int BubbleParticipantListModel::bubbleId(int row)
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/src/bubbleparticipantlistmodel.h
--- a/phoneuis/bubblemanager2/bubblecore/src/bubbleparticipantlistmodel.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/bubblecore/src/bubbleparticipantlistmodel.h	Fri Apr 16 14:58:25 2010 +0300
@@ -34,7 +34,11 @@
     void addParticipant(
         int bubbleId,
         const QString &name,
-        int state );
+        int state,
+        bool ciphering);
+
+    void removeParticipant(
+        int bubbleId);
 
     int bubbleId(int row);
 
@@ -46,6 +50,19 @@
                    int role = Qt::DisplayRole ) const;
 
 private:
+    inline bool isDataChanged(
+        const Participant& participant,
+        const QString &name,
+        int state,
+        bool ciphering) const;
+
+    inline void updateData(
+        Participant& participant,
+        const QString &name,
+        int state,
+        bool ciphering) const;
+
+private:
     QList<Participant*> mParticipants;
 };
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/src/bubbleutils.cpp
--- a/phoneuis/bubblemanager2/bubblecore/src/bubbleutils.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/bubblecore/src/bubbleutils.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -154,6 +154,14 @@
         option.mCliLineNumber = 1;
         break;
 
+    case BubbleManager::Outgoing:
+        option.mText1.append(header.text());
+        option.mText1Clip = header.textClipDirection();
+        option.mText2.append(header.cli());
+        option.mText2Clip = header.cliClipDirection();
+        option.mCliLineNumber = 2;
+        break;
+
     default:
         // do nothing
         break;
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/src/bubblewidgetmanager.cpp
--- a/phoneuis/bubblemanager2/bubblecore/src/bubblewidgetmanager.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/bubblecore/src/bubblewidgetmanager.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -153,11 +153,6 @@
     if (b) {
         Q_ASSERT(mButtonStyle.contains(widget));
         b->setStyle(mButtonStyle.value(widget));
-        HbTextItem* label =
-        static_cast<HbTextItem*>(b->primitive(HbStyle::P_PushButton_text));
-        if (label) {
-            label->setTextColor(Qt::white);
-        }
     }
 }
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_b.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_b.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="50px" height="10px" viewBox="0 0 50 10" enable-background="new 0 0 50 10" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="50" height="10"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="24.9995" y1="-39.8838" x2="24.9995" y2="10.0715">
+	<stop  offset="0" style="stop-color:#85BF24"/>
+	<stop  offset="1" style="stop-color:#387300"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" width="50" height="10"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.9995" y1="-39.8838" x2="24.9995" y2="9.8873">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<rect y="9" opacity="0.35" fill="url(#SVGID_2_)" width="50" height="1"/>
+<rect fill="none" width="50" height="10"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_bl.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_bl.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="10" height="10"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="-39.8838" x2="5" y2="10.0715">
+	<stop  offset="0" style="stop-color:#85BF24"/>
+	<stop  offset="1" style="stop-color:#387300"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M0,5c0,2.762,2.238,5,5,5h5V0H0V5z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="-39.8838" x2="5" y2="9.8873">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<path opacity="0.35" fill="url(#SVGID_2_)" d="M0,0v5c0,2.762,2.238,5,5,5h5V9H5C2.794,9,1,7.206,1,5V0H0z"/>
+<rect fill="none" width="10" height="10"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_br.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_br.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="10" height="10"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="-39.8838" x2="5" y2="10.0715">
+	<stop  offset="0" style="stop-color:#85BF24"/>
+	<stop  offset="1" style="stop-color:#387300"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M0,10h5c2.762,0,5-2.238,5-5V0H0V10z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="-39.8838" x2="5" y2="9.8873">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<path opacity="0.35" fill="url(#SVGID_2_)" d="M9,5c0,2.206-1.794,4-4,4H0v1h5c2.762,0,5-2.238,5-5V0H9V5z"/>
+<rect fill="none" width="10" height="10"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_c.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_c.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="50px" height="30px" viewBox="0 0 50 30" enable-background="new 0 0 50 30" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="50" height="30"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="24.9995" y1="-9.8843" x2="24.9995" y2="40.0719">
+	<stop  offset="0" style="stop-color:#85BF24"/>
+	<stop  offset="1" style="stop-color:#387300"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" width="50" height="30"/>
+<rect fill="none" width="50" height="30"/>
+<rect opacity="0.1" fill="#FFFFFF" width="50" height="9"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_l.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_l.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="10px" height="30px" viewBox="0 0 10 30" enable-background="new 0 0 10 30" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="10" height="30"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="-9.8843" x2="5" y2="40.0719">
+	<stop  offset="0" style="stop-color:#85BF24"/>
+	<stop  offset="1" style="stop-color:#387300"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" width="10" height="30"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="0.5" y1="-9.8843" x2="0.5" y2="39.8876">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<rect opacity="0.35" fill="url(#SVGID_2_)" width="1" height="30"/>
+<rect fill="none" width="10" height="30"/>
+<rect x="3" opacity="0.1" fill="#FFFFFF" width="7" height="9"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_r.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_r.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="10px" height="30px" viewBox="0 0 10 30" enable-background="new 0 0 10 30" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="10" height="30"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="-9.8843" x2="5" y2="40.0719">
+	<stop  offset="0" style="stop-color:#85BF24"/>
+	<stop  offset="1" style="stop-color:#387300"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" width="10" height="30"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="9.5" y1="-9.8843" x2="9.5" y2="39.8876">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<rect x="9" opacity="0.35" fill="url(#SVGID_2_)" width="1" height="30"/>
+<rect fill="none" width="10" height="30"/>
+<rect opacity="0.1" fill="#FFFFFF" width="7" height="9"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_t.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_t.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="50px" height="10px" viewBox="0 0 50 10" enable-background="new 0 0 50 10" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="50" height="10"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="24.9995" y1="0.1157" x2="24.9995" y2="50.071">
+	<stop  offset="0" style="stop-color:#85BF24"/>
+	<stop  offset="1" style="stop-color:#387300"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" width="50" height="10"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.9995" y1="0.1157" x2="24.9995" y2="49.8868">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<rect opacity="0.35" fill="url(#SVGID_2_)" width="50" height="1"/>
+<rect fill="none" width="50" height="10"/>
+<rect y="3" opacity="0.1" fill="#FFFFFF" width="50" height="7"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_tl.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_tl.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="10" height="10"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="0.1157" x2="5" y2="50.071">
+	<stop  offset="0" style="stop-color:#85BF24"/>
+	<stop  offset="1" style="stop-color:#387300"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M10,0H5C2.238,0,0,2.238,0,5v5h10V0z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="0.1157" x2="5" y2="49.8868">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<path opacity="0.35" fill="url(#SVGID_2_)" d="M1,5c0-2.206,1.794-4,4-4h5V0H5C2.238,0,0,2.238,0,5v5h1V5z"/>
+<rect fill="none" width="10" height="10"/>
+<path opacity="0.1" fill="#FFFFFF" d="M10,3H5C3.897,3,3,3.896,3,5v5h7V3z"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_tr.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_normal_tr.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="10" height="10"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="0.1157" x2="5" y2="50.071">
+	<stop  offset="0" style="stop-color:#85BF24"/>
+	<stop  offset="1" style="stop-color:#387300"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M10,5c0-2.762-2.238-5-5-5H0v10h10V5z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="0.1157" x2="5" y2="49.8868">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<path opacity="0.35" fill="url(#SVGID_2_)" d="M10,5c0-2.762-2.238-5-5-5H0v1h5c2.206,0,4,1.794,4,4v5h1V5z"/>
+<rect fill="none" width="10" height="10"/>
+<path opacity="0.1" fill="#FFFFFF" d="M7,5c0-1.104-0.896-2-2-2H0v7h7V5z"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_b.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_b.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="50px" height="10px" viewBox="0 0 50 10" enable-background="new 0 0 50 10" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="50" height="10"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="25.0005" y1="10.1279" x2="25.0005" y2="-39.7534">
+	<stop  offset="0" style="stop-color:#85BF24"/>
+	<stop  offset="1" style="stop-color:#387300"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" width="50" height="10"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.9995" y1="-39.8838" x2="24.9995" y2="9.8873">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<rect y="9" opacity="0.35" fill="url(#SVGID_2_)" width="50" height="1"/>
+<rect fill="none" width="50" height="10"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_bl.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_bl.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="10" height="10"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="10.1279" x2="5" y2="-39.7534">
+	<stop  offset="0" style="stop-color:#85BF24"/>
+	<stop  offset="1" style="stop-color:#387300"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M0,5c0,2.762,2.238,5,5,5h5V0H0V5z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="-39.8838" x2="5" y2="9.8873">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<path opacity="0.35" fill="url(#SVGID_2_)" d="M0,0v5c0,2.762,2.238,5,5,5h5V9H5C2.794,9,1,7.206,1,5V0H0z"/>
+<rect fill="none" width="10" height="10"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_br.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_br.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="10" height="10"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="10.1279" x2="5" y2="-39.7534">
+	<stop  offset="0" style="stop-color:#85BF24"/>
+	<stop  offset="1" style="stop-color:#387300"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M0,10h5c2.762,0,5-2.238,5-5V0H0V10z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="-39.8838" x2="5" y2="9.8873">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<path opacity="0.35" fill="url(#SVGID_2_)" d="M9,5c0,2.206-1.794,4-4,4H0v1h5c2.762,0,5-2.238,5-5V0H9V5z"/>
+<rect fill="none" width="10" height="10"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_c.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_c.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="50px" height="30px" viewBox="0 0 50 30" enable-background="new 0 0 50 30" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="50" height="30"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="25.0005" y1="40.127" x2="25.0005" y2="-9.7536">
+	<stop  offset="0" style="stop-color:#85BF24"/>
+	<stop  offset="1" style="stop-color:#387300"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" width="50" height="30"/>
+<rect fill="none" width="50" height="30"/>
+<rect opacity="0.1" fill="#FFFFFF" width="50" height="9"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_l.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_l.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="10px" height="30px" viewBox="0 0 10 30" enable-background="new 0 0 10 30" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="10" height="30"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="40.127" x2="5" y2="-9.7536">
+	<stop  offset="0" style="stop-color:#85BF24"/>
+	<stop  offset="1" style="stop-color:#387300"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" width="10" height="30"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="0.5" y1="-9.8843" x2="0.5" y2="39.8876">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<rect opacity="0.35" fill="url(#SVGID_2_)" width="1" height="30"/>
+<rect fill="none" width="10" height="30"/>
+<rect x="3" opacity="0.1" fill="#FFFFFF" width="7" height="9"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_r.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_r.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="10px" height="30px" viewBox="0 0 10 30" enable-background="new 0 0 10 30" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="10" height="30"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="40.127" x2="5" y2="-9.7536">
+	<stop  offset="0" style="stop-color:#85BF24"/>
+	<stop  offset="1" style="stop-color:#387300"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" width="10" height="30"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="9.5" y1="-9.8843" x2="9.5" y2="39.8876">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<rect x="9" opacity="0.35" fill="url(#SVGID_2_)" width="1" height="30"/>
+<rect fill="none" width="10" height="30"/>
+<rect opacity="0.1" fill="#FFFFFF" width="7" height="9"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_t.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_t.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="50px" height="10px" viewBox="0 0 50 10" enable-background="new 0 0 50 10" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="50" height="10"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="25.0005" y1="50.1279" x2="25.0005" y2="0.2466">
+	<stop  offset="0" style="stop-color:#85BF24"/>
+	<stop  offset="1" style="stop-color:#387300"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" width="50" height="10"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.9995" y1="0.1157" x2="24.9995" y2="49.8868">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<rect opacity="0.35" fill="url(#SVGID_2_)" width="50" height="1"/>
+<rect fill="none" width="50" height="10"/>
+<rect y="3" opacity="0.1" fill="#FFFFFF" width="50" height="7"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_tl.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_tl.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="10" height="10"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="50.1279" x2="5" y2="0.2466">
+	<stop  offset="0" style="stop-color:#85BF24"/>
+	<stop  offset="1" style="stop-color:#387300"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M10,0H5C2.238,0,0,2.238,0,5v5h10V0z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="0.1157" x2="5" y2="49.8868">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<path opacity="0.35" fill="url(#SVGID_2_)" d="M1,5c0-2.206,1.794-4,4-4h5V0H5C2.238,0,0,2.238,0,5v5h1V5z"/>
+<rect fill="none" width="10" height="10"/>
+<path opacity="0.1" fill="#FFFFFF" d="M10,3H5C3.897,3,3,3.897,3,5v5h7V3z"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_tr.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_green_pressed_tr.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="10" height="10"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="50.1279" x2="5" y2="0.2466">
+	<stop  offset="0" style="stop-color:#85BF24"/>
+	<stop  offset="1" style="stop-color:#387300"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M10,5c0-2.762-2.238-5-5-5H0v10h10V5z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="0.1157" x2="5" y2="49.8868">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<path opacity="0.35" fill="url(#SVGID_2_)" d="M10,5c0-2.762-2.238-5-5-5H0v1h5c2.206,0,4,1.794,4,4v5h1V5z"/>
+<rect fill="none" width="10" height="10"/>
+<path opacity="0.1" fill="#FFFFFF" d="M7,5c0-1.103-0.896-2-2-2H0v7h7V5z"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_b.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_b.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="50px" height="10px" viewBox="0 0 50 10" enable-background="new 0 0 50 10" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="50" height="10"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="25.0005" y1="9.8145" x2="25.0005" y2="-39.8316">
+	<stop  offset="0" style="stop-color:#700000"/>
+	<stop  offset="1" style="stop-color:#CF1708"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" width="50" height="10"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.9995" y1="-39.8838" x2="24.9995" y2="9.8873">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<rect y="9" opacity="0.35" fill="url(#SVGID_2_)" width="50" height="1"/>
+<rect fill="none" width="50" height="10"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_bl.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_bl.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="10" height="10"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="9.8145" x2="5" y2="-39.8316">
+	<stop  offset="0" style="stop-color:#700000"/>
+	<stop  offset="1" style="stop-color:#CF1708"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M0,5c0,2.762,2.238,5,5,5h5V0H0V5z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="-39.8838" x2="5" y2="9.8873">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<path opacity="0.35" fill="url(#SVGID_2_)" d="M0,0v5c0,2.762,2.238,5,5,5h5V9H5C2.794,9,1,7.206,1,5V0H0z"/>
+<rect fill="none" width="10" height="10"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_br.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_br.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="10" height="10"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="9.8145" x2="5" y2="-39.8316">
+	<stop  offset="0" style="stop-color:#700000"/>
+	<stop  offset="1" style="stop-color:#CF1708"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M0,10h5c2.762,0,5-2.238,5-5V0H0V10z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="-39.8838" x2="5" y2="9.8873">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<path opacity="0.35" fill="url(#SVGID_2_)" d="M9,5c0,2.206-1.794,4-4,4H0v1h5c2.762,0,5-2.238,5-5V0H9V5z"/>
+<rect fill="none" width="10" height="10"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_c.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_c.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="50px" height="30px" viewBox="0 0 50 30" enable-background="new 0 0 50 30" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="50" height="30"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="25.0005" y1="39.8135" x2="25.0005" y2="-9.8318">
+	<stop  offset="0" style="stop-color:#700000"/>
+	<stop  offset="1" style="stop-color:#CF1708"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" width="50" height="30"/>
+<rect fill="none" width="50" height="30"/>
+<rect opacity="0.1" fill="#FFFFFF" width="50" height="9"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_l.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_l.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="10px" height="30px" viewBox="0 0 10 30" enable-background="new 0 0 10 30" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="10" height="30"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="39.8135" x2="5" y2="-9.8318">
+	<stop  offset="0" style="stop-color:#700000"/>
+	<stop  offset="1" style="stop-color:#CF1708"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" width="10" height="30"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="0.5" y1="-9.8843" x2="0.5" y2="39.8876">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<rect opacity="0.35" fill="url(#SVGID_2_)" width="1" height="30"/>
+<rect fill="none" width="10" height="30"/>
+<rect x="3" opacity="0.1" fill="#FFFFFF" width="7" height="9"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_r.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_r.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="10px" height="30px" viewBox="0 0 10 30" enable-background="new 0 0 10 30" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="10" height="30"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="39.8135" x2="5" y2="-9.8318">
+	<stop  offset="0" style="stop-color:#700000"/>
+	<stop  offset="1" style="stop-color:#CF1708"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" width="10" height="30"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="9.5" y1="-9.8843" x2="9.5" y2="39.8876">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<rect x="9" opacity="0.35" fill="url(#SVGID_2_)" width="1" height="30"/>
+<rect fill="none" width="10" height="30"/>
+<rect opacity="0.1" fill="#FFFFFF" width="7" height="9"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_t.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_t.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="50px" height="10px" viewBox="0 0 50 10" enable-background="new 0 0 50 10" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="50" height="10"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="25.0005" y1="49.8145" x2="25.0005" y2="0.1684">
+	<stop  offset="0" style="stop-color:#700000"/>
+	<stop  offset="1" style="stop-color:#CF1708"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" width="50" height="10"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.9995" y1="0.1157" x2="24.9995" y2="49.8868">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<rect opacity="0.35" fill="url(#SVGID_2_)" width="50" height="1"/>
+<rect fill="none" width="50" height="10"/>
+<rect y="3" opacity="0.1" fill="#FFFFFF" width="50" height="7"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_tl.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_tl.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="10" height="10"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="49.8145" x2="5" y2="0.1684">
+	<stop  offset="0" style="stop-color:#700000"/>
+	<stop  offset="1" style="stop-color:#CF1708"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M10,0H5C2.238,0,0,2.238,0,5v5h10V0z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="0.1157" x2="5" y2="49.8868">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<path opacity="0.35" fill="url(#SVGID_2_)" d="M1,5c0-2.206,1.794-4,4-4h5V0H5C2.238,0,0,2.238,0,5v5h1V5z"/>
+<rect fill="none" width="10" height="10"/>
+<path opacity="0.1" fill="#FFFFFF" d="M10,3H5C3.897,3,3,3.897,3,5v5h7V3z"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_tr.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_normal_tr.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="10" height="10"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="49.8145" x2="5" y2="0.1684">
+	<stop  offset="0" style="stop-color:#700000"/>
+	<stop  offset="1" style="stop-color:#CF1708"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M10,5c0-2.762-2.238-5-5-5H0v10h10V5z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="0.1157" x2="5" y2="49.8868">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<path opacity="0.35" fill="url(#SVGID_2_)" d="M10,5c0-2.762-2.238-5-5-5H0v1h5c2.206,0,4,1.794,4,4v5h1V5z"/>
+<rect fill="none" width="10" height="10"/>
+<path opacity="0.1" fill="#FFFFFF" d="M7,5c0-1.103-0.896-2-2-2H0v7h7V5z"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_b.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_b.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="50px" height="10px" viewBox="0 0 50 10" enable-background="new 0 0 50 10" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="50" height="10"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="24.9995" y1="-39.667" x2="24.9995" y2="10.422">
+	<stop  offset="0" style="stop-color:#700000"/>
+	<stop  offset="1" style="stop-color:#CF1708"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" width="50" height="10"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.9995" y1="-39.8838" x2="24.9995" y2="9.8873">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<rect y="9" opacity="0.35" fill="url(#SVGID_2_)" width="50" height="1"/>
+<rect fill="none" width="50" height="10"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_bl.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_bl.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="10" height="10"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="-39.667" x2="5" y2="10.422">
+	<stop  offset="0" style="stop-color:#700000"/>
+	<stop  offset="1" style="stop-color:#CF1708"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M0,5c0,2.762,2.238,5,5,5h5V0H0V5z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="-39.8838" x2="5" y2="9.8873">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<path opacity="0.35" fill="url(#SVGID_2_)" d="M0,0v5c0,2.762,2.238,5,5,5h5V9H5C2.794,9,1,7.206,1,5V0H0z"/>
+<rect fill="none" width="10" height="10"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_br.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_br.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="10" height="10"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="-39.667" x2="5" y2="10.422">
+	<stop  offset="0" style="stop-color:#700000"/>
+	<stop  offset="1" style="stop-color:#CF1708"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M0,10h5c2.762,0,5-2.238,5-5V0H0V10z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="-39.8838" x2="5" y2="9.8873">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<path opacity="0.35" fill="url(#SVGID_2_)" d="M9,5c0,2.206-1.794,4-4,4H0v1h5c2.762,0,5-2.238,5-5V0H9V5z"/>
+<rect fill="none" width="10" height="10"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_c.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_c.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="50px" height="30px" viewBox="0 0 50 30" enable-background="new 0 0 50 30" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="50" height="30"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="24.9995" y1="-9.6675" x2="24.9995" y2="40.4223">
+	<stop  offset="0" style="stop-color:#700000"/>
+	<stop  offset="1" style="stop-color:#CF1708"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" width="50" height="30"/>
+<rect fill="none" width="50" height="30"/>
+<rect opacity="0.1" fill="#FFFFFF" width="50" height="9"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_l.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_l.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="10px" height="30px" viewBox="0 0 10 30" enable-background="new 0 0 10 30" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="10" height="30"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="-9.6675" x2="5" y2="40.4223">
+	<stop  offset="0" style="stop-color:#700000"/>
+	<stop  offset="1" style="stop-color:#CF1708"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" width="10" height="30"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="0.5" y1="-9.8843" x2="0.5" y2="39.8876">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<rect opacity="0.35" fill="url(#SVGID_2_)" width="1" height="30"/>
+<rect fill="none" width="10" height="30"/>
+<rect x="3" opacity="0.1" fill="#FFFFFF" width="7" height="9"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_r.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_r.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="10px" height="30px" viewBox="0 0 10 30" enable-background="new 0 0 10 30" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="10" height="30"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="-9.6675" x2="5" y2="40.4223">
+	<stop  offset="0" style="stop-color:#700000"/>
+	<stop  offset="1" style="stop-color:#CF1708"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" width="10" height="30"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="9.5" y1="-9.8843" x2="9.5" y2="39.8876">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<rect x="9" opacity="0.35" fill="url(#SVGID_2_)" width="1" height="30"/>
+<rect fill="none" width="10" height="30"/>
+<rect opacity="0.1" fill="#FFFFFF" width="7" height="9"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_t.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_t.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="50px" height="10px" viewBox="0 0 50 10" enable-background="new 0 0 50 10" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="50" height="10"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="24.9995" y1="0.3325" x2="24.9995" y2="50.4215">
+	<stop  offset="0" style="stop-color:#700000"/>
+	<stop  offset="1" style="stop-color:#CF1708"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" width="50" height="10"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.9995" y1="0.1157" x2="24.9995" y2="49.8868">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<rect opacity="0.35" fill="url(#SVGID_2_)" width="50" height="1"/>
+<rect fill="none" width="50" height="10"/>
+<rect y="3" opacity="0.1" fill="#FFFFFF" width="50" height="7"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_tl.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_tl.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="10" height="10"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="0.3325" x2="5" y2="50.4215">
+	<stop  offset="0" style="stop-color:#700000"/>
+	<stop  offset="1" style="stop-color:#CF1708"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M10,0H5C2.238,0,0,2.238,0,5v5h10V0z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="0.1157" x2="5" y2="49.8868">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<path opacity="0.35" fill="url(#SVGID_2_)" d="M1,5c0-2.206,1.794-4,4-4h5V0H5C2.238,0,0,2.238,0,5v5h1V5z"/>
+<rect fill="none" width="10" height="10"/>
+<path opacity="0.1" fill="#FFFFFF" d="M10,3H5C3.897,3,3,3.897,3,5v5h7V3z"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_tr.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_fr_btn_red_pressed_tr.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="10" height="10"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5" y1="0.3325" x2="5" y2="50.4215">
+	<stop  offset="0" style="stop-color:#700000"/>
+	<stop  offset="1" style="stop-color:#CF1708"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M10,5c0-2.762-2.238-5-5-5H0v10h10V5z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5" y1="0.1157" x2="5" y2="49.8868">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<path opacity="0.35" fill="url(#SVGID_2_)" d="M10,5c0-2.762-2.238-5-5-5H0v1h5c2.206,0,4,1.794,4,4v5h1V5z"/>
+<rect fill="none" width="10" height="10"/>
+<path opacity="0.1" fill="#FFFFFF" d="M7,5c0-1.103-0.896-2-2-2H0v7h7V5z"/>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_large_active_call.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_large_active_call.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="423.0967" x2="429.6524" y1="-578.646" y2="-582.9078">
+<stop offset="0" style="stop-color:#A7E722"/>
+<stop offset="0.1333" style="stop-color:#A7E722"/>
+<stop offset="0.6303" style="stop-color:#428C0F"/>
+<stop offset="1" style="stop-color:#5CA617"/>
+</linearGradient>
+<path d="M19.081,33.91c2.089-3.595,4.591-6.496,7.281-9.188c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.58c0,0,0.34,1.035,1.144,2.377C10.248,46.475,19.081,33.91,19.081,33.91z" fill="url(#SVGID_1_)"/>
+<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
+<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<radialGradient cx="40.9697" cy="9.21" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="12.2872">
+<stop offset="0" style="stop-color:#A7E722"/>
+<stop offset="0.6242" style="stop-color:#428C0F"/>
+<stop offset="1" style="stop-color:#5CA617"/>
+</radialGradient>
+<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
+<path d="M17.483,34.105c-0.988-0.139-2.007-0.119-3.027,0.105c-2.418,0.531-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.408-0.05,5.18c0,0,0.34,1.035,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.105z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M18.366,34.135c-0.989-0.139-2.008-0.117-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.873,0.127,2.398c0.003,0.012,0.005,0.033,0.01,0.047c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.887,8.75-11.383L18.366,34.135z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6187">
+<stop offset="0" style="stop-color:#A7E722"/>
+<stop offset="0.6242" style="stop-color:#428C0F"/>
+<stop offset="1" style="stop-color:#5CA617"/>
+</radialGradient>
+<path d="M11.202,47.738c0.616,0.74,0.646,0.953,1.295,1.523c1.194,1.055,9.301-13.611,9.301-13.611  l-2.683-1.719c-0.941-0.111-1.914-0.08-2.89,0.135c-4.777,1.049-7.806,5.869-6.87,10.832C9.749,45.686,10.349,46.709,11.202,47.738z  " fill="url(#SVGID_3_)"/>
+<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
+<stop offset="0" style="stop-color:#C6FF45"/>
+<stop offset="0.6788" style="stop-color:#387300"/>
+<stop offset="1" style="stop-color:#66A00E"/>
+</linearGradient>
+<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
+<path d="M21.798,35.65l-0.725-0.473l-9.215,13.486c0.216,0.205,0.43,0.414,0.639,0.598  C13.691,50.316,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
+<stop offset="0" style="stop-color:#C6FF45"/>
+<stop offset="0.6788" style="stop-color:#387300"/>
+<stop offset="1" style="stop-color:#66A00E"/>
+</linearGradient>
+<path d="M12.498,49.262c1.193,1.049,1.686,1.369,1.686,1.369c0.567,0.367,1.363,0.17,1.781-0.441l7.9-11.605  c0.419-0.615,0.307-1.412-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<rect fill="none" height="60" width="60"/>
+</g>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_large_avatar.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_large_avatar.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<path d="M46.691,42.35c-1.665-0.866-9.918-3.756-10.072-3.936l-0.002,0.002  c-0.934-1.068-0.896-3.433-0.43-4.46c0.001-0.001,0.002-0.001,0.002-0.002c0.032-0.071,0.065-0.139,0.104-0.197  c0.113-0.177,0.219-0.354,0.326-0.533l0,0c0.813-1.329,1.494-2.651,2.054-3.892c1.009,0.349,2.307-0.59,2.95-2.18  c0.667-1.645,0.379-3.354-0.645-3.815c-0.058-0.026-0.119-0.03-0.178-0.048c0-0.001,0-0.002,0-0.002  c0.133-0.521,0.191-0.826,0.191-0.826c1.77-7.934-2.078-14.223-11.402-14.533c-3.832,0-5.617,0.578-7.039,2.398  c-2.313,0.357-6.039,3.642-3.453,12.927c-0.098,0.016-0.195,0.031-0.289,0.071c-1.032,0.436-1.355,2.128-0.724,3.782  c0.633,1.653,1.983,2.643,3.017,2.208c0.063-0.027,0.117-0.072,0.176-0.11c0.568,1.279,1.266,2.646,2.104,4.02H23.38  c0.022,0.037,0.046,0.073,0.067,0.11c0.023,0.038,0.045,0.076,0.068,0.114c0.002,0.003,0.005,0.005,0.007,0.008  c0.061,0.101,0.12,0.201,0.185,0.301c0.532,0.833,0.663,3.229-0.166,4.457c-0.208,0.283-8.346,3.135-10.23,4.136  c-2.161,1.147-5.688,3.782-5.688,9.723h44.756C52.378,46.132,48.354,43.216,46.691,42.35z" fill="url(#SVGID_1_)"/>
+<path d="M7.659,51.072c-0.022,0.323-0.037,0.655-0.037,1h44.756c0-0.345-0.017-0.676-0.042-1H7.659z" fill="#FFFFFF" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M22.551,11.326c1.422-1.82,3.207-2.398,7.039-2.398c7.565,0.252,11.524,4.44,11.804,10.248  C41.535,12.856,37.58,8.194,29.59,7.928c-3.832,0-5.617,0.578-7.039,2.398c-1.81,0.279-4.472,2.367-4.311,7.704  C18.419,13.429,20.858,11.588,22.551,11.326z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M36.617,38.416c-0.441-0.505-0.66-1.3-0.725-2.106c-0.086,1.09,0.098,2.389,0.725,3.106  l0.002-0.002c0.154,0.18,8.407,3.069,10.072,3.936c1.566,0.816,5.225,3.453,5.645,8.723h0.042c0-5.94-4.024-8.856-5.687-9.723  c-1.665-0.866-9.918-3.756-10.072-3.936L36.617,38.416z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M13.311,43.35c1.885-1.001,10.022-3.853,10.23-4.136c0.508-0.752,0.652-1.938,0.568-2.938  c-0.053,0.717-0.225,1.429-0.568,1.938c-0.208,0.283-8.346,3.135-10.23,4.136c-2.161,1.147-5.688,3.782-5.688,9.723h0.037  C8.029,46.833,11.275,44.431,13.311,43.35z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<rect fill="none" height="60" width="60"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9995" x2="29.9995" y1="8.5967" y2="52.3536">
+<stop offset="0" style="stop-color:#8E8E8E"/>
+<stop offset="1" style="stop-color:#444444"/>
+</linearGradient>
+</defs>
+</g>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_large_end_call.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_large_end_call.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<linearGradient gradientTransform="matrix(-0.5413 0.8408 -0.8408 -0.5413 1896.0922 -2198.2874)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="2876.6201" x2="2883.1765" y1="367.9102" y2="363.6479">
+<stop offset="0" style="stop-color:#FF7236"/>
+<stop offset="0.6242" style="stop-color:#BA1212"/>
+<stop offset="1" style="stop-color:#E8522A"/>
+</linearGradient>
+<path d="M19.072,29.698c4.021-1.066,7.842-1.348,11.646-1.35c3.666,0.002,8.5,1.004,10.479,1.631l14.061-0.48  c-0.385-0.81-2.283-2.939-5.582-4.711c-3.303-1.771-11.847-3.841-20.172-3.841S13.896,22.8,11.703,23.785  c-3.453,1.555-6.129,4.401-6.725,5.411c0,0-0.49,0.972-0.873,2.489C3.943,32.337,19.072,29.698,19.072,29.698z" fill="url(#SVGID_1_)"/>
+<path d="M36.902,28.984c1.785,0.32,3.359,0.699,4.295,0.995l13.684-0.467  c-0.053-0.134-0.086-0.21-0.086-0.21c-0.111-0.236-0.338-0.568-0.639-0.949c-0.566-0.557-1.195-1.063-1.889-1.508  C47.357,23.704,40.916,24.737,36.902,28.984z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
+<path d="M37.762,29.146c1.424,0.28,2.654,0.586,3.436,0.833l13.729-0.47  c-0.059-0.148-0.096-0.233-0.096-0.233c-0.105-0.221-0.318-0.535-0.605-0.894c-0.535-0.526-1.129-1.006-1.783-1.426  C47.73,23.941,41.537,24.988,37.762,29.146z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M54.885,29.238c-0.096-0.2-0.291-0.485-0.549-0.812c-0.484-0.478-1.023-0.911-1.619-1.293  c-4.387-2.808-10.189-1.726-13.584,2.303c0.834,0.19,1.547,0.38,2.064,0.543l13.797-0.47C54.928,29.336,54.885,29.238,54.885,29.238  z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<radialGradient cx="-362.4932" cy="2606.3809" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 2153.4434 -1558.1849)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="14.0807">
+<stop offset="0" style="stop-color:#FF7236"/>
+<stop offset="0.6242" style="stop-color:#BA1212"/>
+<stop offset="1" style="stop-color:#E8522A"/>
+</radialGradient>
+<path d="M41.197,29.979l-0.439,1.752c0,0,15.475,5.881,15.643,4.275c0.084-0.809,0.057-0.872,0.018-1.768  c-0.119-2.688-1.16-4.74-1.16-4.74c-0.086-0.176-0.256-0.425-0.482-0.711c-0.424-0.419-0.898-0.801-1.42-1.135  c-3.959-2.533-9.242-1.463-12.176,2.329C41.184,29.981,41.191,29.979,41.197,29.979z" fill="url(#SVGID_2_)"/>
+<path d="M17.805,28.706c-0.6-0.797-1.334-1.503-2.215-2.065c-2.084-1.335-4.555-1.633-6.914-1.072  c-1.92,1.402-3.293,2.939-3.697,3.628c0,0-0.49,0.972-0.873,2.489c-0.135,0.546,10.469-1.219,13.904-1.805L17.805,28.706z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M18.408,29.352c-0.6-0.799-1.336-1.504-2.217-2.067c-2.855-1.829-6.439-1.728-9.463-0.097  c-0.744,0.706-1.299,1.348-1.605,1.785c-0.006,0.011-0.02,0.027-0.027,0.04c0,0-0.49,0.972-0.873,2.491  c-0.141,0.564,11.221-1.348,14.236-1.862L18.408,29.352z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<radialGradient cx="2885.8242" cy="377.8994" gradientTransform="matrix(-0.5439 0.8402 -0.8348 -0.5344 1899.8433 -2194.1335)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6192">
+<stop offset="0" style="stop-color:#FF7236"/>
+<stop offset="0.6242" style="stop-color:#BA1212"/>
+<stop offset="1" style="stop-color:#E8522A"/>
+</radialGradient>
+<path d="M3.725,33.904c-0.088,0.959-0.219,1.131-0.162,1.993c0.098,1.591,16.201-3.049,16.201-3.049  l-0.682-3.112c-0.586-0.744-1.297-1.409-2.139-1.947c-4.119-2.637-9.67-1.369-12.518,2.802C4.148,31.425,3.848,32.573,3.725,33.904z  " fill="url(#SVGID_3_)"/>
+<path d="M56.4,36.007c0.029-0.282,0.047-0.585,0.064-0.883l-15.488-4.232l-0.219,0.84  C40.758,31.731,56.232,37.612,56.4,36.007z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientTransform="matrix(-0.5413 0.8408 -0.8408 -0.5413 1896.0941 -2198.2864)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="2875.8125" x2="2881.0032" y1="335.625" y2="352.1139">
+<stop offset="0" style="stop-color:#FF7236"/>
+<stop offset="0.6242" style="stop-color:#BA1212"/>
+<stop offset="1" style="stop-color:#E8522A"/>
+</linearGradient>
+<path d="M40.758,31.731l-0.568,2.234c-0.15,0.577,0.211,1.163,0.811,1.408l4.543,1.241l8.988,2.387  c0.703,0.189,1.412-0.171,1.58-0.804c0,0,0.119-0.59,0.283-2.192L40.758,31.731z" fill="url(#SVGID_4_)"/>
+<path d="M19.764,32.849l-0.178-0.846L3.533,35.023c0.008,0.297,0.012,0.597,0.029,0.874  C3.66,37.488,19.764,32.849,19.764,32.849z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientTransform="matrix(-0.5413 0.8408 -0.8408 -0.5413 1896.0941 -2198.2869)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="2893.2236" x2="2905.0479" y1="368.8027" y2="381.8245">
+<stop offset="0" style="stop-color:#FF7236"/>
+<stop offset="0.6242" style="stop-color:#BA1212"/>
+<stop offset="1" style="stop-color:#E8522A"/>
+</linearGradient>
+<path d="M3.563,35.897c0.102,1.587,0.225,2.161,0.225,2.161c0.141,0.66,0.844,1.083,1.572,0.946l13.793-2.62  c0.73-0.138,1.213-0.78,1.072-1.44l-0.461-2.096L3.563,35.897z" fill="url(#SVGID_5_)"/>
+<rect fill="none" height="60" width="60"/>
+</g>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_large_video_dialled_call.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_large_video_dialled_call.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="422.2207" x2="428.7761" y1="-578.2104" y2="-582.472">
+<stop offset="0" style="stop-color:#A7E722"/>
+<stop offset="0.1333" style="stop-color:#A7E722"/>
+<stop offset="0.6303" style="stop-color:#428C0F"/>
+<stop offset="1" style="stop-color:#5CA617"/>
+</linearGradient>
+<path d="M18.469,33.146c2.09-3.596,4.591-6.497,7.281-9.19c2.594-2.589,6.72-5.299,8.562-6.254L43.916,7.42  c-0.846-0.3-3.693-0.465-7.279,0.616c-3.588,1.083-11.736,6.302-16.979,11.547C14.416,24.83,9.932,31.93,9.077,34.178  c-1.343,3.541-1.222,7.445-0.929,8.58c0,0,0.34,1.035,1.145,2.377C9.636,45.711,18.469,33.146,18.469,33.146z" fill="url(#SVGID_1_)"/>
+<path d="M30.573,20.037c1.488-1.037,2.869-1.883,3.74-2.335l9.346-10.006  c-0.131-0.057-0.209-0.088-0.209-0.088c-0.246-0.088-0.641-0.162-1.123-0.218c-0.793,0.005-1.596,0.093-2.402,0.27  C34.23,8.909,30.409,14.194,30.573,20.037z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
+<path d="M31.295,19.542c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.234-0.098-0.234-0.098c-0.232-0.08-0.604-0.152-1.061-0.203c-0.75,0.006-1.508,0.087-2.27,0.253  C34.664,8.813,31.023,13.932,31.295,19.542z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M43.467,7.499c-0.209-0.073-0.549-0.137-0.963-0.186c-0.68,0.006-1.369,0.08-2.059,0.231  c-5.088,1.116-8.426,5.984-7.977,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.422-10.088C43.566,7.538,43.467,7.499,43.467,7.499z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<radialGradient cx="46.6523" cy="-5.2056" gradientTransform="matrix(0.6122 0 0 0.6122 11.7943 11.6322)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="20.0698">
+<stop offset="0" style="stop-color:#A7E722"/>
+<stop offset="0.6242" style="stop-color:#428C0F"/>
+<stop offset="1" style="stop-color:#5CA617"/>
+</radialGradient>
+<path d="M34.313,17.702l0.928,1.55c0,0,15.102-6.784,14.084-8.039c-0.514-0.631-0.576-0.656-1.238-1.262  c-1.984-1.815-4.17-2.531-4.17-2.531C43.73,7.357,43.434,7.3,43.07,7.258c-0.596,0.005-1.199,0.069-1.805,0.202  c-4.592,1.008-7.572,5.5-6.965,10.256C34.305,17.713,34.309,17.706,34.313,17.702z" fill="url(#SVGID_2_)"/>
+<path d="M16.873,33.344c-0.989-0.141-2.008-0.121-3.028,0.104c-2.417,0.531-4.375,2.066-5.646,4.131  c-0.367,2.35-0.25,4.408-0.05,5.18c0,0,0.34,1.035,1.145,2.377c0.289,0.484,6.539-8.264,8.555-11.107L16.873,33.344z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M17.755,33.373c-0.989-0.141-2.008-0.119-3.029,0.104c-3.313,0.727-5.776,3.332-6.76,6.623  C7.94,41.125,8,41.973,8.093,42.498c0.002,0.012,0.005,0.033,0.01,0.047c0,0,0.339,1.033,1.143,2.379  c0.3,0.498,6.981-8.887,8.75-11.383L17.755,33.373z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<radialGradient cx="437.749" cy="-560.2109" gradientTransform="matrix(0.1283 0.5992 -0.5928 0.13 -373.5847 -154.0506)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="23.8799">
+<stop offset="0" style="stop-color:#A7E722"/>
+<stop offset="0.6242" style="stop-color:#428C0F"/>
+<stop offset="1" style="stop-color:#5CA617"/>
+</radialGradient>
+<path d="M10.591,46.975c0.616,0.74,0.646,0.955,1.294,1.525c1.195,1.055,9.301-13.613,9.301-13.613  l-2.683-1.719c-0.941-0.111-1.913-0.08-2.889,0.135c-4.777,1.049-7.806,5.869-6.87,10.832C9.138,44.922,9.736,45.947,10.591,46.975z  " fill="url(#SVGID_3_)"/>
+<path d="M49.324,11.213c-0.178-0.219-0.381-0.445-0.578-0.669l-13.943,7.958l0.438,0.749  C35.24,19.252,50.342,12.468,49.324,11.213z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="421.4131" x2="426.6039" y1="-610.4937" y2="-594.0048">
+<stop offset="0" style="stop-color:#C6FF45"/>
+<stop offset="0.6788" style="stop-color:#387300"/>
+<stop offset="1" style="stop-color:#66A00E"/>
+</linearGradient>
+<path d="M35.24,19.252l1.178,1.98c0.301,0.515,0.973,0.673,1.57,0.423l4.09-2.335l8.043-4.667  c0.631-0.363,0.877-1.12,0.549-1.685c0,0-0.334-0.501-1.35-1.752L35.24,19.252z" fill="url(#SVGID_4_)"/>
+<path d="M21.186,34.887l-0.725-0.473l-9.214,13.488c0.215,0.203,0.429,0.412,0.638,0.598  C13.081,49.555,21.186,34.887,21.186,34.887z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="438.8232" x2="450.6482" y1="-577.3184" y2="-564.2958">
+<stop offset="0" style="stop-color:#C6FF45"/>
+<stop offset="0.6788" style="stop-color:#387300"/>
+<stop offset="1" style="stop-color:#66A00E"/>
+</linearGradient>
+<path d="M11.887,48.498c1.193,1.051,1.685,1.371,1.685,1.371c0.568,0.367,1.363,0.168,1.781-0.443  l7.901-11.605c0.418-0.615,0.307-1.412-0.261-1.777l-1.808-1.156L11.887,48.498z" fill="url(#SVGID_5_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="39.1182" x2="44.145" y1="48.6309" y2="48.6309">
+<stop offset="0" style="stop-color:#878A8C"/>
+<stop offset="0.2606" style="stop-color:#BDC2C4"/>
+<stop offset="0.6606" style="stop-color:#5B6163"/>
+<stop offset="1" style="stop-color:#959A9C"/>
+</linearGradient>
+<rect fill="url(#SVGID_6_)" height="7.535" width="4.896" x="39.184" y="44.863"/>
+<path d="M39.184,49.596c0.787,0.189,1.604,0.303,2.449,0.303c0.844,0,1.662-0.113,2.447-0.303v-4.121  h-4.896V49.596z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M39.184,48.982c0.787,0.191,1.604,0.303,2.449,0.303c0.844,0,1.662-0.111,2.447-0.303v-4.119  h-4.896V48.982z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="41.6328" x2="41.6328" y1="27.8325" y2="48.6499">
+<stop offset="0" style="stop-color:#F2F2F2"/>
+<stop offset="0.3212" style="stop-color:#E6E6E6"/>
+<stop offset="1" style="stop-color:#666666"/>
+</linearGradient>
+<path d="M41.633,48.674c-5.74,0-10.408-4.67-10.408-10.408c0-5.74,4.668-10.409,10.408-10.409  c5.738,0,10.408,4.668,10.408,10.409C52.041,44.004,47.371,48.674,41.633,48.674L41.633,48.674z" fill="url(#SVGID_7_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="41.6318" x2="41.6318" y1="28.4473" y2="48.0381">
+<stop offset="0" style="stop-color:#D1D7D9"/>
+<stop offset="0.0667" style="stop-color:#D1D7D9"/>
+<stop offset="0.2606" style="stop-color:#BDC2C4"/>
+<stop offset="0.6606" style="stop-color:#7C8487"/>
+<stop offset="1" style="stop-color:#ADB3B5"/>
+</linearGradient>
+<circle cx="41.632" cy="38.266" fill="url(#SVGID_8_)" r="9.796"/>
+<path d="M41.633,47.037c-5.102,0-9.268-4.059-9.445-9.115c-0.004,0.111-0.008,0.223-0.008,0.334  c0,5.211,4.24,9.451,9.453,9.451c5.211,0,9.451-4.24,9.451-9.451c0-0.111-0.004-0.223-0.008-0.334  C50.898,42.979,46.732,47.037,41.633,47.037z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M49.592,37.848c0,4.516-3.564,8.969-7.963,8.967c-4.395-0.002-7.957-4.457-7.957-8.971  c0.004-4.516,3.568-8.172,7.963-8.172C46.029,29.675,49.594,33.334,49.592,37.848z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M41.629,46.15c-2.291,0-4.443-0.893-6.061-2.512c-1.619-1.619-2.51-3.773-2.508-6.063  c0-4.725,3.846-8.567,8.572-8.567c2.291,0,4.443,0.893,6.063,2.512c1.619,1.619,2.51,3.771,2.508,6.063  c0,4.725-3.846,8.566-8.57,8.566H41.629z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="41.6318" x2="41.6318" y1="29.5093" y2="45.4663">
+<stop offset="0" style="stop-color:#CFCFCF"/>
+<stop offset="0.1091" style="stop-color:#CFCFCF"/>
+<stop offset="0.6848" style="stop-color:#121212"/>
+<stop offset="1" style="stop-color:#A6A6A6"/>
+</linearGradient>
+<path d="M41.629,45.539c-2.127-0.002-4.125-0.83-5.629-2.334c-1.502-1.502-2.328-3.502-2.328-5.629  c0-4.387,3.572-7.956,7.961-7.956c2.127,0,4.125,0.83,5.629,2.333c1.504,1.504,2.33,3.504,2.33,5.631  c-0.002,4.387-3.572,7.955-7.959,7.955H41.629z" fill="url(#SVGID_9_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="41.6318" x2="41.6318" y1="30.1289" y2="44.8584">
+<stop offset="0" style="stop-color:#F2F2F2"/>
+<stop offset="1" style="stop-color:#606769"/>
+</linearGradient>
+<circle cx="41.632" cy="37.58" fill="url(#SVGID_10_)" r="7.347"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="41.6318" x2="41.6318" y1="31.4756" y2="43.6433">
+<stop offset="0" style="stop-color:#1A1A1A"/>
+<stop offset="0.503" style="stop-color:#343434"/>
+<stop offset="0.7515" style="stop-color:#9E9E9E"/>
+<stop offset="1" style="stop-color:#CFCFCF"/>
+</linearGradient>
+<path d="M41.633,43.701c-1.639,0-3.176-0.639-4.332-1.795c-1.154-1.156-1.791-2.693-1.791-4.33  c0-3.373,2.746-6.119,6.123-6.119c1.637,0,3.174,0.637,4.33,1.795c1.156,1.156,1.793,2.693,1.791,4.33  C47.754,40.957,45.008,43.701,41.633,43.701L41.633,43.701z" fill="url(#SVGID_11_)"/>
+<radialGradient cx="59.5957" cy="40.5771" gradientTransform="matrix(0.621 1.836735e-004 -1.836735e-004 0.6209 5.2261 12.8455)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="10.1859">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="0.5917" style="stop-color:#000000"/>
+<stop offset="0.627" style="stop-color:#050505"/>
+<stop offset="0.7652" style="stop-color:#121212"/>
+<stop offset="0.8876" style="stop-color:#171717"/>
+<stop offset="1" style="stop-color:#171717"/>
+</radialGradient>
+<circle cx="41.632" cy="37.579" fill="url(#SVGID_12_)" r="5.511"/>
+<radialGradient cx="53.6738" cy="32.9404" gradientTransform="matrix(0.621 0 0 0.6209 5.811 13.4188)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="16.2221">
+<stop offset="0" style="stop-color:#242424"/>
+<stop offset="0.4303" style="stop-color:#242424"/>
+<stop offset="0.7818" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#000000"/>
+</radialGradient>
+<circle cx="41.633" cy="37.58" fill="url(#SVGID_13_)" r="4.521"/>
+<radialGradient cx="56.7607" cy="30.0415" gradientTransform="matrix(0.621 1.836735e-004 -1.836735e-004 0.6209 5.2261 12.8455)" gradientUnits="userSpaceOnUse" id="SVGID_14_" r="17.797">
+<stop offset="0" style="stop-color:#A700F5"/>
+<stop offset="0.3091" style="stop-color:#A700F5"/>
+<stop offset="0.4364" style="stop-color:#5E008A"/>
+<stop offset="0.8061" style="stop-color:#0E1402"/>
+<stop offset="1" style="stop-color:#0E1402"/>
+</radialGradient>
+<path d="M45.672,37.58c0,2.232-1.809,4.041-4.041,4.039c-2.232,0-4.041-1.811-4.041-4.041  c0.002-2.232,1.813-4.039,4.041-4.039C43.865,33.541,45.676,35.35,45.672,37.58z" fill="url(#SVGID_14_)"/>
+<radialGradient cx="58.6514" cy="45.2432" gradientTransform="matrix(0.621 1.836735e-004 -1.836735e-004 0.6209 5.2261 12.8455)" gradientUnits="userSpaceOnUse" id="SVGID_15_" r="7.2256">
+<stop offset="0" style="stop-color:#48630C"/>
+<stop offset="0.7879" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#000000"/>
+</radialGradient>
+<path d="M45.672,37.58c0,2.232-1.809,4.041-4.041,4.039c-2.232,0-4.041-1.811-4.041-4.041  c0,0,1.385,2.465,4.041,2.465S45.672,37.58,45.672,37.58z" fill="url(#SVGID_15_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="41.6123" x2="41.6123" y1="32.7168" y2="37.5411">
+<stop offset="0" style="stop-color:#F8FBFF"/>
+<stop offset="1" style="stop-color:#808080"/>
+</linearGradient>
+<path d="M41.611,37.518c1.754,0,3.404-0.264,4.863-0.732  c-0.414-2.313-2.432-4.068-4.863-4.068c-2.43,0-4.445,1.756-4.861,4.068C38.207,37.254,39.859,37.518,41.611,37.518z" fill="url(#SVGID_16_)" fill-opacity="0.35" stroke-opacity="0.35"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="32.7676" x2="50.541" y1="51.5801" y2="51.5801">
+<stop offset="0" style="stop-color:#878A8C"/>
+<stop offset="0.2606" style="stop-color:#BDC2C4"/>
+<stop offset="0.6606" style="stop-color:#5B6163"/>
+<stop offset="1" style="stop-color:#959A9C"/>
+</linearGradient>
+<path d="M50.502,52.805c0.025-0.609,0.039-0.486,0.039-0.613v-0.033c0-0.996-0.816-1.803-1.824-1.803H34.592  c-1.008,0-1.824,0.807-1.824,1.803v0.033c0,0.127,0.014,0.004,0.039,0.613H50.502z" fill="url(#SVGID_17_)"/>
+<path d="M32.881,51.557H50.43c-0.08-0.225-0.203-0.426-0.361-0.6H33.242  C33.084,51.131,32.961,51.332,32.881,51.557z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M32.777,52.191c0.008,0.125,0.016,0.309,0.029,0.613h17.695  c0.012-0.305,0.021-0.488,0.027-0.613H32.777z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M33.24,50.957h16.826c-0.332-0.367-0.811-0.602-1.35-0.602H34.592  C34.053,50.355,33.574,50.59,33.24,50.957z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<rect fill="none" height="60" width="60"/>
+</g>
+<g>
+<linearGradient gradientTransform="matrix(1 1.000000e-004 -1.000000e-004 1 -2.3655 -29.0779)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="17.3477" x2="17.3477" y1="31.0703" y2="55.8327">
+<stop offset="0" style="stop-color:#45E8FF"/>
+<stop offset="0.1455" style="stop-color:#45E8FF"/>
+<stop offset="0.5576" style="stop-color:#30A4D5"/>
+<stop offset="1" style="stop-color:#1347BA"/>
+</linearGradient>
+<polygon fill="url(#SVGID_1__)" points="25.381,14.288 15.027,3.528 4.573,14.288 10.207,14.288 10.21,26.582 19.865,26.584   19.863,14.288 "/>
+<linearGradient gradientTransform="matrix(1 1.000000e-004 -1.000000e-004 1 -2.3655 -29.0779)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="17.3701" x2="17.3701" y1="32.3115" y2="43.6498">
+<stop offset="0" style="stop-color:#B3FCFF"/>
+<stop offset="0.4182" style="stop-color:#B3FCFF"/>
+<stop offset="1" style="stop-color:#5FBAD8"/>
+</linearGradient>
+<polygon fill="url(#SVGID_2__)" points="4.897,14.286 15.026,3.888 25.104,14.288 25.801,14.288 15.027,3.17 4.199,14.286 "/>
+<line fill="#1D4489" x1="10.21" x2="19.865" y1="26.578" y2="26.58"/>
+<polygon fill="#33AEDB" points="19.867,26.83 10.21,26.828 10.21,26.328 19.866,26.33 19.867,26.83 "/>
+<rect fill="none" height="30" width="30"/>
+</g>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_large_video_missed_call.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_large_video_missed_call.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="422.2207" x2="428.7761" y1="-578.2104" y2="-582.472">
+<stop offset="0" style="stop-color:#A7E722"/>
+<stop offset="0.1333" style="stop-color:#A7E722"/>
+<stop offset="0.6303" style="stop-color:#428C0F"/>
+<stop offset="1" style="stop-color:#5CA617"/>
+</linearGradient>
+<path d="M18.469,33.146c2.09-3.596,4.591-6.497,7.281-9.19c2.594-2.589,6.72-5.299,8.562-6.254L43.916,7.42  c-0.846-0.3-3.693-0.465-7.279,0.616c-3.588,1.083-11.736,6.302-16.979,11.547C14.416,24.83,9.932,31.93,9.077,34.178  c-1.343,3.541-1.222,7.445-0.929,8.58c0,0,0.34,1.035,1.145,2.377C9.636,45.711,18.469,33.146,18.469,33.146z" fill="url(#SVGID_1_)"/>
+<path d="M30.573,20.037c1.488-1.037,2.869-1.883,3.74-2.335l9.346-10.006  c-0.131-0.057-0.209-0.088-0.209-0.088c-0.246-0.088-0.641-0.162-1.123-0.218c-0.793,0.005-1.596,0.093-2.402,0.27  C34.23,8.909,30.409,14.194,30.573,20.037z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
+<path d="M31.295,19.542c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.234-0.098-0.234-0.098c-0.232-0.08-0.604-0.152-1.061-0.203c-0.75,0.006-1.508,0.087-2.27,0.253  C34.664,8.813,31.023,13.932,31.295,19.542z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M43.467,7.499c-0.209-0.073-0.549-0.137-0.963-0.186c-0.68,0.006-1.369,0.08-2.059,0.231  c-5.088,1.116-8.426,5.984-7.977,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.422-10.088C43.566,7.538,43.467,7.499,43.467,7.499z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<radialGradient cx="46.6523" cy="-5.2056" gradientTransform="matrix(0.6122 0 0 0.6122 11.7943 11.6322)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="20.0698">
+<stop offset="0" style="stop-color:#A7E722"/>
+<stop offset="0.6242" style="stop-color:#428C0F"/>
+<stop offset="1" style="stop-color:#5CA617"/>
+</radialGradient>
+<path d="M34.313,17.702l0.928,1.55c0,0,15.102-6.784,14.084-8.039c-0.514-0.631-0.576-0.656-1.238-1.262  c-1.984-1.815-4.17-2.531-4.17-2.531C43.73,7.357,43.434,7.3,43.07,7.258c-0.596,0.005-1.199,0.069-1.805,0.202  c-4.592,1.008-7.572,5.5-6.965,10.256C34.305,17.713,34.309,17.706,34.313,17.702z" fill="url(#SVGID_2_)"/>
+<path d="M16.873,33.344c-0.989-0.141-2.008-0.121-3.028,0.104c-2.417,0.531-4.375,2.066-5.646,4.131  c-0.367,2.35-0.25,4.408-0.05,5.18c0,0,0.34,1.035,1.145,2.377c0.289,0.484,6.539-8.264,8.555-11.107L16.873,33.344z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M17.755,33.373c-0.989-0.141-2.008-0.119-3.029,0.104c-3.313,0.727-5.776,3.332-6.76,6.623  C7.94,41.125,8,41.973,8.093,42.498c0.002,0.012,0.005,0.033,0.01,0.047c0,0,0.339,1.033,1.143,2.379  c0.3,0.498,6.981-8.887,8.75-11.383L17.755,33.373z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<radialGradient cx="437.749" cy="-560.2109" gradientTransform="matrix(0.1283 0.5992 -0.5928 0.13 -373.5847 -154.0506)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="23.8799">
+<stop offset="0" style="stop-color:#A7E722"/>
+<stop offset="0.6242" style="stop-color:#428C0F"/>
+<stop offset="1" style="stop-color:#5CA617"/>
+</radialGradient>
+<path d="M10.591,46.975c0.616,0.74,0.646,0.955,1.294,1.525c1.195,1.055,9.301-13.613,9.301-13.613  l-2.683-1.719c-0.941-0.111-1.913-0.08-2.889,0.135c-4.777,1.049-7.806,5.869-6.87,10.832C9.138,44.922,9.736,45.947,10.591,46.975z  " fill="url(#SVGID_3_)"/>
+<path d="M49.324,11.213c-0.178-0.219-0.381-0.445-0.578-0.669l-13.943,7.958l0.438,0.749  C35.24,19.252,50.342,12.468,49.324,11.213z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="421.4131" x2="426.6039" y1="-610.4937" y2="-594.0048">
+<stop offset="0" style="stop-color:#C6FF45"/>
+<stop offset="0.6788" style="stop-color:#387300"/>
+<stop offset="1" style="stop-color:#66A00E"/>
+</linearGradient>
+<path d="M35.24,19.252l1.178,1.98c0.301,0.515,0.973,0.673,1.57,0.423l4.09-2.335l8.043-4.667  c0.631-0.363,0.877-1.12,0.549-1.685c0,0-0.334-0.501-1.35-1.752L35.24,19.252z" fill="url(#SVGID_4_)"/>
+<path d="M21.186,34.887l-0.725-0.473l-9.214,13.488c0.215,0.203,0.429,0.412,0.638,0.598  C13.081,49.555,21.186,34.887,21.186,34.887z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="438.8232" x2="450.6482" y1="-577.3184" y2="-564.2958">
+<stop offset="0" style="stop-color:#C6FF45"/>
+<stop offset="0.6788" style="stop-color:#387300"/>
+<stop offset="1" style="stop-color:#66A00E"/>
+</linearGradient>
+<path d="M11.887,48.498c1.193,1.051,1.685,1.371,1.685,1.371c0.568,0.367,1.363,0.168,1.781-0.443  l7.901-11.605c0.418-0.615,0.307-1.412-0.261-1.777l-1.808-1.156L11.887,48.498z" fill="url(#SVGID_5_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="39.1182" x2="44.145" y1="48.6309" y2="48.6309">
+<stop offset="0" style="stop-color:#878A8C"/>
+<stop offset="0.2606" style="stop-color:#BDC2C4"/>
+<stop offset="0.6606" style="stop-color:#5B6163"/>
+<stop offset="1" style="stop-color:#959A9C"/>
+</linearGradient>
+<rect fill="url(#SVGID_6_)" height="7.535" width="4.896" x="39.184" y="44.863"/>
+<path d="M39.184,49.596c0.787,0.189,1.604,0.303,2.449,0.303c0.844,0,1.662-0.113,2.447-0.303v-4.121  h-4.896V49.596z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M39.184,48.982c0.787,0.191,1.604,0.303,2.449,0.303c0.844,0,1.662-0.111,2.447-0.303v-4.119  h-4.896V48.982z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="41.6328" x2="41.6328" y1="27.8325" y2="48.6499">
+<stop offset="0" style="stop-color:#F2F2F2"/>
+<stop offset="0.3212" style="stop-color:#E6E6E6"/>
+<stop offset="1" style="stop-color:#666666"/>
+</linearGradient>
+<path d="M41.633,48.674c-5.74,0-10.408-4.67-10.408-10.408c0-5.74,4.668-10.409,10.408-10.409  c5.738,0,10.408,4.668,10.408,10.409C52.041,44.004,47.371,48.674,41.633,48.674L41.633,48.674z" fill="url(#SVGID_7_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="41.6318" x2="41.6318" y1="28.4473" y2="48.0381">
+<stop offset="0" style="stop-color:#D1D7D9"/>
+<stop offset="0.0667" style="stop-color:#D1D7D9"/>
+<stop offset="0.2606" style="stop-color:#BDC2C4"/>
+<stop offset="0.6606" style="stop-color:#7C8487"/>
+<stop offset="1" style="stop-color:#ADB3B5"/>
+</linearGradient>
+<circle cx="41.632" cy="38.266" fill="url(#SVGID_8_)" r="9.796"/>
+<path d="M41.633,47.037c-5.102,0-9.268-4.059-9.445-9.115c-0.004,0.111-0.008,0.223-0.008,0.334  c0,5.211,4.24,9.451,9.453,9.451c5.211,0,9.451-4.24,9.451-9.451c0-0.111-0.004-0.223-0.008-0.334  C50.898,42.979,46.732,47.037,41.633,47.037z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M49.592,37.848c0,4.516-3.564,8.969-7.963,8.967c-4.395-0.002-7.957-4.457-7.957-8.971  c0.004-4.516,3.568-8.172,7.963-8.172C46.029,29.675,49.594,33.334,49.592,37.848z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M41.629,46.15c-2.291,0-4.443-0.893-6.061-2.512c-1.619-1.619-2.51-3.773-2.508-6.063  c0-4.725,3.846-8.567,8.572-8.567c2.291,0,4.443,0.893,6.063,2.512c1.619,1.619,2.51,3.771,2.508,6.063  c0,4.725-3.846,8.566-8.57,8.566H41.629z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="41.6318" x2="41.6318" y1="29.5093" y2="45.4663">
+<stop offset="0" style="stop-color:#CFCFCF"/>
+<stop offset="0.1091" style="stop-color:#CFCFCF"/>
+<stop offset="0.6848" style="stop-color:#121212"/>
+<stop offset="1" style="stop-color:#A6A6A6"/>
+</linearGradient>
+<path d="M41.629,45.539c-2.127-0.002-4.125-0.83-5.629-2.334c-1.502-1.502-2.328-3.502-2.328-5.629  c0-4.387,3.572-7.956,7.961-7.956c2.127,0,4.125,0.83,5.629,2.333c1.504,1.504,2.33,3.504,2.33,5.631  c-0.002,4.387-3.572,7.955-7.959,7.955H41.629z" fill="url(#SVGID_9_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="41.6318" x2="41.6318" y1="30.1289" y2="44.8584">
+<stop offset="0" style="stop-color:#F2F2F2"/>
+<stop offset="1" style="stop-color:#606769"/>
+</linearGradient>
+<circle cx="41.632" cy="37.58" fill="url(#SVGID_10_)" r="7.347"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="41.6318" x2="41.6318" y1="31.4756" y2="43.6433">
+<stop offset="0" style="stop-color:#1A1A1A"/>
+<stop offset="0.503" style="stop-color:#343434"/>
+<stop offset="0.7515" style="stop-color:#9E9E9E"/>
+<stop offset="1" style="stop-color:#CFCFCF"/>
+</linearGradient>
+<path d="M41.633,43.701c-1.639,0-3.176-0.639-4.332-1.795c-1.154-1.156-1.791-2.693-1.791-4.33  c0-3.373,2.746-6.119,6.123-6.119c1.637,0,3.174,0.637,4.33,1.795c1.156,1.156,1.793,2.693,1.791,4.33  C47.754,40.957,45.008,43.701,41.633,43.701L41.633,43.701z" fill="url(#SVGID_11_)"/>
+<radialGradient cx="59.5957" cy="40.5771" gradientTransform="matrix(0.621 1.836735e-004 -1.836735e-004 0.6209 5.2261 12.8455)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="10.1859">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="0.5917" style="stop-color:#000000"/>
+<stop offset="0.627" style="stop-color:#050505"/>
+<stop offset="0.7652" style="stop-color:#121212"/>
+<stop offset="0.8876" style="stop-color:#171717"/>
+<stop offset="1" style="stop-color:#171717"/>
+</radialGradient>
+<circle cx="41.632" cy="37.579" fill="url(#SVGID_12_)" r="5.511"/>
+<radialGradient cx="53.6738" cy="32.9404" gradientTransform="matrix(0.621 0 0 0.6209 5.811 13.4188)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="16.2221">
+<stop offset="0" style="stop-color:#242424"/>
+<stop offset="0.4303" style="stop-color:#242424"/>
+<stop offset="0.7818" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#000000"/>
+</radialGradient>
+<circle cx="41.633" cy="37.58" fill="url(#SVGID_13_)" r="4.521"/>
+<radialGradient cx="56.7607" cy="30.0415" gradientTransform="matrix(0.621 1.836735e-004 -1.836735e-004 0.6209 5.2261 12.8455)" gradientUnits="userSpaceOnUse" id="SVGID_14_" r="17.797">
+<stop offset="0" style="stop-color:#A700F5"/>
+<stop offset="0.3091" style="stop-color:#A700F5"/>
+<stop offset="0.4364" style="stop-color:#5E008A"/>
+<stop offset="0.8061" style="stop-color:#0E1402"/>
+<stop offset="1" style="stop-color:#0E1402"/>
+</radialGradient>
+<path d="M45.672,37.58c0,2.232-1.809,4.041-4.041,4.039c-2.232,0-4.041-1.811-4.041-4.041  c0.002-2.232,1.813-4.039,4.041-4.039C43.865,33.541,45.676,35.35,45.672,37.58z" fill="url(#SVGID_14_)"/>
+<radialGradient cx="58.6514" cy="45.2432" gradientTransform="matrix(0.621 1.836735e-004 -1.836735e-004 0.6209 5.2261 12.8455)" gradientUnits="userSpaceOnUse" id="SVGID_15_" r="7.2256">
+<stop offset="0" style="stop-color:#48630C"/>
+<stop offset="0.7879" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#000000"/>
+</radialGradient>
+<path d="M45.672,37.58c0,2.232-1.809,4.041-4.041,4.039c-2.232,0-4.041-1.811-4.041-4.041  c0,0,1.385,2.465,4.041,2.465S45.672,37.58,45.672,37.58z" fill="url(#SVGID_15_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="41.6123" x2="41.6123" y1="32.7168" y2="37.5411">
+<stop offset="0" style="stop-color:#F8FBFF"/>
+<stop offset="1" style="stop-color:#808080"/>
+</linearGradient>
+<path d="M41.611,37.518c1.754,0,3.404-0.264,4.863-0.732  c-0.414-2.313-2.432-4.068-4.863-4.068c-2.43,0-4.445,1.756-4.861,4.068C38.207,37.254,39.859,37.518,41.611,37.518z" fill="url(#SVGID_16_)" fill-opacity="0.35" stroke-opacity="0.35"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="32.7676" x2="50.541" y1="51.5801" y2="51.5801">
+<stop offset="0" style="stop-color:#878A8C"/>
+<stop offset="0.2606" style="stop-color:#BDC2C4"/>
+<stop offset="0.6606" style="stop-color:#5B6163"/>
+<stop offset="1" style="stop-color:#959A9C"/>
+</linearGradient>
+<path d="M50.502,52.805c0.025-0.609,0.039-0.486,0.039-0.613v-0.033c0-0.996-0.816-1.803-1.824-1.803H34.592  c-1.008,0-1.824,0.807-1.824,1.803v0.033c0,0.127,0.014,0.004,0.039,0.613H50.502z" fill="url(#SVGID_17_)"/>
+<path d="M32.881,51.557H50.43c-0.08-0.225-0.203-0.426-0.361-0.6H33.242  C33.084,51.131,32.961,51.332,32.881,51.557z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M32.777,52.191c0.008,0.125,0.016,0.309,0.029,0.613h17.695  c0.012-0.305,0.021-0.488,0.027-0.613H32.777z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M33.24,50.957h16.826c-0.332-0.367-0.811-0.602-1.35-0.602H34.592  C34.053,50.355,33.574,50.59,33.24,50.957z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<rect fill="none" height="60" width="60"/>
+</g>
+<g>
+<rect fill="none" height="30" width="30"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15.0005" x2="15.0005" y1="4.5283" y2="27.0492">
+<stop offset="0" style="stop-color:#FF7042"/>
+<stop offset="1" style="stop-color:#991B23"/>
+</linearGradient>
+<path d="M19.018,16.846v-4.316h4.535l-8.512-8.844l-8.592,8.844h4.631v4.316  c0,7.293,6.068,9.467,11.908,9.467v-6.422C21.189,19.891,19.018,19.002,19.018,16.846z" fill="url(#SVGID_1__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15.0005" x2="15.0005" y1="4.0146" y2="12.8168">
+<stop offset="0" style="stop-color:#FFBE82"/>
+<stop offset="1" style="stop-color:#991B23"/>
+</linearGradient>
+<polygon fill="url(#SVGID_2__)" points="15.041,4.508 22.762,12.529 23.553,12.529 15.041,3.686 6.449,12.529 7.248,12.529 "/>
+</g>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_large_video_received_call.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_large_video_received_call.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="422.2207" x2="428.7761" y1="-578.2104" y2="-582.472">
+<stop offset="0" style="stop-color:#A7E722"/>
+<stop offset="0.1333" style="stop-color:#A7E722"/>
+<stop offset="0.6303" style="stop-color:#428C0F"/>
+<stop offset="1" style="stop-color:#5CA617"/>
+</linearGradient>
+<path d="M18.469,33.146c2.09-3.596,4.591-6.497,7.281-9.19c2.594-2.589,6.72-5.299,8.562-6.254L43.916,7.42  c-0.846-0.3-3.693-0.465-7.279,0.616c-3.588,1.083-11.736,6.302-16.979,11.547C14.416,24.83,9.932,31.93,9.077,34.178  c-1.343,3.541-1.222,7.445-0.929,8.58c0,0,0.34,1.035,1.145,2.377C9.636,45.711,18.469,33.146,18.469,33.146z" fill="url(#SVGID_1_)"/>
+<path d="M30.573,20.037c1.488-1.037,2.869-1.883,3.74-2.335l9.346-10.006  c-0.131-0.057-0.209-0.088-0.209-0.088c-0.246-0.088-0.641-0.162-1.123-0.218c-0.793,0.005-1.596,0.093-2.402,0.27  C34.23,8.909,30.409,14.194,30.573,20.037z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
+<path d="M31.295,19.542c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.234-0.098-0.234-0.098c-0.232-0.08-0.604-0.152-1.061-0.203c-0.75,0.006-1.508,0.087-2.27,0.253  C34.664,8.813,31.023,13.932,31.295,19.542z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M43.467,7.499c-0.209-0.073-0.549-0.137-0.963-0.186c-0.68,0.006-1.369,0.08-2.059,0.231  c-5.088,1.116-8.426,5.984-7.977,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.422-10.088C43.566,7.538,43.467,7.499,43.467,7.499z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<radialGradient cx="46.6523" cy="-5.2056" gradientTransform="matrix(0.6122 0 0 0.6122 11.7943 11.6322)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="20.0698">
+<stop offset="0" style="stop-color:#A7E722"/>
+<stop offset="0.6242" style="stop-color:#428C0F"/>
+<stop offset="1" style="stop-color:#5CA617"/>
+</radialGradient>
+<path d="M34.313,17.702l0.928,1.55c0,0,15.102-6.784,14.084-8.039c-0.514-0.631-0.576-0.656-1.238-1.262  c-1.984-1.815-4.17-2.531-4.17-2.531C43.73,7.357,43.434,7.3,43.07,7.258c-0.596,0.005-1.199,0.069-1.805,0.202  c-4.592,1.008-7.572,5.5-6.965,10.256C34.305,17.713,34.309,17.706,34.313,17.702z" fill="url(#SVGID_2_)"/>
+<path d="M16.873,33.344c-0.989-0.141-2.008-0.121-3.028,0.104c-2.417,0.531-4.375,2.066-5.646,4.131  c-0.367,2.35-0.25,4.408-0.05,5.18c0,0,0.34,1.035,1.145,2.377c0.289,0.484,6.539-8.264,8.555-11.107L16.873,33.344z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M17.755,33.373c-0.989-0.141-2.008-0.119-3.029,0.104c-3.313,0.727-5.776,3.332-6.76,6.623  C7.94,41.125,8,41.973,8.093,42.498c0.002,0.012,0.005,0.033,0.01,0.047c0,0,0.339,1.033,1.143,2.379  c0.3,0.498,6.981-8.887,8.75-11.383L17.755,33.373z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<radialGradient cx="437.749" cy="-560.2109" gradientTransform="matrix(0.1283 0.5992 -0.5928 0.13 -373.5847 -154.0506)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="23.8799">
+<stop offset="0" style="stop-color:#A7E722"/>
+<stop offset="0.6242" style="stop-color:#428C0F"/>
+<stop offset="1" style="stop-color:#5CA617"/>
+</radialGradient>
+<path d="M10.591,46.975c0.616,0.74,0.646,0.955,1.294,1.525c1.195,1.055,9.301-13.613,9.301-13.613  l-2.683-1.719c-0.941-0.111-1.913-0.08-2.889,0.135c-4.777,1.049-7.806,5.869-6.87,10.832C9.138,44.922,9.736,45.947,10.591,46.975z  " fill="url(#SVGID_3_)"/>
+<path d="M49.324,11.213c-0.178-0.219-0.381-0.445-0.578-0.669l-13.943,7.958l0.438,0.749  C35.24,19.252,50.342,12.468,49.324,11.213z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="421.4131" x2="426.6039" y1="-610.4937" y2="-594.0048">
+<stop offset="0" style="stop-color:#C6FF45"/>
+<stop offset="0.6788" style="stop-color:#387300"/>
+<stop offset="1" style="stop-color:#66A00E"/>
+</linearGradient>
+<path d="M35.24,19.252l1.178,1.98c0.301,0.515,0.973,0.673,1.57,0.423l4.09-2.335l8.043-4.667  c0.631-0.363,0.877-1.12,0.549-1.685c0,0-0.334-0.501-1.35-1.752L35.24,19.252z" fill="url(#SVGID_4_)"/>
+<path d="M21.186,34.887l-0.725-0.473l-9.214,13.488c0.215,0.203,0.429,0.412,0.638,0.598  C13.081,49.555,21.186,34.887,21.186,34.887z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="438.8232" x2="450.6482" y1="-577.3184" y2="-564.2958">
+<stop offset="0" style="stop-color:#C6FF45"/>
+<stop offset="0.6788" style="stop-color:#387300"/>
+<stop offset="1" style="stop-color:#66A00E"/>
+</linearGradient>
+<path d="M11.887,48.498c1.193,1.051,1.685,1.371,1.685,1.371c0.568,0.367,1.363,0.168,1.781-0.443  l7.901-11.605c0.418-0.615,0.307-1.412-0.261-1.777l-1.808-1.156L11.887,48.498z" fill="url(#SVGID_5_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="39.1182" x2="44.145" y1="48.6309" y2="48.6309">
+<stop offset="0" style="stop-color:#878A8C"/>
+<stop offset="0.2606" style="stop-color:#BDC2C4"/>
+<stop offset="0.6606" style="stop-color:#5B6163"/>
+<stop offset="1" style="stop-color:#959A9C"/>
+</linearGradient>
+<rect fill="url(#SVGID_6_)" height="7.535" width="4.896" x="39.184" y="44.863"/>
+<path d="M39.184,49.596c0.787,0.189,1.604,0.303,2.449,0.303c0.844,0,1.662-0.113,2.447-0.303v-4.121  h-4.896V49.596z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M39.184,48.982c0.787,0.191,1.604,0.303,2.449,0.303c0.844,0,1.662-0.111,2.447-0.303v-4.119  h-4.896V48.982z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="41.6328" x2="41.6328" y1="27.8325" y2="48.6499">
+<stop offset="0" style="stop-color:#F2F2F2"/>
+<stop offset="0.3212" style="stop-color:#E6E6E6"/>
+<stop offset="1" style="stop-color:#666666"/>
+</linearGradient>
+<path d="M41.633,48.674c-5.74,0-10.408-4.67-10.408-10.408c0-5.74,4.668-10.409,10.408-10.409  c5.738,0,10.408,4.668,10.408,10.409C52.041,44.004,47.371,48.674,41.633,48.674L41.633,48.674z" fill="url(#SVGID_7_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="41.6318" x2="41.6318" y1="28.4473" y2="48.0381">
+<stop offset="0" style="stop-color:#D1D7D9"/>
+<stop offset="0.0667" style="stop-color:#D1D7D9"/>
+<stop offset="0.2606" style="stop-color:#BDC2C4"/>
+<stop offset="0.6606" style="stop-color:#7C8487"/>
+<stop offset="1" style="stop-color:#ADB3B5"/>
+</linearGradient>
+<circle cx="41.632" cy="38.266" fill="url(#SVGID_8_)" r="9.796"/>
+<path d="M41.633,47.037c-5.102,0-9.268-4.059-9.445-9.115c-0.004,0.111-0.008,0.223-0.008,0.334  c0,5.211,4.24,9.451,9.453,9.451c5.211,0,9.451-4.24,9.451-9.451c0-0.111-0.004-0.223-0.008-0.334  C50.898,42.979,46.732,47.037,41.633,47.037z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M49.592,37.848c0,4.516-3.564,8.969-7.963,8.967c-4.395-0.002-7.957-4.457-7.957-8.971  c0.004-4.516,3.568-8.172,7.963-8.172C46.029,29.675,49.594,33.334,49.592,37.848z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M41.629,46.15c-2.291,0-4.443-0.893-6.061-2.512c-1.619-1.619-2.51-3.773-2.508-6.063  c0-4.725,3.846-8.567,8.572-8.567c2.291,0,4.443,0.893,6.063,2.512c1.619,1.619,2.51,3.771,2.508,6.063  c0,4.725-3.846,8.566-8.57,8.566H41.629z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="41.6318" x2="41.6318" y1="29.5093" y2="45.4663">
+<stop offset="0" style="stop-color:#CFCFCF"/>
+<stop offset="0.1091" style="stop-color:#CFCFCF"/>
+<stop offset="0.6848" style="stop-color:#121212"/>
+<stop offset="1" style="stop-color:#A6A6A6"/>
+</linearGradient>
+<path d="M41.629,45.539c-2.127-0.002-4.125-0.83-5.629-2.334c-1.502-1.502-2.328-3.502-2.328-5.629  c0-4.387,3.572-7.956,7.961-7.956c2.127,0,4.125,0.83,5.629,2.333c1.504,1.504,2.33,3.504,2.33,5.631  c-0.002,4.387-3.572,7.955-7.959,7.955H41.629z" fill="url(#SVGID_9_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="41.6318" x2="41.6318" y1="30.1289" y2="44.8584">
+<stop offset="0" style="stop-color:#F2F2F2"/>
+<stop offset="1" style="stop-color:#606769"/>
+</linearGradient>
+<circle cx="41.632" cy="37.58" fill="url(#SVGID_10_)" r="7.347"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="41.6318" x2="41.6318" y1="31.4756" y2="43.6433">
+<stop offset="0" style="stop-color:#1A1A1A"/>
+<stop offset="0.503" style="stop-color:#343434"/>
+<stop offset="0.7515" style="stop-color:#9E9E9E"/>
+<stop offset="1" style="stop-color:#CFCFCF"/>
+</linearGradient>
+<path d="M41.633,43.701c-1.639,0-3.176-0.639-4.332-1.795c-1.154-1.156-1.791-2.693-1.791-4.33  c0-3.373,2.746-6.119,6.123-6.119c1.637,0,3.174,0.637,4.33,1.795c1.156,1.156,1.793,2.693,1.791,4.33  C47.754,40.957,45.008,43.701,41.633,43.701L41.633,43.701z" fill="url(#SVGID_11_)"/>
+<radialGradient cx="59.5957" cy="40.5771" gradientTransform="matrix(0.621 1.836735e-004 -1.836735e-004 0.6209 5.2261 12.8455)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="10.1859">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="0.5917" style="stop-color:#000000"/>
+<stop offset="0.627" style="stop-color:#050505"/>
+<stop offset="0.7652" style="stop-color:#121212"/>
+<stop offset="0.8876" style="stop-color:#171717"/>
+<stop offset="1" style="stop-color:#171717"/>
+</radialGradient>
+<circle cx="41.632" cy="37.579" fill="url(#SVGID_12_)" r="5.511"/>
+<radialGradient cx="53.6738" cy="32.9404" gradientTransform="matrix(0.621 0 0 0.6209 5.811 13.4188)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="16.2221">
+<stop offset="0" style="stop-color:#242424"/>
+<stop offset="0.4303" style="stop-color:#242424"/>
+<stop offset="0.7818" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#000000"/>
+</radialGradient>
+<circle cx="41.633" cy="37.58" fill="url(#SVGID_13_)" r="4.521"/>
+<radialGradient cx="56.7607" cy="30.0415" gradientTransform="matrix(0.621 1.836735e-004 -1.836735e-004 0.6209 5.2261 12.8455)" gradientUnits="userSpaceOnUse" id="SVGID_14_" r="17.797">
+<stop offset="0" style="stop-color:#A700F5"/>
+<stop offset="0.3091" style="stop-color:#A700F5"/>
+<stop offset="0.4364" style="stop-color:#5E008A"/>
+<stop offset="0.8061" style="stop-color:#0E1402"/>
+<stop offset="1" style="stop-color:#0E1402"/>
+</radialGradient>
+<path d="M45.672,37.58c0,2.232-1.809,4.041-4.041,4.039c-2.232,0-4.041-1.811-4.041-4.041  c0.002-2.232,1.813-4.039,4.041-4.039C43.865,33.541,45.676,35.35,45.672,37.58z" fill="url(#SVGID_14_)"/>
+<radialGradient cx="58.6514" cy="45.2432" gradientTransform="matrix(0.621 1.836735e-004 -1.836735e-004 0.6209 5.2261 12.8455)" gradientUnits="userSpaceOnUse" id="SVGID_15_" r="7.2256">
+<stop offset="0" style="stop-color:#48630C"/>
+<stop offset="0.7879" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#000000"/>
+</radialGradient>
+<path d="M45.672,37.58c0,2.232-1.809,4.041-4.041,4.039c-2.232,0-4.041-1.811-4.041-4.041  c0,0,1.385,2.465,4.041,2.465S45.672,37.58,45.672,37.58z" fill="url(#SVGID_15_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="41.6123" x2="41.6123" y1="32.7168" y2="37.5411">
+<stop offset="0" style="stop-color:#F8FBFF"/>
+<stop offset="1" style="stop-color:#808080"/>
+</linearGradient>
+<path d="M41.611,37.518c1.754,0,3.404-0.264,4.863-0.732  c-0.414-2.313-2.432-4.068-4.863-4.068c-2.43,0-4.445,1.756-4.861,4.068C38.207,37.254,39.859,37.518,41.611,37.518z" fill="url(#SVGID_16_)" fill-opacity="0.35" stroke-opacity="0.35"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="32.7676" x2="50.541" y1="51.5801" y2="51.5801">
+<stop offset="0" style="stop-color:#878A8C"/>
+<stop offset="0.2606" style="stop-color:#BDC2C4"/>
+<stop offset="0.6606" style="stop-color:#5B6163"/>
+<stop offset="1" style="stop-color:#959A9C"/>
+</linearGradient>
+<path d="M50.502,52.805c0.025-0.609,0.039-0.486,0.039-0.613v-0.033c0-0.996-0.816-1.803-1.824-1.803H34.592  c-1.008,0-1.824,0.807-1.824,1.803v0.033c0,0.127,0.014,0.004,0.039,0.613H50.502z" fill="url(#SVGID_17_)"/>
+<path d="M32.881,51.557H50.43c-0.08-0.225-0.203-0.426-0.361-0.6H33.242  C33.084,51.131,32.961,51.332,32.881,51.557z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M32.777,52.191c0.008,0.125,0.016,0.309,0.029,0.613h17.695  c0.012-0.305,0.021-0.488,0.027-0.613H32.777z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M33.24,50.957h16.826c-0.332-0.367-0.811-0.602-1.35-0.602H34.592  C34.053,50.355,33.574,50.59,33.24,50.957z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<rect fill="none" height="60" width="60"/>
+</g>
+<g>
+<linearGradient gradientTransform="matrix(1 1.000000e-004 -1.000000e-004 1 -2.3655 -29.0779)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="17.3926" x2="17.3926" y1="32.2334" y2="55.3194">
+<stop offset="0" style="stop-color:#C6FF45"/>
+<stop offset="0.7273" style="stop-color:#66A00E"/>
+<stop offset="1" style="stop-color:#387300"/>
+</linearGradient>
+<polygon fill="url(#SVGID_1__)" points="4.648,15.727 14.942,26.471 25.397,15.714 19.763,15.712 19.759,3.417 10.166,3.416   10.166,15.726 "/>
+<line fill="#1D4489" x1="19.759" x2="10.166" y1="3.421" y2="3.42"/>
+<polygon fill="#E7FFB9" points="10.166,3.17 19.76,3.171 19.759,3.671 10.166,3.67 10.166,3.17 "/>
+<polygon fill="#E7FFB9" points="19.612,15.732 25.505,15.733 25.059,16.233 19.612,16.233 19.612,15.732 "/>
+<polygon fill="#E7FFB9" points="4.321,15.726 10.157,15.726 10.157,16.226 4.848,16.226 4.321,15.726 "/>
+<linearGradient gradientTransform="matrix(1 1.000000e-004 -1.000000e-004 1 -2.3655 -29.0779)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="26.5625" x2="7.7312" y1="50.3418" y2="50.3418">
+<stop offset="0" style="stop-color:#AAE535"/>
+<stop offset="1" style="stop-color:#5D9C0A"/>
+</linearGradient>
+<polygon fill="url(#SVGID_2__)" points="25.072,15.713 14.942,26.112 4.925,15.7 4.229,15.701 14.941,26.83 25.771,15.713 "/>
+<rect fill="none" height="30" width="30"/>
+</g>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_large_voip_dialled_call.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_large_voip_dialled_call.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<rect fill="none" height="60" width="60"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="31.3823" x2="31.3823" y1="49.3193" y2="6.7675">
+<stop offset="0" style="stop-color:#004E8C"/>
+<stop offset="1" style="stop-color:#1B66D8"/>
+</linearGradient>
+<circle cx="31.382" cy="28.137" fill="url(#SVGID_1_)" r="21.429"/>
+<radialGradient cx="23.8237" cy="17.7847" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="25.9191">
+<stop offset="0" style="stop-color:#94FFFF"/>
+<stop offset="0.5" style="stop-color:#36B5FF"/>
+<stop offset="1" style="stop-color:#1B66D8"/>
+</radialGradient>
+<path d="M52.262,28.137c0,11.533-9.346,20.877-20.879,20.877c-11.533,0-20.882-9.344-20.882-20.877  c0-11.53,9.35-20.88,20.882-20.88C42.917,7.257,52.262,16.607,52.262,28.137z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="31.3823" x2="31.3823" y1="7.0732" y2="49.1199">
+<stop offset="0" style="stop-color:#31A7F8"/>
+<stop offset="0.497" style="stop-color:#1E74DC"/>
+<stop offset="1" style="stop-color:#88D6EB"/>
+</linearGradient>
+<path d="M31.383,7.257c-11.533,0-20.882,9.35-20.882,20.88c0,11.533,9.35,20.877,20.882,20.877  c11.533,0,20.879-9.344,20.879-20.877C52.262,16.607,42.917,7.257,31.383,7.257z M31.383,47.188  c-10.843,0-19.664-8.818-19.664-19.659c0-10.843,8.82-19.663,19.664-19.663c10.841,0,19.66,8.82,19.66,19.663  C51.043,38.369,42.224,47.188,31.383,47.188z" fill="url(#SVGID_3_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="10.8428" x2="14.1621" y1="30.9775" y2="30.9775">
+<stop offset="0" style="stop-color:#58595B"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M12.462,27.796C12.239,27.5,11.737,27.5,11.516,27.5c-0.437,0-0.669,0.312-0.673,0.616  v0.021l0.001,0.031c-0.001,0.537,0.029,1.14,0.094,1.872c0.013,0.138,0.03,0.276,0.047,0.414l0.024,0.201  c0.056,0.434,0.121,0.86,0.195,1.274l0.034,0.182c0.032,0.164,0.063,0.324,0.098,0.484c0.089,0.406,0.198,0.826,0.332,1.291  c0.02,0.066,0.037,0.133,0.055,0.199c0.028,0.109,0.058,0.217,0.091,0.322l0.005,0.014l0.012,0.033  c-0.003-0.01-0.008-0.023-0.01-0.037l1.198-0.08c0.019-0.188,0.024-0.383,0.019-0.576c-0.01-0.303-0.021-0.676-0.107-0.99  l1.112-1.494l0.12-0.162v-0.203v-1.165v-0.252l-0.179-0.178L12.462,27.796z" fill="url(#SVGID_4_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="17.2432" x2="51.9731" y1="24.897" y2="24.897">
+<stop offset="0" style="stop-color:#58595B"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M51.966,24.045c-0.016-0.079-0.029-0.136-0.043-0.191  c-0.011-0.042-0.021-0.084-0.029-0.125c-0.106-0.495-0.237-1.005-0.392-1.525l-0.017-0.058c-0.033-0.117-0.068-0.234-0.105-0.349  c-0.188-0.588-0.393-1.148-0.608-1.666c-0.027-0.066-0.056-0.125-0.084-0.188l-0.045-0.1c-0.206-0.474-0.436-0.947-0.677-1.403  l-0.03-0.059c-0.047-0.09-0.093-0.181-0.142-0.269c-0.295-0.532-0.604-1.041-0.918-1.512c-0.032-0.049-0.069-0.102-0.106-0.154  c-0.023-0.031-0.045-0.061-0.066-0.092c-0.302-0.437-0.618-0.862-0.946-1.268l-0.064-0.082c-0.044-0.055-0.088-0.111-0.134-0.167  c-0.381-0.456-0.783-0.898-1.199-1.317c-0.056-0.056-0.115-0.115-0.176-0.172l-0.049-0.047c-0.375-0.368-0.774-0.732-1.183-1.074  l-0.081-0.069c-0.041-0.037-0.083-0.073-0.125-0.106c-0.446-0.367-0.931-0.728-1.435-1.075c-0.063-0.042-0.126-0.083-0.19-0.124  l-0.077-0.05c-0.454-0.301-0.928-0.59-1.404-0.853l-0.072-0.042c-0.04-0.023-0.079-0.045-0.119-0.068  c-0.529-0.283-1.081-0.55-1.643-0.792l-0.142-0.057l-0.153-0.063c-0.148-0.061-0.297-0.114-0.443-0.165  c-0.077-0.026-0.152-0.053-0.228-0.08l-0.282-0.105L38.303,8.74c-0.17,0.107-0.84,0.49-1.235,0.715  c-0.438-0.059-1.499-0.192-2.57-0.295c0.33-0.032,0.787-0.069,1.43-0.111l0.09-1.204L35.97,7.832  c-0.039-0.011-0.077-0.021-0.116-0.029l-0.092-0.018l-0.075-0.015c-0.655-0.131-1.271-0.227-1.882-0.291l-0.004-0.001l-0.085-0.009  c-0.698-0.07-1.409-0.106-2.112-0.106c-0.62,0-1.262,0.033-1.964,0.101c-0.109,0.01-0.214,0.021-0.321,0.032  c-0.693,0.078-1.3,0.17-1.873,0.286l-0.02,0.003l-0.015,0.002c-0.604,0.125-1.211,0.281-1.856,0.477  c-0.058,0.018-0.116,0.037-0.173,0.055l-0.131,0.043c-0.547,0.176-1.082,0.371-1.596,0.582c-0.042,0.018-0.071,0.029-0.1,0.04  l-0.078,0.031c-0.564,0.24-1.128,0.512-1.688,0.812c-0.06,0.031-0.118,0.066-0.177,0.099L21.542,9.97  c-0.157,0.087-0.315,0.185-0.473,0.283l-0.203,0.127l-1.118,0.684l1.242,0.415c0.186,0.063,0.385,0.093,0.592,0.093  c0.67,0,1.317-0.329,1.838-0.593c0.209-0.105,0.521-0.264,0.648-0.288c0.152,0.045,0.306,0.068,0.458,0.068  c0.569,0,1.035-0.306,1.446-0.578l0.111-0.072c0.134-0.043,0.362-0.128,0.818-0.299c0.465-0.174,1.314-0.493,1.54-0.546  c0.44-0.005,0.966-0.068,1.339-0.3c0.352,0.058,0.977,0.157,1.619,0.24c-0.047,0.029-0.093,0.059-0.132,0.097  c-0.209,0.192-1.335,0.533-1.68,0.578c-0.647,0.081-0.908,0.408-1.012,0.666c-0.135,0.336-0.054,0.672,0.078,0.946  c-0.245,0.162-0.545,0.342-0.804,0.479c0.001-0.006,0.003-0.012,0.004-0.02c0.093-0.517,0.16-0.89-0.091-1.189  c-0.128-0.153-0.317-0.241-0.519-0.241c-0.295,0-0.525,0.183-0.711,0.362c-0.52,0.502-0.834,1.129-0.952,1.365l-0.022,0.044  l-0.019,0.035c-0.225,0.431-0.317,0.737-0.192,1.688c-0.055,0.04-0.219,0.102-0.445,0.102c-0.03,0-0.058-0.002-0.079-0.003  c-0.146-0.158-0.349-0.248-0.576-0.248l0,0c-0.524,0-1.238,0.589-2.123,1.754l-0.284,0.374l0.289,0.371l0.27,0.343  c-4.216,3.259-4.248,3.444-4.292,3.717c-0.007,0.024-0.044,0.137-0.095,0.293c-0.628,1.952-0.977,3.413-0.637,4.194  c0.784,1.813,1.669,3.505,2.815,3.599c0.101,0.008,0.212,0.012,0.332,0.012c1.051,0,2.753-0.318,3.572-0.485  c0.151,0.283,0.335,0.614,0.438,0.795l0.181,0.323l0.37-0.012c0.004,0,0.199-0.006,0.448-0.006c0.286,0,0.478,0.008,0.602,0.017  c0.446,1.307,1.3,4.317,1.142,4.944L27.272,34.1c-1.441,2.16,0.306,4.975,1.145,6.328c0.066,0.107,0.126,0.203,0.177,0.287  c0.324,0.922,0.716,1.531,1.545,1.531c0.062,0,0.124-0.004,0.188-0.008c0.047-0.002,0.096-0.004,0.146-0.004  c0.092,0,0.157,0.01,0.226,0.035l0.075,0.027l0.08,0.006c0.155,0.014,0.306,0.035,0.453,0.057c0.255,0.035,0.519,0.07,0.788,0.07  c0.721,0,1.293-0.271,1.787-0.855c0.019-0.002,0.036-0.004,0.055-0.006c0.518-0.072,0.712-0.332,0.778-0.564  c0.038-0.039,0.089-0.086,0.131-0.125c0.204-0.188,0.447-0.41,0.615-0.674c0.075-0.045,0.161-0.096,0.258-0.152  c0.167-0.104,0.355-0.217,0.504-0.293c0.131-0.041,0.247-0.117,0.334-0.225c0.209-0.258,0.166-0.549,0.131-0.783  c-0.035-0.242-0.071-0.492,0.06-0.758c0.738-0.355,2.051-1.23,2.263-1.375l-0.001,0.018c-0.014,0.117-0.048,0.43-0.1,0.629  c-0.279,0.279-0.513,0.703-0.586,0.846l-0.049,0.094l-0.015,0.104c-0.019,0.137-0.094,0.85,0.306,1.311  c0.202,0.23,0.49,0.359,0.813,0.359c0.103,0,0.21-0.014,0.319-0.039c1.027-0.232,2.85-2.703,2.998-4.066  c0.072-0.656-0.185-1.172-0.704-1.416l-0.387-0.184l-0.304,0.303l-1.125,1.125c-0.38,0.035-0.678,0.148-0.879,0.326  c0.012-0.48-0.035-0.973-0.086-1.451c-0.155-1.447-0.185-2.369,0.703-2.996l0.045-0.033l0.038-0.039  c0.321-0.326,0.676-0.611,1.052-0.914c0.88-0.707,1.79-1.438,2.332-2.759l0.022-0.056c0.174-0.451,0.437-1.132,0.081-1.651  c-0.089-0.128-0.275-0.327-0.624-0.397c0.462-0.186,0.816-0.332,0.851-0.346l0.107-0.044l0.083-0.08l1.898-1.822l0.278-0.268  l-0.122-0.366c-0.017-0.047-0.12-0.335-0.411-0.747c0.554,0.075,1.029,0.208,1.185,0.326c0.057,0.124,0.171,0.396,0.292,0.683  c2.089,4.924,2.382,5.178,2.926,5.187c0.021,0,0.037,0.002,0.051,0.003c0.044,0.003,0.083,0.005,0.119,0.005  c0.31,0,0.486-0.157,0.564-0.252c0.227-0.274,0.163-0.608,0.14-0.734l-0.009-0.043c-0.025-0.294-0.008-1.618,0.034-2.706  c0.003,0.002,0.004,0.006,0.006,0.01l1.12-0.445L51.966,24.045z M35.508,18.021c-0.087,0.003-0.181,0.008-0.282,0.012  c-0.322,0.015-0.688,0.031-1.053,0.031c-0.955,0-1.174-0.118-1.196-0.131c-0.113-0.082-0.229-0.144-0.35-0.188  c0.216-0.048,0.464-0.214,0.719-0.708c0.251,0.487,0.592,0.917,1.115,0.917c0.142,0,0.277-0.034,0.406-0.101  C35.043,17.856,35.333,17.957,35.508,18.021z M35.133,15.357c-0.072,0-0.131-0.003-0.176-0.007c0.049-0.128,0.107-0.202,0.154-0.244  c0.06,0.093,0.14,0.175,0.232,0.245C35.27,15.355,35.2,15.357,35.133,15.357z M31.331,16.635c0.327,0.641,0.569,0.917,0.762,1.037  c-0.475,0.038-0.833,0.339-1.126,0.625c-0.206-0.068-0.565-0.286-0.672-0.438c-0.063-0.089-0.138-0.166-0.221-0.232  C30.593,17.479,31.049,16.998,31.331,16.635z M29.523,16.163l-0.679-0.033l-2.278-0.111c0.278-0.229,0.541-0.444,0.697-0.57  c0.042-0.015,0.205-0.06,0.605-0.06c0.242,0,0.474,0.017,0.62,0.029L29.523,16.163z" fill="url(#SVGID_5_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<radialGradient cx="24.4912" cy="10.4414" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="23.6744">
+<stop offset="0" style="stop-color:#7AF200"/>
+<stop offset="0.3152" style="stop-color:#7AF200"/>
+<stop offset="0.7273" style="stop-color:#1CAD0F"/>
+<stop offset="1" style="stop-color:#007A3A"/>
+</radialGradient>
+<path d="M11.451,28.125C11.451,28.125,11.451,28.125,11.451,28.125c0,0.008,0.001,0.012,0.001,0.018  c0,0.622,0.039,1.236,0.093,1.844c0.018,0.198,0.047,0.398,0.069,0.598c0.053,0.417,0.116,0.83,0.19,1.238  c0.042,0.215,0.081,0.434,0.127,0.646c0.094,0.422,0.203,0.838,0.321,1.248c0.05,0.17,0.089,0.342,0.141,0.508  c0.007,0.018,0.015,0.033,0.019,0.051c0.017-0.16,0.021-0.326,0.017-0.496c-0.04-1.199-0.232-1.045-0.232-1.045l1.356-1.822v-1.165  l-1.589-1.589C11.964,28.159,11.452,28.079,11.451,28.125z" fill="url(#SVGID_6_)"/>
+<radialGradient cx="24.4868" cy="10.4395" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="23.6775">
+<stop offset="0" style="stop-color:#7AF200"/>
+<stop offset="0.3152" style="stop-color:#7AF200"/>
+<stop offset="0.7273" style="stop-color:#1CAD0F"/>
+<stop offset="1" style="stop-color:#007A3A"/>
+</radialGradient>
+<path d="M24.212,10.099c0.587,0.193,1.066-0.2,1.613-0.549c0.193-0.04,2.338-0.896,2.57-0.896  c0.231,0,1.011-0.03,1.204-0.34c0,0,3.357,0.584,3.863,0.389c0.275-0.107,1.433-0.2,2.425-0.264  c-0.056-0.012-0.106-0.029-0.162-0.041c-0.054-0.011-0.105-0.019-0.161-0.03c-0.623-0.126-1.252-0.226-1.894-0.29  c-0.006,0-0.01,0-0.016-0.002c-0.674-0.068-1.358-0.104-2.052-0.104c-0.644,0-1.277,0.038-1.906,0.098  c-0.11,0.011-0.221,0.022-0.331,0.035c-0.608,0.067-1.211,0.155-1.801,0.274c-0.01,0.003-0.021,0.004-0.031,0.006  c-0.612,0.127-1.213,0.283-1.802,0.464c-0.102,0.03-0.199,0.064-0.302,0.096c-0.522,0.168-1.038,0.356-1.544,0.564  c-0.06,0.026-0.12,0.048-0.18,0.072c-0.557,0.238-1.1,0.501-1.63,0.784c-0.08,0.043-0.156,0.089-0.234,0.134  c-0.227,0.125-0.44,0.267-0.66,0.402C22.273,11.265,23.635,9.904,24.212,10.099z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="24.4863" cy="10.437" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="23.6745">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.3152" style="stop-color:#B2F56E"/>
+<stop offset="0.7273" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M51.366,24.146c-0.021-0.102-0.049-0.197-0.069-0.297c-0.106-0.499-0.233-0.99-0.378-1.474  c-0.038-0.13-0.076-0.264-0.118-0.395c-0.176-0.549-0.371-1.09-0.59-1.616c-0.04-0.093-0.085-0.184-0.125-0.275  c-0.202-0.464-0.421-0.918-0.657-1.363c-0.056-0.106-0.109-0.215-0.166-0.319c-0.279-0.502-0.575-0.993-0.893-1.469  c-0.054-0.083-0.114-0.161-0.17-0.243c-0.291-0.422-0.596-0.831-0.916-1.228c-0.064-0.079-0.127-0.16-0.194-0.24  c-0.368-0.442-0.756-0.868-1.161-1.277c-0.069-0.07-0.143-0.14-0.215-0.208c-0.369-0.363-0.755-0.714-1.153-1.047  c-0.067-0.056-0.131-0.116-0.198-0.171c-0.448-0.366-0.915-0.714-1.395-1.043c-0.084-0.057-0.17-0.112-0.256-0.167  c-0.442-0.294-0.898-0.571-1.366-0.83c-0.063-0.035-0.123-0.073-0.187-0.108c-0.52-0.278-1.05-0.533-1.594-0.768  c-0.097-0.041-0.194-0.079-0.29-0.12c-0.211-0.087-0.432-0.156-0.646-0.235c-0.255,0.163-1.438,0.832-1.438,0.832  s-5.141-0.702-5.491-0.353c-0.352,0.353-1.721,0.71-2.033,0.751c-0.311,0.04-0.956,0.206-0.182,1.161  c-0.116,0.118-2.325,1.657-2.325,0.957s0.494-1.953-0.2-1.282c-0.498,0.482-0.796,1.135-0.86,1.257  c-0.163,0.312-0.263,0.461-0.145,1.357s-1.43,0.891-1.534,0.659c-0.276-0.622-1.809,1.394-1.809,1.394l0.646,0.828  c0,0-4.51,3.474-4.548,3.707c-0.04,0.234-1.164,3.25-0.775,4.147c0.39,0.897,1.376,3.158,2.307,3.233  c1.222,0.101,4.186-0.559,4.186-0.559c0.08,0.196,0.638,1.189,0.638,1.189s1.453-0.048,1.534,0.11  c0.026,0.053,1.75,5.122,1.182,5.794c-1.357,2.033,0.775,5.012,1.369,6.02c0.594,1.73,0.977,0.955,1.758,1.238  c0.962,0.084,1.772,0.439,2.589-0.611c0.237-0.195,0.641-0.041,0.641-0.313c0-0.152,0.698-0.598,0.878-1.018  c0.188-0.088,0.674-0.414,1.003-0.572c0.299-0.02-0.283-0.82,0.309-1.666c0.64-0.252,2.364-1.414,2.364-1.414  c0.078-1.705-0.839-3.811,0.873-5.02c1.104-1.126,2.553-1.767,3.255-3.479c0.194-0.506,0.628-1.542-0.619-1.231  c-1.173,0.295-2.48,0.362-1.861-0.154c-0.071-0.634-0.85-0.932-1.55-1.552c-0.361-0.854-0.93-2.378-0.93-2.378l-1.24-1.885  l0.155-0.389l1.474,2.171l1.474,1.781c0.542,1.783,1.007,1.939,1.007,1.939c0.815-0.288,2.753-1.086,2.753-1.086l1.898-1.822  c0,0-0.195-0.581-0.967-1.316l-0.584-0.349c-0.126,0.357-0.802,0.491-0.802,0.491l-1.641-1.964l0.61-0.123l0.471,0.896l1.128,0.39  c0,0,0.313-0.229,0.893,0.371c0.473-0.039,2.318,0.09,2.749,0.636c0.085,0.109,2.287,5.607,2.721,5.614  c0.19,0.002,0.329,0.077,0.267-0.256c-0.078-0.156,0-3.609,0.116-4.349c0.295-0.628,0.343-0.003,1.04,1.188  C51.374,24.204,51.372,24.175,51.366,24.146z M31.993,10.823c0.154-0.459,1.047-0.615,1.047-0.615s-0.256,0.473-0.197,0.716  c0.06,0.247-0.407,0.402-0.46,0.982c-0.051,0.578-1.117,0.239-1.204,0.036C31.09,11.74,31.835,11.281,31.993,10.823z M35.816,18.624  c-0.661,0-2.645,0.196-3.19-0.194c-0.546-0.389-0.97,0.04-1.362,0.43c-0.258,0.253-1.193-0.26-1.468-0.649  c-0.271-0.39-1.188-0.361-1.188-0.361l0.208-1.111l-2.637-0.128l-1.499,0.439l-1.41,0.041l0.79-0.376l0.983-0.232  c0,0,1.431-1.176,1.859-1.526c0.363-0.297,1.811-0.129,1.811-0.129l1.589,1.146c0,0-0.353,0.898-0.508,1.091  c0.583-0.039,1.269-1.099,1.269-1.099c-1.239-1.138-1.188-1.524-1.188-1.524l1.633,1.146l0.016,0.01c0,0,0.661,1.558,0.937,1.558  c0.271,0,0.619-1.073,0.619-1.073l0.465-0.117c0.207,0.492,0.595,1.603,1.059,1.343c0.269-0.147,0.71-0.013,1.215,0.181  c0.509,0.195,0.854-0.104,1.267,0.258C37.03,19.349,36.089,18.702,35.816,18.624z M36.853,15.943  c-0.681-0.259-2.984,0.586-2.47-0.796c0.275-0.746,0.981-0.901,1.223-0.405c0.063,0.204,0.83,0.519,0.824,0.09  c-0.006-0.431,0.771-0.659,0.883-0.338C36.899,14.791,38.932,16.341,36.853,15.943z M41.192,17.252  c-0.377-0.304,0.169-0.564-0.387-1.041c-0.798-0.684-1.421-0.978-0.334-1.532c1.341-0.168,0.218,0.428,0.44,0.786  c0.119,0.19,0.796,0.828,1.325,1.61C42.676,17.725,41.567,17.555,41.192,17.252z" fill="url(#SVGID_8_)"/>
+<radialGradient cx="24.4839" cy="10.4453" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="23.6688">
+<stop offset="0" style="stop-color:#7AF200"/>
+<stop offset="0.3152" style="stop-color:#7AF200"/>
+<stop offset="0.7273" style="stop-color:#1CAD0F"/>
+<stop offset="1" style="stop-color:#007A3A"/>
+</radialGradient>
+<path d="M41.733,35.008l-1.293,1.291c0,0-0.778,0-0.815,0.313c-0.017,0.133-0.063,0.709-0.192,1.006  c-0.258,0.18-0.569,0.775-0.569,0.775s-0.158,1.15,0.699,0.953C40.42,39.152,43.059,35.633,41.733,35.008z" fill="url(#SVGID_9_)"/>
+<path d="M31.68,48.668c1.546,0,3.049-0.174,4.499-0.49c-0.039-0.049-0.071-0.1-0.114-0.145  l-7.534-7.756c-0.434-0.447-1.031-0.705-1.638-0.705c-0.57,0-1.102,0.221-1.5,0.625l-1.144,1.18l-0.472,0.477l-0.436,0.447  c-1.654-1.605-3.133-3.443-4.739-5.873c-0.888-1.348-1.653-2.988-2.138-4.123l-0.178-0.424c-0.001,0-0.242-0.598-0.324-0.811  l-0.027-0.068c-0.067-0.176-0.127-0.341-0.184-0.5l-0.025-0.069l1.843-0.641c1.017-0.344,1.593-1.403,1.363-2.555l-0.007-0.036  l-1.154-3.523l-2.274-6.787c-0.162-0.486-0.47-0.886-0.858-1.16c-2.416,3.407-3.841,7.565-3.841,12.059  C10.797,39.322,20.147,48.668,31.68,48.668z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M31.68,48.668c1.301,0,2.57-0.125,3.806-0.352l-7.394-7.613c-0.32-0.33-0.758-0.52-1.199-0.52  c-0.404,0-0.779,0.156-1.061,0.441l-1.148,1.182l-0.467,0.473l-0.424,0.436l0.003,0.004l-0.435,0.445  c-1.866-1.736-3.509-3.734-5.269-6.4c-0.91-1.381-1.694-3.059-2.192-4.221l-0.158-0.375l-0.024-0.059c0,0-0.243-0.602-0.327-0.816  l-0.029-0.072c-0.068-0.18-0.129-0.347-0.19-0.513c0,0-0.12-0.337-0.145-0.41l0.071-0.295l2.272-0.791  c0.721-0.244,1.127-1.009,0.966-1.819l-0.007-0.036l-1.142-3.485l-2.274-6.789c-0.119-0.357-0.343-0.65-0.626-0.851  c-2.204,3.31-3.492,7.283-3.492,11.557C10.797,39.322,20.147,48.668,31.68,48.668z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<radialGradient cx="-859.7427" cy="-265.1074" gradientTransform="matrix(0.9999 -0.0111 0.0111 0.9999 905.1068 277.0371)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="34.2211">
+<stop offset="0" style="stop-color:#E9F0F2"/>
+<stop offset="0.8364" style="stop-color:#E9F0F2"/>
+<stop offset="0.8909" style="stop-color:#AAB1B5"/>
+<stop offset="0.9515" style="stop-color:#7C878C"/>
+<stop offset="1" style="stop-color:#838F94"/>
+</radialGradient>
+<path d="M23.387,44.016c-2.39-2.133-4.191-4.469-5.806-6.914c-1.552-2.357-2.958-5.889-3.393-7.428  l-6.272-8.836c-0.357,0.592-0.921,2.715-0.661,5.588c0.262,2.872,2.939,9.828,6.083,14.596c3.146,4.766,7.81,9.248,9.374,10.24  c2.462,1.561,5.427,2.074,6.329,2.029c0,0,0.833-0.098,1.97-0.496C31.5,52.625,23.387,44.016,23.387,44.016z" fill="url(#SVGID_10_)"/>
+<path d="M15.369,32.857c-0.55-1.283-0.976-2.456-1.18-3.184l-6.104-8.599c-0.064,0.09-0.099,0.144-0.099,0.144  c-0.104,0.172-0.22,0.458-0.338,0.813c-0.118,0.599-0.177,1.219-0.167,1.854C7.541,28.374,10.936,32.078,15.369,32.857z" fill-opacity="0.05" stroke-opacity="0.05"/>
+<path d="M15.108,32.234c-0.423-1.033-0.749-1.953-0.919-2.561l-6.125-8.627c-0.069,0.101-0.109,0.161-0.109,0.161  c-0.097,0.162-0.208,0.434-0.318,0.769c-0.111,0.567-0.168,1.151-0.159,1.751C7.536,28.033,10.834,31.572,15.108,32.234z" fill-opacity="0.05" stroke-opacity="0.05"/>
+<path d="M7.907,21.188c-0.088,0.148-0.188,0.394-0.289,0.698c-0.102,0.514-0.152,1.046-0.144,1.59  c0.054,4.01,3.21,7.283,7.24,7.757c-0.232-0.618-0.412-1.157-0.526-1.559l-6.154-8.67C7.951,21.121,7.907,21.188,7.907,21.188z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<radialGradient cx="-891.105" cy="-262.4795" gradientTransform="matrix(1.0009 -0.0086 0.0135 0.9911 906.6143 271.6763)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="11.8382">
+<stop offset="0" style="stop-color:#D1D8D9"/>
+<stop offset="0.0424" style="stop-color:#D1D8D9"/>
+<stop offset="0.4" style="stop-color:#BBC0C2"/>
+<stop offset="0.7333" style="stop-color:#7C8C91"/>
+<stop offset="1" style="stop-color:#A7B3B7"/>
+</radialGradient>
+<path d="M14.188,29.674l1.312-0.461c0,0-2.781-12.441-3.885-11.868c-0.555,0.29-0.549,0.448-1.11,0.853  c-1.676,1.219-2.589,2.641-2.589,2.641c-0.077,0.13-0.165,0.345-0.252,0.613c-0.088,0.45-0.134,0.916-0.128,1.392  c0.05,3.62,2.979,6.563,6.661,6.841C14.194,29.681,14.189,29.677,14.188,29.674z" fill="url(#SVGID_11_)"/>
+<path d="M23.289,45.25c-0.259,0.727-0.4,1.498-0.39,2.303c0.025,1.906,0.882,3.621,2.242,4.898  c1.716,0.641,3.287,0.871,3.9,0.84c0,0,0.833-0.098,1.97-0.496c0.409-0.143-5.222-6.213-7.055-8.172L23.289,45.25z" fill-opacity="0.05" stroke-opacity="0.05"/>
+<path d="M23.448,44.59c-0.261,0.725-0.401,1.496-0.391,2.301c0.036,2.613,1.621,4.875,3.95,6.125  c0.771,0.18,1.418,0.264,1.829,0.275c0.011,0,0.026,0.002,0.037,0c0,0,0.832-0.096,1.972-0.494c0.422-0.148-5.624-6.641-7.233-8.363  L23.448,44.59z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<radialGradient cx="-877.4263" cy="-238.3691" gradientTransform="matrix(1.0009 -0.0086 0.0135 0.9911 906.6143 271.6763)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="12.0474">
+<stop offset="0" style="stop-color:#D1D8D9"/>
+<stop offset="0.0424" style="stop-color:#D1D8D9"/>
+<stop offset="0.4" style="stop-color:#BBC0C2"/>
+<stop offset="0.7333" style="stop-color:#7C8C91"/>
+<stop offset="1" style="stop-color:#A7B3B7"/>
+</radialGradient>
+<path d="M32.6,52.1c0.653-0.35,0.819-0.34,1.351-0.74c0.98-0.74-8.83-9.123-8.83-9.123l-1.712,1.756  c-0.229,0.695-0.355,1.434-0.345,2.203c0.051,3.766,3.219,6.797,7.107,6.857C30.828,52.877,31.693,52.584,32.6,52.1z" fill="url(#SVGID_12_)"/>
+<path d="M14.866,29.428l0.634-0.215c0,0-2.781-12.441-3.885-11.868  c-0.291,0.151-0.427,0.268-0.573,0.401L14.866,29.428z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(0.9999 -0.0111 0.0111 0.9999 905.1068 277.0361)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="-889.625" x2="-885.2537" y1="-270.9771" y2="-257.0911">
+<stop offset="0" style="stop-color:#E9F0F2"/>
+<stop offset="0.0424" style="stop-color:#E9F0F2"/>
+<stop offset="0.4" style="stop-color:#D4D9DB"/>
+<stop offset="0.7333" style="stop-color:#98AAAD"/>
+<stop offset="1" style="stop-color:#D0DADE"/>
+</linearGradient>
+<path d="M15.5,29.214l1.677-0.583c0.435-0.147,0.659-0.629,0.562-1.119l-1.129-3.446l-2.275-6.79  c-0.177-0.533-0.71-0.836-1.188-0.676c0,0-0.429,0.175-1.529,0.747L15.5,29.214z" fill="url(#SVGID_13_)"/>
+<path d="M25.121,42.236l-0.468,0.473l8.748,9.039c0.188-0.131,0.379-0.26,0.55-0.389  C34.931,50.619,25.121,42.236,25.121,42.236z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(0.9999 -0.0111 0.0111 0.9999 905.1068 277.0366)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="-876.2178" x2="-867.1104" y1="-245.4277" y2="-235.398">
+<stop offset="0" style="stop-color:#E9F0F2"/>
+<stop offset="0.0424" style="stop-color:#E9F0F2"/>
+<stop offset="0.4" style="stop-color:#D4D9DB"/>
+<stop offset="0.7333" style="stop-color:#98AAAD"/>
+<stop offset="1" style="stop-color:#D0DADE"/>
+</linearGradient>
+<path d="M33.95,51.357c0.978-0.738,1.295-1.059,1.295-1.059c0.364-0.373,0.338-1.002-0.059-1.412  l-7.534-7.756c-0.397-0.412-1.016-0.451-1.38-0.08l-1.151,1.186L33.95,51.357z" fill="url(#SVGID_14_)"/>
+</g>
+<g>
+<linearGradient gradientTransform="matrix(1 1.000000e-004 -1.000000e-004 1 -2.3655 -29.0779)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="17.3477" x2="17.3477" y1="31.0703" y2="55.8327">
+<stop offset="0" style="stop-color:#45E8FF"/>
+<stop offset="0.1455" style="stop-color:#45E8FF"/>
+<stop offset="0.5576" style="stop-color:#30A4D5"/>
+<stop offset="1" style="stop-color:#1347BA"/>
+</linearGradient>
+<polygon fill="url(#SVGID_1__)" points="25.381,14.288 15.027,3.528 4.573,14.288 10.207,14.288 10.21,26.582 19.865,26.584   19.863,14.288 "/>
+<linearGradient gradientTransform="matrix(1 1.000000e-004 -1.000000e-004 1 -2.3655 -29.0779)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="17.3701" x2="17.3701" y1="32.3115" y2="43.6498">
+<stop offset="0" style="stop-color:#B3FCFF"/>
+<stop offset="0.4182" style="stop-color:#B3FCFF"/>
+<stop offset="1" style="stop-color:#5FBAD8"/>
+</linearGradient>
+<polygon fill="url(#SVGID_2__)" points="4.897,14.286 15.026,3.888 25.104,14.288 25.801,14.288 15.027,3.17 4.199,14.286 "/>
+<line fill="#1D4489" x1="10.21" x2="19.865" y1="26.578" y2="26.58"/>
+<polygon fill="#33AEDB" points="19.867,26.83 10.21,26.828 10.21,26.328 19.866,26.33 19.867,26.83 "/>
+<rect fill="none" height="30" width="30"/>
+</g>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_large_voip_missed_call.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_large_voip_missed_call.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<rect fill="none" height="60" width="60"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="31.3823" x2="31.3823" y1="49.3193" y2="6.7675">
+<stop offset="0" style="stop-color:#004E8C"/>
+<stop offset="1" style="stop-color:#1B66D8"/>
+</linearGradient>
+<circle cx="31.382" cy="28.137" fill="url(#SVGID_1_)" r="21.429"/>
+<radialGradient cx="23.8237" cy="17.7847" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="25.9191">
+<stop offset="0" style="stop-color:#94FFFF"/>
+<stop offset="0.5" style="stop-color:#36B5FF"/>
+<stop offset="1" style="stop-color:#1B66D8"/>
+</radialGradient>
+<path d="M52.262,28.137c0,11.533-9.346,20.877-20.879,20.877c-11.533,0-20.882-9.344-20.882-20.877  c0-11.53,9.35-20.88,20.882-20.88C42.917,7.257,52.262,16.607,52.262,28.137z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="31.3823" x2="31.3823" y1="7.0732" y2="49.1199">
+<stop offset="0" style="stop-color:#31A7F8"/>
+<stop offset="0.497" style="stop-color:#1E74DC"/>
+<stop offset="1" style="stop-color:#88D6EB"/>
+</linearGradient>
+<path d="M31.383,7.257c-11.533,0-20.882,9.35-20.882,20.88c0,11.533,9.35,20.877,20.882,20.877  c11.533,0,20.879-9.344,20.879-20.877C52.262,16.607,42.917,7.257,31.383,7.257z M31.383,47.188  c-10.843,0-19.664-8.818-19.664-19.659c0-10.843,8.82-19.663,19.664-19.663c10.841,0,19.66,8.82,19.66,19.663  C51.043,38.369,42.224,47.188,31.383,47.188z" fill="url(#SVGID_3_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="10.8428" x2="14.1621" y1="30.9775" y2="30.9775">
+<stop offset="0" style="stop-color:#58595B"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M12.462,27.796C12.239,27.5,11.737,27.5,11.516,27.5c-0.437,0-0.669,0.312-0.673,0.616  v0.021l0.001,0.031c-0.001,0.537,0.029,1.14,0.094,1.872c0.013,0.138,0.03,0.276,0.047,0.414l0.024,0.201  c0.056,0.434,0.121,0.86,0.195,1.274l0.034,0.182c0.032,0.164,0.063,0.324,0.098,0.484c0.089,0.406,0.198,0.826,0.332,1.291  c0.02,0.066,0.037,0.133,0.055,0.199c0.028,0.109,0.058,0.217,0.091,0.322l0.005,0.014l0.012,0.033  c-0.003-0.01-0.008-0.023-0.01-0.037l1.198-0.08c0.019-0.188,0.024-0.383,0.019-0.576c-0.01-0.303-0.021-0.676-0.107-0.99  l1.112-1.494l0.12-0.162v-0.203v-1.165v-0.252l-0.179-0.178L12.462,27.796z" fill="url(#SVGID_4_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="17.2432" x2="51.9731" y1="24.897" y2="24.897">
+<stop offset="0" style="stop-color:#58595B"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M51.966,24.045c-0.016-0.079-0.029-0.136-0.043-0.191  c-0.011-0.042-0.021-0.084-0.029-0.125c-0.106-0.495-0.237-1.005-0.392-1.525l-0.017-0.058c-0.033-0.117-0.068-0.234-0.105-0.349  c-0.188-0.588-0.393-1.148-0.608-1.666c-0.027-0.066-0.056-0.125-0.084-0.188l-0.045-0.1c-0.206-0.474-0.436-0.947-0.677-1.403  l-0.03-0.059c-0.047-0.09-0.093-0.181-0.142-0.269c-0.295-0.532-0.604-1.041-0.918-1.512c-0.032-0.049-0.069-0.102-0.106-0.154  c-0.023-0.031-0.045-0.061-0.066-0.092c-0.302-0.437-0.618-0.862-0.946-1.268l-0.064-0.082c-0.044-0.055-0.088-0.111-0.134-0.167  c-0.381-0.456-0.783-0.898-1.199-1.317c-0.056-0.056-0.115-0.115-0.176-0.172l-0.049-0.047c-0.375-0.368-0.774-0.732-1.183-1.074  l-0.081-0.069c-0.041-0.037-0.083-0.073-0.125-0.106c-0.446-0.367-0.931-0.728-1.435-1.075c-0.063-0.042-0.126-0.083-0.19-0.124  l-0.077-0.05c-0.454-0.301-0.928-0.59-1.404-0.853l-0.072-0.042c-0.04-0.023-0.079-0.045-0.119-0.068  c-0.529-0.283-1.081-0.55-1.643-0.792l-0.142-0.057l-0.153-0.063c-0.148-0.061-0.297-0.114-0.443-0.165  c-0.077-0.026-0.152-0.053-0.228-0.08l-0.282-0.105L38.303,8.74c-0.17,0.107-0.84,0.49-1.235,0.715  c-0.438-0.059-1.499-0.192-2.57-0.295c0.33-0.032,0.787-0.069,1.43-0.111l0.09-1.204L35.97,7.832  c-0.039-0.011-0.077-0.021-0.116-0.029l-0.092-0.018l-0.075-0.015c-0.655-0.131-1.271-0.227-1.882-0.291l-0.004-0.001l-0.085-0.009  c-0.698-0.07-1.409-0.106-2.112-0.106c-0.62,0-1.262,0.033-1.964,0.101c-0.109,0.01-0.214,0.021-0.321,0.032  c-0.693,0.078-1.3,0.17-1.873,0.286l-0.02,0.003l-0.015,0.002c-0.604,0.125-1.211,0.281-1.856,0.477  c-0.058,0.018-0.116,0.037-0.173,0.055l-0.131,0.043c-0.547,0.176-1.082,0.371-1.596,0.582c-0.042,0.018-0.071,0.029-0.1,0.04  l-0.078,0.031c-0.564,0.24-1.128,0.512-1.688,0.812c-0.06,0.031-0.118,0.066-0.177,0.099L21.542,9.97  c-0.157,0.087-0.315,0.185-0.473,0.283l-0.203,0.127l-1.118,0.684l1.242,0.415c0.186,0.063,0.385,0.093,0.592,0.093  c0.67,0,1.317-0.329,1.838-0.593c0.209-0.105,0.521-0.264,0.648-0.288c0.152,0.045,0.306,0.068,0.458,0.068  c0.569,0,1.035-0.306,1.446-0.578l0.111-0.072c0.134-0.043,0.362-0.128,0.818-0.299c0.465-0.174,1.314-0.493,1.54-0.546  c0.44-0.005,0.966-0.068,1.339-0.3c0.352,0.058,0.977,0.157,1.619,0.24c-0.047,0.029-0.093,0.059-0.132,0.097  c-0.209,0.192-1.335,0.533-1.68,0.578c-0.647,0.081-0.908,0.408-1.012,0.666c-0.135,0.336-0.054,0.672,0.078,0.946  c-0.245,0.162-0.545,0.342-0.804,0.479c0.001-0.006,0.003-0.012,0.004-0.02c0.093-0.517,0.16-0.89-0.091-1.189  c-0.128-0.153-0.317-0.241-0.519-0.241c-0.295,0-0.525,0.183-0.711,0.362c-0.52,0.502-0.834,1.129-0.952,1.365l-0.022,0.044  l-0.019,0.035c-0.225,0.431-0.317,0.737-0.192,1.688c-0.055,0.04-0.219,0.102-0.445,0.102c-0.03,0-0.058-0.002-0.079-0.003  c-0.146-0.158-0.349-0.248-0.576-0.248l0,0c-0.524,0-1.238,0.589-2.123,1.754l-0.284,0.374l0.289,0.371l0.27,0.343  c-4.216,3.259-4.248,3.444-4.292,3.717c-0.007,0.024-0.044,0.137-0.095,0.293c-0.628,1.952-0.977,3.413-0.637,4.194  c0.784,1.813,1.669,3.505,2.815,3.599c0.101,0.008,0.212,0.012,0.332,0.012c1.051,0,2.753-0.318,3.572-0.485  c0.151,0.283,0.335,0.614,0.438,0.795l0.181,0.323l0.37-0.012c0.004,0,0.199-0.006,0.448-0.006c0.286,0,0.478,0.008,0.602,0.017  c0.446,1.307,1.3,4.317,1.142,4.944L27.272,34.1c-1.441,2.16,0.306,4.975,1.145,6.328c0.066,0.107,0.126,0.203,0.177,0.287  c0.324,0.922,0.716,1.531,1.545,1.531c0.062,0,0.124-0.004,0.188-0.008c0.047-0.002,0.096-0.004,0.146-0.004  c0.092,0,0.157,0.01,0.226,0.035l0.075,0.027l0.08,0.006c0.155,0.014,0.306,0.035,0.453,0.057c0.255,0.035,0.519,0.07,0.788,0.07  c0.721,0,1.293-0.271,1.787-0.855c0.019-0.002,0.036-0.004,0.055-0.006c0.518-0.072,0.712-0.332,0.778-0.564  c0.038-0.039,0.089-0.086,0.131-0.125c0.204-0.188,0.447-0.41,0.615-0.674c0.075-0.045,0.161-0.096,0.258-0.152  c0.167-0.104,0.355-0.217,0.504-0.293c0.131-0.041,0.247-0.117,0.334-0.225c0.209-0.258,0.166-0.549,0.131-0.783  c-0.035-0.242-0.071-0.492,0.06-0.758c0.738-0.355,2.051-1.23,2.263-1.375l-0.001,0.018c-0.014,0.117-0.048,0.43-0.1,0.629  c-0.279,0.279-0.513,0.703-0.586,0.846l-0.049,0.094l-0.015,0.104c-0.019,0.137-0.094,0.85,0.306,1.311  c0.202,0.23,0.49,0.359,0.813,0.359c0.103,0,0.21-0.014,0.319-0.039c1.027-0.232,2.85-2.703,2.998-4.066  c0.072-0.656-0.185-1.172-0.704-1.416l-0.387-0.184l-0.304,0.303l-1.125,1.125c-0.38,0.035-0.678,0.148-0.879,0.326  c0.012-0.48-0.035-0.973-0.086-1.451c-0.155-1.447-0.185-2.369,0.703-2.996l0.045-0.033l0.038-0.039  c0.321-0.326,0.676-0.611,1.052-0.914c0.88-0.707,1.79-1.438,2.332-2.759l0.022-0.056c0.174-0.451,0.437-1.132,0.081-1.651  c-0.089-0.128-0.275-0.327-0.624-0.397c0.462-0.186,0.816-0.332,0.851-0.346l0.107-0.044l0.083-0.08l1.898-1.822l0.278-0.268  l-0.122-0.366c-0.017-0.047-0.12-0.335-0.411-0.747c0.554,0.075,1.029,0.208,1.185,0.326c0.057,0.124,0.171,0.396,0.292,0.683  c2.089,4.924,2.382,5.178,2.926,5.187c0.021,0,0.037,0.002,0.051,0.003c0.044,0.003,0.083,0.005,0.119,0.005  c0.31,0,0.486-0.157,0.564-0.252c0.227-0.274,0.163-0.608,0.14-0.734l-0.009-0.043c-0.025-0.294-0.008-1.618,0.034-2.706  c0.003,0.002,0.004,0.006,0.006,0.01l1.12-0.445L51.966,24.045z M35.508,18.021c-0.087,0.003-0.181,0.008-0.282,0.012  c-0.322,0.015-0.688,0.031-1.053,0.031c-0.955,0-1.174-0.118-1.196-0.131c-0.113-0.082-0.229-0.144-0.35-0.188  c0.216-0.048,0.464-0.214,0.719-0.708c0.251,0.487,0.592,0.917,1.115,0.917c0.142,0,0.277-0.034,0.406-0.101  C35.043,17.856,35.333,17.957,35.508,18.021z M35.133,15.357c-0.072,0-0.131-0.003-0.176-0.007c0.049-0.128,0.107-0.202,0.154-0.244  c0.06,0.093,0.14,0.175,0.232,0.245C35.27,15.355,35.2,15.357,35.133,15.357z M31.331,16.635c0.327,0.641,0.569,0.917,0.762,1.037  c-0.475,0.038-0.833,0.339-1.126,0.625c-0.206-0.068-0.565-0.286-0.672-0.438c-0.063-0.089-0.138-0.166-0.221-0.232  C30.593,17.479,31.049,16.998,31.331,16.635z M29.523,16.163l-0.679-0.033l-2.278-0.111c0.278-0.229,0.541-0.444,0.697-0.57  c0.042-0.015,0.205-0.06,0.605-0.06c0.242,0,0.474,0.017,0.62,0.029L29.523,16.163z" fill="url(#SVGID_5_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<radialGradient cx="24.4912" cy="10.4414" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="23.6744">
+<stop offset="0" style="stop-color:#7AF200"/>
+<stop offset="0.3152" style="stop-color:#7AF200"/>
+<stop offset="0.7273" style="stop-color:#1CAD0F"/>
+<stop offset="1" style="stop-color:#007A3A"/>
+</radialGradient>
+<path d="M11.451,28.125C11.451,28.125,11.451,28.125,11.451,28.125c0,0.008,0.001,0.012,0.001,0.018  c0,0.622,0.039,1.236,0.093,1.844c0.018,0.198,0.047,0.398,0.069,0.598c0.053,0.417,0.116,0.83,0.19,1.238  c0.042,0.215,0.081,0.434,0.127,0.646c0.094,0.422,0.203,0.838,0.321,1.248c0.05,0.17,0.089,0.342,0.141,0.508  c0.007,0.018,0.015,0.033,0.019,0.051c0.017-0.16,0.021-0.326,0.017-0.496c-0.04-1.199-0.232-1.045-0.232-1.045l1.356-1.822v-1.165  l-1.589-1.589C11.964,28.159,11.452,28.079,11.451,28.125z" fill="url(#SVGID_6_)"/>
+<radialGradient cx="24.4868" cy="10.4395" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="23.6775">
+<stop offset="0" style="stop-color:#7AF200"/>
+<stop offset="0.3152" style="stop-color:#7AF200"/>
+<stop offset="0.7273" style="stop-color:#1CAD0F"/>
+<stop offset="1" style="stop-color:#007A3A"/>
+</radialGradient>
+<path d="M24.212,10.099c0.587,0.193,1.066-0.2,1.613-0.549c0.193-0.04,2.338-0.896,2.57-0.896  c0.231,0,1.011-0.03,1.204-0.34c0,0,3.357,0.584,3.863,0.389c0.275-0.107,1.433-0.2,2.425-0.264  c-0.056-0.012-0.106-0.029-0.162-0.041c-0.054-0.011-0.105-0.019-0.161-0.03c-0.623-0.126-1.252-0.226-1.894-0.29  c-0.006,0-0.01,0-0.016-0.002c-0.674-0.068-1.358-0.104-2.052-0.104c-0.644,0-1.277,0.038-1.906,0.098  c-0.11,0.011-0.221,0.022-0.331,0.035c-0.608,0.067-1.211,0.155-1.801,0.274c-0.01,0.003-0.021,0.004-0.031,0.006  c-0.612,0.127-1.213,0.283-1.802,0.464c-0.102,0.03-0.199,0.064-0.302,0.096c-0.522,0.168-1.038,0.356-1.544,0.564  c-0.06,0.026-0.12,0.048-0.18,0.072c-0.557,0.238-1.1,0.501-1.63,0.784c-0.08,0.043-0.156,0.089-0.234,0.134  c-0.227,0.125-0.44,0.267-0.66,0.402C22.273,11.265,23.635,9.904,24.212,10.099z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="24.4863" cy="10.437" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="23.6745">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.3152" style="stop-color:#B2F56E"/>
+<stop offset="0.7273" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M51.366,24.146c-0.021-0.102-0.049-0.197-0.069-0.297c-0.106-0.499-0.233-0.99-0.378-1.474  c-0.038-0.13-0.076-0.264-0.118-0.395c-0.176-0.549-0.371-1.09-0.59-1.616c-0.04-0.093-0.085-0.184-0.125-0.275  c-0.202-0.464-0.421-0.918-0.657-1.363c-0.056-0.106-0.109-0.215-0.166-0.319c-0.279-0.502-0.575-0.993-0.893-1.469  c-0.054-0.083-0.114-0.161-0.17-0.243c-0.291-0.422-0.596-0.831-0.916-1.228c-0.064-0.079-0.127-0.16-0.194-0.24  c-0.368-0.442-0.756-0.868-1.161-1.277c-0.069-0.07-0.143-0.14-0.215-0.208c-0.369-0.363-0.755-0.714-1.153-1.047  c-0.067-0.056-0.131-0.116-0.198-0.171c-0.448-0.366-0.915-0.714-1.395-1.043c-0.084-0.057-0.17-0.112-0.256-0.167  c-0.442-0.294-0.898-0.571-1.366-0.83c-0.063-0.035-0.123-0.073-0.187-0.108c-0.52-0.278-1.05-0.533-1.594-0.768  c-0.097-0.041-0.194-0.079-0.29-0.12c-0.211-0.087-0.432-0.156-0.646-0.235c-0.255,0.163-1.438,0.832-1.438,0.832  s-5.141-0.702-5.491-0.353c-0.352,0.353-1.721,0.71-2.033,0.751c-0.311,0.04-0.956,0.206-0.182,1.161  c-0.116,0.118-2.325,1.657-2.325,0.957s0.494-1.953-0.2-1.282c-0.498,0.482-0.796,1.135-0.86,1.257  c-0.163,0.312-0.263,0.461-0.145,1.357s-1.43,0.891-1.534,0.659c-0.276-0.622-1.809,1.394-1.809,1.394l0.646,0.828  c0,0-4.51,3.474-4.548,3.707c-0.04,0.234-1.164,3.25-0.775,4.147c0.39,0.897,1.376,3.158,2.307,3.233  c1.222,0.101,4.186-0.559,4.186-0.559c0.08,0.196,0.638,1.189,0.638,1.189s1.453-0.048,1.534,0.11  c0.026,0.053,1.75,5.122,1.182,5.794c-1.357,2.033,0.775,5.012,1.369,6.02c0.594,1.73,0.977,0.955,1.758,1.238  c0.962,0.084,1.772,0.439,2.589-0.611c0.237-0.195,0.641-0.041,0.641-0.313c0-0.152,0.698-0.598,0.878-1.018  c0.188-0.088,0.674-0.414,1.003-0.572c0.299-0.02-0.283-0.82,0.309-1.666c0.64-0.252,2.364-1.414,2.364-1.414  c0.078-1.705-0.839-3.811,0.873-5.02c1.104-1.126,2.553-1.767,3.255-3.479c0.194-0.506,0.628-1.542-0.619-1.231  c-1.173,0.295-2.48,0.362-1.861-0.154c-0.071-0.634-0.85-0.932-1.55-1.552c-0.361-0.854-0.93-2.378-0.93-2.378l-1.24-1.885  l0.155-0.389l1.474,2.171l1.474,1.781c0.542,1.783,1.007,1.939,1.007,1.939c0.815-0.288,2.753-1.086,2.753-1.086l1.898-1.822  c0,0-0.195-0.581-0.967-1.316l-0.584-0.349c-0.126,0.357-0.802,0.491-0.802,0.491l-1.641-1.964l0.61-0.123l0.471,0.896l1.128,0.39  c0,0,0.313-0.229,0.893,0.371c0.473-0.039,2.318,0.09,2.749,0.636c0.085,0.109,2.287,5.607,2.721,5.614  c0.19,0.002,0.329,0.077,0.267-0.256c-0.078-0.156,0-3.609,0.116-4.349c0.295-0.628,0.343-0.003,1.04,1.188  C51.374,24.204,51.372,24.175,51.366,24.146z M31.993,10.823c0.154-0.459,1.047-0.615,1.047-0.615s-0.256,0.473-0.197,0.716  c0.06,0.247-0.407,0.402-0.46,0.982c-0.051,0.578-1.117,0.239-1.204,0.036C31.09,11.74,31.835,11.281,31.993,10.823z M35.816,18.624  c-0.661,0-2.645,0.196-3.19-0.194c-0.546-0.389-0.97,0.04-1.362,0.43c-0.258,0.253-1.193-0.26-1.468-0.649  c-0.271-0.39-1.188-0.361-1.188-0.361l0.208-1.111l-2.637-0.128l-1.499,0.439l-1.41,0.041l0.79-0.376l0.983-0.232  c0,0,1.431-1.176,1.859-1.526c0.363-0.297,1.811-0.129,1.811-0.129l1.589,1.146c0,0-0.353,0.898-0.508,1.091  c0.583-0.039,1.269-1.099,1.269-1.099c-1.239-1.138-1.188-1.524-1.188-1.524l1.633,1.146l0.016,0.01c0,0,0.661,1.558,0.937,1.558  c0.271,0,0.619-1.073,0.619-1.073l0.465-0.117c0.207,0.492,0.595,1.603,1.059,1.343c0.269-0.147,0.71-0.013,1.215,0.181  c0.509,0.195,0.854-0.104,1.267,0.258C37.03,19.349,36.089,18.702,35.816,18.624z M36.853,15.943  c-0.681-0.259-2.984,0.586-2.47-0.796c0.275-0.746,0.981-0.901,1.223-0.405c0.063,0.204,0.83,0.519,0.824,0.09  c-0.006-0.431,0.771-0.659,0.883-0.338C36.899,14.791,38.932,16.341,36.853,15.943z M41.192,17.252  c-0.377-0.304,0.169-0.564-0.387-1.041c-0.798-0.684-1.421-0.978-0.334-1.532c1.341-0.168,0.218,0.428,0.44,0.786  c0.119,0.19,0.796,0.828,1.325,1.61C42.676,17.725,41.567,17.555,41.192,17.252z" fill="url(#SVGID_8_)"/>
+<radialGradient cx="24.4839" cy="10.4453" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="23.6688">
+<stop offset="0" style="stop-color:#7AF200"/>
+<stop offset="0.3152" style="stop-color:#7AF200"/>
+<stop offset="0.7273" style="stop-color:#1CAD0F"/>
+<stop offset="1" style="stop-color:#007A3A"/>
+</radialGradient>
+<path d="M41.733,35.008l-1.293,1.291c0,0-0.778,0-0.815,0.313c-0.017,0.133-0.063,0.709-0.192,1.006  c-0.258,0.18-0.569,0.775-0.569,0.775s-0.158,1.15,0.699,0.953C40.42,39.152,43.059,35.633,41.733,35.008z" fill="url(#SVGID_9_)"/>
+<path d="M31.68,48.668c1.546,0,3.049-0.174,4.499-0.49c-0.039-0.049-0.071-0.1-0.114-0.145  l-7.534-7.756c-0.434-0.447-1.031-0.705-1.638-0.705c-0.57,0-1.102,0.221-1.5,0.625l-1.144,1.18l-0.472,0.477l-0.436,0.447  c-1.654-1.605-3.133-3.443-4.739-5.873c-0.888-1.348-1.653-2.988-2.138-4.123l-0.178-0.424c-0.001,0-0.242-0.598-0.324-0.811  l-0.027-0.068c-0.067-0.176-0.127-0.341-0.184-0.5l-0.025-0.069l1.843-0.641c1.017-0.344,1.593-1.403,1.363-2.555l-0.007-0.036  l-1.154-3.523l-2.274-6.787c-0.162-0.486-0.47-0.886-0.858-1.16c-2.416,3.407-3.841,7.565-3.841,12.059  C10.797,39.322,20.147,48.668,31.68,48.668z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M31.68,48.668c1.301,0,2.57-0.125,3.806-0.352l-7.394-7.613c-0.32-0.33-0.758-0.52-1.199-0.52  c-0.404,0-0.779,0.156-1.061,0.441l-1.148,1.182l-0.467,0.473l-0.424,0.436l0.003,0.004l-0.435,0.445  c-1.866-1.736-3.509-3.734-5.269-6.4c-0.91-1.381-1.694-3.059-2.192-4.221l-0.158-0.375l-0.024-0.059c0,0-0.243-0.602-0.327-0.816  l-0.029-0.072c-0.068-0.18-0.129-0.347-0.19-0.513c0,0-0.12-0.337-0.145-0.41l0.071-0.295l2.272-0.791  c0.721-0.244,1.127-1.009,0.966-1.819l-0.007-0.036l-1.142-3.485l-2.274-6.789c-0.119-0.357-0.343-0.65-0.626-0.851  c-2.204,3.31-3.492,7.283-3.492,11.557C10.797,39.322,20.147,48.668,31.68,48.668z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<radialGradient cx="-859.7427" cy="-265.1074" gradientTransform="matrix(0.9999 -0.0111 0.0111 0.9999 905.1068 277.0371)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="34.2211">
+<stop offset="0" style="stop-color:#E9F0F2"/>
+<stop offset="0.8364" style="stop-color:#E9F0F2"/>
+<stop offset="0.8909" style="stop-color:#AAB1B5"/>
+<stop offset="0.9515" style="stop-color:#7C878C"/>
+<stop offset="1" style="stop-color:#838F94"/>
+</radialGradient>
+<path d="M23.387,44.016c-2.39-2.133-4.191-4.469-5.806-6.914c-1.552-2.357-2.958-5.889-3.393-7.428  l-6.272-8.836c-0.357,0.592-0.921,2.715-0.661,5.588c0.262,2.872,2.939,9.828,6.083,14.596c3.146,4.766,7.81,9.248,9.374,10.24  c2.462,1.561,5.427,2.074,6.329,2.029c0,0,0.833-0.098,1.97-0.496C31.5,52.625,23.387,44.016,23.387,44.016z" fill="url(#SVGID_10_)"/>
+<path d="M15.369,32.857c-0.55-1.283-0.976-2.456-1.18-3.184l-6.104-8.599c-0.064,0.09-0.099,0.144-0.099,0.144  c-0.104,0.172-0.22,0.458-0.338,0.813c-0.118,0.599-0.177,1.219-0.167,1.854C7.541,28.374,10.936,32.078,15.369,32.857z" fill-opacity="0.05" stroke-opacity="0.05"/>
+<path d="M15.108,32.234c-0.423-1.033-0.749-1.953-0.919-2.561l-6.125-8.627c-0.069,0.101-0.109,0.161-0.109,0.161  c-0.097,0.162-0.208,0.434-0.318,0.769c-0.111,0.567-0.168,1.151-0.159,1.751C7.536,28.033,10.834,31.572,15.108,32.234z" fill-opacity="0.05" stroke-opacity="0.05"/>
+<path d="M7.907,21.188c-0.088,0.148-0.188,0.394-0.289,0.698c-0.102,0.514-0.152,1.046-0.144,1.59  c0.054,4.01,3.21,7.283,7.24,7.757c-0.232-0.618-0.412-1.157-0.526-1.559l-6.154-8.67C7.951,21.121,7.907,21.188,7.907,21.188z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<radialGradient cx="-891.105" cy="-262.4795" gradientTransform="matrix(1.0009 -0.0086 0.0135 0.9911 906.6143 271.6763)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="11.8382">
+<stop offset="0" style="stop-color:#D1D8D9"/>
+<stop offset="0.0424" style="stop-color:#D1D8D9"/>
+<stop offset="0.4" style="stop-color:#BBC0C2"/>
+<stop offset="0.7333" style="stop-color:#7C8C91"/>
+<stop offset="1" style="stop-color:#A7B3B7"/>
+</radialGradient>
+<path d="M14.188,29.674l1.312-0.461c0,0-2.781-12.441-3.885-11.868c-0.555,0.29-0.549,0.448-1.11,0.853  c-1.676,1.219-2.589,2.641-2.589,2.641c-0.077,0.13-0.165,0.345-0.252,0.613c-0.088,0.45-0.134,0.916-0.128,1.392  c0.05,3.62,2.979,6.563,6.661,6.841C14.194,29.681,14.189,29.677,14.188,29.674z" fill="url(#SVGID_11_)"/>
+<path d="M23.289,45.25c-0.259,0.727-0.4,1.498-0.39,2.303c0.025,1.906,0.882,3.621,2.242,4.898  c1.716,0.641,3.287,0.871,3.9,0.84c0,0,0.833-0.098,1.97-0.496c0.409-0.143-5.222-6.213-7.055-8.172L23.289,45.25z" fill-opacity="0.05" stroke-opacity="0.05"/>
+<path d="M23.448,44.59c-0.261,0.725-0.401,1.496-0.391,2.301c0.036,2.613,1.621,4.875,3.95,6.125  c0.771,0.18,1.418,0.264,1.829,0.275c0.011,0,0.026,0.002,0.037,0c0,0,0.832-0.096,1.972-0.494c0.422-0.148-5.624-6.641-7.233-8.363  L23.448,44.59z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<radialGradient cx="-877.4263" cy="-238.3691" gradientTransform="matrix(1.0009 -0.0086 0.0135 0.9911 906.6143 271.6763)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="12.0474">
+<stop offset="0" style="stop-color:#D1D8D9"/>
+<stop offset="0.0424" style="stop-color:#D1D8D9"/>
+<stop offset="0.4" style="stop-color:#BBC0C2"/>
+<stop offset="0.7333" style="stop-color:#7C8C91"/>
+<stop offset="1" style="stop-color:#A7B3B7"/>
+</radialGradient>
+<path d="M32.6,52.1c0.653-0.35,0.819-0.34,1.351-0.74c0.98-0.74-8.83-9.123-8.83-9.123l-1.712,1.756  c-0.229,0.695-0.355,1.434-0.345,2.203c0.051,3.766,3.219,6.797,7.107,6.857C30.828,52.877,31.693,52.584,32.6,52.1z" fill="url(#SVGID_12_)"/>
+<path d="M14.866,29.428l0.634-0.215c0,0-2.781-12.441-3.885-11.868  c-0.291,0.151-0.427,0.268-0.573,0.401L14.866,29.428z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(0.9999 -0.0111 0.0111 0.9999 905.1068 277.0361)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="-889.625" x2="-885.2537" y1="-270.9771" y2="-257.0911">
+<stop offset="0" style="stop-color:#E9F0F2"/>
+<stop offset="0.0424" style="stop-color:#E9F0F2"/>
+<stop offset="0.4" style="stop-color:#D4D9DB"/>
+<stop offset="0.7333" style="stop-color:#98AAAD"/>
+<stop offset="1" style="stop-color:#D0DADE"/>
+</linearGradient>
+<path d="M15.5,29.214l1.677-0.583c0.435-0.147,0.659-0.629,0.562-1.119l-1.129-3.446l-2.275-6.79  c-0.177-0.533-0.71-0.836-1.188-0.676c0,0-0.429,0.175-1.529,0.747L15.5,29.214z" fill="url(#SVGID_13_)"/>
+<path d="M25.121,42.236l-0.468,0.473l8.748,9.039c0.188-0.131,0.379-0.26,0.55-0.389  C34.931,50.619,25.121,42.236,25.121,42.236z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(0.9999 -0.0111 0.0111 0.9999 905.1068 277.0366)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="-876.2178" x2="-867.1104" y1="-245.4277" y2="-235.398">
+<stop offset="0" style="stop-color:#E9F0F2"/>
+<stop offset="0.0424" style="stop-color:#E9F0F2"/>
+<stop offset="0.4" style="stop-color:#D4D9DB"/>
+<stop offset="0.7333" style="stop-color:#98AAAD"/>
+<stop offset="1" style="stop-color:#D0DADE"/>
+</linearGradient>
+<path d="M33.95,51.357c0.978-0.738,1.295-1.059,1.295-1.059c0.364-0.373,0.338-1.002-0.059-1.412  l-7.534-7.756c-0.397-0.412-1.016-0.451-1.38-0.08l-1.151,1.186L33.95,51.357z" fill="url(#SVGID_14_)"/>
+</g>
+<g>
+<rect fill="none" height="30" width="30"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15.0005" x2="15.0005" y1="4.5283" y2="27.0492">
+<stop offset="0" style="stop-color:#FF7042"/>
+<stop offset="1" style="stop-color:#991B23"/>
+</linearGradient>
+<path d="M19.018,16.846v-4.316h4.535l-8.512-8.844l-8.592,8.844h4.631v4.316  c0,7.293,6.068,9.467,11.908,9.467v-6.422C21.189,19.891,19.018,19.002,19.018,16.846z" fill="url(#SVGID_1__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15.0005" x2="15.0005" y1="4.0146" y2="12.8168">
+<stop offset="0" style="stop-color:#FFBE82"/>
+<stop offset="1" style="stop-color:#991B23"/>
+</linearGradient>
+<polygon fill="url(#SVGID_2__)" points="15.041,4.508 22.762,12.529 23.553,12.529 15.041,3.686 6.449,12.529 7.248,12.529 "/>
+</g>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_large_voip_received_call.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_large_voip_received_call.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<rect fill="none" height="60" width="60"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="31.3823" x2="31.3823" y1="49.3193" y2="6.7675">
+<stop offset="0" style="stop-color:#004E8C"/>
+<stop offset="1" style="stop-color:#1B66D8"/>
+</linearGradient>
+<circle cx="31.382" cy="28.137" fill="url(#SVGID_1_)" r="21.429"/>
+<radialGradient cx="23.8237" cy="17.7847" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="25.9191">
+<stop offset="0" style="stop-color:#94FFFF"/>
+<stop offset="0.5" style="stop-color:#36B5FF"/>
+<stop offset="1" style="stop-color:#1B66D8"/>
+</radialGradient>
+<path d="M52.262,28.137c0,11.533-9.346,20.877-20.879,20.877c-11.533,0-20.882-9.344-20.882-20.877  c0-11.53,9.35-20.88,20.882-20.88C42.917,7.257,52.262,16.607,52.262,28.137z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="31.3823" x2="31.3823" y1="7.0732" y2="49.1199">
+<stop offset="0" style="stop-color:#31A7F8"/>
+<stop offset="0.497" style="stop-color:#1E74DC"/>
+<stop offset="1" style="stop-color:#88D6EB"/>
+</linearGradient>
+<path d="M31.383,7.257c-11.533,0-20.882,9.35-20.882,20.88c0,11.533,9.35,20.877,20.882,20.877  c11.533,0,20.879-9.344,20.879-20.877C52.262,16.607,42.917,7.257,31.383,7.257z M31.383,47.188  c-10.843,0-19.664-8.818-19.664-19.659c0-10.843,8.82-19.663,19.664-19.663c10.841,0,19.66,8.82,19.66,19.663  C51.043,38.369,42.224,47.188,31.383,47.188z" fill="url(#SVGID_3_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="10.8428" x2="14.1621" y1="30.9775" y2="30.9775">
+<stop offset="0" style="stop-color:#58595B"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M12.462,27.796C12.239,27.5,11.737,27.5,11.516,27.5c-0.437,0-0.669,0.312-0.673,0.616  v0.021l0.001,0.031c-0.001,0.537,0.029,1.14,0.094,1.872c0.013,0.138,0.03,0.276,0.047,0.414l0.024,0.201  c0.056,0.434,0.121,0.86,0.195,1.274l0.034,0.182c0.032,0.164,0.063,0.324,0.098,0.484c0.089,0.406,0.198,0.826,0.332,1.291  c0.02,0.066,0.037,0.133,0.055,0.199c0.028,0.109,0.058,0.217,0.091,0.322l0.005,0.014l0.012,0.033  c-0.003-0.01-0.008-0.023-0.01-0.037l1.198-0.08c0.019-0.188,0.024-0.383,0.019-0.576c-0.01-0.303-0.021-0.676-0.107-0.99  l1.112-1.494l0.12-0.162v-0.203v-1.165v-0.252l-0.179-0.178L12.462,27.796z" fill="url(#SVGID_4_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="17.2432" x2="51.9731" y1="24.897" y2="24.897">
+<stop offset="0" style="stop-color:#58595B"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M51.966,24.045c-0.016-0.079-0.029-0.136-0.043-0.191  c-0.011-0.042-0.021-0.084-0.029-0.125c-0.106-0.495-0.237-1.005-0.392-1.525l-0.017-0.058c-0.033-0.117-0.068-0.234-0.105-0.349  c-0.188-0.588-0.393-1.148-0.608-1.666c-0.027-0.066-0.056-0.125-0.084-0.188l-0.045-0.1c-0.206-0.474-0.436-0.947-0.677-1.403  l-0.03-0.059c-0.047-0.09-0.093-0.181-0.142-0.269c-0.295-0.532-0.604-1.041-0.918-1.512c-0.032-0.049-0.069-0.102-0.106-0.154  c-0.023-0.031-0.045-0.061-0.066-0.092c-0.302-0.437-0.618-0.862-0.946-1.268l-0.064-0.082c-0.044-0.055-0.088-0.111-0.134-0.167  c-0.381-0.456-0.783-0.898-1.199-1.317c-0.056-0.056-0.115-0.115-0.176-0.172l-0.049-0.047c-0.375-0.368-0.774-0.732-1.183-1.074  l-0.081-0.069c-0.041-0.037-0.083-0.073-0.125-0.106c-0.446-0.367-0.931-0.728-1.435-1.075c-0.063-0.042-0.126-0.083-0.19-0.124  l-0.077-0.05c-0.454-0.301-0.928-0.59-1.404-0.853l-0.072-0.042c-0.04-0.023-0.079-0.045-0.119-0.068  c-0.529-0.283-1.081-0.55-1.643-0.792l-0.142-0.057l-0.153-0.063c-0.148-0.061-0.297-0.114-0.443-0.165  c-0.077-0.026-0.152-0.053-0.228-0.08l-0.282-0.105L38.303,8.74c-0.17,0.107-0.84,0.49-1.235,0.715  c-0.438-0.059-1.499-0.192-2.57-0.295c0.33-0.032,0.787-0.069,1.43-0.111l0.09-1.204L35.97,7.832  c-0.039-0.011-0.077-0.021-0.116-0.029l-0.092-0.018l-0.075-0.015c-0.655-0.131-1.271-0.227-1.882-0.291l-0.004-0.001l-0.085-0.009  c-0.698-0.07-1.409-0.106-2.112-0.106c-0.62,0-1.262,0.033-1.964,0.101c-0.109,0.01-0.214,0.021-0.321,0.032  c-0.693,0.078-1.3,0.17-1.873,0.286l-0.02,0.003l-0.015,0.002c-0.604,0.125-1.211,0.281-1.856,0.477  c-0.058,0.018-0.116,0.037-0.173,0.055l-0.131,0.043c-0.547,0.176-1.082,0.371-1.596,0.582c-0.042,0.018-0.071,0.029-0.1,0.04  l-0.078,0.031c-0.564,0.24-1.128,0.512-1.688,0.812c-0.06,0.031-0.118,0.066-0.177,0.099L21.542,9.97  c-0.157,0.087-0.315,0.185-0.473,0.283l-0.203,0.127l-1.118,0.684l1.242,0.415c0.186,0.063,0.385,0.093,0.592,0.093  c0.67,0,1.317-0.329,1.838-0.593c0.209-0.105,0.521-0.264,0.648-0.288c0.152,0.045,0.306,0.068,0.458,0.068  c0.569,0,1.035-0.306,1.446-0.578l0.111-0.072c0.134-0.043,0.362-0.128,0.818-0.299c0.465-0.174,1.314-0.493,1.54-0.546  c0.44-0.005,0.966-0.068,1.339-0.3c0.352,0.058,0.977,0.157,1.619,0.24c-0.047,0.029-0.093,0.059-0.132,0.097  c-0.209,0.192-1.335,0.533-1.68,0.578c-0.647,0.081-0.908,0.408-1.012,0.666c-0.135,0.336-0.054,0.672,0.078,0.946  c-0.245,0.162-0.545,0.342-0.804,0.479c0.001-0.006,0.003-0.012,0.004-0.02c0.093-0.517,0.16-0.89-0.091-1.189  c-0.128-0.153-0.317-0.241-0.519-0.241c-0.295,0-0.525,0.183-0.711,0.362c-0.52,0.502-0.834,1.129-0.952,1.365l-0.022,0.044  l-0.019,0.035c-0.225,0.431-0.317,0.737-0.192,1.688c-0.055,0.04-0.219,0.102-0.445,0.102c-0.03,0-0.058-0.002-0.079-0.003  c-0.146-0.158-0.349-0.248-0.576-0.248l0,0c-0.524,0-1.238,0.589-2.123,1.754l-0.284,0.374l0.289,0.371l0.27,0.343  c-4.216,3.259-4.248,3.444-4.292,3.717c-0.007,0.024-0.044,0.137-0.095,0.293c-0.628,1.952-0.977,3.413-0.637,4.194  c0.784,1.813,1.669,3.505,2.815,3.599c0.101,0.008,0.212,0.012,0.332,0.012c1.051,0,2.753-0.318,3.572-0.485  c0.151,0.283,0.335,0.614,0.438,0.795l0.181,0.323l0.37-0.012c0.004,0,0.199-0.006,0.448-0.006c0.286,0,0.478,0.008,0.602,0.017  c0.446,1.307,1.3,4.317,1.142,4.944L27.272,34.1c-1.441,2.16,0.306,4.975,1.145,6.328c0.066,0.107,0.126,0.203,0.177,0.287  c0.324,0.922,0.716,1.531,1.545,1.531c0.062,0,0.124-0.004,0.188-0.008c0.047-0.002,0.096-0.004,0.146-0.004  c0.092,0,0.157,0.01,0.226,0.035l0.075,0.027l0.08,0.006c0.155,0.014,0.306,0.035,0.453,0.057c0.255,0.035,0.519,0.07,0.788,0.07  c0.721,0,1.293-0.271,1.787-0.855c0.019-0.002,0.036-0.004,0.055-0.006c0.518-0.072,0.712-0.332,0.778-0.564  c0.038-0.039,0.089-0.086,0.131-0.125c0.204-0.188,0.447-0.41,0.615-0.674c0.075-0.045,0.161-0.096,0.258-0.152  c0.167-0.104,0.355-0.217,0.504-0.293c0.131-0.041,0.247-0.117,0.334-0.225c0.209-0.258,0.166-0.549,0.131-0.783  c-0.035-0.242-0.071-0.492,0.06-0.758c0.738-0.355,2.051-1.23,2.263-1.375l-0.001,0.018c-0.014,0.117-0.048,0.43-0.1,0.629  c-0.279,0.279-0.513,0.703-0.586,0.846l-0.049,0.094l-0.015,0.104c-0.019,0.137-0.094,0.85,0.306,1.311  c0.202,0.23,0.49,0.359,0.813,0.359c0.103,0,0.21-0.014,0.319-0.039c1.027-0.232,2.85-2.703,2.998-4.066  c0.072-0.656-0.185-1.172-0.704-1.416l-0.387-0.184l-0.304,0.303l-1.125,1.125c-0.38,0.035-0.678,0.148-0.879,0.326  c0.012-0.48-0.035-0.973-0.086-1.451c-0.155-1.447-0.185-2.369,0.703-2.996l0.045-0.033l0.038-0.039  c0.321-0.326,0.676-0.611,1.052-0.914c0.88-0.707,1.79-1.438,2.332-2.759l0.022-0.056c0.174-0.451,0.437-1.132,0.081-1.651  c-0.089-0.128-0.275-0.327-0.624-0.397c0.462-0.186,0.816-0.332,0.851-0.346l0.107-0.044l0.083-0.08l1.898-1.822l0.278-0.268  l-0.122-0.366c-0.017-0.047-0.12-0.335-0.411-0.747c0.554,0.075,1.029,0.208,1.185,0.326c0.057,0.124,0.171,0.396,0.292,0.683  c2.089,4.924,2.382,5.178,2.926,5.187c0.021,0,0.037,0.002,0.051,0.003c0.044,0.003,0.083,0.005,0.119,0.005  c0.31,0,0.486-0.157,0.564-0.252c0.227-0.274,0.163-0.608,0.14-0.734l-0.009-0.043c-0.025-0.294-0.008-1.618,0.034-2.706  c0.003,0.002,0.004,0.006,0.006,0.01l1.12-0.445L51.966,24.045z M35.508,18.021c-0.087,0.003-0.181,0.008-0.282,0.012  c-0.322,0.015-0.688,0.031-1.053,0.031c-0.955,0-1.174-0.118-1.196-0.131c-0.113-0.082-0.229-0.144-0.35-0.188  c0.216-0.048,0.464-0.214,0.719-0.708c0.251,0.487,0.592,0.917,1.115,0.917c0.142,0,0.277-0.034,0.406-0.101  C35.043,17.856,35.333,17.957,35.508,18.021z M35.133,15.357c-0.072,0-0.131-0.003-0.176-0.007c0.049-0.128,0.107-0.202,0.154-0.244  c0.06,0.093,0.14,0.175,0.232,0.245C35.27,15.355,35.2,15.357,35.133,15.357z M31.331,16.635c0.327,0.641,0.569,0.917,0.762,1.037  c-0.475,0.038-0.833,0.339-1.126,0.625c-0.206-0.068-0.565-0.286-0.672-0.438c-0.063-0.089-0.138-0.166-0.221-0.232  C30.593,17.479,31.049,16.998,31.331,16.635z M29.523,16.163l-0.679-0.033l-2.278-0.111c0.278-0.229,0.541-0.444,0.697-0.57  c0.042-0.015,0.205-0.06,0.605-0.06c0.242,0,0.474,0.017,0.62,0.029L29.523,16.163z" fill="url(#SVGID_5_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<radialGradient cx="24.4912" cy="10.4414" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="23.6744">
+<stop offset="0" style="stop-color:#7AF200"/>
+<stop offset="0.3152" style="stop-color:#7AF200"/>
+<stop offset="0.7273" style="stop-color:#1CAD0F"/>
+<stop offset="1" style="stop-color:#007A3A"/>
+</radialGradient>
+<path d="M11.451,28.125C11.451,28.125,11.451,28.125,11.451,28.125c0,0.008,0.001,0.012,0.001,0.018  c0,0.622,0.039,1.236,0.093,1.844c0.018,0.198,0.047,0.398,0.069,0.598c0.053,0.417,0.116,0.83,0.19,1.238  c0.042,0.215,0.081,0.434,0.127,0.646c0.094,0.422,0.203,0.838,0.321,1.248c0.05,0.17,0.089,0.342,0.141,0.508  c0.007,0.018,0.015,0.033,0.019,0.051c0.017-0.16,0.021-0.326,0.017-0.496c-0.04-1.199-0.232-1.045-0.232-1.045l1.356-1.822v-1.165  l-1.589-1.589C11.964,28.159,11.452,28.079,11.451,28.125z" fill="url(#SVGID_6_)"/>
+<radialGradient cx="24.4868" cy="10.4395" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="23.6775">
+<stop offset="0" style="stop-color:#7AF200"/>
+<stop offset="0.3152" style="stop-color:#7AF200"/>
+<stop offset="0.7273" style="stop-color:#1CAD0F"/>
+<stop offset="1" style="stop-color:#007A3A"/>
+</radialGradient>
+<path d="M24.212,10.099c0.587,0.193,1.066-0.2,1.613-0.549c0.193-0.04,2.338-0.896,2.57-0.896  c0.231,0,1.011-0.03,1.204-0.34c0,0,3.357,0.584,3.863,0.389c0.275-0.107,1.433-0.2,2.425-0.264  c-0.056-0.012-0.106-0.029-0.162-0.041c-0.054-0.011-0.105-0.019-0.161-0.03c-0.623-0.126-1.252-0.226-1.894-0.29  c-0.006,0-0.01,0-0.016-0.002c-0.674-0.068-1.358-0.104-2.052-0.104c-0.644,0-1.277,0.038-1.906,0.098  c-0.11,0.011-0.221,0.022-0.331,0.035c-0.608,0.067-1.211,0.155-1.801,0.274c-0.01,0.003-0.021,0.004-0.031,0.006  c-0.612,0.127-1.213,0.283-1.802,0.464c-0.102,0.03-0.199,0.064-0.302,0.096c-0.522,0.168-1.038,0.356-1.544,0.564  c-0.06,0.026-0.12,0.048-0.18,0.072c-0.557,0.238-1.1,0.501-1.63,0.784c-0.08,0.043-0.156,0.089-0.234,0.134  c-0.227,0.125-0.44,0.267-0.66,0.402C22.273,11.265,23.635,9.904,24.212,10.099z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="24.4863" cy="10.437" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="23.6745">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.3152" style="stop-color:#B2F56E"/>
+<stop offset="0.7273" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M51.366,24.146c-0.021-0.102-0.049-0.197-0.069-0.297c-0.106-0.499-0.233-0.99-0.378-1.474  c-0.038-0.13-0.076-0.264-0.118-0.395c-0.176-0.549-0.371-1.09-0.59-1.616c-0.04-0.093-0.085-0.184-0.125-0.275  c-0.202-0.464-0.421-0.918-0.657-1.363c-0.056-0.106-0.109-0.215-0.166-0.319c-0.279-0.502-0.575-0.993-0.893-1.469  c-0.054-0.083-0.114-0.161-0.17-0.243c-0.291-0.422-0.596-0.831-0.916-1.228c-0.064-0.079-0.127-0.16-0.194-0.24  c-0.368-0.442-0.756-0.868-1.161-1.277c-0.069-0.07-0.143-0.14-0.215-0.208c-0.369-0.363-0.755-0.714-1.153-1.047  c-0.067-0.056-0.131-0.116-0.198-0.171c-0.448-0.366-0.915-0.714-1.395-1.043c-0.084-0.057-0.17-0.112-0.256-0.167  c-0.442-0.294-0.898-0.571-1.366-0.83c-0.063-0.035-0.123-0.073-0.187-0.108c-0.52-0.278-1.05-0.533-1.594-0.768  c-0.097-0.041-0.194-0.079-0.29-0.12c-0.211-0.087-0.432-0.156-0.646-0.235c-0.255,0.163-1.438,0.832-1.438,0.832  s-5.141-0.702-5.491-0.353c-0.352,0.353-1.721,0.71-2.033,0.751c-0.311,0.04-0.956,0.206-0.182,1.161  c-0.116,0.118-2.325,1.657-2.325,0.957s0.494-1.953-0.2-1.282c-0.498,0.482-0.796,1.135-0.86,1.257  c-0.163,0.312-0.263,0.461-0.145,1.357s-1.43,0.891-1.534,0.659c-0.276-0.622-1.809,1.394-1.809,1.394l0.646,0.828  c0,0-4.51,3.474-4.548,3.707c-0.04,0.234-1.164,3.25-0.775,4.147c0.39,0.897,1.376,3.158,2.307,3.233  c1.222,0.101,4.186-0.559,4.186-0.559c0.08,0.196,0.638,1.189,0.638,1.189s1.453-0.048,1.534,0.11  c0.026,0.053,1.75,5.122,1.182,5.794c-1.357,2.033,0.775,5.012,1.369,6.02c0.594,1.73,0.977,0.955,1.758,1.238  c0.962,0.084,1.772,0.439,2.589-0.611c0.237-0.195,0.641-0.041,0.641-0.313c0-0.152,0.698-0.598,0.878-1.018  c0.188-0.088,0.674-0.414,1.003-0.572c0.299-0.02-0.283-0.82,0.309-1.666c0.64-0.252,2.364-1.414,2.364-1.414  c0.078-1.705-0.839-3.811,0.873-5.02c1.104-1.126,2.553-1.767,3.255-3.479c0.194-0.506,0.628-1.542-0.619-1.231  c-1.173,0.295-2.48,0.362-1.861-0.154c-0.071-0.634-0.85-0.932-1.55-1.552c-0.361-0.854-0.93-2.378-0.93-2.378l-1.24-1.885  l0.155-0.389l1.474,2.171l1.474,1.781c0.542,1.783,1.007,1.939,1.007,1.939c0.815-0.288,2.753-1.086,2.753-1.086l1.898-1.822  c0,0-0.195-0.581-0.967-1.316l-0.584-0.349c-0.126,0.357-0.802,0.491-0.802,0.491l-1.641-1.964l0.61-0.123l0.471,0.896l1.128,0.39  c0,0,0.313-0.229,0.893,0.371c0.473-0.039,2.318,0.09,2.749,0.636c0.085,0.109,2.287,5.607,2.721,5.614  c0.19,0.002,0.329,0.077,0.267-0.256c-0.078-0.156,0-3.609,0.116-4.349c0.295-0.628,0.343-0.003,1.04,1.188  C51.374,24.204,51.372,24.175,51.366,24.146z M31.993,10.823c0.154-0.459,1.047-0.615,1.047-0.615s-0.256,0.473-0.197,0.716  c0.06,0.247-0.407,0.402-0.46,0.982c-0.051,0.578-1.117,0.239-1.204,0.036C31.09,11.74,31.835,11.281,31.993,10.823z M35.816,18.624  c-0.661,0-2.645,0.196-3.19-0.194c-0.546-0.389-0.97,0.04-1.362,0.43c-0.258,0.253-1.193-0.26-1.468-0.649  c-0.271-0.39-1.188-0.361-1.188-0.361l0.208-1.111l-2.637-0.128l-1.499,0.439l-1.41,0.041l0.79-0.376l0.983-0.232  c0,0,1.431-1.176,1.859-1.526c0.363-0.297,1.811-0.129,1.811-0.129l1.589,1.146c0,0-0.353,0.898-0.508,1.091  c0.583-0.039,1.269-1.099,1.269-1.099c-1.239-1.138-1.188-1.524-1.188-1.524l1.633,1.146l0.016,0.01c0,0,0.661,1.558,0.937,1.558  c0.271,0,0.619-1.073,0.619-1.073l0.465-0.117c0.207,0.492,0.595,1.603,1.059,1.343c0.269-0.147,0.71-0.013,1.215,0.181  c0.509,0.195,0.854-0.104,1.267,0.258C37.03,19.349,36.089,18.702,35.816,18.624z M36.853,15.943  c-0.681-0.259-2.984,0.586-2.47-0.796c0.275-0.746,0.981-0.901,1.223-0.405c0.063,0.204,0.83,0.519,0.824,0.09  c-0.006-0.431,0.771-0.659,0.883-0.338C36.899,14.791,38.932,16.341,36.853,15.943z M41.192,17.252  c-0.377-0.304,0.169-0.564-0.387-1.041c-0.798-0.684-1.421-0.978-0.334-1.532c1.341-0.168,0.218,0.428,0.44,0.786  c0.119,0.19,0.796,0.828,1.325,1.61C42.676,17.725,41.567,17.555,41.192,17.252z" fill="url(#SVGID_8_)"/>
+<radialGradient cx="24.4839" cy="10.4453" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="23.6688">
+<stop offset="0" style="stop-color:#7AF200"/>
+<stop offset="0.3152" style="stop-color:#7AF200"/>
+<stop offset="0.7273" style="stop-color:#1CAD0F"/>
+<stop offset="1" style="stop-color:#007A3A"/>
+</radialGradient>
+<path d="M41.733,35.008l-1.293,1.291c0,0-0.778,0-0.815,0.313c-0.017,0.133-0.063,0.709-0.192,1.006  c-0.258,0.18-0.569,0.775-0.569,0.775s-0.158,1.15,0.699,0.953C40.42,39.152,43.059,35.633,41.733,35.008z" fill="url(#SVGID_9_)"/>
+<path d="M31.68,48.668c1.546,0,3.049-0.174,4.499-0.49c-0.039-0.049-0.071-0.1-0.114-0.145  l-7.534-7.756c-0.434-0.447-1.031-0.705-1.638-0.705c-0.57,0-1.102,0.221-1.5,0.625l-1.144,1.18l-0.472,0.477l-0.436,0.447  c-1.654-1.605-3.133-3.443-4.739-5.873c-0.888-1.348-1.653-2.988-2.138-4.123l-0.178-0.424c-0.001,0-0.242-0.598-0.324-0.811  l-0.027-0.068c-0.067-0.176-0.127-0.341-0.184-0.5l-0.025-0.069l1.843-0.641c1.017-0.344,1.593-1.403,1.363-2.555l-0.007-0.036  l-1.154-3.523l-2.274-6.787c-0.162-0.486-0.47-0.886-0.858-1.16c-2.416,3.407-3.841,7.565-3.841,12.059  C10.797,39.322,20.147,48.668,31.68,48.668z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M31.68,48.668c1.301,0,2.57-0.125,3.806-0.352l-7.394-7.613c-0.32-0.33-0.758-0.52-1.199-0.52  c-0.404,0-0.779,0.156-1.061,0.441l-1.148,1.182l-0.467,0.473l-0.424,0.436l0.003,0.004l-0.435,0.445  c-1.866-1.736-3.509-3.734-5.269-6.4c-0.91-1.381-1.694-3.059-2.192-4.221l-0.158-0.375l-0.024-0.059c0,0-0.243-0.602-0.327-0.816  l-0.029-0.072c-0.068-0.18-0.129-0.347-0.19-0.513c0,0-0.12-0.337-0.145-0.41l0.071-0.295l2.272-0.791  c0.721-0.244,1.127-1.009,0.966-1.819l-0.007-0.036l-1.142-3.485l-2.274-6.789c-0.119-0.357-0.343-0.65-0.626-0.851  c-2.204,3.31-3.492,7.283-3.492,11.557C10.797,39.322,20.147,48.668,31.68,48.668z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<radialGradient cx="-859.7427" cy="-265.1074" gradientTransform="matrix(0.9999 -0.0111 0.0111 0.9999 905.1068 277.0371)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="34.2211">
+<stop offset="0" style="stop-color:#E9F0F2"/>
+<stop offset="0.8364" style="stop-color:#E9F0F2"/>
+<stop offset="0.8909" style="stop-color:#AAB1B5"/>
+<stop offset="0.9515" style="stop-color:#7C878C"/>
+<stop offset="1" style="stop-color:#838F94"/>
+</radialGradient>
+<path d="M23.387,44.016c-2.39-2.133-4.191-4.469-5.806-6.914c-1.552-2.357-2.958-5.889-3.393-7.428  l-6.272-8.836c-0.357,0.592-0.921,2.715-0.661,5.588c0.262,2.872,2.939,9.828,6.083,14.596c3.146,4.766,7.81,9.248,9.374,10.24  c2.462,1.561,5.427,2.074,6.329,2.029c0,0,0.833-0.098,1.97-0.496C31.5,52.625,23.387,44.016,23.387,44.016z" fill="url(#SVGID_10_)"/>
+<path d="M15.369,32.857c-0.55-1.283-0.976-2.456-1.18-3.184l-6.104-8.599c-0.064,0.09-0.099,0.144-0.099,0.144  c-0.104,0.172-0.22,0.458-0.338,0.813c-0.118,0.599-0.177,1.219-0.167,1.854C7.541,28.374,10.936,32.078,15.369,32.857z" fill-opacity="0.05" stroke-opacity="0.05"/>
+<path d="M15.108,32.234c-0.423-1.033-0.749-1.953-0.919-2.561l-6.125-8.627c-0.069,0.101-0.109,0.161-0.109,0.161  c-0.097,0.162-0.208,0.434-0.318,0.769c-0.111,0.567-0.168,1.151-0.159,1.751C7.536,28.033,10.834,31.572,15.108,32.234z" fill-opacity="0.05" stroke-opacity="0.05"/>
+<path d="M7.907,21.188c-0.088,0.148-0.188,0.394-0.289,0.698c-0.102,0.514-0.152,1.046-0.144,1.59  c0.054,4.01,3.21,7.283,7.24,7.757c-0.232-0.618-0.412-1.157-0.526-1.559l-6.154-8.67C7.951,21.121,7.907,21.188,7.907,21.188z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<radialGradient cx="-891.105" cy="-262.4795" gradientTransform="matrix(1.0009 -0.0086 0.0135 0.9911 906.6143 271.6763)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="11.8382">
+<stop offset="0" style="stop-color:#D1D8D9"/>
+<stop offset="0.0424" style="stop-color:#D1D8D9"/>
+<stop offset="0.4" style="stop-color:#BBC0C2"/>
+<stop offset="0.7333" style="stop-color:#7C8C91"/>
+<stop offset="1" style="stop-color:#A7B3B7"/>
+</radialGradient>
+<path d="M14.188,29.674l1.312-0.461c0,0-2.781-12.441-3.885-11.868c-0.555,0.29-0.549,0.448-1.11,0.853  c-1.676,1.219-2.589,2.641-2.589,2.641c-0.077,0.13-0.165,0.345-0.252,0.613c-0.088,0.45-0.134,0.916-0.128,1.392  c0.05,3.62,2.979,6.563,6.661,6.841C14.194,29.681,14.189,29.677,14.188,29.674z" fill="url(#SVGID_11_)"/>
+<path d="M23.289,45.25c-0.259,0.727-0.4,1.498-0.39,2.303c0.025,1.906,0.882,3.621,2.242,4.898  c1.716,0.641,3.287,0.871,3.9,0.84c0,0,0.833-0.098,1.97-0.496c0.409-0.143-5.222-6.213-7.055-8.172L23.289,45.25z" fill-opacity="0.05" stroke-opacity="0.05"/>
+<path d="M23.448,44.59c-0.261,0.725-0.401,1.496-0.391,2.301c0.036,2.613,1.621,4.875,3.95,6.125  c0.771,0.18,1.418,0.264,1.829,0.275c0.011,0,0.026,0.002,0.037,0c0,0,0.832-0.096,1.972-0.494c0.422-0.148-5.624-6.641-7.233-8.363  L23.448,44.59z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<radialGradient cx="-877.4263" cy="-238.3691" gradientTransform="matrix(1.0009 -0.0086 0.0135 0.9911 906.6143 271.6763)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="12.0474">
+<stop offset="0" style="stop-color:#D1D8D9"/>
+<stop offset="0.0424" style="stop-color:#D1D8D9"/>
+<stop offset="0.4" style="stop-color:#BBC0C2"/>
+<stop offset="0.7333" style="stop-color:#7C8C91"/>
+<stop offset="1" style="stop-color:#A7B3B7"/>
+</radialGradient>
+<path d="M32.6,52.1c0.653-0.35,0.819-0.34,1.351-0.74c0.98-0.74-8.83-9.123-8.83-9.123l-1.712,1.756  c-0.229,0.695-0.355,1.434-0.345,2.203c0.051,3.766,3.219,6.797,7.107,6.857C30.828,52.877,31.693,52.584,32.6,52.1z" fill="url(#SVGID_12_)"/>
+<path d="M14.866,29.428l0.634-0.215c0,0-2.781-12.441-3.885-11.868  c-0.291,0.151-0.427,0.268-0.573,0.401L14.866,29.428z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(0.9999 -0.0111 0.0111 0.9999 905.1068 277.0361)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="-889.625" x2="-885.2537" y1="-270.9771" y2="-257.0911">
+<stop offset="0" style="stop-color:#E9F0F2"/>
+<stop offset="0.0424" style="stop-color:#E9F0F2"/>
+<stop offset="0.4" style="stop-color:#D4D9DB"/>
+<stop offset="0.7333" style="stop-color:#98AAAD"/>
+<stop offset="1" style="stop-color:#D0DADE"/>
+</linearGradient>
+<path d="M15.5,29.214l1.677-0.583c0.435-0.147,0.659-0.629,0.562-1.119l-1.129-3.446l-2.275-6.79  c-0.177-0.533-0.71-0.836-1.188-0.676c0,0-0.429,0.175-1.529,0.747L15.5,29.214z" fill="url(#SVGID_13_)"/>
+<path d="M25.121,42.236l-0.468,0.473l8.748,9.039c0.188-0.131,0.379-0.26,0.55-0.389  C34.931,50.619,25.121,42.236,25.121,42.236z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<linearGradient gradientTransform="matrix(0.9999 -0.0111 0.0111 0.9999 905.1068 277.0366)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="-876.2178" x2="-867.1104" y1="-245.4277" y2="-235.398">
+<stop offset="0" style="stop-color:#E9F0F2"/>
+<stop offset="0.0424" style="stop-color:#E9F0F2"/>
+<stop offset="0.4" style="stop-color:#D4D9DB"/>
+<stop offset="0.7333" style="stop-color:#98AAAD"/>
+<stop offset="1" style="stop-color:#D0DADE"/>
+</linearGradient>
+<path d="M33.95,51.357c0.978-0.738,1.295-1.059,1.295-1.059c0.364-0.373,0.338-1.002-0.059-1.412  l-7.534-7.756c-0.397-0.412-1.016-0.451-1.38-0.08l-1.151,1.186L33.95,51.357z" fill="url(#SVGID_14_)"/>
+</g>
+<g>
+<linearGradient gradientTransform="matrix(1 1.000000e-004 -1.000000e-004 1 -2.3655 -29.0779)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="17.3926" x2="17.3926" y1="32.2334" y2="55.3194">
+<stop offset="0" style="stop-color:#C6FF45"/>
+<stop offset="0.7273" style="stop-color:#66A00E"/>
+<stop offset="1" style="stop-color:#387300"/>
+</linearGradient>
+<polygon fill="url(#SVGID_1__)" points="4.648,15.727 14.942,26.471 25.397,15.714 19.763,15.712 19.759,3.417 10.166,3.416   10.166,15.726 "/>
+<line fill="#1D4489" x1="19.759" x2="10.166" y1="3.421" y2="3.42"/>
+<polygon fill="#E7FFB9" points="10.166,3.17 19.76,3.171 19.759,3.671 10.166,3.67 10.166,3.17 "/>
+<polygon fill="#E7FFB9" points="19.612,15.732 25.505,15.733 25.059,16.233 19.612,16.233 19.612,15.732 "/>
+<polygon fill="#E7FFB9" points="4.321,15.726 10.157,15.726 10.157,16.226 4.848,16.226 4.321,15.726 "/>
+<linearGradient gradientTransform="matrix(1 1.000000e-004 -1.000000e-004 1 -2.3655 -29.0779)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="26.5625" x2="7.7312" y1="50.3418" y2="50.3418">
+<stop offset="0" style="stop-color:#AAE535"/>
+<stop offset="1" style="stop-color:#5D9C0A"/>
+</linearGradient>
+<polygon fill="url(#SVGID_2__)" points="25.072,15.713 14.942,26.112 4.925,15.7 4.229,15.701 14.941,26.83 25.771,15.713 "/>
+<rect fill="none" height="30" width="30"/>
+</g>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_large_waiting_call.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_large_waiting_call.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20.3613" x2="26.6141" y1="20.2744" y2="26.4485">
+<stop offset="0" style="stop-color:#FEE16E"/>
+<stop offset="0.5939" style="stop-color:#D96900"/>
+<stop offset="1" style="stop-color:#FED43A"/>
+</linearGradient>
+<path d="M19.081,33.911c2.089-3.597,4.591-6.497,7.281-9.189c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282  c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595  c-1.343,3.541-1.221,7.445-0.929,8.581c0,0,0.34,1.034,1.144,2.377C10.248,46.476,19.081,33.911,19.081,33.911z" fill="url(#SVGID_1_)"/>
+<path d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46  c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27  C34.843,9.673,31.019,14.958,31.184,20.8z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
+<path d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253  C35.275,9.576,31.636,14.695,31.906,20.306z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231  c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<radialGradient cx="43.6406" cy="10.1128" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="13.348">
+<stop offset="0" style="stop-color:#FEE16E"/>
+<stop offset="0.6061" style="stop-color:#F1830A"/>
+<stop offset="1" style="stop-color:#FED43A"/>
+</radialGradient>
+<path d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263  c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201  c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z" fill="url(#SVGID_2_)"/>
+<path d="M17.483,34.106c-0.988-0.14-2.007-0.119-3.027,0.105c-2.418,0.53-4.376,2.066-5.646,4.131  c-0.367,2.35-0.25,4.407-0.05,5.18c0,0,0.34,1.034,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.106z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M18.366,34.136c-0.989-0.14-2.008-0.118-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623  c-0.026,1.025,0.034,1.872,0.127,2.397c0.003,0.013,0.005,0.034,0.01,0.048c0,0,0.34,1.033,1.144,2.379  c0.3,0.498,6.981-8.888,8.75-11.384L18.366,34.136z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
+<radialGradient cx="437.4258" cy="-571.231" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.6198">
+<stop offset="0" style="stop-color:#FEE16E"/>
+<stop offset="0.6061" style="stop-color:#F1830A"/>
+<stop offset="1" style="stop-color:#FED43A"/>
+</radialGradient>
+<path d="M11.202,47.738c0.616,0.74,0.646,0.954,1.295,1.524c1.194,1.055,9.301-13.612,9.301-13.612  l-2.683-1.719c-0.941-0.111-1.914-0.079-2.89,0.136c-4.777,1.048-7.806,5.868-6.87,10.832C9.749,45.686,10.349,46.71,11.202,47.738z  " fill="url(#SVGID_3_)"/>
+<path d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749  C35.853,20.016,50.953,13.231,49.937,11.978z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
+<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="422.2881" x2="427.4786" y1="-610.9287" y2="-594.4409">
+<stop offset="0" style="stop-color:#FEE16E"/>
+<stop offset="0.7576" style="stop-color:#D96900"/>
+<stop offset="1" style="stop-color:#FED43A"/>
+</linearGradient>
+<path d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668  c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z" fill="url(#SVGID_4_)"/>
+<path d="M21.798,35.65l-0.725-0.472l-9.215,13.486c0.216,0.204,0.43,0.414,0.639,0.598  C13.691,50.317,21.798,35.65,21.798,35.65z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
+<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="439.6982" x2="451.5232" y1="-577.7549" y2="-564.7323">
+<stop offset="0" style="stop-color:#FEE16E"/>
+<stop offset="0.7576" style="stop-color:#D96900"/>
+<stop offset="1" style="stop-color:#FED43A"/>
+</linearGradient>
+<path d="M12.498,49.262c1.193,1.05,1.686,1.37,1.686,1.37c0.567,0.367,1.363,0.169,1.781-0.442l7.9-11.605  c0.419-0.614,0.307-1.411-0.26-1.777l-1.808-1.156L12.498,49.262z" fill="url(#SVGID_5_)"/>
+<rect fill="none" height="60" width="60"/>
+</g>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_mono_ciphering_off.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/bubblemanager2/bubblecore/themes/icons/hbdefault/scalable/qtg_mono_ciphering_off.svg	Fri Apr 16 14:58:25 2010 +0300
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="8.005" version="1.1" viewBox="0 0 9 8.005" width="9" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<path d="M7.029,3.005V1c0-0.553-0.446-1-1-1L4,0.005v0.997c0.492-0.001,1.326,0,1.375,0.001c0.006,0,0.01,0.001,0.017,0.001   C6.008,1.022,6.01,1.15,6.01,2L6.002,3.005H1v5h7v-5H7.029z M5,7.005H4v-3h1V7.005z"/>
+<rect fill="none" height="8" width="9" y="0.005"/>
+</g>
+</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblestyle/bubblestyle.qrc
--- a/phoneuis/bubblemanager2/bubblestyle/bubblestyle.qrc	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/bubblestyle/bubblestyle.qrc	Fri Apr 16 14:58:25 2010 +0300
@@ -1,18 +1,9 @@
 <RCC>
     <qresource prefix="/">
-        <file>resources/qgn_indi_call_diverted.svg</file>
+        <file alias="qgn_indi_call_diverted.svg">resources/qgn_indi_call_diverted.svg</file>
         <file alias="bubbleparticipantlistitem.widgetml">layout/bubbleparticipantlistitem.widgetml</file>
         <file alias="bubbleparticipantlistitem.css">layout/bubbleparticipantlistitem.css</file>
         <file alias="bubbleheadingwidget.widgetml">layout/bubbleheadingwidget.widgetml</file>
         <file alias="bubbleheadingwidget.css">layout/bubbleheadingwidget.css</file>
-        <file alias="pri_large_red_handset.svg">resources/pri_large_red_handset.svg</file>
-        <file alias="pri_large_green_handset.svg">resources/pri_large_green_handset.svg</file>
-        <file alias="pri_large_yellow_handset.svg">resources/pri_large_yellow_handset.svg</file>
-        <file alias="qtg_large_voip_dialled_call.svg">resources/qtg_large_voip_dialled_call.svg</file>
-        <file alias="qtg_large_voip_missed_call.svg">resources/qtg_large_voip_missed_call.svg</file>
-        <file alias="qtg_large_voip_received_call.svg">resources/qtg_large_voip_received_call.svg</file>
-        <file alias="qtg_large_video_dialled_call.svg">resources/qtg_large_video_dialled_call.svg</file>
-        <file alias="qtg_large_video_missed_call.svg">resources/qtg_large_video_missed_call.svg</file>
-        <file alias="qtg_large_video_received_call.svg">resources/qtg_large_video_received_call.svg</file> 
     </qresource>
 </RCC>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblestyle/layout/bubbleheadingwidget.css
--- a/phoneuis/bubblemanager2/bubblestyle/layout/bubbleheadingwidget.css	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/bubblestyle/layout/bubbleheadingwidget.css	Fri Apr 16 14:58:25 2010 +0300
@@ -1,3 +1,4 @@
+
 
 BubbleHeadingWidget[layoutOption="three_lines"]
 {
@@ -16,45 +17,48 @@
 
 BubbleHeadingWidget:text_line_1
 {
-    preferred-height: 4un;
+    preferred-height: var(hb-param-text-height-primary);
+    left: -var(hb-param-margin-gene-middle-horizontal);
 }
 
 BubbleHeadingWidget:text_line_2[layoutOption!="one_line"]
 {
-    preferred-height: 4un;
+    preferred-height: var(hb-param-text-height-primary);
+    preferred-width: -1;
+    left: -var(hb-param-margin-gene-middle-horizontal);
+    top: -var(hb-param-margin-gene-middle-vertical);
+    text-align: left;
 }
 
 BubbleHeadingWidget:text_line_2[layoutOption="one_line"]
 {
-    preferred-height: 4un;
-    fixed-width:  23un;
+    preferred-height: var(hb-param-text-height-primary);
+    preferred-width: 30un;
+    left: -var(hb-param-margin-gene-middle-horizontal);
+    text-align: right;
 }
 
 BubbleHeadingWidget:text_line_3
 {
-    preferred-height: 4un;
+    preferred-height: var(hb-param-text-height-primary);
+    left: -var(hb-param-margin-gene-middle-horizontal);
+    top: -var(hb-param-margin-gene-middle-vertical);
 }
 
-BubbleHeadingWidget:status_icon[layoutOption!="one_line"]
+BubbleHeadingWidget:status_icon
 {
-    fixed-width:   8un;
-    fixed-height:  8un;
+    fixed-width:   var(hb-param-graphic-size-primary-large);
+    fixed-height:  var(hb-param-graphic-size-primary-large);
 }
 
-BubbleHeadingWidget:number_type_icon[layoutOption!="one_line"]
+BubbleHeadingWidget:number_type_icon
 {
-    fixed-height: 3un;
-    fixed-width:  3un;
+    fixed-height: var(hb-param-graphic-size-secondary);
+    fixed-width:  var(hb-param-graphic-size-secondary);
 }
 
-BubbleHeadingWidget:status_icon[layoutOption="one_line"]
+BubbleHeadingWidget:ciphering_icon
 {
-    fixed-width:   8un;
-    fixed-height:  8un;
+    fixed-height: 2.5un;
+    fixed-width:  2.5un;
 }
-
-BubbleHeadingWidget:number_type_icon[layoutOption="one_line"]
-{
-    fixed-height: 3un;
-    fixed-width:  3un;
-}
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblestyle/layout/bubbleheadingwidget.widgetml
--- a/phoneuis/bubblemanager2/bubblestyle/layout/bubbleheadingwidget.widgetml	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/bubblestyle/layout/bubbleheadingwidget.widgetml	Fri Apr 16 14:58:25 2010 +0300
@@ -3,67 +3,61 @@
     <meshitem src="status_icon" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
     <meshitem src="status_icon" srcEdge="TOP" dst="" dstEdge="TOP"/>
     
-    <meshitem src="number_type_icon" srcEdge="RIGHT" dst="status_icon" dstEdge="RIGHT" spacing="0.75un"/>
-    <meshitem src="number_type_icon" srcEdge="BOTTOM" dst="status_icon" dstEdge="BOTTOM" spacing="0.75un"/>
+    <meshitem src="number_type_icon" srcEdge="RIGHT" dst="status_icon" dstEdge="RIGHT"/>
+    <meshitem src="number_type_icon" srcEdge="BOTTOM" dst="status_icon" dstEdge="BOTTOM"/>
     
-    <meshitem src="text_line_1" srcEdge="LEFT" dst="status_icon" dstEdge="RIGHT" spacing="-0.75un"/>
-    <meshitem src="text_line_1" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
-    <meshitem src="text_line_1" srcEdge="TOP" dst="" dstEdge="TOP" spacing=""/>
+    <meshitem src="ciphering_icon" srcEdge="LEFT" dst="status_icon" dstEdge="LEFT"/>
+    <meshitem src="ciphering_icon" srcEdge="TOP" dst="status_icon" dstEdge="TOP"/>    
     
-    <meshitem src="text_line_2" srcEdge="LEFT" dst="status_icon" dstEdge="RIGHT" spacing="-0.75un"/>
-    <meshitem src="text_line_2" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
-    <meshitem src="text_line_2" srcEdge="TOP" dst="text_line_1" dstEdge="BOTTOM" spacing="-0.75un"/>
+    <meshitem src="text_line_1" srcEdge="LEFT" dst="status_icon" dstEdge="RIGHT"/>
+    <meshitem src="text_line_1" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
+    <meshitem src="text_line_1" srcEdge="TOP" dst="" dstEdge="TOP"/>
     
-    <meshitem src="text_line_3" srcEdge="LEFT" dst="status_icon" dstEdge="RIGHT" spacing="-0.75un"/>
+    <meshitem src="text_line_2" srcEdge="TOP" dst="text_line_1" dstEdge="BOTTOM"/>
+    <meshitem src="text_line_2" srcEdge="LEFT" dst="status_icon" dstEdge="RIGHT"/>
+    <meshitem src="text_line_2" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
+    
+    <meshitem src="text_line_3" srcEdge="TOP" dst="text_line_2" dstEdge="BOTTOM"/>
+    <meshitem src="text_line_3" srcEdge="LEFT" dst="status_icon" dstEdge="RIGHT"/>
     <meshitem src="text_line_3" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
-    <meshitem src="text_line_3" srcEdge="TOP" dst="text_line_2" dstEdge="BOTTOM" spacing="-0.75un"/>        
   </layout>
 
   <layout name="two_lines_layout" type="mesh">
     <meshitem src="status_icon" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
     <meshitem src="status_icon" srcEdge="TOP" dst="" dstEdge="TOP"/>
     
-    <meshitem src="number_type_icon" srcEdge="RIGHT" dst="status_icon" dstEdge="RIGHT" spacing="0.75un"/>
-    <meshitem src="number_type_icon" srcEdge="BOTTOM" dst="status_icon" dstEdge="BOTTOM" spacing="0.75un"/>
+    <meshitem src="number_type_icon" srcEdge="RIGHT" dst="status_icon" dstEdge="RIGHT"/>
+    <meshitem src="number_type_icon" srcEdge="BOTTOM" dst="status_icon" dstEdge="BOTTOM"/>
+
+    <meshitem src="ciphering_icon" srcEdge="LEFT" dst="status_icon" dstEdge="LEFT"/>
+    <meshitem src="ciphering_icon" srcEdge="TOP" dst="status_icon" dstEdge="TOP"/>    
     
-    <meshitem src="text_line_1" srcEdge="LEFT" dst="status_icon" dstEdge="RIGHT" spacing="-0.75un"/>
+    <meshitem src="text_line_1" srcEdge="LEFT" dst="status_icon" dstEdge="RIGHT"/>
     <meshitem src="text_line_1" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
-    <meshitem src="text_line_1" srcEdge="TOP" dst="" dstEdge="TOP" spacing="-0.75"/>
+    <meshitem src="text_line_1" srcEdge="TOP" dst="" dstEdge="TOP"/>
     
-    <meshitem src="text_line_2" srcEdge="LEFT" dst="status_icon" dstEdge="RIGHT" spacing="-0.75un"/>
+    <meshitem src="text_line_2" srcEdge="LEFT" dst="status_icon" dstEdge="RIGHT"/>
     <meshitem src="text_line_2" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
-    <meshitem src="text_line_2" srcEdge="TOP" dst="text_line_1" dstEdge="BOTTOM" spacing="-0.75"/>
+    <meshitem src="text_line_2" srcEdge="TOP" dst="text_line_1" dstEdge="BOTTOM"/>
   </layout>
 
   <layout name="one_line_layout" type="mesh">
     <meshitem src="status_icon" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
-    <meshitem src="status_icon" srcEdge="TOP" dst="" dstEdge="TOP"/>
+    <meshitem src="status_icon" srcEdge="CENTERV" dst="" dstEdge="CENTERV"/>
     
-    <meshitem src="number_type_icon" srcEdge="RIGHT" dst="status_icon" dstEdge="RIGHT" spacing="0.75un"/>
-    <meshitem src="number_type_icon" srcEdge="BOTTOM" dst="status_icon" dstEdge="BOTTOM" spacing="0.75un"/>
+    <meshitem src="number_type_icon" srcEdge="RIGHT" dst="status_icon" dstEdge="RIGHT"/>
+    <meshitem src="number_type_icon" srcEdge="BOTTOM" dst="status_icon" dstEdge="BOTTOM"/>
     
-    <meshitem src="text_line_1" srcEdge="LEFT" dst="status_icon" dstEdge="RIGHT" spacing="-0.75un"/>
-    <meshitem src="text_line_1" srcEdge="TOP" dst="" dstEdge="TOP" spacing="-0.75un"/>
-    <meshitem src="text_line_1" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="24.0un"/>
+    <meshitem src="ciphering_icon" srcEdge="LEFT" dst="status_icon" dstEdge="LEFT"/>
+    <meshitem src="ciphering_icon" srcEdge="TOP" dst="status_icon" dstEdge="TOP"/>    
     
-    <meshitem src="text_line_2" srcEdge="TOP" dst="" dstEdge="TOP" spacing="-0.75un"/>
-    <meshitem src="text_line_2" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="10.0"/>
+    <meshitem src="text_line_1" srcEdge="LEFT" dst="status_icon" dstEdge="RIGHT"/>
+    <meshitem src="text_line_1" srcEdge="CENTERV" dst="" dstEdge="CENTERV"/>
+    <meshitem src="text_line_1" srcEdge="RIGHT" dst="text_line_2" dstEdge="LEFT"/>
+    
+    <meshitem src="text_line_2" srcEdge="CENTERV" dst="" dstEdge="CENTERV"/>
+    <meshitem src="text_line_2" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
   </layout>
   
 </hbwidget>
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblestyle/layout/bubbleparticipantlistitem.css
--- a/phoneuis/bubblemanager2/bubblestyle/layout/bubbleparticipantlistitem.css	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/bubblestyle/layout/bubbleparticipantlistitem.css	Fri Apr 16 14:58:25 2010 +0300
@@ -8,16 +8,36 @@
 }
 
 BubbleParticipantListItem::icon {
-    fixed-width: 5un;
-    fixed-height: 5un;
+    fixed-width: var(hb-param-graphic-size-primary-medium);
+    fixed-height: var(hb-param-graphic-size-primary-medium);
+}
+
+BubbleParticipantListItem::ciphering {
+    fixed-width: 2.0un;
+    fixed-height: 2.0un;
+    left: (hb-param-margin-gene-middle-horizontal);
+    top: (hb-param-margin-gene-middle-vertical)
+}
+
+BubbleParticipantListItem::expand-indi {
+    fixed-width: var(hb-param-graphic-size-primary-small);
+    fixed-height: var(hb-param-graphic-size-primary-small);
+    right: var(hb-param-margin-gene-middle-horizontal);
+}
+
+BubbleHeadingWidget:text
+{
+    preferred-height: var(hb-param-text-height-primary);
+	  left: var(hb-param-margin-gene-middle-horizontal);
+	  right: var(hb-param-margin-gene-middle-horizontal);
 }
 
 BubbleParticipantListItem::button-1 {
-    fixed-height: 10un;
+    fixed-height: 9.0un;
 }
 
 BubbleParticipantListItem::button-2 {
-    fixed-height: 10un;
+    fixed-height: 9.0un;
 }
 
 BubbleParticipantListItem::background{
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblestyle/layout/bubbleparticipantlistitem.widgetml
--- a/phoneuis/bubblemanager2/bubblestyle/layout/bubbleparticipantlistitem.widgetml	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/bubblestyle/layout/bubbleparticipantlistitem.widgetml	Fri Apr 16 14:58:25 2010 +0300
@@ -2,44 +2,54 @@
 
   <layout name="collapsed" type="mesh">
     
-    <meshitem src="icon" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="icon" srcEdge="RIGHT" dst="text" dstEdge="LEFT" />
-    <meshitem src="icon" srcEdge="CENTERV" dst="" dstEdge="CENTERV" />
+    <meshitem src="icon" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
+    <meshitem src="icon" srcEdge="CENTERV" dst="" dstEdge="CENTERV"/>
+    
+    <meshitem src="ciphering" srcEdge="LEFT" dst="icon" dstEdge="LEFT"/>
+    <meshitem src="ciphering" srcEdge="TOP" dst="icon" dstEdge="TOP"/>
 
-    <meshitem src="text" srcEdge="LEFT" dst="icon" dstEdge="RIGHT" />
-    <meshitem src="text" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="text" srcEdge="CENTERV" dst="" dstEdge="CENTERV" />
+    <meshitem src="text" srcEdge="LEFT" dst="icon" dstEdge="RIGHT"/>
+    <meshitem src="text" srcEdge="RIGHT" dst="expand-indi" dstEdge="LEFT"/>
+    <meshitem src="text" srcEdge="CENTERV" dst="" dstEdge="CENTERV"/>
     
-    <meshitem src="background" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="background" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="background" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="background" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+    <meshitem src="expand-indi" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
+    <meshitem src="expand-indi" srcEdge="CENTERV" dst="" dstEdge="CENTERV"/>
+    
+    <meshitem src="background" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
+    <meshitem src="background" srcEdge="TOP" dst="" dstEdge="TOP"/>
+    <meshitem src="background" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
+    <meshitem src="background" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM"/>
 
   </layout>
   
   <layout name="expanded" type="mesh">
     
-    <meshitem src="icon" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="icon" srcEdge="RIGHT" dst="text" dstEdge="LEFT" />
-    <meshitem src="icon" srcEdge="TOP" dst="" dstEdge="TOP" spacing="-1.5un" />
-    <meshitem src="icon" srcEdge="BOTTOM" dst="button-1" dstEdge="TOP" spacing="1.0un" />
+    <meshitem src="icon" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
+    <meshitem src="icon" srcEdge="TOP" dst="" dstEdge="TOP" spacing="-1.5un"/>
+    <meshitem src="icon" srcEdge="BOTTOM" dst="button-1" dstEdge="TOP" spacing="1.0un"/>
+    
+    <meshitem src="ciphering" srcEdge="LEFT" dst="icon" dstEdge="LEFT"/>
+    <meshitem src="ciphering" srcEdge="TOP" dst="icon" dstEdge="TOP"/>
 
-    <meshitem src="text" srcEdge="LEFT" dst="icon" dstEdge="RIGHT" />
-    <meshitem src="text" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+    <meshitem src="text" srcEdge="LEFT" dst="icon" dstEdge="RIGHT"/>
+    <meshitem src="text" srcEdge="RIGHT" dst="expand-indi" dstEdge="LEFT"/>
     <meshitem src="text" srcEdge="TOP" dst="" dstEdge="TOP" spacing="-1.5un" />
     
+    <meshitem src="expand-indi" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
+    <meshitem src="expand-indi" srcEdge="TOP" dst="" dstEdge="TOP" spacing="-1.5un"/>
+    
     <meshitem src="button-1" srcEdge="RIGHT" dst="" dstEdge="CENTERH" spacing="1.0un"/>
     <meshitem src="button-1" srcEdge="LEFT" dst="" dstEdge="LEFT" spacing="-2.0un"/>
     <meshitem src="button-1" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacing="2.0un"/>        
     
     <meshitem src="button-2" srcEdge="LEFT" dst="" dstEdge="CENTERH" spacing="-1.0un"/>
-    <meshitem src="button-2" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="2.0un" />
-    <meshitem src="button-2" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacing="2.0un" />        
+    <meshitem src="button-2" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="2.0un"/>
+    <meshitem src="button-2" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacing="2.0un"/>        
    
-    <meshitem src="background" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="background" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="background" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="background" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+    <meshitem src="background" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
+    <meshitem src="background" srcEdge="TOP" dst="" dstEdge="TOP"/>
+    <meshitem src="background" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
+    <meshitem src="background" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM"/>
     
   </layout>  
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblestyle/resources/pri_large_green_handset.svg
--- a/phoneuis/bubblemanager2/bubblestyle/resources/pri_large_green_handset.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="60px" viewBox="0 0 60 60" enable-background="new 0 0 60 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="423.0967" y1="-578.646" x2="429.6527" y2="-582.908" gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)">
-	<stop  offset="0.1333" style="stop-color:#A7E722"/>
-	<stop  offset="0.6303" style="stop-color:#428C0F"/>
-	<stop  offset="1" style="stop-color:#5CA617"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M19.081,33.911c2.089-3.597,4.591-6.497,7.281-9.189c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282
-	c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595
-	c-1.343,3.541-1.221,7.445-0.929,8.581c0,0,0.34,1.034,1.144,2.377C10.248,46.476,19.081,33.911,19.081,33.911z"/>
-<path opacity="0.05" fill="#020202" d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46
-	c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27
-	C34.843,9.673,31.019,14.958,31.184,20.8z"/>
-<path opacity="0.1" fill="#020202" d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04
-	c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253
-	C35.275,9.576,31.636,14.695,31.906,20.306z"/>
-<path opacity="0.1" fill="#020202" d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231
-	c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z
-	"/>
-<radialGradient id="SVGID_2_" cx="40.9697" cy="9.21" r="12.2872" gradientUnits="userSpaceOnUse">
-	<stop  offset="0" style="stop-color:#A7E722"/>
-	<stop  offset="0.6242" style="stop-color:#428C0F"/>
-	<stop  offset="1" style="stop-color:#5CA617"/>
-</radialGradient>
-<path fill="url(#SVGID_2_)" d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263
-	c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201
-	c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z"/>
-<path opacity="0.1" fill="#020202" d="M17.483,34.106c-0.988-0.14-2.007-0.119-3.027,0.105c-2.418,0.53-4.376,2.066-5.646,4.131
-	c-0.367,2.35-0.25,4.407-0.05,5.18c0,0,0.34,1.034,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.106z"/>
-<path opacity="0.1" fill="#020202" d="M18.366,34.136c-0.989-0.14-2.008-0.118-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623
-	c-0.026,1.025,0.034,1.872,0.127,2.397c0.003,0.013,0.005,0.034,0.01,0.048c0,0,0.34,1.033,1.144,2.379
-	c0.3,0.498,6.981-8.888,8.75-11.384L18.366,34.136z"/>
-<radialGradient id="SVGID_3_" cx="437.4258" cy="-571.231" r="14.6198" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse">
-	<stop  offset="0" style="stop-color:#A7E722"/>
-	<stop  offset="0.6242" style="stop-color:#428C0F"/>
-	<stop  offset="1" style="stop-color:#5CA617"/>
-</radialGradient>
-<path fill="url(#SVGID_3_)" d="M11.202,47.738c0.616,0.74,0.646,0.954,1.295,1.524c1.194,1.055,9.301-13.612,9.301-13.612
-	l-2.683-1.719c-0.941-0.111-1.914-0.079-2.89,0.136c-4.777,1.048-7.806,5.868-6.87,10.832C9.749,45.686,10.349,46.71,11.202,47.738z
-	"/>
-<path opacity="0.4" fill="#020202" d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749
-	C35.853,20.016,50.953,13.231,49.937,11.978z"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="422.2881" y1="-610.9287" x2="427.4786" y2="-594.4409" gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)">
-	<stop  offset="0" style="stop-color:#C6FF45"/>
-	<stop  offset="0.6788" style="stop-color:#387300"/>
-	<stop  offset="1" style="stop-color:#66A00E"/>
-</linearGradient>
-<path fill="url(#SVGID_4_)" d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668
-	c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z"/>
-<path opacity="0.4" fill="#020202" d="M21.798,35.65l-0.725-0.472l-9.215,13.486c0.216,0.204,0.43,0.414,0.639,0.598
-	C13.691,50.317,21.798,35.65,21.798,35.65z"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="439.6982" y1="-577.7549" x2="451.5232" y2="-564.7323" gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)">
-	<stop  offset="0" style="stop-color:#C6FF45"/>
-	<stop  offset="0.6788" style="stop-color:#387300"/>
-	<stop  offset="1" style="stop-color:#66A00E"/>
-</linearGradient>
-<path fill="url(#SVGID_5_)" d="M12.498,49.262c1.193,1.05,1.686,1.37,1.686,1.37c0.567,0.367,1.363,0.169,1.781-0.442l7.9-11.605
-	c0.419-0.614,0.307-1.411-0.26-1.777l-1.808-1.156L12.498,49.262z"/>
-<rect fill="none" width="60" height="60"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblestyle/resources/pri_large_red_handset.svg
--- a/phoneuis/bubblemanager2/bubblestyle/resources/pri_large_red_handset.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="60px" viewBox="0 0 60 60" enable-background="new 0 0 60 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="2876.6201" y1="367.9102" x2="2883.1765" y2="363.6479" gradientTransform="matrix(-0.5413 0.8408 -0.8408 -0.5413 1896.0922 -2198.2874)">
-	<stop  offset="0" style="stop-color:#FF7236"/>
-	<stop  offset="0.6242" style="stop-color:#BA1212"/>
-	<stop  offset="1" style="stop-color:#E8522A"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M19.072,29.698c4.021-1.066,7.842-1.348,11.646-1.35c3.666,0.002,8.5,1.004,10.479,1.631l14.061-0.48
-	c-0.385-0.81-2.283-2.939-5.582-4.711c-3.303-1.771-11.847-3.841-20.172-3.841S13.896,22.8,11.703,23.785
-	c-3.453,1.555-6.129,4.401-6.725,5.411c0,0-0.49,0.972-0.873,2.489C3.943,32.337,19.072,29.698,19.072,29.698z"/>
-<path opacity="0.05" fill="#020202" d="M36.902,28.984c1.785,0.32,3.359,0.699,4.295,0.995l13.684-0.467
-	c-0.053-0.134-0.086-0.21-0.086-0.21c-0.111-0.236-0.338-0.568-0.639-0.949c-0.566-0.557-1.195-1.063-1.889-1.508
-	C47.357,23.704,40.916,24.737,36.902,28.984z"/>
-<path opacity="0.1" fill="#020202" d="M37.762,29.146c1.424,0.28,2.654,0.586,3.436,0.833l13.729-0.47
-	c-0.059-0.148-0.096-0.233-0.096-0.233c-0.105-0.221-0.318-0.535-0.605-0.894c-0.535-0.526-1.129-1.006-1.783-1.426
-	C47.73,23.941,41.537,24.988,37.762,29.146z"/>
-<path opacity="0.1" fill="#020202" d="M54.885,29.238c-0.096-0.2-0.291-0.485-0.549-0.812c-0.484-0.478-1.023-0.911-1.619-1.293
-	c-4.387-2.808-10.189-1.726-13.584,2.303c0.834,0.19,1.547,0.38,2.064,0.543l13.797-0.47C54.928,29.336,54.885,29.238,54.885,29.238
-	z"/>
-<radialGradient id="SVGID_2_" cx="-362.4932" cy="2606.3809" r="14.0807" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 2153.4434 -1558.1849)" gradientUnits="userSpaceOnUse">
-	<stop  offset="0" style="stop-color:#FF7236"/>
-	<stop  offset="0.6242" style="stop-color:#BA1212"/>
-	<stop  offset="1" style="stop-color:#E8522A"/>
-</radialGradient>
-<path fill="url(#SVGID_2_)" d="M41.197,29.979l-0.439,1.752c0,0,15.475,5.881,15.643,4.275c0.084-0.809,0.057-0.872,0.018-1.768
-	c-0.119-2.688-1.16-4.74-1.16-4.74c-0.086-0.176-0.256-0.425-0.482-0.711c-0.424-0.419-0.898-0.801-1.42-1.135
-	c-3.959-2.533-9.242-1.463-12.176,2.329C41.184,29.981,41.191,29.979,41.197,29.979z"/>
-<path opacity="0.1" fill="#020202" d="M17.805,28.706c-0.6-0.797-1.334-1.503-2.215-2.065c-2.084-1.335-4.555-1.633-6.914-1.072
-	c-1.92,1.402-3.293,2.939-3.697,3.628c0,0-0.49,0.972-0.873,2.489c-0.135,0.546,10.469-1.219,13.904-1.805L17.805,28.706z"/>
-<path opacity="0.1" fill="#020202" d="M18.408,29.352c-0.6-0.799-1.336-1.504-2.217-2.067c-2.855-1.829-6.439-1.728-9.463-0.097
-	c-0.744,0.706-1.299,1.348-1.605,1.785c-0.006,0.011-0.02,0.027-0.027,0.04c0,0-0.49,0.972-0.873,2.491
-	c-0.141,0.564,11.221-1.348,14.236-1.862L18.408,29.352z"/>
-<radialGradient id="SVGID_3_" cx="2885.8242" cy="377.8994" r="14.6192" gradientTransform="matrix(-0.5439 0.8402 -0.8348 -0.5344 1899.8433 -2194.1335)" gradientUnits="userSpaceOnUse">
-	<stop  offset="0" style="stop-color:#FF7236"/>
-	<stop  offset="0.6242" style="stop-color:#BA1212"/>
-	<stop  offset="1" style="stop-color:#E8522A"/>
-</radialGradient>
-<path fill="url(#SVGID_3_)" d="M3.725,33.904c-0.088,0.959-0.219,1.131-0.162,1.993c0.098,1.591,16.201-3.049,16.201-3.049
-	l-0.682-3.112c-0.586-0.744-1.297-1.409-2.139-1.947c-4.119-2.637-9.67-1.369-12.518,2.802C4.148,31.425,3.848,32.573,3.725,33.904z
-	"/>
-<path opacity="0.4" fill="#020202" d="M56.4,36.007c0.029-0.282,0.047-0.585,0.064-0.883l-15.488-4.232l-0.219,0.84
-	C40.758,31.731,56.232,37.612,56.4,36.007z"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="2875.8125" y1="335.625" x2="2881.0032" y2="352.1139" gradientTransform="matrix(-0.5413 0.8408 -0.8408 -0.5413 1896.0941 -2198.2864)">
-	<stop  offset="0" style="stop-color:#FF7236"/>
-	<stop  offset="0.6242" style="stop-color:#BA1212"/>
-	<stop  offset="1" style="stop-color:#E8522A"/>
-</linearGradient>
-<path fill="url(#SVGID_4_)" d="M40.758,31.731l-0.568,2.234c-0.15,0.577,0.211,1.163,0.811,1.408l4.543,1.241l8.988,2.387
-	c0.703,0.189,1.412-0.171,1.58-0.804c0,0,0.119-0.59,0.283-2.192L40.758,31.731z"/>
-<path opacity="0.4" fill="#020202" d="M19.764,32.849l-0.178-0.846L3.533,35.023c0.008,0.297,0.012,0.597,0.029,0.874
-	C3.66,37.488,19.764,32.849,19.764,32.849z"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="2893.2236" y1="368.8027" x2="2905.0479" y2="381.8245" gradientTransform="matrix(-0.5413 0.8408 -0.8408 -0.5413 1896.0941 -2198.2869)">
-	<stop  offset="0" style="stop-color:#FF7236"/>
-	<stop  offset="0.6242" style="stop-color:#BA1212"/>
-	<stop  offset="1" style="stop-color:#E8522A"/>
-</linearGradient>
-<path fill="url(#SVGID_5_)" d="M3.563,35.897c0.102,1.587,0.225,2.161,0.225,2.161c0.141,0.66,0.844,1.083,1.572,0.946l13.793-2.62
-	c0.73-0.138,1.213-0.78,1.072-1.44l-0.461-2.096L3.563,35.897z"/>
-<rect fill="none" width="60" height="60"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblestyle/resources/pri_large_yellow_handset.svg
--- a/phoneuis/bubblemanager2/bubblestyle/resources/pri_large_yellow_handset.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="60px" height="60px" viewBox="0 0 60 60" enable-background="new 0 0 60 60" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="20.3613" y1="20.2744" x2="26.6141" y2="26.4485">
-	<stop  offset="0" style="stop-color:#FEE16E"/>
-	<stop  offset="0.5939" style="stop-color:#D96900"/>
-	<stop  offset="1" style="stop-color:#FED43A"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M19.081,33.911c2.089-3.597,4.591-6.497,7.281-9.189c2.593-2.591,6.72-5.3,8.562-6.256l9.604-10.282
-	c-0.845-0.3-3.693-0.464-7.279,0.616c-3.586,1.083-11.736,6.303-16.979,11.547c-5.242,5.246-9.727,12.347-10.581,14.595
-	c-1.343,3.541-1.221,7.445-0.929,8.581c0,0,0.34,1.034,1.144,2.377C10.248,46.476,19.081,33.911,19.081,33.911z"/>
-<path opacity="0.05" fill="#020202" d="M31.184,20.8c1.488-1.036,2.87-1.882,3.74-2.334L44.271,8.46
-	c-0.132-0.058-0.209-0.088-0.209-0.088c-0.247-0.088-0.642-0.162-1.124-0.219c-0.793,0.006-1.596,0.093-2.401,0.27
-	C34.843,9.673,31.019,14.958,31.184,20.8z"/>
-<path opacity="0.1" fill="#020202" d="M31.906,20.306c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04
-	c-0.146-0.063-0.233-0.098-0.233-0.098c-0.231-0.08-0.604-0.152-1.06-0.203c-0.751,0.006-1.51,0.087-2.27,0.253
-	C35.275,9.576,31.636,14.695,31.906,20.306z"/>
-<path opacity="0.1" fill="#020202" d="M44.079,8.263c-0.21-0.073-0.55-0.137-0.962-0.186c-0.681,0.006-1.369,0.08-2.06,0.231
-	c-5.087,1.116-8.426,5.984-7.978,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.424-10.088C44.178,8.302,44.079,8.263,44.079,8.263z
-	"/>
-<radialGradient id="SVGID_2_" cx="43.6406" cy="10.1128" r="13.348" gradientUnits="userSpaceOnUse">
-	<stop  offset="0" style="stop-color:#FEE16E"/>
-	<stop  offset="0.6061" style="stop-color:#F1830A"/>
-	<stop  offset="1" style="stop-color:#FED43A"/>
-</radialGradient>
-<path fill="url(#SVGID_2_)" d="M34.924,18.466l0.929,1.55c0,0,15.101-6.784,14.084-8.038c-0.513-0.631-0.577-0.656-1.237-1.263
-	c-1.985-1.815-4.172-2.531-4.172-2.531c-0.186-0.063-0.481-0.12-0.845-0.161c-0.596,0.004-1.2,0.068-1.806,0.201
-	c-4.591,1.009-7.57,5.501-6.963,10.257C34.916,18.477,34.921,18.47,34.924,18.466z"/>
-<path opacity="0.1" fill="#020202" d="M17.483,34.106c-0.988-0.14-2.007-0.119-3.027,0.105c-2.418,0.53-4.376,2.066-5.646,4.131
-	c-0.367,2.35-0.25,4.407-0.05,5.18c0,0,0.34,1.034,1.144,2.377c0.29,0.482,6.54-8.264,8.556-11.107L17.483,34.106z"/>
-<path opacity="0.1" fill="#020202" d="M18.366,34.136c-0.989-0.14-2.008-0.118-3.029,0.105c-3.313,0.727-5.775,3.332-6.76,6.623
-	c-0.026,1.025,0.034,1.872,0.127,2.397c0.003,0.013,0.005,0.034,0.01,0.048c0,0,0.34,1.033,1.144,2.379
-	c0.3,0.498,6.981-8.888,8.75-11.384L18.366,34.136z"/>
-<radialGradient id="SVGID_3_" cx="437.4258" cy="-571.231" r="14.6198" gradientTransform="matrix(0.2095 0.9787 -0.9682 0.2124 -629.4526 -270.6148)" gradientUnits="userSpaceOnUse">
-	<stop  offset="0" style="stop-color:#FEE16E"/>
-	<stop  offset="0.6061" style="stop-color:#F1830A"/>
-	<stop  offset="1" style="stop-color:#FED43A"/>
-</radialGradient>
-<path fill="url(#SVGID_3_)" d="M11.202,47.738c0.616,0.74,0.646,0.954,1.295,1.524c1.194,1.055,9.301-13.612,9.301-13.612
-	l-2.683-1.719c-0.941-0.111-1.914-0.079-2.89,0.136c-4.777,1.048-7.806,5.868-6.87,10.832C9.749,45.686,10.349,46.71,11.202,47.738z
-	"/>
-<path opacity="0.5" fill="#020202" d="M49.937,11.978c-0.179-0.22-0.381-0.446-0.578-0.67l-13.944,7.959l0.438,0.749
-	C35.853,20.016,50.953,13.231,49.937,11.978z"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="422.2881" y1="-610.9287" x2="427.4786" y2="-594.4409" gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)">
-	<stop  offset="0" style="stop-color:#FEE16E"/>
-	<stop  offset="0.7576" style="stop-color:#D96900"/>
-	<stop  offset="1" style="stop-color:#FED43A"/>
-</linearGradient>
-<path fill="url(#SVGID_4_)" d="M35.853,20.016l1.178,1.981c0.302,0.515,0.972,0.674,1.569,0.422l4.09-2.334l8.043-4.668
-	c0.632-0.363,0.878-1.119,0.549-1.686c0,0-0.333-0.501-1.349-1.751L35.853,20.016z"/>
-<path opacity="0.5" fill="#020202" d="M21.798,35.65l-0.725-0.472l-9.215,13.486c0.216,0.204,0.43,0.414,0.639,0.598
-	C13.691,50.317,21.798,35.65,21.798,35.65z"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="439.6982" y1="-577.7549" x2="451.5232" y2="-564.7323" gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)">
-	<stop  offset="0" style="stop-color:#FEE16E"/>
-	<stop  offset="0.7576" style="stop-color:#D96900"/>
-	<stop  offset="1" style="stop-color:#FED43A"/>
-</linearGradient>
-<path fill="url(#SVGID_5_)" d="M12.498,49.262c1.193,1.05,1.686,1.37,1.686,1.37c0.567,0.367,1.363,0.169,1.781-0.442l7.9-11.605
-	c0.419-0.614,0.307-1.411-0.26-1.777l-1.808-1.156L12.498,49.262z"/>
-<rect fill="none" width="60" height="60"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblestyle/resources/qtg_large_video_dialled_call.svg
--- a/phoneuis/bubblemanager2/bubblestyle/resources/qtg_large_video_dialled_call.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="422.2207" x2="428.7761" y1="-578.2104" y2="-582.472">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.1333" style="stop-color:#A7E722"/>
-<stop offset="0.6303" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</linearGradient>
-<path d="M18.469,33.146c2.09-3.596,4.591-6.497,7.281-9.19c2.594-2.589,6.72-5.299,8.562-6.254L43.916,7.42  c-0.846-0.3-3.693-0.465-7.279,0.616c-3.588,1.083-11.736,6.302-16.979,11.547C14.416,24.83,9.932,31.93,9.077,34.178  c-1.343,3.541-1.222,7.445-0.929,8.58c0,0,0.34,1.035,1.145,2.377C9.636,45.711,18.469,33.146,18.469,33.146z" fill="url(#SVGID_1_)"/>
-<path d="M30.573,20.037c1.488-1.037,2.869-1.883,3.74-2.335l9.346-10.006  c-0.131-0.057-0.209-0.088-0.209-0.088c-0.246-0.088-0.641-0.162-1.123-0.218c-0.793,0.005-1.596,0.093-2.402,0.27  C34.23,8.909,30.409,14.194,30.573,20.037z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.295,19.542c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.234-0.098-0.234-0.098c-0.232-0.08-0.604-0.152-1.061-0.203c-0.75,0.006-1.508,0.087-2.27,0.253  C34.664,8.813,31.023,13.932,31.295,19.542z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M43.467,7.499c-0.209-0.073-0.549-0.137-0.963-0.186c-0.68,0.006-1.369,0.08-2.059,0.231  c-5.088,1.116-8.426,5.984-7.977,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.422-10.088C43.566,7.538,43.467,7.499,43.467,7.499z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="46.6523" cy="-5.2056" gradientTransform="matrix(0.6122 0 0 0.6122 11.7943 11.6322)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="20.0698">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</radialGradient>
-<path d="M34.313,17.702l0.928,1.55c0,0,15.102-6.784,14.084-8.039c-0.514-0.631-0.576-0.656-1.238-1.262  c-1.984-1.815-4.17-2.531-4.17-2.531C43.73,7.357,43.434,7.3,43.07,7.258c-0.596,0.005-1.199,0.069-1.805,0.202  c-4.592,1.008-7.572,5.5-6.965,10.256C34.305,17.713,34.309,17.706,34.313,17.702z" fill="url(#SVGID_2_)"/>
-<path d="M16.873,33.344c-0.989-0.141-2.008-0.121-3.028,0.104c-2.417,0.531-4.375,2.066-5.646,4.131  c-0.367,2.35-0.25,4.408-0.05,5.18c0,0,0.34,1.035,1.145,2.377c0.289,0.484,6.539-8.264,8.555-11.107L16.873,33.344z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M17.755,33.373c-0.989-0.141-2.008-0.119-3.029,0.104c-3.313,0.727-5.776,3.332-6.76,6.623  C7.94,41.125,8,41.973,8.093,42.498c0.002,0.012,0.005,0.033,0.01,0.047c0,0,0.339,1.033,1.143,2.379  c0.3,0.498,6.981-8.887,8.75-11.383L17.755,33.373z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.749" cy="-560.2109" gradientTransform="matrix(0.1283 0.5992 -0.5928 0.13 -373.5847 -154.0506)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="23.8799">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</radialGradient>
-<path d="M10.591,46.975c0.616,0.74,0.646,0.955,1.294,1.525c1.195,1.055,9.301-13.613,9.301-13.613  l-2.683-1.719c-0.941-0.111-1.913-0.08-2.889,0.135c-4.777,1.049-7.806,5.869-6.87,10.832C9.138,44.922,9.736,45.947,10.591,46.975z  " fill="url(#SVGID_3_)"/>
-<path d="M49.324,11.213c-0.178-0.219-0.381-0.445-0.578-0.669l-13.943,7.958l0.438,0.749  C35.24,19.252,50.342,12.468,49.324,11.213z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="421.4131" x2="426.6039" y1="-610.4937" y2="-594.0048">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
-</linearGradient>
-<path d="M35.24,19.252l1.178,1.98c0.301,0.515,0.973,0.673,1.57,0.423l4.09-2.335l8.043-4.667  c0.631-0.363,0.877-1.12,0.549-1.685c0,0-0.334-0.501-1.35-1.752L35.24,19.252z" fill="url(#SVGID_4_)"/>
-<path d="M21.186,34.887l-0.725-0.473l-9.214,13.488c0.215,0.203,0.429,0.412,0.638,0.598  C13.081,49.555,21.186,34.887,21.186,34.887z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="438.8232" x2="450.6482" y1="-577.3184" y2="-564.2958">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
-</linearGradient>
-<path d="M11.887,48.498c1.193,1.051,1.685,1.371,1.685,1.371c0.568,0.367,1.363,0.168,1.781-0.443  l7.901-11.605c0.418-0.615,0.307-1.412-0.261-1.777l-1.808-1.156L11.887,48.498z" fill="url(#SVGID_5_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="39.1182" x2="44.145" y1="48.6309" y2="48.6309">
-<stop offset="0" style="stop-color:#878A8C"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#5B6163"/>
-<stop offset="1" style="stop-color:#959A9C"/>
-</linearGradient>
-<rect fill="url(#SVGID_6_)" height="7.535" width="4.896" x="39.184" y="44.863"/>
-<path d="M39.184,49.596c0.787,0.189,1.604,0.303,2.449,0.303c0.844,0,1.662-0.113,2.447-0.303v-4.121  h-4.896V49.596z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M39.184,48.982c0.787,0.191,1.604,0.303,2.449,0.303c0.844,0,1.662-0.111,2.447-0.303v-4.119  h-4.896V48.982z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="41.6328" x2="41.6328" y1="27.8325" y2="48.6499">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.3212" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#666666"/>
-</linearGradient>
-<path d="M41.633,48.674c-5.74,0-10.408-4.67-10.408-10.408c0-5.74,4.668-10.409,10.408-10.409  c5.738,0,10.408,4.668,10.408,10.409C52.041,44.004,47.371,48.674,41.633,48.674L41.633,48.674z" fill="url(#SVGID_7_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="41.6318" x2="41.6318" y1="28.4473" y2="48.0381">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#7C8487"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
-</linearGradient>
-<circle cx="41.632" cy="38.266" fill="url(#SVGID_8_)" r="9.796"/>
-<path d="M41.633,47.037c-5.102,0-9.268-4.059-9.445-9.115c-0.004,0.111-0.008,0.223-0.008,0.334  c0,5.211,4.24,9.451,9.453,9.451c5.211,0,9.451-4.24,9.451-9.451c0-0.111-0.004-0.223-0.008-0.334  C50.898,42.979,46.732,47.037,41.633,47.037z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M49.592,37.848c0,4.516-3.564,8.969-7.963,8.967c-4.395-0.002-7.957-4.457-7.957-8.971  c0.004-4.516,3.568-8.172,7.963-8.172C46.029,29.675,49.594,33.334,49.592,37.848z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M41.629,46.15c-2.291,0-4.443-0.893-6.061-2.512c-1.619-1.619-2.51-3.773-2.508-6.063  c0-4.725,3.846-8.567,8.572-8.567c2.291,0,4.443,0.893,6.063,2.512c1.619,1.619,2.51,3.771,2.508,6.063  c0,4.725-3.846,8.566-8.57,8.566H41.629z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="41.6318" x2="41.6318" y1="29.5093" y2="45.4663">
-<stop offset="0" style="stop-color:#CFCFCF"/>
-<stop offset="0.1091" style="stop-color:#CFCFCF"/>
-<stop offset="0.6848" style="stop-color:#121212"/>
-<stop offset="1" style="stop-color:#A6A6A6"/>
-</linearGradient>
-<path d="M41.629,45.539c-2.127-0.002-4.125-0.83-5.629-2.334c-1.502-1.502-2.328-3.502-2.328-5.629  c0-4.387,3.572-7.956,7.961-7.956c2.127,0,4.125,0.83,5.629,2.333c1.504,1.504,2.33,3.504,2.33,5.631  c-0.002,4.387-3.572,7.955-7.959,7.955H41.629z" fill="url(#SVGID_9_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="41.6318" x2="41.6318" y1="30.1289" y2="44.8584">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="1" style="stop-color:#606769"/>
-</linearGradient>
-<circle cx="41.632" cy="37.58" fill="url(#SVGID_10_)" r="7.347"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="41.6318" x2="41.6318" y1="31.4756" y2="43.6433">
-<stop offset="0" style="stop-color:#1A1A1A"/>
-<stop offset="0.503" style="stop-color:#343434"/>
-<stop offset="0.7515" style="stop-color:#9E9E9E"/>
-<stop offset="1" style="stop-color:#CFCFCF"/>
-</linearGradient>
-<path d="M41.633,43.701c-1.639,0-3.176-0.639-4.332-1.795c-1.154-1.156-1.791-2.693-1.791-4.33  c0-3.373,2.746-6.119,6.123-6.119c1.637,0,3.174,0.637,4.33,1.795c1.156,1.156,1.793,2.693,1.791,4.33  C47.754,40.957,45.008,43.701,41.633,43.701L41.633,43.701z" fill="url(#SVGID_11_)"/>
-<radialGradient cx="59.5957" cy="40.5771" gradientTransform="matrix(0.621 1.836735e-004 -1.836735e-004 0.6209 5.2261 12.8455)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="10.1859">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="0.5917" style="stop-color:#000000"/>
-<stop offset="0.627" style="stop-color:#050505"/>
-<stop offset="0.7652" style="stop-color:#121212"/>
-<stop offset="0.8876" style="stop-color:#171717"/>
-<stop offset="1" style="stop-color:#171717"/>
-</radialGradient>
-<circle cx="41.632" cy="37.579" fill="url(#SVGID_12_)" r="5.511"/>
-<radialGradient cx="53.6738" cy="32.9404" gradientTransform="matrix(0.621 0 0 0.6209 5.811 13.4188)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="16.2221">
-<stop offset="0" style="stop-color:#242424"/>
-<stop offset="0.4303" style="stop-color:#242424"/>
-<stop offset="0.7818" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
-</radialGradient>
-<circle cx="41.633" cy="37.58" fill="url(#SVGID_13_)" r="4.521"/>
-<radialGradient cx="56.7607" cy="30.0415" gradientTransform="matrix(0.621 1.836735e-004 -1.836735e-004 0.6209 5.2261 12.8455)" gradientUnits="userSpaceOnUse" id="SVGID_14_" r="17.797">
-<stop offset="0" style="stop-color:#A700F5"/>
-<stop offset="0.3091" style="stop-color:#A700F5"/>
-<stop offset="0.4364" style="stop-color:#5E008A"/>
-<stop offset="0.8061" style="stop-color:#0E1402"/>
-<stop offset="1" style="stop-color:#0E1402"/>
-</radialGradient>
-<path d="M45.672,37.58c0,2.232-1.809,4.041-4.041,4.039c-2.232,0-4.041-1.811-4.041-4.041  c0.002-2.232,1.813-4.039,4.041-4.039C43.865,33.541,45.676,35.35,45.672,37.58z" fill="url(#SVGID_14_)"/>
-<radialGradient cx="58.6514" cy="45.2432" gradientTransform="matrix(0.621 1.836735e-004 -1.836735e-004 0.6209 5.2261 12.8455)" gradientUnits="userSpaceOnUse" id="SVGID_15_" r="7.2256">
-<stop offset="0" style="stop-color:#48630C"/>
-<stop offset="0.7879" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
-</radialGradient>
-<path d="M45.672,37.58c0,2.232-1.809,4.041-4.041,4.039c-2.232,0-4.041-1.811-4.041-4.041  c0,0,1.385,2.465,4.041,2.465S45.672,37.58,45.672,37.58z" fill="url(#SVGID_15_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="41.6123" x2="41.6123" y1="32.7168" y2="37.5411">
-<stop offset="0" style="stop-color:#F8FBFF"/>
-<stop offset="1" style="stop-color:#808080"/>
-</linearGradient>
-<path d="M41.611,37.518c1.754,0,3.404-0.264,4.863-0.732  c-0.414-2.313-2.432-4.068-4.863-4.068c-2.43,0-4.445,1.756-4.861,4.068C38.207,37.254,39.859,37.518,41.611,37.518z" fill="url(#SVGID_16_)" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="32.7676" x2="50.541" y1="51.5801" y2="51.5801">
-<stop offset="0" style="stop-color:#878A8C"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#5B6163"/>
-<stop offset="1" style="stop-color:#959A9C"/>
-</linearGradient>
-<path d="M50.502,52.805c0.025-0.609,0.039-0.486,0.039-0.613v-0.033c0-0.996-0.816-1.803-1.824-1.803H34.592  c-1.008,0-1.824,0.807-1.824,1.803v0.033c0,0.127,0.014,0.004,0.039,0.613H50.502z" fill="url(#SVGID_17_)"/>
-<path d="M32.881,51.557H50.43c-0.08-0.225-0.203-0.426-0.361-0.6H33.242  C33.084,51.131,32.961,51.332,32.881,51.557z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M32.777,52.191c0.008,0.125,0.016,0.309,0.029,0.613h17.695  c0.012-0.305,0.021-0.488,0.027-0.613H32.777z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M33.24,50.957h16.826c-0.332-0.367-0.811-0.602-1.35-0.602H34.592  C34.053,50.355,33.574,50.59,33.24,50.957z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<rect fill="none" height="60" width="60"/>
-</g>
-<g>
-<linearGradient gradientTransform="matrix(1 1.000000e-004 -1.000000e-004 1 -2.3655 -29.0779)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="17.3477" x2="17.3477" y1="31.0703" y2="55.8327">
-<stop offset="0" style="stop-color:#45E8FF"/>
-<stop offset="0.1455" style="stop-color:#45E8FF"/>
-<stop offset="0.5576" style="stop-color:#30A4D5"/>
-<stop offset="1" style="stop-color:#1347BA"/>
-</linearGradient>
-<polygon fill="url(#SVGID_1__)" points="25.381,14.288 15.027,3.528 4.573,14.288 10.207,14.288 10.21,26.582 19.865,26.584   19.863,14.288 "/>
-<linearGradient gradientTransform="matrix(1 1.000000e-004 -1.000000e-004 1 -2.3655 -29.0779)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="17.3701" x2="17.3701" y1="32.3115" y2="43.6498">
-<stop offset="0" style="stop-color:#B3FCFF"/>
-<stop offset="0.4182" style="stop-color:#B3FCFF"/>
-<stop offset="1" style="stop-color:#5FBAD8"/>
-</linearGradient>
-<polygon fill="url(#SVGID_2__)" points="4.897,14.286 15.026,3.888 25.104,14.288 25.801,14.288 15.027,3.17 4.199,14.286 "/>
-<line fill="#1D4489" x1="10.21" x2="19.865" y1="26.578" y2="26.58"/>
-<polygon fill="#33AEDB" points="19.867,26.83 10.21,26.828 10.21,26.328 19.866,26.33 19.867,26.83 "/>
-<rect fill="none" height="30" width="30"/>
-</g>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblestyle/resources/qtg_large_video_missed_call.svg
--- a/phoneuis/bubblemanager2/bubblestyle/resources/qtg_large_video_missed_call.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="422.2207" x2="428.7761" y1="-578.2104" y2="-582.472">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.1333" style="stop-color:#A7E722"/>
-<stop offset="0.6303" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</linearGradient>
-<path d="M18.469,33.146c2.09-3.596,4.591-6.497,7.281-9.19c2.594-2.589,6.72-5.299,8.562-6.254L43.916,7.42  c-0.846-0.3-3.693-0.465-7.279,0.616c-3.588,1.083-11.736,6.302-16.979,11.547C14.416,24.83,9.932,31.93,9.077,34.178  c-1.343,3.541-1.222,7.445-0.929,8.58c0,0,0.34,1.035,1.145,2.377C9.636,45.711,18.469,33.146,18.469,33.146z" fill="url(#SVGID_1_)"/>
-<path d="M30.573,20.037c1.488-1.037,2.869-1.883,3.74-2.335l9.346-10.006  c-0.131-0.057-0.209-0.088-0.209-0.088c-0.246-0.088-0.641-0.162-1.123-0.218c-0.793,0.005-1.596,0.093-2.402,0.27  C34.23,8.909,30.409,14.194,30.573,20.037z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.295,19.542c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.234-0.098-0.234-0.098c-0.232-0.08-0.604-0.152-1.061-0.203c-0.75,0.006-1.508,0.087-2.27,0.253  C34.664,8.813,31.023,13.932,31.295,19.542z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M43.467,7.499c-0.209-0.073-0.549-0.137-0.963-0.186c-0.68,0.006-1.369,0.08-2.059,0.231  c-5.088,1.116-8.426,5.984-7.977,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.422-10.088C43.566,7.538,43.467,7.499,43.467,7.499z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="46.6523" cy="-5.2056" gradientTransform="matrix(0.6122 0 0 0.6122 11.7943 11.6322)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="20.0698">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</radialGradient>
-<path d="M34.313,17.702l0.928,1.55c0,0,15.102-6.784,14.084-8.039c-0.514-0.631-0.576-0.656-1.238-1.262  c-1.984-1.815-4.17-2.531-4.17-2.531C43.73,7.357,43.434,7.3,43.07,7.258c-0.596,0.005-1.199,0.069-1.805,0.202  c-4.592,1.008-7.572,5.5-6.965,10.256C34.305,17.713,34.309,17.706,34.313,17.702z" fill="url(#SVGID_2_)"/>
-<path d="M16.873,33.344c-0.989-0.141-2.008-0.121-3.028,0.104c-2.417,0.531-4.375,2.066-5.646,4.131  c-0.367,2.35-0.25,4.408-0.05,5.18c0,0,0.34,1.035,1.145,2.377c0.289,0.484,6.539-8.264,8.555-11.107L16.873,33.344z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M17.755,33.373c-0.989-0.141-2.008-0.119-3.029,0.104c-3.313,0.727-5.776,3.332-6.76,6.623  C7.94,41.125,8,41.973,8.093,42.498c0.002,0.012,0.005,0.033,0.01,0.047c0,0,0.339,1.033,1.143,2.379  c0.3,0.498,6.981-8.887,8.75-11.383L17.755,33.373z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.749" cy="-560.2109" gradientTransform="matrix(0.1283 0.5992 -0.5928 0.13 -373.5847 -154.0506)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="23.8799">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</radialGradient>
-<path d="M10.591,46.975c0.616,0.74,0.646,0.955,1.294,1.525c1.195,1.055,9.301-13.613,9.301-13.613  l-2.683-1.719c-0.941-0.111-1.913-0.08-2.889,0.135c-4.777,1.049-7.806,5.869-6.87,10.832C9.138,44.922,9.736,45.947,10.591,46.975z  " fill="url(#SVGID_3_)"/>
-<path d="M49.324,11.213c-0.178-0.219-0.381-0.445-0.578-0.669l-13.943,7.958l0.438,0.749  C35.24,19.252,50.342,12.468,49.324,11.213z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="421.4131" x2="426.6039" y1="-610.4937" y2="-594.0048">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
-</linearGradient>
-<path d="M35.24,19.252l1.178,1.98c0.301,0.515,0.973,0.673,1.57,0.423l4.09-2.335l8.043-4.667  c0.631-0.363,0.877-1.12,0.549-1.685c0,0-0.334-0.501-1.35-1.752L35.24,19.252z" fill="url(#SVGID_4_)"/>
-<path d="M21.186,34.887l-0.725-0.473l-9.214,13.488c0.215,0.203,0.429,0.412,0.638,0.598  C13.081,49.555,21.186,34.887,21.186,34.887z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="438.8232" x2="450.6482" y1="-577.3184" y2="-564.2958">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
-</linearGradient>
-<path d="M11.887,48.498c1.193,1.051,1.685,1.371,1.685,1.371c0.568,0.367,1.363,0.168,1.781-0.443  l7.901-11.605c0.418-0.615,0.307-1.412-0.261-1.777l-1.808-1.156L11.887,48.498z" fill="url(#SVGID_5_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="39.1182" x2="44.145" y1="48.6309" y2="48.6309">
-<stop offset="0" style="stop-color:#878A8C"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#5B6163"/>
-<stop offset="1" style="stop-color:#959A9C"/>
-</linearGradient>
-<rect fill="url(#SVGID_6_)" height="7.535" width="4.896" x="39.184" y="44.863"/>
-<path d="M39.184,49.596c0.787,0.189,1.604,0.303,2.449,0.303c0.844,0,1.662-0.113,2.447-0.303v-4.121  h-4.896V49.596z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M39.184,48.982c0.787,0.191,1.604,0.303,2.449,0.303c0.844,0,1.662-0.111,2.447-0.303v-4.119  h-4.896V48.982z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="41.6328" x2="41.6328" y1="27.8325" y2="48.6499">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.3212" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#666666"/>
-</linearGradient>
-<path d="M41.633,48.674c-5.74,0-10.408-4.67-10.408-10.408c0-5.74,4.668-10.409,10.408-10.409  c5.738,0,10.408,4.668,10.408,10.409C52.041,44.004,47.371,48.674,41.633,48.674L41.633,48.674z" fill="url(#SVGID_7_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="41.6318" x2="41.6318" y1="28.4473" y2="48.0381">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#7C8487"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
-</linearGradient>
-<circle cx="41.632" cy="38.266" fill="url(#SVGID_8_)" r="9.796"/>
-<path d="M41.633,47.037c-5.102,0-9.268-4.059-9.445-9.115c-0.004,0.111-0.008,0.223-0.008,0.334  c0,5.211,4.24,9.451,9.453,9.451c5.211,0,9.451-4.24,9.451-9.451c0-0.111-0.004-0.223-0.008-0.334  C50.898,42.979,46.732,47.037,41.633,47.037z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M49.592,37.848c0,4.516-3.564,8.969-7.963,8.967c-4.395-0.002-7.957-4.457-7.957-8.971  c0.004-4.516,3.568-8.172,7.963-8.172C46.029,29.675,49.594,33.334,49.592,37.848z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M41.629,46.15c-2.291,0-4.443-0.893-6.061-2.512c-1.619-1.619-2.51-3.773-2.508-6.063  c0-4.725,3.846-8.567,8.572-8.567c2.291,0,4.443,0.893,6.063,2.512c1.619,1.619,2.51,3.771,2.508,6.063  c0,4.725-3.846,8.566-8.57,8.566H41.629z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="41.6318" x2="41.6318" y1="29.5093" y2="45.4663">
-<stop offset="0" style="stop-color:#CFCFCF"/>
-<stop offset="0.1091" style="stop-color:#CFCFCF"/>
-<stop offset="0.6848" style="stop-color:#121212"/>
-<stop offset="1" style="stop-color:#A6A6A6"/>
-</linearGradient>
-<path d="M41.629,45.539c-2.127-0.002-4.125-0.83-5.629-2.334c-1.502-1.502-2.328-3.502-2.328-5.629  c0-4.387,3.572-7.956,7.961-7.956c2.127,0,4.125,0.83,5.629,2.333c1.504,1.504,2.33,3.504,2.33,5.631  c-0.002,4.387-3.572,7.955-7.959,7.955H41.629z" fill="url(#SVGID_9_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="41.6318" x2="41.6318" y1="30.1289" y2="44.8584">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="1" style="stop-color:#606769"/>
-</linearGradient>
-<circle cx="41.632" cy="37.58" fill="url(#SVGID_10_)" r="7.347"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="41.6318" x2="41.6318" y1="31.4756" y2="43.6433">
-<stop offset="0" style="stop-color:#1A1A1A"/>
-<stop offset="0.503" style="stop-color:#343434"/>
-<stop offset="0.7515" style="stop-color:#9E9E9E"/>
-<stop offset="1" style="stop-color:#CFCFCF"/>
-</linearGradient>
-<path d="M41.633,43.701c-1.639,0-3.176-0.639-4.332-1.795c-1.154-1.156-1.791-2.693-1.791-4.33  c0-3.373,2.746-6.119,6.123-6.119c1.637,0,3.174,0.637,4.33,1.795c1.156,1.156,1.793,2.693,1.791,4.33  C47.754,40.957,45.008,43.701,41.633,43.701L41.633,43.701z" fill="url(#SVGID_11_)"/>
-<radialGradient cx="59.5957" cy="40.5771" gradientTransform="matrix(0.621 1.836735e-004 -1.836735e-004 0.6209 5.2261 12.8455)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="10.1859">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="0.5917" style="stop-color:#000000"/>
-<stop offset="0.627" style="stop-color:#050505"/>
-<stop offset="0.7652" style="stop-color:#121212"/>
-<stop offset="0.8876" style="stop-color:#171717"/>
-<stop offset="1" style="stop-color:#171717"/>
-</radialGradient>
-<circle cx="41.632" cy="37.579" fill="url(#SVGID_12_)" r="5.511"/>
-<radialGradient cx="53.6738" cy="32.9404" gradientTransform="matrix(0.621 0 0 0.6209 5.811 13.4188)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="16.2221">
-<stop offset="0" style="stop-color:#242424"/>
-<stop offset="0.4303" style="stop-color:#242424"/>
-<stop offset="0.7818" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
-</radialGradient>
-<circle cx="41.633" cy="37.58" fill="url(#SVGID_13_)" r="4.521"/>
-<radialGradient cx="56.7607" cy="30.0415" gradientTransform="matrix(0.621 1.836735e-004 -1.836735e-004 0.6209 5.2261 12.8455)" gradientUnits="userSpaceOnUse" id="SVGID_14_" r="17.797">
-<stop offset="0" style="stop-color:#A700F5"/>
-<stop offset="0.3091" style="stop-color:#A700F5"/>
-<stop offset="0.4364" style="stop-color:#5E008A"/>
-<stop offset="0.8061" style="stop-color:#0E1402"/>
-<stop offset="1" style="stop-color:#0E1402"/>
-</radialGradient>
-<path d="M45.672,37.58c0,2.232-1.809,4.041-4.041,4.039c-2.232,0-4.041-1.811-4.041-4.041  c0.002-2.232,1.813-4.039,4.041-4.039C43.865,33.541,45.676,35.35,45.672,37.58z" fill="url(#SVGID_14_)"/>
-<radialGradient cx="58.6514" cy="45.2432" gradientTransform="matrix(0.621 1.836735e-004 -1.836735e-004 0.6209 5.2261 12.8455)" gradientUnits="userSpaceOnUse" id="SVGID_15_" r="7.2256">
-<stop offset="0" style="stop-color:#48630C"/>
-<stop offset="0.7879" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
-</radialGradient>
-<path d="M45.672,37.58c0,2.232-1.809,4.041-4.041,4.039c-2.232,0-4.041-1.811-4.041-4.041  c0,0,1.385,2.465,4.041,2.465S45.672,37.58,45.672,37.58z" fill="url(#SVGID_15_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="41.6123" x2="41.6123" y1="32.7168" y2="37.5411">
-<stop offset="0" style="stop-color:#F8FBFF"/>
-<stop offset="1" style="stop-color:#808080"/>
-</linearGradient>
-<path d="M41.611,37.518c1.754,0,3.404-0.264,4.863-0.732  c-0.414-2.313-2.432-4.068-4.863-4.068c-2.43,0-4.445,1.756-4.861,4.068C38.207,37.254,39.859,37.518,41.611,37.518z" fill="url(#SVGID_16_)" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="32.7676" x2="50.541" y1="51.5801" y2="51.5801">
-<stop offset="0" style="stop-color:#878A8C"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#5B6163"/>
-<stop offset="1" style="stop-color:#959A9C"/>
-</linearGradient>
-<path d="M50.502,52.805c0.025-0.609,0.039-0.486,0.039-0.613v-0.033c0-0.996-0.816-1.803-1.824-1.803H34.592  c-1.008,0-1.824,0.807-1.824,1.803v0.033c0,0.127,0.014,0.004,0.039,0.613H50.502z" fill="url(#SVGID_17_)"/>
-<path d="M32.881,51.557H50.43c-0.08-0.225-0.203-0.426-0.361-0.6H33.242  C33.084,51.131,32.961,51.332,32.881,51.557z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M32.777,52.191c0.008,0.125,0.016,0.309,0.029,0.613h17.695  c0.012-0.305,0.021-0.488,0.027-0.613H32.777z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M33.24,50.957h16.826c-0.332-0.367-0.811-0.602-1.35-0.602H34.592  C34.053,50.355,33.574,50.59,33.24,50.957z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<rect fill="none" height="60" width="60"/>
-</g>
-<g>
-<rect fill="none" height="30" width="30"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15.0005" x2="15.0005" y1="4.5283" y2="27.0492">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
-</linearGradient>
-<path d="M19.018,16.846v-4.316h4.535l-8.512-8.844l-8.592,8.844h4.631v4.316  c0,7.293,6.068,9.467,11.908,9.467v-6.422C21.189,19.891,19.018,19.002,19.018,16.846z" fill="url(#SVGID_1__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15.0005" x2="15.0005" y1="4.0146" y2="12.8168">
-<stop offset="0" style="stop-color:#FFBE82"/>
-<stop offset="1" style="stop-color:#991B23"/>
-</linearGradient>
-<polygon fill="url(#SVGID_2__)" points="15.041,4.508 22.762,12.529 23.553,12.529 15.041,3.686 6.449,12.529 7.248,12.529 "/>
-</g>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblestyle/resources/qtg_large_video_received_call.svg
--- a/phoneuis/bubblemanager2/bubblestyle/resources/qtg_large_video_received_call.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5609 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="422.2207" x2="428.7761" y1="-578.2104" y2="-582.472">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.1333" style="stop-color:#A7E722"/>
-<stop offset="0.6303" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</linearGradient>
-<path d="M18.469,33.146c2.09-3.596,4.591-6.497,7.281-9.19c2.594-2.589,6.72-5.299,8.562-6.254L43.916,7.42  c-0.846-0.3-3.693-0.465-7.279,0.616c-3.588,1.083-11.736,6.302-16.979,11.547C14.416,24.83,9.932,31.93,9.077,34.178  c-1.343,3.541-1.222,7.445-0.929,8.58c0,0,0.34,1.035,1.145,2.377C9.636,45.711,18.469,33.146,18.469,33.146z" fill="url(#SVGID_1_)"/>
-<path d="M30.573,20.037c1.488-1.037,2.869-1.883,3.74-2.335l9.346-10.006  c-0.131-0.057-0.209-0.088-0.209-0.088c-0.246-0.088-0.641-0.162-1.123-0.218c-0.793,0.005-1.596,0.093-2.402,0.27  C34.23,8.909,30.409,14.194,30.573,20.037z" fill="#020202" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M31.295,19.542c1.205-0.809,2.291-1.462,3.018-1.84l9.377-10.04  c-0.146-0.063-0.234-0.098-0.234-0.098c-0.232-0.08-0.604-0.152-1.061-0.203c-0.75,0.006-1.508,0.087-2.27,0.253  C34.664,8.813,31.023,13.932,31.295,19.542z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M43.467,7.499c-0.209-0.073-0.549-0.137-0.963-0.186c-0.68,0.006-1.369,0.08-2.059,0.231  c-5.088,1.116-8.426,5.984-7.977,11.233c0.725-0.455,1.363-0.826,1.844-1.076l9.422-10.088C43.566,7.538,43.467,7.499,43.467,7.499z  " fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="46.6523" cy="-5.2056" gradientTransform="matrix(0.6122 0 0 0.6122 11.7943 11.6322)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="20.0698">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</radialGradient>
-<path d="M34.313,17.702l0.928,1.55c0,0,15.102-6.784,14.084-8.039c-0.514-0.631-0.576-0.656-1.238-1.262  c-1.984-1.815-4.17-2.531-4.17-2.531C43.73,7.357,43.434,7.3,43.07,7.258c-0.596,0.005-1.199,0.069-1.805,0.202  c-4.592,1.008-7.572,5.5-6.965,10.256C34.305,17.713,34.309,17.706,34.313,17.702z" fill="url(#SVGID_2_)"/>
-<path d="M16.873,33.344c-0.989-0.141-2.008-0.121-3.028,0.104c-2.417,0.531-4.375,2.066-5.646,4.131  c-0.367,2.35-0.25,4.408-0.05,5.18c0,0,0.34,1.035,1.145,2.377c0.289,0.484,6.539-8.264,8.555-11.107L16.873,33.344z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M17.755,33.373c-0.989-0.141-2.008-0.119-3.029,0.104c-3.313,0.727-5.776,3.332-6.76,6.623  C7.94,41.125,8,41.973,8.093,42.498c0.002,0.012,0.005,0.033,0.01,0.047c0,0,0.339,1.033,1.143,2.379  c0.3,0.498,6.981-8.887,8.75-11.383L17.755,33.373z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="437.749" cy="-560.2109" gradientTransform="matrix(0.1283 0.5992 -0.5928 0.13 -373.5847 -154.0506)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="23.8799">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.6242" style="stop-color:#428C0F"/>
-<stop offset="1" style="stop-color:#5CA617"/>
-</radialGradient>
-<path d="M10.591,46.975c0.616,0.74,0.646,0.955,1.294,1.525c1.195,1.055,9.301-13.613,9.301-13.613  l-2.683-1.719c-0.941-0.111-1.913-0.08-2.889,0.135c-4.777,1.049-7.806,5.869-6.87,10.832C9.138,44.922,9.736,45.947,10.591,46.975z  " fill="url(#SVGID_3_)"/>
-<path d="M49.324,11.213c-0.178-0.219-0.381-0.445-0.578-0.669l-13.943,7.958l0.438,0.749  C35.24,19.252,50.342,12.468,49.324,11.213z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="421.4131" x2="426.6039" y1="-610.4937" y2="-594.0048">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
-</linearGradient>
-<path d="M35.24,19.252l1.178,1.98c0.301,0.515,0.973,0.673,1.57,0.423l4.09-2.335l8.043-4.667  c0.631-0.363,0.877-1.12,0.549-1.685c0,0-0.334-0.501-1.35-1.752L35.24,19.252z" fill="url(#SVGID_4_)"/>
-<path d="M21.186,34.887l-0.725-0.473l-9.214,13.488c0.215,0.203,0.429,0.412,0.638,0.598  C13.081,49.555,21.186,34.887,21.186,34.887z" fill="#020202" fill-opacity="0.4" stroke-opacity="0.4"/>
-<linearGradient gradientTransform="matrix(0.2118 0.9773 -0.9773 0.2118 -634.5599 -270.4865)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="438.8232" x2="450.6482" y1="-577.3184" y2="-564.2958">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.6788" style="stop-color:#387300"/>
-<stop offset="1" style="stop-color:#66A00E"/>
-</linearGradient>
-<path d="M11.887,48.498c1.193,1.051,1.685,1.371,1.685,1.371c0.568,0.367,1.363,0.168,1.781-0.443  l7.901-11.605c0.418-0.615,0.307-1.412-0.261-1.777l-1.808-1.156L11.887,48.498z" fill="url(#SVGID_5_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="39.1182" x2="44.145" y1="48.6309" y2="48.6309">
-<stop offset="0" style="stop-color:#878A8C"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#5B6163"/>
-<stop offset="1" style="stop-color:#959A9C"/>
-</linearGradient>
-<rect fill="url(#SVGID_6_)" height="7.535" width="4.896" x="39.184" y="44.863"/>
-<path d="M39.184,49.596c0.787,0.189,1.604,0.303,2.449,0.303c0.844,0,1.662-0.113,2.447-0.303v-4.121  h-4.896V49.596z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M39.184,48.982c0.787,0.191,1.604,0.303,2.449,0.303c0.844,0,1.662-0.111,2.447-0.303v-4.119  h-4.896V48.982z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="41.6328" x2="41.6328" y1="27.8325" y2="48.6499">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.3212" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#666666"/>
-</linearGradient>
-<path d="M41.633,48.674c-5.74,0-10.408-4.67-10.408-10.408c0-5.74,4.668-10.409,10.408-10.409  c5.738,0,10.408,4.668,10.408,10.409C52.041,44.004,47.371,48.674,41.633,48.674L41.633,48.674z" fill="url(#SVGID_7_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="41.6318" x2="41.6318" y1="28.4473" y2="48.0381">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#7C8487"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
-</linearGradient>
-<circle cx="41.632" cy="38.266" fill="url(#SVGID_8_)" r="9.796"/>
-<path d="M41.633,47.037c-5.102,0-9.268-4.059-9.445-9.115c-0.004,0.111-0.008,0.223-0.008,0.334  c0,5.211,4.24,9.451,9.453,9.451c5.211,0,9.451-4.24,9.451-9.451c0-0.111-0.004-0.223-0.008-0.334  C50.898,42.979,46.732,47.037,41.633,47.037z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M49.592,37.848c0,4.516-3.564,8.969-7.963,8.967c-4.395-0.002-7.957-4.457-7.957-8.971  c0.004-4.516,3.568-8.172,7.963-8.172C46.029,29.675,49.594,33.334,49.592,37.848z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M41.629,46.15c-2.291,0-4.443-0.893-6.061-2.512c-1.619-1.619-2.51-3.773-2.508-6.063  c0-4.725,3.846-8.567,8.572-8.567c2.291,0,4.443,0.893,6.063,2.512c1.619,1.619,2.51,3.771,2.508,6.063  c0,4.725-3.846,8.566-8.57,8.566H41.629z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="41.6318" x2="41.6318" y1="29.5093" y2="45.4663">
-<stop offset="0" style="stop-color:#CFCFCF"/>
-<stop offset="0.1091" style="stop-color:#CFCFCF"/>
-<stop offset="0.6848" style="stop-color:#121212"/>
-<stop offset="1" style="stop-color:#A6A6A6"/>
-</linearGradient>
-<path d="M41.629,45.539c-2.127-0.002-4.125-0.83-5.629-2.334c-1.502-1.502-2.328-3.502-2.328-5.629  c0-4.387,3.572-7.956,7.961-7.956c2.127,0,4.125,0.83,5.629,2.333c1.504,1.504,2.33,3.504,2.33,5.631  c-0.002,4.387-3.572,7.955-7.959,7.955H41.629z" fill="url(#SVGID_9_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="41.6318" x2="41.6318" y1="30.1289" y2="44.8584">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="1" style="stop-color:#606769"/>
-</linearGradient>
-<circle cx="41.632" cy="37.58" fill="url(#SVGID_10_)" r="7.347"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="41.6318" x2="41.6318" y1="31.4756" y2="43.6433">
-<stop offset="0" style="stop-color:#1A1A1A"/>
-<stop offset="0.503" style="stop-color:#343434"/>
-<stop offset="0.7515" style="stop-color:#9E9E9E"/>
-<stop offset="1" style="stop-color:#CFCFCF"/>
-</linearGradient>
-<path d="M41.633,43.701c-1.639,0-3.176-0.639-4.332-1.795c-1.154-1.156-1.791-2.693-1.791-4.33  c0-3.373,2.746-6.119,6.123-6.119c1.637,0,3.174,0.637,4.33,1.795c1.156,1.156,1.793,2.693,1.791,4.33  C47.754,40.957,45.008,43.701,41.633,43.701L41.633,43.701z" fill="url(#SVGID_11_)"/>
-<radialGradient cx="59.5957" cy="40.5771" gradientTransform="matrix(0.621 1.836735e-004 -1.836735e-004 0.6209 5.2261 12.8455)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="10.1859">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="0.5917" style="stop-color:#000000"/>
-<stop offset="0.627" style="stop-color:#050505"/>
-<stop offset="0.7652" style="stop-color:#121212"/>
-<stop offset="0.8876" style="stop-color:#171717"/>
-<stop offset="1" style="stop-color:#171717"/>
-</radialGradient>
-<circle cx="41.632" cy="37.579" fill="url(#SVGID_12_)" r="5.511"/>
-<radialGradient cx="53.6738" cy="32.9404" gradientTransform="matrix(0.621 0 0 0.6209 5.811 13.4188)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="16.2221">
-<stop offset="0" style="stop-color:#242424"/>
-<stop offset="0.4303" style="stop-color:#242424"/>
-<stop offset="0.7818" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
-</radialGradient>
-<circle cx="41.633" cy="37.58" fill="url(#SVGID_13_)" r="4.521"/>
-<radialGradient cx="56.7607" cy="30.0415" gradientTransform="matrix(0.621 1.836735e-004 -1.836735e-004 0.6209 5.2261 12.8455)" gradientUnits="userSpaceOnUse" id="SVGID_14_" r="17.797">
-<stop offset="0" style="stop-color:#A700F5"/>
-<stop offset="0.3091" style="stop-color:#A700F5"/>
-<stop offset="0.4364" style="stop-color:#5E008A"/>
-<stop offset="0.8061" style="stop-color:#0E1402"/>
-<stop offset="1" style="stop-color:#0E1402"/>
-</radialGradient>
-<path d="M45.672,37.58c0,2.232-1.809,4.041-4.041,4.039c-2.232,0-4.041-1.811-4.041-4.041  c0.002-2.232,1.813-4.039,4.041-4.039C43.865,33.541,45.676,35.35,45.672,37.58z" fill="url(#SVGID_14_)"/>
-<radialGradient cx="58.6514" cy="45.2432" gradientTransform="matrix(0.621 1.836735e-004 -1.836735e-004 0.6209 5.2261 12.8455)" gradientUnits="userSpaceOnUse" id="SVGID_15_" r="7.2256">
-<stop offset="0" style="stop-color:#48630C"/>
-<stop offset="0.7879" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
-</radialGradient>
-<path d="M45.672,37.58c0,2.232-1.809,4.041-4.041,4.039c-2.232,0-4.041-1.811-4.041-4.041  c0,0,1.385,2.465,4.041,2.465S45.672,37.58,45.672,37.58z" fill="url(#SVGID_15_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="41.6123" x2="41.6123" y1="32.7168" y2="37.5411">
-<stop offset="0" style="stop-color:#F8FBFF"/>
-<stop offset="1" style="stop-color:#808080"/>
-</linearGradient>
-<path d="M41.611,37.518c1.754,0,3.404-0.264,4.863-0.732  c-0.414-2.313-2.432-4.068-4.863-4.068c-2.43,0-4.445,1.756-4.861,4.068C38.207,37.254,39.859,37.518,41.611,37.518z" fill="url(#SVGID_16_)" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="32.7676" x2="50.541" y1="51.5801" y2="51.5801">
-<stop offset="0" style="stop-color:#878A8C"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#5B6163"/>
-<stop offset="1" style="stop-color:#959A9C"/>
-</linearGradient>
-<path d="M50.502,52.805c0.025-0.609,0.039-0.486,0.039-0.613v-0.033c0-0.996-0.816-1.803-1.824-1.803H34.592  c-1.008,0-1.824,0.807-1.824,1.803v0.033c0,0.127,0.014,0.004,0.039,0.613H50.502z" fill="url(#SVGID_17_)"/>
-<path d="M32.881,51.557H50.43c-0.08-0.225-0.203-0.426-0.361-0.6H33.242  C33.084,51.131,32.961,51.332,32.881,51.557z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M32.777,52.191c0.008,0.125,0.016,0.309,0.029,0.613h17.695  c0.012-0.305,0.021-0.488,0.027-0.613H32.777z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M33.24,50.957h16.826c-0.332-0.367-0.811-0.602-1.35-0.602H34.592  C34.053,50.355,33.574,50.59,33.24,50.957z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<rect fill="none" height="60" width="60"/>
-</g>
-<g>
-<linearGradient gradientTransform="matrix(1 1.000000e-004 -1.000000e-004 1 -2.3655 -29.0779)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="17.3926" x2="17.3926" y1="32.2334" y2="55.3194">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<polygon fill="url(#SVGID_1__)" points="4.648,15.727 14.942,26.471 25.397,15.714 19.763,15.712 19.759,3.417 10.166,3.416   10.166,15.726 "/>
-<line fill="#1D4489" x1="19.759" x2="10.166" y1="3.421" y2="3.42"/>
-<polygon fill="#E7FFB9" points="10.166,3.17 19.76,3.171 19.759,3.671 10.166,3.67 10.166,3.17 "/>
-<polygon fill="#E7FFB9" points="19.612,15.732 25.505,15.733 25.059,16.233 19.612,16.233 19.612,15.732 "/>
-<polygon fill="#E7FFB9" points="4.321,15.726 10.157,15.726 10.157,16.226 4.848,16.226 4.321,15.726 "/>
-<linearGradient gradientTransform="matrix(1 1.000000e-004 -1.000000e-004 1 -2.3655 -29.0779)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="26.5625" x2="7.7312" y1="50.3418" y2="50.3418">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
-</linearGradient>
-<polygon fill="url(#SVGID_2__)" points="25.072,15.713 14.942,26.112 4.925,15.7 4.229,15.701 14.941,26.83 25.771,15.713 "/>
-<rect fill="none" height="30" width="30"/>
-</g>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblestyle/resources/qtg_large_voip_dialled_call.svg
--- a/phoneuis/bubblemanager2/bubblestyle/resources/qtg_large_voip_dialled_call.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g>
-<rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="31.3823" x2="31.3823" y1="49.3193" y2="6.7675">
-<stop offset="0" style="stop-color:#004E8C"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
-</linearGradient>
-<circle cx="31.382" cy="28.137" fill="url(#SVGID_1_)" r="21.429"/>
-<radialGradient cx="23.8237" cy="17.7847" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="25.9191">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
-</radialGradient>
-<path d="M52.262,28.137c0,11.533-9.346,20.877-20.879,20.877c-11.533,0-20.882-9.344-20.882-20.877  c0-11.53,9.35-20.88,20.882-20.88C42.917,7.257,52.262,16.607,52.262,28.137z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="31.3823" x2="31.3823" y1="7.0732" y2="49.1199">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#88D6EB"/>
-</linearGradient>
-<path d="M31.383,7.257c-11.533,0-20.882,9.35-20.882,20.88c0,11.533,9.35,20.877,20.882,20.877  c11.533,0,20.879-9.344,20.879-20.877C52.262,16.607,42.917,7.257,31.383,7.257z M31.383,47.188  c-10.843,0-19.664-8.818-19.664-19.659c0-10.843,8.82-19.663,19.664-19.663c10.841,0,19.66,8.82,19.66,19.663  C51.043,38.369,42.224,47.188,31.383,47.188z" fill="url(#SVGID_3_)" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="10.8428" x2="14.1621" y1="30.9775" y2="30.9775">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<path d="M12.462,27.796C12.239,27.5,11.737,27.5,11.516,27.5c-0.437,0-0.669,0.312-0.673,0.616  v0.021l0.001,0.031c-0.001,0.537,0.029,1.14,0.094,1.872c0.013,0.138,0.03,0.276,0.047,0.414l0.024,0.201  c0.056,0.434,0.121,0.86,0.195,1.274l0.034,0.182c0.032,0.164,0.063,0.324,0.098,0.484c0.089,0.406,0.198,0.826,0.332,1.291  c0.02,0.066,0.037,0.133,0.055,0.199c0.028,0.109,0.058,0.217,0.091,0.322l0.005,0.014l0.012,0.033  c-0.003-0.01-0.008-0.023-0.01-0.037l1.198-0.08c0.019-0.188,0.024-0.383,0.019-0.576c-0.01-0.303-0.021-0.676-0.107-0.99  l1.112-1.494l0.12-0.162v-0.203v-1.165v-0.252l-0.179-0.178L12.462,27.796z" fill="url(#SVGID_4_)" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="17.2432" x2="51.9731" y1="24.897" y2="24.897">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<path d="M51.966,24.045c-0.016-0.079-0.029-0.136-0.043-0.191  c-0.011-0.042-0.021-0.084-0.029-0.125c-0.106-0.495-0.237-1.005-0.392-1.525l-0.017-0.058c-0.033-0.117-0.068-0.234-0.105-0.349  c-0.188-0.588-0.393-1.148-0.608-1.666c-0.027-0.066-0.056-0.125-0.084-0.188l-0.045-0.1c-0.206-0.474-0.436-0.947-0.677-1.403  l-0.03-0.059c-0.047-0.09-0.093-0.181-0.142-0.269c-0.295-0.532-0.604-1.041-0.918-1.512c-0.032-0.049-0.069-0.102-0.106-0.154  c-0.023-0.031-0.045-0.061-0.066-0.092c-0.302-0.437-0.618-0.862-0.946-1.268l-0.064-0.082c-0.044-0.055-0.088-0.111-0.134-0.167  c-0.381-0.456-0.783-0.898-1.199-1.317c-0.056-0.056-0.115-0.115-0.176-0.172l-0.049-0.047c-0.375-0.368-0.774-0.732-1.183-1.074  l-0.081-0.069c-0.041-0.037-0.083-0.073-0.125-0.106c-0.446-0.367-0.931-0.728-1.435-1.075c-0.063-0.042-0.126-0.083-0.19-0.124  l-0.077-0.05c-0.454-0.301-0.928-0.59-1.404-0.853l-0.072-0.042c-0.04-0.023-0.079-0.045-0.119-0.068  c-0.529-0.283-1.081-0.55-1.643-0.792l-0.142-0.057l-0.153-0.063c-0.148-0.061-0.297-0.114-0.443-0.165  c-0.077-0.026-0.152-0.053-0.228-0.08l-0.282-0.105L38.303,8.74c-0.17,0.107-0.84,0.49-1.235,0.715  c-0.438-0.059-1.499-0.192-2.57-0.295c0.33-0.032,0.787-0.069,1.43-0.111l0.09-1.204L35.97,7.832  c-0.039-0.011-0.077-0.021-0.116-0.029l-0.092-0.018l-0.075-0.015c-0.655-0.131-1.271-0.227-1.882-0.291l-0.004-0.001l-0.085-0.009  c-0.698-0.07-1.409-0.106-2.112-0.106c-0.62,0-1.262,0.033-1.964,0.101c-0.109,0.01-0.214,0.021-0.321,0.032  c-0.693,0.078-1.3,0.17-1.873,0.286l-0.02,0.003l-0.015,0.002c-0.604,0.125-1.211,0.281-1.856,0.477  c-0.058,0.018-0.116,0.037-0.173,0.055l-0.131,0.043c-0.547,0.176-1.082,0.371-1.596,0.582c-0.042,0.018-0.071,0.029-0.1,0.04  l-0.078,0.031c-0.564,0.24-1.128,0.512-1.688,0.812c-0.06,0.031-0.118,0.066-0.177,0.099L21.542,9.97  c-0.157,0.087-0.315,0.185-0.473,0.283l-0.203,0.127l-1.118,0.684l1.242,0.415c0.186,0.063,0.385,0.093,0.592,0.093  c0.67,0,1.317-0.329,1.838-0.593c0.209-0.105,0.521-0.264,0.648-0.288c0.152,0.045,0.306,0.068,0.458,0.068  c0.569,0,1.035-0.306,1.446-0.578l0.111-0.072c0.134-0.043,0.362-0.128,0.818-0.299c0.465-0.174,1.314-0.493,1.54-0.546  c0.44-0.005,0.966-0.068,1.339-0.3c0.352,0.058,0.977,0.157,1.619,0.24c-0.047,0.029-0.093,0.059-0.132,0.097  c-0.209,0.192-1.335,0.533-1.68,0.578c-0.647,0.081-0.908,0.408-1.012,0.666c-0.135,0.336-0.054,0.672,0.078,0.946  c-0.245,0.162-0.545,0.342-0.804,0.479c0.001-0.006,0.003-0.012,0.004-0.02c0.093-0.517,0.16-0.89-0.091-1.189  c-0.128-0.153-0.317-0.241-0.519-0.241c-0.295,0-0.525,0.183-0.711,0.362c-0.52,0.502-0.834,1.129-0.952,1.365l-0.022,0.044  l-0.019,0.035c-0.225,0.431-0.317,0.737-0.192,1.688c-0.055,0.04-0.219,0.102-0.445,0.102c-0.03,0-0.058-0.002-0.079-0.003  c-0.146-0.158-0.349-0.248-0.576-0.248l0,0c-0.524,0-1.238,0.589-2.123,1.754l-0.284,0.374l0.289,0.371l0.27,0.343  c-4.216,3.259-4.248,3.444-4.292,3.717c-0.007,0.024-0.044,0.137-0.095,0.293c-0.628,1.952-0.977,3.413-0.637,4.194  c0.784,1.813,1.669,3.505,2.815,3.599c0.101,0.008,0.212,0.012,0.332,0.012c1.051,0,2.753-0.318,3.572-0.485  c0.151,0.283,0.335,0.614,0.438,0.795l0.181,0.323l0.37-0.012c0.004,0,0.199-0.006,0.448-0.006c0.286,0,0.478,0.008,0.602,0.017  c0.446,1.307,1.3,4.317,1.142,4.944L27.272,34.1c-1.441,2.16,0.306,4.975,1.145,6.328c0.066,0.107,0.126,0.203,0.177,0.287  c0.324,0.922,0.716,1.531,1.545,1.531c0.062,0,0.124-0.004,0.188-0.008c0.047-0.002,0.096-0.004,0.146-0.004  c0.092,0,0.157,0.01,0.226,0.035l0.075,0.027l0.08,0.006c0.155,0.014,0.306,0.035,0.453,0.057c0.255,0.035,0.519,0.07,0.788,0.07  c0.721,0,1.293-0.271,1.787-0.855c0.019-0.002,0.036-0.004,0.055-0.006c0.518-0.072,0.712-0.332,0.778-0.564  c0.038-0.039,0.089-0.086,0.131-0.125c0.204-0.188,0.447-0.41,0.615-0.674c0.075-0.045,0.161-0.096,0.258-0.152  c0.167-0.104,0.355-0.217,0.504-0.293c0.131-0.041,0.247-0.117,0.334-0.225c0.209-0.258,0.166-0.549,0.131-0.783  c-0.035-0.242-0.071-0.492,0.06-0.758c0.738-0.355,2.051-1.23,2.263-1.375l-0.001,0.018c-0.014,0.117-0.048,0.43-0.1,0.629  c-0.279,0.279-0.513,0.703-0.586,0.846l-0.049,0.094l-0.015,0.104c-0.019,0.137-0.094,0.85,0.306,1.311  c0.202,0.23,0.49,0.359,0.813,0.359c0.103,0,0.21-0.014,0.319-0.039c1.027-0.232,2.85-2.703,2.998-4.066  c0.072-0.656-0.185-1.172-0.704-1.416l-0.387-0.184l-0.304,0.303l-1.125,1.125c-0.38,0.035-0.678,0.148-0.879,0.326  c0.012-0.48-0.035-0.973-0.086-1.451c-0.155-1.447-0.185-2.369,0.703-2.996l0.045-0.033l0.038-0.039  c0.321-0.326,0.676-0.611,1.052-0.914c0.88-0.707,1.79-1.438,2.332-2.759l0.022-0.056c0.174-0.451,0.437-1.132,0.081-1.651  c-0.089-0.128-0.275-0.327-0.624-0.397c0.462-0.186,0.816-0.332,0.851-0.346l0.107-0.044l0.083-0.08l1.898-1.822l0.278-0.268  l-0.122-0.366c-0.017-0.047-0.12-0.335-0.411-0.747c0.554,0.075,1.029,0.208,1.185,0.326c0.057,0.124,0.171,0.396,0.292,0.683  c2.089,4.924,2.382,5.178,2.926,5.187c0.021,0,0.037,0.002,0.051,0.003c0.044,0.003,0.083,0.005,0.119,0.005  c0.31,0,0.486-0.157,0.564-0.252c0.227-0.274,0.163-0.608,0.14-0.734l-0.009-0.043c-0.025-0.294-0.008-1.618,0.034-2.706  c0.003,0.002,0.004,0.006,0.006,0.01l1.12-0.445L51.966,24.045z M35.508,18.021c-0.087,0.003-0.181,0.008-0.282,0.012  c-0.322,0.015-0.688,0.031-1.053,0.031c-0.955,0-1.174-0.118-1.196-0.131c-0.113-0.082-0.229-0.144-0.35-0.188  c0.216-0.048,0.464-0.214,0.719-0.708c0.251,0.487,0.592,0.917,1.115,0.917c0.142,0,0.277-0.034,0.406-0.101  C35.043,17.856,35.333,17.957,35.508,18.021z M35.133,15.357c-0.072,0-0.131-0.003-0.176-0.007c0.049-0.128,0.107-0.202,0.154-0.244  c0.06,0.093,0.14,0.175,0.232,0.245C35.27,15.355,35.2,15.357,35.133,15.357z M31.331,16.635c0.327,0.641,0.569,0.917,0.762,1.037  c-0.475,0.038-0.833,0.339-1.126,0.625c-0.206-0.068-0.565-0.286-0.672-0.438c-0.063-0.089-0.138-0.166-0.221-0.232  C30.593,17.479,31.049,16.998,31.331,16.635z M29.523,16.163l-0.679-0.033l-2.278-0.111c0.278-0.229,0.541-0.444,0.697-0.57  c0.042-0.015,0.205-0.06,0.605-0.06c0.242,0,0.474,0.017,0.62,0.029L29.523,16.163z" fill="url(#SVGID_5_)" fill-opacity="0.3" stroke-opacity="0.3"/>
-<radialGradient cx="24.4912" cy="10.4414" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="23.6744">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
-</radialGradient>
-<path d="M11.451,28.125C11.451,28.125,11.451,28.125,11.451,28.125c0,0.008,0.001,0.012,0.001,0.018  c0,0.622,0.039,1.236,0.093,1.844c0.018,0.198,0.047,0.398,0.069,0.598c0.053,0.417,0.116,0.83,0.19,1.238  c0.042,0.215,0.081,0.434,0.127,0.646c0.094,0.422,0.203,0.838,0.321,1.248c0.05,0.17,0.089,0.342,0.141,0.508  c0.007,0.018,0.015,0.033,0.019,0.051c0.017-0.16,0.021-0.326,0.017-0.496c-0.04-1.199-0.232-1.045-0.232-1.045l1.356-1.822v-1.165  l-1.589-1.589C11.964,28.159,11.452,28.079,11.451,28.125z" fill="url(#SVGID_6_)"/>
-<radialGradient cx="24.4868" cy="10.4395" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="23.6775">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
-</radialGradient>
-<path d="M24.212,10.099c0.587,0.193,1.066-0.2,1.613-0.549c0.193-0.04,2.338-0.896,2.57-0.896  c0.231,0,1.011-0.03,1.204-0.34c0,0,3.357,0.584,3.863,0.389c0.275-0.107,1.433-0.2,2.425-0.264  c-0.056-0.012-0.106-0.029-0.162-0.041c-0.054-0.011-0.105-0.019-0.161-0.03c-0.623-0.126-1.252-0.226-1.894-0.29  c-0.006,0-0.01,0-0.016-0.002c-0.674-0.068-1.358-0.104-2.052-0.104c-0.644,0-1.277,0.038-1.906,0.098  c-0.11,0.011-0.221,0.022-0.331,0.035c-0.608,0.067-1.211,0.155-1.801,0.274c-0.01,0.003-0.021,0.004-0.031,0.006  c-0.612,0.127-1.213,0.283-1.802,0.464c-0.102,0.03-0.199,0.064-0.302,0.096c-0.522,0.168-1.038,0.356-1.544,0.564  c-0.06,0.026-0.12,0.048-0.18,0.072c-0.557,0.238-1.1,0.501-1.63,0.784c-0.08,0.043-0.156,0.089-0.234,0.134  c-0.227,0.125-0.44,0.267-0.66,0.402C22.273,11.265,23.635,9.904,24.212,10.099z" fill="url(#SVGID_7_)"/>
-<radialGradient cx="24.4863" cy="10.437" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="23.6745">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.3152" style="stop-color:#B2F56E"/>
-<stop offset="0.7273" style="stop-color:#5CBF1B"/>
-<stop offset="1" style="stop-color:#227A00"/>
-</radialGradient>
-<path d="M51.366,24.146c-0.021-0.102-0.049-0.197-0.069-0.297c-0.106-0.499-0.233-0.99-0.378-1.474  c-0.038-0.13-0.076-0.264-0.118-0.395c-0.176-0.549-0.371-1.09-0.59-1.616c-0.04-0.093-0.085-0.184-0.125-0.275  c-0.202-0.464-0.421-0.918-0.657-1.363c-0.056-0.106-0.109-0.215-0.166-0.319c-0.279-0.502-0.575-0.993-0.893-1.469  c-0.054-0.083-0.114-0.161-0.17-0.243c-0.291-0.422-0.596-0.831-0.916-1.228c-0.064-0.079-0.127-0.16-0.194-0.24  c-0.368-0.442-0.756-0.868-1.161-1.277c-0.069-0.07-0.143-0.14-0.215-0.208c-0.369-0.363-0.755-0.714-1.153-1.047  c-0.067-0.056-0.131-0.116-0.198-0.171c-0.448-0.366-0.915-0.714-1.395-1.043c-0.084-0.057-0.17-0.112-0.256-0.167  c-0.442-0.294-0.898-0.571-1.366-0.83c-0.063-0.035-0.123-0.073-0.187-0.108c-0.52-0.278-1.05-0.533-1.594-0.768  c-0.097-0.041-0.194-0.079-0.29-0.12c-0.211-0.087-0.432-0.156-0.646-0.235c-0.255,0.163-1.438,0.832-1.438,0.832  s-5.141-0.702-5.491-0.353c-0.352,0.353-1.721,0.71-2.033,0.751c-0.311,0.04-0.956,0.206-0.182,1.161  c-0.116,0.118-2.325,1.657-2.325,0.957s0.494-1.953-0.2-1.282c-0.498,0.482-0.796,1.135-0.86,1.257  c-0.163,0.312-0.263,0.461-0.145,1.357s-1.43,0.891-1.534,0.659c-0.276-0.622-1.809,1.394-1.809,1.394l0.646,0.828  c0,0-4.51,3.474-4.548,3.707c-0.04,0.234-1.164,3.25-0.775,4.147c0.39,0.897,1.376,3.158,2.307,3.233  c1.222,0.101,4.186-0.559,4.186-0.559c0.08,0.196,0.638,1.189,0.638,1.189s1.453-0.048,1.534,0.11  c0.026,0.053,1.75,5.122,1.182,5.794c-1.357,2.033,0.775,5.012,1.369,6.02c0.594,1.73,0.977,0.955,1.758,1.238  c0.962,0.084,1.772,0.439,2.589-0.611c0.237-0.195,0.641-0.041,0.641-0.313c0-0.152,0.698-0.598,0.878-1.018  c0.188-0.088,0.674-0.414,1.003-0.572c0.299-0.02-0.283-0.82,0.309-1.666c0.64-0.252,2.364-1.414,2.364-1.414  c0.078-1.705-0.839-3.811,0.873-5.02c1.104-1.126,2.553-1.767,3.255-3.479c0.194-0.506,0.628-1.542-0.619-1.231  c-1.173,0.295-2.48,0.362-1.861-0.154c-0.071-0.634-0.85-0.932-1.55-1.552c-0.361-0.854-0.93-2.378-0.93-2.378l-1.24-1.885  l0.155-0.389l1.474,2.171l1.474,1.781c0.542,1.783,1.007,1.939,1.007,1.939c0.815-0.288,2.753-1.086,2.753-1.086l1.898-1.822  c0,0-0.195-0.581-0.967-1.316l-0.584-0.349c-0.126,0.357-0.802,0.491-0.802,0.491l-1.641-1.964l0.61-0.123l0.471,0.896l1.128,0.39  c0,0,0.313-0.229,0.893,0.371c0.473-0.039,2.318,0.09,2.749,0.636c0.085,0.109,2.287,5.607,2.721,5.614  c0.19,0.002,0.329,0.077,0.267-0.256c-0.078-0.156,0-3.609,0.116-4.349c0.295-0.628,0.343-0.003,1.04,1.188  C51.374,24.204,51.372,24.175,51.366,24.146z M31.993,10.823c0.154-0.459,1.047-0.615,1.047-0.615s-0.256,0.473-0.197,0.716  c0.06,0.247-0.407,0.402-0.46,0.982c-0.051,0.578-1.117,0.239-1.204,0.036C31.09,11.74,31.835,11.281,31.993,10.823z M35.816,18.624  c-0.661,0-2.645,0.196-3.19-0.194c-0.546-0.389-0.97,0.04-1.362,0.43c-0.258,0.253-1.193-0.26-1.468-0.649  c-0.271-0.39-1.188-0.361-1.188-0.361l0.208-1.111l-2.637-0.128l-1.499,0.439l-1.41,0.041l0.79-0.376l0.983-0.232  c0,0,1.431-1.176,1.859-1.526c0.363-0.297,1.811-0.129,1.811-0.129l1.589,1.146c0,0-0.353,0.898-0.508,1.091  c0.583-0.039,1.269-1.099,1.269-1.099c-1.239-1.138-1.188-1.524-1.188-1.524l1.633,1.146l0.016,0.01c0,0,0.661,1.558,0.937,1.558  c0.271,0,0.619-1.073,0.619-1.073l0.465-0.117c0.207,0.492,0.595,1.603,1.059,1.343c0.269-0.147,0.71-0.013,1.215,0.181  c0.509,0.195,0.854-0.104,1.267,0.258C37.03,19.349,36.089,18.702,35.816,18.624z M36.853,15.943  c-0.681-0.259-2.984,0.586-2.47-0.796c0.275-0.746,0.981-0.901,1.223-0.405c0.063,0.204,0.83,0.519,0.824,0.09  c-0.006-0.431,0.771-0.659,0.883-0.338C36.899,14.791,38.932,16.341,36.853,15.943z M41.192,17.252  c-0.377-0.304,0.169-0.564-0.387-1.041c-0.798-0.684-1.421-0.978-0.334-1.532c1.341-0.168,0.218,0.428,0.44,0.786  c0.119,0.19,0.796,0.828,1.325,1.61C42.676,17.725,41.567,17.555,41.192,17.252z" fill="url(#SVGID_8_)"/>
-<radialGradient cx="24.4839" cy="10.4453" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="23.6688">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
-</radialGradient>
-<path d="M41.733,35.008l-1.293,1.291c0,0-0.778,0-0.815,0.313c-0.017,0.133-0.063,0.709-0.192,1.006  c-0.258,0.18-0.569,0.775-0.569,0.775s-0.158,1.15,0.699,0.953C40.42,39.152,43.059,35.633,41.733,35.008z" fill="url(#SVGID_9_)"/>
-<path d="M31.68,48.668c1.546,0,3.049-0.174,4.499-0.49c-0.039-0.049-0.071-0.1-0.114-0.145  l-7.534-7.756c-0.434-0.447-1.031-0.705-1.638-0.705c-0.57,0-1.102,0.221-1.5,0.625l-1.144,1.18l-0.472,0.477l-0.436,0.447  c-1.654-1.605-3.133-3.443-4.739-5.873c-0.888-1.348-1.653-2.988-2.138-4.123l-0.178-0.424c-0.001,0-0.242-0.598-0.324-0.811  l-0.027-0.068c-0.067-0.176-0.127-0.341-0.184-0.5l-0.025-0.069l1.843-0.641c1.017-0.344,1.593-1.403,1.363-2.555l-0.007-0.036  l-1.154-3.523l-2.274-6.787c-0.162-0.486-0.47-0.886-0.858-1.16c-2.416,3.407-3.841,7.565-3.841,12.059  C10.797,39.322,20.147,48.668,31.68,48.668z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M31.68,48.668c1.301,0,2.57-0.125,3.806-0.352l-7.394-7.613c-0.32-0.33-0.758-0.52-1.199-0.52  c-0.404,0-0.779,0.156-1.061,0.441l-1.148,1.182l-0.467,0.473l-0.424,0.436l0.003,0.004l-0.435,0.445  c-1.866-1.736-3.509-3.734-5.269-6.4c-0.91-1.381-1.694-3.059-2.192-4.221l-0.158-0.375l-0.024-0.059c0,0-0.243-0.602-0.327-0.816  l-0.029-0.072c-0.068-0.18-0.129-0.347-0.19-0.513c0,0-0.12-0.337-0.145-0.41l0.071-0.295l2.272-0.791  c0.721-0.244,1.127-1.009,0.966-1.819l-0.007-0.036l-1.142-3.485l-2.274-6.789c-0.119-0.357-0.343-0.65-0.626-0.851  c-2.204,3.31-3.492,7.283-3.492,11.557C10.797,39.322,20.147,48.668,31.68,48.668z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<radialGradient cx="-859.7427" cy="-265.1074" gradientTransform="matrix(0.9999 -0.0111 0.0111 0.9999 905.1068 277.0371)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="34.2211">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.8364" style="stop-color:#E9F0F2"/>
-<stop offset="0.8909" style="stop-color:#AAB1B5"/>
-<stop offset="0.9515" style="stop-color:#7C878C"/>
-<stop offset="1" style="stop-color:#838F94"/>
-</radialGradient>
-<path d="M23.387,44.016c-2.39-2.133-4.191-4.469-5.806-6.914c-1.552-2.357-2.958-5.889-3.393-7.428  l-6.272-8.836c-0.357,0.592-0.921,2.715-0.661,5.588c0.262,2.872,2.939,9.828,6.083,14.596c3.146,4.766,7.81,9.248,9.374,10.24  c2.462,1.561,5.427,2.074,6.329,2.029c0,0,0.833-0.098,1.97-0.496C31.5,52.625,23.387,44.016,23.387,44.016z" fill="url(#SVGID_10_)"/>
-<path d="M15.369,32.857c-0.55-1.283-0.976-2.456-1.18-3.184l-6.104-8.599c-0.064,0.09-0.099,0.144-0.099,0.144  c-0.104,0.172-0.22,0.458-0.338,0.813c-0.118,0.599-0.177,1.219-0.167,1.854C7.541,28.374,10.936,32.078,15.369,32.857z" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M15.108,32.234c-0.423-1.033-0.749-1.953-0.919-2.561l-6.125-8.627c-0.069,0.101-0.109,0.161-0.109,0.161  c-0.097,0.162-0.208,0.434-0.318,0.769c-0.111,0.567-0.168,1.151-0.159,1.751C7.536,28.033,10.834,31.572,15.108,32.234z" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M7.907,21.188c-0.088,0.148-0.188,0.394-0.289,0.698c-0.102,0.514-0.152,1.046-0.144,1.59  c0.054,4.01,3.21,7.283,7.24,7.757c-0.232-0.618-0.412-1.157-0.526-1.559l-6.154-8.67C7.951,21.121,7.907,21.188,7.907,21.188z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="-891.105" cy="-262.4795" gradientTransform="matrix(1.0009 -0.0086 0.0135 0.9911 906.6143 271.6763)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="11.8382">
-<stop offset="0" style="stop-color:#D1D8D9"/>
-<stop offset="0.0424" style="stop-color:#D1D8D9"/>
-<stop offset="0.4" style="stop-color:#BBC0C2"/>
-<stop offset="0.7333" style="stop-color:#7C8C91"/>
-<stop offset="1" style="stop-color:#A7B3B7"/>
-</radialGradient>
-<path d="M14.188,29.674l1.312-0.461c0,0-2.781-12.441-3.885-11.868c-0.555,0.29-0.549,0.448-1.11,0.853  c-1.676,1.219-2.589,2.641-2.589,2.641c-0.077,0.13-0.165,0.345-0.252,0.613c-0.088,0.45-0.134,0.916-0.128,1.392  c0.05,3.62,2.979,6.563,6.661,6.841C14.194,29.681,14.189,29.677,14.188,29.674z" fill="url(#SVGID_11_)"/>
-<path d="M23.289,45.25c-0.259,0.727-0.4,1.498-0.39,2.303c0.025,1.906,0.882,3.621,2.242,4.898  c1.716,0.641,3.287,0.871,3.9,0.84c0,0,0.833-0.098,1.97-0.496c0.409-0.143-5.222-6.213-7.055-8.172L23.289,45.25z" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M23.448,44.59c-0.261,0.725-0.401,1.496-0.391,2.301c0.036,2.613,1.621,4.875,3.95,6.125  c0.771,0.18,1.418,0.264,1.829,0.275c0.011,0,0.026,0.002,0.037,0c0,0,0.832-0.096,1.972-0.494c0.422-0.148-5.624-6.641-7.233-8.363  L23.448,44.59z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="-877.4263" cy="-238.3691" gradientTransform="matrix(1.0009 -0.0086 0.0135 0.9911 906.6143 271.6763)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="12.0474">
-<stop offset="0" style="stop-color:#D1D8D9"/>
-<stop offset="0.0424" style="stop-color:#D1D8D9"/>
-<stop offset="0.4" style="stop-color:#BBC0C2"/>
-<stop offset="0.7333" style="stop-color:#7C8C91"/>
-<stop offset="1" style="stop-color:#A7B3B7"/>
-</radialGradient>
-<path d="M32.6,52.1c0.653-0.35,0.819-0.34,1.351-0.74c0.98-0.74-8.83-9.123-8.83-9.123l-1.712,1.756  c-0.229,0.695-0.355,1.434-0.345,2.203c0.051,3.766,3.219,6.797,7.107,6.857C30.828,52.877,31.693,52.584,32.6,52.1z" fill="url(#SVGID_12_)"/>
-<path d="M14.866,29.428l0.634-0.215c0,0-2.781-12.441-3.885-11.868  c-0.291,0.151-0.427,0.268-0.573,0.401L14.866,29.428z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<linearGradient gradientTransform="matrix(0.9999 -0.0111 0.0111 0.9999 905.1068 277.0361)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="-889.625" x2="-885.2537" y1="-270.9771" y2="-257.0911">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.0424" style="stop-color:#E9F0F2"/>
-<stop offset="0.4" style="stop-color:#D4D9DB"/>
-<stop offset="0.7333" style="stop-color:#98AAAD"/>
-<stop offset="1" style="stop-color:#D0DADE"/>
-</linearGradient>
-<path d="M15.5,29.214l1.677-0.583c0.435-0.147,0.659-0.629,0.562-1.119l-1.129-3.446l-2.275-6.79  c-0.177-0.533-0.71-0.836-1.188-0.676c0,0-0.429,0.175-1.529,0.747L15.5,29.214z" fill="url(#SVGID_13_)"/>
-<path d="M25.121,42.236l-0.468,0.473l8.748,9.039c0.188-0.131,0.379-0.26,0.55-0.389  C34.931,50.619,25.121,42.236,25.121,42.236z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<linearGradient gradientTransform="matrix(0.9999 -0.0111 0.0111 0.9999 905.1068 277.0366)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="-876.2178" x2="-867.1104" y1="-245.4277" y2="-235.398">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.0424" style="stop-color:#E9F0F2"/>
-<stop offset="0.4" style="stop-color:#D4D9DB"/>
-<stop offset="0.7333" style="stop-color:#98AAAD"/>
-<stop offset="1" style="stop-color:#D0DADE"/>
-</linearGradient>
-<path d="M33.95,51.357c0.978-0.738,1.295-1.059,1.295-1.059c0.364-0.373,0.338-1.002-0.059-1.412  l-7.534-7.756c-0.397-0.412-1.016-0.451-1.38-0.08l-1.151,1.186L33.95,51.357z" fill="url(#SVGID_14_)"/>
-</g>
-<g>
-<linearGradient gradientTransform="matrix(1 1.000000e-004 -1.000000e-004 1 -2.3655 -29.0779)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="17.3477" x2="17.3477" y1="31.0703" y2="55.8327">
-<stop offset="0" style="stop-color:#45E8FF"/>
-<stop offset="0.1455" style="stop-color:#45E8FF"/>
-<stop offset="0.5576" style="stop-color:#30A4D5"/>
-<stop offset="1" style="stop-color:#1347BA"/>
-</linearGradient>
-<polygon fill="url(#SVGID_1__)" points="25.381,14.288 15.027,3.528 4.573,14.288 10.207,14.288 10.21,26.582 19.865,26.584   19.863,14.288 "/>
-<linearGradient gradientTransform="matrix(1 1.000000e-004 -1.000000e-004 1 -2.3655 -29.0779)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="17.3701" x2="17.3701" y1="32.3115" y2="43.6498">
-<stop offset="0" style="stop-color:#B3FCFF"/>
-<stop offset="0.4182" style="stop-color:#B3FCFF"/>
-<stop offset="1" style="stop-color:#5FBAD8"/>
-</linearGradient>
-<polygon fill="url(#SVGID_2__)" points="4.897,14.286 15.026,3.888 25.104,14.288 25.801,14.288 15.027,3.17 4.199,14.286 "/>
-<line fill="#1D4489" x1="10.21" x2="19.865" y1="26.578" y2="26.58"/>
-<polygon fill="#33AEDB" points="19.867,26.83 10.21,26.828 10.21,26.328 19.866,26.33 19.867,26.83 "/>
-<rect fill="none" height="30" width="30"/>
-</g>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblestyle/resources/qtg_large_voip_missed_call.svg
--- a/phoneuis/bubblemanager2/bubblestyle/resources/qtg_large_voip_missed_call.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g>
-<rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="31.3823" x2="31.3823" y1="49.3193" y2="6.7675">
-<stop offset="0" style="stop-color:#004E8C"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
-</linearGradient>
-<circle cx="31.382" cy="28.137" fill="url(#SVGID_1_)" r="21.429"/>
-<radialGradient cx="23.8237" cy="17.7847" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="25.9191">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
-</radialGradient>
-<path d="M52.262,28.137c0,11.533-9.346,20.877-20.879,20.877c-11.533,0-20.882-9.344-20.882-20.877  c0-11.53,9.35-20.88,20.882-20.88C42.917,7.257,52.262,16.607,52.262,28.137z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="31.3823" x2="31.3823" y1="7.0732" y2="49.1199">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#88D6EB"/>
-</linearGradient>
-<path d="M31.383,7.257c-11.533,0-20.882,9.35-20.882,20.88c0,11.533,9.35,20.877,20.882,20.877  c11.533,0,20.879-9.344,20.879-20.877C52.262,16.607,42.917,7.257,31.383,7.257z M31.383,47.188  c-10.843,0-19.664-8.818-19.664-19.659c0-10.843,8.82-19.663,19.664-19.663c10.841,0,19.66,8.82,19.66,19.663  C51.043,38.369,42.224,47.188,31.383,47.188z" fill="url(#SVGID_3_)" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="10.8428" x2="14.1621" y1="30.9775" y2="30.9775">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<path d="M12.462,27.796C12.239,27.5,11.737,27.5,11.516,27.5c-0.437,0-0.669,0.312-0.673,0.616  v0.021l0.001,0.031c-0.001,0.537,0.029,1.14,0.094,1.872c0.013,0.138,0.03,0.276,0.047,0.414l0.024,0.201  c0.056,0.434,0.121,0.86,0.195,1.274l0.034,0.182c0.032,0.164,0.063,0.324,0.098,0.484c0.089,0.406,0.198,0.826,0.332,1.291  c0.02,0.066,0.037,0.133,0.055,0.199c0.028,0.109,0.058,0.217,0.091,0.322l0.005,0.014l0.012,0.033  c-0.003-0.01-0.008-0.023-0.01-0.037l1.198-0.08c0.019-0.188,0.024-0.383,0.019-0.576c-0.01-0.303-0.021-0.676-0.107-0.99  l1.112-1.494l0.12-0.162v-0.203v-1.165v-0.252l-0.179-0.178L12.462,27.796z" fill="url(#SVGID_4_)" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="17.2432" x2="51.9731" y1="24.897" y2="24.897">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<path d="M51.966,24.045c-0.016-0.079-0.029-0.136-0.043-0.191  c-0.011-0.042-0.021-0.084-0.029-0.125c-0.106-0.495-0.237-1.005-0.392-1.525l-0.017-0.058c-0.033-0.117-0.068-0.234-0.105-0.349  c-0.188-0.588-0.393-1.148-0.608-1.666c-0.027-0.066-0.056-0.125-0.084-0.188l-0.045-0.1c-0.206-0.474-0.436-0.947-0.677-1.403  l-0.03-0.059c-0.047-0.09-0.093-0.181-0.142-0.269c-0.295-0.532-0.604-1.041-0.918-1.512c-0.032-0.049-0.069-0.102-0.106-0.154  c-0.023-0.031-0.045-0.061-0.066-0.092c-0.302-0.437-0.618-0.862-0.946-1.268l-0.064-0.082c-0.044-0.055-0.088-0.111-0.134-0.167  c-0.381-0.456-0.783-0.898-1.199-1.317c-0.056-0.056-0.115-0.115-0.176-0.172l-0.049-0.047c-0.375-0.368-0.774-0.732-1.183-1.074  l-0.081-0.069c-0.041-0.037-0.083-0.073-0.125-0.106c-0.446-0.367-0.931-0.728-1.435-1.075c-0.063-0.042-0.126-0.083-0.19-0.124  l-0.077-0.05c-0.454-0.301-0.928-0.59-1.404-0.853l-0.072-0.042c-0.04-0.023-0.079-0.045-0.119-0.068  c-0.529-0.283-1.081-0.55-1.643-0.792l-0.142-0.057l-0.153-0.063c-0.148-0.061-0.297-0.114-0.443-0.165  c-0.077-0.026-0.152-0.053-0.228-0.08l-0.282-0.105L38.303,8.74c-0.17,0.107-0.84,0.49-1.235,0.715  c-0.438-0.059-1.499-0.192-2.57-0.295c0.33-0.032,0.787-0.069,1.43-0.111l0.09-1.204L35.97,7.832  c-0.039-0.011-0.077-0.021-0.116-0.029l-0.092-0.018l-0.075-0.015c-0.655-0.131-1.271-0.227-1.882-0.291l-0.004-0.001l-0.085-0.009  c-0.698-0.07-1.409-0.106-2.112-0.106c-0.62,0-1.262,0.033-1.964,0.101c-0.109,0.01-0.214,0.021-0.321,0.032  c-0.693,0.078-1.3,0.17-1.873,0.286l-0.02,0.003l-0.015,0.002c-0.604,0.125-1.211,0.281-1.856,0.477  c-0.058,0.018-0.116,0.037-0.173,0.055l-0.131,0.043c-0.547,0.176-1.082,0.371-1.596,0.582c-0.042,0.018-0.071,0.029-0.1,0.04  l-0.078,0.031c-0.564,0.24-1.128,0.512-1.688,0.812c-0.06,0.031-0.118,0.066-0.177,0.099L21.542,9.97  c-0.157,0.087-0.315,0.185-0.473,0.283l-0.203,0.127l-1.118,0.684l1.242,0.415c0.186,0.063,0.385,0.093,0.592,0.093  c0.67,0,1.317-0.329,1.838-0.593c0.209-0.105,0.521-0.264,0.648-0.288c0.152,0.045,0.306,0.068,0.458,0.068  c0.569,0,1.035-0.306,1.446-0.578l0.111-0.072c0.134-0.043,0.362-0.128,0.818-0.299c0.465-0.174,1.314-0.493,1.54-0.546  c0.44-0.005,0.966-0.068,1.339-0.3c0.352,0.058,0.977,0.157,1.619,0.24c-0.047,0.029-0.093,0.059-0.132,0.097  c-0.209,0.192-1.335,0.533-1.68,0.578c-0.647,0.081-0.908,0.408-1.012,0.666c-0.135,0.336-0.054,0.672,0.078,0.946  c-0.245,0.162-0.545,0.342-0.804,0.479c0.001-0.006,0.003-0.012,0.004-0.02c0.093-0.517,0.16-0.89-0.091-1.189  c-0.128-0.153-0.317-0.241-0.519-0.241c-0.295,0-0.525,0.183-0.711,0.362c-0.52,0.502-0.834,1.129-0.952,1.365l-0.022,0.044  l-0.019,0.035c-0.225,0.431-0.317,0.737-0.192,1.688c-0.055,0.04-0.219,0.102-0.445,0.102c-0.03,0-0.058-0.002-0.079-0.003  c-0.146-0.158-0.349-0.248-0.576-0.248l0,0c-0.524,0-1.238,0.589-2.123,1.754l-0.284,0.374l0.289,0.371l0.27,0.343  c-4.216,3.259-4.248,3.444-4.292,3.717c-0.007,0.024-0.044,0.137-0.095,0.293c-0.628,1.952-0.977,3.413-0.637,4.194  c0.784,1.813,1.669,3.505,2.815,3.599c0.101,0.008,0.212,0.012,0.332,0.012c1.051,0,2.753-0.318,3.572-0.485  c0.151,0.283,0.335,0.614,0.438,0.795l0.181,0.323l0.37-0.012c0.004,0,0.199-0.006,0.448-0.006c0.286,0,0.478,0.008,0.602,0.017  c0.446,1.307,1.3,4.317,1.142,4.944L27.272,34.1c-1.441,2.16,0.306,4.975,1.145,6.328c0.066,0.107,0.126,0.203,0.177,0.287  c0.324,0.922,0.716,1.531,1.545,1.531c0.062,0,0.124-0.004,0.188-0.008c0.047-0.002,0.096-0.004,0.146-0.004  c0.092,0,0.157,0.01,0.226,0.035l0.075,0.027l0.08,0.006c0.155,0.014,0.306,0.035,0.453,0.057c0.255,0.035,0.519,0.07,0.788,0.07  c0.721,0,1.293-0.271,1.787-0.855c0.019-0.002,0.036-0.004,0.055-0.006c0.518-0.072,0.712-0.332,0.778-0.564  c0.038-0.039,0.089-0.086,0.131-0.125c0.204-0.188,0.447-0.41,0.615-0.674c0.075-0.045,0.161-0.096,0.258-0.152  c0.167-0.104,0.355-0.217,0.504-0.293c0.131-0.041,0.247-0.117,0.334-0.225c0.209-0.258,0.166-0.549,0.131-0.783  c-0.035-0.242-0.071-0.492,0.06-0.758c0.738-0.355,2.051-1.23,2.263-1.375l-0.001,0.018c-0.014,0.117-0.048,0.43-0.1,0.629  c-0.279,0.279-0.513,0.703-0.586,0.846l-0.049,0.094l-0.015,0.104c-0.019,0.137-0.094,0.85,0.306,1.311  c0.202,0.23,0.49,0.359,0.813,0.359c0.103,0,0.21-0.014,0.319-0.039c1.027-0.232,2.85-2.703,2.998-4.066  c0.072-0.656-0.185-1.172-0.704-1.416l-0.387-0.184l-0.304,0.303l-1.125,1.125c-0.38,0.035-0.678,0.148-0.879,0.326  c0.012-0.48-0.035-0.973-0.086-1.451c-0.155-1.447-0.185-2.369,0.703-2.996l0.045-0.033l0.038-0.039  c0.321-0.326,0.676-0.611,1.052-0.914c0.88-0.707,1.79-1.438,2.332-2.759l0.022-0.056c0.174-0.451,0.437-1.132,0.081-1.651  c-0.089-0.128-0.275-0.327-0.624-0.397c0.462-0.186,0.816-0.332,0.851-0.346l0.107-0.044l0.083-0.08l1.898-1.822l0.278-0.268  l-0.122-0.366c-0.017-0.047-0.12-0.335-0.411-0.747c0.554,0.075,1.029,0.208,1.185,0.326c0.057,0.124,0.171,0.396,0.292,0.683  c2.089,4.924,2.382,5.178,2.926,5.187c0.021,0,0.037,0.002,0.051,0.003c0.044,0.003,0.083,0.005,0.119,0.005  c0.31,0,0.486-0.157,0.564-0.252c0.227-0.274,0.163-0.608,0.14-0.734l-0.009-0.043c-0.025-0.294-0.008-1.618,0.034-2.706  c0.003,0.002,0.004,0.006,0.006,0.01l1.12-0.445L51.966,24.045z M35.508,18.021c-0.087,0.003-0.181,0.008-0.282,0.012  c-0.322,0.015-0.688,0.031-1.053,0.031c-0.955,0-1.174-0.118-1.196-0.131c-0.113-0.082-0.229-0.144-0.35-0.188  c0.216-0.048,0.464-0.214,0.719-0.708c0.251,0.487,0.592,0.917,1.115,0.917c0.142,0,0.277-0.034,0.406-0.101  C35.043,17.856,35.333,17.957,35.508,18.021z M35.133,15.357c-0.072,0-0.131-0.003-0.176-0.007c0.049-0.128,0.107-0.202,0.154-0.244  c0.06,0.093,0.14,0.175,0.232,0.245C35.27,15.355,35.2,15.357,35.133,15.357z M31.331,16.635c0.327,0.641,0.569,0.917,0.762,1.037  c-0.475,0.038-0.833,0.339-1.126,0.625c-0.206-0.068-0.565-0.286-0.672-0.438c-0.063-0.089-0.138-0.166-0.221-0.232  C30.593,17.479,31.049,16.998,31.331,16.635z M29.523,16.163l-0.679-0.033l-2.278-0.111c0.278-0.229,0.541-0.444,0.697-0.57  c0.042-0.015,0.205-0.06,0.605-0.06c0.242,0,0.474,0.017,0.62,0.029L29.523,16.163z" fill="url(#SVGID_5_)" fill-opacity="0.3" stroke-opacity="0.3"/>
-<radialGradient cx="24.4912" cy="10.4414" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="23.6744">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
-</radialGradient>
-<path d="M11.451,28.125C11.451,28.125,11.451,28.125,11.451,28.125c0,0.008,0.001,0.012,0.001,0.018  c0,0.622,0.039,1.236,0.093,1.844c0.018,0.198,0.047,0.398,0.069,0.598c0.053,0.417,0.116,0.83,0.19,1.238  c0.042,0.215,0.081,0.434,0.127,0.646c0.094,0.422,0.203,0.838,0.321,1.248c0.05,0.17,0.089,0.342,0.141,0.508  c0.007,0.018,0.015,0.033,0.019,0.051c0.017-0.16,0.021-0.326,0.017-0.496c-0.04-1.199-0.232-1.045-0.232-1.045l1.356-1.822v-1.165  l-1.589-1.589C11.964,28.159,11.452,28.079,11.451,28.125z" fill="url(#SVGID_6_)"/>
-<radialGradient cx="24.4868" cy="10.4395" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="23.6775">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
-</radialGradient>
-<path d="M24.212,10.099c0.587,0.193,1.066-0.2,1.613-0.549c0.193-0.04,2.338-0.896,2.57-0.896  c0.231,0,1.011-0.03,1.204-0.34c0,0,3.357,0.584,3.863,0.389c0.275-0.107,1.433-0.2,2.425-0.264  c-0.056-0.012-0.106-0.029-0.162-0.041c-0.054-0.011-0.105-0.019-0.161-0.03c-0.623-0.126-1.252-0.226-1.894-0.29  c-0.006,0-0.01,0-0.016-0.002c-0.674-0.068-1.358-0.104-2.052-0.104c-0.644,0-1.277,0.038-1.906,0.098  c-0.11,0.011-0.221,0.022-0.331,0.035c-0.608,0.067-1.211,0.155-1.801,0.274c-0.01,0.003-0.021,0.004-0.031,0.006  c-0.612,0.127-1.213,0.283-1.802,0.464c-0.102,0.03-0.199,0.064-0.302,0.096c-0.522,0.168-1.038,0.356-1.544,0.564  c-0.06,0.026-0.12,0.048-0.18,0.072c-0.557,0.238-1.1,0.501-1.63,0.784c-0.08,0.043-0.156,0.089-0.234,0.134  c-0.227,0.125-0.44,0.267-0.66,0.402C22.273,11.265,23.635,9.904,24.212,10.099z" fill="url(#SVGID_7_)"/>
-<radialGradient cx="24.4863" cy="10.437" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="23.6745">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.3152" style="stop-color:#B2F56E"/>
-<stop offset="0.7273" style="stop-color:#5CBF1B"/>
-<stop offset="1" style="stop-color:#227A00"/>
-</radialGradient>
-<path d="M51.366,24.146c-0.021-0.102-0.049-0.197-0.069-0.297c-0.106-0.499-0.233-0.99-0.378-1.474  c-0.038-0.13-0.076-0.264-0.118-0.395c-0.176-0.549-0.371-1.09-0.59-1.616c-0.04-0.093-0.085-0.184-0.125-0.275  c-0.202-0.464-0.421-0.918-0.657-1.363c-0.056-0.106-0.109-0.215-0.166-0.319c-0.279-0.502-0.575-0.993-0.893-1.469  c-0.054-0.083-0.114-0.161-0.17-0.243c-0.291-0.422-0.596-0.831-0.916-1.228c-0.064-0.079-0.127-0.16-0.194-0.24  c-0.368-0.442-0.756-0.868-1.161-1.277c-0.069-0.07-0.143-0.14-0.215-0.208c-0.369-0.363-0.755-0.714-1.153-1.047  c-0.067-0.056-0.131-0.116-0.198-0.171c-0.448-0.366-0.915-0.714-1.395-1.043c-0.084-0.057-0.17-0.112-0.256-0.167  c-0.442-0.294-0.898-0.571-1.366-0.83c-0.063-0.035-0.123-0.073-0.187-0.108c-0.52-0.278-1.05-0.533-1.594-0.768  c-0.097-0.041-0.194-0.079-0.29-0.12c-0.211-0.087-0.432-0.156-0.646-0.235c-0.255,0.163-1.438,0.832-1.438,0.832  s-5.141-0.702-5.491-0.353c-0.352,0.353-1.721,0.71-2.033,0.751c-0.311,0.04-0.956,0.206-0.182,1.161  c-0.116,0.118-2.325,1.657-2.325,0.957s0.494-1.953-0.2-1.282c-0.498,0.482-0.796,1.135-0.86,1.257  c-0.163,0.312-0.263,0.461-0.145,1.357s-1.43,0.891-1.534,0.659c-0.276-0.622-1.809,1.394-1.809,1.394l0.646,0.828  c0,0-4.51,3.474-4.548,3.707c-0.04,0.234-1.164,3.25-0.775,4.147c0.39,0.897,1.376,3.158,2.307,3.233  c1.222,0.101,4.186-0.559,4.186-0.559c0.08,0.196,0.638,1.189,0.638,1.189s1.453-0.048,1.534,0.11  c0.026,0.053,1.75,5.122,1.182,5.794c-1.357,2.033,0.775,5.012,1.369,6.02c0.594,1.73,0.977,0.955,1.758,1.238  c0.962,0.084,1.772,0.439,2.589-0.611c0.237-0.195,0.641-0.041,0.641-0.313c0-0.152,0.698-0.598,0.878-1.018  c0.188-0.088,0.674-0.414,1.003-0.572c0.299-0.02-0.283-0.82,0.309-1.666c0.64-0.252,2.364-1.414,2.364-1.414  c0.078-1.705-0.839-3.811,0.873-5.02c1.104-1.126,2.553-1.767,3.255-3.479c0.194-0.506,0.628-1.542-0.619-1.231  c-1.173,0.295-2.48,0.362-1.861-0.154c-0.071-0.634-0.85-0.932-1.55-1.552c-0.361-0.854-0.93-2.378-0.93-2.378l-1.24-1.885  l0.155-0.389l1.474,2.171l1.474,1.781c0.542,1.783,1.007,1.939,1.007,1.939c0.815-0.288,2.753-1.086,2.753-1.086l1.898-1.822  c0,0-0.195-0.581-0.967-1.316l-0.584-0.349c-0.126,0.357-0.802,0.491-0.802,0.491l-1.641-1.964l0.61-0.123l0.471,0.896l1.128,0.39  c0,0,0.313-0.229,0.893,0.371c0.473-0.039,2.318,0.09,2.749,0.636c0.085,0.109,2.287,5.607,2.721,5.614  c0.19,0.002,0.329,0.077,0.267-0.256c-0.078-0.156,0-3.609,0.116-4.349c0.295-0.628,0.343-0.003,1.04,1.188  C51.374,24.204,51.372,24.175,51.366,24.146z M31.993,10.823c0.154-0.459,1.047-0.615,1.047-0.615s-0.256,0.473-0.197,0.716  c0.06,0.247-0.407,0.402-0.46,0.982c-0.051,0.578-1.117,0.239-1.204,0.036C31.09,11.74,31.835,11.281,31.993,10.823z M35.816,18.624  c-0.661,0-2.645,0.196-3.19-0.194c-0.546-0.389-0.97,0.04-1.362,0.43c-0.258,0.253-1.193-0.26-1.468-0.649  c-0.271-0.39-1.188-0.361-1.188-0.361l0.208-1.111l-2.637-0.128l-1.499,0.439l-1.41,0.041l0.79-0.376l0.983-0.232  c0,0,1.431-1.176,1.859-1.526c0.363-0.297,1.811-0.129,1.811-0.129l1.589,1.146c0,0-0.353,0.898-0.508,1.091  c0.583-0.039,1.269-1.099,1.269-1.099c-1.239-1.138-1.188-1.524-1.188-1.524l1.633,1.146l0.016,0.01c0,0,0.661,1.558,0.937,1.558  c0.271,0,0.619-1.073,0.619-1.073l0.465-0.117c0.207,0.492,0.595,1.603,1.059,1.343c0.269-0.147,0.71-0.013,1.215,0.181  c0.509,0.195,0.854-0.104,1.267,0.258C37.03,19.349,36.089,18.702,35.816,18.624z M36.853,15.943  c-0.681-0.259-2.984,0.586-2.47-0.796c0.275-0.746,0.981-0.901,1.223-0.405c0.063,0.204,0.83,0.519,0.824,0.09  c-0.006-0.431,0.771-0.659,0.883-0.338C36.899,14.791,38.932,16.341,36.853,15.943z M41.192,17.252  c-0.377-0.304,0.169-0.564-0.387-1.041c-0.798-0.684-1.421-0.978-0.334-1.532c1.341-0.168,0.218,0.428,0.44,0.786  c0.119,0.19,0.796,0.828,1.325,1.61C42.676,17.725,41.567,17.555,41.192,17.252z" fill="url(#SVGID_8_)"/>
-<radialGradient cx="24.4839" cy="10.4453" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="23.6688">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
-</radialGradient>
-<path d="M41.733,35.008l-1.293,1.291c0,0-0.778,0-0.815,0.313c-0.017,0.133-0.063,0.709-0.192,1.006  c-0.258,0.18-0.569,0.775-0.569,0.775s-0.158,1.15,0.699,0.953C40.42,39.152,43.059,35.633,41.733,35.008z" fill="url(#SVGID_9_)"/>
-<path d="M31.68,48.668c1.546,0,3.049-0.174,4.499-0.49c-0.039-0.049-0.071-0.1-0.114-0.145  l-7.534-7.756c-0.434-0.447-1.031-0.705-1.638-0.705c-0.57,0-1.102,0.221-1.5,0.625l-1.144,1.18l-0.472,0.477l-0.436,0.447  c-1.654-1.605-3.133-3.443-4.739-5.873c-0.888-1.348-1.653-2.988-2.138-4.123l-0.178-0.424c-0.001,0-0.242-0.598-0.324-0.811  l-0.027-0.068c-0.067-0.176-0.127-0.341-0.184-0.5l-0.025-0.069l1.843-0.641c1.017-0.344,1.593-1.403,1.363-2.555l-0.007-0.036  l-1.154-3.523l-2.274-6.787c-0.162-0.486-0.47-0.886-0.858-1.16c-2.416,3.407-3.841,7.565-3.841,12.059  C10.797,39.322,20.147,48.668,31.68,48.668z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M31.68,48.668c1.301,0,2.57-0.125,3.806-0.352l-7.394-7.613c-0.32-0.33-0.758-0.52-1.199-0.52  c-0.404,0-0.779,0.156-1.061,0.441l-1.148,1.182l-0.467,0.473l-0.424,0.436l0.003,0.004l-0.435,0.445  c-1.866-1.736-3.509-3.734-5.269-6.4c-0.91-1.381-1.694-3.059-2.192-4.221l-0.158-0.375l-0.024-0.059c0,0-0.243-0.602-0.327-0.816  l-0.029-0.072c-0.068-0.18-0.129-0.347-0.19-0.513c0,0-0.12-0.337-0.145-0.41l0.071-0.295l2.272-0.791  c0.721-0.244,1.127-1.009,0.966-1.819l-0.007-0.036l-1.142-3.485l-2.274-6.789c-0.119-0.357-0.343-0.65-0.626-0.851  c-2.204,3.31-3.492,7.283-3.492,11.557C10.797,39.322,20.147,48.668,31.68,48.668z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<radialGradient cx="-859.7427" cy="-265.1074" gradientTransform="matrix(0.9999 -0.0111 0.0111 0.9999 905.1068 277.0371)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="34.2211">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.8364" style="stop-color:#E9F0F2"/>
-<stop offset="0.8909" style="stop-color:#AAB1B5"/>
-<stop offset="0.9515" style="stop-color:#7C878C"/>
-<stop offset="1" style="stop-color:#838F94"/>
-</radialGradient>
-<path d="M23.387,44.016c-2.39-2.133-4.191-4.469-5.806-6.914c-1.552-2.357-2.958-5.889-3.393-7.428  l-6.272-8.836c-0.357,0.592-0.921,2.715-0.661,5.588c0.262,2.872,2.939,9.828,6.083,14.596c3.146,4.766,7.81,9.248,9.374,10.24  c2.462,1.561,5.427,2.074,6.329,2.029c0,0,0.833-0.098,1.97-0.496C31.5,52.625,23.387,44.016,23.387,44.016z" fill="url(#SVGID_10_)"/>
-<path d="M15.369,32.857c-0.55-1.283-0.976-2.456-1.18-3.184l-6.104-8.599c-0.064,0.09-0.099,0.144-0.099,0.144  c-0.104,0.172-0.22,0.458-0.338,0.813c-0.118,0.599-0.177,1.219-0.167,1.854C7.541,28.374,10.936,32.078,15.369,32.857z" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M15.108,32.234c-0.423-1.033-0.749-1.953-0.919-2.561l-6.125-8.627c-0.069,0.101-0.109,0.161-0.109,0.161  c-0.097,0.162-0.208,0.434-0.318,0.769c-0.111,0.567-0.168,1.151-0.159,1.751C7.536,28.033,10.834,31.572,15.108,32.234z" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M7.907,21.188c-0.088,0.148-0.188,0.394-0.289,0.698c-0.102,0.514-0.152,1.046-0.144,1.59  c0.054,4.01,3.21,7.283,7.24,7.757c-0.232-0.618-0.412-1.157-0.526-1.559l-6.154-8.67C7.951,21.121,7.907,21.188,7.907,21.188z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="-891.105" cy="-262.4795" gradientTransform="matrix(1.0009 -0.0086 0.0135 0.9911 906.6143 271.6763)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="11.8382">
-<stop offset="0" style="stop-color:#D1D8D9"/>
-<stop offset="0.0424" style="stop-color:#D1D8D9"/>
-<stop offset="0.4" style="stop-color:#BBC0C2"/>
-<stop offset="0.7333" style="stop-color:#7C8C91"/>
-<stop offset="1" style="stop-color:#A7B3B7"/>
-</radialGradient>
-<path d="M14.188,29.674l1.312-0.461c0,0-2.781-12.441-3.885-11.868c-0.555,0.29-0.549,0.448-1.11,0.853  c-1.676,1.219-2.589,2.641-2.589,2.641c-0.077,0.13-0.165,0.345-0.252,0.613c-0.088,0.45-0.134,0.916-0.128,1.392  c0.05,3.62,2.979,6.563,6.661,6.841C14.194,29.681,14.189,29.677,14.188,29.674z" fill="url(#SVGID_11_)"/>
-<path d="M23.289,45.25c-0.259,0.727-0.4,1.498-0.39,2.303c0.025,1.906,0.882,3.621,2.242,4.898  c1.716,0.641,3.287,0.871,3.9,0.84c0,0,0.833-0.098,1.97-0.496c0.409-0.143-5.222-6.213-7.055-8.172L23.289,45.25z" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M23.448,44.59c-0.261,0.725-0.401,1.496-0.391,2.301c0.036,2.613,1.621,4.875,3.95,6.125  c0.771,0.18,1.418,0.264,1.829,0.275c0.011,0,0.026,0.002,0.037,0c0,0,0.832-0.096,1.972-0.494c0.422-0.148-5.624-6.641-7.233-8.363  L23.448,44.59z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="-877.4263" cy="-238.3691" gradientTransform="matrix(1.0009 -0.0086 0.0135 0.9911 906.6143 271.6763)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="12.0474">
-<stop offset="0" style="stop-color:#D1D8D9"/>
-<stop offset="0.0424" style="stop-color:#D1D8D9"/>
-<stop offset="0.4" style="stop-color:#BBC0C2"/>
-<stop offset="0.7333" style="stop-color:#7C8C91"/>
-<stop offset="1" style="stop-color:#A7B3B7"/>
-</radialGradient>
-<path d="M32.6,52.1c0.653-0.35,0.819-0.34,1.351-0.74c0.98-0.74-8.83-9.123-8.83-9.123l-1.712,1.756  c-0.229,0.695-0.355,1.434-0.345,2.203c0.051,3.766,3.219,6.797,7.107,6.857C30.828,52.877,31.693,52.584,32.6,52.1z" fill="url(#SVGID_12_)"/>
-<path d="M14.866,29.428l0.634-0.215c0,0-2.781-12.441-3.885-11.868  c-0.291,0.151-0.427,0.268-0.573,0.401L14.866,29.428z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<linearGradient gradientTransform="matrix(0.9999 -0.0111 0.0111 0.9999 905.1068 277.0361)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="-889.625" x2="-885.2537" y1="-270.9771" y2="-257.0911">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.0424" style="stop-color:#E9F0F2"/>
-<stop offset="0.4" style="stop-color:#D4D9DB"/>
-<stop offset="0.7333" style="stop-color:#98AAAD"/>
-<stop offset="1" style="stop-color:#D0DADE"/>
-</linearGradient>
-<path d="M15.5,29.214l1.677-0.583c0.435-0.147,0.659-0.629,0.562-1.119l-1.129-3.446l-2.275-6.79  c-0.177-0.533-0.71-0.836-1.188-0.676c0,0-0.429,0.175-1.529,0.747L15.5,29.214z" fill="url(#SVGID_13_)"/>
-<path d="M25.121,42.236l-0.468,0.473l8.748,9.039c0.188-0.131,0.379-0.26,0.55-0.389  C34.931,50.619,25.121,42.236,25.121,42.236z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<linearGradient gradientTransform="matrix(0.9999 -0.0111 0.0111 0.9999 905.1068 277.0366)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="-876.2178" x2="-867.1104" y1="-245.4277" y2="-235.398">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.0424" style="stop-color:#E9F0F2"/>
-<stop offset="0.4" style="stop-color:#D4D9DB"/>
-<stop offset="0.7333" style="stop-color:#98AAAD"/>
-<stop offset="1" style="stop-color:#D0DADE"/>
-</linearGradient>
-<path d="M33.95,51.357c0.978-0.738,1.295-1.059,1.295-1.059c0.364-0.373,0.338-1.002-0.059-1.412  l-7.534-7.756c-0.397-0.412-1.016-0.451-1.38-0.08l-1.151,1.186L33.95,51.357z" fill="url(#SVGID_14_)"/>
-</g>
-<g>
-<rect fill="none" height="30" width="30"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15.0005" x2="15.0005" y1="4.5283" y2="27.0492">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
-</linearGradient>
-<path d="M19.018,16.846v-4.316h4.535l-8.512-8.844l-8.592,8.844h4.631v4.316  c0,7.293,6.068,9.467,11.908,9.467v-6.422C21.189,19.891,19.018,19.002,19.018,16.846z" fill="url(#SVGID_1__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15.0005" x2="15.0005" y1="4.0146" y2="12.8168">
-<stop offset="0" style="stop-color:#FFBE82"/>
-<stop offset="1" style="stop-color:#991B23"/>
-</linearGradient>
-<polygon fill="url(#SVGID_2__)" points="15.041,4.508 22.762,12.529 23.553,12.529 15.041,3.686 6.449,12.529 7.248,12.529 "/>
-</g>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblestyle/resources/qtg_large_voip_received_call.svg
--- a/phoneuis/bubblemanager2/bubblestyle/resources/qtg_large_voip_received_call.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g>
-<rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="31.3823" x2="31.3823" y1="49.3193" y2="6.7675">
-<stop offset="0" style="stop-color:#004E8C"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
-</linearGradient>
-<circle cx="31.382" cy="28.137" fill="url(#SVGID_1_)" r="21.429"/>
-<radialGradient cx="23.8237" cy="17.7847" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="25.9191">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
-</radialGradient>
-<path d="M52.262,28.137c0,11.533-9.346,20.877-20.879,20.877c-11.533,0-20.882-9.344-20.882-20.877  c0-11.53,9.35-20.88,20.882-20.88C42.917,7.257,52.262,16.607,52.262,28.137z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="31.3823" x2="31.3823" y1="7.0732" y2="49.1199">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#88D6EB"/>
-</linearGradient>
-<path d="M31.383,7.257c-11.533,0-20.882,9.35-20.882,20.88c0,11.533,9.35,20.877,20.882,20.877  c11.533,0,20.879-9.344,20.879-20.877C52.262,16.607,42.917,7.257,31.383,7.257z M31.383,47.188  c-10.843,0-19.664-8.818-19.664-19.659c0-10.843,8.82-19.663,19.664-19.663c10.841,0,19.66,8.82,19.66,19.663  C51.043,38.369,42.224,47.188,31.383,47.188z" fill="url(#SVGID_3_)" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="10.8428" x2="14.1621" y1="30.9775" y2="30.9775">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<path d="M12.462,27.796C12.239,27.5,11.737,27.5,11.516,27.5c-0.437,0-0.669,0.312-0.673,0.616  v0.021l0.001,0.031c-0.001,0.537,0.029,1.14,0.094,1.872c0.013,0.138,0.03,0.276,0.047,0.414l0.024,0.201  c0.056,0.434,0.121,0.86,0.195,1.274l0.034,0.182c0.032,0.164,0.063,0.324,0.098,0.484c0.089,0.406,0.198,0.826,0.332,1.291  c0.02,0.066,0.037,0.133,0.055,0.199c0.028,0.109,0.058,0.217,0.091,0.322l0.005,0.014l0.012,0.033  c-0.003-0.01-0.008-0.023-0.01-0.037l1.198-0.08c0.019-0.188,0.024-0.383,0.019-0.576c-0.01-0.303-0.021-0.676-0.107-0.99  l1.112-1.494l0.12-0.162v-0.203v-1.165v-0.252l-0.179-0.178L12.462,27.796z" fill="url(#SVGID_4_)" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="17.2432" x2="51.9731" y1="24.897" y2="24.897">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<path d="M51.966,24.045c-0.016-0.079-0.029-0.136-0.043-0.191  c-0.011-0.042-0.021-0.084-0.029-0.125c-0.106-0.495-0.237-1.005-0.392-1.525l-0.017-0.058c-0.033-0.117-0.068-0.234-0.105-0.349  c-0.188-0.588-0.393-1.148-0.608-1.666c-0.027-0.066-0.056-0.125-0.084-0.188l-0.045-0.1c-0.206-0.474-0.436-0.947-0.677-1.403  l-0.03-0.059c-0.047-0.09-0.093-0.181-0.142-0.269c-0.295-0.532-0.604-1.041-0.918-1.512c-0.032-0.049-0.069-0.102-0.106-0.154  c-0.023-0.031-0.045-0.061-0.066-0.092c-0.302-0.437-0.618-0.862-0.946-1.268l-0.064-0.082c-0.044-0.055-0.088-0.111-0.134-0.167  c-0.381-0.456-0.783-0.898-1.199-1.317c-0.056-0.056-0.115-0.115-0.176-0.172l-0.049-0.047c-0.375-0.368-0.774-0.732-1.183-1.074  l-0.081-0.069c-0.041-0.037-0.083-0.073-0.125-0.106c-0.446-0.367-0.931-0.728-1.435-1.075c-0.063-0.042-0.126-0.083-0.19-0.124  l-0.077-0.05c-0.454-0.301-0.928-0.59-1.404-0.853l-0.072-0.042c-0.04-0.023-0.079-0.045-0.119-0.068  c-0.529-0.283-1.081-0.55-1.643-0.792l-0.142-0.057l-0.153-0.063c-0.148-0.061-0.297-0.114-0.443-0.165  c-0.077-0.026-0.152-0.053-0.228-0.08l-0.282-0.105L38.303,8.74c-0.17,0.107-0.84,0.49-1.235,0.715  c-0.438-0.059-1.499-0.192-2.57-0.295c0.33-0.032,0.787-0.069,1.43-0.111l0.09-1.204L35.97,7.832  c-0.039-0.011-0.077-0.021-0.116-0.029l-0.092-0.018l-0.075-0.015c-0.655-0.131-1.271-0.227-1.882-0.291l-0.004-0.001l-0.085-0.009  c-0.698-0.07-1.409-0.106-2.112-0.106c-0.62,0-1.262,0.033-1.964,0.101c-0.109,0.01-0.214,0.021-0.321,0.032  c-0.693,0.078-1.3,0.17-1.873,0.286l-0.02,0.003l-0.015,0.002c-0.604,0.125-1.211,0.281-1.856,0.477  c-0.058,0.018-0.116,0.037-0.173,0.055l-0.131,0.043c-0.547,0.176-1.082,0.371-1.596,0.582c-0.042,0.018-0.071,0.029-0.1,0.04  l-0.078,0.031c-0.564,0.24-1.128,0.512-1.688,0.812c-0.06,0.031-0.118,0.066-0.177,0.099L21.542,9.97  c-0.157,0.087-0.315,0.185-0.473,0.283l-0.203,0.127l-1.118,0.684l1.242,0.415c0.186,0.063,0.385,0.093,0.592,0.093  c0.67,0,1.317-0.329,1.838-0.593c0.209-0.105,0.521-0.264,0.648-0.288c0.152,0.045,0.306,0.068,0.458,0.068  c0.569,0,1.035-0.306,1.446-0.578l0.111-0.072c0.134-0.043,0.362-0.128,0.818-0.299c0.465-0.174,1.314-0.493,1.54-0.546  c0.44-0.005,0.966-0.068,1.339-0.3c0.352,0.058,0.977,0.157,1.619,0.24c-0.047,0.029-0.093,0.059-0.132,0.097  c-0.209,0.192-1.335,0.533-1.68,0.578c-0.647,0.081-0.908,0.408-1.012,0.666c-0.135,0.336-0.054,0.672,0.078,0.946  c-0.245,0.162-0.545,0.342-0.804,0.479c0.001-0.006,0.003-0.012,0.004-0.02c0.093-0.517,0.16-0.89-0.091-1.189  c-0.128-0.153-0.317-0.241-0.519-0.241c-0.295,0-0.525,0.183-0.711,0.362c-0.52,0.502-0.834,1.129-0.952,1.365l-0.022,0.044  l-0.019,0.035c-0.225,0.431-0.317,0.737-0.192,1.688c-0.055,0.04-0.219,0.102-0.445,0.102c-0.03,0-0.058-0.002-0.079-0.003  c-0.146-0.158-0.349-0.248-0.576-0.248l0,0c-0.524,0-1.238,0.589-2.123,1.754l-0.284,0.374l0.289,0.371l0.27,0.343  c-4.216,3.259-4.248,3.444-4.292,3.717c-0.007,0.024-0.044,0.137-0.095,0.293c-0.628,1.952-0.977,3.413-0.637,4.194  c0.784,1.813,1.669,3.505,2.815,3.599c0.101,0.008,0.212,0.012,0.332,0.012c1.051,0,2.753-0.318,3.572-0.485  c0.151,0.283,0.335,0.614,0.438,0.795l0.181,0.323l0.37-0.012c0.004,0,0.199-0.006,0.448-0.006c0.286,0,0.478,0.008,0.602,0.017  c0.446,1.307,1.3,4.317,1.142,4.944L27.272,34.1c-1.441,2.16,0.306,4.975,1.145,6.328c0.066,0.107,0.126,0.203,0.177,0.287  c0.324,0.922,0.716,1.531,1.545,1.531c0.062,0,0.124-0.004,0.188-0.008c0.047-0.002,0.096-0.004,0.146-0.004  c0.092,0,0.157,0.01,0.226,0.035l0.075,0.027l0.08,0.006c0.155,0.014,0.306,0.035,0.453,0.057c0.255,0.035,0.519,0.07,0.788,0.07  c0.721,0,1.293-0.271,1.787-0.855c0.019-0.002,0.036-0.004,0.055-0.006c0.518-0.072,0.712-0.332,0.778-0.564  c0.038-0.039,0.089-0.086,0.131-0.125c0.204-0.188,0.447-0.41,0.615-0.674c0.075-0.045,0.161-0.096,0.258-0.152  c0.167-0.104,0.355-0.217,0.504-0.293c0.131-0.041,0.247-0.117,0.334-0.225c0.209-0.258,0.166-0.549,0.131-0.783  c-0.035-0.242-0.071-0.492,0.06-0.758c0.738-0.355,2.051-1.23,2.263-1.375l-0.001,0.018c-0.014,0.117-0.048,0.43-0.1,0.629  c-0.279,0.279-0.513,0.703-0.586,0.846l-0.049,0.094l-0.015,0.104c-0.019,0.137-0.094,0.85,0.306,1.311  c0.202,0.23,0.49,0.359,0.813,0.359c0.103,0,0.21-0.014,0.319-0.039c1.027-0.232,2.85-2.703,2.998-4.066  c0.072-0.656-0.185-1.172-0.704-1.416l-0.387-0.184l-0.304,0.303l-1.125,1.125c-0.38,0.035-0.678,0.148-0.879,0.326  c0.012-0.48-0.035-0.973-0.086-1.451c-0.155-1.447-0.185-2.369,0.703-2.996l0.045-0.033l0.038-0.039  c0.321-0.326,0.676-0.611,1.052-0.914c0.88-0.707,1.79-1.438,2.332-2.759l0.022-0.056c0.174-0.451,0.437-1.132,0.081-1.651  c-0.089-0.128-0.275-0.327-0.624-0.397c0.462-0.186,0.816-0.332,0.851-0.346l0.107-0.044l0.083-0.08l1.898-1.822l0.278-0.268  l-0.122-0.366c-0.017-0.047-0.12-0.335-0.411-0.747c0.554,0.075,1.029,0.208,1.185,0.326c0.057,0.124,0.171,0.396,0.292,0.683  c2.089,4.924,2.382,5.178,2.926,5.187c0.021,0,0.037,0.002,0.051,0.003c0.044,0.003,0.083,0.005,0.119,0.005  c0.31,0,0.486-0.157,0.564-0.252c0.227-0.274,0.163-0.608,0.14-0.734l-0.009-0.043c-0.025-0.294-0.008-1.618,0.034-2.706  c0.003,0.002,0.004,0.006,0.006,0.01l1.12-0.445L51.966,24.045z M35.508,18.021c-0.087,0.003-0.181,0.008-0.282,0.012  c-0.322,0.015-0.688,0.031-1.053,0.031c-0.955,0-1.174-0.118-1.196-0.131c-0.113-0.082-0.229-0.144-0.35-0.188  c0.216-0.048,0.464-0.214,0.719-0.708c0.251,0.487,0.592,0.917,1.115,0.917c0.142,0,0.277-0.034,0.406-0.101  C35.043,17.856,35.333,17.957,35.508,18.021z M35.133,15.357c-0.072,0-0.131-0.003-0.176-0.007c0.049-0.128,0.107-0.202,0.154-0.244  c0.06,0.093,0.14,0.175,0.232,0.245C35.27,15.355,35.2,15.357,35.133,15.357z M31.331,16.635c0.327,0.641,0.569,0.917,0.762,1.037  c-0.475,0.038-0.833,0.339-1.126,0.625c-0.206-0.068-0.565-0.286-0.672-0.438c-0.063-0.089-0.138-0.166-0.221-0.232  C30.593,17.479,31.049,16.998,31.331,16.635z M29.523,16.163l-0.679-0.033l-2.278-0.111c0.278-0.229,0.541-0.444,0.697-0.57  c0.042-0.015,0.205-0.06,0.605-0.06c0.242,0,0.474,0.017,0.62,0.029L29.523,16.163z" fill="url(#SVGID_5_)" fill-opacity="0.3" stroke-opacity="0.3"/>
-<radialGradient cx="24.4912" cy="10.4414" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="23.6744">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
-</radialGradient>
-<path d="M11.451,28.125C11.451,28.125,11.451,28.125,11.451,28.125c0,0.008,0.001,0.012,0.001,0.018  c0,0.622,0.039,1.236,0.093,1.844c0.018,0.198,0.047,0.398,0.069,0.598c0.053,0.417,0.116,0.83,0.19,1.238  c0.042,0.215,0.081,0.434,0.127,0.646c0.094,0.422,0.203,0.838,0.321,1.248c0.05,0.17,0.089,0.342,0.141,0.508  c0.007,0.018,0.015,0.033,0.019,0.051c0.017-0.16,0.021-0.326,0.017-0.496c-0.04-1.199-0.232-1.045-0.232-1.045l1.356-1.822v-1.165  l-1.589-1.589C11.964,28.159,11.452,28.079,11.451,28.125z" fill="url(#SVGID_6_)"/>
-<radialGradient cx="24.4868" cy="10.4395" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="23.6775">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
-</radialGradient>
-<path d="M24.212,10.099c0.587,0.193,1.066-0.2,1.613-0.549c0.193-0.04,2.338-0.896,2.57-0.896  c0.231,0,1.011-0.03,1.204-0.34c0,0,3.357,0.584,3.863,0.389c0.275-0.107,1.433-0.2,2.425-0.264  c-0.056-0.012-0.106-0.029-0.162-0.041c-0.054-0.011-0.105-0.019-0.161-0.03c-0.623-0.126-1.252-0.226-1.894-0.29  c-0.006,0-0.01,0-0.016-0.002c-0.674-0.068-1.358-0.104-2.052-0.104c-0.644,0-1.277,0.038-1.906,0.098  c-0.11,0.011-0.221,0.022-0.331,0.035c-0.608,0.067-1.211,0.155-1.801,0.274c-0.01,0.003-0.021,0.004-0.031,0.006  c-0.612,0.127-1.213,0.283-1.802,0.464c-0.102,0.03-0.199,0.064-0.302,0.096c-0.522,0.168-1.038,0.356-1.544,0.564  c-0.06,0.026-0.12,0.048-0.18,0.072c-0.557,0.238-1.1,0.501-1.63,0.784c-0.08,0.043-0.156,0.089-0.234,0.134  c-0.227,0.125-0.44,0.267-0.66,0.402C22.273,11.265,23.635,9.904,24.212,10.099z" fill="url(#SVGID_7_)"/>
-<radialGradient cx="24.4863" cy="10.437" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="23.6745">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.3152" style="stop-color:#B2F56E"/>
-<stop offset="0.7273" style="stop-color:#5CBF1B"/>
-<stop offset="1" style="stop-color:#227A00"/>
-</radialGradient>
-<path d="M51.366,24.146c-0.021-0.102-0.049-0.197-0.069-0.297c-0.106-0.499-0.233-0.99-0.378-1.474  c-0.038-0.13-0.076-0.264-0.118-0.395c-0.176-0.549-0.371-1.09-0.59-1.616c-0.04-0.093-0.085-0.184-0.125-0.275  c-0.202-0.464-0.421-0.918-0.657-1.363c-0.056-0.106-0.109-0.215-0.166-0.319c-0.279-0.502-0.575-0.993-0.893-1.469  c-0.054-0.083-0.114-0.161-0.17-0.243c-0.291-0.422-0.596-0.831-0.916-1.228c-0.064-0.079-0.127-0.16-0.194-0.24  c-0.368-0.442-0.756-0.868-1.161-1.277c-0.069-0.07-0.143-0.14-0.215-0.208c-0.369-0.363-0.755-0.714-1.153-1.047  c-0.067-0.056-0.131-0.116-0.198-0.171c-0.448-0.366-0.915-0.714-1.395-1.043c-0.084-0.057-0.17-0.112-0.256-0.167  c-0.442-0.294-0.898-0.571-1.366-0.83c-0.063-0.035-0.123-0.073-0.187-0.108c-0.52-0.278-1.05-0.533-1.594-0.768  c-0.097-0.041-0.194-0.079-0.29-0.12c-0.211-0.087-0.432-0.156-0.646-0.235c-0.255,0.163-1.438,0.832-1.438,0.832  s-5.141-0.702-5.491-0.353c-0.352,0.353-1.721,0.71-2.033,0.751c-0.311,0.04-0.956,0.206-0.182,1.161  c-0.116,0.118-2.325,1.657-2.325,0.957s0.494-1.953-0.2-1.282c-0.498,0.482-0.796,1.135-0.86,1.257  c-0.163,0.312-0.263,0.461-0.145,1.357s-1.43,0.891-1.534,0.659c-0.276-0.622-1.809,1.394-1.809,1.394l0.646,0.828  c0,0-4.51,3.474-4.548,3.707c-0.04,0.234-1.164,3.25-0.775,4.147c0.39,0.897,1.376,3.158,2.307,3.233  c1.222,0.101,4.186-0.559,4.186-0.559c0.08,0.196,0.638,1.189,0.638,1.189s1.453-0.048,1.534,0.11  c0.026,0.053,1.75,5.122,1.182,5.794c-1.357,2.033,0.775,5.012,1.369,6.02c0.594,1.73,0.977,0.955,1.758,1.238  c0.962,0.084,1.772,0.439,2.589-0.611c0.237-0.195,0.641-0.041,0.641-0.313c0-0.152,0.698-0.598,0.878-1.018  c0.188-0.088,0.674-0.414,1.003-0.572c0.299-0.02-0.283-0.82,0.309-1.666c0.64-0.252,2.364-1.414,2.364-1.414  c0.078-1.705-0.839-3.811,0.873-5.02c1.104-1.126,2.553-1.767,3.255-3.479c0.194-0.506,0.628-1.542-0.619-1.231  c-1.173,0.295-2.48,0.362-1.861-0.154c-0.071-0.634-0.85-0.932-1.55-1.552c-0.361-0.854-0.93-2.378-0.93-2.378l-1.24-1.885  l0.155-0.389l1.474,2.171l1.474,1.781c0.542,1.783,1.007,1.939,1.007,1.939c0.815-0.288,2.753-1.086,2.753-1.086l1.898-1.822  c0,0-0.195-0.581-0.967-1.316l-0.584-0.349c-0.126,0.357-0.802,0.491-0.802,0.491l-1.641-1.964l0.61-0.123l0.471,0.896l1.128,0.39  c0,0,0.313-0.229,0.893,0.371c0.473-0.039,2.318,0.09,2.749,0.636c0.085,0.109,2.287,5.607,2.721,5.614  c0.19,0.002,0.329,0.077,0.267-0.256c-0.078-0.156,0-3.609,0.116-4.349c0.295-0.628,0.343-0.003,1.04,1.188  C51.374,24.204,51.372,24.175,51.366,24.146z M31.993,10.823c0.154-0.459,1.047-0.615,1.047-0.615s-0.256,0.473-0.197,0.716  c0.06,0.247-0.407,0.402-0.46,0.982c-0.051,0.578-1.117,0.239-1.204,0.036C31.09,11.74,31.835,11.281,31.993,10.823z M35.816,18.624  c-0.661,0-2.645,0.196-3.19-0.194c-0.546-0.389-0.97,0.04-1.362,0.43c-0.258,0.253-1.193-0.26-1.468-0.649  c-0.271-0.39-1.188-0.361-1.188-0.361l0.208-1.111l-2.637-0.128l-1.499,0.439l-1.41,0.041l0.79-0.376l0.983-0.232  c0,0,1.431-1.176,1.859-1.526c0.363-0.297,1.811-0.129,1.811-0.129l1.589,1.146c0,0-0.353,0.898-0.508,1.091  c0.583-0.039,1.269-1.099,1.269-1.099c-1.239-1.138-1.188-1.524-1.188-1.524l1.633,1.146l0.016,0.01c0,0,0.661,1.558,0.937,1.558  c0.271,0,0.619-1.073,0.619-1.073l0.465-0.117c0.207,0.492,0.595,1.603,1.059,1.343c0.269-0.147,0.71-0.013,1.215,0.181  c0.509,0.195,0.854-0.104,1.267,0.258C37.03,19.349,36.089,18.702,35.816,18.624z M36.853,15.943  c-0.681-0.259-2.984,0.586-2.47-0.796c0.275-0.746,0.981-0.901,1.223-0.405c0.063,0.204,0.83,0.519,0.824,0.09  c-0.006-0.431,0.771-0.659,0.883-0.338C36.899,14.791,38.932,16.341,36.853,15.943z M41.192,17.252  c-0.377-0.304,0.169-0.564-0.387-1.041c-0.798-0.684-1.421-0.978-0.334-1.532c1.341-0.168,0.218,0.428,0.44,0.786  c0.119,0.19,0.796,0.828,1.325,1.61C42.676,17.725,41.567,17.555,41.192,17.252z" fill="url(#SVGID_8_)"/>
-<radialGradient cx="24.4839" cy="10.4453" gradientTransform="matrix(0.9953 0 0 0.9952 7.3664 3.0238)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="23.6688">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
-</radialGradient>
-<path d="M41.733,35.008l-1.293,1.291c0,0-0.778,0-0.815,0.313c-0.017,0.133-0.063,0.709-0.192,1.006  c-0.258,0.18-0.569,0.775-0.569,0.775s-0.158,1.15,0.699,0.953C40.42,39.152,43.059,35.633,41.733,35.008z" fill="url(#SVGID_9_)"/>
-<path d="M31.68,48.668c1.546,0,3.049-0.174,4.499-0.49c-0.039-0.049-0.071-0.1-0.114-0.145  l-7.534-7.756c-0.434-0.447-1.031-0.705-1.638-0.705c-0.57,0-1.102,0.221-1.5,0.625l-1.144,1.18l-0.472,0.477l-0.436,0.447  c-1.654-1.605-3.133-3.443-4.739-5.873c-0.888-1.348-1.653-2.988-2.138-4.123l-0.178-0.424c-0.001,0-0.242-0.598-0.324-0.811  l-0.027-0.068c-0.067-0.176-0.127-0.341-0.184-0.5l-0.025-0.069l1.843-0.641c1.017-0.344,1.593-1.403,1.363-2.555l-0.007-0.036  l-1.154-3.523l-2.274-6.787c-0.162-0.486-0.47-0.886-0.858-1.16c-2.416,3.407-3.841,7.565-3.841,12.059  C10.797,39.322,20.147,48.668,31.68,48.668z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M31.68,48.668c1.301,0,2.57-0.125,3.806-0.352l-7.394-7.613c-0.32-0.33-0.758-0.52-1.199-0.52  c-0.404,0-0.779,0.156-1.061,0.441l-1.148,1.182l-0.467,0.473l-0.424,0.436l0.003,0.004l-0.435,0.445  c-1.866-1.736-3.509-3.734-5.269-6.4c-0.91-1.381-1.694-3.059-2.192-4.221l-0.158-0.375l-0.024-0.059c0,0-0.243-0.602-0.327-0.816  l-0.029-0.072c-0.068-0.18-0.129-0.347-0.19-0.513c0,0-0.12-0.337-0.145-0.41l0.071-0.295l2.272-0.791  c0.721-0.244,1.127-1.009,0.966-1.819l-0.007-0.036l-1.142-3.485l-2.274-6.789c-0.119-0.357-0.343-0.65-0.626-0.851  c-2.204,3.31-3.492,7.283-3.492,11.557C10.797,39.322,20.147,48.668,31.68,48.668z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<radialGradient cx="-859.7427" cy="-265.1074" gradientTransform="matrix(0.9999 -0.0111 0.0111 0.9999 905.1068 277.0371)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="34.2211">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.8364" style="stop-color:#E9F0F2"/>
-<stop offset="0.8909" style="stop-color:#AAB1B5"/>
-<stop offset="0.9515" style="stop-color:#7C878C"/>
-<stop offset="1" style="stop-color:#838F94"/>
-</radialGradient>
-<path d="M23.387,44.016c-2.39-2.133-4.191-4.469-5.806-6.914c-1.552-2.357-2.958-5.889-3.393-7.428  l-6.272-8.836c-0.357,0.592-0.921,2.715-0.661,5.588c0.262,2.872,2.939,9.828,6.083,14.596c3.146,4.766,7.81,9.248,9.374,10.24  c2.462,1.561,5.427,2.074,6.329,2.029c0,0,0.833-0.098,1.97-0.496C31.5,52.625,23.387,44.016,23.387,44.016z" fill="url(#SVGID_10_)"/>
-<path d="M15.369,32.857c-0.55-1.283-0.976-2.456-1.18-3.184l-6.104-8.599c-0.064,0.09-0.099,0.144-0.099,0.144  c-0.104,0.172-0.22,0.458-0.338,0.813c-0.118,0.599-0.177,1.219-0.167,1.854C7.541,28.374,10.936,32.078,15.369,32.857z" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M15.108,32.234c-0.423-1.033-0.749-1.953-0.919-2.561l-6.125-8.627c-0.069,0.101-0.109,0.161-0.109,0.161  c-0.097,0.162-0.208,0.434-0.318,0.769c-0.111,0.567-0.168,1.151-0.159,1.751C7.536,28.033,10.834,31.572,15.108,32.234z" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M7.907,21.188c-0.088,0.148-0.188,0.394-0.289,0.698c-0.102,0.514-0.152,1.046-0.144,1.59  c0.054,4.01,3.21,7.283,7.24,7.757c-0.232-0.618-0.412-1.157-0.526-1.559l-6.154-8.67C7.951,21.121,7.907,21.188,7.907,21.188z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="-891.105" cy="-262.4795" gradientTransform="matrix(1.0009 -0.0086 0.0135 0.9911 906.6143 271.6763)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="11.8382">
-<stop offset="0" style="stop-color:#D1D8D9"/>
-<stop offset="0.0424" style="stop-color:#D1D8D9"/>
-<stop offset="0.4" style="stop-color:#BBC0C2"/>
-<stop offset="0.7333" style="stop-color:#7C8C91"/>
-<stop offset="1" style="stop-color:#A7B3B7"/>
-</radialGradient>
-<path d="M14.188,29.674l1.312-0.461c0,0-2.781-12.441-3.885-11.868c-0.555,0.29-0.549,0.448-1.11,0.853  c-1.676,1.219-2.589,2.641-2.589,2.641c-0.077,0.13-0.165,0.345-0.252,0.613c-0.088,0.45-0.134,0.916-0.128,1.392  c0.05,3.62,2.979,6.563,6.661,6.841C14.194,29.681,14.189,29.677,14.188,29.674z" fill="url(#SVGID_11_)"/>
-<path d="M23.289,45.25c-0.259,0.727-0.4,1.498-0.39,2.303c0.025,1.906,0.882,3.621,2.242,4.898  c1.716,0.641,3.287,0.871,3.9,0.84c0,0,0.833-0.098,1.97-0.496c0.409-0.143-5.222-6.213-7.055-8.172L23.289,45.25z" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M23.448,44.59c-0.261,0.725-0.401,1.496-0.391,2.301c0.036,2.613,1.621,4.875,3.95,6.125  c0.771,0.18,1.418,0.264,1.829,0.275c0.011,0,0.026,0.002,0.037,0c0,0,0.832-0.096,1.972-0.494c0.422-0.148-5.624-6.641-7.233-8.363  L23.448,44.59z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<radialGradient cx="-877.4263" cy="-238.3691" gradientTransform="matrix(1.0009 -0.0086 0.0135 0.9911 906.6143 271.6763)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="12.0474">
-<stop offset="0" style="stop-color:#D1D8D9"/>
-<stop offset="0.0424" style="stop-color:#D1D8D9"/>
-<stop offset="0.4" style="stop-color:#BBC0C2"/>
-<stop offset="0.7333" style="stop-color:#7C8C91"/>
-<stop offset="1" style="stop-color:#A7B3B7"/>
-</radialGradient>
-<path d="M32.6,52.1c0.653-0.35,0.819-0.34,1.351-0.74c0.98-0.74-8.83-9.123-8.83-9.123l-1.712,1.756  c-0.229,0.695-0.355,1.434-0.345,2.203c0.051,3.766,3.219,6.797,7.107,6.857C30.828,52.877,31.693,52.584,32.6,52.1z" fill="url(#SVGID_12_)"/>
-<path d="M14.866,29.428l0.634-0.215c0,0-2.781-12.441-3.885-11.868  c-0.291,0.151-0.427,0.268-0.573,0.401L14.866,29.428z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<linearGradient gradientTransform="matrix(0.9999 -0.0111 0.0111 0.9999 905.1068 277.0361)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="-889.625" x2="-885.2537" y1="-270.9771" y2="-257.0911">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.0424" style="stop-color:#E9F0F2"/>
-<stop offset="0.4" style="stop-color:#D4D9DB"/>
-<stop offset="0.7333" style="stop-color:#98AAAD"/>
-<stop offset="1" style="stop-color:#D0DADE"/>
-</linearGradient>
-<path d="M15.5,29.214l1.677-0.583c0.435-0.147,0.659-0.629,0.562-1.119l-1.129-3.446l-2.275-6.79  c-0.177-0.533-0.71-0.836-1.188-0.676c0,0-0.429,0.175-1.529,0.747L15.5,29.214z" fill="url(#SVGID_13_)"/>
-<path d="M25.121,42.236l-0.468,0.473l8.748,9.039c0.188-0.131,0.379-0.26,0.55-0.389  C34.931,50.619,25.121,42.236,25.121,42.236z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<linearGradient gradientTransform="matrix(0.9999 -0.0111 0.0111 0.9999 905.1068 277.0366)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="-876.2178" x2="-867.1104" y1="-245.4277" y2="-235.398">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.0424" style="stop-color:#E9F0F2"/>
-<stop offset="0.4" style="stop-color:#D4D9DB"/>
-<stop offset="0.7333" style="stop-color:#98AAAD"/>
-<stop offset="1" style="stop-color:#D0DADE"/>
-</linearGradient>
-<path d="M33.95,51.357c0.978-0.738,1.295-1.059,1.295-1.059c0.364-0.373,0.338-1.002-0.059-1.412  l-7.534-7.756c-0.397-0.412-1.016-0.451-1.38-0.08l-1.151,1.186L33.95,51.357z" fill="url(#SVGID_14_)"/>
-</g>
-<g>
-<linearGradient gradientTransform="matrix(1 1.000000e-004 -1.000000e-004 1 -2.3655 -29.0779)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="17.3926" x2="17.3926" y1="32.2334" y2="55.3194">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<polygon fill="url(#SVGID_1__)" points="4.648,15.727 14.942,26.471 25.397,15.714 19.763,15.712 19.759,3.417 10.166,3.416   10.166,15.726 "/>
-<line fill="#1D4489" x1="19.759" x2="10.166" y1="3.421" y2="3.42"/>
-<polygon fill="#E7FFB9" points="10.166,3.17 19.76,3.171 19.759,3.671 10.166,3.67 10.166,3.17 "/>
-<polygon fill="#E7FFB9" points="19.612,15.732 25.505,15.733 25.059,16.233 19.612,16.233 19.612,15.732 "/>
-<polygon fill="#E7FFB9" points="4.321,15.726 10.157,15.726 10.157,16.226 4.848,16.226 4.321,15.726 "/>
-<linearGradient gradientTransform="matrix(1 1.000000e-004 -1.000000e-004 1 -2.3655 -29.0779)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="26.5625" x2="7.7312" y1="50.3418" y2="50.3418">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
-</linearGradient>
-<polygon fill="url(#SVGID_2__)" points="25.072,15.713 14.942,26.112 4.925,15.7 4.229,15.701 14.941,26.83 25.771,15.713 "/>
-<rect fill="none" height="30" width="30"/>
-</g>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblestyle/src/bubblestyleplugin.cpp
--- a/phoneuis/bubblemanager2/bubblestyle/src/bubblestyleplugin.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/bubblestyle/src/bubblestyleplugin.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -28,6 +28,7 @@
 #include <hbfontspec.h>
 #include <hbdeviceprofile.h>
 #include <hbcolorscheme.h>
+#include <hbstringutil.h>
 
 static const int BUBBLE_ICON_ANIM_INTERVAL = 500; // ms
 
@@ -55,11 +56,11 @@
     return BP_Bubble_primitive_count;
 }
 
-HbWidgetBase* BubbleStylePlugin::createPrimitive(
+QGraphicsItem* BubbleStylePlugin::createPrimitive(
     HbStyle::Primitive primitive, 
     QGraphicsItem *parent) const
 {
-    HbWidgetBase* item = 0;
+    QGraphicsItem* item = 0;
     
     switch(primitive) {
     case BP_Bubble_frame: {
@@ -87,7 +88,12 @@
         HbIconItem* icon = new HbIconItem(parent);
         item = icon;
         }
-        break;    
+        break;
+    case BP_Ciphering_icon: {
+        HbIconItem* icon = new HbIconItem(parent);
+        item = icon;
+        }
+        break;
     default:
         break;
     } // switch
@@ -119,26 +125,23 @@
         break;                
 
     case BP_Text1_text: {
-        HbTextItem* text = static_cast<HbTextItem*>(item);
-        text->setText( opt->mText1 );
-        text->setElideMode( opt->mText1Clip );
-        setFont(text, primitive, opt);
+        HbTextItem* textItem = static_cast<HbTextItem*>(item);
+        setText(textItem, opt->mText1, opt->mText1Clip);
+        setFont(textItem, primitive, opt);
         }
         break;    
     
     case BP_Text2_text: {
-        HbTextItem* text = static_cast<HbTextItem*>(item);
-        text->setText( opt->mText2 );
-        text->setElideMode( opt->mText2Clip );
-        setFont(text, primitive, opt);
+        HbTextItem* textItem = static_cast<HbTextItem*>(item);
+        setText(textItem, opt->mText2, opt->mText2Clip);
+        setFont(textItem, primitive, opt);
         }
         break;    
 
     case BP_Text3_text: {
-        HbTextItem* text = static_cast<HbTextItem*>(item);
-        text->setText( opt->mText3 );
-        text->setElideMode( opt->mText3Clip );
-        setFont(text, primitive, opt);
+        HbTextItem* textItem = static_cast<HbTextItem*>(item);
+        setText(textItem, opt->mText3, opt->mText3Clip);
+        setFont(textItem, primitive, opt);
         }
         break;    
     
@@ -152,15 +155,21 @@
         if ( (( opt->mCallState == BubbleManagerIF::Incoming ) ||
               ( opt->mCallState == BubbleManagerIF::Waiting )) &&
              ( opt->mCallFlags & BubbleManagerIF::Diverted ) ) {
-            icon->setIconName(":/resources/qgn_indi_call_diverted.svg");
+            icon->setIconName(":/qgn_indi_call_diverted.svg");
+            setIconColor(icon);
+            icon->show();
+            } else {
+            icon->setIconName(QString());
+            icon->hide();
+            }
+        }
+        break;
 
-            // to be done via css when possible
-            QColor color;
-            color = HbColorScheme::color("list_item_title_normal");
-            if (color.isValid()) {
-                icon->setColor(color);
-            }
-
+    case BP_Ciphering_icon: {
+        HbIconItem* icon = static_cast<HbIconItem*>(item);
+        if ( opt->mCallFlags & BubbleManagerIF::NoCiphering ) {
+            icon->setIconName("qtg_mono_ciphering_off");
+            setIconColor(icon);
             icon->show();
             } else {
             icon->setIconName(QString());
@@ -174,7 +183,25 @@
     } // switch
 }
 
-void BubbleStylePlugin::setFont(HbTextItem* item, int primitive, const BubbleStyleOption *option) const
+void BubbleStylePlugin::setText(
+    HbTextItem* item,
+    const QString& text,
+    Qt::TextElideMode clip) const
+{
+    if (clip == Qt::ElideLeft) {
+        // convert phonenumber to phone ui language
+        QString converted = HbStringUtil::convertDigits(text);
+        item->setText(converted);
+    } else {
+        item->setText( text );
+    }
+    item->setElideMode( clip );
+}
+
+void BubbleStylePlugin::setFont(
+    HbTextItem* item,
+    int primitive,
+    const BubbleStyleOption *option) const
 {
     int primitiveLineNumber = 0;
     if (primitive==BP_Text1_text) {
@@ -204,6 +231,16 @@
     }
 }
 
+void BubbleStylePlugin::setIconColor(HbIconItem* icon) const
+{
+    // to be done via css when possible
+    QColor color;
+    color = HbColorScheme::color("list_item_title_normal");
+    if (color.isValid()) {
+        icon->setColor(color);
+    }
+}
+
 QString BubbleStylePlugin::layoutPath() const
 {
    QString path(":/");
@@ -218,43 +255,43 @@
     case BubbleManagerIF::Alerting:
     case BubbleManagerIF::Waiting:
         if ( opt->mCallFlags & BubbleManagerIF::VoIPCall ) {
-            anim->appendIcon(":/qtg_large_voip_received_call.svg");
-            anim->appendIcon(":/qtg_large_voip_dialled_call.svg");
+            anim->appendIcon("qtg_large_voip_received_call");
+            anim->appendIcon("qtg_large_voip_dialled_call");
         } else if ( opt->mCallFlags & BubbleManagerIF::Video ) {
-            anim->appendIcon(":/qtg_large_video_received_call.svg");
-            anim->appendIcon(":/qtg_large_video_dialled_call.svg");         
+            anim->appendIcon("qtg_large_video_received_call");
+            anim->appendIcon("qtg_large_video_dialled_call");
         } else {
-            anim->appendIcon(":/pri_large_green_handset.svg");
-            anim->appendIcon(":/pri_large_yellow_handset.svg");
+            anim->appendIcon("qtg_large_active_call");
+            anim->appendIcon("qtg_large_waiting_call");
         }
         break;
     case BubbleManagerIF::Outgoing:
     case BubbleManagerIF::Active:
         if ( opt->mCallFlags & BubbleManagerIF::VoIPCall ) {
-            anim->appendIcon(":/qtg_large_voip_received_call.svg");
+            anim->appendIcon("qtg_large_voip_received_call");
         } else if ( opt->mCallFlags & BubbleManagerIF::Video ) {
-            anim->appendIcon(":/qtg_large_video_received_call.svg");
+            anim->appendIcon("qtg_large_video_received_call");
         } else {
-            anim->appendIcon(":/pri_large_green_handset.svg");
+            anim->appendIcon("qtg_large_active_call");
         }            
         break;
     case BubbleManagerIF::OnHold:
         if ( opt->mCallFlags & BubbleManagerIF::VoIPCall ) {
-            anim->appendIcon(":/qtg_large_voip_dialled_call.svg");
+            anim->appendIcon("qtg_large_voip_dialled_call");
         } else if ( opt->mCallFlags & BubbleManagerIF::Video ) {
-            anim->appendIcon(":/qtg_large_video_dialled_call.svg");
+            anim->appendIcon("qtg_large_video_dialled_call");
         } else {
-            anim->appendIcon(":/pri_large_yellow_handset.svg");
+            anim->appendIcon("qtg_large_waiting_call");
         }                      
         break;
     case BubbleManagerIF::Disconnected:
     case BubbleManagerIF::AlertToDisconnected:
         if ( opt->mCallFlags & BubbleManagerIF::VoIPCall ) {
-            anim->appendIcon(":/qtg_large_voip_missed_call.svg");
+            anim->appendIcon("qtg_large_voip_missed_call");
         } else if ( opt->mCallFlags & BubbleManagerIF::Video ) {
-            anim->appendIcon(":/qtg_large_video_missed_call.svg");
+            anim->appendIcon("qtg_large_video_missed_call");
         } else {
-            anim->appendIcon(":/pri_large_red_handset.svg");
+            anim->appendIcon("qtg_large_end_call");
         }           
         break;
     default:
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/bubblestyle/src/bubblestyleplugin.h
--- a/phoneuis/bubblemanager2/bubblestyle/src/bubblestyleplugin.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/bubblestyle/src/bubblestyleplugin.h	Fri Apr 16 14:58:25 2010 +0300
@@ -25,6 +25,7 @@
 
 class HbFontSpec;
 class HbTextItem;
+class HbIconItem;
 class BubbleStyleOption;
 class BubbleAnimIconItem;
 
@@ -37,14 +38,17 @@
     BubbleStylePlugin();
     virtual ~BubbleStylePlugin();
 
+protected:
     int primitiveCount() const;
-    HbWidgetBase *createPrimitive( HbStyle::Primitive primitive, QGraphicsItem *parent = 0 ) const;
+    QGraphicsItem *createPrimitive( HbStyle::Primitive primitive, QGraphicsItem *parent = 0 ) const;
     void updatePrimitive( QGraphicsItem *item, HbStyle::Primitive primitive, const QStyleOption *option ) const;
     QString layoutPath() const;
-    void setFont(HbTextItem* item, int primitive, const BubbleStyleOption *option) const;
 
 private:
     void setCallStatusIcons(BubbleAnimIconItem* anim, const BubbleStyleOption *opt) const;
+    void setText(HbTextItem* item, const QString& text, Qt::TextElideMode clip) const;
+    void setFont(HbTextItem* item, int primitive, const BubbleStyleOption *option) const;
+    void setIconColor(HbIconItem* icon) const;
     
 private:
     HbFontSpec* mCliFont;
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/inc/bubbleprimitives.h
--- a/phoneuis/bubblemanager2/inc/bubbleprimitives.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/inc/bubbleprimitives.h	Fri Apr 16 14:58:25 2010 +0300
@@ -26,6 +26,7 @@
     BP_Text3_text,
     BP_CallStatus_icon,
     BP_NumberType_icon,
+    BP_Ciphering_icon,
     BP_Bubble_primitive_count
 };
 
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/tsrc/bubbletest2/bubbletest2.qrc
--- a/phoneuis/bubblemanager2/tsrc/bubbletest2/bubbletest2.qrc	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/tsrc/bubbletest2/bubbletest2.qrc	Fri Apr 16 14:58:25 2010 +0300
@@ -3,21 +3,5 @@
         <file>resources/contactpic.jpg</file>
         <file>resources/contactpic2.jpg</file>
         <file>resources/contactpic3.png</file>
-        <file>resources/qtg_large_tb_mute.svg</file>
-        <file>resources/qtg_large_tb_silence.svg</file>
-        <file>resources/qtg_large_tb_unmute.svg</file>
-        <file>resources/qtg_large_tb_message.svg</file>
-        <file>resources/qtg_large_tb_contacts.svg</file>
-        <file>resources/qtg_large_tb_dialler.svg</file>
-        <file>resources/qtg_large_tb_loudsp_mute.svg</file>
-        <file>resources/qtg_large_tb_loudsp_unmute.svg</file>
-        <file>resources/qtg_mono_reject_call.svg</file>
-        <file>resources/qtg_mono_answer_call.svg</file>
-        <file>resources/qtg_mono_replace_call.svg</file>
-        <file>resources/qtg_mono_drop_call.svg</file>
-        <file>resources/qtg_mono_end_call.svg</file>
-        <file>resources/qtg_mono_hold_call.svg</file>
-        <file>resources/qtg_mono_join_call.svg</file>
-        <file>resources/qtg_mono_private_call.svg</file>
     </qresource>
 </RCC>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/tsrc/bubbletest2/bubbletestview.cpp
--- a/phoneuis/bubblemanager2/tsrc/bubbletest2/bubbletestview.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/tsrc/bubbletest2/bubbletestview.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -139,7 +139,7 @@
             call.callState = BubbleManager::Outgoing;
             mCalls.append( call );
 
-            bubbleManager().setBubbleSelectionDisabled(true);
+            bubbleManager().setBubbleSelectionDisabled(false);
             updateToolBarActions();
        }
        break;
@@ -198,7 +198,9 @@
     {
         int i,j;
 
-        if (callCount()==1) {
+        if (bubbleManager().isConferenceExpanded()) {
+            toggleHoldConference();
+        } else if (callCount()==1) {
             // toggle hold
             bubbleManager().startChanges();
             if (callIndexByState(BubbleManagerIF::Active, i)||
@@ -314,8 +316,12 @@
         int i;
 
         if (conferenceCallExists()&&(activeCallId!=-1)) {
+            int j;
+            callIndexByBubbleId(mConfBubbleId,j);
             callIndexByBubbleId(activeCallId,i);
             mCalls[i].isInConf = true;
+            mCalls[i].callState = BubbleManagerIF::Active;
+            mCalls[j].callState = BubbleManagerIF::Active;
             bubbleManager().startChanges();
             bubbleManager().addRowToConference(activeCallId);
             bubbleManager().setExpandedConferenceCallHeader(true);
@@ -331,17 +337,22 @@
             if (mCallTimer->isChecked()) {
                 bubbleManager().setCallTime( mConfBubbleId, "0:00" );
             }
+            bubbleManager().addAction(mConfBubbleId, mHold);
             bubbleManager().addAction(mConfBubbleId, mEndConference);
             bubbleManager().clearParticipantListActions();
             bubbleManager().addParticipantListAction(mPrivate);
             bubbleManager().addParticipantListAction(mDrop);
             bubbleManager().setState(heldCallId,BubbleManagerIF::Active);
+            bubbleManager().setCallFlag(mConfBubbleId, BubbleManager::NoCiphering,
+                                        mCipheringOff->isChecked());
             bubbleManager().endChanges();
 
             callIndexByBubbleId(activeCallId,i);
             mCalls[i].isInConf = true;
+            mCalls[i].callState = BubbleManagerIF::Active;
             callIndexByBubbleId(heldCallId,i);
             mCalls[i].isInConf = true;
+            mCalls[i].callState = BubbleManagerIF::Active;
 
             // store the call
             TestCall call;
@@ -473,6 +484,7 @@
         setCallObject(bubble, ":resources/contactpic.jpg");
         bubbleManager().setNumberType(bubble, BubbleManager::Mobile);
         bubbleManager().setCallFlag(bubble, BubbleManager::Diverted, mCallDivert->isChecked());
+        bubbleManager().setCallFlag(bubble, BubbleManager::NoCiphering, mCipheringOff->isChecked());
         bubbleManager().setLabel(bubble, "calling", Qt::ElideRight);
         break;
         }
@@ -499,12 +511,15 @@
         setCallObject(bubble, ":resources/contactpic3.png");
         bubbleManager().setNumberType(bubble, BubbleManager::Mobile);
         bubbleManager().setCallFlag(bubble, BubbleManager::Diverted, mCallDivert->isChecked());
+        bubbleManager().setCallFlag(bubble, BubbleManager::NoCiphering, mCipheringOff->isChecked());
         bubbleManager().setLabel(bubble, "waiting", Qt::ElideRight);
         break;
         }
 
     case BubbleManager::Outgoing:
         {
+        bubbleManager().setCallFlag(bubble, BubbleManager::NoCiphering, mCipheringOff->isChecked());
+
         if (mEmergencyCall->isChecked()) {
             bubbleManager().setCli( bubble, "emergency call", Qt::ElideRight );
             bubbleManager().setLabel( bubble, "Attempting", Qt::ElideRight );
@@ -604,6 +619,11 @@
 
         if (swapButton) {
             bubbleManager().addAction(bubble, mSwap);
+        } else {
+            if (state == BubbleManager::OnHold)
+                bubbleManager().addAction(bubble, mUnhold);
+            else
+                bubbleManager().addAction(bubble, mHold);
         }
 
         bubbleManager().addAction(bubble, mEndConference);
@@ -841,19 +861,19 @@
     mCallOut = new HbAction("Call out", this);
     connect( mCallOut, SIGNAL(triggered()), this, SLOT(createOutgoingCall()), Qt::QueuedConnection );
 
-    mMute = new HbAction(HbIcon(":resources/qtg_large_tb_mute.svg"), "", this);
+    mMute = new HbAction(HbIcon("qtg_mono_mic_mute"), "", this);
     connect( mMute, SIGNAL(triggered()), this, SLOT(setMuted()), Qt::QueuedConnection );
 
-    mUnmute = new HbAction(HbIcon(":resources/qtg_large_tb_unmute.svg"), "", this);
+    mUnmute = new HbAction(HbIcon("qtg_mono_mic_unmute"), "", this);
     connect( mUnmute, SIGNAL(triggered()), this, SLOT(setMuted()), Qt::QueuedConnection );
 
     // not connected to anywhere
-    mActivateLoudspeaker = new HbAction(HbIcon(":resources/qtg_large_tb_loudsp_unmute.svg"), "", this);
-    mActivateHandset = new HbAction(HbIcon(":resources/qtg_large_tb_loudsp_mute.svg"), "", this);
-    mSendMessage = new HbAction(HbIcon(":resources/qtg_large_tb_message.svg"), "", this);
-    mSilence = new HbAction(HbIcon(":resources/qtg_large_tb_silence.svg"), "", this);
-    mOpenDialer = new HbAction(HbIcon(":resources/qtg_large_tb_dialler.svg"), "", this);
-    mOpenContacts = new HbAction(HbIcon(":resources/qtg_large_tb_contacts.svg"), "", this);
+    mActivateLoudspeaker = new HbAction(HbIcon("qtg_mono_loudspeaker"), "", this);
+    mActivateHandset = new HbAction(HbIcon("qtg_mono_mobile"), "", this);
+    mSendMessage = new HbAction(HbIcon("qtg_mono_send"), "", this);
+    mSilence = new HbAction(HbIcon("qtg_mono_speaker_off"), "", this);
+    mOpenDialer = new HbAction(HbIcon("qtg_mono_dialer"), "", this);
+    mOpenContacts = new HbAction(HbIcon("qtg_mono_contacts"), "", this);
 
     updateToolBarActions();
 }
@@ -866,12 +886,14 @@
     mCallTimer = menu()->addAction("Call timer");
     mContactName = menu()->addAction("Contact name");
     mContactPicture = menu()->addAction("Contact picture");
-    mEmergencyCall = menu()->addAction( "Emergency call" );
+    mCipheringOff = menu()->addAction("Ciphering off");
+    mEmergencyCall = menu()->addAction( "Emergency call" );    
     HbAction* exit = menu()->addAction( "Exit" );
     mCallDivert->setCheckable(true);
     mCallTimer->setCheckable(true);
     mContactPicture->setCheckable(true);
     mContactName->setCheckable(true);
+    mCipheringOff->setCheckable(true);
     mEmergencyCall->setCheckable(true);
     connect( exit, SIGNAL(triggered()), qApp, SLOT(quit()) );
 }
@@ -909,41 +931,41 @@
 
 void BubbleTestView::createBubbleActions()
 {
-    mAnswer = new HbAction( HbIcon(":resources/qtg_mono_answer_call.svg"),"Answer", this);
+    mAnswer = new HbAction( HbIcon("qtg_mono_call"),"Answer", this);
     mAnswer->setSoftKeyRole(QAction::PositiveSoftKey);
     connect( mAnswer, SIGNAL( triggered() ), this, SLOT( answerCall() ) );
 
-    mReject= new HbAction( HbIcon(":resources/qtg_mono_reject_call.svg"),"Reject", this);
+    mReject= new HbAction( HbIcon("qtg_mono_reject_call"),"Reject", this);
     mReject->setSoftKeyRole(QAction::NegativeSoftKey);
     connect( mReject, SIGNAL( triggered() ), this, SLOT( rejectCall() ) );
 
-    mHold = new HbAction( HbIcon(":resources/qtg_mono_hold_call.svg"),"Hold", this);
+    mHold = new HbAction( HbIcon("qtg_mono_hold_call"),"Hold", this);
     connect( mHold, SIGNAL( triggered() ), this, SLOT( toggleHold() ) );
 
-    mUnhold = new HbAction( HbIcon(":resources/qtg_mono_answer_call.svg"),"Activate", this);
+    mUnhold = new HbAction( HbIcon("qtg_mono_call"),"Activate", this);
     connect( mUnhold, SIGNAL( triggered() ), this, SLOT( toggleHold() ) );
 
-    mSwap = new HbAction( HbIcon(":resources/qtg_mono_hold_call.svg"),"Swap", this);
+    mSwap = new HbAction( HbIcon("qtg_mono_hold_call"),"Swap", this);
     connect( mSwap, SIGNAL( triggered() ), this, SLOT( toggleHold() ) );
 
-    mEndCall = new HbAction(HbIcon(":resources/qtg_mono_end_call.svg"),"End call", this);
+    mEndCall = new HbAction(HbIcon("qtg_mono_end_call"),"End call", this);
     mEndCall->setSoftKeyRole(QAction::NegativeSoftKey);
     connect( mEndCall, SIGNAL( triggered() ), this, SLOT( endCall() ) );
 
-    mEndConference = new HbAction(HbIcon(":resources/qtg_mono_end_call.svg"),"End conference", this);
+    mEndConference = new HbAction(HbIcon("qtg_mono_end_all_call"),"End conference", this);
     mEndConference->setSoftKeyRole(QAction::NegativeSoftKey);
     connect( mEndConference, SIGNAL( triggered() ), this, SLOT( endConferenceCall() ) );
 
-    mJoin = new HbAction(HbIcon(":resources/qtg_mono_join_call.svg"),"Join", this);
+    mJoin = new HbAction(HbIcon("qtg_mono_join_call"),"Join", this);
     connect( mJoin, SIGNAL( triggered() ), this, SLOT(joinToConference()) );
 
-    mPrivate = new HbAction(HbIcon(":resources/qtg_mono_private_call.svg"),"Private", this);
+    mPrivate = new HbAction(HbIcon("qtg_mono_private_call"),"Private", this);
     connect( mPrivate, SIGNAL( triggered() ), this, SLOT(handlePrivate()) );
 
-    mDrop = new HbAction(HbIcon(":resources/qtg_mono_drop_call.svg"),"Drop", this);
+    mDrop = new HbAction(HbIcon("qtg_mono_drop_call"),"Drop", this);
     connect( mDrop, SIGNAL( triggered() ), this, SLOT(handleDrop()) );
 
-    mReplace = new HbAction(HbIcon(":resources/qtg_mono_replace_call.svg"),"Replace", this);
+    mReplace = new HbAction(HbIcon("qtg_mono_replace_call"),"Replace", this);
     connect( mReplace, SIGNAL( triggered() ), this, SLOT(replaceActiveCall()) );
 
     mUpdateUiControls = new HbAction(QString(), this);
@@ -1000,6 +1022,51 @@
     mBubbleManager->handleOrientationChange(orientation);
 }
 
+void BubbleTestView::toggleHoldConference()
+{
+    int i;
+    if (callIndexByBubbleId(mConfBubbleId, i) ) {
+        BubbleManagerIF::PhoneCallState state =
+            (mCalls[i].callState == BubbleManagerIF::Active) ?
+            BubbleManagerIF::OnHold : BubbleManagerIF::Active;
+        bubbleManager().startChanges();
+        setBubbleData(mCalls[i].bubbleId, state);
+        setBubbleActions(mCalls[i].bubbleId, state );
+        qDebug() << "toggleHoldConference:" << state;
+        mCalls[i].callState=state;
+        bubbleManager().endChanges();
+        // update participants
+        QTimer::singleShot(500, this, SLOT(toggleConferenceHoldDelayed()));
+    }
+}
+
+void BubbleTestView::toggleConferenceHoldDelayed()
+{
+    int i;
+    callIndexByBubbleId(mConfBubbleId, i);
+    BubbleManagerIF::PhoneCallState confState =
+        (BubbleManagerIF::PhoneCallState)mCalls[i].callState;
+    qDebug() << "toggleConferenceHoldDelayed state:" << confState;
+
+    QListIterator<TestCall> calls(mCalls);
+    int j=0;
+    while(calls.hasNext()) {
+        TestCall call = calls.next();
+        qDebug() << "toggleConferenceHoldDelayed callState:" << call.callState;
+        if (call.isInConf && call.callState!=confState) {
+            bubbleManager().startChanges();
+            setBubbleData(call.bubbleId, confState);
+            setBubbleActions(call.bubbleId, confState);
+            mCalls[j].callState=confState;
+            bubbleManager().endChanges();
+            // next
+            QTimer::singleShot(500, this, SLOT(toggleConferenceHoldDelayed()));
+            break;
+        }
+        j++;
+    }
+}
+
 void BubbleTestView::connectToTester()
 {
     mBubbleTester->connectToServer();
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/tsrc/bubbletest2/bubbletestview.h
--- a/phoneuis/bubblemanager2/tsrc/bubbletest2/bubbletestview.h	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/tsrc/bubbletest2/bubbletestview.h	Fri Apr 16 14:58:25 2010 +0300
@@ -47,6 +47,7 @@
     void rejectCall();
     void toggleHold();
     void toggleHoldDelayed();
+    void toggleConferenceHoldDelayed();
     void createIncomingCall();
     void createOutgoingCall();
     void setMuted();
@@ -81,6 +82,7 @@
     bool callIndexByBubbleId(int bubbleId, int& index);
     void conferenceWizard();
     void sendKeyEvent(int key);
+    void toggleHoldConference();
 
 private:
     HbMainWindow&     mMainWindow;
@@ -89,6 +91,7 @@
     
     // settings
     HbAction          *mCallDivert;
+    HbAction          *mCipheringOff;
     HbAction          *mCallTimer;
     HbAction          *mEmergencyCall;
     HbAction          *mContactPicture;
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_large_tb_contacts.svg
--- a/phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_large_tb_contacts.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg version="1.1" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-	 x="0px" y="0px" width="60px" height="60px" viewBox="0 0 60 60" xml:space="preserve">
-<g>
-	<rect fill="none" width="60" height="60"/>
-	<path fill="#666666" d="M45.047,10.296h-29c-2.75,0-5,2.25-5,5v5.702h5.676v3h-5.676v5.798h5.676v3h-5.676v5.798h5.676v3h-5.676
-		v6.702c0,2.75,2.25,5,5,5h29c2.75,0,5-2.25,5-5v-33C50.047,12.546,47.797,10.296,45.047,10.296z M41.804,25.414
-		c-0.059,0.947-0.776,1.983-2.33,3.355c-1.459,1.284-2.816,2.008-3.646,1.931c-0.219-0.066-0.656-0.258-1.177-0.91
-		c-0.352-0.448-0.599-1.104-0.731-1.953l-0.068-0.403l-0.41,0.002c-2.037,0.01-5.48,3.454-5.499,5.502l-0.003,0.41l0.405,0.064
-		c0.85,0.136,1.485,0.412,1.943,0.734c0.976,0.683,0.917,1.308,0.917,1.308c0,1.237-1.479,3.006-1.934,3.518
-		c-1.375,1.554-2.402,2.273-3.34,2.332c0,0-0.506,0.045-1.388-0.448c-0.977-0.543-1.526-1.315-1.921-1.904
-		c-0.383-0.577-0.847-1.771-0.847-3.404c0-2.526,1.015-6.053,4.624-9.666c5.945-5.944,11.697-4.81,13.119-3.722
-		c0.662,0.506,1.114,0.941,1.847,1.868C41.938,24.753,41.805,25.414,41.804,25.414z"/>
-</g>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_large_tb_dialler.svg
--- a/phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_large_tb_dialler.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<rect fill="none" height="60" width="60"/>
-<path d="M39.189,11.974c0-0.55,0.449-1,1-1h8.004c0.551,0,1,0.45,1,1v4.437c0,0.55-0.449,1-1,1h-8.004   c-0.551,0-1-0.45-1-1V11.974z M39.189,37.485c0,0.55,0.449,1,1,1h8.004c0.551,0,1-0.45,1-1v-4.438c0-0.55-0.449-1-1-1h-8.004   c-0.551,0-1,0.45-1,1V37.485z M39.184,26.949c0,0.55,0.451,1,1,1h8.01c0.551,0,1-0.45,1-1V22.51c0-0.55-0.449-1-1-1h-8.01   c-0.549,0-1,0.45-1,1V26.949z M24.965,16.41c0,0.55,0.449,1,1,1h7.992c0.551,0,1-0.45,1-1v-4.437c0-0.55-0.449-1-1-1h-7.992   c-0.551,0-1,0.45-1,1V16.41z M24.965,37.485c0,0.55,0.449,1,1,1h7.992c0.551,0,1-0.45,1-1v-4.438c0-0.55-0.449-1-1-1h-7.992   c-0.551,0-1,0.45-1,1V37.485z M24.965,48.026c0,0.55,0.449,1,1,1h7.992c0.551,0,1-0.45,1-1v-4.444c0-0.55-0.449-1-1-1h-7.992   c-0.551,0-1,0.45-1,1V48.026z M24.961,26.949c0,0.55,0.451,1,1,1h7.996c0.551,0,1-0.45,1-1V22.51c0-0.55-0.449-1-1-1h-7.996   c-0.549,0-1,0.45-1,1V26.949z M10.816,16.41c0,0.55,0.449,1,1,1h7.996c0.551,0,1-0.45,1-1v-4.437c0-0.55-0.449-1-1-1h-7.996   c-0.551,0-1,0.45-1,1V16.41z M10.816,37.485c0,0.55,0.449,1,1,1h7.996c0.551,0,1-0.45,1-1v-4.438c0-0.55-0.449-1-1-1h-7.996   c-0.551,0-1,0.45-1,1V37.485z M10.805,26.949c0,0.55,0.451,1,1,1h8.008c0.551,0,1-0.45,1-1V22.51c0-0.55-0.449-1-1-1h-8.008   c-0.549,0-1,0.45-1,1V26.949z" fill="#666666"/>
-</g>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_large_tb_join.svg
--- a/phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_large_tb_join.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<rect fill="none" fill-opacity="0.5" height="60" stroke-opacity="0.5" width="60"/>
-<g>
-<path d="M33.305,22.519c0,2.729,1.895,5.014,4.434,5.633c-0.297-0.846-0.468-1.75-0.477-2.691    c-0.979-0.617-1.635-1.701-1.635-2.941c0-1.918,1.563-3.48,3.482-3.48c0.33,0,0.646,0.063,0.952,0.148    c0.678-0.605,1.452-1.107,2.305-1.465c-0.93-0.633-2.051-1.004-3.257-1.004C35.908,16.716,33.305,19.319,33.305,22.519z     M38.518,31.806c0.27-0.33,0.545-0.639,0.838-0.896c-0.385-0.436-0.721-0.914-1.012-1.426h-2.809c-1.654,0-3.295,3.881-4.42,7.145    c-1.125,3.26-1.709,5.627-1.709,5.627h2.643c0-0.408,0.543-2.563,1.438-5.201c0.971-2.604,1.691-4.162,2.493-5.246h2.538V31.806z     M32.049,28.931c0.269-0.33,0.543-0.639,0.838-0.896c-0.387-0.436-0.723-0.914-1.012-1.426h-2.81c-1.657,0-3.294,3.881-4.42,7.143    s-1.708,5.629-1.708,5.629h2.64c0-0.408,0.543-2.563,1.437-5.201c0.971-2.602,1.69-4.164,2.492-5.248H32.049L32.049,28.931z     M31.268,25.276c-0.297-0.844-0.469-1.75-0.475-2.691c-0.979-0.619-1.637-1.701-1.637-2.939c0-1.92,1.563-3.482,3.479-3.482    c0.334,0,0.648,0.063,0.953,0.148c0.683-0.605,1.455-1.105,2.309-1.465c-0.932-0.633-2.055-1.006-3.262-1.006    c-3.199,0-5.801,2.604-5.801,5.803C26.836,22.37,28.728,24.657,31.268,25.276z" fill="#666666"/>
-<path d="M39.778,25.396c0,3.199,2.601,5.803,5.799,5.803c3.201,0,5.808-2.604,5.808-5.803    s-2.604-5.803-5.808-5.803C42.377,19.593,39.778,22.196,39.778,25.396z M45.576,21.913c1.924,0,3.486,1.563,3.486,3.482    s-1.563,3.48-3.486,3.48c-1.918,0-3.48-1.561-3.48-3.48S43.658,21.913,45.576,21.913z M53.481,39.503    c-1.125-3.266-2.765-7.143-4.418-7.143h-3.438h-3.617c-1.658,0-3.295,3.877-4.422,7.143c-1.125,3.26-1.707,5.629-1.707,5.629h2.64    c0-0.41,0.545-2.564,1.438-5.201c0.971-2.605,1.692-4.164,2.491-5.248h3.179h2.993c0.804,1.084,1.523,2.646,2.494,5.248    c0.894,2.639,1.438,4.791,1.438,5.201h2.642C55.192,45.132,54.608,42.763,53.481,39.503z" fill="#666666"/>
-<g>
-<path d="M18.227,33.763l-1.555-1.557c-0.979,1.18-2.072,2.256-3.264,3.219l1.553,1.553     c-0.91,0.732-1.873,1.404-2.892,1.994l-0.041,0.039h8.403v-8.395C19.787,31.729,19.045,32.776,18.227,33.763z" fill="#666666"/>
-<path d="M19.752,22.079c-0.787-0.605-6.068-2.355-12.262,3.779l-0.076,0.074     C1.28,32.126,3.032,37.409,3.635,38.194c0.438,0.574,0.933,1.221,1.771,1.785c0.207,0.127,0.6,0.285,1.021,0.275     s1.387-0.637,2.596-1.959c1.211-1.322,1.721-2.387,1.834-2.887l0.064-0.285l-0.189-0.223c-0.119-0.145-0.262-0.277-0.43-0.41     c-0.715-0.57-2.205-0.658-2.223-0.658l-0.229-0.014L7.74,33.616c-0.046-0.086-1.137-2.184,1.998-5.438     c3.254-3.135,5.35-2.043,5.436-1.996l0.203,0.111l0.014,0.229c0,0.018,0.088,1.508,0.658,2.223c0.131,0.17,0.268,0.309,0.41,0.43     l0.223,0.189l0.283-0.064c0.5-0.113,1.567-0.623,2.89-1.834c1.321-1.211,1.948-2.174,1.959-2.596     c0.009-0.422-0.15-0.814-0.277-1.021C20.971,23.009,20.325,22.515,19.752,22.079z" fill="#666666"/>
-</g>
-</g>
-</g>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_large_tb_loudsp_mute.svg
--- a/phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_large_tb_loudsp_mute.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<rect fill="none" fill-opacity="0.5" height="60" stroke-opacity="0.5" width="60"/>
-<g>
-<path d="M30.896,14.575h-4.929c-0.291,0-0.618,0.109-0.91,0.277l6.839,10.611v-9.889    C31.896,15.024,31.445,14.575,30.896,14.575z M36.33,20.429c-0.69,0-1.25,0.561-1.25,1.25v8.729l2.498,3.877V21.679    C37.578,20.989,37.019,20.429,36.33,20.429z M19.757,22.667H14.83c-0.55,0-1,0.449-1,1v13.994c0,0.551,0.45,1,1,1h4.927    l4.621,6.342c0.324,0.445,1.039,0.809,1.589,0.809h4.929c0.55,0,1-0.449,1-1v-7.35L21.058,20.646L19.757,22.667z" fill="#666666"/>
-<polygon fill="#666666" points="15.071,7.665 17.171,6.31 46.171,51.308 44.071,52.663 15.071,7.665   "/>
-</g>
-</g>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_large_tb_loudsp_unmute.svg
--- a/phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_large_tb_loudsp_unmute.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<g>
-<rect fill="none" fill-opacity="0.5" height="60" stroke-opacity="0.5" width="60"/>
-<g>
-<path d="M25.348,14.381c-0.55,0-1.244,0.378-1.541,0.841l-4.669,7.251h-4.927c-0.55,0-1,0.45-1,1v13.995     c0,0.55,0.45,1,1,1h4.927l4.621,6.342c0.324,0.445,1.039,0.809,1.589,0.809h4.929c0.55,0,1-0.45,1-1V15.381c0-0.55-0.45-1-1-1     H25.348z" fill="#666666"/>
-</g>
-</g>
-<g>
-<path d="M34.462,37.372V21.485c0-0.691,0.559-1.251,1.248-1.251l0,0c0.689,0,1.252,0.56,1.252,1.251l0,0v15.887    c0,0.689-0.563,1.249-1.252,1.249l0,0C35.021,38.621,34.462,38.062,34.462,37.372L34.462,37.372z" fill="#666666"/>
-<path d="M39.896,40.298v-21.74c0-0.689,0.561-1.249,1.25-1.249l0,0c0.689,0,1.249,0.56,1.249,1.249l0,0v21.74    c0,0.689-0.56,1.252-1.249,1.252l0,0C40.456,41.55,39.896,40.987,39.896,40.298L39.896,40.298z" fill="#666666"/>
-<path d="M45.538,43.641V15.215c0-0.69,0.56-1.25,1.252-1.25l0,0c0.689,0,1.25,0.56,1.25,1.25l0,0v28.426    c0,0.69-0.561,1.252-1.25,1.252l0,0C46.098,44.893,45.538,44.331,45.538,43.641L45.538,43.641z" fill="#666666"/>
-</g>
-</g>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_large_tb_message.svg
--- a/phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_large_tb_message.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<rect fill="none" height="60" width="60"/>
-<g>
-<polygon fill="#666666" points="38.165,38.746 32.015,40.565 33.922,34.504 51.582,16.844 55.824,21.086   "/>
-<path d="M42,47.675H13.174c-3.033,0-5.501-2.47-5.501-5.503V19.692c0-3.033,2.468-5.501,5.501-5.501H42    c2.604,0,4.87,1.855,5.388,4.409l0.056,0.263L34.964,31.138H20.029l-9.354-9.158v20.194c0,1.379,1.12,2.499,2.498,2.499H42    c1.381,0,2.501-1.12,2.501-2.499v-7.643l3-3v10.641C47.501,45.205,45.034,47.675,42,47.675L42,47.675z M21.35,28.136h12.294    l10.33-9.956c-0.473-0.615-1.2-0.983-1.974-0.983H13.174c-0.829,0-1.585,0.407-2.048,1.084L21.35,28.136L21.35,28.136z" fill="#666666"/>
-</g>
-</g>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_large_tb_mute.svg
--- a/phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_large_tb_mute.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<rect fill="none" fill-opacity="0.5" height="60" stroke-opacity="0.5" width="60"/>
-<path d="M38.377,23.988v12.305l2.066,3.207c0.273-0.703,0.43-1.464,0.431-2.263V23.988H38.377z M25.377,40.989   c-2.056-0.005-3.747-1.698-3.752-3.752V23.988h-2.497h-0.002v13.249c0.005,3.446,2.805,6.247,6.251,6.249h1.75v10.558h5.75V43.486   h1.751c0.214,0,0.424-0.011,0.632-0.032l-1.588-2.465H25.377z M29.33,38.531h1.343c0.45,0,0.878-0.078,1.292-0.189L24.33,26.494   v7.037C24.33,36.293,26.568,38.531,29.33,38.531z M30.673,10.604H29.33c-2.434,0-4.456,1.739-4.903,4.042l11.246,17.451V15.604   C35.673,12.843,33.435,10.604,30.673,10.604z" fill="#666666"/>
-<polygon fill="#666666" points="14.45,7.471 16.551,6.115 45.55,51.114 43.45,52.47 14.45,7.471  "/>
-</g>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_large_tb_silence.svg
--- a/phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_large_tb_silence.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<rect fill="none" fill-opacity="0.5" height="60" stroke-opacity="0.5" width="60"/>
-<g>
-<g>
-<path d="M20.253,15.567l2.602,2.604v-5.16l4.037,2.156v-4.459l-6.639-3.98V15.567L20.253,15.567z M16.163,35.304     c0.184,0.023,0.367,0.035,0.547,0.035l0,0c1.805-0.016,3.715-1.086,4.656-2.666l0,0c0.271-0.465,0.416-0.936,0.457-1.385     l0.025-0.047v-0.133l0,0c0-0.139,0-3.648,0-4.742v-0.211l-2.6-2.598v5.092l0,0c-0.078-0.004-0.156-0.006-0.234-0.004l0,0     c-1.801,0.012-3.723,1.082-4.662,2.674l0,0c-0.309,0.537-0.471,1.09-0.471,1.619l0,0C13.858,34.155,14.8,35.144,16.163,35.304     L16.163,35.304z" fill="#666666"/>
-</g>
-<polygon fill="#666666" points="9.358,11.591 11.495,9.454 31.698,29.655 29.562,31.794 9.358,11.591   "/>
-</g>
-<path d="M54.592,25.338c-0.059-0.357-0.295-1.59-0.837-2.398c-1.101-1.652-2.377-2.627-3.226-3.271   c-2.435-1.863-11.519-3.749-21.144,4.851l1.771,1.771c5.564-4.919,10.563-5.707,13.16-5.707c2.418,0,4.132,0.64,4.695,1.071   c0.758,0.576,1.793,1.364,2.66,2.67c0.153,0.229,0.334,0.788,0.434,1.311c-0.135,1.033-1.224,2.454-3.244,4.236   c-2.063,1.826-3.787,2.688-4.567,2.744c-0.112-0.073-0.452-0.311-0.878-0.847c-0.268-0.339-0.635-1.03-0.859-2.412l-0.344-2.106   l-2.133,0.007c-1.532,0.003-4.006,0.636-7.09,3.622c-3.007,3.124-3.645,5.593-3.652,7.123l-0.013,2.135l2.109,0.345   c1.443,0.236,2.127,0.645,2.407,0.866c0.5,0.396,0.742,0.72,0.84,0.878c-0.103,0.897-1.038,2.643-2.734,4.558   c-1.788,2.03-3.201,3.121-4.213,3.254c-0.513-0.092-1.09-0.277-1.321-0.434c-1.283-0.852-2.051-1.854-2.727-2.736   c-0.817-1.088-2.911-7.435,2.745-15.371l-1.793-1.794c-6.855,9.306-4.186,17.05-2.962,18.655c0.729,0.951,1.704,2.232,3.351,3.328   c0.813,0.541,2.042,0.777,2.4,0.836l0.181,0.027l0.181-0.006c1.765-0.115,3.627-1.375,6.031-4.102   c1.035-1.168,3.37-4.066,3.37-6.299c0.003-0.092-0.002-0.186-0.014-0.281l-0.019-0.18l-0.058-0.17   c-0.075-0.242-0.439-1.119-1.703-2.119c-1.062-0.846-2.514-1.207-3.56-1.379c0.006-0.939,0.431-2.775,2.927-5.352l-0.035,0.012   c2.576-2.494,4.418-2.914,5.358-2.918c0.171,1.053,0.528,2.508,1.371,3.568c1.007,1.264,1.879,1.627,2.122,1.705l0.172,0.061   l0.181,0.016c2.264,0.213,5.355-2.275,6.584-3.359c2.717-2.402,3.979-4.268,4.093-6.049l0.012-0.184L54.592,25.338z" fill="#666666"/>
-</g>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_large_tb_unmute.svg
--- a/phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_large_tb_unmute.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 60 60" width="60px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<rect fill="none" fill-opacity="0.5" height="60" stroke-opacity="0.5" width="60"/>
-<path d="M40.864,23.988h-2.497v13.249c-0.005,2.054-1.696,3.747-3.752,3.752h-9.238   c-2.056-0.005-3.747-1.698-3.752-3.752V23.988h-2.497h-0.002v13.249c0.005,3.446,2.805,6.247,6.251,6.249h1.738v10.558h5.756   V43.486c0,0,2.241-0.017,2.389-0.032l-0.001-0.001c3.145-0.325,5.603-2.987,5.607-6.216V23.988H40.864z M29.42,38.579h1.283   c2.75,0,5-2.25,5-5V15.544c0-2.75-2.25-5-5-5H29.42c-2.75,0-5,2.25-5,5v18.035C24.42,36.329,26.67,38.579,29.42,38.579z" fill="#666666"/>
-</g>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_mono_answer_call.svg
--- a/phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_mono_answer_call.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
-<defs>
-</defs>
-<g opacity="0.5">
-	<rect fill="none" width="30" height="30"/>
-</g>
-<path d="M28.578,7.523l-7.359,4.248c-0.364,0.152-0.771,0.057-0.953-0.256l-1.277-2.142c-0.002,0.002-0.006,0.007-0.007,0.008
-	c-0.001-0.001,0-0.003-0.001-0.004c-1.119,0.582-3.617,2.223-5.187,3.79c-1.632,1.635-3.149,3.394-4.417,5.576
-	c0,0-0.006,0.008-0.008,0.01c0.009,0.002,0.018,0.002,0.027,0.003l2.725,1.743c0.344,0.222,0.412,0.706,0.158,1.078L7.486,28.62
-	c-0.254,0.37-0.736,0.491-1.081,0.268c0,0-0.298-0.194-1.021-0.83c-0.001,0-0.002,0-0.003,0c-0.394-0.347-0.411-0.476-0.785-0.925
-	c-0.319-0.385-0.573-0.765-0.783-1.114c-0.001-0.001-0.004,0-0.005-0.002c-0.043-0.071-0.081-0.139-0.119-0.207
-	c-0.005-0.009-0.01-0.018-0.015-0.024c-0.391-0.698-0.56-1.211-0.56-1.211c-0.178-0.688-0.252-3.057,0.563-5.205
-	c0.52-1.364,3.24-5.672,6.42-8.854c3.181-3.182,8.125-6.349,10.3-7.005c2.176-0.656,3.903-0.556,4.417-0.374
-	c0,0,1.326,0.434,2.53,1.536c0.401,0.367,0.439,0.382,0.751,0.765c0.002,0.003,0,0.006,0.002,0.008
-	c-0.002-0.002-0.002-0.004-0.004-0.005c0.615,0.757,0.818,1.062,0.818,1.062C29.111,6.844,28.961,7.304,28.578,7.523z"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_mono_drop_call.svg
--- a/phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_mono_drop_call.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
-<defs>
-</defs>
-<g opacity="0.5">
-	<rect fill="none" width="30" height="30"/>
-</g>
-<path d="M10.212,8.109c0.055,0.038,0.103,0.08,0.159,0.117c0.002,0.085,0.007,0.529,0.002,0.614
-	c-0.004,0.054-0.023,0.11-0.042,0.167c0.089,1.068,0.15,3.104-0.483,4.348c-0.273,0.539-0.615,1.011-1.033,1.424
-	C9.12,15.073,9.671,15.486,10.438,16h6.139c-0.073-0.132-0.162-0.251-0.228-0.389c-0.603-1.273-0.687-3.219-0.65-4.633
-	c-1.034-0.719-2.033-1.543-2.07-2.138c-0.006-0.09,0-0.523,0-0.614c0.621-0.419,1.057-0.91,1.383-1.552
-	c0.605-1.188,0.281-3.985,0.281-3.985C15.293,1.45,13.646,0,12.395,0H11.6c-1.254,0-2.902,1.45-2.902,2.689
-	c0,0-0.172,1.68,0.017,2.991C9.477,6.346,10.033,7.214,10.212,8.109z"/>
-<path d="M19.987,16.797c0.003,0.112,0.009,0.695,0.001,0.807c-0.005,0.076-0.032,0.158-0.061,0.24
-	c0.001-0.001,0.002-0.002,0.002-0.003h4.393c-0.027-0.081-0.055-0.162-0.06-0.237c-0.007-0.118-0.001-0.687,0.001-0.807
-	c0.814-0.549,1.385-1.194,1.814-2.037c0.795-1.559,0.369-5.229,0.369-5.229c0-1.626-2.16-3.53-3.805-3.53H21.6
-	c-1.645,0-3.81,1.904-3.81,3.53c0,0-0.376,3.652,0.367,5.225C18.564,15.615,19.153,16.25,19.987,16.797z"/>
-<path d="M24.677,18.443l-2.552,5.771l-2.552-5.771c-0.921,1.158-3.178,2.559-4.44,3.355l1.008,1.008l-1.891,1.891v0.461L16.092,27
-	H30v-4.594C29.778,22.114,25.947,20.043,24.677,18.443z"/>
-<path d="M7.129,14.841c-0.006-0.09,0-0.523,0-0.614c0.621-0.419,1.057-0.91,1.383-1.552c0.605-1.188,0.281-3.985,0.281-3.985
-	C8.793,7.45,7.146,6,5.895,6H5.1C3.846,6,2.197,7.45,2.197,8.689c0,0-0.287,2.783,0.279,3.981c0.311,0.654,0.76,1.139,1.395,1.556
-	c0.002,0.085,0.007,0.529,0.002,0.614C3.811,15.82,1.139,17.424,0,18.147V22h2.807l4.143-4.143l2.121,2.121l1.867-1.867
-	C9.769,17.37,7.189,15.804,7.129,14.841z"/>
-<polygon points="13.313,22.807 11.191,20.686 9.07,22.807 6.949,20.686 4.828,22.807 6.949,24.928 4.828,27.049 6.949,29.171 
-	9.07,27.05 11.191,29.171 13.313,27.049 11.191,24.928 "/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_mono_end_call.svg
--- a/phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_mono_end_call.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
-<defs>
-</defs>
-<g opacity="0.5">
-	<rect fill="none" width="30" height="30"/>
-</g>
-<path d="M28.908,18.236l-7.671-2.057c-0.341-0.139-0.547-0.472-0.461-0.798l0.571-2.261c-0.002,0.001-0.008,0.001-0.01,0.001
-	c0.001-0.001,0.002-0.002,0.002-0.003c-1.125-0.355-3.859-0.922-5.933-0.923c-2.159,0.001-4.325,0.161-6.604,0.766
-	c0,0-0.009,0.002-0.012,0.002c0.006,0.007,0.012,0.013,0.017,0.02l0.648,2.953c0.081,0.374-0.194,0.738-0.608,0.816l-7.822,1.486
-	c-0.412,0.076-0.811-0.162-0.891-0.537c0,0-0.068-0.325-0.126-1.224c-0.001,0-0.001,0-0.001-0.002
-	c-0.031-0.489,0.042-0.586,0.092-1.13c0.043-0.466,0.126-0.885,0.219-1.254c0-0.001-0.003-0.003-0.002-0.005
-	c0.019-0.074,0.039-0.145,0.059-0.216c0.002-0.009,0.005-0.018,0.006-0.025c0.203-0.72,0.43-1.17,0.43-1.17
-	c0.338-0.572,1.855-2.187,3.813-3.068C5.867,9.05,10.514,8.001,14.718,8c4.205-0.001,9.565,1.174,11.438,2.178
-	s2.946,2.212,3.165,2.671c0,0,0.59,1.164,0.658,2.688c0.023,0.509,0.037,0.543-0.01,1.002c0,0.003-0.003,0.004-0.003,0.007
-	c0-0.003,0-0.004,0-0.007c-0.094,0.907-0.161,1.243-0.161,1.243C29.71,18.14,29.308,18.344,28.908,18.236z"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_mono_hold_call.svg
--- a/phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_mono_hold_call.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
-<defs>
-</defs>
-<g opacity="0.5">
-	<rect fill="none" width="30" height="30"/>
-</g>
-<path d="M28.908,10.028l-7.671,2.057c-0.341,0.139-0.547,0.472-0.461,0.798l0.571,2.261c-0.002-0.001-0.008-0.001-0.01-0.001
-	c0.001,0.001,0.002,0.002,0.002,0.003c-1.125,0.355-3.859,0.922-5.933,0.923c-2.159-0.001-4.325-0.161-6.604-0.766
-	c0,0-0.009-0.002-0.012-0.002c0.006-0.007,0.012-0.013,0.017-0.02l0.648-2.953c0.081-0.374-0.194-0.738-0.608-0.816l-7.822-1.486
-	c-0.412-0.076-0.811,0.162-0.891,0.537c0,0-0.068,0.325-0.126,1.224c-0.001,0-0.001,0-0.001,0.002
-	c-0.031,0.489,0.042,0.586,0.092,1.13c0.043,0.466,0.126,0.885,0.219,1.254c0,0.001-0.003,0.003-0.002,0.005
-	c0.019,0.074,0.039,0.145,0.059,0.216c0.002,0.009,0.005,0.018,0.006,0.025c0.203,0.72,0.43,1.17,0.43,1.17
-	c0.338,0.572,1.855,2.187,3.813,3.068c1.244,0.559,5.891,1.607,10.095,1.608c4.205,0.001,9.565-1.174,11.438-2.178
-	s2.946-2.212,3.165-2.671c0,0,0.59-1.164,0.658-2.688c0.023-0.509,0.037-0.543-0.01-1.002c0-0.003-0.003-0.004-0.003-0.007
-	c0,0.003,0,0.004,0,0.007c-0.094-0.907-0.161-1.243-0.161-1.243C29.71,10.125,29.308,9.921,28.908,10.028z"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_mono_join_call.svg
--- a/phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_mono_join_call.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
-<defs>
-</defs>
-<g opacity="0.5">
-	<rect fill="none" width="30" height="30"/>
-</g>
-<path d="M10.213,8.109c0.054,0.038,0.102,0.08,0.158,0.117c0.002,0.085,0.007,0.529,0.002,0.614
-	c-0.004,0.053-0.023,0.109-0.042,0.166c0.089,1.067,0.151,3.104-0.483,4.349c-0.273,0.539-0.615,1.011-1.033,1.424
-	c0.305,0.294,0.856,0.707,1.623,1.221h6.824c-0.354-0.427-0.67-0.879-0.912-1.389c-0.469-0.993-0.623-2.394-0.651-3.634
-	c-1.034-0.719-2.032-1.543-2.069-2.137c-0.006-0.09,0-0.523,0-0.614c0.621-0.419,1.057-0.91,1.383-1.552
-	c0.605-1.188,0.281-3.985,0.281-3.985C15.293,1.45,13.646,0,12.395,0H11.6c-1.254,0-2.902,1.45-2.902,2.689
-	c0,0-0.172,1.68,0.018,2.992C9.477,6.346,10.033,7.214,10.213,8.109z"/>
-<path d="M19.987,15.797c0.003,0.112,0.009,0.695,0.001,0.807c-0.005,0.076-0.032,0.158-0.061,0.24c0-0.001,0.002-0.002,0.002-0.003
-	h4.393c-0.027-0.081-0.055-0.162-0.06-0.237c-0.007-0.118-0.001-0.687,0.001-0.807c0.814-0.549,1.385-1.194,1.814-2.037
-	c0.795-1.559,0.369-5.229,0.369-5.229c0-1.626-2.16-3.53-3.805-3.53H21.6c-1.645,0-3.81,1.904-3.81,3.53
-	c0,0-0.376,3.652,0.367,5.225C18.564,14.615,19.153,15.25,19.987,15.797z"/>
-<path d="M24.677,17.443l-2.552,5.771l-2.551-5.771c-0.549,0.688-1.57,1.464-2.574,2.146V26h13v-4.594
-	C29.778,21.114,25.947,19.043,24.677,17.443z"/>
-<path d="M7.129,14.841c-0.006-0.09,0-0.523,0-0.614c0.621-0.419,1.057-0.91,1.383-1.552c0.605-1.188,0.281-3.985,0.281-3.985
-	C8.793,7.45,7.146,6,5.895,6H5.1C3.846,6,2.197,7.45,2.197,8.689c0,0-0.287,2.783,0.279,3.981c0.311,0.654,0.76,1.139,1.395,1.556
-	c0.002,0.085,0.007,0.529,0.002,0.614C3.811,15.82,1.139,17.425,0,18.148V22h1.454l7.665-5.078
-	C8.115,16.217,7.166,15.42,7.129,14.841z"/>
-<polygon points="11,18.075 2,23.537 11,29 11,26 15,26 15,21 11,21 "/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_mono_private_call.svg
--- a/phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_mono_private_call.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
-<defs>
-</defs>
-<g opacity="0.5">
-	<rect fill="none" width="30" height="30"/>
-</g>
-<path d="M12.794,12.168c1.569-1.567,4.066-3.208,5.188-3.79c0,0.001,0,0.003,0,0.004c0.002-0.001,0.005-0.006,0.006-0.008
-	l1.278,2.142c0.183,0.313,0.589,0.408,0.952,0.256l7.36-4.248c0.384-0.22,0.532-0.68,0.333-1.022c0,0-0.202-0.305-0.818-1.062
-	c0.002,0.001,0.004,0.003,0.005,0.005c-0.001-0.002-0.001-0.005-0.003-0.008c-0.311-0.383-0.349-0.397-0.75-0.765
-	c-1.205-1.103-2.531-1.536-2.531-1.536c-0.513-0.182-2.24-0.282-4.416,0.374s-7.119,3.823-10.3,7.005
-	c-3.18,3.183-5.9,7.49-6.42,8.854c-0.814,2.148-0.74,4.517-0.563,5.205c0,0,0.169,0.513,0.56,1.211
-	c0.005,0.007,0.01,0.016,0.015,0.024c0.038,0.068,0.076,0.136,0.119,0.207c0.001,0.002,0.004,0.001,0.005,0.002
-	c0.21,0.35,0.464,0.729,0.783,1.114c0.374,0.449,0.392,0.578,0.785,0.925c0.001,0,0.002,0,0.003,0
-	c0.723,0.636,1.021,0.83,1.021,0.83c0.345,0.224,0.827,0.103,1.08-0.268l4.794-7.042c0.254-0.372,0.186-0.856-0.158-1.078
-	l-2.725-1.743c-0.01-0.001-0.019-0.001-0.027-0.003c0.002-0.002,0.008-0.01,0.008-0.01C9.644,15.562,11.162,13.803,12.794,12.168z"
-	/>
-<path d="M22.5,16c-3.59,0-6.5,2.91-6.5,6.5s2.91,6.5,6.5,6.5s6.5-2.91,6.5-6.5S26.09,16,22.5,16z M27,24h-9v-3h9V24z"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_mono_reject_call.svg
--- a/phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_mono_reject_call.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
-<defs>
-</defs>
-<g opacity="0.5">
-	<rect fill="none" width="30" height="30"/>
-</g>
-<path d="M15.691,11.542c1.257-0.96,2.563-1.786,3.289-2.164c0.001,0.001,0,0.003,0.001,0.004c0.001-0.001,0.005-0.006,0.007-0.008
-	l1.277,2.142c0.183,0.313,0.589,0.408,0.953,0.256l7.359-4.248c0.383-0.22,0.533-0.68,0.334-1.022c0,0-0.203-0.305-0.818-1.062
-	c0.002,0.001,0.002,0.003,0.004,0.005c-0.002-0.002,0-0.005-0.002-0.008c-0.312-0.383-0.35-0.397-0.751-0.765
-	c-1.204-1.103-2.53-1.536-2.53-1.536c-0.514-0.182-2.241-0.282-4.417,0.374c-1.677,0.506-4.996,2.505-7.888,4.851L15.691,11.542z"/>
-<path d="M9.396,18.757c-0.01-0.001-0.019-0.001-0.027-0.003c0.002-0.002,0.008-0.01,0.008-0.01c0.652-1.125,1.375-2.136,2.143-3.077
-	l-3.205-3.205c-2.367,2.794-4.219,5.808-4.637,6.907c-0.814,2.148-0.74,4.517-0.563,5.205c0,0,0.169,0.513,0.56,1.211
-	c0.005,0.007,0.01,0.016,0.015,0.024c0.038,0.068,0.076,0.136,0.119,0.207c0.001,0.002,0.004,0.001,0.005,0.002
-	c0.21,0.35,0.464,0.729,0.783,1.114c0.374,0.449,0.392,0.578,0.785,0.925c0.001,0,0.002,0,0.003,0
-	c0.723,0.636,1.021,0.83,1.021,0.83c0.345,0.224,0.827,0.103,1.08-0.268l4.794-7.042c0.254-0.372,0.186-0.856-0.158-1.078
-	L9.396,18.757z"/>
-<rect x="13.74" y="-3.24" transform="matrix(0.7066 -0.7076 0.7076 0.7066 -6.0774 14.6889)" width="1.867" height="35.826"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_mono_replace_call.svg
--- a/phoneuis/bubblemanager2/tsrc/bubbletest2/resources/qtg_mono_replace_call.svg	Fri Mar 19 09:28:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
-<defs>
-</defs>
-<g opacity="0.5">
-	<rect fill="none" width="30" height="30"/>
-</g>
-<path d="M27.578,6.523l-7.36,4.248c-0.363,0.152-0.77,0.057-0.952-0.256l-1.278-2.142c-0.001,0.002-0.004,0.007-0.006,0.008
-	c0-0.001,0-0.003,0-0.004c-1.121,0.582-3.618,2.223-5.188,3.79c-1.632,1.635-3.15,3.394-4.417,5.576c0,0-0.006,0.008-0.008,0.01
-	c0.009,0.002,0.018,0.002,0.027,0.003l2.725,1.743c0.344,0.222,0.412,0.706,0.158,1.078L6.485,27.62
-	c-0.253,0.37-0.735,0.491-1.08,0.268c0,0-0.298-0.194-1.021-0.83c-0.001,0-0.002,0-0.003,0c-0.394-0.347-0.411-0.476-0.785-0.925
-	c-0.319-0.385-0.573-0.765-0.783-1.114c-0.001-0.001-0.004,0-0.005-0.002c-0.043-0.071-0.081-0.139-0.119-0.207
-	c-0.005-0.009-0.01-0.018-0.015-0.024c-0.391-0.698-0.56-1.211-0.56-1.211c-0.178-0.688-0.252-3.057,0.563-5.205
-	c0.52-1.364,3.24-5.672,6.42-8.854c3.181-3.182,8.124-6.349,10.3-7.005s3.903-0.556,4.416-0.374c0,0,1.326,0.434,2.531,1.536
-	c0.401,0.367,0.439,0.382,0.75,0.765c0.002,0.003,0.002,0.006,0.003,0.008c-0.001-0.002-0.003-0.004-0.005-0.005
-	c0.616,0.757,0.818,1.062,0.818,1.062C28.11,5.844,27.962,6.304,27.578,6.523z"/>
-<path d="M24.001,11L18,19h1.963h2v2.522V25H20v-5h-0.037H16v4v1l0,0c0,3,2.775,5,5.5,5s5.5-2,5.5-5v-6h3L24.001,11z"/>
-</svg>
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/tsrc/unit/mt_bubblemanager2/mt_bubblemanager2.cpp
--- a/phoneuis/bubblemanager2/tsrc/unit/mt_bubblemanager2/mt_bubblemanager2.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/tsrc/unit/mt_bubblemanager2/mt_bubblemanager2.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -37,10 +37,13 @@
     void initTestCase();
     void cleanupTestCase();
 
+    void testConferenceCall();
+
+private:
     void testBasicMtCall();
     void testBasicMoCall();
     void testWaitingCall();
-    void testConferenceCall();
+
     void testEmergencyCall();
 
 private:
@@ -157,6 +160,7 @@
     bubbleManager->setSecondaryCli( bubbleId, "0507284096" );
     bubbleManager->setNumberType( bubbleId, BubbleManager::Mobile );
     bubbleManager->setLabel( bubbleId,"Calling");
+    bubbleManager->setCallFlag( bubbleId, BubbleManager::NoCiphering, true );
     bubbleManager->setCallObjectFromTheme(bubbleId);
     HbAction action1("End call", this);
     action1.setSoftKeyRole(QAction::NegativeSoftKey);
@@ -177,6 +181,7 @@
     bubbleManager->setState( bubbleId, BubbleManager::Active );
     bubbleManager->setLabel( bubbleId,"");
     bubbleManager->setCallTime( bubbleId, "00:00" );
+    bubbleManager->setCallFlag( bubbleId, BubbleManager::NoCiphering, false);
     bubbleManager->clearActions(bubbleId);
     HbAction action2("Hold", this);
     bubbleManager->addAction( bubbleId, &action2 );
@@ -358,6 +363,8 @@
     bubbleManager->setCli(bubbleIdC,"Conference call",Qt::ElideRight);
     bubbleManager->setExpandedConferenceCallHeader(true);
     bubbleManager->setState(bubbleIdC,BubbleManager::Active);
+    bubbleManager->setState(bubbleId1,BubbleManager::Active);
+    bubbleManager->setState(bubbleId2,BubbleManager::Active);
     bubbleManager->setCallTime(bubbleIdC,"00:00");
     HbAction action5("End conference");
     action5.setSoftKeyRole(QAction::NegativeSoftKey);
@@ -410,6 +417,21 @@
     QTest::mouseClick(mainWindow->viewport(),Qt::LeftButton,0,QPoint(100,100));
     QTest::qWait( 2*WAIT_TIME );
 
+    // hold/unhold conference
+    bubbleManager->startChanges();
+    bubbleManager->setState( bubbleIdC, BubbleManager::OnHold );
+    bubbleManager->setState( bubbleId1, BubbleManager::OnHold );
+    bubbleManager->setState( bubbleId2, BubbleManager::OnHold );
+    bubbleManager->setState( bubbleId3, BubbleManager::OnHold );
+    bubbleManager->endChanges();
+    QTest::qWait( 2*WAIT_TIME );
+    bubbleManager->startChanges();
+    bubbleManager->setState( bubbleIdC, BubbleManager::Active );
+    bubbleManager->setState( bubbleId1, BubbleManager::Active );
+    bubbleManager->setState( bubbleId2, BubbleManager::Active );
+    bubbleManager->setState( bubbleId3, BubbleManager::Active );
+    bubbleManager->endChanges();
+
     // remove call from conference
     bubbleManager->startChanges();
     bubbleManager->removeRowFromConference(bubbleId3);
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/tsrc/unit/ut_bubblebuttonstyle/ut_bubblebuttonstyle.cpp
--- a/phoneuis/bubblemanager2/tsrc/unit/ut_bubblebuttonstyle/ut_bubblebuttonstyle.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/tsrc/unit/ut_bubblebuttonstyle/ut_bubblebuttonstyle.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -70,11 +70,11 @@
 
     mStyle->setButtonColor(BubbleButtonStyle::Green);
     mStyle->updatePrimitive(item,HbStyle::P_PushButton_background,&option);
-    QVERIFY(item->frameDrawer().frameGraphicsName()==":/resources/qtg_fr_btn_green_pressed");
+    QVERIFY(item->frameDrawer().frameGraphicsName()=="qtg_fr_btn_green_pressed");
 
     mStyle->setButtonColor(BubbleButtonStyle::Red);
     mStyle->updatePrimitive(item,HbStyle::P_PushButton_background,&option);
-    QVERIFY(item->frameDrawer().frameGraphicsName()==":/resources/qtg_fr_btn_red_pressed");
+    QVERIFY(item->frameDrawer().frameGraphicsName()=="qtg_fr_btn_red_pressed");
 
     // Enabled OFF
     option.state &= ~QStyle::State_On;
@@ -86,11 +86,11 @@
 
     mStyle->setButtonColor(BubbleButtonStyle::Green);
     mStyle->updatePrimitive(item,HbStyle::P_PushButton_background,&option);
-    QVERIFY(item->frameDrawer().frameGraphicsName()==":/resources/qtg_fr_btn_green_normal");
+    QVERIFY(item->frameDrawer().frameGraphicsName()=="qtg_fr_btn_green_normal");
 
     mStyle->setButtonColor(BubbleButtonStyle::Red);
     mStyle->updatePrimitive(item,HbStyle::P_PushButton_background,&option);
-    QVERIFY(item->frameDrawer().frameGraphicsName()==":/resources/qtg_fr_btn_red_normal");
+    QVERIFY(item->frameDrawer().frameGraphicsName()=="qtg_fr_btn_red_normal");
 
     // Disabled
     option.state &= ~QStyle::State_Enabled;
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/tsrc/unit/ut_bubbleheadingwidget/ut_bubbleheadingwidget.cpp
--- a/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleheadingwidget/ut_bubbleheadingwidget.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleheadingwidget/ut_bubbleheadingwidget.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -43,8 +43,6 @@
     void testTwoLinedHeading();
     void testOneLinedHeading();
 
-    //void testInvalidStylePlugin();
-
 private:
     BubbleHeadingWidget* mHeading;
     HbMainWindow* mMainWindow;
@@ -78,11 +76,12 @@
     header.setText("",Qt::ElideRight);
     header.setTimerCost("0:00");
     header.setCallState(BubbleManagerIF::Active);
+    header.setCallFlag(BubbleManagerIF::NoCiphering);
     mHeading->setLineCount(3);
     Q_ASSERT(mHeading->lineCount()==3);
     mHeading->readBubbleHeader(header);
     mHeading->show();
-    QTest::qWait(100);
+    QTest::qWait(1000);
     mHeading->updateTimerDisplayNow();
 }
 
@@ -94,6 +93,7 @@
     header.setText("",Qt::ElideRight);
     header.setTimerCost("0:00");
     header.setCallState(BubbleManagerIF::Active);
+    header.setCallFlag(BubbleManagerIF::NoCiphering);
 
     mHeading->setLineCount(2);
     Q_ASSERT(mHeading->lineCount()==2);
@@ -111,6 +111,7 @@
     header.setText("",Qt::ElideRight);
     header.setTimerCost("0:00");
     header.setCallState(BubbleManagerIF::Active);
+    header.setCallFlag(BubbleManagerIF::NoCiphering);
 
     mHeading->setLineCount(1);
     Q_ASSERT(mHeading->lineCount()==1);
@@ -121,22 +122,5 @@
     mHeading->updateTimerDisplayNow();
 }
 
-/*void ut_BubbleHeadingWidget::testInvalidStylePlugin()
-{
-    // this just shouldn't crash
-    BubbleHeadingWidget *heading =
-        new BubbleHeadingWidget("c:\foobar.dll");
-    HbView* view = mMainWindow->addView(heading);
-    mMainWindow->setCurrentView(view);
-    BubbleHeader header;
-    header.setCli("John Doe",Qt::ElideRight);
-    header.setSecondaryCli("12345",Qt::ElideLeft);
-    header.setText("",Qt::ElideRight);
-    header.setTimerCost("0:00");
-    header.setCallState(BubbleManagerIF::Active);
-    heading->readBubbleHeader(header);
-    heading->show();
-}*/
-
 BUBBLE_TEST_MAIN(ut_BubbleHeadingWidget)
 #include "ut_bubbleheadingwidget.moc"
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/tsrc/unit/ut_bubblepartlistmodel/ut_bubblepartlistmodel.cpp
--- a/phoneuis/bubblemanager2/tsrc/unit/ut_bubblepartlistmodel/ut_bubblepartlistmodel.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/tsrc/unit/ut_bubblepartlistmodel/ut_bubblepartlistmodel.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -31,8 +31,10 @@
 private slots:
     void initTestCase();
     void cleanupTestCase();
+    void cleanupTest();
     
     void test_addParticipant();
+    void test_removeParticipant();
     void test_bubbleId();
     void test_dataModel();
     void test_reset();
@@ -51,29 +53,79 @@
     delete mModel;
 }
 
+void ut_BubbleParticipantListModel::cleanupTest()
+{
+    mModel->reset();
+}
+
 void ut_BubbleParticipantListModel::test_addParticipant()
 {
-    mModel->addParticipant(1,"Bubble-1",8);
-    mModel->addParticipant(2,"Bubble-2",9);
-    mModel->addParticipant(3,"Bubble-3",10);
+    QSignalSpy spyDataChanged(mModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)));
+
+    mModel->addParticipant(1,"Bubble-1",8,true);
+    mModel->addParticipant(2,"Bubble-2",9,false);
+    mModel->addParticipant(3,"Bubble-3",10,true);
+    QVERIFY(mModel->rowCount()==3);
+    QVERIFY(spyDataChanged.count()==0);
+
+    // name changed
+    mModel->addParticipant(2,"Bubble-Two",9,false);
+    QVERIFY(mModel->rowCount()==3);
+    QVERIFY(spyDataChanged.count()==1);
+
+    // state changed
+    mModel->addParticipant(2,"Bubble-Two",11,false);
+    QVERIFY(mModel->rowCount()==3);
+    QVERIFY(spyDataChanged.count()==2);
 
+    // ciphering changed
+    mModel->addParticipant(2,"Bubble-Two",11,true);
     QVERIFY(mModel->rowCount()==3);
+    QVERIFY(spyDataChanged.count()==3);
+}
+
+void ut_BubbleParticipantListModel::test_removeParticipant()
+{
+    mModel->addParticipant(1,"Bubble-1",8,true);
+    mModel->addParticipant(2,"Bubble-2",9,false);
+    mModel->addParticipant(3,"Bubble-3",10,true);
+
+    mModel->removeParticipant(2);
+    QVERIFY(mModel->rowCount()==2);
+
+    mModel->removeParticipant(3);
+    QVERIFY(mModel->rowCount()==1);
+
+    mModel->addParticipant(2,"Bubble-2",9,false);
+    QVERIFY(mModel->rowCount()==2);
 }
 
 void ut_BubbleParticipantListModel::test_bubbleId()
 {
+    mModel->addParticipant(1,"Bubble-1",8,true);
+    mModel->addParticipant(2,"Bubble-2",9,false);
+    mModel->addParticipant(3,"Bubble-3",10,true);
+
     QVERIFY(mModel->bubbleId(1)==2);
     QVERIFY(mModel->bubbleId(4)==-1);
 }
 
 void ut_BubbleParticipantListModel::test_dataModel()
 {
+    mModel->addParticipant(1,"Bubble-1",8,true);
+    mModel->addParticipant(2,"Bubble-2",9,false);
+    mModel->addParticipant(3,"Bubble-3",10,true);
+
     QModelIndex index = mModel->index(1,0);
 
     QVERIFY(index.data(Qt::DecorationRole).toInt()==9);
     QVERIFY(index.data(Qt::DisplayRole).toString()=="Bubble-2");
+    QVERIFY(index.data(Qt::StatusTipRole).toBool()==false);
     QVERIFY(index.data(Qt::UserRole).isNull());
 
+    index = mModel->index(2,0);
+    QVERIFY(index.data(Qt::StatusTipRole).toBool()==true);
+
     index = mModel->index(4,0);
     QVERIFY(index.data(Qt::DisplayRole).isNull());
 }
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/tsrc/unit/ut_bubblestyleplugin/ut_bubblestyleplugin.cpp
--- a/phoneuis/bubblemanager2/tsrc/unit/ut_bubblestyleplugin/ut_bubblestyleplugin.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/tsrc/unit/ut_bubblestyleplugin/ut_bubblestyleplugin.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -52,21 +52,24 @@
     void testVideoCallStatusIcon();
     void testVoipCallStatusIcon();
     void testNumberTypeIcon();
+    void testCipheringIcon();
 
 private:
-    BubbleStylePlugin* mPlugin;
+    BubbleStylePlugin* mPluginInstance;
+    HbStyleInterface*  mPlugin;
     HbWidget* mParent;
 };
 
 void ut_BubbleStylePlugin::initTestCase()
 {
-    mPlugin = new BubbleStylePlugin();
+    mPluginInstance = new BubbleStylePlugin();
+    mPlugin = static_cast<HbStyleInterface*>(mPluginInstance);
     mParent = new HbWidget();
 }
 
 void ut_BubbleStylePlugin::cleanupTestCase()
 {
-    delete mPlugin;
+    delete mPluginInstance;
     delete mParent;
 }
 
@@ -315,7 +318,7 @@
     mPlugin->updatePrimitive(
             item, (HbStyle::Primitive)(BP_NumberType_icon),
             &option);
-    QVERIFY(icon->icon().iconName()==":/resources/qgn_indi_call_diverted.svg");
+    QVERIFY(icon->icon().iconName()==":/qgn_indi_call_diverted.svg");
     option.mCallState = BubbleManagerIF::Incoming;
     option.mCallFlags &= ~BubbleManagerIF::Diverted;
     mPlugin->updatePrimitive(
@@ -329,7 +332,7 @@
     mPlugin->updatePrimitive(
             item, (HbStyle::Primitive)(BP_NumberType_icon),
             &option);
-    QVERIFY(icon->icon().iconName()==":/resources/qgn_indi_call_diverted.svg");
+    QVERIFY(icon->icon().iconName()==":/qgn_indi_call_diverted.svg");
     option.mCallState = BubbleManagerIF::Waiting;
     option.mCallFlags &= ~BubbleManagerIF::Diverted;
     mPlugin->updatePrimitive(
@@ -338,5 +341,29 @@
     QVERIFY(icon->icon().iconName()=="");
 }
 
+void ut_BubbleStylePlugin::testCipheringIcon()
+{
+    QGraphicsItem *item = mPlugin->createPrimitive(
+        (HbStyle::Primitive)(BP_Ciphering_icon),mParent);
+    QVERIFY(item);
+    QVERIFY(item->parentItem()==mParent);
+
+    HbIconItem* icon = qgraphicsitem_cast<HbIconItem*>(item);
+    QVERIFY(icon);
+    BubbleStyleOption option;
+    option.mCallState = BubbleManagerIF::Active;
+    option.mCallFlags |= BubbleManagerIF::NoCiphering;
+    mPlugin->updatePrimitive(
+            item, (HbStyle::Primitive)(BP_Ciphering_icon),
+            &option);
+    QVERIFY(icon->icon().iconName()=="qtg_mono_ciphering_off");
+    option.mCallState = BubbleManagerIF::Incoming;
+    option.mCallFlags &= ~BubbleManagerIF::NoCiphering;
+    mPlugin->updatePrimitive(
+            item, (HbStyle::Primitive)(BP_Ciphering_icon),
+            &option);
+    QVERIFY(icon->icon().iconName()=="");
+}
+
 BUBBLE_TEST_MAIN(ut_BubbleStylePlugin)
 #include "ut_bubblestyleplugin.moc"
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/bubblemanager2/tsrc/unit/ut_bubbleutils/ut_bubbleutils.cpp
--- a/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleutils/ut_bubbleutils.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleutils/ut_bubbleutils.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -58,6 +58,7 @@
     void test_setCallHeaderTexts2Lines_active();
     void test_setCallHeaderTexts2Lines_held();
     void test_setCallHeaderTexts2Lines_disconnected();
+    void test_setCallHeaderTexts2Lines_outgoing();
 
     void test_compareHeaders();
 
@@ -466,6 +467,24 @@
     QVERIFY( opt.mText3 == "" );
 }
 
+void ut_BubbleUtils::test_setCallHeaderTexts2Lines_outgoing()
+{
+    // outgoing
+    BubbleHeader header;
+    BubbleStyleOption opt;
+
+    header.setCallState(BubbleManager::Outgoing);
+    header.setCli("john", Qt::ElideRight);
+    header.setText("calling", Qt::ElideRight);
+    header.setTimerCost("00:00");
+
+    BubbleUtils::setCallHeaderTexts2Lines(header, opt);
+    QCOMPARE(opt.mText1, QString("calling"));
+    QCOMPARE(opt.mText1Clip, Qt::ElideRight);
+    QCOMPARE(opt.mText2, QString("john"));
+    QCOMPARE(opt.mText2Clip, Qt::ElideRight);
+}
+
 void ut_BubbleUtils::test_compareHeaders()
 {
     BubbleHeader header1;
diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneuis/group/bld.inf
--- a/phoneuis/group/bld.inf	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneuis/group/bld.inf	Fri Apr 16 14:58:25 2010 +0300
@@ -15,6 +15,6 @@
 *              
 */ 
 
-#include "../TelephonyDeviceMode/group/bld.inf"
+#include "../telephonydevicemode/group/bld.inf"
 
 // End of File
\ No newline at end of file