FCL/sf/app/camera: comparison camerauis/cameraapp/generic/src/CamAppui.cpp

equal deleted inserted replaced

-:f0c0788c4de2
+:756ad29ed18e
 #include <musresourceproperties.h>
 #include <cameraplatpskeys.h>
 #include <AknCommonDialogsDynMem.h>
 #include <CAknMemorySelectionDialogMultiDrive.h>
-#include <aknmessagequerydialog.h>
 #include "CameraappPrivateCRKeys.h"
 #include "CamAppUi.h"
 #include "CamUtility.h"
 #include "CamAppController.h"
 | ECamCameraEventClassImage
 | ECamCameraEventClassVideo
 | ECamCameraEventClassVfControl
 | ECamCameraEventClassSsControl
 | ECamCameraEventClassSettings );
-/**
-* class CCamFtuDisplay
-* This class is used to give a notification to Camera First Time User regarding the
-* geotagging of captured images or videos.
-*/
-class CCamFtuDisplay : public CAsyncOneShot
-{
-public:
-/**
-* CCamFtuDisplay
-* Default Constructor
-*/
-CCamFtuDisplay( CCamAppUi * aCamAppUi )
-: CAsyncOneShot( CActive::EPriorityLow), iCamAppUi(aCamAppUi)
-{
-}
-enum TEnableCamFtu
-{
-ECamFtuEnable = 0,
-ECamFtuDisable
-};
-protected:
-/**
-* RunL
-* Callback method
-*/
-void RunL()
-{
-iCamAppUi->CamFtuDisplayL();
-}
-private:
-/**
-* iCamAppUi
-* An instance of the CCamAppUi
-*/
-CCamAppUi* iCamAppUi;
-};
 // ===========================================================================
 // Member functions
 delete iScreenClearer;
 delete iVolumeKeyObserver;
 delete iCollectionManager;
 iCollectionManager = NULL;
-if( iCamFtuDisplay )
-{
-delete iCamFtuDisplay;
-iCamFtuDisplay = NULL;
-}
 PRINT( _L("Camera <= ~CCamAppUi" ))
 }
 // -----------------------------------------------------------------------------
 iDSASupported = iController.UiConfigManagerPtr()->IsDSAViewFinderSupported();
 TBool uiOrientationOverride = iController.UiConfigManagerPtr()->IsUIOrientationOverrideSupported();
 // Get the screenmode values used for setting  the orientation
+RArray<TInt> screenModeValues;
 if ( uiOrientationOverride )
 {
-RArray<TInt> screenModeValues;
-CleanupClosePushL( screenModeValues );
 iController.UiConfigManagerPtr()->SupportedScreenModesL( screenModeValues );
 iLandscapeScreenMode = screenModeValues[0];
 iPortraitScreenMode = screenModeValues[1];
-CleanupStack::PopAndDestroy( &screenModeValues );
 }
 // The embedded views are set after ConstructL completes
 // but the value is only of interest if the app is embedded
 iEmbeddedViewSet = !IsEmbedded();
 // TRAP errors so camera starts up even if startup animation fails
 TRAP_IGNORE(iStartupLogoController = CCamStartupLogoController::NewL(EStartupLogoVisible));
 PRINT( _L("Camera <= CCamAppUi::ConstructL") )
 OstTrace0( CAMERAAPP_PERFORMANCE_DETAIL, DUP3_CCAMAPPUI_CONSTRUCTL, "e_CCamAppUi_ConstructL 0" );
+}
-//  To get FTU flag value
-TInt ftuValue=0;
-TInt retErr=0;
-retErr=iRepository->Get( KCamCrFtuMessageFlag, ftuValue );
-if( !IsEmbedded() && ftuValue == CCamFtuDisplay::ECamFtuEnable
-	        && retErr==KErrNone )
-{
-iCamFtuDisplay = new (ELeave)CCamFtuDisplay(this);
-iCamFtuDisplay->Call();
-}
-}
 // -----------------------------------------------------------------------------
 // IsInternalView
 }
 PRINT1( _L("Camera <= CCamAppUi::IsInternalView, return %d"), internal );
 return internal;
 }
-// -----------------------------------------------------------------------------
-// CCamAppUi:: HyperlinkCallback
-// Call back method for the hyper link text
-// -----------------------------------------------------------------------------
-//
-TInt CCamAppUi:: HyperlinkCallback(TAny* aAny)
-{
-(static_cast<CCamAppUi*>(aAny))->OpenSettingView();
-return EFalse;
-}
-// -----------------------------------------------------------------------------
-// CCamAppUi::OpenSettingView
-// Non static public method , to launch the settings view
-// -----------------------------------------------------------------------------
-//
-void CCamAppUi::OpenSettingView()
-{
-TRAP_IGNORE( HandleCommandL( ECamCmdSettings ) );
-}
-// -----------------------------------------------------------------------------
-// CCamAppUi::CamFtuDisplayL()
-// TO Display FTU message for first time camera launched
-// -----------------------------------------------------------------------------
-//
-void CCamAppUi::CamFtuDisplayL()
-{
-	iController.SetIntegerSettingValueL( ECamSettingItemRecLocation, ECamLocationOn );
-CAknMessageQueryDialog* dlg =
-new (ELeave) CAknMessageQueryDialog();
-dlg->PrepareLC( R_FTU_MESSAGE_DIALOG );
-HBufC* msg = iEikonEnv->AllocReadResourceLC( R_FTU_MESSAGE_DIALOG_TEXT );
-HBufC* hyperLinkMsg = iEikonEnv->AllocReadResourceLC(
-R_FTU_MESSAGE_HYPERLINK_TEXT );
-TInt len = msg->Length()
-+ hyperLinkMsg->Length()
-+ KOpeningLinkTag().Length()
-+ KClosingLinkTag().Length();
-HBufC* displayMsg = HBufC::NewLC( len );
-_LIT(KMsgFormat, "%S%S%S%S");
-displayMsg->Des().Format(KMsgFormat,
-msg,
-&KOpeningLinkTag(),
-hyperLinkMsg,
-&KClosingLinkTag());
-dlg->SetMessageTextL( *displayMsg );
-CleanupStack::PopAndDestroy(3); //msg, hyperLinkMsg, displayMsg
-TCallBack callback( HyperlinkCallback, this );
-dlg->SetLink( callback );
-dlg->RunLD();
-iRepository->Set( KCamCrFtuMessageFlag, CCamFtuDisplay::ECamFtuDisable );
-	//Read the location record value in case its changed by hyperlink
-	TInt value = 0;
-	iRepository->Get( KCamCrPhotoStoreLocation, value );
-	iController.SetIntegerSettingValueL( ECamSettingItemRecLocation, value );
-}
 // -----------------------------------------------------------------------------
 // CCamAppUi::IsConstructionComplete
 // Returns whether or not all construction has completed
 // -----------------------------------------------------------------------------
 //
 {
 // stop the timer and remove the indicator from the side pane
 iSelfTimer->Cancel();
 // In capture setup mode, toolbar and indicators are not visible
-// They will be updated when returning to precap, similarily to
+// They will be updated when returning to precap, similar to
-// when setting the self timer mode above
+// when setting the self timer mode above.
-// during changing from still pre-capture view to video pre-capture view, no need
+// Also, during transition from still pre-capture view to video
-// to show toolbar of still image. It will display toolbar of video when entering video pre-capture
+// pre-capture view, there's no need to show toolbar of still image.
+// It will display toolbar of video when entering video pre-capture.
-if( ( iPreCaptureMode != ECamPreCapCaptureSetup &&
+if ( iPreCaptureMode != ECamPreCapCaptureSetup &&
-iPreCaptureMode != ECamPreCapSceneSetting ) &&
+iPreCaptureMode != ECamPreCapSceneSetting )
-!( IsViewFinderInTransit() &&
-iMode == ECamControllerImage &&
-iTargetMode == ECamControllerVideo ) )
 {
 // Re-show the active palette
 iActivePaletteHandler->UpdateActivePaletteL();
 iPreventActivePaletteDisplay = EFalse;
 SetActivePaletteVisibility( ETrue );
 }
 }
 // Cancel any active focusing operation
 // this won't cancel if capture has already been requested
 iController.CancelFocusAndCapture();
 iStillCaptureView->UpdateToolbarIconsL();
 // Raise precapture UI and restart courtesy UI timer,
 // if hide icons is enabled.
 RaisePreCaptureCourtesyUI(EFalse);
 }
 UpdateCba();
-CCamViewBase* precapView = static_cast<CCamViewBase*>( iView );
+}
-if( precapView &&
-IsViewFinderInTransit() &&
-iMode == ECamControllerImage &&
-iTargetMode == ECamControllerVideo )
-{
-precapView->ViewCba()->DrawNow();
-}
-}
 }
 // -----------------------------------------------------------------------------
 // CCamAppUi::SelfTimerEnabled
 // Returns current self-timer state
 iPreventActivePaletteDisplay = ETrue;
 SetActivePaletteVisibility( EFalse );
 // Update CBA
-if ( iSelfTimer && iSelfTimer->IsActive() )
+UpdateCba();
-{
-UpdateCba();
-}
 }
 }
 break;
 // -----------------------------------------------------
 case ECamCmdSelfTimerCancel:
 {
 CCamGSInterface* plugin = CCamGSInterface::NewL( KCamGSPluginUid );
 CleanupStack::PushL( plugin );
 AddViewL( plugin ); // Transfer ownership to AppUi
 CleanupStack::Pop( plugin );
-iController.SetSettingsPlugin( plugin->iDtor_ID_Key );
 iPlugin = plugin;
 }
 break;
 }
 // -----------------------------------------------------
 }
 else if( iViewState == ECamViewStateBurstThumbnail )
 {
 iController.ReleaseArray( ETrue );
 }
-if ( iPreCaptureMode != ECamPreCapTimeLapseSlider && !IsEmbedded() )
+if ( iPreCaptureMode != ECamPreCapTimeLapseSlider )
 {
 iPreCaptureMode = ECamPreCapViewfinder;
 }
 }
 if ( iController.IsProcessingCapture() )
 {
 PRINT( _L("Camera <= CCamAppUi::StartCaptureL - already processing - ignored capture key") );
 return EKeyWasNotConsumed;
 }
+else if( iController.ActiveCamera() == ECamActiveCameraSecondary &&
+iController.IsRotationActive() )
+{
+PRINT( _L("Camera <= CCamAppUi::StartCaptureL - rotation in processing - ignored capture key") );
+return EKeyWasNotConsumed;
+}
 // Start capture
 iController.Capture();
 // Ensure softkeys are correct for sequence
 if ( IsBurstEnabled() )
 OstTrace0( CAMERAAPP_PERFORMANCE_DETAIL, CCAMAPPUI_INTERNALEXITL, "e_CCamAppUi_InternalExitL 1" );
 PRINT( _L("Camera => CCamAppUi::InternalExitL") );
 iController.StoreFaceTrackingValue(); // store the current FT setting
-if ( iMode == ECamControllerVideo )
-{
-// Prevent flickering when returning to default Still image mode
-CCamViewBase* precapView = static_cast<CCamViewBase*>( iView );
-	__ASSERT_DEBUG( precapView, CamPanic( ECamPanicNullPointer ));
-precapView->ViewCba()->MakeVisible( EFalse );
-}
 if ( iController.UiConfigManagerPtr() &&
 iController.UiConfigManagerPtr()->IsLocationSupported() )
 {
 // If record location setting is on, stop location trail
 SetActivePaletteVisibility( EFalse );
 }
 if ( iViewState != ECamViewStateUserSceneSetup )
 {
-	    if ( AknLayoutUtils::PenEnabled() )
+	    if ( CamUtility::IsNhdDevice() )
 	        {
 	        StatusPane()->MakeVisible( aMode == ECamPreCapStandby ||
 	                                   IsSecondCameraEnabled() &&
 	                                   !IsQwerty2ndCamera() ||
 	                                   SettingsLaunchedFromCamera() );

branch	RCL_3
changeset 67	756ad29ed18e
parent 62	f0c0788c4de2