--- a/camerauis/cameraapp/generic/GsCamcorderPlugin/inc/GSCamcorderSettingsBaseView.h Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/GsCamcorderPlugin/inc/GSCamcorderSettingsBaseView.h Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,18 +12,6 @@
* Contributors:
*
* Description: Base class for Photo/Video settings view
-*
-* Copyright (c) 2008 Nokia Corporation.
-* This material, including documentation and any related
-* computer programs, is protected by copyright controlled by
-* Nokia Corporation. All rights are reserved. Copying,
-* including reproducing, storing, adapting or translating, any
-* or all of this material requires the prior written consent of
-* Nokia Corporation. This material also contains confidential
-* information which may not be disclosed to others without the
-* prior written consent of Nokia Corporation.
-*
-*
*/
--- a/camerauis/cameraapp/generic/GsCamcorderPlugin/inc/GSCamcorderSettingsContainer.h Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/GsCamcorderPlugin/inc/GSCamcorderSettingsContainer.h Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,18 +12,6 @@
* Contributors:
*
* Description: Base container for Photo/video settings views
-*
-* Copyright (c) 2008 Nokia Corporation.
-* This material, including documentation and any related
-* computer programs, is protected by copyright controlled by
-* Nokia Corporation. All rights are reserved. Copying,
-* including reproducing, storing, adapting or translating, any
-* or all of this material requires the prior written consent of
-* Nokia Corporation. This material also contains confidential
-* information which may not be disclosed to others without the
-* prior written consent of Nokia Corporation.
-*
-*
*/
--- a/camerauis/cameraapp/generic/GsCamcorderPlugin/src/CamLocationSettingContainer.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/GsCamcorderPlugin/src/CamLocationSettingContainer.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -169,7 +169,7 @@
layoutAreaRect.BoundingRect( statusPaneRect );
// set the layouts for the rect containing the description
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
if ( Layout_Meta_Data::IsLandscapeOrientation() )
{
@@ -203,7 +203,7 @@
TInt lineCount = listLimits.LastRow() + 1;
for ( TInt i = 0; i < lineCount; i++ )
{
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
layout.LayoutText( iSummaryRect.Rect(),
AknLayoutScalable_Apps::main_cset_text2_pane_t1( i ) );
@@ -259,7 +259,7 @@
if ( visibility == CEikScrollBarFrame::EOn )
{
// if scrollbars are used, use scrollbar layout
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
listboxLayoutRect.LayoutRect( listboxRect,
AknLayoutScalable_Apps::main_cset_list_pane( 0 ) );
@@ -272,7 +272,7 @@
}
else
{
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
listboxLayoutRect.LayoutRect( listboxRect,
AknLayoutScalable_Apps::main_cset_list_pane( 1 ) );
@@ -286,7 +286,7 @@
// layout scrollbarpane (will not be visible if not needed)
TAknLayoutRect scrollbarLayoutRect;
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
scrollbarLayoutRect.LayoutRect( listboxRect,
AknLayoutScalable_Apps::scroll_pane_cp028( 0 ) );
@@ -423,7 +423,7 @@
if ( visibility == CEikScrollBarFrame::EOn )
{
// if scrollbars are used, use scrollbar layout
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
listboxLayoutRect.LayoutRect( listboxRect,
AknLayoutScalable_Apps::main_cset_list_pane( 0 ) );
@@ -436,7 +436,7 @@
}
else
{
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
listboxLayoutRect.LayoutRect( listboxRect,
AknLayoutScalable_Apps::main_cset_list_pane( 1 ) );
@@ -450,7 +450,7 @@
// layout scrollbarpane (will not be visible if not needed)
TAknLayoutRect scrollbarLayoutRect;
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
scrollbarLayoutRect.LayoutRect( listboxRect,
AknLayoutScalable_Apps::scroll_pane_cp028( 0 ) );
@@ -526,7 +526,7 @@
// get the rect size for listbox in the layout
TAknLayoutRect listboxLayoutRect;
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
if ( Layout_Meta_Data::IsLandscapeOrientation() )
{
--- a/camerauis/cameraapp/generic/GsCamcorderPlugin/src/CamLocationSettingPage.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/GsCamcorderPlugin/src/CamLocationSettingPage.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -216,7 +216,7 @@
{
CAknSettingPage::SizeChanged();
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
if ( Layout_Meta_Data::IsLandscapeOrientation() )
{
--- a/camerauis/cameraapp/generic/GsCamcorderPlugin/src/GSCamQualitySettingSlider.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/GsCamcorderPlugin/src/GSCamQualitySettingSlider.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -535,7 +535,7 @@
if( iSettingType == ECamSettingItemVideoQuality )
{
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
TouchLayoutVideo();
}
@@ -549,7 +549,7 @@
}
else // iSettingType == ECamSettingItemPhotoQuality
{
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
TouchLayoutPhoto();
}
@@ -653,7 +653,7 @@
// get positioning info
if ( iSettingType == ECamSettingItemVideoQuality )
{
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
layout = GetTouchVideoLegendLayout( Rect(),
i/2 + aNumSliderValues );
@@ -666,7 +666,7 @@
}
else
{
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
if ( IsThreeTicksSlider() )
{
--- a/camerauis/cameraapp/generic/GsCamcorderPlugin/src/GSCamcorderPlugin.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/GsCamcorderPlugin/src/GSCamcorderPlugin.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -97,7 +97,7 @@
iSettingsModel = CCamStaticSettingsModel::NewL( *iConfiguration );
RDebug::Print( _L( "[CGSCamcorderPlugin] Loading resource from :" ) );
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
RDebug::Print( KGSCamcorderPluginResourceFileName );
OpenLocalizedResourceFileL( KGSCamcorderPluginResourceFileName,
--- a/camerauis/cameraapp/generic/GsCamcorderPlugin/src/GSCamcorderSettingsBaseView.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/GsCamcorderPlugin/src/GSCamcorderSettingsBaseView.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,18 +12,6 @@
* Contributors:
*
* Description: Image settings view
-*
-* Copyright (c) 2008 Nokia Corporation.
-* This material, including documentation and any related
-* computer programs, is protected by copyright controlled by
-* Nokia Corporation. All rights are reserved. Copying,
-* including reproducing, storing, adapting or translating, any
-* or all of this material requires the prior written consent of
-* Nokia Corporation. This material also contains confidential
-* information which may not be disclosed to others without the
-* prior written consent of Nokia Corporation.
-*
-*
*/
--- a/camerauis/cameraapp/generic/GsCamcorderPlugin/src/GSCamcorderSettingsContainer.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/GsCamcorderPlugin/src/GSCamcorderSettingsContainer.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,18 +12,6 @@
* Contributors:
*
* Description: Image settings container
-*
-* Copyright (c) 2008 Nokia Corporation.
-* This material, including documentation and any related
-* computer programs, is protected by copyright controlled by
-* Nokia Corporation. All rights are reserved. Copying,
-* including reproducing, storing, adapting or translating, any
-* or all of this material requires the prior written consent of
-* Nokia Corporation. This material also contains confidential
-* information which may not be disclosed to others without the
-* prior written consent of Nokia Corporation.
-*
-*
*/
--- a/camerauis/cameraapp/generic/camerauiconfigmanager/src/CameraUiConfigManager.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/camerauiconfigmanager/src/CameraUiConfigManager.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -129,6 +129,7 @@
EXPORT_C TBool CCameraUiConfigManager::IsDSAViewFinderSupported( TBool aPrimaryCamera ) const
{
RArray<TInt> supportedItems;
+ CleanupClosePushL( supportedItems );
TBool supported ( EFalse );
TRAPD( err,iConfigManagerImp->SupportedSettingItemsL( ECamDynamicSettingDSAViewFinder,
supportedItems ) );
@@ -137,7 +138,7 @@
if ( aPrimaryCamera ) supported = supportedItems[0];
else supported = supportedItems[1];
}
- supportedItems.Close();
+ CleanupStack::PopAndDestroy( &supportedItems );
return supported; // not supported
}
--- a/camerauis/cameraapp/generic/common/inc/CamCaptureSetupListItem.h Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/common/inc/CamCaptureSetupListItem.h Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,17 +12,6 @@
* Contributors:
*
* Description: A list box item with text, a bitmap and a value id
-*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-*
-*
*/
--- a/camerauis/cameraapp/generic/common/inc/CamCollectionManagerAo.h Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/common/inc/CamCollectionManagerAo.h Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,18 +12,6 @@
* Contributors:
*
* Description: Implementation of Asynchronous Operation of Add to Album
-*
-*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
*/
#ifndef __CAMCOLLECTIONMANAGERAO_H__
--- a/camerauis/cameraapp/generic/common/inc/CamLogger.h Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/common/inc/CamLogger.h Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,17 +12,6 @@
* Contributors:
*
* Description: Responsible for logging tests results to one or more files.
-*
-* CCopyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-*
-*
*/
--- a/camerauis/cameraapp/generic/common/inc/camuidconstants.h Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/common/inc/camuidconstants.h Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,17 +12,6 @@
* Contributors:
*
* Description: UID constants needed by the camera application
-*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-*
-*
*/
--- a/camerauis/cameraapp/generic/common/src/CamCaptureSetupListBoxModel.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/common/src/CamCaptureSetupListBoxModel.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -225,6 +225,10 @@
{
iItemArray.AppendL( listItem );
}
+ else
+ {
+ delete listItem;
+ }
CleanupStack::Pop( listItem );
}
@@ -238,7 +242,7 @@
//
void CCamCaptureSetupListBoxModel::ReadLayoutData( TRect aListBoxRect )
{
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
iIconLayoutData.LayoutRect( aListBoxRect,
AknLayoutScalable_Apps::cset_list_set_pane_g3( 0 ) );
--- a/camerauis/cameraapp/generic/common/src/CamCaptureSetupListItem.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/common/src/CamCaptureSetupListItem.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,17 +12,6 @@
* Contributors:
*
* Description: A list box item with text and a bitmap
-*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-*
-*
*/
--- a/camerauis/cameraapp/generic/common/src/CamCaptureSetupListItemDrawer.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/common/src/CamCaptureSetupListItemDrawer.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -552,7 +552,7 @@
//
void CCamCaptureSetupListItemDrawer::ReadLayout()
{
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
iTxtLayout = AknLayoutScalable_Apps::cset_list_set_pane_t1( 0 );
iBmpLayout = AknLayoutScalable_Apps::cset_list_set_pane_g3( 0 );
--- a/camerauis/cameraapp/generic/common/src/CamCollectionManagerAo.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/common/src/CamCollectionManagerAo.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -13,18 +13,6 @@
*
* Description: Implementation of Collection Manager asynchronous operation
*
-
- Copyright (c) 2007 Nokia Corporation.
-* This material, including documentation and any related
-* computer programs, is protected by copyright controlled by
-* Nokia Corporation. All rights are reserved. Copying,
-* including reproducing, storing, adapting or translating, any
-* or all of this material requires the prior written consent of
-* Nokia Corporation. This material also contains confidential
-* information which may not be disclosed to others without the
-* prior written consent of Nokia Corporation.
-*
-*
*/
--- a/camerauis/cameraapp/generic/common/src/CamUtility.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/common/src/CamUtility.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -1532,12 +1532,12 @@
{
PRINT1( _L("Camera => CamUtility::ViewfinderLayout - resolution[%d]"), aResolution );
- TAknWindowLineLayout l = IsNhdDevice()
+ TAknWindowLineLayout l = AknLayoutUtils::PenEnabled()
? ViewfinderLayoutTouch(aMode, aResolution)
: ViewfinderLayoutNonTouch(aMode, aResolution);
TRect screenRect;
- if ( Layout_Meta_Data::IsLandscapeOrientation() || IsNhdDevice() )
+ if ( Layout_Meta_Data::IsLandscapeOrientation() || AknLayoutUtils::PenEnabled() )
{
AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EScreen, screenRect );
}
--- a/camerauis/cameraapp/generic/inc/CamApplicationPane.h Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/inc/CamApplicationPane.h Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,18 +12,6 @@
* Contributors:
*
* Description: Control for containing the NaviPane
-*
-* CCopyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
--- a/camerauis/cameraapp/generic/inc/CamBurstCaptureArray.h Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/inc/CamBurstCaptureArray.h Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,18 +12,6 @@
* Contributors:
*
* Description: A class that represents a set of capture items
-*
-* Copyright © 2007-2008 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
--- a/camerauis/cameraapp/generic/inc/CamBurstCaptureArray.inl Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/inc/CamBurstCaptureArray.inl Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,18 +12,6 @@
* Contributors:
*
* Description: Implementation of CCamBurstCaptureArray
-*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
--- a/camerauis/cameraapp/generic/inc/CamBurstThumbnailContainer.h Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/inc/CamBurstThumbnailContainer.h Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,18 +12,6 @@
* Contributors:
*
* Description: Container for burst thumbnail view
-*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
--- a/camerauis/cameraapp/generic/inc/CamContainerBase.h Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/inc/CamContainerBase.h Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,18 +12,6 @@
* Contributors:
*
* Description: Base class for all camera application containers
-*
-* Copyright © 2007-2008 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
--- a/camerauis/cameraapp/generic/inc/CamLocationIconController.h Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/inc/CamLocationIconController.h Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,18 +12,6 @@
* Contributors:
*
* Description: Header file for CCamLocationIconController class.
-*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
--- a/camerauis/cameraapp/generic/inc/CamModeSetupPaneHandler.h Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/inc/CamModeSetupPaneHandler.h Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,18 +12,6 @@
* Contributors:
*
* Description: Setup pane handler/controller class.
-*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
--- a/camerauis/cameraapp/generic/inc/CamNaviCounterControl.h Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/inc/CamNaviCounterControl.h Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,18 +12,6 @@
* Contributors:
*
* Description: Control for displaying remaining images in navi pane.
-*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
--- a/camerauis/cameraapp/generic/inc/CamNaviCounterModel.h Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/inc/CamNaviCounterModel.h Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,18 +12,6 @@
* Contributors:
*
* Description: Control for displaying remaining images in navi pane.
-*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
--- a/camerauis/cameraapp/generic/inc/CamNaviProgressBarControl.h Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/inc/CamNaviProgressBarControl.h Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,18 +12,6 @@
* Contributors:
*
* Description: Control for displaying remaining images in navi pane.
-*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
--- a/camerauis/cameraapp/generic/inc/CamNaviProgressBarModel.h Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/inc/CamNaviProgressBarModel.h Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,17 +12,6 @@
* Contributors:
*
* Description: Control for displaying recording progress bar in navi pane.
-*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
*/
@@ -46,7 +35,7 @@
class CCamTextItem;
// CONSTANTS
-const TInt KMaxRecordTimeTextLength = 40;
+const TInt KMaxRecordTimeTextLength = 40+3; // +3 for separator " /"
// FORWARD DECLARATIONS
class MAknsSkinInstance;
--- a/camerauis/cameraapp/generic/inc/CamNewFileService.h Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/inc/CamNewFileService.h Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,19 +12,6 @@
* Contributors:
*
* Description: Class for file server service.
-*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-* ---------------------------------------------------------------------------
-*
*/
--- a/camerauis/cameraapp/generic/inc/CamObservable.h Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/inc/CamObservable.h Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,18 +12,6 @@
* Contributors:
*
* Description: Abstract interface for observable classes
-*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
--- a/camerauis/cameraapp/generic/inc/CamObserver.h Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/inc/CamObserver.h Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,18 +12,6 @@
* Contributors:
*
* Description: Abstract interface for observer classes
-*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
--- a/camerauis/cameraapp/generic/inc/CamObserverHandler.h Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/inc/CamObserverHandler.h Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,18 +12,6 @@
* Contributors:
*
* Description: observer handler class
-*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
--- a/camerauis/cameraapp/generic/inc/CamPropertyObserver.h Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/inc/CamPropertyObserver.h Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -13,20 +13,6 @@
*
* Description: Callback interface for CCamPropertyWatcher
*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
-*
-* ---------------------------------------------------------------------------
-*
*/
#ifndef CAMPROPERTYOBSERVER_H
--- a/camerauis/cameraapp/generic/inc/CamPropertyWatcher.h Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/inc/CamPropertyWatcher.h Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -13,17 +13,6 @@
*
* Description: Callback wrapper for Publish and Subscribe
*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
--- a/camerauis/cameraapp/generic/inc/CamZoomPane.h Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/inc/CamZoomPane.h Tue Sep 14 20:46:07 2010 +0300
@@ -182,7 +182,7 @@
* @since 3.0
* @return the zoom pane rect
*/
- TRect Rect() const;
+ TRect Extent() const;
/**
* Called when the parent gains or loses foreground
@@ -405,6 +405,7 @@
TRect iZoomPaneRect;
TRect iSliderParentRect;
+ TRect iExtent;
TPoint iPlusPoint;
TPoint iMinusPoint;
TPoint iTopPoint;
--- a/camerauis/cameraapp/generic/inc/cambackupcontainer.h Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/inc/cambackupcontainer.h Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -13,17 +13,6 @@
*
* Description: Base class for all camera application containers
*
-* Copyright © 2007-2008 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
--- a/camerauis/cameraapp/generic/inc/cambatterypanecontroller.h Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/inc/cambatterypanecontroller.h Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -13,17 +13,6 @@
*
* Description: Header file for CCamBatteryPaneController class.
*
-* Copyright © 2007-2008 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
--- a/camerauis/cameraapp/generic/inc/cambatterypanedrawer.h Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/inc/cambatterypanedrawer.h Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -13,17 +13,6 @@
*
* Description: Header file for CCamBatteryPaneDrawer class.
*
-* Copyright © 2007-2008 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
--- a/camerauis/cameraapp/generic/inc/camflashstatus.h Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/inc/camflashstatus.h Tue Sep 14 20:46:07 2010 +0300
@@ -1,7 +1,5 @@
-
-#ifndef CAMFLASHSTATUS_H
-#define CAMFLASHSTATUS_H/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+/*
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -15,18 +13,10 @@
*
* Description: Header file for CCamFlashStatus class.
*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-*
-*
*/
+#ifndef CAMFLASHSTATUS_H
+#define CAMFLASHSTATUS_H
// ===========================================================================
--- a/camerauis/cameraapp/generic/inc/camlinevfgriddrawer.h Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/inc/camlinevfgriddrawer.h Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -13,17 +13,6 @@
*
* Description: Header file for CCamLineVfGridDrawer class.
*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
--- a/camerauis/cameraapp/generic/inc/camvideotime.h Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/inc/camvideotime.h Tue Sep 14 20:46:07 2010 +0300
@@ -13,16 +13,6 @@
*
* Description: Class for calculating remaining video time
*
-* Copyright © 2008 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-*
-*
*/
--- a/camerauis/cameraapp/generic/src/CamAppController.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamAppController.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -1232,7 +1232,7 @@
// In case settings plugin is being run or mmc dismount is pending
// due to usb activation, we calculate the remaining time here,
// instead of repreparing the engine and getting it from there
- TRAPD( err, iVideoTimeRemaining = CalculateVideoTimeRemainingL() );
+ TRAPD( err, iVideoTimeRemaining = CalculateVideoTimeRemainingL( static_cast < TCamMediaStorage >(CurrentVideoStorageLocation()) ) );
if( KErrNone != err )
{
iVideoTimeRemaining = 0;
@@ -1251,7 +1251,7 @@
else
{
PRINT( _L("Camera <> CCamAppController::RecordTimeRemaining - video mode not yet initialized" ));
- TRAPD( err, iVideoTimeRemaining = CalculateVideoTimeRemainingL() );
+ TRAPD( err, iVideoTimeRemaining = CalculateVideoTimeRemainingL( static_cast < TCamMediaStorage >(CurrentVideoStorageLocation()) ) );
if( KErrNone != err )
{
iVideoTimeRemaining = 0;
@@ -2558,9 +2558,11 @@
if( UiConfigManagerPtr()->IsUIOrientationOverrideSupported() )
{
RArray<TInt> screenModeValues;
+ CleanupClosePushL( screenModeValues );
UiConfigManagerPtr()->SupportedScreenModesL( screenModeValues );
TInt landscapeScreenMode = screenModeValues[0];
SetCameraOrientationModeL( landscapeScreenMode );
+ CleanupStack::PopAndDestroy( &screenModeValues );
}
iCameraController->CompleteSwitchCameraL();
// Force to get a sensor data after switch camera from primary to secondary
@@ -3057,7 +3059,9 @@
}
else
{
- CamPanic(ECamPanicInvalidState);
+ // Memory card and mass storage not accessible. Storage may be locked or corrupted.
+ PRINT1( _L("Camera <> Storage is locked/corrupted. USB personality:%d"), usbPersonality );
+ SwitchToStandbyL( ECamErrMassStorageMode );
}
iIssueModeChangeSequenceSucceeded = EFalse;
@@ -8513,7 +8517,10 @@
{
PRINT( _L( "Camera => CCamAppController::HandleCaptureCompletion()" ) )
- SetOperation( ECamNoOperation );
+ if ( iInfo.iOperation != ECamFocused && iInfo.iOperation != ECamFocusing )
+ {
+ SetOperation( ECamNoOperation );
+ }
// Re-enable screensaver
EnableScreenSaver( ETrue );
--- a/camerauis/cameraapp/generic/src/CamApplicationPane.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamApplicationPane.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -13,16 +13,6 @@
*
* Description: Control for containing the NaviPane
*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
*/
--- a/camerauis/cameraapp/generic/src/CamAppui.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamAppui.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -334,12 +334,15 @@
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
@@ -5489,6 +5492,14 @@
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() )
@@ -7868,7 +7879,7 @@
if ( iViewState != ECamViewStateUserSceneSetup )
{
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
StatusPane()->MakeVisible( aMode == ECamPreCapStandby ||
IsSecondCameraEnabled() &&
--- a/camerauis/cameraapp/generic/src/CamBurstCaptureArray.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamBurstCaptureArray.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -13,17 +13,6 @@
*
* Description: A class that represents a single item in a burst capture
*
-* Copyright © 2007-2008 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
--- a/camerauis/cameraapp/generic/src/CamBurstThumbnailContainer.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamBurstThumbnailContainer.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -96,7 +96,7 @@
TAknLayoutRect burstPaneRect;
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
// use layoutAreaRect for nhd (contains the statuspane)
burstPaneRect.LayoutRect( layoutAreaRect, AknLayoutScalable_Apps::main_cam4_burst_pane() );
--- a/camerauis/cameraapp/generic/src/CamBurstThumbnailGrid.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamBurstThumbnailGrid.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -732,7 +732,7 @@
// CCamAppUi* appUi = static_cast<CCamAppUi*>( iEikonEnv->AppUi() );
TAknLayoutRect burstPaneRect;
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
// use layoutAreaRect for nhd (contains the statuspane)
burstPaneRect.LayoutRect( layoutAreaRect, AknLayoutScalable_Apps::main_cam4_burst_pane() );
--- a/camerauis/cameraapp/generic/src/CamCaptureSetupContainer.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamCaptureSetupContainer.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -148,7 +148,7 @@
// go around the problem
TRect listboxRect;
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
listboxRect = TouchLayout();
}
@@ -327,7 +327,7 @@
TRgb color;
AknsUtils::GetCachedColor( skin, color, KAknsIIDQsnTextColors,
EAknsCIQsnTextColorsCG6 );
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
if( appUi->IsDirectViewfinderActive() &&
iViewFinding && iFullScreenVF )
--- a/camerauis/cameraapp/generic/src/CamCaptureSetupSlider.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamCaptureSetupSlider.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -583,7 +583,7 @@
// We're starting again from scratch, so delete the old legend layouts
iLegendArray.ResetAndDestroy();
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
TouchLayoutL();
}
--- a/camerauis/cameraapp/generic/src/CamCaptureSetupViewBase.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamCaptureSetupViewBase.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -68,6 +68,12 @@
delete iInfoListBoxContainer;
}
}
+
+
+ if( iCaptureSetupControlHandler )
+ {
+ delete iCaptureSetupControlHandler;
+ }
PRINT( _L("Camera <= ~CCamCaptureSetupViewBase") );
}
@@ -553,7 +559,7 @@
CCamAppUiBase* appUi = static_cast<CCamAppUiBase*>( AppUi() );
TRect rect = appUi->ApplicationRect();
- if ( !CamUtility::IsNhdDevice() )
+ if ( !AknLayoutUtils::PenEnabled() )
{
// Space for visible statuspane for non-touch device
AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, rect );
--- a/camerauis/cameraapp/generic/src/CamContainerBase.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamContainerBase.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -622,7 +622,7 @@
AknLayoutUtils::EAknCbaLocationLeft?
AknLayoutUtils::EAknCbaLocationLeft : 0;
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
vidProgressPane.LayoutRect( Rect(),
AknLayoutScalable_Apps::vid4_progress_pane(
@@ -682,7 +682,7 @@
AknLayoutUtils::EAknCbaLocationLeft : 0;
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
vidProgressPane.LayoutRect(
Rect(),
--- a/camerauis/cameraapp/generic/src/CamDecorator.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamDecorator.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -241,7 +241,7 @@
PRINT( _L("Camera => CCamDecorator::CreateRecordingIconL") );
TRect screenRect;
- if ( Layout_Meta_Data::IsLandscapeOrientation() || CamUtility::IsNhdDevice() )
+ if ( Layout_Meta_Data::IsLandscapeOrientation() || AknLayoutUtils::PenEnabled() )
{
AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EScreen, screenRect );
}
@@ -253,7 +253,7 @@
TAknLayoutRect progressPaneLayout;
TAknLayoutRect recIconLayout;
TInt vari = Layout_Meta_Data::IsLandscapeOrientation();
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
progressPaneLayout.LayoutRect( screenRect,
AknLayoutScalable_Apps::vid4_progress_pane( vari ) );
--- a/camerauis/cameraapp/generic/src/CamInfoListBoxContainer.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamInfoListBoxContainer.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -153,7 +153,7 @@
CCamAppUi* appUi = static_cast<CCamAppUi*>( iEikonEnv->AppUi() );
TRect listboxRect;
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
listboxRect = TouchLayout();
}
@@ -329,7 +329,7 @@
PRINT(_L("Camera => CCamInfoListBoxContainer::Draw") )
CWindowGc& gc = SystemGc();
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
TRgb color;
if( iSkinnedBackGround )
--- a/camerauis/cameraapp/generic/src/CamLocationIconController.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamLocationIconController.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -13,17 +13,6 @@
*
* Description: Implemantation for CCamLocationIconController class.
*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
@@ -259,7 +248,7 @@
( ECamPaused == operation ) ||
( ECamResuming == operation ))
{
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
if ( Layout_Meta_Data::IsLandscapeOrientation() )
{
@@ -304,7 +293,7 @@
}
else
{
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
if ( Layout_Meta_Data::IsLandscapeOrientation() )
{
@@ -348,7 +337,7 @@
}
else
{
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
if ( Layout_Meta_Data::IsLandscapeOrientation() )
{
--- a/camerauis/cameraapp/generic/src/CamMemoryMonitor.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamMemoryMonitor.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -58,6 +58,7 @@
iMemoryCheckTimer->Cancel();
delete iMemoryCheckTimer;
}
+ Cancel();
PRINT( _L("Camera <= CCamMemoryMonitor::~CCamMemoryMonitor") )
}
--- a/camerauis/cameraapp/generic/src/CamModeSetupPaneHandler.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamModeSetupPaneHandler.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -13,17 +13,6 @@
*
* Description: Implementation of the mode setup pane handler class.
*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
--- a/camerauis/cameraapp/generic/src/CamNaviCounterControl.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamNaviCounterControl.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -13,17 +13,6 @@
*
* Description: Control for displaying remaining images/videos in Navi Pane
*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
--- a/camerauis/cameraapp/generic/src/CamNaviCounterModel.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamNaviCounterModel.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -13,17 +13,6 @@
*
* Description: Control for displaying remaining images/videos in Navi Pane
*
-* Copyright © 2007-2008 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
@@ -209,7 +198,7 @@
iCamOrientation = appUi->CamOrientation();
- if ( Layout_Meta_Data::IsLandscapeOrientation() || CamUtility::IsNhdDevice() )
+ if ( Layout_Meta_Data::IsLandscapeOrientation() || AknLayoutUtils::PenEnabled() )
{
TSize screenSize;
AknLayoutUtils::LayoutMetricsSize( AknLayoutUtils::EScreen, screenSize );
@@ -222,7 +211,7 @@
iExtent = screenRect;
}
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
TouchLayoutL();
}
@@ -1512,7 +1501,7 @@
// Draw self timer icons, if set to on.
if ( iDrawSelfTimer )
{
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
aGc.SetBrushColor( KRgbWhite );
aGc.SetBrushStyle( CGraphicsContext::ENullBrush );
--- a/camerauis/cameraapp/generic/src/CamNaviProgressBarControl.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamNaviProgressBarControl.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -13,17 +13,6 @@
*
* Description: Control for displaying remaining images/videos in Navi Pane
*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
--- a/camerauis/cameraapp/generic/src/CamNaviProgressBarModel.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamNaviProgressBarModel.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -14,17 +14,6 @@
* Description: Control for displaying elapse/remaining record time
* in Navi Pane
*
-* Copyright (c) 2007-2008 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
@@ -195,7 +184,7 @@
iCamOrientation = appUi->CamOrientation();
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
TouchLayoutL();
}
@@ -254,7 +243,7 @@
// Create component bitmaps
TSize size;
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
size = iProgressIconRect.Rect().Size();
}
@@ -374,7 +363,7 @@
DrawElapsedTimeText( aGc );
DrawRemainingTimeText( aGc, skin );
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
aGc.BitBltMasked( iProgressIconRect.Rect().iTl,
icon, icon->SizeInPixels(), mask, ETrue );
@@ -384,8 +373,11 @@
aGc.BitBltMasked( iVidStorageIconRect.Rect().iTl,
icon, icon->SizeInPixels(), mask, ETrue );
}
-
- DrawProgressBar( aGc );
+ if( CamUtility::IsNhdDevice() )
+ {
+ // VGA layout doesn't use progress bar
+ DrawProgressBar( aGc );
+ }
}
// ---------------------------------------------------------
@@ -551,6 +543,11 @@
time = iRecordTimeRemaining.Int64();
time.FormatL( iRemainingTimeText, *iTimeFormat );
+ if( !CamUtility::IsNhdDevice() )
+ {
+ // VGA layout is using backslash instead of progress bar
+ iElapsedTimeText.Append(_L(" /"));
+ }
if ( iElapsedTimeTextItem )
{
--- a/camerauis/cameraapp/generic/src/CamNewFileService.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamNewFileService.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -13,18 +13,6 @@
*
* Description: Class for file server service.
*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
-*
*/
--- a/camerauis/cameraapp/generic/src/CamObserverHandler.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamObserverHandler.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -13,17 +13,6 @@
*
* Description: Generic handler to be used by Observables
*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
--- a/camerauis/cameraapp/generic/src/CamPostCaptureViewBase.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamPostCaptureViewBase.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -189,6 +189,7 @@
sp->MakeVisible( ETrue );
title->MakeVisible( ETrue );
iContainer->SetRect( AppUi()->ClientRect() );
+ DecrementCameraUsers();
GlxMetadataViewUtility::ActivateViewL( iController.CurrentFullFileName() );
static_cast<CCamContainerBase*>(iContainer)->CheckForFileName( ETrue );
title->MakeVisible( EFalse );
@@ -901,6 +902,7 @@
TBool allowMultipleSelection = ETrue;
RArray<TUint32> selectedAlbumIds;
CleanupClosePushL( selectedAlbumIds );
+ DecrementCameraUsers();
// Launching the Pop-up menu with the list of albums
TRAPD( err, TGlxCollectionSelectionPopup::ShowPopupL(
selectedAlbumIds,
--- a/camerauis/cameraapp/generic/src/CamPreCaptureContainerBase.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamPreCaptureContainerBase.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -1981,7 +1981,7 @@
{
// Draw the resolution indicator
if ( appUi->ActiveCamera() == ECamActiveCameraPrimary
- && ( CamUtility::IsNhdDevice()
+ && ( AknLayoutUtils::PenEnabled()
|| videoOperation == ECamNoOperation ) )
{
iResolutionIndicators[iCurrentIndicator]->Draw( aGc );
@@ -2626,7 +2626,7 @@
if ( iController.UiConfigManagerPtr() &&
iController.UiConfigManagerPtr()->IsAutoFocusSupported() )
{
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
TouchLayout();
}
@@ -2731,7 +2731,7 @@
CCamAppUi* appUi = static_cast<CCamAppUi*>( CEikonEnv::Static()->AppUi() );
TAknLayoutRect resolutionIconLayout;
TAknLayoutRect indicatorPane;
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
TInt variant = Layout_Meta_Data::IsLandscapeOrientation();
if ( appUi->TargetMode() == ECamControllerVideo )
--- a/camerauis/cameraapp/generic/src/CamSettingsModel.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamSettingsModel.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -2246,7 +2246,7 @@
{
TFileName resourceFile;
TParse parse;
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
parse.Set( KCamNhdResourceFileName, &KDC_APP_RESOURCE_DIR, NULL );
}
--- a/camerauis/cameraapp/generic/src/CamShootingModeContainer.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamShootingModeContainer.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -182,7 +182,7 @@
iListBox->DisableSingleClick( ETrue );
TRect listboxRect;
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
listboxRect = TouchLayout();
}
@@ -514,7 +514,7 @@
PRINT(_L("Camera => CCamShootingModeContainer::Draw") )
CWindowGc& gc = SystemGc();
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
TRgb color;
if( iFullySkinned )
@@ -616,7 +616,7 @@
if ( EStdKeyUpArrow == aKeyEvent.iScanCode ||
EStdKeyDownArrow == aKeyEvent.iScanCode )
{
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
ShowTooltipL();
}
@@ -677,6 +677,8 @@
TInt description = R_CAM_SCENE_DESCRIPTION_LANDSCAPE_AUTOFOCUS;
Description = StringLoader::LoadL( description );
User::LeaveIfError( iDescArray.Append( Description ) );
+ delete descr;
+ descr = NULL;
}
else
{
--- a/camerauis/cameraapp/generic/src/CamSidePane.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamSidePane.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -921,7 +921,7 @@
//
void CCamSidePane::UpdateLayout()
{
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
TouchLayout();
}
--- a/camerauis/cameraapp/generic/src/CamUserSceneSetupContainer.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamUserSceneSetupContainer.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -453,7 +453,8 @@
{
if ( aType == EEventKey &&
( aKeyEvent.iScanCode == EStdKeyEnter ||
- aKeyEvent.iScanCode == EStdKeyNkpEnter ) )
+ aKeyEvent.iScanCode == EStdKeyNkpEnter ||
+ aKeyEvent.iScanCode == EStdKeyDevice3 ) ) //Selection key
{
HandleSelectionL();
return EKeyWasConsumed;
--- a/camerauis/cameraapp/generic/src/CamVideoPreCaptureContainer.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamVideoPreCaptureContainer.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -116,7 +116,7 @@
{
AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, rect );
}
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
TInt variant = Layout_Meta_Data::IsLandscapeOrientation();
vidProgressPane.LayoutRect( rect,
@@ -531,7 +531,7 @@
&& appUi->CurrentViewState() == ECamViewStatePreCapture
&& appUi->DrawPreCaptureCourtesyUI()
&& !appUi->IsSecondCameraEnabled()
- && ( CamUtility::IsNhdDevice() || videoOperation == ECamNoOperation )
+ && ( AknLayoutUtils::PenEnabled() || videoOperation == ECamNoOperation )
)
{
iFileTypeIndicator->Draw( aGc );
@@ -581,7 +581,7 @@
{
AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, rect );
}
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
TInt variant = Layout_Meta_Data::IsLandscapeOrientation();
vidProgressPane.LayoutRect( rect,
--- a/camerauis/cameraapp/generic/src/CamViewBase.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamViewBase.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -180,8 +180,8 @@
if( iContainer )
{
if(appUi)
- {
- iContainer->DrawNow( appUi->ZoomPane()->Rect() );
+ {
+ iContainer->DrawNow( appUi->ZoomPane()->Extent() );
}
else
{
--- a/camerauis/cameraapp/generic/src/CamZoomPane.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamZoomPane.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -411,6 +411,10 @@
iIconZoomMarker[0]->SizeInPixels().iHeight *
KDivisorFactor / 2) / KDivisorFactor;
+ // Centralize thumb and slider X-axis.
+ TRect old = TRect(newThumbPos,iIconZoomMarkerCurrent->SizeInPixels());
+ newThumbPos.iX += iSliderParentRect.Center().iX - old.Center().iX;
+
aGc.BitBlt( newThumbPos, iIconZoomMarkerCurrent );
PRINT( _L( "Camera <= CCamZoomPane::DrawThumb " ) );
}
@@ -612,13 +616,13 @@
// -----------------------------------------------------------------------------
// CCamZoomPane::Rect
-// Returns the zoom pane rect
+// Returns the whole zoom pane rect
// -----------------------------------------------------------------------------
//
-TRect CCamZoomPane::Rect() const
+TRect CCamZoomPane::Extent() const
{
- PRINT( _L( "Camera =><= CCamZoomPane::Rect " ) );
- return iZoomPaneRect;
+ PRINT( _L( "Camera =><= CCamZoomPane::Extent " ) );
+ return iExtent;
}
// ---------------------------------------------------------
@@ -629,7 +633,7 @@
{
PRINT( _L( "Camera =><= CCamZoomPane::ReadLayoutL " ) );
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
TouchLayout();
}
@@ -1064,7 +1068,7 @@
void CCamZoomPane::SizeChanged()
{
PRINT( _L( "Camera => CCamZoomPane::SizeChanged" ) );
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
TouchLayout();
}
@@ -1098,18 +1102,21 @@
l = AknLayoutScalable_Apps::cam4_zoom_cont_pane(variant);
area.LayoutRect( iZoomPaneRect, l.LayoutLine() );
iSliderParentRect = area.Rect();
+ iExtent = iSliderParentRect;
l = AknLayoutScalable_Apps::cam4_zoom_pane_g1(variant); // +
area.LayoutRect( iZoomPaneRect, l.LayoutLine() );
AknIconUtils::SetSize( iIconZoomMax[0], area.Rect().Size(),
EAspectRatioNotPreserved );
- iPlusPoint = area.Rect().iTl;
+ iPlusPoint = area.Rect().iTl;
+ iExtent.BoundingRect(area.Rect());
l = AknLayoutScalable_Apps::cam4_zoom_pane_g2(variant); // -
area.LayoutRect( iZoomPaneRect, l.LayoutLine() );
AknIconUtils::SetSize( iIconZoomMin[0], area.Rect().Size(),
EAspectRatioNotPreserved );
- iMinusPoint = area.Rect().iTl;
+ iMinusPoint = area.Rect().iTl;
+ iExtent.BoundingRect(area.Rect());
l = AknLayoutScalable_Apps::cam4_zoom_cont_pane_g1(variant); // Top
area.LayoutRect( iSliderParentRect, l.LayoutLine() );
@@ -1141,6 +1148,20 @@
adj.Move( bottomRect.Center() - adj.Center() );
AknIconUtils::SetSize( iIconZoomMarker[0], adj.Size() );
AknIconUtils::SetSize( iIconZoomMarkerGray[0], adj.Size() );
+
+ if( iPlusPoint.iY < iTopPoint.iY )
+ {
+ // Thumb is drawn further than shaft.
+ // If Max(+) and Min(-) marks are extending shaft,
+ // parent rectangle covers everything.
+ iExtent = iZoomPaneRect;
+ }
+ else
+ {
+ // If marks are drawn right side of shaft,
+ // extend area to redraw.
+ iExtent.Grow(0, adj.Size().iHeight/2);
+ }
}
@@ -1166,18 +1187,21 @@
l = AknLayoutScalable_Apps::cam6_zoom_cont_pane(variant);
area.LayoutRect( iZoomPaneRect, l.LayoutLine() );
iSliderParentRect = area.Rect();
+ iExtent = iSliderParentRect;
l = AknLayoutScalable_Apps::cam6_zoom_pane_g1(variant); // +
area.LayoutRect( iZoomPaneRect, l.LayoutLine() );
AknIconUtils::SetSize( iIconZoomMax[0], area.Rect().Size(),
EAspectRatioNotPreserved );
- iPlusPoint = area.Rect().iTl;
+ iPlusPoint = area.Rect().iTl;
+ iExtent.BoundingRect(area.Rect());
l = AknLayoutScalable_Apps::cam6_zoom_pane_g2(variant); // -
area.LayoutRect( iZoomPaneRect, l.LayoutLine() );
AknIconUtils::SetSize( iIconZoomMin[0], area.Rect().Size(),
EAspectRatioNotPreserved );
- iMinusPoint = area.Rect().iTl;
+ iMinusPoint = area.Rect().iTl;
+ iExtent.BoundingRect(area.Rect());
l = AknLayoutScalable_Apps::cam6_zoom_cont_pane_g1(variant); // Top
area.LayoutRect( iSliderParentRect, l.LayoutLine() );
@@ -1207,6 +1231,20 @@
iZoomPaneRect.iTl.iX += area.Rect().Width()/2;
AknIconUtils::SetSize( iIconZoomMarker[0], area.Rect().Size() );
AknIconUtils::SetSize( iIconZoomMarkerGray[0], area.Rect().Size() );
+
+ if( iPlusPoint.iY < iTopPoint.iY )
+ {
+ // Thumb is drawn further than shaft.
+ // If Max(+) and Min(-) marks are extending shaft,
+ // parent rectangle covers everything.
+ iExtent = iZoomPaneRect;
+ }
+ else
+ {
+ // If marks are drawn right side of shaft,
+ // extend area to redraw.
+ iExtent.Grow(0, area.Rect().Size().iHeight/2);
+ }
}
// ---------------------------------------------------------
--- a/camerauis/cameraapp/generic/src/CamZoomUpdateManager.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamZoomUpdateManager.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -207,12 +207,15 @@
// default values are used in case of error
iCamZoomCooldown = KCamZoomCooldown;
iCamMaxZoomCooldown = KCamMaxZoomCooldown;
- RArray<TInt> delayValues;
+
if( iController.UiConfigManagerPtr() )
{
+ RArray<TInt> delayValues;
+ CleanupClosePushL( delayValues );
iController.UiConfigManagerPtr()->SupportedZoomDelaysL( delayValues );
iCamZoomCooldown = delayValues[0]*1000;
iCamMaxZoomCooldown = delayValues[1]*1000;
+ CleanupStack::PopAndDestroy( &delayValues );
}
}
// End of File
--- a/camerauis/cameraapp/generic/src/cambatterypanecontroller.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/cambatterypanecontroller.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -13,17 +13,6 @@
*
* Description: Implemantation for CCamBatteryPaneController class.
*
-* Copyright © 2007-2008 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
--- a/camerauis/cameraapp/generic/src/cambatterypanedrawer.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/cambatterypanedrawer.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -13,17 +13,6 @@
*
* Description: Implemantation for CCamBatteryPaneDrawer class.
*
-* Copyright © 2007-2008 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
@@ -199,7 +188,7 @@
void CCamBatteryPaneDrawer::LoadLayoutsL()
{
PRINT( _L("Camera => CCamBatteryPaneDrawer::LoadLayoutsL") );
- if ( CamUtility::IsNhdDevice() )
+ if ( AknLayoutUtils::PenEnabled() )
{
TouchLayoutL();
}
--- a/camerauis/cameraapp/generic/src/cameracontroller/camcameracontroller.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/cameracontroller/camcameracontroller.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -3719,6 +3719,11 @@
iInfo.iSnapshotSize = params().iSize;
iInfo.iSnapshotAspectMaintain = params().iMaintainAspect;
+ if( iInfo.iSnapshotSize.iWidth%2 )
+ {
+ //Only even width parameter is accepted
+ iInfo.iSnapshotSize.iWidth++;
+ }
PRINT( _L("Camera <> Prepare snapshot..") );
iSnapshotProvider->PrepareSnapshotL( iInfo.iSnapshotFormat,
iInfo.iSnapshotSize,
@@ -4852,6 +4857,7 @@
else
{
iFirstAfEventReceived = EFalse;
+ iAfInProgress = EFalse;
PRINT( _L("Camera <> CCamCameraController: event KUidECamEventCameraSettingAutoFocusType2 - second time") );
}
}
--- a/camerauis/cameraapp/generic/src/camflashstatus.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/camflashstatus.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -13,17 +13,6 @@
*
* Description: Implemantation for CCamFlashStatus class.
*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
--- a/camerauis/cameraapp/generic/src/camfolderutility.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/camfolderutility.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -13,17 +13,6 @@
*
* Description:
*
-* Copyright © 2007-2008 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
--- a/camerauis/cameraapp/generic/src/camlinevfgriddrawer.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/camlinevfgriddrawer.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -13,17 +13,6 @@
*
* Description: Implemantation for CCamLineVfGridDrawer class.
*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/
@@ -275,6 +264,7 @@
{
// Max used to make sure no div-by-zero
TInt currentY = ((i+indexOffset)*height) / Max(1,aHorizontalLines+countOffset) - KPenHeight/2;
+ currentY += aDrawingRect.iTl.iY; //Offset, due to NHD viewfinder on VGA display
iLineArray.Append( TRect( leftX, currentY, rightX, currentY ) );
i++;
}
--- a/camerauis/cameraapp/generic/src/camstartuplogocontroller.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/camstartuplogocontroller.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -40,6 +40,7 @@
{
PRINT( _L("Camera <> CCamStartupLogoController::~CCamStartupLogoController") );
delete iFailSafeTimer;
+ iObservers.Reset();
}
// ---------------------------------------------------------------------------
--- a/camerauis/cameraapp/generic/src/camvfgridfactory.cpp Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/camvfgridfactory.cpp Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -13,17 +13,6 @@
*
* Description: Implemantation for CCamVfGridFactory class.
*
-* Copyright © 2007 Nokia. All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing,
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
-
-*
-*
*/