--- 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 <rphcltserver.h>
+#include "TelephonyAudioRouting.h"
+#include "MTelephonyAudioRoutingObserver.h"
+#include <RPhCltServer.h>
#include <mmf/server/sounddevice.h>
// FORWARD DECLARATIONS
--- 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 <e32base.h>
#include <AccPolAccessoryMode.h>
-#include <accessoryserver.h>
-#include <accessorymode.h>
+#include <AccessoryServer.h>
+#include <AccessoryMode.h>
// FORWARD DECLARATIONS
class MVtEngAccessoryObserver;
--- 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 <e32base.h>
#include <e32std.h>
#include <RSatRefresh.h>
-#include <rsatsession.h>
+#include <RSatSession.h>
// CLASS DECLARATION
--- 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 <e32std.h>
-#include <accpolaccessorymode.h>
+#include <AccPolAccessoryMode.h>
// CLASS DECLARATION
--- 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 <e32cmn.h>
#include <MediatorCommandResponder.h>
-#include <mediatoreventconsumer.h>
+#include <MediatorEventConsumer.h>
#include "MVtEngEventObserver.h"
#include "CVtEngStateManager.h"
#include "MVtEngSessionInfo.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 <videorenderer.h>
#include <Posting_Surface.h>
-#include <posting_surface_factory.h>
+#include <Posting_Surface_Factory.h>
#include <pixelformats.h>
//#include <videoframebuffer.h>
// GCE Surface
--- 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 <cvtlogger.h>
#include <featmgr.h>
#include <mmf/server/sounddevice.h>
-#include <audiopreference.h>
+#include <AudioPreference.h>
#include "VtEngUtils.h"
#include "CVtEngStateManager.h"
#include "MVtEngSessionInfo.h"
--- 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 <telincallvolcntrlcrkeys.h>
#include <RPhCltServer.h>
-#include <cphcltimagehandler.h>
+#include <CPhCltImageHandler.h>
#include <videotelephonyinternalcrkeys.h>
-#include <logsdomaincrkeys.h>
+#include <LogsDomainCRKeys.h>
#include <settingsinternalcrkeys.h>
#include <videotelephonyvariant.hrh>
--- 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 <mediatorcommandinitiator.h>
-#include <mediatordomainuids.h>
+#include <MediatorCommandInitiator.h>
+#include <MediatorDomainUIDs.h>
#include <mediatorcommandstotelephonyapi.h>
#include <mediatoraudiocommandstotelephonyapi.h>
#include <videoteltophonecommandsapi.h>
--- 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 <cvtlogger.h>
#include <videotelcontrolmediatorapi.h>
-#include <mediatorcommandresponder.h>
-#include <mediatordomainuids.h>
+#include <MediatorCommandResponder.h>
+#include <MediatorDomainUIDs.h>
#include <mediatoreventsfromtelephonyapi.h>
#include <vtinternalmediatorapi.h>
--- 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 <cvtlogger.h>
#include <MediatorCommandResponder.h>
-#include <mediatordomainuids.h>
+#include <MediatorDomainUIDs.h>
#include <videotelcontrolmediatorapi.h>
#include <videoteltophonecommandsapi.h>
#include <vtinternalmediatorapi.h>
--- 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 <videotelephonyvariant.hrh>
#include <tdisplaysinkparamsdp.h>
#include <cvtlogger.h>
-#include <posting_surface_factory.h>
+#include <Posting_Surface_Factory.h>
#include <cvtimagebitmap.h>
--- 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);
--- 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 <MediatorPluginBase.h>
-#include <mediatornotifications.h>
-#include <mediatoreventconsumer.h>
-#include <mediatoreventprovider.h>
-#include <mediatorcommandresponder.h>
+#include <MediatorNotifications.h>
+#include <MediatorEventConsumer.h>
+#include <MediatorEventProvider.h>
+#include <MediatorCommandResponder.h>
#include <vtinternalmediatorapi.h>
#include <mediatoreventsfromtelephonyapi.h>
-#include <mediatorcommandinitiator.h>
+#include <MediatorCommandInitiator.h>
#include <w32std.h>
--- 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 <imageconversion.h>
#include <cvtimageconverter.h>
#include <RPhCltServer.h>
-#include <cphcltimagehandler.h>
+#include <CPhCltImageHandler.h>
#include <w32std.h>
#include "CVSStillImageDataProvider.h"
--- 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 <imageconversion.h>
#include <cvtimageconverter.h>
#include <RPhCltServer.h>
-#include <cphcltimagehandler.h>
+#include <CPhCltImageHandler.h>
#include <bautils.h>
#include "cmultiframeprovider.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 <coecntrl.h>
-#include <aknwseventobserver.h>
+#include <AknWsEventObserver.h>
class CVtUiVideoControlBase;
class CVtUiAppUi;
--- 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 <coecntrl.h>
-#include <aknutils.h>
+#include <AknUtils.h>
#include "CVtUiBitmapManager.h"
// CLASS DECLARATION
--- 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 <babitflags.h>
#include <MPhCltEmergencyCallObserver.h>
-#include <cphcltemergencycall.h>
-#include <rphcltserver.h>
+#include <CPhCltEmergencyCall.h>
+#include <RPhCltServer.h>
class CAsyncCallBack;
class MVtUiShutterObserver;
--- 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
--- 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 <stringloader.h>
+#include <StringLoader.h>
#include <videotelui.rsg>
// CONSTANTS
--- 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 <csxhelp/incl.hlp.hrh>
-#include <aknincallbubblenotify.h>
-#include <aknslayeredbackgroundcontrolcontext.h>
-#include <aknutils.h>
+#include <AknIncallBubbleNotify.h>
+#include <AknsLayeredBackgroundControlContext.h>
+#include <AknUtils.h>
#include <aknnavi.h>
#include <akntitle.h>
-#include <akndlgshut.h>
+#include <AknDlgShut.h>
#include <aknnotedialog.h>
#include <aknnotewrappers.h>
#include <akncontext.h>
@@ -54,15 +54,15 @@
#include <videotelui.rsg>
#include <hlplch.h>
#include <apgwgnam.h>
-#include <stringloader.h>
-#include <akndef.h>
+#include <StringLoader.h>
+#include <AknDef.h>
#include <aknconsts.h>
#include <e32property.h>
#include <ecom/ecom.h>
#include <coreapplicationuisdomainpskeys.h>
-#include <uikoninternalpskeys.h>
+#include <UikonInternalPSKeys.h>
#include <centralrepository.h>
#include <videotelephonyinternalcrkeys.h>
#include <settingsinternalcrkeys.h>
@@ -72,8 +72,8 @@
#include <activeidle2domainpskeys.h>
#include <ctsydomainpskeys.h>
-#include <aknquerydialog.h>
-#include <aknglobalnote.h>
+#include <AknQueryDialog.h>
+#include <AknGlobalNote.h>
#include <aknsoundsystem.h>
@@ -90,8 +90,8 @@
#include "CVtUiBitmapManager.h"
-#include <mgfetch.h>
-#include <mmgfetchverifier.h>
+#include <MGFetch.h>
+#include <MMGFetchVerifier.h>
#include <caf/manager.h>
#include <caf/virtualpathptr.h>
@@ -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();
}
}
--- 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 <aknsutils.h>
-#include <akniconutils.h>
+#include <AknsUtils.h>
+#include <AknIconUtils.h>
#include <fbs.h>
// CONSTANTS
--- 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 <aknsutils.h>
-#include <aknsdrawutils.h>
+#include <AknsUtils.h>
+#include <AknsDrawUtils.h>
#include <cvtlogger.h>
#include <featmgr.h>
#include "CVtUiAppUi.h"
#include "tvtuistates.h"
-#include <aknsutils.h>
#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());
--- 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 <aknsutils.h>
-#include <aknsdrawutils.h>
+#include <AknsUtils.h>
+#include <AknsDrawUtils.h>
#include <cvtlogger.h>
#include <featmgr.h>
#include "CVtUiAppUi.h"
#include "tvtuistates.h"
-#include <aknsutils.h>
#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());
--- 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 <eiklabel.h>
-#include <aknsutils.h>
-#include <aknsdrawutils.h>
-#include <stringloader.h>
+#include <AknsUtils.h>
+#include <AknsDrawUtils.h>
+#include <StringLoader.h>
#include <videotelui.rsg>
// ============================ MEMBER FUNCTIONS ===============================
--- 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 <aknnavide.h>
#include <featmgr.h>
#include "tVtuifeaturevariation.h"
-#include <stringloader.h>
+#include <StringLoader.h>
#include <videotelui.rsg>
// CONSTANTS
--- 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 <aknsutils.h>
-#include <aknsdrawutils.h>
+#include <AknsUtils.h>
+#include <AknsDrawUtils.h>
// CONSTANTS
--- 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 <aknutils.h>
-#include <aknsutils.h>
+#include <AknUtils.h>
+#include <AknsUtils.h>
#include <eikenv.h>
#include <cvtlogger.h>
--- 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 <cvtlogger.h>
#include <eikdef.h>
#include <AknIncallBubbleNotify.h>
-#include <aknslayeredbackgroundcontrolcontext.h>
-#include <aknutils.h>
+#include <AknsLayeredBackgroundControlContext.h>
+#include <AknUtils.h>
#include <aknnavi.h>
#include <akntitle.h>
-#include <akndlgshut.h>
+#include <AknDlgShut.h>
#include <aknnotedialog.h>
#include <aknnotewrappers.h>
#include <akncontext.h>
@@ -37,8 +37,8 @@
#include <videotelui.rsg>
#include <hlplch.h>
#include <apgwgnam.h>
-#include <stringloader.h>
-#include <akndef.h>
+#include <StringLoader.h>
+#include <AknDef.h>
#include <aknconsts.h>
#include "CVtUiRemoteVideoControl.h"
#include "CVtUiAppUi.h"
--- 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 <aknsutils.h>
-#include <aknsdrawutils.h>
+#include <AknsUtils.h>
+#include <AknsDrawUtils.h>
#include "videotelui.hrh"
#include <cvtlogger.h>
--- 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 <fbs.h>
#include <avkon.mbg>
#include <videotelui.mbg>
-#include <aknsconstants.h>
+#include <AknsConstants.h>
#include <aknconsts.h>
-#include <akniconutils.h>
-#include <aknutils.h>
+#include <AknIconUtils.h>
+#include <AknUtils.h>
#include <aknlayout.cdl.h>
#include <applayout.cdl.h>
--- 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 <cvtlogger.h>
#include <eikenv.h>
-#include <aknutils.h>
+#include <AknUtils.h>
#include <aknnotewrappers.h>
-#include <stringloader.h>
+#include <StringLoader.h>
// singleton instance
static CVtUiAppShutter* iAppShutter = NULL;
--- 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 <cvtlogger.h>
#include <featmgr.h>
#include <AknsDrawUtils.h>
-#include <aknsutils.h>
-#include <aknbiditextutils.h>
-#include <stringloader.h>
+#include <AknsUtils.h>
+#include <AknBidiTextUtils.h>
+#include <StringLoader.h>
#include <videotelui.rsg>
-#include <aknsbasicbackgroundcontrolcontext.h>
-#include <aknstatuspaneutils.h>
+#include <AknsBasicBackgroundControlContext.h>
+#include <AknStatuspaneUtils.h>
#include "cvtuivideocontrolbase.h"
#include "mvtuicomponentmanager.h"
#include "VtUiLayout.h"
--- 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 <cvtlogger.h>
#include <cvideodtmfdialer.h>
#include <AknsDrawUtils.h>
-#include <aknsutils.h>
+#include <AknsUtils.h>
#include <aknlayoutscalable_apps.cdl.h>
#include <aknlayoutscalable_avkon.cdl.h>
#include <layoutmetadata.cdl.h>
#include <featmgr.h>
-#include <aknsbasicbackgroundcontrolcontext.h>
+#include <AknsBasicBackgroundControlContext.h>
#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;
--- 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" )
}
--- 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 <aknsutils.h>
+#include <AknsUtils.h>
#include <cvtlogger.h>
#include <eikenv.h>
--- 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" )
}
--- 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 <badesca.h>
#include <AknIconArray.h>
-#include <aknsutils.h>
-#include <stringloader.h>
+#include <AknsUtils.h>
+#include <StringLoader.h>
#include <aknlists.h>
-#include <aknpopup.h>
+#include <aknPopup.h>
#include <aknselectionlist.h>
#include <mvtengmedia.h>
#include <cvtengmodel.h>
--- 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 <videotelui.rsg>
#include <cvtlogger.h>
#include <akntoolbar.h>
-#include <aknutils.h>
+#include <AknUtils.h>
#include <aknlayoutscalable_apps.cdl.h>
#include <layoutmetadata.cdl.h>
#include <gfxtranseffect/gfxtranseffect.h>
--- 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 <cvtlogger.h>
#include <AknUtils.h>
-#include <aknvolumepopup.h>
+#include <AknVolumePopup.h>
#include <fbs.h>
#include "cvtuipopupbase.h"
--- 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 <videotelui.rsg>
-#include <aknquerydialog.h>
-#include <stringloader.h>
+#include <AknQueryDialog.h>
+#include <StringLoader.h>
#include <cvtlogger.h>
#include <cvtengmodel.h>
#include <vtengevents.h>
--- 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 <cvtlogger.h>
#include <vtengevents.h>
-#include <stringloader.h>
-#include <aknquerydialog.h>
+#include <StringLoader.h>
+#include <AknQueryDialog.h>
#include <videotelui.rsg>
TVtUiStateRunning* TVtUiStateRunning::iInstance = NULL;