1031 if( appUi->ActiveCamera() == ECamActiveCameraSecondary ) |
1031 if( appUi->ActiveCamera() == ECamActiveCameraSecondary ) |
1032 { |
1032 { |
1033 PRINT( _L("Camera <> CCamPreCaptureViewBase::ExitAllModesL ##" )) |
1033 PRINT( _L("Camera <> CCamPreCaptureViewBase::ExitAllModesL ##" )) |
1034 ExitCaptureSetupMenuModeL(); |
1034 ExitCaptureSetupMenuModeL(); |
1035 } |
1035 } |
1036 if(Id() == TUid::Uid(ECamViewIdVideoPreCapture)) |
1036 if( Id() == TUid::Uid( ECamViewIdVideoPreCapture ) && |
|
1037 iController.UiConfigManagerPtr() && |
|
1038 iController.UiConfigManagerPtr()->IsXenonFlashSupported() ) |
1037 { |
1039 { |
1038 iToolbarExtensionInvisible = ETrue; |
1040 iToolbarExtensionInvisible = ETrue; |
1039 } |
1041 } |
1040 break; |
1042 break; |
1041 } |
1043 } |
1084 if ( iController.IsTouchScreenSupported() ) |
1086 if ( iController.IsTouchScreenSupported() ) |
1085 { |
1087 { |
1086 CAknToolbar* fixedToolbar = Toolbar(); |
1088 CAknToolbar* fixedToolbar = Toolbar(); |
1087 CAknToolbarExtension* extension = fixedToolbar->ToolbarExtension(); |
1089 CAknToolbarExtension* extension = fixedToolbar->ToolbarExtension(); |
1088 |
1090 |
1089 //Only active view will set toolbar extension visibility. |
1091 // Only active view will set toolbar extension visibility. |
1090 |
1092 if( this->IsForeground() ) |
1091 if(this->IsForeground()) |
|
1092 { |
1093 { |
1093 if ( extension && iToolbarExtensionInvisible == EFalse ) |
1094 if ( extension && iToolbarExtensionInvisible == EFalse ) |
1094 { |
1095 { |
1095 extension->SetShown( ETrue ); |
1096 extension->SetShown( ETrue ); |
1096 } |
1097 } |
1097 else if( extension ) |
1098 else if( extension ) |
1098 { |
1099 { |
1099 extension->SetShown( EFalse ); |
1100 extension->SetShown( EFalse ); |
1100 } |
1101 } |
1101 } |
1102 } |
1820 return; |
1821 return; |
1821 } |
1822 } |
1822 |
1823 |
1823 MAknTouchGestureFwPinchEvent *pinch = AknTouchGestureFwEventPinch( aEvent ); |
1824 MAknTouchGestureFwPinchEvent *pinch = AknTouchGestureFwEventPinch( aEvent ); |
1824 CCamAppUi* appUi = static_cast<CCamAppUi*>( iEikonEnv->AppUi() ); |
1825 CCamAppUi* appUi = static_cast<CCamAppUi*>( iEikonEnv->AppUi() ); |
1825 if ( pinch && (ECamNoOperation == iController.CurrentOperation()) && appUi && !appUi->ZoomPane()->IsVisible() ) |
1826 if ( pinch && (ECamNoOperation == iController.CurrentOperation()) && appUi |
|
1827 && !appUi->ZoomPane()->IsCurrentlyZooming() ) |
1826 { |
1828 { |
1827 // Determine the direction of pinch: +ve -> pinch outward / zoom / widen VF |
1829 // Determine the direction of pinch: +ve -> pinch outward / zoom / widen VF |
1828 TInt currMove = pinch->Movement(); |
1830 TInt currMove = pinch->Movement(); |
1829 TBool wide = (currMove > 0) ? ETrue : EFalse; |
1831 TBool wide = (currMove > 0) ? ETrue : EFalse; |
1830 PRINT1( _L("Camera <> CCamPreCaptureViewBase::HandleTouchGestureL - pinch, movement:%d"), currMove ); |
1832 PRINT1( _L("Camera <> CCamPreCaptureViewBase::HandleTouchGestureL - pinch, movement:%d"), currMove ); |
1850 // if the quality level wasn't changed, then disable the blinking |
1852 // if the quality level wasn't changed, then disable the blinking |
1851 container->BlinkResolutionIndicatorOnChange( EFalse ); |
1853 container->BlinkResolutionIndicatorOnChange( EFalse ); |
1852 } |
1854 } |
1853 } |
1855 } |
1854 } |
1856 } |
1855 else if ( EAknTouchGestureFwDoubleTap == aEvent.Type() ) |
1857 else if ( EAknTouchGestureFwDoubleTap == aEvent.Type() |
1856 { |
1858 && ( ECamNoOperation == iController.CurrentOperation() |
1857 PRINT( _L("Camera <> *** double tap event") ); |
1859 || ( ECamCapturing == iController.CurrentOperation() |
|
1860 && iController.CurrentMode() == ECamControllerVideo ) ) ) |
|
1861 { |
|
1862 PRINT( _L("Camera <> double tap event") ); |
1858 CCamAppUi* appUi = static_cast<CCamAppUi*>( iEikonEnv->AppUi() ); |
1863 CCamAppUi* appUi = static_cast<CCamAppUi*>( iEikonEnv->AppUi() ); |
1859 CCamZoomPane *zoomPane = appUi->ZoomPane(); |
1864 CCamZoomPane *zoomPane = appUi->ZoomPane(); |
1860 |
1865 |
1861 CCamPreCaptureContainerBase* container = static_cast<CCamPreCaptureContainerBase*>( iContainer ); |
1866 CCamPreCaptureContainerBase* container = static_cast<CCamPreCaptureContainerBase*>( iContainer ); |
1862 container->ShowZoomPaneWithTimer(); |
1867 container->ShowZoomPaneWithTimer(); |
1863 |
1868 |
1864 // Zoom to max (if not already at max) zoom level, otherwise zoom out to min level |
1869 // Zoom to min (if not already at min) zoom level, otherwise zoom in to max level |
1865 if ( !zoomPane->IsZoomAtMaximum() ) |
1870 if ( !zoomPane->IsZoomAtMinimum() ) |
|
1871 { |
|
1872 PRINT( _L("Camera <> Zooming out to min level") ); |
|
1873 zoomPane->ZoomToMinimum(); |
|
1874 } |
|
1875 else |
1866 { |
1876 { |
1867 PRINT( _L("Camera <> Zooming to max level") ); |
1877 PRINT( _L("Camera <> Zooming to max level") ); |
1868 zoomPane->ZoomToMaximum(); |
1878 zoomPane->ZoomToMaximum(); |
1869 } |
|
1870 else |
|
1871 { |
|
1872 PRINT( _L("Camera <> Zooming out to min level") ); |
|
1873 zoomPane->ZoomToMinimum(); |
|
1874 } |
1879 } |
1875 } |
1880 } |
1876 else |
1881 else |
1877 { |
1882 { |
1878 PRINT1( _L("Camera <> HandleTouchGestureL - gesture not used, type:%d"), aEvent.Type() ); |
1883 PRINT1( _L("Camera <> HandleTouchGestureL - gesture not used, type:%d"), aEvent.Type() ); |