--- a/mmsharing/livecommsui/lcui/inc/lcview.h Fri Jun 11 13:36:18 2010 +0300
+++ b/mmsharing/livecommsui/lcui/inc/lcview.h Wed Jun 23 18:09:54 2010 +0300
@@ -54,13 +54,8 @@
void init();
void activated();
void deactivated();
- void showControl();
- void hideControl();
QString currentLayout();
- void deActivateFullScreen();
- void activatePortrait();
- void updateUiElements();
-
+
public slots:
void endVideoSession();
@@ -69,19 +64,15 @@
void changeCamera();
void switchToVoiceCall();
void speaker();
- void showZoom();
- void activateFullScreen();
+ void showZoom();
void updateVideoRects();
void swap();
void shareImage();
void updateSwapLayout();
- void menuAboutToShow();
- void menuAboutToHide();
+ void menuAboutToShow();
void back();
//temp
void notSupported();
- void changeOrientation_Temporary();
-
private slots:
@@ -94,8 +85,8 @@
void setCameraActionToDisable();
void setCameraActionToEnable();
void disableControls();
- void enableControls();
- void landscapeTimerTimeout();
+ void enableControls();
+ void watchInactivity();
protected: // From HbView
@@ -109,7 +100,10 @@
protected:
void setDialpadPosition();
- void enableDialpadCallButton( bool enable );
+
+private: // fullscreen
+ void timerEvent( QTimerEvent * event );
+ void toFullScreen( bool fullscreen );
private:
void createNotSupportedNote();
@@ -117,8 +111,7 @@
bool isLandscapeOrientation();
QRectF translateRectForOrientation(const QRectF& origRect);
QPointF translatePointForOrientation(const QPointF& origPoint);
- void setVisibility( QGraphicsItem* item, bool visible );
- void resetLandscapeTimer();
+ void setVisibility( QGraphicsItem* item, bool visible );
void addOptionsMenuActions();
void gestureLongPress( QPointF coords );
void gestureShortPress();
@@ -148,11 +141,11 @@
private:
- HbMenu* mItemContextMenu;
- QTimer* mLandscapeTimer;
+ HbMenu* mItemContextMenu;
bool mIsOptionMenuOpen;
HbAction* mSoftKeyBackAction;
Dialpad* mDialpad; // Not owned
+ int timerId;
};