# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1277305794 -10800 # Node ID 53c1c4459a94b737907251185f4f32917d8c94bd # Parent 496ad160a278b802e12d87bb5fc4b49c93effa5a Revision: 201023 Kit: 2010125 diff -r 496ad160a278 -r 53c1c4459a94 inc/musuid.hrh --- a/inc/musuid.hrh Fri Jun 11 13:36:18 2010 +0300 +++ b/inc/musuid.hrh Wed Jun 23 18:09:54 2010 +0300 @@ -37,4 +37,6 @@ #define KMusAvaPluginInterfaceUid 0x10282393 -#endif \ No newline at end of file +#endif + +//end of file diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/inc/lcview.h --- 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; }; diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/livecommsui.qrc --- a/mmsharing/livecommsui/lcui/livecommsui.qrc Fri Jun 11 13:36:18 2010 +0300 +++ b/mmsharing/livecommsui/lcui/livecommsui.qrc Wed Jun 23 18:09:54 2010 +0300 @@ -1,57 +1,20 @@ - - resources/graphics/qgn_indi_tb_pause_send_video.svg - resources/graphics/qgn_indi_tb_play.svg - resources/graphics/qgn_indi_tb_ihf_off.svg - resources/graphics/qgn_indi_tb_ihf_on.svg - resources/graphics/qgn_indi_tb_video.svg - resources/graphics/qgn_indi_tb_video_disable.svg - resources/graphics/qgn_indi_tb_camera_main.svg - resources/graphics/qgn_indi_tb_camera_secondary.svg - resources/graphics/qgn_indi_tb_microphone_mute.svg - resources/graphics/qgn_indi_tb_microphone_unmute.svg - resources/graphics/qgn_indi_tb_gallery.svg - resources/graphics/qgn_indi_mp_button_stop.svg - resources/graphics/qtg_large_video_call.svg - resources/graphics/qtg_mono_end_call.svg - resources/graphics/qtg_fr_btn_red_normal_tl.svg - resources/graphics/qtg_fr_btn_red_normal_tr.svg - resources/graphics/qtg_fr_btn_red_normal_r.svg - resources/graphics/qtg_fr_btn_red_normal_l.svg - resources/graphics/qtg_fr_btn_red_normal_br.svg - resources/graphics/qtg_fr_btn_red_normal_bl.svg - resources/graphics/qtg_fr_btn_red_normal_c.svg - resources/graphics/qtg_fr_btn_red_normal_b.svg - resources/graphics/qtg_fr_btn_red_normal_t.svg - resources/graphics/qtg_fr_btn_red_pressed_tl.svg - resources/graphics/qtg_fr_btn_red_pressed_tr.svg - resources/graphics/qtg_fr_btn_red_pressed_r.svg - resources/graphics/qtg_fr_btn_red_pressed_l.svg - resources/graphics/qtg_fr_btn_red_pressed_br.svg - resources/graphics/qtg_fr_btn_red_pressed_bl.svg - resources/graphics/qtg_fr_btn_red_pressed_c.svg - resources/graphics/qtg_fr_btn_red_pressed_b.svg - resources/graphics/qtg_fr_btn_red_pressed_t.svg - resources/graphics/qgn_indi_tb_black_win.bmp - resources/hbpushbutton_color.css - - - resources/lcviews/lcidleview.docml - resources/lcviews/lcreceiveview.docml - resources/lcviews/lcreceiveonlyview.docml - resources/lcviews/lcsendview.docml - resources/lcviews/lctwowayview.docml - resources/lcviews/lcvtview.docml - - - livecommsui_en_GB.qm - - - resources/win_appear.fxml - resources/win_disappear.fxml - resources/win_flip.fxml - resources/win_swap_down.fxml - resources/win_swap_up.fxml - - + + resources/hbpushbutton_color.css + + + resources/lcviews/lcidleview.docml + resources/lcviews/lcreceiveview.docml + resources/lcviews/lcreceiveonlyview.docml + resources/lcviews/lcsendview.docml + resources/lcviews/lctwowayview.docml + resources/lcviews/lcvtview.docml + + + resources/win_appear.fxml + resources/win_disappear.fxml + resources/win_flip.fxml + resources/win_swap_down.fxml + resources/win_swap_up.fxml + diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/livecommsui_en_GB.qm Binary file mmsharing/livecommsui/lcui/livecommsui_en_GB.qm has changed diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/livecommsui_en_GB.ts --- a/mmsharing/livecommsui/lcui/livecommsui_en_GB.ts Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,104 +0,0 @@ - - - - - - Video preference - Video preference - di - - False - - - Swap views - Swap views - di - - False - - - End active call - End active call - di - - False - - - - - - - Share image - Share image - di - - False - - - Adjust video - Adjust video - di - - False - - - Switch to voice call - Switch to voice call - di - - False - - - Open Keypad - Open Keypad - di - - False - - - Zoom - Zoom - di - - False - - - End Call - End Call - di - - False - - - Video Call - Video Call - di - - False - - - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qgn_indi_mp_button_stop.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qgn_indi_mp_button_stop.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ - - - \ No newline at end of file diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qgn_indi_tb_black_win.bmp Binary file mmsharing/livecommsui/lcui/resources/graphics/qgn_indi_tb_black_win.bmp has changed diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qgn_indi_tb_camera_main.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qgn_indi_tb_camera_main.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ - - - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qgn_indi_tb_camera_secondary.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qgn_indi_tb_camera_secondary.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ - - - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qgn_indi_tb_gallery.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qgn_indi_tb_gallery.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ - - - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qgn_indi_tb_ihf_off.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qgn_indi_tb_ihf_off.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ - - - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qgn_indi_tb_ihf_on.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qgn_indi_tb_ihf_on.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ - - - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qgn_indi_tb_microphone_mute.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qgn_indi_tb_microphone_mute.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ - - - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qgn_indi_tb_microphone_unmute.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qgn_indi_tb_microphone_unmute.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ - - - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qgn_indi_tb_pause_send_video.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qgn_indi_tb_pause_send_video.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ - - - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qgn_indi_tb_play.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qgn_indi_tb_play.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ - - - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qgn_indi_tb_video.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qgn_indi_tb_video.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ - - - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qgn_indi_tb_video_disable.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qgn_indi_tb_video_disable.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ - - - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_normal_b.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_normal_b.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ - - - -]> - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_normal_bl.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_normal_bl.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ - - - -]> - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_normal_br.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_normal_br.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ - - - -]> - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_normal_c.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_normal_c.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ - - - -]> - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_normal_l.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_normal_l.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_normal_r.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_normal_r.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_normal_t.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_normal_t.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_normal_tl.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_normal_tl.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_normal_tr.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_normal_tr.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_pressed_b.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_pressed_b.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ - - - -]> - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_pressed_bl.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_pressed_bl.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ - - - -]> - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_pressed_br.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_pressed_br.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ - - - -]> - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_pressed_c.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_pressed_c.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ - - - -]> - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_pressed_l.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_pressed_l.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_pressed_r.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_pressed_r.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_pressed_t.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_pressed_t.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_pressed_tl.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_pressed_tl.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_pressed_tr.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qtg_fr_btn_red_pressed_tr.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - -]> - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qtg_large_video_call.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qtg_large_video_call.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,137 +0,0 @@ - - - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/graphics/qtg_mono_end_call.svg --- a/mmsharing/livecommsui/lcui/resources/graphics/qtg_mono_end_call.svg Fri Jun 11 13:36:18 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ - - - -]> - diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/lcviews.uip Binary file mmsharing/livecommsui/lcui/resources/lcviews.uip has changed diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/resources/lcviews/lcvtview.docml --- a/mmsharing/livecommsui/lcui/resources/lcviews/lcvtview.docml Fri Jun 11 13:36:18 2010 +0300 +++ b/mmsharing/livecommsui/lcui/resources/lcviews/lcvtview.docml Wed Jun 23 18:09:54 2010 +0300 @@ -79,11 +79,16 @@ + + + + + - + @@ -197,6 +202,8 @@ + + @@ -261,6 +268,8 @@ + + @@ -352,40 +361,42 @@ - - - - - - + - + - - - - + + + + + + + + - - - - - - - + + + - - + + - + + + + + + + + diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/src/lcuicomponentrepository.cpp --- a/mmsharing/livecommsui/lcui/src/lcuicomponentrepository.cpp Fri Jun 11 13:36:18 2010 +0300 +++ b/mmsharing/livecommsui/lcui/src/lcuicomponentrepository.cpp Wed Jun 23 18:09:54 2010 +0300 @@ -77,7 +77,7 @@ mSlots->insert( lcActSwapViewsId, SLOT( swap() ) ); mSlots->insert( lcActZoomId, SLOT( notSupported() ) ); mSlots->insert( lcActSwitchToVoiceCallId, SLOT( switchToVoiceCall() ) ); - mSlots->insert( lcActOpenKeypadId, SLOT( notSupported() ) ); + mSlots->insert( lcActOpenKeypadId, SLOT( openDialpad() ) ); mSlots->insert( lcActDisableCameraId, SLOT( disableCamera() ) ); mSlots->insert( lcActSpeakerId, SLOT( speaker() ) ); @@ -166,7 +166,10 @@ HbStyleLoader::registerFilePath(":/hbpushbutton_color.css"); } else if ( name == lcWidgetDialpad ){ - object = new Dialpad(); + HbMainWindow* pWindow = HbInstance::instance()->allMainWindows().at(0); + if( pWindow ){ + object = new Dialpad( *pWindow ); + } } else { object = HbDocumentLoader::createObject( type, name ); @@ -567,13 +570,14 @@ if ( mLastLoadedView.length() > 0) { LC_QDEBUG_4( "layout = ", layoutName, ", view =", mLastLoadedView ) - load( mLastLoadedView, layoutName, &ok ); + QObjectList objects = load( mLastLoadedView, layoutName, &ok ); if (!ok) { LC_QCRITICAL( "! loading of XML failed !" ) } else{ mPreviousLayout = mLayout; mLayout = layoutName; + setObjectTree( objects ); } } else { LC_QCRITICAL( "! not loading layout, since view is not loaded!" ) diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/src/lcvideowidget.cpp --- a/mmsharing/livecommsui/lcui/src/lcvideowidget.cpp Fri Jun 11 13:36:18 2010 +0300 +++ b/mmsharing/livecommsui/lcui/src/lcvideowidget.cpp Wed Jun 23 18:09:54 2010 +0300 @@ -31,6 +31,7 @@ HbTransparentWindow(parent), mShowVideo(showVideo) { + setFlag(QGraphicsItem::ItemUsesExtendedStyleOption, true); } // ----------------------------------------------------------------------------- @@ -50,6 +51,7 @@ { Q_UNUSED(widget) + painter->save(); if ( mShowVideo ){ QPainter::CompositionMode origCompositionMode = painter->compositionMode(); @@ -64,6 +66,7 @@ painter->drawRoundedRect( option->exposedRect, lcVideoWidgetCornerRounding, lcVideoWidgetCornerRounding); } + painter->restore(); } // ----------------------------------------------------------------------------- diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/src/lcview.cpp --- a/mmsharing/livecommsui/lcui/src/lcview.cpp Fri Jun 11 13:36:18 2010 +0300 +++ b/mmsharing/livecommsui/lcui/src/lcview.cpp Wed Jun 23 18:09:54 2010 +0300 @@ -74,11 +74,11 @@ mReceivedVideoEffectOverlay(0), mSharedVideoEffectOverlay(0), mEffectHandler(0), - mItemContextMenu(0), - mLandscapeTimer(0), + mItemContextMenu(0), mIsOptionMenuOpen(false), mSoftKeyBackAction(0), - mDialpad(0) + mDialpad(0), + timerId(0) { LC_QDEBUG( "livecomms [UI] -> LcView::LcView()" ) @@ -105,8 +105,7 @@ // Un-subscribe to the gesture events. ungrabGesture(Qt::TapGesture); - delete mEffectHandler; - delete mLandscapeTimer; + delete mEffectHandler; delete mNotSupportedNote; LC_QDEBUG( "livecomms [UI] <- LcView::~LcView()" ) @@ -172,26 +171,34 @@ mReceivedVideoEffectOverlay->show(); } + // swap mEffectHandler = new LcEffectHandler( mEngine, mSharedVideoWidget, mSharedVideoEffectOverlay, mReceivedVideoWidget, mReceivedVideoEffectOverlay); connect( mEffectHandler, SIGNAL(swapCompleted()), this, SLOT(updateVideoRects()) ); - connect( mEffectHandler, SIGNAL(loadSwapLayout()), this, SLOT(updateSwapLayout()) ); - mLandscapeTimer = new QTimer(); - connect( mLandscapeTimer, SIGNAL(timeout()), this, SLOT(landscapeTimerTimeout()) ); - - updateUiElements(); - + // menu if ( menu()) { connect( menu(), SIGNAL(aboutToShow()), this, SLOT(menuAboutToShow()) ); - connect( menu(), SIGNAL(aboutToHide()), this, SLOT(menuAboutToHide()) ); - } - + connect( menu(), SIGNAL(aboutToHide()), this, SLOT(watchInactivity()) ); + } mSoftKeyBackAction = new HbAction(Hb::BackNaviAction, this); connect(mSoftKeyBackAction, SIGNAL(triggered()), SLOT(back())); + + // dialpad + mDialpad = static_cast ( mRepository.findWidget("lc_label_dialpad") ); + connect( mDialpad, SIGNAL(aboutToClose()), SLOT(dialpadClosed()) ); + connect( mDialpad, SIGNAL(aboutToOpen()), SLOT(dialpadOpened()) ); + connect( &mDialpad->editor(), SIGNAL( contentsChanged() ), SLOT( dialpadEditorTextChanged() ) ); + // inactivity + timerId = this->startTimer( inActivityTimeout ); + connect( this, SIGNAL( contentFullScreenChanged() ), SLOT( watchInactivity() ) ) ; + + // activate fullscreen at beginning if inactivity timesout + toFullScreen( true ); + LC_QDEBUG( "livecomms [UI] <- LcView::init()" ) } @@ -254,32 +261,7 @@ void LcView::updateSwapLayout() { mRepository.loadLayout( currentLayout() ); - - if ( isLandscapeOrientation() ){ - if ( mEngine.fullScreenMode() ){ - hideControl(); - } else { - showControl(); - } - } -} - -// ----------------------------------------------------------------------------- -// LcView::updateUiElements -// ----------------------------------------------------------------------------- -// -void LcView::updateUiElements() -{ - LC_QDEBUG( "livecomms [UI] -> LcView::updateUiElements()" ) - - if ( isLandscapeOrientation() ) { - setContentFullScreen( true ); - deActivateFullScreen(); - } else { - setContentFullScreen( false ); - activatePortrait(); - } - LC_QDEBUG( "livecomms [UI] <- LcView::updateUiElements()" ) + toFullScreen( true ); } // ----------------------------------------------------------------------------- @@ -416,7 +398,7 @@ LC_QDEBUG( "livecomms [UI] -> LcView::notSupported()" ) mNotSupportedNote->show(); - resetLandscapeTimer(); + toFullScreen( false ); LC_QDEBUG( "livecomms [UI] <- LcView::notSupported()" ) } @@ -435,24 +417,6 @@ } // ----------------------------------------------------------------------------- -// LcView::changeOrientation_Temporary -// ----------------------------------------------------------------------------- -// -void LcView::changeOrientation_Temporary() -{ - LC_QDEBUG( "livecomms [UI] -> LcView::changeOrientation_Temporary()" ) - - if ( isLandscapeOrientation() ) { - HbInstance::instance()->allMainWindows().at(0)->setOrientation( Qt::Vertical ); - } else { - HbInstance::instance()->allMainWindows().at(0)->setOrientation( Qt::Horizontal ); - } - - LC_QDEBUG( "livecomms [UI] <- LcView::changeOrientation_Temporary()" ) -} - - -// ----------------------------------------------------------------------------- // LcView::endVideoSession // ----------------------------------------------------------------------------- // @@ -476,7 +440,7 @@ mEffectHandler->setDissappearEffect( LcEffectHandler::NormalDissappear ); mEngine.toggleDisableCamera(); - resetLandscapeTimer(); + toFullScreen( false ); LC_QDEBUG( "livecomms [UI] <- LcView::disableCamera()" ) } @@ -490,7 +454,7 @@ LC_QDEBUG( "livecomms [UI] -> LcView::mute()" ) mEngine.toggleMute(); - resetLandscapeTimer(); + toFullScreen( false ); LC_QDEBUG( "livecomms [UI] <- LcView::mute()" ) } @@ -505,7 +469,7 @@ mEffectHandler->setDissappearEffect( LcEffectHandler::DissappearToFlip ); mEngine.toggleCamera(); - resetLandscapeTimer(); + toFullScreen( false ); LC_QDEBUG( "livecomms [UI] <- LcView::changeCamera()" ) } @@ -532,7 +496,7 @@ LC_QDEBUG( "livecomms [UI] -> LcView::speaker()" ) mEngine.toggleSpeaker(); - resetLandscapeTimer(); + toFullScreen( false ); LC_QDEBUG( "livecomms [UI] <- LcView::speaker()" ) } @@ -713,11 +677,9 @@ void LcView::gestureEvent(QGestureEvent *event) { LC_QDEBUG( "livecomms [UI] -> LcView::gestureEvent()" ) - if(HbTapGesture *tap = static_cast(event->gesture(Qt::TapGesture))) { - + if(HbTapGesture *tap = static_cast(event->gesture(Qt::TapGesture))) { if ((tap->state() == Qt::GestureUpdated) && - (tap->tapStyleHint() == HbTapGesture::TapAndHold)) { - + (tap->tapStyleHint() == HbTapGesture::TapAndHold)) { gestureLongPress(translatePointForOrientation(tap->position())); } @@ -725,7 +687,7 @@ ( tap->tapStyleHint() == HbTapGesture::Tap)) { gestureShortPress(); - } + } } LC_QDEBUG( "livecomms [UI] <- LcView::gestureEvent()" ) } @@ -768,26 +730,9 @@ // void LcView::gestureShortPress() { - if ( isLandscapeOrientation() ) { - if ( mEngine.fullScreenMode() ) { - deActivateFullScreen(); - } else { - activateFullScreen(); - } - } -} - - -// ----------------------------------------------------------------------------- -// LcView::landscapeTimerTimeout -// ----------------------------------------------------------------------------- -// -void LcView::landscapeTimerTimeout() -{ - LC_QDEBUG( "livecomms [UI] -> LcView::landscapeTimerTimeout()" ) - if (!mIsOptionMenuOpen && isLandscapeOrientation() ) - activateFullScreen(); - LC_QDEBUG( "livecomms [UI] <- LcView::landscapeTimerTimeout()" ) + LC_QDEBUG( "livecomms [UI] -> LcView::gestureShortPress()" ) + toFullScreen( !mEngine.fullScreenMode() ); + LC_QDEBUG( "livecomms [UI] <- LcView::gestureShortPress()" ) } // ----------------------------------------------------------------------------- @@ -826,97 +771,6 @@ LC_QDEBUG( "livecomms [UI] <- LcView::createContextMenu()" ) } - -// ----------------------------------------------------------------------------- -// LcView::activateFullScreen -// ----------------------------------------------------------------------------- -// -void LcView::activateFullScreen() - { - LC_QDEBUG( "livecomms [UI] -> LcView::activateFullScreen()" ) - - if ( mLandscapeTimer ) { - mLandscapeTimer->stop(); - mEngine.setFullScreenMode(true); - hideControl(); - } - - LC_QDEBUG( "livecomms [UI] <- LcView::activateFullScreen()" ) -} - - -// ----------------------------------------------------------------------------- -// LcView::deActivateFullScreen -// ----------------------------------------------------------------------------- -// -void LcView::deActivateFullScreen() -{ - LC_QDEBUG( "livecomms [UI] -> LcView::deActivateFullScreen()" ) - - if ( mLandscapeTimer ) { - mLandscapeTimer->stop(); - - mEngine.setFullScreenMode(false); - - showControl(); - mLandscapeTimer->start( inActivityTimeout ); - } - LC_QDEBUG( "livecomms [UI] <- LcView::deActivateFullScreen()" ) -} - -// ----------------------------------------------------------------------------- -// LcView::activateFullScreen -// ----------------------------------------------------------------------------- -// -void LcView::activatePortrait() -{ - LC_QDEBUG( "livecomms [UI] -> LcView::activatePortrait()" ) - - if ( mLandscapeTimer ) { - mLandscapeTimer->stop(); - mEngine.setFullScreenMode(false); - showControl(); - } - - LC_QDEBUG( "livecomms [UI] <- LcView::activatePortrait()" ) -} - - -// ----------------------------------------------------------------------------- -// LcView::hideControl -// ----------------------------------------------------------------------------- -// -void LcView::hideControl() -{ - if( mDialpad && mDialpad->isOpen()) { - return; - } - toolBar()->hide(); - setTitleBarVisible(false); - setVisibility(mEndCallButton, false); - setVisibility(mBrandIcon, false); - setVisibility(mDuration, false); - setVisibility(mRecipient, false); -} - - -// ----------------------------------------------------------------------------- -// LcView::showControl -// ----------------------------------------------------------------------------- -// -void LcView::showControl() -{ - if( mDialpad && mDialpad->isOpen()) { - return; - } - setTitleBarVisible(true); - toolBar()->show(); - setVisibility(mEndCallButton, true); - setVisibility(mBrandIcon, true); - setVisibility(mDuration, true); - setVisibility(mRecipient, true); -} - // ----------------------------------------------------------------------------- // LcView::currentLayout @@ -959,28 +813,11 @@ void LcView::menuAboutToShow() { LC_QDEBUG( "livecomms [UI] -> LcView::menuAboutToShow()" ) - mIsOptionMenuOpen = true; - if( mLandscapeTimer ){ - mLandscapeTimer->stop(); - } + toFullScreen( false ); LC_QDEBUG( "livecomms [UI] <- LcView::menuAboutToShow()" ) } // ----------------------------------------------------------------------------- -// LcView::menuAboutToHide -// ----------------------------------------------------------------------------- -// -void LcView::menuAboutToHide() -{ - LC_QDEBUG( "livecomms [UI] -> LcView::menuAboutToHide()" ) - mIsOptionMenuOpen = false; - if( mLandscapeTimer ){ - mLandscapeTimer->start( inActivityTimeout ); - } - LC_QDEBUG( "livecomms [UI] <- LcView::menuAboutToHide()" ) -} - -// ----------------------------------------------------------------------------- // LcView::isLandscapeOrientation // ----------------------------------------------------------------------------- // @@ -1055,14 +892,6 @@ // // ----------------------------------------------------------------------------- // -void LcView::resetLandscapeTimer() -{ - if ( mLandscapeTimer && mLandscapeTimer->isActive() ) { - mLandscapeTimer->stop(); - mLandscapeTimer->start( inActivityTimeout ); - } -} - void LcView::addOptionsMenuActions() { HbAction* swapAction = static_cast( @@ -1081,30 +910,11 @@ void LcView::openDialpad() { LC_QDEBUG("livecomms [UI] -> LcView::openDialpad()") - // stop the auto full screen timer. - if( mLandscapeTimer ){ - mLandscapeTimer->stop(); - } - mEngine.setFullScreenMode( false ); - - // load dialpad layout - mRepository.loadLayout( lcLayoutLandscapeDialpadId ); - updateVideoRects(); - - // construct dialpad and connect signals. - mDialpad = static_cast ( mRepository.findWidget("lc_label_dialpad") ); - connect( mDialpad, SIGNAL(aboutToClose()), SLOT(dialpadClosed()) ); - connect( mDialpad, SIGNAL(aboutToOpen()), SLOT(dialpadOpened()) ); - connect( &mDialpad->editor(), SIGNAL( contentsChanged() ), this, - SLOT( dialpadEditorTextChanged() ) ); - // open dialpad + mRepository.loadLayout( lcLayoutLandscapeDialpadId ); + if ( mEffectHandler )mEffectHandler->startEffects(); mDialpad->openDialpad(); - - menu()->clearActions(); - - if ( mEffectHandler ){ - mEffectHandler->startEffects(); - } + mDialpad->setCallButtonEnabled(false); + menu()->clearActions(); LC_QDEBUG("livecomms [UI] <- LcView::openDialpad()") } @@ -1114,7 +924,9 @@ // void LcView::dialpadOpened() { - LC_QDEBUG("livecomms [UI] <-> LcView::dialpadOpened()") + LC_QDEBUG("livecomms [UI] <-> LcView::dialpadOpened()") + toolBar()->setVisible( false ); + setTitleBarVisible( true ); } // ----------------------------------------------------------------------------- @@ -1123,16 +935,8 @@ // void LcView::dialpadClosed() { - LC_QDEBUG("livecomms [UI] -> LcView::dialpadClosed()") - disconnect( &mDialpad->editor(), SIGNAL( contentsChanged() ), this, - SLOT( dialpadEditorTextChanged() ) ); - disconnect( mDialpad, SIGNAL(aboutToClose()), this, SLOT(dialpadClosed()) ); - disconnect( mDialpad, SIGNAL(aboutToOpen()), this, SLOT(dialpadOpened()) ); - - mDialpad = 0; // do not delete it since it is not owned. - - addOptionsMenuActions(); - + LC_QDEBUG("livecomms [UI] -> LcView::dialpadClosed()") + addOptionsMenuActions(); // switch back to the previous layout QString pLayout = mRepository.previousLayout(); QString layout; @@ -1149,20 +953,12 @@ else { layout = ( isSwapped ) ? lcLayoutPortraitSwappedId : lcLayoutPortraitDefaultId; - } - // load the layout + } mRepository.loadLayout( layout ); - // update the videoplayer hole - updateVideoRects(); - // now do some effects if ( mEffectHandler ){ mEffectHandler->startEffects(); } - // deactivate full screen untill inactivity timeout happens. - if ( isLandscape ){ - deActivateFullScreen(); - } - + toFullScreen(false); LC_QDEBUG("livecomms [UI] <- LcView::dialpadClosed()") } @@ -1179,16 +975,6 @@ } // ----------------------------------------------------------------------------- -// LcView::enableDialpadCallButton() -// ----------------------------------------------------------------------------- -// -void LcView::enableDialpadCallButton( bool enable ) -{ - LC_QDEBUG_2("livecomms [UI] -> Enable callbutton, emergency call ",enable) - mDialpad->setCallButtonEnabled( enable ); -} - -// ----------------------------------------------------------------------------- // LcView::back // ----------------------------------------------------------------------------- // @@ -1205,4 +991,47 @@ LC_QDEBUG("livecomms [UI] <- LcView::back()") } +// ----------------------------------------------------------------------------- +// LcView::timerEvent +// ----------------------------------------------------------------------------- +// +void LcView::timerEvent( QTimerEvent * event ) +{ + if ( event->timerId() == timerId ){ + LC_QDEBUG("livecomms [UI] -> LcView::timerEvent() inActivity Timeout") + killTimer( timerId ); + toFullScreen(true); + } +} + +// ----------------------------------------------------------------------------- +// LcView::watchInactivity +// ----------------------------------------------------------------------------- +// +void LcView::watchInactivity() +{ + if( !mEngine.fullScreenMode()){ + LC_QDEBUG("livecomms [UI] - LcView::watchInactivity() start watching inactivity") + killTimer( timerId ); + timerId = startTimer( inActivityTimeout ); + } +} + +// ----------------------------------------------------------------------------- +// LcView::toFullScreen utility function +// ----------------------------------------------------------------------------- +// +void LcView::toFullScreen( bool fullscreen ) +{ + LC_QDEBUG_2("livecomms [UI] - LcView::toFullScreen(),",fullscreen) + if( menu()->isVisible() || mDialpad && mDialpad->isOpen() ) return; + mEngine.setFullScreenMode( fullscreen ); + setTitleBarVisible( !fullscreen ); + toolBar()->setVisible( !fullscreen ); + setVisibility( mEndCallButton, !fullscreen ); + setVisibility( mBrandIcon, !fullscreen ); + setVisibility( mDuration, !fullscreen ); + setVisibility( mRecipient, !fullscreen ); + emit contentFullScreenChanged(); +} // End of file diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/src/lcviewmanager_p.cpp --- a/mmsharing/livecommsui/lcui/src/lcviewmanager_p.cpp Fri Jun 11 13:36:18 2010 +0300 +++ b/mmsharing/livecommsui/lcui/src/lcviewmanager_p.cpp Wed Jun 23 18:09:54 2010 +0300 @@ -28,6 +28,9 @@ #include #include #include +#include +#include +#include // CONSTANTS #define LC_VIEWMANAGER_SLOT_ACTIVATE_CURRENT_VIEW "activateCurrentView" @@ -140,7 +143,7 @@ LcView* currentView = static_cast( mMainWindow.currentView() ); QString layout = currentView->currentLayout(); mRepository->loadLayout( layout ); - currentView->updateUiElements(); + currentView->setContentFullScreen( true ); currentView->updateVideoRects(); } diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/tsrc/ut_lcui/hbstubs/dialpad_stub.cpp --- a/mmsharing/livecommsui/lcui/tsrc/ut_lcui/hbstubs/dialpad_stub.cpp Fri Jun 11 13:36:18 2010 +0300 +++ b/mmsharing/livecommsui/lcui/tsrc/ut_lcui/hbstubs/dialpad_stub.cpp Wed Jun 23 18:09:54 2010 +0300 @@ -22,7 +22,7 @@ { mLineEdit = new HbLineEdit(); setVisible(false); - mIsCallButtonEnabled = false; + mIsCallButtonEnabled = true; mIsOpen = false; } @@ -31,7 +31,7 @@ Q_UNUSED(mainWindow); mLineEdit = new HbLineEdit(); setVisible(false); - mIsCallButtonEnabled = false; + mIsCallButtonEnabled = true; mIsOpen = false; } diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/tsrc/ut_lcui/hbstubs/hbview.h --- a/mmsharing/livecommsui/lcui/tsrc/ut_lcui/hbstubs/hbview.h Fri Jun 11 13:36:18 2010 +0300 +++ b/mmsharing/livecommsui/lcui/tsrc/ut_lcui/hbstubs/hbview.h Wed Jun 23 18:09:54 2010 +0300 @@ -45,6 +45,9 @@ HbAction *navigationAction() const; void setNavigationAction(HbAction *action); +signals: + void contentFullScreenChanged(); + public slots: void setTitle(const QString &title); diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/tsrc/ut_lcui/inc/ut_lcview.h --- a/mmsharing/livecommsui/lcui/tsrc/ut_lcui/inc/ut_lcview.h Fri Jun 11 13:36:18 2010 +0300 +++ b/mmsharing/livecommsui/lcui/tsrc/ut_lcui/inc/ut_lcview.h Wed Jun 23 18:09:54 2010 +0300 @@ -77,31 +77,25 @@ void testDisableControls(); void testEnableControls(); void testUpdateVideoRects(); - void testCurrentLayout(); - void testActivateFullScreen(); - void testDeactivateFullScreen(); + void testCurrentLayout(); void testGestureEvent(); void testContextMenu(); void testGestureLongPress(); - void testGestureShortPress(); - void testActivatePortrait(); - void testUpdateUiElements(); - void testLandscapeTimerTimeout(); - void testShareImage(); - void testShowControl(); - void testHideControl(); + void testGestureShortPress(); + void testShareImage(); void testUpdateSwapLayout(); - void testMenuAboutToShow(); - void testMenuAboutToHide(); + void testMenuAboutToShow(); void testTranslateRectForOrientation(); - void testTranslatePointForOrientation(); - void testResetLandscapeTimer(); + void testTranslatePointForOrientation(); void testOpenDialpad(); void testDialpadOpened(); void testDialpadClosed(); void testDialpadEditorTextChanged(); void testBack(); void testAddOptionsMenuActions(); + void testToFullScreen(); + void testWatchInactivity(); + void testTimerEvent(); private: diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/tsrc/ut_lcui/src/ut_lcview.cpp --- a/mmsharing/livecommsui/lcui/tsrc/ut_lcui/src/ut_lcview.cpp Fri Jun 11 13:36:18 2010 +0300 +++ b/mmsharing/livecommsui/lcui/tsrc/ut_lcui/src/ut_lcview.cpp Wed Jun 23 18:09:54 2010 +0300 @@ -270,27 +270,19 @@ } void UT_LcView::testMute() -{ - QVERIFY( !mView->mLandscapeTimer ); - mView->mLandscapeTimer = new QTimer(); - mView->mLandscapeTimer->start(); - int oldTimerId = mView->mLandscapeTimer->timerId(); +{ mView->mute(); QVERIFY( lcutStub_LcUiEngine_expectCall( lcutStub_LcUiEngine_mute ) ); - QVERIFY( mView->mLandscapeTimer->isActive() ); - QVERIFY( oldTimerId != mView->mLandscapeTimer->timerId() ); + QVERIFY( !mView->timerId ); + QVERIFY( !mEngine->fullScreenMode()); } void UT_LcView::testChangeCamera() { - mView->init(); - QVERIFY( mView->mLandscapeTimer ); - QVERIFY( mView->mLandscapeTimer->isActive() ); - int oldTimerId = mView->mLandscapeTimer->timerId(); + mView->init(); mView->changeCamera(); - QVERIFY( lcutStub_LcUiEngine_expectCall( lcutStub_LcUiEngine_toggleCamera ) ); - QVERIFY( mView->mLandscapeTimer->isActive() ); - QVERIFY( oldTimerId != mView->mLandscapeTimer->timerId() ); + QVERIFY( lcutStub_LcUiEngine_expectCall( lcutStub_LcUiEngine_toggleCamera ) ); + QVERIFY( !mEngine->fullScreenMode() ); } void UT_LcView::testSwitchToVoiceCall() @@ -301,26 +293,18 @@ void UT_LcView::testDisableCamera() { - mView->init(); - QVERIFY( mView->mLandscapeTimer ); - QVERIFY( mView->mLandscapeTimer->isActive() ); - int oldTimerId = mView->mLandscapeTimer->timerId(); + mView->init(); mView->disableCamera(); - QVERIFY( lcutStub_LcUiEngine_expectCall( lcutStub_LcUiEngine_disableCamera ) ); - QVERIFY( mView->mLandscapeTimer->isActive() ); - QVERIFY( oldTimerId != mView->mLandscapeTimer->timerId() ); + QVERIFY( lcutStub_LcUiEngine_expectCall( lcutStub_LcUiEngine_disableCamera ) ); + QVERIFY( !mEngine->fullScreenMode() ); } void UT_LcView::testSpeaker() -{ - QVERIFY( !mView->mLandscapeTimer ); - mView->mLandscapeTimer = new QTimer(); - mView->mLandscapeTimer->start(); - int oldTimerId = mView->mLandscapeTimer->timerId(); +{ + mView->init(); mView->speaker(); - QVERIFY( lcutStub_LcUiEngine_expectCall( lcutStub_LcUiEngine_speaker ) ); - QVERIFY( mView->mLandscapeTimer->isActive() ); - QVERIFY( oldTimerId != mView->mLandscapeTimer->timerId() ); + QVERIFY( lcutStub_LcUiEngine_expectCall( lcutStub_LcUiEngine_speaker ) ); + QVERIFY( !mEngine->fullScreenMode() ); } void UT_LcView::testSwap() @@ -404,8 +388,8 @@ mView->mReceivedVideoWidget = receivedVideoWidget; sharedVideoWidget->hide(); receivedVideoWidget->hide(); - lcutStub_LcUiEngine_setLocalPlaying( false ); - lcutStub_LcUiEngine_setRemotePlaying( false ); + lcutStub_LcUiEngine_setLocalPlaying( false ); + lcutStub_LcUiEngine_setRemotePlaying( false ); mView->updateVideoRects(); QVERIFY( lcutStub_LcUiEngine_expectCall( lcutStub_LcUiEngine_updateSession, 0 ) ); QVERIFY( lcutStub_LcUiEngine_expectCall( lcutStub_LcUiEngine_setOrientation, 1 ) ); @@ -415,15 +399,12 @@ sharedVideoWidget->hide(); receivedVideoWidget->hide(); - lcutStub_LcUiEngine_setLocalPlaying( true ); - lcutStub_LcUiEngine_setRemotePlaying( true ); + lcutStub_LcUiEngine_setLocalPlaying( true ); + lcutStub_LcUiEngine_setRemotePlaying( true ); mView->updateVideoRects(); QVERIFY( lcutStub_LcUiEngine_expectCall( lcutStub_LcUiEngine_updateSession, 0 ) ); QVERIFY( lcutStub_LcUiEngine_expectCall( lcutStub_LcUiEngine_setOrientation, 1 ) ); - QVERIFY( lcutStub_LcUiEngine_expectCall( lcutStub_LcUiEngine_setContentAreas, 2 ) ); - // TODO: effecthandler->setvisibility temporarily NOP - /*QVERIFY( sharedVideoWidget->isVisible() ); - QVERIFY( receivedVideoWidget->isVisible() );*/ + QVERIFY( lcutStub_LcUiEngine_expectCall( lcutStub_LcUiEngine_setContentAreas, 2 ) ); } void UT_LcView::testCurrentLayout() @@ -487,71 +468,70 @@ } -void UT_LcView::testActivateFullScreen() +void UT_LcView::testToFullScreen() { QString layout; UT_SET_ORIENTATION( Qt::Horizontal ); - // Test1: Initial Layout is Vertical - mEngine->setFullScreenMode(false); - mView->activateFullScreen(); - QVERIFY( !mEngine->fullScreenMode()); - + // Test1: to full screen mView->init(); - mView->mEndCallButton = mEndCallButton; - mEngine->setFullScreenMode(false); - mView->activateFullScreen(); - QVERIFY( mEngine->fullScreenMode()); - - QVERIFY( !mView->isItemVisible(Hb::TitleBarItem ) ); - QVERIFY( !mView->isItemVisible(Hb::DockWidgetItem ) ); + mView->menu()->setVisible( false ); + mView->toFullScreen( true ); + QVERIFY( mEngine->fullScreenMode() ); + QVERIFY( !mView->isTitleBarVisible() ); + QVERIFY( !mView->toolBar()->isVisible() ); QVERIFY( !mView->mEndCallButton->isVisible()); - - layout = mView->currentLayout(); - QVERIFY( layout == lcLayoutLandscapeDefaultId ); - + QVERIFY( !mView->mDuration->isVisible()); + QVERIFY( !mView->mRecipient->isVisible()); + QVERIFY( !mView->mBrandIcon->isVisible()); - // Test2: Retry Full Screen if already Enabled. - QVERIFY( mEngine->fullScreenMode()); - layout = mView->currentLayout(); - QVERIFY( layout == lcLayoutLandscapeDefaultId ); - -} - -void UT_LcView::testDeactivateFullScreen() -{ + // Test2 : not in full screen mView->init(); - mView->mEndCallButton = mEndCallButton; - QString layout; - UT_SET_ORIENTATION( Qt::Horizontal ); - layout = mView->currentLayout(); - - // Test2: Deactivate from Full Screen Mode - mEngine->setFullScreenMode(true); - mView->deActivateFullScreen(); - + mView->menu()->setVisible( false ); + mView->toFullScreen( false ); QVERIFY( !mEngine->fullScreenMode()); QVERIFY( mView->isTitleBarVisible() ); - QVERIFY( !mView->isItemVisible(Hb::DockWidgetItem ) ); + QVERIFY( mView->toolBar()->isVisible() ); + QVERIFY( mView->mEndCallButton->isVisible()); + QVERIFY( mView->mDuration->isVisible()); + QVERIFY( mView->mRecipient->isVisible()); + QVERIFY( mView->mBrandIcon->isVisible()); + QVERIFY( mView->timerId ); + + // Test3 : menu visible + mView->init(); + mView->menu()->setVisible( false ); + mView->toFullScreen( false ); + mView->menu()->setVisible( true ); + mView->toFullScreen( true ); + QVERIFY( !mEngine->fullScreenMode()); + QVERIFY( mView->isTitleBarVisible() ); + QVERIFY( mView->toolBar()->isVisible() ); QVERIFY( mView->mEndCallButton->isVisible()); - - QVERIFY( layout == lcLayoutLandscapeDefaultId ); - - // Test2: Trying to Deactivate full sceeen - // when its not full screen - mEngine->setFullScreenMode(false); - mView->deActivateFullScreen(); + QVERIFY( mView->mDuration->isVisible()); + QVERIFY( mView->mRecipient->isVisible()); + QVERIFY( mView->mBrandIcon->isVisible()); + QVERIFY( mView->timerId ); + // Test3 : dialpad visible + mView->init(); + delete mView->mDialpad; + mView->mDialpad = new Dialpad(); + mView->toFullScreen( true ); + QVERIFY( !mEngine->fullScreenMode()); QVERIFY( mView->isTitleBarVisible() ); - QVERIFY( !mView->isItemVisible(Hb::DockWidgetItem ) ); + QVERIFY( mView->toolBar()->isVisible() ); QVERIFY( mView->mEndCallButton->isVisible()); - QVERIFY( layout == lcLayoutLandscapeDefaultId ); + QVERIFY( mView->mDuration->isVisible()); + QVERIFY( mView->mRecipient->isVisible()); + QVERIFY( mView->mBrandIcon->isVisible()); + QVERIFY( mView->timerId ); } - void UT_LcView::testGestureEvent() { mView->init(); + mView->menu()->setVisible(false); UT_SET_ORIENTATION( Qt::Horizontal ); mView->mItemContextMenu = 0; mView->mSharedVideoWidget->setGeometry(QRectF(5,50, 100, 100)); @@ -671,6 +651,7 @@ void UT_LcView::testGestureShortPress() { mView->init(); + mView->menu()->setVisible(false); mView->mSharedVideoWidget->setGeometry(QRectF(5,50, 100, 100)); mView->mReceivedVideoWidget->setGeometry(QRectF(5,200, 200, 400)); @@ -682,83 +663,38 @@ // toggled mView->gestureShortPress(); QVERIFY( mEngine->fullScreenMode()); - - // no action if its not landscape. - UT_SET_ORIENTATION( Qt::Vertical ); - mView->gestureShortPress(); - QVERIFY( mEngine->fullScreenMode()); } - -void UT_LcView::testActivatePortrait() -{ - - mView->activatePortrait(); - - mView->init(); - mView->mEndCallButton = mEndCallButton; - mView->activateFullScreen(); - QVERIFY( mEngine->fullScreenMode()); - QVERIFY( !mView->isTitleBarVisible() ); - QVERIFY( !mView->isItemVisible(Hb::DockWidgetItem ) ); - QVERIFY( !mView->mEndCallButton->isVisible()); - - mView->activatePortrait(); - QVERIFY( !mEngine->fullScreenMode()); - QVERIFY( mView->isTitleBarVisible() ); - QVERIFY( !mView->isItemVisible(Hb::DockWidgetItem ) ); - QVERIFY( mView->mEndCallButton->isVisible()); - -} - -void UT_LcView::testUpdateUiElements() +void UT_LcView::testTimerEvent() { mView->init(); - UT_SET_ORIENTATION( Qt::Horizontal ); - mView->updateUiElements(); - QVERIFY( !mEngine->fullScreenMode()); - QVERIFY( mView->isTitleBarVisible() ); - QVERIFY( !mView->isItemVisible(Hb::DockWidgetItem ) ); - - UT_SET_ORIENTATION( Qt::Vertical ); - mView->updateUiElements(); - QVERIFY( !mEngine->fullScreenMode()); - QVERIFY( mView->isTitleBarVisible() ); - QVERIFY( !mView->isItemVisible(Hb::DockWidgetItem ) ); -} - -void UT_LcView::testLandscapeTimerTimeout() -{ - mView->init(); - mView->deActivateFullScreen(); - - // No effect as in vertical zontal mode - UT_SET_ORIENTATION(Qt::Vertical); - QVERIFY( !mEngine->fullScreenMode()); - QVERIFY( mView->isTitleBarVisible() ); - QVERIFY( !mView->isItemVisible(Hb::DockWidgetItem ) ); - - mView->landscapeTimerTimeout(); - QVERIFY( !mEngine->fullScreenMode()); - QVERIFY( mView->isTitleBarVisible() ); - QVERIFY( !mView->isItemVisible(Hb::DockWidgetItem ) ); - - // Effective in horizontal mode - UT_SET_ORIENTATION(Qt::Horizontal); - mView->landscapeTimerTimeout(); - + // timer time out + QTimerEvent* event = new QTimerEvent( mView->timerId ); + mView->menu()->setVisible(false); + mView->timerEvent( event ); QVERIFY( mEngine->fullScreenMode()); QVERIFY( !mView->isTitleBarVisible() ); - QVERIFY( !mView->isItemVisible(Hb::DockWidgetItem ) ); - - // Test: If menu is open than it should not go into full screen mode. - mView->deActivateFullScreen(); - mView->mIsOptionMenuOpen = true; - mView->landscapeTimerTimeout(); - QVERIFY( !mEngine->fullScreenMode()); + QVERIFY( !mView->toolBar()->isVisible() ); + QVERIFY( !mView->mEndCallButton->isVisible()); + QVERIFY( !mView->mDuration->isVisible()); + QVERIFY( !mView->mRecipient->isVisible()); + QVERIFY( !mView->mBrandIcon->isVisible()); + delete event; + + // not a timer we want + mView->toFullScreen( false ); + event = new QTimerEvent( 22222 ); // some number + mView->timerEvent( event ); + QVERIFY( !mEngine->fullScreenMode() ); QVERIFY( mView->isTitleBarVisible() ); - QVERIFY( !mView->isItemVisible(Hb::DockWidgetItem ) ); + QVERIFY( mView->toolBar()->isVisible() ); + QVERIFY( mView->mEndCallButton->isVisible()); + QVERIFY( mView->mDuration->isVisible()); + QVERIFY( mView->mRecipient->isVisible()); + QVERIFY( mView->mBrandIcon->isVisible()); + QVERIFY( mView->timerId); + delete event; } void UT_LcView::testShareImage() @@ -768,64 +704,38 @@ //QVERIFY( lcutStub_LcUiEngine_isImageShared() ); } - -void UT_LcView::testShowControl() -{ - mView->showControl(); - QVERIFY( mView->isTitleBarVisible() ); - QVERIFY( mView->toolBar()->isVisible() ); - QVERIFY( !mView->isItemVisible(Hb::DockWidgetItem ) ); - QVERIFY( mView->mEndCallButton->isVisible()); - QVERIFY( mView->mRecipient->isVisible()); -} - -void UT_LcView::testHideControl() -{ - mView->hideControl(); - QVERIFY( !mView->isTitleBarVisible() ); - QVERIFY( !mView->toolBar()->isVisible() ); - QVERIFY( !mView->isItemVisible(Hb::DockWidgetItem ) ); - QVERIFY( !mView->mEndCallButton->isVisible()); - QVERIFY( !mView->mRecipient->isVisible()); -} - void UT_LcView::testUpdateSwapLayout() -{ - //Test1: In Full Screen Mode controls Should be hidden. +{ mView->init(); + mView->menu()->setVisible(false); mView->mEndCallButton = mEndCallButton; UT_SET_ORIENTATION( Qt::Horizontal ); mEngine->setFullScreenMode(true); - mView->updateSwapLayout(); - QVERIFY( !mView->isItemVisible(Hb::TitleBarItem ) ); + QVERIFY( mEngine->fullScreenMode()); + QVERIFY( !mView->isTitleBarVisible() ); QVERIFY( !mView->isItemVisible(Hb::DockWidgetItem ) ); QVERIFY( !mView->mEndCallButton->isVisible()); - - // Test2: If its not full screen show the controls - mEngine->setFullScreenMode(false); - mView->updateSwapLayout(); - QVERIFY( mView->isTitleBarVisible() ); - QVERIFY( !mView->isItemVisible(Hb::DockWidgetItem ) ); - QVERIFY( mView->mEndCallButton->isVisible()); + QVERIFY( !mView->mDuration->isVisible()); + QVERIFY( !mView->mRecipient->isVisible()); + QVERIFY( !mView->mBrandIcon->isVisible()); } void UT_LcView::testMenuAboutToShow() { mView->init(); - QVERIFY( !mView->mIsOptionMenuOpen ); + mView->menu()->setVisible(false); + mView->toFullScreen( true ); mView->menuAboutToShow(); - QVERIFY( mView->mIsOptionMenuOpen ); - QVERIFY( !mView->mLandscapeTimer->isActive()); - -} + QVERIFY( !mEngine->fullScreenMode()); + QVERIFY( mView->isTitleBarVisible() ); + QVERIFY( mView->toolBar()->isVisible() ); + QVERIFY( mView->mEndCallButton->isVisible()); + QVERIFY( mView->mDuration->isVisible()); + QVERIFY( mView->mRecipient->isVisible()); + QVERIFY( mView->mBrandIcon->isVisible()); + QVERIFY( mView->timerId); -void UT_LcView::testMenuAboutToHide() -{ - mView->init(); - mView->menuAboutToHide(); - QVERIFY( !mView->mIsOptionMenuOpen ); - QVERIFY( mView->mLandscapeTimer->isActive()); } void UT_LcView::testTranslateRectForOrientation() @@ -855,27 +765,6 @@ QVERIFY( origPoint != modPoint ); } -void UT_LcView::testResetLandscapeTimer() -{ - // No timer - QVERIFY( !mView->mLandscapeTimer ); - mView->resetLandscapeTimer(); - QVERIFY( !mView->mLandscapeTimer ); - - // Timer not acitve - mView->mLandscapeTimer = new QTimer(); - QVERIFY( !mView->mLandscapeTimer->isActive() ); - mView->resetLandscapeTimer(); - QVERIFY( !mView->mLandscapeTimer->isActive() ); - - // Timer is active - mView->mLandscapeTimer->start(); - int oldTimerId = mView->mLandscapeTimer->timerId(); - mView->resetLandscapeTimer(); - QVERIFY( mView->mLandscapeTimer->isActive() ); - QVERIFY( oldTimerId != mView->mLandscapeTimer->timerId() ); -} - void UT_LcView::testOpenDialpad() { delete mView; @@ -891,10 +780,10 @@ mView->openDialpad(); QVERIFY(mView->mDialpad->isOpen()); + QVERIFY(!mView->mDialpad->mIsCallButtonEnabled); QVERIFY(mView->mRepository.mLayoutSection == lcLayoutLandscapeDialpadId); QVERIFY(mView->isTitleBarVisible()); - QCOMPARE(mView->menu()->actions().size(), 0); - QVERIFY(!mView->mLandscapeTimer->isActive()); + QCOMPARE(mView->menu()->actions().size(), 0); QVERIFY(!mView->mEngine.fullScreenMode()); } @@ -920,8 +809,7 @@ QVERIFY(mView->mEndCallButton->isVisible()); QVERIFY(mView->mRecipient->isVisible()); QVERIFY(mView->mDuration->isVisible()); - QVERIFY(mView->menu()->isVisible()); - QVERIFY(mView->mLandscapeTimer->isActive()); + QVERIFY(mView->menu()->isVisible()); QVERIFY(!mView->mEngine.fullScreenMode()); // test : swapped,fullscreen,landscape,open and close dialpad scenario @@ -933,8 +821,7 @@ // check titlebar invisible QVERIFY( mView->isTitleBarVisible() ); // check toolbar invisible - QVERIFY( mView->toolBar()->isVisible() ); - QVERIFY(mView->mLandscapeTimer->isActive()); + QVERIFY( mView->toolBar()->isVisible() ); QVERIFY(!mView->mEngine.fullScreenMode()); // test : orientation to portrait @@ -948,8 +835,7 @@ // check titlebar visible QVERIFY( mView->isTitleBarVisible() ); // check toolbar visible - QVERIFY( mView->toolBar()->isVisible() ); - QVERIFY(!mView->mLandscapeTimer->isActive()); + QVERIFY( mView->toolBar()->isVisible() ); QVERIFY(!mView->mEngine.fullScreenMode()); } @@ -991,3 +877,15 @@ //TODO: stub implementation of void QGraphicsWidget::addAction(QAction *action); //QCOMPARE(mView->menu()->actions().size(), 2); } + +void UT_LcView::testWatchInactivity() +{ + int tid = mView->timerId ; + mView->mEngine.setFullScreenMode( true ); + mView->watchInactivity(); + QVERIFY( tid==mView->timerId ); + + mView->mEngine.setFullScreenMode( false ); + mView->watchInactivity(); + QVERIFY( tid!=mView->timerId ); +} diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcui/tsrc/ut_lcui/src/ut_lcviewmanager.cpp --- a/mmsharing/livecommsui/lcui/tsrc/ut_lcui/src/ut_lcviewmanager.cpp Fri Jun 11 13:36:18 2010 +0300 +++ b/mmsharing/livecommsui/lcui/tsrc/ut_lcui/src/ut_lcviewmanager.cpp Wed Jun 23 18:09:54 2010 +0300 @@ -18,6 +18,8 @@ #include #include #include +#include +#include #include "ut_lcviewmanager.h" #include "lcviewmanager.h" #include "lcviewmanager_p.h" @@ -194,4 +196,4 @@ QVERIFY( spy2.count() == 1 ); } - +// end of file diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcuiengine/inc/lcuiengine_p.h --- a/mmsharing/livecommsui/lcuiengine/inc/lcuiengine_p.h Fri Jun 11 13:36:18 2010 +0300 +++ b/mmsharing/livecommsui/lcuiengine/inc/lcuiengine_p.h Wed Jun 23 18:09:54 2010 +0300 @@ -187,7 +187,6 @@ LcUiEngine& mUiEngine; bool mIsMinimized; bool mFirstForegroundSwitch; - int mViewReadySimulationTimerId; HbView* mCurrentView; // Not owned TRect mLocalRect; TRect mRemoteRect; diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcuiengine/src/lcuiengine_p.cpp --- a/mmsharing/livecommsui/lcuiengine/src/lcuiengine_p.cpp Fri Jun 11 13:36:18 2010 +0300 +++ b/mmsharing/livecommsui/lcuiengine/src/lcuiengine_p.cpp Wed Jun 23 18:09:54 2010 +0300 @@ -76,7 +76,6 @@ mUiEngine( uiEngine ), mIsMinimized(false), mFirstForegroundSwitch(true), - mViewReadySimulationTimerId(0), mCurrentView(0), mActivityManager(0) { @@ -562,11 +561,9 @@ curr = curr.addSecs( mSessionDurationStartTime.secsTo( QTime::currentTime() ) ); emit mUiEngine.sessionDurationChanged(curr.toString()); - } else if ( event->timerId() == mViewReadySimulationTimerId ){ - LC_QDEBUG( "livecomms [UI] -> LcUiEnginePrivate::timerEvent(), viewReady simulation" ) - handleEngineForegroundStatus(); } } + // ----------------------------------------------------------------------------- // LcUiEnginePrivate::startReceiving // ----------------------------------------------------------------------------- @@ -1373,7 +1370,9 @@ { bool foreground = !mIsMinimized; LC_QDEBUG_2( "livecomms [UI] -> LcUiEnginePrivate::handleEngineForegroundStatus(), fg:", - foreground ) + foreground ) + HbMainWindow *mainWindow = HbInstance::instance()->allMainWindows().at(0); + if ( mLiveCommsEngine ){ bool setStatusToEngine(true); if ( foreground && mFirstForegroundSwitch ){ @@ -1382,11 +1381,9 @@ // TODO: wk8 does not yet have viewReady signal so simulate it // by using timer. Timer can be removed later. if ( mCurrentView ){ - LC_QDEBUG( "livecomms [UI] Wait for first paint" ) - connect( mCurrentView, SIGNAL(viewReady()), + LC_QDEBUG( "livecomms [UI] Wait for first paint" ) + connect( mainWindow, SIGNAL(viewReady()), this, SLOT(handleEngineForegroundStatus()) ); - const int viewReadySimulationInMs = 2000; - mViewReadySimulationTimerId = startTimer( viewReadySimulationInMs ); setStatusToEngine = false; } @@ -1394,11 +1391,8 @@ if ( setStatusToEngine ) { LC_QDEBUG( "livecomms [UI] Set fg status to engine plugin" ) session().SetForegroundStatus(foreground); - - disconnect( mCurrentView, SIGNAL(viewReady()), + disconnect( mainWindow, SIGNAL(viewReady()), this, SLOT(handleEngineForegroundStatus()) ); - killTimer( mViewReadySimulationTimerId ); - mViewReadySimulationTimerId = 0; } mFirstForegroundSwitch = false; } diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcuiengine/tsrc/ut_lcuieng/src/ut_lcactivitymanager.cpp --- a/mmsharing/livecommsui/lcuiengine/tsrc/ut_lcuieng/src/ut_lcactivitymanager.cpp Fri Jun 11 13:36:18 2010 +0300 +++ b/mmsharing/livecommsui/lcuiengine/tsrc/ut_lcuieng/src/ut_lcactivitymanager.cpp Wed Jun 23 18:09:54 2010 +0300 @@ -118,12 +118,10 @@ QVERIFY( User::InactivityTime().Int() == 1 ); // Starting activity simulation again, user inactivity reached threshold - int prevTimerID = mActivityManager->mTimerId; utInactivityInterval = mActivityManager->mInactivityTimeout = 5; QVERIFY( User::InactivityTime().Int() == 5 ); mActivityManager->enableActivitySimulation(true); QVERIFY( mActivityManager->mTimerId > 0 ); - QVERIFY( mActivityManager->mTimerId != prevTimerID ); QVERIFY( User::InactivityTime().Int() == 0 ); // Disabling ongoing activity simulation diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcuiengine/tsrc/ut_lcuieng/src/ut_lcuiengine.cpp --- a/mmsharing/livecommsui/lcuiengine/tsrc/ut_lcuieng/src/ut_lcuiengine.cpp Fri Jun 11 13:36:18 2010 +0300 +++ b/mmsharing/livecommsui/lcuiengine/tsrc/ut_lcuieng/src/ut_lcuiengine.cpp Wed Jun 23 18:09:54 2010 +0300 @@ -1178,22 +1178,21 @@ QtHighwayStubHelper::reset(); // First time to foreground, engine is not set to foreground until viewReady signal - // or simulation timeout occurs HbView currView; mEngine->d->setCurrentView(&currView); - QVERIFY( mEngine->d->mViewReadySimulationTimerId == 0 ); + QVERIFY( mEngine->d->mFirstForegroundSwitch ); QVERIFY( !mEngine->d->mActivityManager->isActivitySimulationEnabled() ); + mEngine->d->HandleForegroundStatus(ETrue); QVERIFY( mEngine->d->mActivityManager->isActivitySimulationEnabled() ); QVERIFY( !mEngine->d->session().IsBackgroundStartup() ); // Stub returns fg status in this QVERIFY( !QtHighwayStubHelper::isAtBg() ); - QVERIFY( mEngine->d->mViewReadySimulationTimerId != 0 ); - // Simulate timeout - QTimerEvent viewReadySimulationEvent(mEngine->d->mViewReadySimulationTimerId); - mEngine->d->timerEvent(&viewReadySimulationEvent); + QVERIFY( !mEngine->d->mFirstForegroundSwitch ); + + //Simulate viewReady signal happens, funciton will be called again. + mEngine->d->HandleForegroundStatus(ETrue); QVERIFY( mEngine->d->session().IsBackgroundStartup() ); // Stub returns fg status in this QVERIFY( !mEngine->d->mFirstForegroundSwitch ); - QVERIFY( mEngine->d->mViewReadySimulationTimerId == 0 ); // Bg switch QtHighwayStubHelper::reset(); diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/lcuiengine/tsrc/ut_lcuieng/ut_lcuieng.pro --- a/mmsharing/livecommsui/lcuiengine/tsrc/ut_lcuieng/ut_lcuieng.pro Fri Jun 11 13:36:18 2010 +0300 +++ b/mmsharing/livecommsui/lcuiengine/tsrc/ut_lcuieng/ut_lcuieng.pro Wed Jun 23 18:09:54 2010 +0300 @@ -60,6 +60,6 @@ TARGET.UID2 = 0x100039CE TARGET.UID3 = 0xEfa329b2 TARGET.CAPABILITY = ALL -TCB - LIBS += -lecom -lflogger -lws32 -lbafl -lxqservice -lxqserviceutil + LIBS += -lecom -lflogger -lws32 -lbafl -lxqservice -lxqserviceutil -lcone TARGET.EPOCALLOWDLLDATA = 1 } diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/livecommsui/livecommsui.pro --- a/mmsharing/livecommsui/livecommsui.pro Fri Jun 11 13:36:18 2010 +0300 +++ b/mmsharing/livecommsui/livecommsui.pro Wed Jun 23 18:09:54 2010 +0300 @@ -91,6 +91,5 @@ :BLD_INF_RULES.prj_exports += "$$DOCML_DIR/lctwowayview.docml z:/data/others/lctwowayview.docml" :BLD_INF_RULES.prj_exports += "$$DOCML_DIR/lcvtview.docml z:/data/others/lcvtview.docml" :BLD_INF_RULES.prj_exports += "$$DOCML_DIR/lcreceiveonlyView.docml z:/data/others/lcreceiveonlyview.docml" - :BLD_INF_RULES.prj_exports += "$$LCUI_DIR/livecommsui_en_GB.qm z:/data/others/livecommsui_en_GB.qm" } diff -r 496ad160a278 -r 53c1c4459a94 mmsharing/mmshengine/src/musengmcesession.cpp --- a/mmsharing/mmshengine/src/musengmcesession.cpp Fri Jun 11 13:36:18 2010 +0300 +++ b/mmsharing/mmshengine/src/musengmcesession.cpp Wed Jun 23 18:09:54 2010 +0300 @@ -538,10 +538,9 @@ // From MLcSession // ----------------------------------------------------------------------------- // -TBool CMusEngMceSession::SendDialTone( TChar aKey) +TBool CMusEngMceSession::SendDialTone( TChar /*aKey*/) { - MUS_LOG1( "mus: [ENGINE] -> CMusEngMceSession::SendDialTone() %c", - aKey ) + // Handle Key once implemented return ETrue; } diff -r 496ad160a278 -r 53c1c4459a94 mmshplugins/mmshaiwplugin/data/10282389.rss --- a/mmshplugins/mmshaiwplugin/data/10282389.rss Fri Jun 11 13:36:18 2010 +0300 +++ b/mmshplugins/mmshaiwplugin/data/10282389.rss Wed Jun 23 18:09:54 2010 +0300 @@ -56,4 +56,9 @@ }; } }; - } \ No newline at end of file + } + +// end of file + + + diff -r 496ad160a278 -r 53c1c4459a94 tsrc/unittestrunner/eunitdlls_ctc.txt --- a/tsrc/unittestrunner/eunitdlls_ctc.txt Fri Jun 11 13:36:18 2010 +0300 +++ b/tsrc/unittestrunner/eunitdlls_ctc.txt Wed Jun 23 18:09:54 2010 +0300 @@ -22,10 +22,6 @@ ut_muswpadapter.dll 0 -mmsharinguis/mmsharing/mmshindicator/tsrc/ut_indicator/group -ut_musindicator.dll -0 - mmsharinguis/mmsharing/mmshmanagercli/tsrc/ut_managercli/group ut_musmanagerclient.dll 0 @@ -34,6 +30,10 @@ ut_musmanagerserver.dll 0 +mmsharinguis/mmsharing/mmshindicator/tsrc/ut_indicator/group +ut_musindicator.dll +0 + mmsharinguis/mmshplugins/mmcctranscoder/tsrc/ut_transcoder/group ut_transcoder.dll 0