camerauis/cameraapp/generic/src/CamNaviProgressBarModel.cpp
branchRCL_3
changeset 25 2c87b2808fd7
parent 24 bac7acad7cb3
--- a/camerauis/cameraapp/generic/src/CamNaviProgressBarModel.cpp	Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamNaviProgressBarModel.cpp	Tue Sep 14 20:46:07 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -14,17 +14,6 @@
 * Description:  Control for displaying elapse/remaining record time
 *                in Navi Pane
 *
-*  Copyright (c) 2007-2008 Nokia.  All rights reserved.
-*  This material, including documentation and any related computer
-*  programs, is protected by copyright controlled by Nokia.  All
-*  rights are reserved.  Copying, including reproducing, storing,
-*  adapting or translating, any or all of this material requires the
-*  prior written consent of Nokia.  This material also contains
-*  confidential information which may not be disclosed to others
-*  without the prior written consent of Nokia.
-
-*
-*
 */
 
 
@@ -195,7 +184,7 @@
 
     iCamOrientation = appUi->CamOrientation();
 
-    if ( CamUtility::IsNhdDevice() )
+    if ( AknLayoutUtils::PenEnabled() )
         {
         TouchLayoutL();
         }
@@ -254,7 +243,7 @@
 
     // Create component bitmaps
     TSize size;    
-    if ( CamUtility::IsNhdDevice() )
+    if ( AknLayoutUtils::PenEnabled() )
         {
         size =  iProgressIconRect.Rect().Size();
         }
@@ -374,7 +363,7 @@
 
     DrawElapsedTimeText( aGc );
     DrawRemainingTimeText( aGc, skin );
-    if ( CamUtility::IsNhdDevice() )
+    if ( AknLayoutUtils::PenEnabled() )
         {
         aGc.BitBltMasked( iProgressIconRect.Rect().iTl,
             icon, icon->SizeInPixels(), mask, ETrue );
@@ -384,8 +373,11 @@
         aGc.BitBltMasked( iVidStorageIconRect.Rect().iTl,
             icon, icon->SizeInPixels(), mask, ETrue );
         }
-    
-    DrawProgressBar( aGc );
+    if( CamUtility::IsNhdDevice() )
+        {
+        // VGA layout doesn't use progress bar
+        DrawProgressBar( aGc );
+        }
     }
 
 // ---------------------------------------------------------
@@ -551,6 +543,11 @@
 
     time = iRecordTimeRemaining.Int64();
     time.FormatL( iRemainingTimeText, *iTimeFormat );
+    if( !CamUtility::IsNhdDevice() )
+        {
+        // VGA layout is using backslash instead of progress bar
+        iElapsedTimeText.Append(_L("  /"));
+        }
     
     if ( iElapsedTimeTextItem )
         {