--- a/camerauis/cameraxui/cxui/inc/cxuistillprecaptureview.h	Thu May 13 21:30:19 2010 +0300
+++ b/camerauis/cameraxui/cxui/inc/cxuistillprecaptureview.h	Thu Jul 15 01:55:05 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-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"
@@ -37,11 +37,10 @@
 class CxuiSelfTimerRadioButtonList;
 class HbToolBarExtension;
 class HbWidget;
+
 /**
  * Pre-capture view for still image mode
  */
-
-
 class CxuiStillPrecaptureView : public CxuiPrecaptureView
 {
     Q_OBJECT
@@ -53,34 +52,23 @@
 
 public:
 
-    /**
-     * Construct-method handles initialisation tasks for this class. Needs to be called
-     * before the instance of this class is used.
-     * @param mainwindow
-     * @param engine
-     * @param documentLoader
-     * @param keyHandler
-     */
-    virtual void construct(HbMainWindow *mainwindow, CxeEngine *engine,
-                   CxuiDocumentLoader *documentLoader, CxuiCaptureKeyHandler *keyHandler = NULL);
+    virtual void construct(HbMainWindow *mainwindow, 
+                           CxeEngine *engine,
+                           CxuiDocumentLoader *documentLoader, 
+                           CxuiCaptureKeyHandler *keyHandler,
+                           HbActivityManager *activityManager);
 
-    /**
-     * Loads default widgets in layouts xml.
-     */
     virtual void loadDefaultWidgets();
-
-    /**
-     * Loads widgets that are not part of the default section in layouts xml.
-     * Widgets are created at the time they are first loaded.
-     */
     virtual void loadWidgets();
 
-    void updateOrientation(Qt::Orientation orientation);
+    void restoreActivity(const QString &activityId, const QVariant &data);
+    void saveActivity();
+    void clearActivity();
 
 protected:
 
     void showEvent(QShowEvent *event);
-    virtual void showToolbar();
+    virtual bool allowShowControls() const;
 
 public slots:
 
@@ -91,14 +79,15 @@
     // connects to the sceneChanged signal of CxeSettings
     void handleSceneChanged(CxeScene &scene);
 
+    // From CxuiPrecaptureView
+    virtual void enterStandby();
+
 protected slots:
     void focusAndCapture();
     void capture();
     void setCapturePending();
     void goToVideo();
 
-    void launchSceneModesPopup();
-
     // Key events
     void handleCaptureKeyPressed();
     void handleAutofocusKeyPressed();
@@ -110,27 +99,21 @@
     void handleStillCaptureStateChanged(CxeStillCaptureControl::State newState, CxeError::Id error);
     void handleSnapshot(CxeError::Id error);
 
-    /**
-     * Signal used to reset mCapturePending after a short timeout. If the image
-     * cannot be captured within a given time of the key press, it is better to cancel
-     * the whole operation.
-     */
     void resetCapturePendingFlag();
 
-    void showControls();
-
-    /**
-     * Application focus slots are called if focus state is changed.
-     * Camera is released or reserved according to new state.
-     */
-    void handleFocusLost();
-    void handleFocusGained();
     void launchSetting();
     void updateImagesLeftLabel();
 
 protected:
     void initializeSettingsGrid();
+    bool isPostcaptureOn() const;
+    void updateSceneIcon(const QString& sceneId);
+    void updateQualityIcon();
     void closeDialogs();
+    void updateFaceTrackingIcon();
+
+private:
+    void reloadIndicatorWidgets();
 
 protected:
     CxuiSelfTimer *mSelfTimer;