# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1266612784 -7200 # Node ID 07d1685f0cd411db81f47b829d196ca601496426 # Parent 6dc066157ed496759e00751fe884f6c4a0e1d9a9 Revision: 201002 Kit: 201007 diff -r 6dc066157ed4 -r 07d1685f0cd4 vtengines/videoteleng/Inc/Audio/CVtEngAudioHandler.h --- a/vtengines/videoteleng/Inc/Audio/CVtEngAudioHandler.h Tue Jan 26 12:01:21 2010 +0200 +++ b/vtengines/videoteleng/Inc/Audio/CVtEngAudioHandler.h Fri Feb 19 22:53:04 2010 +0200 @@ -29,9 +29,9 @@ #include "CVtEngAccessoryHandler.h" #include "MVtEngAccessoryObserver.h" // new audio routing -#include "telephonyaudiorouting.h" -#include "mtelephonyaudioroutingobserver.h" -#include +#include "TelephonyAudioRouting.h" +#include "MTelephonyAudioRoutingObserver.h" +#include #include // FORWARD DECLARATIONS diff -r 6dc066157ed4 -r 07d1685f0cd4 vtengines/videoteleng/Inc/Base/CVtEngAccessoryHandler.h --- a/vtengines/videoteleng/Inc/Base/CVtEngAccessoryHandler.h Tue Jan 26 12:01:21 2010 +0200 +++ b/vtengines/videoteleng/Inc/Base/CVtEngAccessoryHandler.h Fri Feb 19 22:53:04 2010 +0200 @@ -23,8 +23,8 @@ // INCLUDES #include #include -#include -#include +#include +#include // FORWARD DECLARATIONS class MVtEngAccessoryObserver; diff -r 6dc066157ed4 -r 07d1685f0cd4 vtengines/videoteleng/Inc/Base/CVtEngSATClient.h --- a/vtengines/videoteleng/Inc/Base/CVtEngSATClient.h Tue Jan 26 12:01:21 2010 +0200 +++ b/vtengines/videoteleng/Inc/Base/CVtEngSATClient.h Fri Feb 19 22:53:04 2010 +0200 @@ -24,7 +24,7 @@ #include #include #include -#include +#include // CLASS DECLARATION diff -r 6dc066157ed4 -r 07d1685f0cd4 vtengines/videoteleng/Inc/Base/MVtEngAccessoryObserver.h --- a/vtengines/videoteleng/Inc/Base/MVtEngAccessoryObserver.h Tue Jan 26 12:01:21 2010 +0200 +++ b/vtengines/videoteleng/Inc/Base/MVtEngAccessoryObserver.h Fri Feb 19 22:53:04 2010 +0200 @@ -20,7 +20,7 @@ // INCLUDES #include -#include +#include // CLASS DECLARATION diff -r 6dc066157ed4 -r 07d1685f0cd4 vtengines/videoteleng/Inc/Base/cvtengmdtrmessagelistener.h --- a/vtengines/videoteleng/Inc/Base/cvtengmdtrmessagelistener.h Tue Jan 26 12:01:21 2010 +0200 +++ b/vtengines/videoteleng/Inc/Base/cvtengmdtrmessagelistener.h Fri Feb 19 22:53:04 2010 +0200 @@ -23,7 +23,7 @@ //#include #include -#include +#include #include "MVtEngEventObserver.h" #include "CVtEngStateManager.h" #include "MVtEngSessionInfo.h" diff -r 6dc066157ed4 -r 07d1685f0cd4 vtengines/videoteleng/Inc/Media/CVtEngDrawNGA.h --- a/vtengines/videoteleng/Inc/Media/CVtEngDrawNGA.h Tue Jan 26 12:01:21 2010 +0200 +++ b/vtengines/videoteleng/Inc/Media/CVtEngDrawNGA.h Fri Feb 19 22:53:04 2010 +0200 @@ -22,7 +22,7 @@ // INCLUDES //#include #include -#include +#include #include //#include // GCE Surface diff -r 6dc066157ed4 -r 07d1685f0cd4 vtengines/videoteleng/Src/Audio/CVtEngAudioHandler.cpp --- a/vtengines/videoteleng/Src/Audio/CVtEngAudioHandler.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtengines/videoteleng/Src/Audio/CVtEngAudioHandler.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include "VtEngUtils.h" #include "CVtEngStateManager.h" #include "MVtEngSessionInfo.h" diff -r 6dc066157ed4 -r 07d1685f0cd4 vtengines/videoteleng/Src/Base/CVtEngSettings.cpp --- a/vtengines/videoteleng/Src/Base/CVtEngSettings.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtengines/videoteleng/Src/Base/CVtEngSettings.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -25,9 +25,9 @@ #include "VtEngPanic.h" #include #include -#include +#include #include -#include +#include #include #include diff -r 6dc066157ed4 -r 07d1685f0cd4 vtengines/videoteleng/Src/Base/cvtengmdtrcommandsender.cpp --- a/vtengines/videoteleng/Src/Base/cvtengmdtrcommandsender.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtengines/videoteleng/Src/Base/cvtengmdtrcommandsender.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -26,8 +26,8 @@ #include "vtengcommands.h" #include "CVtEngStateManager.h" #include "VtEngPanic.h" -#include -#include +#include +#include #include #include #include diff -r 6dc066157ed4 -r 07d1685f0cd4 vtengines/videoteleng/Src/Base/cvtengmdtrmessagelistener.cpp --- a/vtengines/videoteleng/Src/Base/cvtengmdtrmessagelistener.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtengines/videoteleng/Src/Base/cvtengmdtrmessagelistener.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include #include diff -r 6dc066157ed4 -r 07d1685f0cd4 vtengines/videoteleng/Src/Base/cvtengmediatorservice.cpp --- a/vtengines/videoteleng/Src/Base/cvtengmediatorservice.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtengines/videoteleng/Src/Base/cvtengmediatorservice.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -26,7 +26,7 @@ #include "CVtEngSettings.h" #include #include -#include +#include #include #include #include diff -r 6dc066157ed4 -r 07d1685f0cd4 vtengines/videoteleng/Src/Media/CVtEngDrawDP.cpp --- a/vtengines/videoteleng/Src/Media/CVtEngDrawDP.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtengines/videoteleng/Src/Media/CVtEngDrawDP.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include diff -r 6dc066157ed4 -r 07d1685f0cd4 vtengines/videoteleng/Src/Media/CVtEngDrawNGA.cpp --- a/vtengines/videoteleng/Src/Media/CVtEngDrawNGA.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtengines/videoteleng/Src/Media/CVtEngDrawNGA.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -752,6 +752,9 @@ iConfig.iWsSession->RegisterSurface(0, iSurfaceId); iConfig.iRemoteWindow->SetBackgroundSurface(iSurfaceId); + iConfig.iRemoteWindow->BeginRedraw(); + iConfig.iRemoteWindow->EndRedraw(); + iCallBackTable[0] = new(ELeave) CActiveCallBack( TCallBack(SurfaceBuffer0Ready, this), CActive::EPriorityStandard-1); diff -r 6dc066157ed4 -r 07d1685f0cd4 vtengines/vtmediatorplugin/inc/cvtmediatorplugin.h --- a/vtengines/vtmediatorplugin/inc/cvtmediatorplugin.h Tue Jan 26 12:01:21 2010 +0200 +++ b/vtengines/vtmediatorplugin/inc/cvtmediatorplugin.h Fri Feb 19 22:53:04 2010 +0200 @@ -21,13 +21,13 @@ // INCLUDES #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include -#include +#include #include diff -r 6dc066157ed4 -r 07d1685f0cd4 vtprotocolplugins/VideoSource/src/CVSStillImageDataProvider.cpp --- a/vtprotocolplugins/VideoSource/src/CVSStillImageDataProvider.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtprotocolplugins/VideoSource/src/CVSStillImageDataProvider.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include "CVSStillImageDataProvider.h" diff -r 6dc066157ed4 -r 07d1685f0cd4 vtprotocolplugins/VideoSource/src/cmultiframeprovider.cpp --- a/vtprotocolplugins/VideoSource/src/cmultiframeprovider.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtprotocolplugins/VideoSource/src/cmultiframeprovider.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include "cmultiframeprovider.h" diff -r 6dc066157ed4 -r 07d1685f0cd4 vtuis/videotelui/inc/CVtUiRemoteVideoControl.h --- a/vtuis/videotelui/inc/CVtUiRemoteVideoControl.h Tue Jan 26 12:01:21 2010 +0200 +++ b/vtuis/videotelui/inc/CVtUiRemoteVideoControl.h Fri Feb 19 22:53:04 2010 +0200 @@ -19,7 +19,7 @@ #define CVTUIREMOTEVIDEOCONTROL_H_ #include -#include +#include class CVtUiVideoControlBase; class CVtUiAppUi; diff -r 6dc066157ed4 -r 07d1685f0cd4 vtuis/videotelui/inc/CVtUiZoomControl.h --- a/vtuis/videotelui/inc/CVtUiZoomControl.h Tue Jan 26 12:01:21 2010 +0200 +++ b/vtuis/videotelui/inc/CVtUiZoomControl.h Fri Feb 19 22:53:04 2010 +0200 @@ -23,7 +23,7 @@ // INCLUDES #include -#include +#include #include "CVtUiBitmapManager.h" // CLASS DECLARATION diff -r 6dc066157ed4 -r 07d1685f0cd4 vtuis/videotelui/inc/cvtuiappshutter.h --- a/vtuis/videotelui/inc/cvtuiappshutter.h Tue Jan 26 12:01:21 2010 +0200 +++ b/vtuis/videotelui/inc/cvtuiappshutter.h Fri Feb 19 22:53:04 2010 +0200 @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include class CAsyncCallBack; class MVtUiShutterObserver; diff -r 6dc066157ed4 -r 07d1685f0cd4 vtuis/videotelui/inc/features/prefs/cvtuiprefsettinglistbase.h --- a/vtuis/videotelui/inc/features/prefs/cvtuiprefsettinglistbase.h Tue Jan 26 12:01:21 2010 +0200 +++ b/vtuis/videotelui/inc/features/prefs/cvtuiprefsettinglistbase.h Fri Feb 19 22:53:04 2010 +0200 @@ -193,12 +193,16 @@ CVtUiAppUi& iAppUi; // Window priority for context control - TInt iWindowPriority; + TInt iContextControlWindowPriority; // Window position for context control - TInt iWindowPosition; - + TInt iContextControlWindowPosition; + // Window priority for context control + TInt iRemoteVideoControlWindowPriority; + + // Window position for context control + TInt iRemoteVideoControlWindowPosition; }; #endif // CVTUIPEFSETTINGLISTBASE_H diff -r 6dc066157ed4 -r 07d1685f0cd4 vtuis/videotelui/src/CVtUiAllowVideoDialog.cpp --- a/vtuis/videotelui/src/CVtUiAllowVideoDialog.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtuis/videotelui/src/CVtUiAllowVideoDialog.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES #include "CVtUiAllowVideoDialog.h" -#include +#include #include // CONSTANTS diff -r 6dc066157ed4 -r 07d1685f0cd4 vtuis/videotelui/src/CVtUiAppUi.cpp --- a/vtuis/videotelui/src/CVtUiAppUi.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtuis/videotelui/src/CVtUiAppUi.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -37,12 +37,12 @@ #include -#include -#include -#include +#include +#include +#include #include #include -#include +#include #include #include #include @@ -54,15 +54,15 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include #include #include #include @@ -72,8 +72,8 @@ #include #include -#include -#include +#include +#include #include @@ -90,8 +90,8 @@ #include "CVtUiBitmapManager.h" -#include -#include +#include +#include #include #include @@ -1493,6 +1493,7 @@ } break; + case EEventFocusGained: case KAknFullOrPartialForegroundGained: { SetIncallBubbleAllowedInUsualL( EFalse ); @@ -4781,6 +4782,7 @@ iDownlinkWindow->SetWaiting( EFalse ); iUiStates->SetWaitingForFirstFrame( EFalse ); RemoteVideoControl().MakeVisible(ETrue); + iDownlinkWindow->LayoutRemoteVideo(); } } diff -r 6dc066157ed4 -r 07d1685f0cd4 vtuis/videotelui/src/CVtUiBitmapManager.cpp --- a/vtuis/videotelui/src/CVtUiBitmapManager.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtuis/videotelui/src/CVtUiBitmapManager.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -22,8 +22,8 @@ #include "VtUiLayout.h" #include "VtUiPanic.h" -#include -#include +#include +#include #include // CONSTANTS diff -r 6dc066157ed4 -r 07d1685f0cd4 vtuis/videotelui/src/CVtUiContextControl.cpp --- a/vtuis/videotelui/src/CVtUiContextControl.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtuis/videotelui/src/CVtUiContextControl.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -20,13 +20,12 @@ // INCLUDE FILES #include "CVtUiContextControl.h" #include "VtUiLayout.h" -#include -#include +#include +#include #include #include #include "CVtUiAppUi.h" #include "tvtuistates.h" -#include #include "tVtuifeaturevariation.h" @@ -322,7 +321,7 @@ void CVtUiContextControl::LayoutRemoteVideo() { __VTPRINTENTER( "CVtUiContextControl.LayoutRemoteVideo" ) - if ( NULL != iRemoteVideoControl ) + if ( NULL != iRemoteVideoControl && iRemoteVideoControl->IsVisible() ) { TRect rectRemoteVideo(StreamClippingRect()); rectRemoteVideo.Move(PositionRelativeToScreen()); diff -r 6dc066157ed4 -r 07d1685f0cd4 vtuis/videotelui/src/CVtUiMainControl.cpp --- a/vtuis/videotelui/src/CVtUiMainControl.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtuis/videotelui/src/CVtUiMainControl.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -20,13 +20,12 @@ // INCLUDE FILES #include "CVtUiMainControl.h" #include "VtUiLayout.h" -#include -#include +#include +#include #include #include #include "CVtUiAppUi.h" #include "tvtuistates.h" -#include #include "tVtuifeaturevariation.h" // ============================ MEMBER FUNCTIONS =============================== @@ -234,7 +233,7 @@ void CVtUiMainControl::LayoutRemoteVideo( ) { __VTPRINTENTER( "MainCtrl.LayoutRemoteVideo" ) - if ( NULL != iRemoteVideoControl ) + if ( NULL != iRemoteVideoControl && iRemoteVideoControl->IsVisible() ) { TRect rectRemoteVideo(StreamClippingRect()); rectRemoteVideo.Move(PositionRelativeToScreen()); diff -r 6dc066157ed4 -r 07d1685f0cd4 vtuis/videotelui/src/CVtUiMutedControl.cpp --- a/vtuis/videotelui/src/CVtUiMutedControl.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtuis/videotelui/src/CVtUiMutedControl.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -21,9 +21,9 @@ #include "CVtUiMutedControl.h" #include "VtUiLayout.h" #include -#include -#include -#include +#include +#include +#include #include // ============================ MEMBER FUNCTIONS =============================== diff -r 6dc066157ed4 -r 07d1685f0cd4 vtuis/videotelui/src/CVtUiNaviPane.cpp --- a/vtuis/videotelui/src/CVtUiNaviPane.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtuis/videotelui/src/CVtUiNaviPane.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -29,7 +29,7 @@ #include #include #include "tVtuifeaturevariation.h" -#include +#include #include // CONSTANTS diff -r 6dc066157ed4 -r 07d1685f0cd4 vtuis/videotelui/src/CVtUiNaviPaneControl.cpp --- a/vtuis/videotelui/src/CVtUiNaviPaneControl.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtuis/videotelui/src/CVtUiNaviPaneControl.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -21,8 +21,8 @@ #include "CVtUiNaviPaneControl.h" #include "CVtUiNaviPane.h" #include "VtUiLayout.h" -#include -#include +#include +#include // CONSTANTS diff -r 6dc066157ed4 -r 07d1685f0cd4 vtuis/videotelui/src/CVtUiNumberEntryActivationControl.cpp --- a/vtuis/videotelui/src/CVtUiNumberEntryActivationControl.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtuis/videotelui/src/CVtUiNumberEntryActivationControl.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -23,8 +23,8 @@ #include "CVtUiAppUi.h" #include "VtUiUtility.h" -#include -#include +#include +#include #include #include diff -r 6dc066157ed4 -r 07d1685f0cd4 vtuis/videotelui/src/CVtUiRemoteVideoControl.cpp --- a/vtuis/videotelui/src/CVtUiRemoteVideoControl.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtuis/videotelui/src/CVtUiRemoteVideoControl.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -21,11 +21,11 @@ #include #include #include -#include -#include +#include +#include #include #include -#include +#include #include #include #include @@ -37,8 +37,8 @@ #include #include #include -#include -#include +#include +#include #include #include "CVtUiRemoteVideoControl.h" #include "CVtUiAppUi.h" diff -r 6dc066157ed4 -r 07d1685f0cd4 vtuis/videotelui/src/CVtUiZoomControl.cpp --- a/vtuis/videotelui/src/CVtUiZoomControl.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtuis/videotelui/src/CVtUiZoomControl.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -20,8 +20,8 @@ // INCLUDE FILES #include "CVtUiZoomControl.h" #include "VtUiLayout.h" -#include -#include +#include +#include #include "videotelui.hrh" #include diff -r 6dc066157ed4 -r 07d1685f0cd4 vtuis/videotelui/src/VtUiLayout.cpp --- a/vtuis/videotelui/src/VtUiLayout.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtuis/videotelui/src/VtUiLayout.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -23,10 +23,10 @@ #include #include #include -#include +#include #include -#include -#include +#include +#include #include #include diff -r 6dc066157ed4 -r 07d1685f0cd4 vtuis/videotelui/src/cvtuiappshutter.cpp --- a/vtuis/videotelui/src/cvtuiappshutter.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtuis/videotelui/src/cvtuiappshutter.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -23,9 +23,9 @@ #include "tvtuilocalvariation.h" #include #include -#include +#include #include -#include +#include // singleton instance static CVtUiAppShutter* iAppShutter = NULL; diff -r 6dc066157ed4 -r 07d1685f0cd4 vtuis/videotelui/src/cvtuivideocontrolbase.cpp --- a/vtuis/videotelui/src/cvtuivideocontrolbase.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtuis/videotelui/src/cvtuivideocontrolbase.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -19,13 +19,13 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include -#include -#include +#include +#include #include "cvtuivideocontrolbase.h" #include "mvtuicomponentmanager.h" #include "VtUiLayout.h" diff -r 6dc066157ed4 -r 07d1685f0cd4 vtuis/videotelui/src/features/dialer/cvtuidialercontainer.cpp --- a/vtuis/videotelui/src/features/dialer/cvtuidialercontainer.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtuis/videotelui/src/features/dialer/cvtuidialercontainer.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -19,12 +19,12 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include "VtUiUtility.h" #include "VtUiLayout.h" @@ -379,12 +379,12 @@ if ( Layout_Meta_Data::IsLandscapeOrientation() ) { // Landscape: Option11 (thin status pane, lsc) - mainPaneLL = AknLayoutScalable_Avkon::main_pane( 9 ).LayoutLine(); + mainPaneLL = AknLayoutScalable_Apps::main_pane( 15 ).LayoutLine(); } else { // Portrait: main pane with status pane off, control pane on - mainPaneLL = AknLayoutScalable_Avkon::main_pane( 7 ).LayoutLine(); + mainPaneLL = AknLayoutScalable_Apps::main_pane( 12 ).LayoutLine(); } TRect appWinRect; diff -r 6dc066157ed4 -r 07d1685f0cd4 vtuis/videotelui/src/features/dialer/cvtuidialervideocontrol.cpp --- a/vtuis/videotelui/src/features/dialer/cvtuidialervideocontrol.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtuis/videotelui/src/features/dialer/cvtuidialervideocontrol.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -144,11 +144,10 @@ void CVtUiDialerVideoControl::LayoutRemoteVideo( ) { __VTPRINTENTER( "DialCtrl.LayoutRemoteVideo" ) - if ( NULL != iRemoteVideoControl ) + if ( NULL != iRemoteVideoControl && iRemoteVideoControl->IsVisible() ) { TRect rectRemoteVideo(StreamClippingRect()); - rectRemoteVideo.Move(PositionRelativeToScreen()); - iRemoteVideoControl->SetExtent(rectRemoteVideo.iTl,rectRemoteVideo.Size()); + iRemoteVideoControl->SetExtent( PositionRelativeToScreen(),rectRemoteVideo.Size() ); } __VTPRINTEXIT( "DialCtrl.LayoutRemoteVideo" ) } diff -r 6dc066157ed4 -r 07d1685f0cd4 vtuis/videotelui/src/features/numberentry/CVtUiNumberEntryControl.cpp --- a/vtuis/videotelui/src/features/numberentry/CVtUiNumberEntryControl.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtuis/videotelui/src/features/numberentry/CVtUiNumberEntryControl.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -27,7 +27,7 @@ #include "mvtuinumberentrycontrolobserver.h" #include "cvtuidtmfbuffer.h" -#include +#include #include #include diff -r 6dc066157ed4 -r 07d1685f0cd4 vtuis/videotelui/src/features/prefs/cvtuiprefsettinglistbase.cpp --- a/vtuis/videotelui/src/features/prefs/cvtuiprefsettinglistbase.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtuis/videotelui/src/features/prefs/cvtuiprefsettinglistbase.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -27,6 +27,7 @@ #include "cvtuitransparentsettingpage.h" #include "CVtUiMainControl.h" #include "CVtUiContextControl.h" +#include "CVtUiRemoteVideoControl.h" #include "cvtuifeaturemanager.h" #include "VtUiLayout.h" @@ -156,15 +157,27 @@ iAppUi.SwitchViewFinderToMainPaneL(); // Get context control's window priority and position - iWindowPriority = iAppUi.ContextControl().DrawableWindow() + iContextControlWindowPriority = iAppUi.ContextControl().DrawableWindow() ->OrdinalPriority(); - iWindowPosition = iAppUi.ContextControl().DrawableWindow() + iContextControlWindowPosition = iAppUi.ContextControl().DrawableWindow() ->OrdinalPosition(); + // Get remote video control's window priority and position + iRemoteVideoControlWindowPriority = + iAppUi.RemoteVideoControl().DrawableWindow()->OrdinalPriority(); + iRemoteVideoControlWindowPosition = + iAppUi.RemoteVideoControl().DrawableWindow()->OrdinalPosition(); + // Rise context control's window priority othwerwise setting page will be // drawn partially over the context control window. iAppUi.ContextControl().DrawableWindow()->SetOrdinalPosition( - iWindowPosition, iWindowPriority + 1 ); + iContextControlWindowPosition, iContextControlWindowPriority + 1 ); + + // Rise remote video control's window priority othwerwise setting page + // will be drawn partially over the context control window. + iAppUi.RemoteVideoControl().DrawableWindow()->SetOrdinalPosition( + iRemoteVideoControlWindowPosition, + iRemoteVideoControlWindowPriority + 2 ); // Creates setting page CreateSettingPageL(); @@ -192,9 +205,17 @@ iSettingPage->OfferKeyEventL( keyEvent, EEventKey ); } - // Set contex control's window priority and position back to orginal value. + // Set remote video control's window priority and position back to + // orginal value. + iAppUi.RemoteVideoControl().DrawableWindow()->SetOrdinalPosition( + iRemoteVideoControlWindowPosition, + iRemoteVideoControlWindowPriority ); + + // Set contex control's window priority and position back to + // orginal value. iAppUi.ContextControl().DrawableWindow()->SetOrdinalPosition( - iWindowPosition, iWindowPriority ); + iContextControlWindowPosition, iContextControlWindowPriority ); + __VTPRINTEXIT( "CVtUiPrefSettingListBase.StopSettingPageL" ) } diff -r 6dc066157ed4 -r 07d1685f0cd4 vtuis/videotelui/src/features/prefs/cvtuivideoquality.cpp --- a/vtuis/videotelui/src/features/prefs/cvtuivideoquality.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtuis/videotelui/src/features/prefs/cvtuivideoquality.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -18,10 +18,10 @@ #include #include -#include -#include +#include +#include #include -#include +#include #include #include #include diff -r 6dc066157ed4 -r 07d1685f0cd4 vtuis/videotelui/src/features/toolbar/cvtuifloatingtoolbar.cpp --- a/vtuis/videotelui/src/features/toolbar/cvtuifloatingtoolbar.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtuis/videotelui/src/features/toolbar/cvtuifloatingtoolbar.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff -r 6dc066157ed4 -r 07d1685f0cd4 vtuis/videotelui/src/sliders/cvtuipopupbase.cpp --- a/vtuis/videotelui/src/sliders/cvtuipopupbase.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtuis/videotelui/src/sliders/cvtuipopupbase.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include "cvtuipopupbase.h" diff -r 6dc066157ed4 -r 07d1685f0cd4 vtuis/videotelui/src/tvtuiappstatebase.cpp --- a/vtuis/videotelui/src/tvtuiappstatebase.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtuis/videotelui/src/tvtuiappstatebase.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -22,8 +22,8 @@ #include "cvtuiappshutter.h" #include "mvtuistatecontext.h" #include -#include -#include +#include +#include #include #include #include diff -r 6dc066157ed4 -r 07d1685f0cd4 vtuis/videotelui/src/tvtuistaterunning.cpp --- a/vtuis/videotelui/src/tvtuistaterunning.cpp Tue Jan 26 12:01:21 2010 +0200 +++ b/vtuis/videotelui/src/tvtuistaterunning.cpp Fri Feb 19 22:53:04 2010 +0200 @@ -23,8 +23,8 @@ #include "videotelui.hrh" #include #include -#include -#include +#include +#include #include TVtUiStateRunning* TVtUiStateRunning::iInstance = NULL;