--- a/camerauis/cameraapp/generic/src/CamNaviCounterModel.cpp Mon Mar 15 12:39:00 2010 +0200
+++ b/camerauis/cameraapp/generic/src/CamNaviCounterModel.cpp Wed Mar 31 21:06:44 2010 +0300
@@ -537,7 +537,11 @@
if (ECamMediaStorageMassStorage ==iStorageLocation)
{
- iStorageLocation = iController.ExistMassStorage()?ECamMediaStorageMassStorage:ECamMediaStoragePhone;
+ iStorageLocation = iController.ExistMassStorage()?
+ ECamMediaStorageMassStorage:
+ iController.IntegerSettingValue( ECamSettingItemRemovePhoneMemoryUsage )?
+ ECamMediaStorageNone:
+ ECamMediaStoragePhone;
}
}
@@ -893,21 +897,33 @@
{
CFbsBitmap* icon = NULL;
CFbsBitmap* mask = NULL;
- if ( iStorageLocation == ECamMediaStoragePhone )
- {
- icon = iPhoneIcon;
- mask = iPhoneIconMask;
- }
- else if ( iStorageLocation == ECamMediaStorageMassStorage )
- {
- icon = iMassStorageIcon;
- mask = iMassStorageIconMask;
- }
- else
- {
- icon = iMMCIcon;
- mask = iMMCIconMask;
- }
+ switch( iStorageLocation )
+ {
+ case ECamMediaStoragePhone:
+ {
+ icon = iPhoneIcon;
+ mask = iPhoneIconMask;
+ }
+ break;
+ case ECamMediaStorageMassStorage:
+ {
+ icon = iMassStorageIcon;
+ mask = iMassStorageIconMask;
+ }
+ break;
+ case ECamMediaStorageCard:
+ {
+ icon = iMMCIcon;
+ mask = iMMCIconMask;
+ }
+ break;
+ case ECamMediaStorageNone:
+ default:
+ {
+ //TODO: Get icons when none is available
+ }
+ break;
+ }
// Should use layout
aBmpGc.BitBlt(TPoint(0,0), icon);
aBmpMaskGc.BitBlt(TPoint(0,0), mask);
@@ -923,21 +939,38 @@
{
CFbsBitmap* icon = NULL;
CFbsBitmap* mask = NULL;
- if ( iStorageLocation == ECamMediaStoragePhone )
- {
- icon = iPhoneIcon;
- mask = iPhoneIconMask;
- }
- else if ( iStorageLocation == ECamMediaStorageMassStorage )
+ switch( iStorageLocation )
{
- icon = iMassStorageIcon;
- mask = iMassStorageIconMask;
+ case ECamMediaStoragePhone:
+ {
+ icon = iPhoneIcon;
+ mask = iPhoneIconMask;
+ }
+ break;
+ case ECamMediaStorageMassStorage:
+ {
+ icon = iMassStorageIcon;
+ mask = iMassStorageIconMask;
+ }
+ break;
+ case ECamMediaStorageCard:
+ {
+ icon = iMMCIcon;
+ mask = iMMCIconMask;
+ }
+ break;
+ case ECamMediaStorageNone:
+ default:
+ {
+ //TODO: Get icons when none is available
+ }
+ break;
}
- else
- {
- icon = iMMCIcon;
- mask = iMMCIconMask;
- }
+
+ if( icon == NULL || mask == NULL)
+ {
+ return;
+ }
if ( iMode == ECamControllerVideo )
{
@@ -1250,7 +1283,10 @@
if (ECamMediaStorageMassStorage ==iStorageLocation)
{
- iStorageLocation = iController.ExistMassStorage()?ECamMediaStorageMassStorage:ECamMediaStoragePhone;
+ TCamMediaStorage storage = iController.IntegerSettingValue( ECamSettingItemRemovePhoneMemoryUsage )?
+ ECamMediaStorageNone:
+ ECamMediaStoragePhone;
+ iStorageLocation = iController.ExistMassStorage()?ECamMediaStorageMassStorage:storage;
}
UpdateCounter();
@@ -1312,7 +1348,10 @@
if (ECamMediaStorageMassStorage ==iStorageLocation)
{
- iStorageLocation = iController.ExistMassStorage()?ECamMediaStorageMassStorage:ECamMediaStoragePhone;
+ TCamMediaStorage storage = iController.IntegerSettingValue( ECamSettingItemRemovePhoneMemoryUsage )?
+ ECamMediaStorageNone:
+ ECamMediaStoragePhone;
+ iStorageLocation = iController.ExistMassStorage()?ECamMediaStorageMassStorage:storage;
}
}
BroadcastEvent( ECamObserverEventNaviModelUpdated );