FCL/sf/app/camera: comparison camerauis/cameraxui/cxui/src/cxuivideoprecaptureview.cpp

equal deleted inserted replaced

-:feebad15db8c
+:c826656d6714
 *
 * Description:
 *
 */
-#include <e32keys.h>
 #include <QApplication>
 #include <QGraphicsLayout>
 #include <hbmainwindow.h>
 #include "cxuizoomslider.h"
 #include "cxuicapturekeyhandler.h"
 #include "cxuidocumentloader.h"
 #include "cxuiserviceprovider.h"
+#ifdef Q_OS_SYMBIAN
 #include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
 #include "cxuivideoprecaptureviewTraces.h"
 #endif
+#include <e32keys.h>
+#endif  //Q_OS_SYMBIAN
 using namespace Cxe;
 using namespace CxUiLayout;
 using namespace CxUiInternal;
 static const int CXUI_RECORD_ANIMATION_DURATION = 3000; // milliseconds
 static const int CXUI_PAUSE_TIMEOUT = 60*1000;   // 60 seconds
 //!@todo Localization?
 static const char* VIDEO_TIME_FORMAT = "%02d:%02d";
+const int POSTCAPTURE_ON = -1;
 }
 CxuiVideoPrecaptureView::CxuiVideoPrecaptureView(QGraphicsItem *parent) :
 CxuiPrecaptureView(parent),
 mElapsedTimer(this),
 mTimeElapsed(0),
 mTimeRemaining(0),
-mElapsedTimeText(NULL),
+mVideoTimeText(NULL),
-mRemainingTimeText(NULL),
 mRecordingIcon(NULL),
 mGoToStillAction(NULL),
 mToolbarIdle(NULL),
 mToolbarRec(NULL),
 mToolbarPaused(NULL),
 mCaptureKeyHandler = keyHandler;
 mVideoCaptureControl = &(engine->videoCaptureControl());
 connect(&mElapsedTimer, SIGNAL(timeout()), this, SLOT(updateTimeLabels()));
-connect(mVideoCaptureControl, SIGNAL(snapshotReady(CxeError::Id, const QImage&, const QString&)),
-this, SLOT(handleSnapshot(CxeError::Id)));
 connect(mVideoCaptureControl, SIGNAL(stateChanged(CxeVideoCaptureControl::State, CxeError::Id)),
 this, SLOT(handleVideoStateChanged(CxeVideoCaptureControl::State,CxeError::Id)));
-connect(&(mEngine->settings()), SIGNAL(sceneChanged(CxeScene&)),
-this, SLOT(handleSceneChanged(CxeScene&)));
 connect(mVideoCaptureControl, SIGNAL(remainingTimeChanged()),
 this, SLOT(updateTimeLabels()));
+mEngine->settings().listenForSetting(CxeSettingIds::VIDEO_SCENE, this, SLOT(handleSceneChanged(const QVariant&)));
 mPauseTimer.setSingleShot(true);
 connect(&mPauseTimer, SIGNAL(timeout()), this, SLOT(stop()));
 mPauseTimer.setInterval(CXUI_PAUSE_TIMEOUT);
 CX_DEBUG_EXIT_FUNCTION();
 }
 /*!
 * Loads default indicators from docml and modifies the visibility
 * according to current settings.
 */
 void CxuiVideoPrecaptureView::reloadIndicatorWidgets()
 {
 CX_DEBUG_ENTER_FUNCTION();
 if (graphicsLayoutItem) {
 graphicsItem = graphicsLayoutItem->graphicsItem();
 currentSettingValue = -1;
 if (graphicsItem == videoaudiomuteIndicatorIcon) {
 key = CxeSettingIds::VIDEO_MUTE_SETTING;
-mEngine->settings().get(key, currentSettingValue);
+currentSettingValue = mEngine->settings().get(key, currentSettingValue);
 // video mute implementation does not use
 // enum for on/off values but instead
 // 0 for off and 1 for on.
 if (currentSettingValue == 0) {
 isSettingOff = true;
 }
 } else if (graphicsItem == videoStabilityIndicatorIcon) {
 widget = mDocumentLoader->findWidget(VIDEO_PRE_CAPTURE_INDICATOR_CONTAINER_BOTTOM);
 indicatorContainer = qobject_cast<HbWidget *>(widget);
 CX_ASSERT_ALWAYS(indicatorContainer);
 createWidgetBackgroundGraphic(indicatorContainer, TRANSPARENT_BACKGROUND_GRAPHIC);
-widget = mDocumentLoader->findWidget(VIDEO_PRE_CAPTURE_ELAPSED_TIME_LABEL);
+widget = mDocumentLoader->findWidget(VIDEO_PRE_CAPTURE_VIDEO_TIME_LABEL);
-mElapsedTimeText = qobject_cast<HbLabel *> (widget);
+mVideoTimeText = qobject_cast<HbLabel *> (widget);
-CX_ASSERT_ALWAYS(mElapsedTimeText);
+CX_ASSERT_ALWAYS(mVideoTimeText);
-widget = mDocumentLoader->findWidget(VIDEO_PRE_CAPTURE_REMAINING_TIME_LABEL);
-mRemainingTimeText = qobject_cast<HbLabel *> (widget);
-CX_ASSERT_ALWAYS(mRemainingTimeText);
 widget = mDocumentLoader->findWidget(VIDEO_PRE_CAPTURE_RECORDING_ICON);
 mRecordingIcon = qobject_cast<HbLabel *> (widget);
 CX_ASSERT_ALWAYS(mRecordingIcon);
 mRecordingAnimation->setLoopCount(-1);
 mRecordingAnimation->setEasingCurve(QEasingCurve::OutInQuad);
 // Update toolbar scene mode icon.
-QString sceneId;
+try {
-if (mEngine->settings().get(CxeSettingIds::SCENE_ID, sceneId) == CxeError::None) {
+updateSceneIcon(mEngine->settings().get<QString>(CxeSettingIds::VIDEO_SCENE));
-updateSceneIcon(sceneId);
+} catch (CxeException &e) {
+// ignore error
 }
 // Initialize the video time counters.
 updateTimeLabels();
 connect(mCaptureKeyHandler, SIGNAL(autofocusKeyPressed()), mSettingsGrid, SLOT(close()));
 }
 }
 /**
 * Get if postcapture view should be shown or not.
 * Postcapture view may be shown for a predefined time or
 * until user dismisses it, or it may be completely disabled.
 */
 return true;
 }
 // Read the value from settings. Ignoring reading error.
 // On error (missing settings) default to "postcapture on".
-int showPostcapture(-1);
+int showPostcapture(POSTCAPTURE_ON);
 if(mEngine) {
-mEngine->settings().get(CxeSettingIds::VIDEO_SHOWCAPTURED, showPostcapture);
+showPostcapture = mEngine->settings().get<int>(CxeSettingIds::VIDEO_SHOWCAPTURED, POSTCAPTURE_ON);
 }
 CX_DEBUG_EXIT_FUNCTION();
 return showPostcapture != 0; // 0 == no postcapture
 }
 {
 CX_DEBUG_ENTER_FUNCTION();
 if (mQualityIcon && mEngine) {
 QString icon = "";
-int currentValue = -1;
+int currentValue = mEngine->settings().get<int>(CxeSettingIds::VIDEO_QUALITY, -1);
-mEngine->settings().get(CxeSettingIds::VIDEO_QUALITY, currentValue);
 icon = getSettingItemIcon(CxeSettingIds::VIDEO_QUALITY, currentValue);
 mQualityIcon->setIcon(HbIcon(icon));
 }
-CX_DEBUG_EXIT_FUNCTION();
-}
-void CxuiVideoPrecaptureView::handleSnapshot(CxeError::Id /*error*/)
-{
-CX_DEBUG_ENTER_FUNCTION();
 CX_DEBUG_EXIT_FUNCTION();
 }
 void CxuiVideoPrecaptureView::record()
 int time(0);
 mVideoCaptureControl->remainingTime(time);
 if (time) {
-mMenu = takeMenu();
+if (!mMenu){ // Only take out menu, if we have not already done it
+mMenu = takeMenu();
+}
 mVideoCaptureControl->record();
 } else {
 emit errorEncountered(CxeError::DiskFull);
 }
 */
 void CxuiVideoPrecaptureView::updateTimeLabels()
 {
 CX_DEBUG_IN_FUNCTION();
-if (!mRemainingTimeText || !mElapsedTimeText) {
+if (!mVideoTimeText) {
 // Section not loaded yet. Skip update until created.
 CX_DEBUG(("CxuiVideoPrecaptureView: video time labels not loaded yet!"));
 CX_DEBUG_EXIT_FUNCTION();
 return;
 }
 mTimeRemaining = 0;
 mTimeElapsed = 0;
 break;
 }
-setVideoTime(mRemainingTimeText, mTimeRemaining);
+setVideoTime(mVideoTimeText, mTimeElapsed, mTimeRemaining);
-setVideoTime(mElapsedTimeText, mTimeElapsed);
 CX_DEBUG_EXIT_FUNCTION();
 }
 /*!
 }
 /*!
 * Helper method for formatting video time to requested label.
 * @param label Text label to show the time.
-* @param time Time in seconds to be formatted to the label text.
+* @param elapsedTime Elapsed time in seconds to be formatted to the label text.
-*/
+* @param remainingTime Remaining time in seconds to be formatted to the label text.
-void CxuiVideoPrecaptureView::setVideoTime(HbLabel* label, int time)
+*/
+void CxuiVideoPrecaptureView::setVideoTime(HbLabel* label,
+int elapsedTime,
+int remainingTime)
 {
 // Convert time (seconds) into mm:ss
 // HbExtendedLocale wraps minutes at 60 so we can't use that.
 // We need to show times over 1 hour, e.g. "90:00".
-QString timeString;
+QString elapsed, remaining;
-timeString.sprintf(VIDEO_TIME_FORMAT, time/60, time%60);
+elapsed.sprintf(VIDEO_TIME_FORMAT, elapsedTime/60, elapsedTime%60);
-label->setPlainText(timeString);
+remaining.sprintf(VIDEO_TIME_FORMAT, remainingTime/60, remainingTime%60);
+label->setPlainText(hbTrId("txt_cam_info_redorcding_time").arg(elapsed).arg(remaining));
 }
 bool CxuiVideoPrecaptureView::getElapsedTime()
 {
 CX_DEBUG_ENTER_FUNCTION();
 hideControls();
 emit stopStandbyTimer();
 if (mDocumentLoader){
 mDocumentLoader->load(VIDEO_1ST_XML, VIDEO_PRE_CAPTURE_RECORDING);
 }
 mElapsedTimer.start(CXUI_ELAPSED_TIME_TIMEOUT);
 disableFeedback();
 // commented out the activation of the recording animation because
 // it is causing issues when using SW rendering
 break;
 case CxeVideoCaptureControl::PlayingStartSound:
 // don't change anything
 break;
 default:
-// in any other state, just hide the controls
+// don't change anything
-setRecordingItemsVisibility(false);
 break;
 }
 CX_DEBUG_EXIT_FUNCTION();
 }
 /*!
 * Handle scene mode change.
 * @param scene The new active scene mode.
 */
-void CxuiVideoPrecaptureView::handleSceneChanged(CxeScene &scene)
+void CxuiVideoPrecaptureView::handleSceneChanged(const QVariant &scene)
 {
 CX_DEBUG_ENTER_FUNCTION();
 // Ignore if not in video mode.
 if (mEngine->mode() == Cxe::VideoMode) {
 // Update toolbar scene mode icon.
-updateSceneIcon(scene[CxeSettingIds::SCENE_ID].toString());
+updateSceneIcon(scene.toString());
 }
 CX_DEBUG_EXIT_FUNCTION();
-}
-/*!
-Sets the visibility of recording icon and elapsed time text.
-\param visible True if widgets are to be shown, false if not.
-*/
-void CxuiVideoPrecaptureView::setRecordingItemsVisibility(bool visible) {
-if (mRecordingIcon) {
-mRecordingIcon->setVisible(visible);
-mRecordingIcon->setOpacity(1.0f);
-}
-if (mElapsedTimeText) {
-mElapsedTimeText->setVisible(visible);
-}
 }
 /*!
 * Overridden eventFilter() to restart the pause timer.
 */

changeset 46	c826656d6714
parent 42	feebad15db8c
child 52	7e18d488ac5f