--- a/camera_plat/active_palette_2_api/tsrc/group/ActivePalette2ApiTest.mmp Wed Sep 15 11:51:19 2010 +0300
+++ b/camera_plat/active_palette_2_api/tsrc/group/ActivePalette2ApiTest.mmp Wed Oct 13 14:09:54 2010 +0300
@@ -36,8 +36,8 @@
SOURCE ActivePalette2ApiTestBlocks.cpp ActivePaletteContainer.cpp
LIBRARY euser.lib
-LIBRARY StifTestInterface.lib
-LIBRARY StifTestEngine.lib cone.lib ActivePalette.lib eikcore.lib apgrfx.lib ws32.lib
+LIBRARY stiftestinterface.lib
+LIBRARY stiftestengine.lib cone.lib activepalette.lib eikcore.lib apgrfx.lib ws32.lib
LIBRARY fbscli.lib bitgdi.lib
LANG SC
--- a/camera_plat/camcorder_ui_constants_api/tsrc/group/CamAppPerfTest.mmp Wed Sep 15 11:51:19 2010 +0300
+++ b/camera_plat/camcorder_ui_constants_api/tsrc/group/CamAppPerfTest.mmp Wed Oct 13 14:09:54 2010 +0300
@@ -34,14 +34,14 @@
SOURCE CamAppPerfTestCases.cpp
LIBRARY euser.lib
-LIBRARY StifTestInterface.lib
-LIBRARY StifTestEngine.lib
+LIBRARY stiftestinterface.lib
+LIBRARY stiftestengine.lib
LIBRARY apgrfx.lib
LIBRARY apparc.lib
LIBRARY cone.lib
LIBRARY eikcore.lib
LIBRARY avkon.lib
-LIBRARY CommonEngine.lib
+LIBRARY commonengine.lib
LIBRARY efsrv.lib
LIBRARY estor.lib
LIBRARY ws32.lib
--- a/camerauis/activepalette/Group/ActivePalette2.mmp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/activepalette/Group/ActivePalette2.mmp Wed Oct 13 14:09:54 2010 +0300
@@ -74,7 +74,7 @@
APP_LAYER_SYSTEMINCLUDE
LIBRARY euser.lib cone.lib bitgdi.lib fbscli.lib ws32.lib gdi.lib flogger.lib
-LIBRARY bafl.lib avkon.lib egul.lib AKNSKINS.lib AknIcon.lib
+LIBRARY bafl.lib avkon.lib egul.lib AknSkins.lib AknIcon.lib
#ifdef AP2_USE_3D_RENDERING
LIBRARY hitchcock.lib
#endif
--- a/camerauis/cameraapp/build/cameraapp.mmp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/build/cameraapp.mmp Wed Oct 13 14:09:54 2010 +0300
@@ -254,39 +254,39 @@
// Libraries
LIBRARY ecom.lib
-LIBRARY gsecomplugin.lib
+LIBRARY GSEcomPlugin.lib
LIBRARY euser.lib
LIBRARY apparc.lib
LIBRARY cone.lib
LIBRARY eikcore.lib
LIBRARY eikcoctl.lib
LIBRARY avkon.lib
-LIBRARY CaeEngine.lib
-LIBRARY AKNSKINS.lib
+LIBRARY caeengine.lib
+LIBRARY AknSkins.lib
LIBRARY efsrv.lib
-LIBRARY platformenv.lib // PathInfo
-LIBRARY sysutil.lib
+LIBRARY PlatformEnv.lib // PathInfo
+LIBRARY SysUtil.lib
LIBRARY fbscli.lib
LIBRARY bitgdi.lib
LIBRARY ws32.lib
-LIBRARY CommonEngine.lib
+LIBRARY commonengine.lib
LIBRARY egul.lib
LIBRARY bafl.lib
LIBRARY sendui.lib
LIBRARY CdlEngine.lib
-LIBRARY bitmaptransforms.lib
-LIBRARY CommonDialogs.lib
+LIBRARY BitmapTransforms.lib
+LIBRARY commondialogs.lib
LIBRARY featmgr.lib
LIBRARY ServiceHandler.lib // AIW library
LIBRARY AknIcon.lib
-LIBRARY mediaclientaudio.lib
+LIBRARY MediaClientAudio.lib
LIBRARY eikctl.lib
LIBRARY apgrfx.lib
LIBRARY charconv.lib
LIBRARY hlplch.lib // Help Launcher
-LIBRARY CommonUI.lib // CDocumentHandler
+LIBRARY CommonUi.lib // CDocumentHandler
LIBRARY apmime.lib // TDataType
-LIBRARY centralrepository.lib
+LIBRARY CentralRepository.lib
LIBRARY eikdlg.lib
LIBRARY numberconversion.lib
LIBRARY NewService.lib
@@ -299,10 +299,10 @@
LIBRARY accmonitor.lib
// Remote Controller framework
-LIBRARY remconcoreapi.lib
-LIBRARY remconinterfacebase.lib
+LIBRARY RemConCoreApi.lib
+LIBRARY RemConInterfaceBase.lib
-LIBRARY AknLayout2Scalable.lib
+LIBRARY aknlayout2scalable.lib
LIBRARY gdi.lib
LIBRARY estor.lib // RWriteStream
@@ -317,16 +317,16 @@
LIBRARY ecamoverlay.lib
#endif // CAMERAAPP_CAPI_V2
-LIBRARY imageconversion.lib
-LIBRARY ExifLib.lib // CExifRead
+LIBRARY ImageConversion.lib
+LIBRARY exiflib.lib // CExifRead
LIBRARY hal.lib // HAL, HALData
LIBRARY ecampluginsupport.lib
-LIBRARY sensrvclient.lib
+LIBRARY SensrvClient.lib
LIBRARY sensrvutil.lib
-LIBRARY SVGEngine.lib // For reading share SVGs
+LIBRARY svgengine.lib // For reading share SVGs
#ifdef CAMERAAPP_LOGGING
LIBRARY flogger.lib
@@ -335,14 +335,14 @@
LIBRARY cntmodel.lib
#ifndef __WINSCW__
-LIBRARY LocationTrail.lib
+LIBRARY locationtrail.lib
#ifdef RD_MDS_2_5
LIBRARY locationmanager.lib
#endif //RD_MDS_2_5
#endif //WINSCW
LIBRARY oommonitor.lib
-LIBRARY AknNotify.lib
+LIBRARY aknnotify.lib
LIBRARY imagingconfigmanager.lib
LIBRARY touchfeedback.lib
Binary file camerauis/cameraapp/conf/cameraapp.confml has changed
Binary file camerauis/cameraapp/conf/cameraapp_101FFA86.crml has changed
--- a/camerauis/cameraapp/generic/GsCamcorderPlugin/group/bld.inf Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/GsCamcorderPlugin/group/bld.inf Wed Oct 13 14:09:54 2010 +0300
@@ -32,7 +32,7 @@
START EXTENSION s60/mifconv
OPTION TARGETFILE camerasettingsplugin.mif
OPTION HEADERFILE camerasettingsplugin.mbg
-
+OPTION SOURCEDIR ../icons
OPTION SOURCEFILE iconlist.txt
END
--- a/camerauis/cameraapp/generic/GsCamcorderPlugin/group/gscameraplugin.mmp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/GsCamcorderPlugin/group/gscameraplugin.mmp Wed Oct 13 14:09:54 2010 +0300
@@ -110,8 +110,8 @@
END // Plugin resources
LANGUAGE_IDS
-LIBRARY gsecomplugin.lib
-LIBRARY platformenv.lib // PathInfo
+LIBRARY GSEcomPlugin.lib
+LIBRARY PlatformEnv.lib // PathInfo
LIBRARY euser.lib
LIBRARY ecom.lib
LIBRARY efsrv.lib
@@ -120,23 +120,23 @@
LIBRARY cone.lib
LIBRARY eikcoctl.lib
LIBRARY eikcore.lib
-LIBRARY CommonEngine.lib//For RConeResourceLoader
-LIBRARY gsframework.lib
+LIBRARY commonengine.lib//For RConeResourceLoader
+LIBRARY GSFramework.lib
LIBRARY egul.lib // CGulIcon
-LIBRARY AKNSKINS.lib // AknsUtils.h
+LIBRARY aknskins.lib // AknsUtils.h
LIBRARY centralrepository.lib
-LIBRARY featmgr.lib // Feature manager
+LIBRARY FeatMgr.lib // Feature manager
LIBRARY AknNotify.lib // for CAknGlobalNote.h
LIBRARY AknIcon.lib // AknIconUtils
-LIBRARY gslistbox.lib // For CGSListBoxItemTextArray
+LIBRARY GSListBox.lib // For CGSListBoxItemTextArray
LIBRARY charconv.lib // utf
-LIBRARY CommonDialogs.lib // CAknMemorySelectionDialog
+LIBRARY commondialogs.lib // CAknMemorySelectionDialog
LIBRARY eikctl.lib
LIBRARY NewService.lib
LIBRARY eikdlg.lib
LIBRARY bitgdi.lib
LIBRARY aknlayout2.lib
-LIBRARY AknLayout2Scalable.lib
+LIBRARY aknlayout2scalable.lib
LIBRARY CdlEngine.lib
LIBRARY camerauiconfigmanager.lib
--- a/camerauis/cameraapp/generic/GsCamcorderPlugin/group/iconlist.txt Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/GsCamcorderPlugin/group/iconlist.txt Wed Oct 13 14:09:54 2010 +0300
@@ -1,9 +1,11 @@
-
-
--1 qgn_prop_cams_set_image_tab2.svg
--1 qgn_prop_cams_set_video_tab2.svg
+-c8,8 qgn_lcam_gen_sett_list.svg
+-c8,8 qgn_lcam_gen_sett_camera_folder_image.svg
+-c8,8 qgn_lcam_gen_sett_camera_folder_video.svg
+-1 qgn_lcam_gen_sett_camera_tab_image.svg
+-1 qgn_lcam_gen_sett_camera_tab_video.svg
-c8,8 qgn_prop_set_apps_cams.svg
-c8,8 qgn_prop_set_cams_image_sub.svg
-c8,8 qgn_prop_set_cams_video_sub.svg
-1 qgn_prop_set_mp_video_tab2.svg
+
--- a/camerauis/cameraapp/generic/GsCamcorderPlugin/inc/GSCamcorderSettingsBaseView.h Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/GsCamcorderPlugin/inc/GSCamcorderSettingsBaseView.h Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008 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,6 +12,18 @@
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/GsCamcorderPlugin/inc/GSCamcorderSettingsContainer.h Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008 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,6 +12,18 @@
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/GsCamcorderPlugin/src/CamLocationSettingContainer.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -169,7 +169,7 @@
layoutAreaRect.BoundingRect( statusPaneRect );
// set the layouts for the rect containing the description
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
if ( Layout_Meta_Data::IsLandscapeOrientation() )
{
@@ -203,7 +203,7 @@
TInt lineCount = listLimits.LastRow() + 1;
for ( TInt i = 0; i < lineCount; i++ )
{
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
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 ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
listboxLayoutRect.LayoutRect( listboxRect,
AknLayoutScalable_Apps::main_cset_list_pane( 0 ) );
@@ -272,7 +272,7 @@
}
else
{
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
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 ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
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 ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
listboxLayoutRect.LayoutRect( listboxRect,
AknLayoutScalable_Apps::main_cset_list_pane( 0 ) );
@@ -436,7 +436,7 @@
}
else
{
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
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 ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
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 ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
if ( Layout_Meta_Data::IsLandscapeOrientation() )
{
--- a/camerauis/cameraapp/generic/GsCamcorderPlugin/src/CamLocationSettingPage.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/GsCamcorderPlugin/src/CamLocationSettingPage.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -216,7 +216,7 @@
{
CAknSettingPage::SizeChanged();
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
if ( Layout_Meta_Data::IsLandscapeOrientation() )
{
--- a/camerauis/cameraapp/generic/GsCamcorderPlugin/src/GSCamPhotoSettingsView.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/GsCamcorderPlugin/src/GSCamPhotoSettingsView.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -233,9 +233,9 @@
AknsUtils::SkinInstance(),
KAknsIIDDefault,
fileName,
- EMbmCamerasettingspluginQgn_prop_cams_set_image_tab2,
- EMbmCamerasettingspluginQgn_prop_cams_set_image_tab2 );
-
+ EMbmCamerasettingspluginQgn_lcam_gen_sett_camera_tab_image,
+ EMbmCamerasettingspluginQgn_lcam_gen_sett_camera_tab_image );
+
return icon;
}
--- a/camerauis/cameraapp/generic/GsCamcorderPlugin/src/GSCamQualitySettingSlider.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/GsCamcorderPlugin/src/GSCamQualitySettingSlider.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -535,7 +535,7 @@
if( iSettingType == ECamSettingItemVideoQuality )
{
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
TouchLayoutVideo();
}
@@ -549,7 +549,7 @@
}
else // iSettingType == ECamSettingItemPhotoQuality
{
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
TouchLayoutPhoto();
}
@@ -653,7 +653,7 @@
// get positioning info
if ( iSettingType == ECamSettingItemVideoQuality )
{
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
layout = GetTouchVideoLegendLayout( Rect(),
i/2 + aNumSliderValues );
@@ -666,7 +666,7 @@
}
else
{
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
if ( IsThreeTicksSlider() )
{
--- a/camerauis/cameraapp/generic/GsCamcorderPlugin/src/GSCamcorderPlugin.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/GsCamcorderPlugin/src/GSCamcorderPlugin.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -97,7 +97,7 @@
iSettingsModel = CCamStaticSettingsModel::NewL( *iConfiguration );
RDebug::Print( _L( "[CGSCamcorderPlugin] Loading resource from :" ) );
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
RDebug::Print( KGSCamcorderPluginResourceFileName );
OpenLocalizedResourceFileL( KGSCamcorderPluginResourceFileName,
--- a/camerauis/cameraapp/generic/GsCamcorderPlugin/src/GSCamcorderSettingsBaseView.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/GsCamcorderPlugin/src/GSCamcorderSettingsBaseView.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008 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,6 +12,18 @@
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/GsCamcorderPlugin/src/GSCamcorderSettingsContainer.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008 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,6 +12,18 @@
* 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.
+*
+*
*/
Binary file camerauis/cameraapp/generic/camerauiconfigmanager/conf/camerauiconfigmanager.confml has changed
--- a/camerauis/cameraapp/generic/camerauiconfigmanager/src/CameraUiConfigManager.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/camerauiconfigmanager/src/CameraUiConfigManager.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -129,7 +129,6 @@
EXPORT_C TBool CCameraUiConfigManager::IsDSAViewFinderSupported( TBool aPrimaryCamera ) const
{
RArray<TInt> supportedItems;
- CleanupClosePushL( supportedItems );
TBool supported ( EFalse );
TRAPD( err,iConfigManagerImp->SupportedSettingItemsL( ECamDynamicSettingDSAViewFinder,
supportedItems ) );
@@ -138,7 +137,7 @@
if ( aPrimaryCamera ) supported = supportedItems[0];
else supported = supportedItems[1];
}
- CleanupStack::PopAndDestroy( &supportedItems );
+ supportedItems.Close();
return supported; // not supported
}
--- a/camerauis/cameraapp/generic/common/data/CamAppWide.ra Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/common/data/CamAppWide.ra Wed Oct 13 14:09:54 2010 +0300
@@ -851,16 +851,3 @@
}
*/
-//----------------------------------------------------
-//
-// r_note_added_one_item_album
-// Notification to show when an item was added to an album
-//
-//----------------------------------------------------
-//
-RESOURCE TBUF r_note_added_one_item_album
- {
- buf = qtn_lcam_note_added_one_item_album;
- }
-
-
\ No newline at end of file
--- a/camerauis/cameraapp/generic/common/data/CamAppWideV2.ra Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/common/data/CamAppWideV2.ra Wed Oct 13 14:09:54 2010 +0300
@@ -849,17 +849,3 @@
}
*/
-
-//----------------------------------------------------
-//
-// r_note_added_one_item_album
-// Notification to show when an item was added to an album
-//
-//----------------------------------------------------
-//
-RESOURCE TBUF r_note_added_one_item_album
- {
- buf = qtn_lcam_note_added_one_item_album;
- }
-
-
\ No newline at end of file
--- a/camerauis/cameraapp/generic/common/data/CamStillCaptureCamcorder.ra Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/common/data/CamStillCaptureCamcorder.ra Wed Oct 13 14:09:54 2010 +0300
@@ -905,11 +905,6 @@
},
MENU_ITEM
{
- command = ECamCmdEditPhoto;
- txt = qtn_options_image_editor;
- },
- MENU_ITEM
- {
command = KAiwCmdAssign;
txt = qtn_lcam_use_image_postcapture_menu;
cascade = AIW_INTELLIGENT_CASCADE_ID;
--- a/camerauis/cameraapp/generic/common/data/CamVideoCaptureCamcorder.ra Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/common/data/CamVideoCaptureCamcorder.ra Wed Oct 13 14:09:54 2010 +0300
@@ -956,11 +956,6 @@
},
MENU_ITEM
{
- command = ECamCmdEditVideo;
- txt = qtn_options_video_editor;
- },
- MENU_ITEM
- {
command = ECamCmdShareOnOvi;
// AIW provider fills the menu item title.
// No submenu, only 1 provider acccepted.
--- a/camerauis/cameraapp/generic/common/inc/CamCaptureSetupListItem.h Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/common/inc/CamCaptureSetupListItem.h Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +12,17 @@
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/common/inc/CamCollectionManagerAo.h Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +12,18 @@
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/common/inc/CamLogger.h Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +12,17 @@
* 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/CamSettings.hrh Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/common/inc/CamSettings.hrh Wed Oct 13 14:09:54 2010 +0300
@@ -279,13 +279,6 @@
ESwitchSecondaryOrientation
};
-enum TCamEditorSupport
- {
- ECamNoEditorSupport,
- ECamEditorSupportInToolbar,
- ECamEditorSupportInOptions
- };
-
#ifdef _DEBUG
#ifndef CAMERAAPP_PLUGIN_BUILD
const TUint16* const KCamOrientationNames[] =
--- a/camerauis/cameraapp/generic/common/inc/CameraappPrivateCRKeys.h Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/common/inc/CameraappPrivateCRKeys.h Wed Oct 13 14:09:54 2010 +0300
@@ -87,8 +87,6 @@
// Customise Toolbar keys
const TUint32 KCamCrImageToolbarItems = 0x58;
const TUint32 KCamCrImageToolbarDefaultItems = 0x59;
-//Ftu message key
-const TUint32 KCamCrFtuMessageFlag = 0x60;
//Support for Photo and Video editor
const TUint32 KCamCrPhotoEditorSupport = 0x5A;
--- a/camerauis/cameraapp/generic/common/inc/MCamAddToAlbumObserver.h Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/common/inc/MCamAddToAlbumObserver.h Wed Oct 13 14:09:54 2010 +0300
@@ -44,7 +44,7 @@
* Notification once the asynchronous operations using
* CollectionManager interface have completed.
*/
- virtual void AddToAlbumIdOperationCompleteL() = 0;
+ virtual void AddToAlbumIdOperationComplete() = 0;
};
--- a/camerauis/cameraapp/generic/common/inc/camuidconstants.h Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/common/inc/camuidconstants.h Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +12,17 @@
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/common/src/CamCaptureSetupListBoxModel.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -225,10 +225,6 @@
{
iItemArray.AppendL( listItem );
}
- else
- {
- delete listItem;
- }
CleanupStack::Pop( listItem );
}
@@ -242,7 +238,7 @@
//
void CCamCaptureSetupListBoxModel::ReadLayoutData( TRect aListBoxRect )
{
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
iIconLayoutData.LayoutRect( aListBoxRect,
AknLayoutScalable_Apps::cset_list_set_pane_g3( 0 ) );
--- a/camerauis/cameraapp/generic/common/src/CamCaptureSetupListItem.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/common/src/CamCaptureSetupListItem.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +12,17 @@
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/common/src/CamCaptureSetupListItemDrawer.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -552,7 +552,7 @@
//
void CCamCaptureSetupListItemDrawer::ReadLayout()
{
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/common/src/CamCollectionManagerAo.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +13,18 @@
*
* 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.
+*
+*
*/
@@ -190,7 +202,7 @@
PRINT( _L("Camera <> CCamCollectionManagerAO::DoAddToAlbumOperationL ... Enters Else Loop") );
iAddToAlbum = EFalse;
iSelectedAlbumIds.Reset();
- iObserver.AddToAlbumIdOperationCompleteL();
+ iObserver.AddToAlbumIdOperationComplete();
}
PRINT1( _L("Camera <= CCamCollectionManagerAO::DoAddToAlbumOperationL ... Before leaving iCurrentAlbumIndex (%d)"), iCurrentAlbumIndex )
}
--- a/camerauis/cameraapp/generic/common/src/CamUtility.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/common/src/CamUtility.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -1532,12 +1532,12 @@
{
PRINT1( _L("Camera => CamUtility::ViewfinderLayout - resolution[%d]"), aResolution );
- TAknWindowLineLayout l = AknLayoutUtils::PenEnabled()
+ TAknWindowLineLayout l = IsNhdDevice()
? ViewfinderLayoutTouch(aMode, aResolution)
: ViewfinderLayoutNonTouch(aMode, aResolution);
TRect screenRect;
- if ( Layout_Meta_Data::IsLandscapeOrientation() || AknLayoutUtils::PenEnabled() )
+ if ( Layout_Meta_Data::IsLandscapeOrientation() || IsNhdDevice() )
{
AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EScreen, screenRect );
}
--- a/camerauis/cameraapp/generic/data/cameraapp.rss Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/data/cameraapp.rss Wed Oct 13 14:09:54 2010 +0300
@@ -99,54 +99,5 @@
};
}
-// ---------------------------------------------------------
-//
-// r_ftu_message_dialog_text
-// FTU message dialog text
-// ---------------------------------------------------------
-//
-RESOURCE TBUF r_ftu_message_dialog_text { buf=qtn_lcam_location_ftu_text; }
-
-// ---------------------------------------------------------
-//
-// r_ftu_message_hyperlink_text
-// FTU message hyperlink text
-// ---------------------------------------------------------
-//
-RESOURCE TBUF r_ftu_message_hyperlink_text{ buf=qtn_lcam_location_ftu; }
-
-
-// ---------------------------------------------------------
-//
-// r_ftu_message_dialog
-// The FTU message dialog resource
-// ---------------------------------------------------------
-//
-RESOURCE DIALOG r_ftu_message_dialog
- {
- flags=EEikDialogFlagNoDrag |EEikDialogFlagCbaButtons |EEikDialogFlagWait;
- buttons = R_AVKON_SOFTKEYS_OK_EMPTY;
- items =
- {
- DLG_LINE
- {
- type = EAknCtPopupHeadingPane;
- id = EAknMessageQueryHeaderId;
- control = AVKON_HEADING
- {
- headinglayout = R_AVKON_LIST_HEADING_PANE_POPUPS;
- };
- },
- DLG_LINE
- {
- type = EAknCtMessageQuery;
- id = EAknMessageQueryContentId;
- control = AVKON_MESSAGE_QUERY
- {
- message = "";
- };
- }
- };
- }
// ===========================================================================
// end of file
--- a/camerauis/cameraapp/generic/inc/CamAppController.h Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/CamAppController.h Wed Oct 13 14:09:54 2010 +0300
@@ -363,7 +363,12 @@
* Return whether saving is still in progress.
*/
TBool IsSavingInProgress() const;
-
+
+ /**
+ * Return whether snapshot rotation is still active.
+ */
+ TBool IsRotationActive() const;
+
/**
* Return if settings restore is set pending.
*/
@@ -1424,7 +1429,7 @@
* takes ownership.
* @since S60 v5.0
*/
-void SetSettingsPlugin( TUid aPlugin );
+void SetSettingsPlugin( CCamGSInterface* aPlugin );
/**
* Set viewfinder window for direct screen viewfinder. The handle must remain
@@ -2657,7 +2662,7 @@
TBool iDefineContextSuccessful;
TBool iStorageChangeProcessOngoing;
// own.
- TUid iPlugin;
+ CCamGSInterface* iPlugin;
TBool iSilentProfile;
TInt iTimeLapseCaptureCount;
RFs iFs;
--- a/camerauis/cameraapp/generic/inc/CamAppUi.h Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/CamAppUi.h Wed Oct 13 14:09:54 2010 +0300
@@ -68,8 +68,6 @@
class CCamStillPreCaptureView;
class CCamVideoPreCaptureView;
class CCamMemoryMonitor;
-//FTU message display class
-class CCamFtuDisplay;
class CCamStartupLogoController;
@@ -200,36 +198,16 @@
*/
void FileCheckingCompleteL( TInt aStatus, TInt aError );
- // -------------------------------------------------------
- // New functions
-public:
- /*
- * HyperlinkCallback
- * static methode to be called from TCallback
- */
-
- static TInt HyperlinkCallback( TAny* aAny );
-
- /**
- * CamFtuDisplayL
- * Check if camera is launching for first time ,
- * accordingly FTU Message will be displayed.
- */
- void CamFtuDisplayL();
-
- /**
- * OpenSettingView
- * Non static public method , to launch the settings view
- */
- void OpenSettingView();
-
- /**
- * Returns whether or the toolbar has been activated/visible
- * Will return ETrue when when the toolbar is active/visible
- * @since 3.2
- * @return ETrue if toolbar is active/visible, else returns EFalse
- */
- virtual TBool IsToolBarVisible() const;
+ // -------------------------------------------------------
+ // New functions
+ public:
+ /**
+ * Returns whether or the toolbar has been activated/visible
+ * Will return ETrue when when the toolbar is active/visible
+ * @since 3.2
+ * @return ETrue if toolbar is active/visible, else returns EFalse
+ */
+ virtual TBool IsToolBarVisible() const;
/**
* Check if given view state indicates that "internal",
@@ -1470,7 +1448,7 @@
* Status of the operation are returned using aStatus
* e.g. KErrNone
*/
- void AddToAlbumIdOperationCompleteL() {};
+ void AddToAlbumIdOperationComplete() {};
/**
* From MCamAddToAlbumObserver
@@ -1896,12 +1874,6 @@
CCamStartupLogoController* iStartupLogoController;
TBool iVideoClipPlayInProgress;
-
- /**
- * iCamFtuDisplay
- * An instance of the CCamFtuDisplay class
- */
- CCamFtuDisplay* iCamFtuDisplay;
};
// ===========================================================================
--- a/camerauis/cameraapp/generic/inc/CamApplicationPane.h Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/CamApplicationPane.h Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +12,18 @@
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/CamBurstCaptureArray.h Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2008 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,6 +12,18 @@
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/CamBurstCaptureArray.inl Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +12,18 @@
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/CamBurstThumbnailContainer.h Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +12,18 @@
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/CamContainerBase.h Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2008 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,6 +12,18 @@
* 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/CamGSInterface.h Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/CamGSInterface.h Wed Oct 13 14:09:54 2010 +0300
@@ -36,7 +36,7 @@
*/
void DestroyPlugin();
- public:
+ protected:
/** iDtor_ID_Key Instance identifier key. When instance of an
* implementation is created by ECOM framework, the
* framework will assign UID for it. The UID is used in
--- a/camerauis/cameraapp/generic/inc/CamLocationIconController.h Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/CamLocationIconController.h Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +12,18 @@
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/CamModeSetupPaneHandler.h Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +12,18 @@
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/CamNaviCounterControl.h Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +12,18 @@
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/CamNaviCounterModel.h Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +12,18 @@
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/CamNaviProgressBarControl.h Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +12,18 @@
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/CamNaviProgressBarModel.h Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +12,17 @@
* 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.
+
+*
*/
@@ -35,7 +46,7 @@
class CCamTextItem;
// CONSTANTS
-const TInt KMaxRecordTimeTextLength = 40+3; // +3 for separator " /"
+const TInt KMaxRecordTimeTextLength = 40;
// FORWARD DECLARATIONS
class MAknsSkinInstance;
--- a/camerauis/cameraapp/generic/inc/CamNewFileService.h Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/CamNewFileService.h Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +12,19 @@
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/CamObservable.h Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +12,18 @@
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/CamObserver.h Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +12,18 @@
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/CamObserverHandler.h Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +12,18 @@
* 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/CamPostCaptureViewBase.h Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/CamPostCaptureViewBase.h Wed Oct 13 14:09:54 2010 +0300
@@ -116,7 +116,7 @@
* Status of the operation are returned using aStatus
* e.g. KErrNone
*/
- void AddToAlbumIdOperationCompleteL();
+ void AddToAlbumIdOperationComplete();
/**
* From MCamAddToAlbumObserver
--- a/camerauis/cameraapp/generic/inc/CamPropertyObserver.h Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/CamPropertyObserver.h Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +13,20 @@
*
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/CamPropertyWatcher.h Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +13,17 @@
*
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/CamZoomPane.h Wed Oct 13 14:09:54 2010 +0300
@@ -182,7 +182,7 @@
* @since 3.0
* @return the zoom pane rect
*/
- TRect Extent() const;
+ TRect Rect() const;
/**
* Called when the parent gains or loses foreground
@@ -405,7 +405,6 @@
TRect iZoomPaneRect;
TRect iSliderParentRect;
- TRect iExtent;
TPoint iPlusPoint;
TPoint iMinusPoint;
TPoint iTopPoint;
--- a/camerauis/cameraapp/generic/inc/cambackupcontainer.h Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/cambackupcontainer.h Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2008 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,6 +13,17 @@
*
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/cambatterypanecontroller.h Wed Oct 13 14:09:54 2010 +0300
@@ -13,6 +13,17 @@
*
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/cambatterypanedrawer.h Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2008 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,6 +13,17 @@
*
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/camflashstatus.h Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,7 @@
-/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+
+#ifndef CAMFLASHSTATUS_H
+#define CAMFLASHSTATUS_H/*
+* Copyright (c) 2007 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,10 +15,18 @@
*
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/camlinevfgriddrawer.h Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +13,17 @@
*
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/camvideotime.h Wed Oct 13 14:09:54 2010 +0300
@@ -13,6 +13,16 @@
*
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamAppController.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -593,12 +593,12 @@
iConfiguration = NULL;
RProperty::Delete( KPSUidCamcorderNotifier, KCCorFocused );
- if( TUid::Null() != iPlugin )
- {
- // Destroy Ecom plugin
- REComSession::DestroyedImplementation( iPlugin );
- REComSession::FinalClose();
- }
+ if( iPlugin )
+ {
+ // Destroy Ecom plugin
+ iPlugin->DestroyPlugin();
+ }
+ iPlugin = NULL;
delete iDriveChangeNotifier;
iFs.Close();
@@ -608,6 +608,11 @@
}
delete iSnapShotRotator;
+
+ if( iRotatedSnapshot )
+ {
+ delete iRotatedSnapshot;
+ }
if( iTvAccessoryMonitor )
{
@@ -1232,7 +1237,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( static_cast < TCamMediaStorage >(CurrentVideoStorageLocation()) ) );
+ TRAPD( err, iVideoTimeRemaining = CalculateVideoTimeRemainingL() );
if( KErrNone != err )
{
iVideoTimeRemaining = 0;
@@ -1251,7 +1256,7 @@
else
{
PRINT( _L("Camera <> CCamAppController::RecordTimeRemaining - video mode not yet initialized" ));
- TRAPD( err, iVideoTimeRemaining = CalculateVideoTimeRemainingL( static_cast < TCamMediaStorage >(CurrentVideoStorageLocation()) ) );
+ TRAPD( err, iVideoTimeRemaining = CalculateVideoTimeRemainingL() );
if( KErrNone != err )
{
iVideoTimeRemaining = 0;
@@ -2053,13 +2058,17 @@
// Keep track of the fact we are now leaving saving state
iSaving = EFalse;
- //create thumbnail before harvesting
- if( iConfigManager && iConfigManager->IsThumbnailManagerAPISupported() )
- {
- TRAP_IGNORE( iImageSaveActive->CreateThumbnailsL( *BurstCaptureArray() ) ;
- iImageSaveActive->DoCreateThumbnailL() );
- }
-
+ // try closing video record to free up resources
+ // Test - <eo> commented out, no such direct request supported
+ // TRAP_IGNORE( IssueDirectRequestL( ECamRequestVideoRelease ) );
+
+ // if video post capture is off then force re-prepare so
+ // that remaining record time is updated
+ // REMOVED
+
+ // if using direct viewfinding pause viewfinder
+ // REMOVED
+
// report to LifeBlog
RProperty::Set( KPSUidCamcorderNotifier, KCamLatestFilePath, iSuggestedVideoPath );
// Add to album if this is enabled for videos
@@ -2074,7 +2083,12 @@
{
iImageSaveActive->AddToAlbum( iSuggestedVideoPath, EFalse, defaultAlbumId );
}
-
+
+ //create thumbnail
+ if( iConfigManager && iConfigManager->IsThumbnailManagerAPISupported() )
+ {
+ TRAP_IGNORE( iImageSaveActive->CreateThumbnailsL( *BurstCaptureArray() ) );
+ }
NotifyControllerObservers( ECamEventRecordComplete, aStatus );
SetOperation( ECamNoOperation );
PRINT( _L( "Camera <> calling HandleCaptureCompletion.." ) )
@@ -2552,29 +2566,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
- // when always holding in camera with portrait mode.
- if( iConfigManager
- && iConfigManager->IsOrientationSensorSupported() )
- {
- if( iAccSensorListening )
- {
- iAccSensorListening = EFalse;
- }
- if( iAccSensorChannel )
- {
- delete iAccSensorChannel;
- iAccSensorChannel = NULL;
- }
- TRAP_IGNORE( UpdateSensorApiL( ETrue ) );
- }
// Camera switched.
// a) Set current camera index to the new one.
@@ -4009,7 +4005,6 @@
//
TBool CCamAppController::IsAppUiAvailable() const
{
- PRINT1(_L("Camera <> CCamAppController::IsAppUiAvailable=%d"),iAppUiAvailable);
return iAppUiAvailable;
}
@@ -4786,7 +4781,6 @@
, iImageOrientation( ECamOrientation0 )
, iLastImageOrientation( ECamOrientation0 )
, iLongIdleTimeout( KIdleTimeout * 5 )
- , iPlugin( TUid::Null() )
, iPendingHdmiEvent( ECamHdmiNoEvent )
{
}
@@ -8546,10 +8540,7 @@
{
PRINT( _L( "Camera => CCamAppController::HandleCaptureCompletion()" ) )
- if ( iInfo.iOperation != ECamFocused && iInfo.iOperation != ECamFocusing )
- {
- SetOperation( ECamNoOperation );
- }
+ SetOperation( ECamNoOperation );
// Re-enable screensaver
EnableScreenSaver( ETrue );
@@ -8807,26 +8798,6 @@
PRINT( _L("Camera => CCamAppController::StartLocationTrailL") );
CCamAppUi* appUI = static_cast<CCamAppUi*>( CEikonEnv::Static()->AppUi() );
- if( !iRepository )
- {
- iRepository = CRepository::NewL( KCRUidCameraappSettings );
- }
-
- TInt ftuValue=-1;
- TInt retErr=0;
- retErr = iRepository->Get( KCamCrFtuMessageFlag, ftuValue );
- if( ftuValue == 0 )
- {
- return;
- }
-
- if( iRepository )
- {
- delete iRepository;
- iRepository = NULL;
- }
-
-
// If a stop request is pending but the trail is being restarted, stop
// and delete the timer
if( iLocationTrailTimer )
@@ -10601,6 +10572,22 @@
}
// ---------------------------------------------------------------------------
+// IsRotationActive
+// ---------------------------------------------------------------------------
+//
+TBool CCamAppController::IsRotationActive() const
+ {
+ PRINT( _L("Camera => CCamAppController::IsRotationActive" ));
+ TBool rotationactive=iSnapShotRotator->IsActive();
+ if( !rotationactive && iRotatorAo )
+ {
+ rotationactive=iRotatorAo->IsActive();
+ }
+ PRINT1( _L("Camera <= CCamAppController::IsRotationActive rotationactive=%d" ), rotationactive );
+ return rotationactive;
+ }
+
+// ---------------------------------------------------------------------------
// CapturedImages
// ---------------------------------------------------------------------------
//
@@ -10613,7 +10600,7 @@
//
// -----------------------------------------------------------------------------
//
-void CCamAppController::SetSettingsPlugin( TUid aPlugin )
+void CCamAppController::SetSettingsPlugin( CCamGSInterface* aPlugin )
{
iPlugin = aPlugin;
}
@@ -10941,7 +10928,9 @@
else if( aType == EDriveDismount &&
appUi->IsRecoverableStatus() )
{
+ TInt mmcInserted = 0;
TInt usbPersonality = 0;
+ User::LeaveIfError( RProperty::Get( KPSUidUikon, KUikMMCInserted, mmcInserted ) );
User::LeaveIfError(RProperty::Get(KPSUidUsbWatcher,
KUsbWatcherSelectedPersonality,
usbPersonality) );
@@ -10952,7 +10941,7 @@
{
SwitchToStandbyL( ECamErrMassStorageMode );
}
- else if ( aType == EDriveDismount )
+ else if ( !mmcInserted )
{
SwitchToStandbyL( ECamErrMemoryCardNotInserted );
}
@@ -11253,32 +11242,32 @@
}
if( BurstCaptureArray()->Snapshot( iCurrentImageIndex ) )
{
- // copy snapshot to preserve the original snapshot bitmap
- // first get the handle for the original snapshot bitmap
- CFbsBitmap* snapshot = new (ELeave)CFbsBitmap();
- CleanupStack::PushL( snapshot );
- snapshot->Duplicate( BurstCaptureArray()->Snapshot( iCurrentImageIndex )->Handle() );
- //create a new bitmap with the same dimensions as the original snapshot
- iRotatedSnapshot = new (ELeave)CFbsBitmap();
- iRotatedSnapshot->Create( snapshot->SizeInPixels(), snapshot->DisplayMode() );
- TRect tmpRect( TPoint( 0, 0 ), snapshot->SizeInPixels() );
- TInt tmpLen = tmpRect.Width() * tmpRect.Height() * 4;
- //copy the snapshot data
- iRotatedSnapshot->BeginDataAccess();
- snapshot->BeginDataAccess();
- Mem::Copy( iRotatedSnapshot->DataAddress(), snapshot->DataAddress(), tmpLen );
- iRotatedSnapshot->EndDataAccess();
- snapshot->EndDataAccess();
- // copy the filename
- iRotationArray->SetNextNameL( BurstCaptureArray()->FileName( iCurrentImageIndex ), BurstCaptureArray()->ImageName( iCurrentImageIndex ));
- // rotate the copied snapshot
- if ( !iRotatorAo )
- {
- iRotatorAo = CCamSyncRotatorAo::NewL( *this );
- }
- iRotatorAo->RotateL( iRotatedSnapshot, MapCamOrientation2RotationAngle( iCaptureOrientation ) );
-
- CleanupStack::PopAndDestroy(snapshot);
+ // copy snapshot to preserve the original snapshot bitmap
+ // first get the handle for the original snapshot bitmap
+ CFbsBitmap* snapshot = new (ELeave)CFbsBitmap();
+ CleanupStack::PushL( snapshot );
+ snapshot->Duplicate( BurstCaptureArray()->Snapshot( iCurrentImageIndex )->Handle() );
+ //create a new bitmap with the same dimensions as the original snapshot
+ iRotatedSnapshot = new (ELeave)CFbsBitmap();
+ iRotatedSnapshot->Create( snapshot->SizeInPixels(), snapshot->DisplayMode() );
+ TRect tmpRect( TPoint( 0, 0 ), snapshot->SizeInPixels() );
+ TInt tmpLen = tmpRect.Width() * tmpRect.Height() * 4;
+ //copy the snapshot data
+ iRotatedSnapshot->BeginDataAccess();
+ snapshot->BeginDataAccess();
+ Mem::Copy( iRotatedSnapshot->DataAddress(), snapshot->DataAddress(), tmpLen );
+ iRotatedSnapshot->EndDataAccess();
+ snapshot->EndDataAccess();
+ // copy the filename
+ iRotationArray->SetNextNameL( BurstCaptureArray()->FileName( iCurrentImageIndex ), BurstCaptureArray()->ImageName( iCurrentImageIndex ));
+ // rotate the copied snapshot
+ if ( !iRotatorAo )
+ {
+ iRotatorAo = CCamSyncRotatorAo::NewL( *this );
+ }
+ iRotatorAo->RotateL( iRotatedSnapshot, MapCamOrientation2RotationAngle( iCaptureOrientation ) );
+
+ CleanupStack::PopAndDestroy(snapshot);
}
PRINT( _L( "Camera <= CCamAppController::RotateSnapshotL" ) );
}
--- a/camerauis/cameraapp/generic/src/CamApplicationPane.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamApplicationPane.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +13,16 @@
*
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamAppui.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -63,7 +63,6 @@
#include <AknCommonDialogsDynMem.h>
#include <CAknMemorySelectionDialogMultiDrive.h>
-#include <aknmessagequerydialog.h>
#include "CameraappPrivateCRKeys.h"
#include "CamAppUi.h"
@@ -147,45 +146,7 @@
| 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;
- };
+
// ===========================================================================
@@ -291,12 +252,6 @@
delete iCollectionManager;
iCollectionManager = NULL;
- if( iCamFtuDisplay )
- {
- delete iCamFtuDisplay;
- iCamFtuDisplay = NULL;
- }
-
PRINT( _L("Camera <= ~CCamAppUi" ))
}
@@ -334,15 +289,12 @@
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
@@ -710,20 +662,7 @@
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();
- }
- }
+ }
@@ -755,73 +694,9 @@
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
@@ -1018,16 +893,13 @@
iSelfTimer->Cancel();
// In capture setup mode, toolbar and indicators are not visible
- // They will be updated when returning to precap, similarily to
- // when setting the self timer mode above
- // during changing from still pre-capture view to video pre-capture view, no need
- // to show toolbar of still image. It will display toolbar of video when entering video pre-capture
-
- if( ( iPreCaptureMode != ECamPreCapCaptureSetup &&
- iPreCaptureMode != ECamPreCapSceneSetting ) &&
- !( IsViewFinderInTransit() &&
- iMode == ECamControllerImage &&
- iTargetMode == ECamControllerVideo ) )
+ // They will be updated when returning to precap, similar to
+ // when setting the self timer mode above.
+ // Also, during transition from still pre-capture view to video
+ // 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 &&
+ iPreCaptureMode != ECamPreCapSceneSetting )
{
// Re-show the active palette
iActivePaletteHandler->UpdateActivePaletteL();
@@ -1045,24 +917,16 @@
// 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();
- }
- }
+ }
}
// -----------------------------------------------------------------------------
@@ -1614,10 +1478,7 @@
SetActivePaletteVisibility( EFalse );
// Update CBA
- if ( iSelfTimer && iSelfTimer->IsActive() )
- {
- UpdateCba();
- }
+ UpdateCba();
}
}
break;
@@ -3894,7 +3755,6 @@
CleanupStack::PushL( plugin );
AddViewL( plugin ); // Transfer ownership to AppUi
CleanupStack::Pop( plugin );
- iController.SetSettingsPlugin( plugin->iDtor_ID_Key );
iPlugin = plugin;
}
break;
@@ -4091,7 +3951,7 @@
{
iController.ReleaseArray( ETrue );
}
- if ( iPreCaptureMode != ECamPreCapTimeLapseSlider && !IsEmbedded() )
+ if ( iPreCaptureMode != ECamPreCapTimeLapseSlider )
{
iPreCaptureMode = ECamPreCapViewfinder;
}
@@ -5180,7 +5040,12 @@
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();
@@ -5493,14 +5358,6 @@
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() )
@@ -7880,7 +7737,7 @@
if ( iViewState != ECamViewStateUserSceneSetup )
{
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
StatusPane()->MakeVisible( aMode == ECamPreCapStandby ||
IsSecondCameraEnabled() &&
--- a/camerauis/cameraapp/generic/src/CamBurstCaptureArray.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamBurstCaptureArray.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2008 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,6 +13,17 @@
*
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamBurstThumbnailContainer.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -96,7 +96,7 @@
TAknLayoutRect burstPaneRect;
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
// 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamBurstThumbnailGrid.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -732,7 +732,7 @@
// CCamAppUi* appUi = static_cast<CCamAppUi*>( iEikonEnv->AppUi() );
TAknLayoutRect burstPaneRect;
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
// use layoutAreaRect for nhd (contains the statuspane)
burstPaneRect.LayoutRect( layoutAreaRect, AknLayoutScalable_Apps::main_cam4_burst_pane() );
--- a/camerauis/cameraapp/generic/src/CamBurstThumbnailView.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamBurstThumbnailView.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -716,7 +716,7 @@
iAiwServiceHandler->AttachMenuL( R_CAM_BURST_THUMBNAIL_MENU,
R_CAM_MOVE_TO_STILL_IMAGE_SEQUENCE_INTEREST );
- if ( iController.IntegerSettingValue(ECamSettingItemPhotoEditorSupport) != ECamNoEditorSupport )
+ if ( iController.IntegerSettingValue(ECamSettingItemPhotoEditorSupport) )
{
iAiwServiceHandler->AttachMenuL( R_CAM_BURST_THUMBNAIL_MENU,
R_CAM_SET_AS_CALL_IMAGE_INTEREST_EDITOR );
--- a/camerauis/cameraapp/generic/src/CamCaptureSetupContainer.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamCaptureSetupContainer.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -148,7 +148,7 @@
// go around the problem
TRect listboxRect;
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
listboxRect = TouchLayout();
}
@@ -327,7 +327,7 @@
TRgb color;
AknsUtils::GetCachedColor( skin, color, KAknsIIDQsnTextColors,
EAknsCIQsnTextColorsCG6 );
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
if( appUi->IsDirectViewfinderActive() &&
iViewFinding && iFullScreenVF )
--- a/camerauis/cameraapp/generic/src/CamCaptureSetupSlider.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamCaptureSetupSlider.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -583,7 +583,7 @@
// We're starting again from scratch, so delete the old legend layouts
iLegendArray.ResetAndDestroy();
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
TouchLayoutL();
}
@@ -636,7 +636,7 @@
{
// Set the shaft layout and icon size for Contrast slider
iShaftLayout.LayoutRect( sliderRect,
- AknLayoutScalable_Apps::cset_slider_pane( 5 ) );
+ AknLayoutScalable_Apps::cset_slider_pane( 7 ) );
// set Contrast slider legend layouts
TouchContrastLayoutL( sliderRect );
}
--- a/camerauis/cameraapp/generic/src/CamCaptureSetupViewBase.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamCaptureSetupViewBase.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -68,12 +68,6 @@
delete iInfoListBoxContainer;
}
}
-
-
- if( iCaptureSetupControlHandler )
- {
- delete iCaptureSetupControlHandler;
- }
PRINT( _L("Camera <= ~CCamCaptureSetupViewBase") );
}
@@ -559,7 +553,7 @@
CCamAppUiBase* appUi = static_cast<CCamAppUiBase*>( AppUi() );
TRect rect = appUi->ApplicationRect();
- if ( !AknLayoutUtils::PenEnabled() )
+ if ( !CamUtility::IsNhdDevice() )
{
// Space for visible statuspane for non-touch device
AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, rect );
--- a/camerauis/cameraapp/generic/src/CamContainerBase.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamContainerBase.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2009 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"
@@ -394,12 +394,7 @@
aKeyEvent.iCode == EKeyOK &&
aKeyEvent.iRepeats == 0 )
{
- if( !iController.IsDemandKeyRelease() )
- {
- // Forward selection key event if button has been released
- // after last video capture
- iView.HandleCommandL( EAknSoftkeySelect );
- }
+ iView.HandleCommandL( EAknSoftkeySelect );
return EKeyWasConsumed; // indicate key press was processed
}
// stop video or sequence if get applications key press (short or long)
@@ -627,7 +622,7 @@
AknLayoutUtils::EAknCbaLocationLeft?
AknLayoutUtils::EAknCbaLocationLeft : 0;
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
vidProgressPane.LayoutRect( Rect(),
AknLayoutScalable_Apps::vid4_progress_pane(
@@ -687,7 +682,7 @@
AknLayoutUtils::EAknCbaLocationLeft : 0;
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
vidProgressPane.LayoutRect(
Rect(),
--- a/camerauis/cameraapp/generic/src/CamDecorator.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamDecorator.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -241,7 +241,7 @@
PRINT( _L("Camera => CCamDecorator::CreateRecordingIconL") );
TRect screenRect;
- if ( Layout_Meta_Data::IsLandscapeOrientation() || AknLayoutUtils::PenEnabled() )
+ if ( Layout_Meta_Data::IsLandscapeOrientation() || CamUtility::IsNhdDevice() )
{
AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EScreen, screenRect );
}
@@ -253,7 +253,7 @@
TAknLayoutRect progressPaneLayout;
TAknLayoutRect recIconLayout;
TInt vari = Layout_Meta_Data::IsLandscapeOrientation();
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
progressPaneLayout.LayoutRect( screenRect,
AknLayoutScalable_Apps::vid4_progress_pane( vari ) );
--- a/camerauis/cameraapp/generic/src/CamInfoListBoxContainer.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamInfoListBoxContainer.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -153,7 +153,7 @@
CCamAppUi* appUi = static_cast<CCamAppUi*>( iEikonEnv->AppUi() );
TRect listboxRect;
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
listboxRect = TouchLayout();
}
@@ -329,7 +329,7 @@
PRINT(_L("Camera => CCamInfoListBoxContainer::Draw") )
CWindowGc& gc = SystemGc();
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
TRgb color;
if( iSkinnedBackGround )
@@ -597,15 +597,7 @@
case EEventItemSingleClicked:
{
TInt settingValue = CurrentSettingItemValue();
-
- if ( iView.Id().iUid == ECamViewIdPhotoUserSceneSetup )
- {
- iController.PreviewSettingChangeL( ECamSettingItemUserSceneLightSensitivity, settingValue );
- }
- else
- {
- iController.PreviewSettingChangeL( ECamSettingItemDynamicPhotoLightSensitivity, settingValue );
- }
+ iController.PreviewSettingChangeL( ECamSettingItemDynamicPhotoLightSensitivity, settingValue );
}
break;
default:
--- a/camerauis/cameraapp/generic/src/CamLocationIconController.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamLocationIconController.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -13,6 +13,17 @@
*
* 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.
+
+*
+*
*/
@@ -248,7 +259,7 @@
( ECamPaused == operation ) ||
( ECamResuming == operation ))
{
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
if ( Layout_Meta_Data::IsLandscapeOrientation() )
{
@@ -293,7 +304,7 @@
}
else
{
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
if ( Layout_Meta_Data::IsLandscapeOrientation() )
{
@@ -337,7 +348,7 @@
}
else
{
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
if ( Layout_Meta_Data::IsLandscapeOrientation() )
{
--- a/camerauis/cameraapp/generic/src/CamModeSetupPaneHandler.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamModeSetupPaneHandler.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +13,17 @@
*
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamNaviCounterControl.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +13,17 @@
*
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamNaviCounterModel.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -13,6 +13,17 @@
*
* 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.
+
+*
+*
*/
@@ -198,7 +209,7 @@
iCamOrientation = appUi->CamOrientation();
- if ( Layout_Meta_Data::IsLandscapeOrientation() || AknLayoutUtils::PenEnabled() )
+ if ( Layout_Meta_Data::IsLandscapeOrientation() || CamUtility::IsNhdDevice() )
{
TSize screenSize;
AknLayoutUtils::LayoutMetricsSize( AknLayoutUtils::EScreen, screenSize );
@@ -211,7 +222,7 @@
iExtent = screenRect;
}
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
TouchLayoutL();
}
@@ -1501,7 +1512,7 @@
// Draw self timer icons, if set to on.
if ( iDrawSelfTimer )
{
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
aGc.SetBrushColor( KRgbWhite );
aGc.SetBrushStyle( CGraphicsContext::ENullBrush );
--- a/camerauis/cameraapp/generic/src/CamNaviProgressBarControl.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamNaviProgressBarControl.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +13,17 @@
*
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamNaviProgressBarModel.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2009 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,6 +14,17 @@
* 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.
+
+*
+*
*/
@@ -184,7 +195,7 @@
iCamOrientation = appUi->CamOrientation();
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
TouchLayoutL();
}
@@ -243,7 +254,7 @@
// Create component bitmaps
TSize size;
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
size = iProgressIconRect.Rect().Size();
}
@@ -363,7 +374,7 @@
DrawElapsedTimeText( aGc );
DrawRemainingTimeText( aGc, skin );
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
aGc.BitBltMasked( iProgressIconRect.Rect().iTl,
icon, icon->SizeInPixels(), mask, ETrue );
@@ -373,11 +384,8 @@
aGc.BitBltMasked( iVidStorageIconRect.Rect().iTl,
icon, icon->SizeInPixels(), mask, ETrue );
}
- if( CamUtility::IsNhdDevice() )
- {
- // VGA layout doesn't use progress bar
- DrawProgressBar( aGc );
- }
+
+ DrawProgressBar( aGc );
}
// ---------------------------------------------------------
@@ -543,11 +551,6 @@
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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamNewFileService.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -13,6 +13,18 @@
*
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamObserverHandler.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +13,17 @@
*
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamPostCaptureViewBase.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -37,7 +37,7 @@
#include <akntoolbar.h>
#include <aknbutton.h>
#include <StringLoader.h>
-#include <aknnotewrappers.h>
+
#include "Cam.hrh"
#include "CamUtility.h"
@@ -189,7 +189,6 @@
sp->MakeVisible( ETrue );
title->MakeVisible( ETrue );
iContainer->SetRect( AppUi()->ClientRect() );
- DecrementCameraUsers();
GlxMetadataViewUtility::ActivateViewL( iController.CurrentFullFileName() );
static_cast<CCamContainerBase*>(iContainer)->CheckForFileName( ETrue );
title->MakeVisible( EFalse );
@@ -218,8 +217,6 @@
break;
case KAiwCmdEdit:
case ECamCmdEdit:
- case ECamCmdEditPhoto:
- case ECamCmdEditVideo:
{
CAiwGenericParamList& inputParams = iAiwServiceHandler->InParamListL();
TPtrC currentFullFileName(iController.CurrentFullFileName());
@@ -585,8 +582,7 @@
{
fixedToolbar->SetToolbarObserver( this );
UpdateToolbarIconsL();
- if( Id().iUid != ECamViewIdVideoPostCapture && !appui->IsSelfTimedCapture() &&
- !iController.SavedCurrentImage() )
+ if( Id().iUid != ECamViewIdVideoPostCapture && !appui->IsSelfTimedCapture() )
{
fixedToolbar->SetDimmed(ETrue);
}
@@ -902,7 +898,6 @@
TBool allowMultipleSelection = ETrue;
RArray<TUint32> selectedAlbumIds;
CleanupClosePushL( selectedAlbumIds );
- DecrementCameraUsers();
// Launching the Pop-up menu with the list of albums
TRAPD( err, TGlxCollectionSelectionPopup::ShowPopupL(
selectedAlbumIds,
@@ -965,17 +960,12 @@
}
/*
-* CCamPostCaptureViewBase::AddToAlbumIdOperationCompleteL()
+* CCamPostCaptureViewBase::AddToAlbumIdOperationComplete()
*/
-void CCamPostCaptureViewBase::AddToAlbumIdOperationCompleteL()
+void CCamPostCaptureViewBase::AddToAlbumIdOperationComplete()
{
- PRINT( _L("Camera => CCamPostCaptureViewBase::AddToAlbumIdOperationCompleteL() ... SUCCESS ") );
+ PRINT( _L("Camera => CCamPostCaptureViewBase::AddToAlbumIdOperationComplete() ... SUCCESS ") );
iAddToAlbumRequestOngoing = EFalse;
-
- HBufC* infoText = StringLoader::LoadL( R_NOTE_ADDED_ONE_ITEM_ALBUM );
- CAknConfirmationNote* confNote = new( ELeave ) CAknConfirmationNote( ETrue );
- confNote->ExecuteLD( *infoText );
-
}
--- a/camerauis/cameraapp/generic/src/CamPreCaptureContainerBase.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamPreCaptureContainerBase.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -1981,7 +1981,7 @@
{
// Draw the resolution indicator
if ( appUi->ActiveCamera() == ECamActiveCameraPrimary
- && ( AknLayoutUtils::PenEnabled()
+ && ( CamUtility::IsNhdDevice()
|| videoOperation == ECamNoOperation ) )
{
iResolutionIndicators[iCurrentIndicator]->Draw( aGc );
@@ -2633,7 +2633,7 @@
if ( iController.UiConfigManagerPtr() &&
iController.UiConfigManagerPtr()->IsAutoFocusSupported() )
{
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
TouchLayout();
}
@@ -2738,7 +2738,7 @@
CCamAppUi* appUi = static_cast<CCamAppUi*>( CEikonEnv::Static()->AppUi() );
TAknLayoutRect resolutionIconLayout;
TAknLayoutRect indicatorPane;
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
TInt variant = Layout_Meta_Data::IsLandscapeOrientation();
if ( appUi->TargetMode() == ECamControllerVideo )
@@ -2936,8 +2936,7 @@
iDrawIndicator = ETrue;
}
- CCamAppUi* appUi = static_cast<CCamAppUi*>( iEikonEnv->AppUi() );
- if ( iCaptureButtonContainer && !( appUi && appUi->SelfTimerEnabled() ) )
+ if ( iCaptureButtonContainer )
{
iCaptureButtonContainer->SetCaptureButtonShown( EFalse );
}
--- a/camerauis/cameraapp/generic/src/CamPreCaptureViewBase.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamPreCaptureViewBase.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -558,7 +558,7 @@
( iController.CurrentOperation() != ECamCapturing && iController.CurrentOperation() != ECamPaused ) );
TBool precaptureToolbarState = !appUi->IsBurstEnabled()
- && !iStandbyModeActive && !appUi->IsInPretendExit() && !iController.IsKeyLockOn();
+ && !iStandbyModeActive && !appUi->IsInPretendExit();
if ( ( ECamCameraPreparedImage == iController.CameraState() ||
showVideoModeToolbar ) &&
@@ -1877,8 +1877,7 @@
}
else if ( EAknTouchGestureFwDoubleTap == aEvent.Type()
&& ( ECamNoOperation == iController.CurrentOperation()
- || ( ( ECamCapturing == iController.CurrentOperation()
- || ECamPaused == iController.CurrentOperation() )
+ || ( ECamCapturing == iController.CurrentOperation()
&& iController.CurrentMode() == ECamControllerVideo ) ) )
{
PRINT( _L("Camera <> double tap event") );
--- a/camerauis/cameraapp/generic/src/CamSettingsModel.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamSettingsModel.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -2246,7 +2246,7 @@
{
TFileName resourceFile;
TParse parse;
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
parse.Set( KCamNhdResourceFileName, &KDC_APP_RESOURCE_DIR, NULL );
}
--- a/camerauis/cameraapp/generic/src/CamShootingModeContainer.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamShootingModeContainer.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -182,7 +182,7 @@
iListBox->DisableSingleClick( ETrue );
TRect listboxRect;
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
listboxRect = TouchLayout();
}
@@ -514,7 +514,7 @@
PRINT(_L("Camera => CCamShootingModeContainer::Draw") )
CWindowGc& gc = SystemGc();
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
TRgb color;
if( iFullySkinned )
@@ -616,7 +616,7 @@
if ( EStdKeyUpArrow == aKeyEvent.iScanCode ||
EStdKeyDownArrow == aKeyEvent.iScanCode )
{
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
ShowTooltipL();
}
@@ -674,11 +674,9 @@
{
// the description of the icon
HBufC* Description;
- TInt DescResouceId = R_CAM_SCENE_DESCRIPTION_LANDSCAPE_AUTOFOCUS;
- Description = StringLoader::LoadL( DescResouceId );
+ 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamSidePane.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -921,7 +921,7 @@
//
void CCamSidePane::UpdateLayout()
{
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
TouchLayout();
}
--- a/camerauis/cameraapp/generic/src/CamStillPostCaptureView.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamStillPostCaptureView.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -289,60 +289,28 @@
ROID(R_CAM_STILL_POST_CAPTURE_MENUBAR_ID));
}
}
- /*if ( iController.IsTouchScreenSupported() )
- {
- if ( appUi->IsSecondCameraEnabled() )
- {
- if ( iOneClickUploadUtility->OneClickUploadSupported() )
- {
- TInt resourceId = appUi->IsQwerty2ndCamera()?
- R_CAM_STILL_POSTCAPTURE_TOOLBAR_LANDSCAPE_UPLOAD:
- R_CAM_STILL_POSTCAPTURE_TOOLBAR_PORTRAIT_UPLOAD;
- //CreateAndSetToolbarL( resourceId );
- }
- else
- {
- TInt resourceId = appUi->IsQwerty2ndCamera()?
- R_CAM_STILL_POSTCAPTURE_TOOLBAR_LANDSCAPE:
- R_CAM_STILL_POSTCAPTURE_TOOLBAR_PORTRAIT;
- CreateAndSetToolbarL( resourceId );
- }
- }
- else
- {
- if ( iOneClickUploadUtility->OneClickUploadSupported() )
- {
- CreateAndSetToolbarL(
- R_CAM_STILL_POSTCAPTURE_TOOLBAR_UPLOAD );
- }
- else
- {
- CreateAndSetToolbarL(
- R_CAM_STILL_POSTCAPTURE_TOOLBAR );
- }
- }
- }*/
iAiwServiceHandler->Reset();
CCamPostCaptureViewBase::DoActivateL(
aPreViewId, aCustomMessageId, aCustomMessage );
PERF_EVENT_END_L2( EPerfEventStillPostCaptureViewActivation );
- //iAiwServiceHandler->Reset();
- // attach interest for PRINT from Active Toolbar
+
+ // Attach interest for PRINT from Active Toolbar
iAiwServiceHandler->AttachL( R_CAM_MOVE_TO_STILL_IMAGE_INTEREST_AT );
iAiwServiceHandler->AttachMenuL( ROID(R_CAM_STILL_POST_CAPTURE_MENU_ID),
R_CAM_MOVE_TO_STILL_IMAGE_INTEREST );
+ // Attach share interest: toolbar item
iAiwServiceHandler->AttachMenuL( ROID( R_CAM_STILL_POST_CAPTURE_MENU_ID),
R_CAM_SHARE_ON_OVI_INTEREST );
- // SHARE_AIW
+ // Attach share interest: menu item
iAiwServiceHandler->AttachMenuL( ROID( R_CAM_STILL_POST_CAPTURE_MENU_ID),
R_CAM_AIW_VIEW_INTEREST );
- if ( iController.IntegerSettingValue(ECamSettingItemPhotoEditorSupport) != ECamNoEditorSupport )
+ if ( iController.IntegerSettingValue(ECamSettingItemPhotoEditorSupport) )
{
iAiwServiceHandler->AttachMenuL( ROID( R_CAM_STILL_POST_CAPTURE_MENU_ID),
R_CAM_SET_AS_CALL_IMAGE_INTEREST_EDITOR );
@@ -558,34 +526,46 @@
if ( aResourceId == ROID( R_CAM_STILL_POST_CAPTURE_MENU_ID ) ||
aResourceId == ROID( R_CAM_STILL_POST_CAPTURE_OK_MENU_ID ) )
{
+ TBool showSend = ETrue;
+ TBool showSendToCaller = EFalse;
+
+/*#ifndef __WINS__
+ if ( iSFIUtils->IsCLIValidL() )
+ {
+ showSend = EFalse;
+ showSendToCaller = ETrue;
+ }
+#endif*/
+
+ TCamOrientation orientation =
+ static_cast<CCamAppUiBase*>( AppUi() )->CamOrientation();
+
+ if ( orientation == ECamOrientationCamcorder ||
+ orientation == ECamOrientationCamcorderLeft ||
+ orientation == ECamOrientationPortrait )
+ {
+ showSend = EFalse;
+ showSendToCaller = EFalse;
+ }
+
TInt itemPos = 0;
if ( aMenuPane->MenuItemExists( ECamCmdSendToCallerMultimedia, itemPos ) )
{
aMenuPane->SetItemDimmed(
- ECamCmdSendToCallerMultimedia, ETrue );
+ ECamCmdSendToCallerMultimedia, !showSendToCaller );
}
- TInt editorSupport = iController.IntegerSettingValue(ECamSettingItemPhotoEditorSupport);
-
- if( editorSupport == ECamNoEditorSupport ||
- editorSupport == ECamEditorSupportInOptions )
+ if(iController.IntegerSettingValue(ECamSettingItemPhotoEditorSupport))
{
- if ( aMenuPane->MenuItemExists( ECamCmdSend, itemPos ) )
- {
- aMenuPane->SetItemDimmed(
- ECamCmdSend, ETrue );
- }
- }
- if( editorSupport == ECamNoEditorSupport ||
- editorSupport == ECamEditorSupportInToolbar )
- {
- if ( aMenuPane->MenuItemExists( ECamCmdEditPhoto, itemPos ) )
- {
- aMenuPane->SetItemDimmed(
- ECamCmdEditPhoto, ETrue );
- }
- }
-
+ showSend = ETrue;
+ }
+
+ if ( aMenuPane->MenuItemExists( ECamCmdSend, itemPos ) )
+ {
+ aMenuPane->SetItemDimmed(
+ ECamCmdSend, !showSend );
+ }
+
/*
* MSK : ContextOptions --> We just hide Help and Exit from the Options Menu when
* the MSK is pressed in the postcapture still view
@@ -656,8 +636,7 @@
}
else
{
- TInt editorSupport = iController.IntegerSettingValue(ECamSettingItemPhotoEditorSupport);
- if( editorSupport == ECamEditorSupportInToolbar )
+ if(iController.IntegerSettingValue(ECamSettingItemPhotoEditorSupport))
{
aToolbar->RemoveItem( ECamCmdSend );
CAknButton* editButton = dynamic_cast<CAknButton*>(aToolbar->ControlOrNull( ECamCmdEdit ));
--- a/camerauis/cameraapp/generic/src/CamSyncRotatorAo.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamSyncRotatorAo.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -96,8 +96,11 @@
//
void CCamSyncRotatorAo::RotateL( CFbsBitmap* aBitmap, CBitmapRotator::TRotationAngle aRotation )
{
- iRotator->Rotate( &iStatus, *aBitmap, aRotation );
- SetActive();
+ if( !IsActive() )
+ {
+ iRotator->Rotate( &iStatus, *aBitmap, aRotation );
+ SetActive();
+ }
}
// -----------------------------------------------------------------------------
--- a/camerauis/cameraapp/generic/src/CamUserSceneSetupContainer.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamUserSceneSetupContainer.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -453,8 +453,7 @@
{
if ( aType == EEventKey &&
( aKeyEvent.iScanCode == EStdKeyEnter ||
- aKeyEvent.iScanCode == EStdKeyNkpEnter ||
- aKeyEvent.iScanCode == EStdKeyDevice3 ) ) //Selection key
+ aKeyEvent.iScanCode == EStdKeyNkpEnter ) )
{
HandleSelectionL();
return EKeyWasConsumed;
--- a/camerauis/cameraapp/generic/src/CamUserSceneSetupViewBase.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamUserSceneSetupViewBase.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -290,7 +290,7 @@
// To background
else if( !aForeground )
{
- iNotifierPopupShowing = appUi->AppInBackground( ETrue ) && !appUi->AppInBackground( EFalse );
+ iNotifierPopupShowing = appUi->AppInBackground( ETrue );
PRINT( _L("Camera <> CCamUserSceneSetupViewBase::HandleForegroundEventL dec engine count") );
// Register that we nolonger need the engine
if( !iNotifierPopupShowing )
--- a/camerauis/cameraapp/generic/src/CamVideoPostCaptureView.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamVideoPostCaptureView.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -240,43 +240,13 @@
}
CCamAppUi* appUi = static_cast<CCamAppUi*>( AppUi() );
- /*if ( iController.IsTouchScreenSupported() )
- {
- if ( appUi->IsSecondCameraEnabled() )
- {
- if ( iOneClickUploadUtility->OneClickUploadSupported() )
- {
- TInt resourceId = appUi->IsQwerty2ndCamera()?
- R_CAM_VIDEO_POSTCAPTURE_TOOLBAR_LANDSCAPE_UPLOAD:
- R_CAM_VIDEO_POSTCAPTURE_TOOLBAR_PORTRAIT_UPLOAD;
- CreateAndSetToolbarL( resourceId );
- }
- else
- {
- TInt resourceId = appUi->IsQwerty2ndCamera()?
- R_CAM_VIDEO_POSTCAPTURE_TOOLBAR_LANDSCAPE:
- R_CAM_VIDEO_POSTCAPTURE_TOOLBAR_PORTRAIT;
- CreateAndSetToolbarL( resourceId );
- }
- }
- else
- {
- if ( iOneClickUploadUtility->OneClickUploadSupported() )
- {
- CreateAndSetToolbarL( R_CAM_VIDEO_POSTCAPTURE_TOOLBAR_UPLOAD );
- }
- else
- {
- CreateAndSetToolbarL( R_CAM_VIDEO_POSTCAPTURE_TOOLBAR );
- }
- }
- }*/
-
iAiwServiceHandler->Reset();
+
+ // Attach share interest: toolbar item
iAiwServiceHandler->AttachMenuL( ROID( R_CAM_VIDEO_POST_CAPTURE_MENU_ID ),
R_CAM_SHARE_ON_OVI_INTEREST );
- // SHARE_AIW
+ // Attach share interest: menu item
iAiwServiceHandler->AttachMenuL( ROID( R_CAM_VIDEO_POST_CAPTURE_MENU_ID),
R_CAM_AIW_VIEW_INTEREST );
@@ -314,7 +284,7 @@
{
}
}
- if ( iController.IntegerSettingValue(ECamSettingItemVideoEditorSupport) != ECamNoEditorSupport )
+ if ( iController.IntegerSettingValue(ECamSettingItemVideoEditorSupport) )
{
iAiwServiceHandler->AttachMenuL( ROID( R_CAM_VIDEO_POST_CAPTURE_MENU_ID ),
R_CAM_SET_AS_RING_TONE_INTEREST_EDITOR );
@@ -476,32 +446,53 @@
if ( aResourceId == ROID( R_CAM_VIDEO_POST_CAPTURE_MENU_ID ) ||
aResourceId == ROID( R_CAM_VIDEO_POST_CAPTURE_OK_MENU_ID ) )
{
+ TBool showSend = ETrue;
+ TBool showSendToCaller = EFalse;
+
+/*#ifndef __WINS__
+ if ( iSFIUtils->IsCLIValidL() )
+ {
+ showSend = EFalse;
+ showSendToCaller = ETrue;
+
+ if ( iController.IntegerSettingValue( ECamSettingItemVideoQuality )
+ == ECamVideoQualityHigh )
+ {
+ showSendToCaller = EFalse;
+ }
+ }
+#endif*/
+
+ if ( !iController.IsTouchScreenSupported() ||
+ !iOneClickUploadUtility->OneClickUploadSupported() )
+ {
+ // In non-touch UI Send/Send to caller are always in AP.
+ // No need for Options menu items.
+
+ // If 1-click upload is not supported in touch UI, then there is
+ // a send button in the fixed toolbar. There is no need to
+ // have it in Options menu.
+ showSend = EFalse;
+ showSendToCaller = EFalse;
+ }
if( aMenuPane->MenuItemExists( ECamCmdSendToCallerMultimedia, itemPos ) )
{
aMenuPane->SetItemDimmed(
- ECamCmdSendToCallerMultimedia, ETrue );
+ ECamCmdSendToCallerMultimedia, !showSendToCaller );
}
- TInt editorSupport = iController.IntegerSettingValue(ECamSettingItemPhotoEditorSupport);
-
- if( editorSupport == ECamNoEditorSupport ||
- editorSupport == ECamEditorSupportInOptions )
+
+ if(iController.IntegerSettingValue(ECamSettingItemVideoEditorSupport))
{
- if ( aMenuPane->MenuItemExists( ECamCmdSend, itemPos ) )
- {
- aMenuPane->SetItemDimmed(
- ECamCmdSend, ETrue );
- }
- }
- if( editorSupport == ECamNoEditorSupport ||
- editorSupport == ECamEditorSupportInToolbar )
- {
- if ( aMenuPane->MenuItemExists( ECamCmdEditPhoto, itemPos ) )
- {
- aMenuPane->SetItemDimmed(
- ECamCmdEditPhoto, ETrue );
- }
- }
+ showSend = ETrue;
+ }
+
+ if( aMenuPane->MenuItemExists( ECamCmdSend, itemPos ) )
+ {
+ aMenuPane->SetItemDimmed(
+ ECamCmdSend, !showSend );
+ }
+
/*
* MSK : ContextOptions --> We just hide Help and Exit from the Options Menu when
* the MSK is pressed in the postcapture still view
@@ -573,8 +564,7 @@
}
else
{
- TInt editorSupport = iController.IntegerSettingValue(ECamSettingItemPhotoEditorSupport);
- if( editorSupport == ECamEditorSupportInToolbar )
+ if(iController.IntegerSettingValue(ECamSettingItemVideoEditorSupport))
{
aToolbar->RemoveItem( ECamCmdSend );
CAknButton* editButton = dynamic_cast<CAknButton*>(aToolbar->ControlOrNull( ECamCmdEdit ));
--- a/camerauis/cameraapp/generic/src/CamVideoPreCaptureContainer.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamVideoPreCaptureContainer.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -116,7 +116,7 @@
{
AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, rect );
}
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
TInt variant = Layout_Meta_Data::IsLandscapeOrientation();
vidProgressPane.LayoutRect( rect,
@@ -531,7 +531,7 @@
&& appUi->CurrentViewState() == ECamViewStatePreCapture
&& appUi->DrawPreCaptureCourtesyUI()
&& !appUi->IsSecondCameraEnabled()
- && ( AknLayoutUtils::PenEnabled() || videoOperation == ECamNoOperation )
+ && ( CamUtility::IsNhdDevice() || videoOperation == ECamNoOperation )
)
{
iFileTypeIndicator->Draw( aGc );
@@ -581,7 +581,7 @@
{
AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, rect );
}
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
TInt variant = Layout_Meta_Data::IsLandscapeOrientation();
vidProgressPane.LayoutRect( rect,
--- a/camerauis/cameraapp/generic/src/CamViewBase.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamViewBase.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -180,8 +180,8 @@
if( iContainer )
{
if(appUi)
- {
- iContainer->DrawNow( appUi->ZoomPane()->Extent() );
+ {
+ iContainer->DrawNow( appUi->ZoomPane()->Rect() );
}
else
{
@@ -515,13 +515,6 @@
SetStandbyModeActive(ETrue);
- UpdateCbaL();
- if ( Cba() )
- {
- Cba()->DrawNow();
- }
-
-
// Release the camera hardware
iController.ReleaseCamera();
--- a/camerauis/cameraapp/generic/src/CamZoomPane.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamZoomPane.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -411,10 +411,6 @@
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 " ) );
}
@@ -616,13 +612,13 @@
// -----------------------------------------------------------------------------
// CCamZoomPane::Rect
-// Returns the whole zoom pane rect
+// Returns the zoom pane rect
// -----------------------------------------------------------------------------
//
-TRect CCamZoomPane::Extent() const
+TRect CCamZoomPane::Rect() const
{
- PRINT( _L( "Camera =><= CCamZoomPane::Extent " ) );
- return iExtent;
+ PRINT( _L( "Camera =><= CCamZoomPane::Rect " ) );
+ return iZoomPaneRect;
}
// ---------------------------------------------------------
@@ -633,7 +629,7 @@
{
PRINT( _L( "Camera =><= CCamZoomPane::ReadLayoutL " ) );
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
TouchLayout();
}
@@ -1068,7 +1064,7 @@
void CCamZoomPane::SizeChanged()
{
PRINT( _L( "Camera => CCamZoomPane::SizeChanged" ) );
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
TouchLayout();
}
@@ -1102,21 +1098,18 @@
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;
- iExtent.BoundingRect(area.Rect());
+ iPlusPoint = area.Rect().iTl;
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;
- iExtent.BoundingRect(area.Rect());
+ iMinusPoint = area.Rect().iTl;
l = AknLayoutScalable_Apps::cam4_zoom_cont_pane_g1(variant); // Top
area.LayoutRect( iSliderParentRect, l.LayoutLine() );
@@ -1148,20 +1141,6 @@
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);
- }
}
@@ -1187,21 +1166,18 @@
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;
- iExtent.BoundingRect(area.Rect());
+ iPlusPoint = area.Rect().iTl;
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;
- iExtent.BoundingRect(area.Rect());
+ iMinusPoint = area.Rect().iTl;
l = AknLayoutScalable_Apps::cam6_zoom_cont_pane_g1(variant); // Top
area.LayoutRect( iSliderParentRect, l.LayoutLine() );
@@ -1231,20 +1207,6 @@
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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamZoomUpdateManager.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -207,15 +207,12 @@
// 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/cambatterypanecontroller.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -13,6 +13,17 @@
*
* 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.
+
+*
+*
*/
@@ -169,7 +180,6 @@
}
-
// ---------------------------------------------------------------------------
// CCamBatteryPaneController::SetBatteryStrength
// ---------------------------------------------------------------------------
--- a/camerauis/cameraapp/generic/src/cambatterypanedrawer.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/cambatterypanedrawer.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2008 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,6 +13,17 @@
*
* 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.
+
+*
+*
*/
@@ -188,7 +199,7 @@
void CCamBatteryPaneDrawer::LoadLayoutsL()
{
PRINT( _L("Camera => CCamBatteryPaneDrawer::LoadLayoutsL") );
- if ( AknLayoutUtils::PenEnabled() )
+ if ( CamUtility::IsNhdDevice() )
{
TouchLayoutL();
}
--- a/camerauis/cameraapp/generic/src/camcapturebuttoncontainer.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/camcapturebuttoncontainer.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -285,6 +285,13 @@
TRect boundingRect( iCaptureRect );
boundingRect.Move( -boundingRect.iTl.iX, -boundingRect.iTl.iY );
+ // Clear the window
+ aGc.SetPenStyle( CGraphicsContext::ENullPen );
+ aGc.SetBrushStyle( CGraphicsContext::ESolidBrush );
+ aGc.SetDrawMode( CGraphicsContext::EDrawModeWriteAlpha );
+ aGc.SetBrushColor( TRgb::Color16MA( 0 ) );
+ aGc.Clear( boundingRect );
+
if ( iCaptureButtonPressed )
{
aGc.BitBltMasked( iCaptureRect.iTl, iCaptureIconPressed, boundingRect, iCaptureIconPressedMask, EFalse );
--- a/camerauis/cameraapp/generic/src/cameracontroller/camcameracontroller.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/cameracontroller/camcameracontroller.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -3719,11 +3719,6 @@
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,
@@ -4857,7 +4852,6 @@
else
{
iFirstAfEventReceived = EFalse;
- iAfInProgress = EFalse;
PRINT( _L("Camera <> CCamCameraController: event KUidECamEventCameraSettingAutoFocusType2 - second time") );
}
}
--- a/camerauis/cameraapp/generic/src/cameracontroller/camimagedecoder.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/cameracontroller/camimagedecoder.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -231,6 +231,9 @@
CleanupStack::PopAndDestroy( frameBuffer );
if ( !IsActive() )
{
+ iStatus=KRequestPending;
+ TRequestStatus *pS=(&iStatus);
+ User::RequestComplete(pS,0);
SetActive();
}
--- a/camerauis/cameraapp/generic/src/camflashstatus.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/camflashstatus.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +13,17 @@
*
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/camfolderutility.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2008 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,6 +13,17 @@
*
* 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/camlinevfgriddrawer.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +13,17 @@
*
* 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.
+
+*
+*
*/
@@ -264,7 +275,6 @@
{
// 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 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/camstartuplogocontroller.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -40,7 +40,6 @@
{
PRINT( _L("Camera <> CCamStartupLogoController::~CCamStartupLogoController") );
delete iFailSafeTimer;
- iObservers.Reset();
}
// ---------------------------------------------------------------------------
--- a/camerauis/cameraapp/generic/src/camvfgridfactory.cpp Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/camvfgridfactory.cpp Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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,6 +13,17 @@
*
* 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.
+
+*
+*
*/
Binary file camerauis/cameraapp/help/data/xhtml.zip has changed
--- a/camerauis/cameraapp/loc/cam.loc Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/loc/cam.loc Wed Oct 13 14:09:54 2010 +0300
@@ -845,27 +845,27 @@
//d:Item text for flash auto value
//d:Visible in set_up lists
-//l:cset_list_set_pane_t1
+//l:main_cam5_pane_t1
//
#define qtn_lcam_set_auto "Automatic"
//d:Item text for flash forced value
//d:Visible in set_up lists
-//l:cset_list_set_pane_t1
+//l:main_cam5_pane_t1
//
#define qtn_lcam_set_force "On"
//d:Item text for flash off value
//d:Visible in set_up lists
-//l:cset_list_set_pane_t1
+//l:main_cam5_pane_t1
//
#define qtn_lcam_set_flash_off "Off"
//d:Item text for flash redeye reduction value
//d:Visible in set_up lists
-//l:cset_list_set_pane_t1
-//
-#define qtn_lcam_set_redeye "Red eye reduction"
+//l:main_cam5_pane_t1
+//
+#define qtn_lcam_set_redeye "Red eye redu."
//----------------------------------------------------
@@ -4278,94 +4278,6 @@
//l: cell_tb_ext_pane_t1/opt1
#define qtn_lcam_tb_switch "Switch"
-//d: Options menu item for accessing the Photo editor
-//d: Visible in options menu of still post capture view
-//l: list_single_pane_t1_cp2
-#define qtn_options_image_editor "Image Editor"
-
-//d: Options menu item for accessing the Video editor
-//d: Visible in options menu of video post capture view
-//l: list_single_pane_t1_cp2
-#define qtn_options_video_editor "Video Editor"
-
-//d: Title string of Low FPS video recording note
-//d: Visible in discreet popup during low fps video recording
-//l: popup_discreet_window_t1
-#define qtn_lcam_note_low_fps "Low FPS detected"
-
-//d: Body string of Low FPS video recording note
-//d: Visible in discreet popup during low fps video recording
-//l: popup_discreet_window_t2
-#define qtn_lcam_note_low_fps_help_link "See help"
-
-//d: Description string for close up video shooting mode
-//d: Visible in video scene mode summary
-//l: popup_preview_text_window/opt5
-#define qtn_lcam_scene_vid_close_up_ex "Ideal for filming small objects between 10 and 60 cm"
-
-//d: Description string for strong backlight video shooting mode
-//d: Visible in video scene mode summary
-//l: popup_preview_text_window/opt5
-#define qtn_lcam_scene_vid_backlight_ex "Ideal when capturing subjects with strong backlight"
-
-//d: Description string for concert video shooting mode
-//d: Visible in video scene mode summary
-//l: popup_preview_text_window/opt5
-#define qtn_lcam_scene_vid_concert_ex "Ideal when capturing live concert on stage"
-
-//d: Backlight list item in video scene view
-//d: Visible in video scene mode list box
-//l: list_set_graphic_pane_t1
-#define qtn_lcam_scene_vid_backlight "Backlight"
-
-//d: Concert list item in video scene view
-//d: Visible in video scene mode list box
-//l: list_set_graphic_pane_t1
-#define qtn_lcam_scene_vid_concert "Concert"
-
-//d: Confirmation note shown when the user adds one item to an album
-//l: popup_note_window
-#define qtn_lcam_note_added_one_item_album "Added"
-
-//d:Video quality setting description
-//d:Visible in video quality slider control.
-//l: main_cam5_pane_t4/opt1
-#define qtn_lcam_descr_quality_highdefinition_30fps "Best quality for playback on high-definition televisions. 30fps HD 1280x720."
-
-//d:Video quality setting description
-//d:Visible in video quality slider control.
-//l: main_cam5_pane_t4/opt1
-#define qtn_lcam_descr_quality_highdefinition_reduced "For playback on high definition displays, with reduced storage memory consumption"
-
-//d:Video quality setting description
-//d:Visible in video quality slider control.
-//l: main_cam5_pane_t4/opt1
-#define qtn_lcam_descr_quality_widescreen_wvga "High quality for playback in 16:9 aspect ratio"
-
-//d: Settings list item body text
-//l: list_set_graphic_pane_t1
-#define qtn_lcam_set_type_highdefinition_reduced "High definition, reduced storage requirements"
-
-//d: Settings list item body text
-//l: list_set_graphic_pane_t1
-#define qtn_lcam_set_type_widescreen_wvga "Widescreen high quality"
-
-//d: Settings list item header
-//l: list_setting_pane_t1
-#define qtn_lcam_sett_startup_mode "Start-up mode"
-
-//d: Settings list item body text
-//l: list_set_graphic_pane_t1
-#define qtn_lcam_set_startup_mode_still "Still image"
-
-//d: Settings list item body text
-//l: list_set_graphic_pane_t1
-#define qtn_lcam_set_startup_mode_video "Video"
-
-//d: Settings list item body text
-//l: list_set_graphic_pane_t1
-#define qtn_lcam_set_startup_mode_memorized "Memorized"
-
// end of file