--- 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>

--- 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

--- 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"

--- 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

--- 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

--- 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 

--- 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

--- 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 =======================
 

--- 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.

--- 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"

--- 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  

--- 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 --> 
     }
 
 // -----------------------------------------------------------------------------

--- 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 )
         {

--- 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 --> 
         }
     }
 

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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>

--- 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

--- 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

--- 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
 

--- /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>

--- 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

--- 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

--- 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,