diff -r 53c1c4459a94 -r 5554410e16f5 mmsharing/livecommsui/lcui/inc/lcview.h --- a/mmsharing/livecommsui/lcui/inc/lcview.h Wed Jun 23 18:09:54 2010 +0300 +++ b/mmsharing/livecommsui/lcui/inc/lcview.h Tue Jul 06 14:13:16 2010 +0300 @@ -31,12 +31,12 @@ class HbMessageBox; class HbAction; class HbPushButton; -class HbZoomSliderPopup; class HbTransparentWindow; class HbMenu; class LcVideoWidget; class LcEffectHandler; class Dialpad; +class DialpadVtKeyHandler; class LcView : public HbView { @@ -64,7 +64,6 @@ void changeCamera(); void switchToVoiceCall(); void speaker(); - void showZoom(); void updateVideoRects(); void swap(); void shareImage(); @@ -108,13 +107,14 @@ private: void createNotSupportedNote(); void createContextMenu(); - bool isLandscapeOrientation(); QRectF translateRectForOrientation(const QRectF& origRect); QPointF translatePointForOrientation(const QPointF& origPoint); void setVisibility( QGraphicsItem* item, bool visible ); void addOptionsMenuActions(); void gestureLongPress( QPointF coords ); void gestureShortPress(); + bool isVideoPositionedCorrectly( LcVideoWidget* mVideoWidget ); + bool isPositioned(); private://not owned @@ -122,8 +122,7 @@ LcUiComponentRepository& mRepository; HbLabel* mRecipient; HbLabel* mDuration; - HbLabel* mContactIcon; - HbLabel* mBrandIcon; + HbLabel* mContactIcon; LcVideoWidget* mSharedVideoWidget; LcVideoWidget* mReceivedVideoWidget; HbAction* mChangeCameraAction; @@ -132,7 +131,6 @@ HbAction* mDisableCameraAction; HbAction* mDisableCameraMenuAction; HbMessageBox* mNotSupportedNote; - HbZoomSliderPopup* mZoomSlider; HbPushButton* mEndCallButton; LcVideoWidget* mReceivedVideoEffectOverlay; @@ -143,9 +141,10 @@ HbMenu* mItemContextMenu; bool mIsOptionMenuOpen; - HbAction* mSoftKeyBackAction; Dialpad* mDialpad; // Not owned + DialpadVtKeyHandler* mDialpadVtKeyHandler; int timerId; + bool isViewReady; };