--- a/camerauis/cameraxui/cxui/inc/cxuivideoprecaptureview.h	Thu May 13 21:30:19 2010 +0300
+++ b/camerauis/cameraxui/cxui/inc/cxuivideoprecaptureview.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"
@@ -45,35 +45,25 @@
 
 public:
 
-    /**
-     * Construct-method handles initialisation tasks for this class.
-     * @param mainwindow
-     * @param engine
-     * @param documentLoader
-     * @param keyHandler
-     */
     void construct(HbMainWindow *mainwindow, CxeEngine *engine,
                    CxuiDocumentLoader *documentLoader,
-                   CxuiCaptureKeyHandler *keyHandler = NULL);
+                   CxuiCaptureKeyHandler *keyHandler,
+                   HbActivityManager *activityManager);
 
-    /**
-     * Loads widgets that are needed right from the start.
-     */
     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();
 
 public slots:
 
     // from CxuiPrecaptureView
     virtual void handleSettingValueChanged(const QString& key, QVariant newValue);
 
+    void handleSceneChanged(CxeScene &scene);
     void handleQuitClicked();
 
 protected slots:
@@ -82,28 +72,13 @@
     void record();
     void pause();
     void stop();
-    void stopAndPrepareNewVideo();
     void goToStill();
     void showEvent(QShowEvent *event);
     void handleVideoStateChanged(CxeVideoCaptureControl::State newState, CxeError::Id error);
     void handleCaptureKeyPressed();
     void prepareNewVideo(CxeError::Id error = CxeError::None);
-    void toggleLight();
     void launchVideoScenePopup();
     void launchSetting();
-
-    /**
-     * Application focus slots are called if focus state is changed.
-     * Recording is stopped and camera released or reserved according to new state.
-     */
-    void handleFocusLost();
-
-    /**
-     * Battery almost empty warning signal.
-     * Need to stop ongoing recording.
-     */
-    void handleBatteryEmpty();
-
     void updateTimeLabels();
 
     // from CxuiPrecaptureView
@@ -114,15 +89,24 @@
     void setVideoTime(HbLabel* label, int time);
     bool getElapsedTime();
     void getRemainingTime();
-    virtual void showToolbar();
+    bool allowShowControls() const;
+    bool isFeedbackEnabled() const;
+    void showToolbar();
     void disableFeedback();
     void enableFeedback();
 
     void initializeSettingsGrid();
+    bool isPostcaptureOn() const;
+    void updateSceneIcon(const QString& sceneId);
+    void updateQualityIcon();
     void setRecordingItemsVisibility(bool visible);
 
     // from QObject
     bool eventFilter(QObject *object, QEvent *event);
+
+private:
+    void reloadIndicatorWidgets();
+
 protected:
     QTimer mElapsedTimer;
     int mTimeElapsed;
@@ -132,9 +116,9 @@
     HbLabel *mRemainingTimeText; // not own
     HbLabel *mRecordingIcon; // not own
     HbAction *mGoToStillAction; // not own
-    HbToolBar *mToolBarIdle; // not own
-    HbToolBar *mToolBarRec; // not own
-    HbToolBar *mToolBarPaused; // not own
+    HbToolBar *mToolbarIdle; // not own
+    HbToolBar *mToolbarRec; // not own
+    HbToolBar *mToolbarPaused; // not own
     HbDialog *mVideoScenePopup;
     CxeVideoCaptureControl *mVideoCaptureControl;
     HbMenu *mMenu;    // own