+ + + + + + + @@ -280,31 +284,8 @@ - - - - - -

- - - - - - - - - - - - - - - -

- + diff -r 3075d9b614e6 -r 0e652f8f1fbd camerauis/cameraxui/cxui/src/cxuiapplication.cpp --- a/camerauis/cameraxui/cxui/src/cxuiapplication.cpp Thu May 13 21:30:19 2010 +0300 +++ b/camerauis/cameraxui/cxui/src/cxuiapplication.cpp Thu Jul 15 01:55:05 2010 +0300 @@ -33,7 +33,7 @@ */ CxuiApplication::CxuiApplication(int &argc, char *argv[]) - : HbApplication(argc, argv, Hb::NoSplash) + : HbApplication(argc, argv, Hb::SplashFixedHorizontal) { CX_DEBUG_IN_FUNCTION(); } diff -r 3075d9b614e6 -r 0e652f8f1fbd camerauis/cameraxui/cxui/src/cxuiapplicationframeworkmonitor.cpp --- a/camerauis/cameraxui/cxui/src/cxuiapplicationframeworkmonitor.cpp Thu May 13 21:30:19 2010 +0300 +++ b/camerauis/cameraxui/cxui/src/cxuiapplicationframeworkmonitor.cpp Thu Jul 15 01:55:05 2010 +0300 @@ -28,13 +28,7 @@ CxuiApplicationFrameworkMonitor::CxuiApplicationFrameworkMonitor(CxuiApplication &application, CxeSettings &settings) { CX_DEBUG_ENTER_FUNCTION(); - p = new CxuiApplicationFrameworkMonitorPrivate(application, settings); - - connect(p, SIGNAL(foregroundStateChanged(CxuiApplicationFrameworkMonitor::ForegroundState)), - this, SIGNAL(foregroundStateChanged(CxuiApplicationFrameworkMonitor::ForegroundState))); - connect(p, SIGNAL(batteryEmpty()), this, SIGNAL(batteryEmpty())); - - + p = new CxuiApplicationFrameworkMonitorPrivate(this, application, settings); CX_DEBUG_EXIT_FUNCTION(); } @@ -57,4 +51,13 @@ return p->foregroundState(); } +/*! +* Is USB connected in mass memory mode? +* @return True if USB mass memory mode is active and connected, false otherwise. +*/ +bool CxuiApplicationFrameworkMonitor::isUsbMassMemoryModeActive() const +{ + return p->isUsbMassMemoryModeActive(); +} + // end of file diff -r 3075d9b614e6 -r 0e652f8f1fbd camerauis/cameraxui/cxui/src/cxuiapplicationframeworkmonitorprivate.cpp --- a/camerauis/cameraxui/cxui/src/cxuiapplicationframeworkmonitorprivate.cpp Thu May 13 21:30:19 2010 +0300 +++ b/camerauis/cameraxui/cxui/src/cxuiapplicationframeworkmonitorprivate.cpp Thu Jul 15 01:55:05 2010 +0300 @@ -25,14 +25,19 @@ #include #include // keyguard state #include // battery status +#include // usb status +#include +#include #include #include #include #include + #endif // Q_OS_SYMBIAN #include "cxutils.h" +#include "cxuieventlog.h" #include "cxuiapplication.h" #include "cxesettings.h" #include "cxuiapplicationframeworkmonitorprivate.h" @@ -64,6 +69,11 @@ return convertTDesC2QString(name); } + inline QString bitString(int number, char fill = '0', int width = 32) + { + return QString::number(number, 2).rightJustified(width, fill); + } + //!@todo: Avkon UIDs not needed once device dialogs fully implemented in Orbit. // AknCapServer @@ -75,6 +85,10 @@ static const unsigned int UID_TASKSWITCHER = 0x2002677D; // Dialog server static const unsigned int UID_DIALOGAPPSERVER = 0x20022FC5; + + // Log event types + static const char *EVENT_USB = "usb"; + static const char *EVENT_FOREGROUND = "foreground"; } #endif // Q_OS_SYMBIAN @@ -82,8 +96,11 @@ /*! * Constructor */ -CxuiApplicationFrameworkMonitorPrivate::CxuiApplicationFrameworkMonitorPrivate(CxuiApplication &application, CxeSettings& settings) - : mApplication(application), +CxuiApplicationFrameworkMonitorPrivate::CxuiApplicationFrameworkMonitorPrivate(CxuiApplicationFrameworkMonitor *parent, + CxuiApplication &application, + CxeSettings& settings) + : q(parent), + mApplication(application), mSettings(settings), #ifdef Q_OS_SYMBIAN mWsSession(CCoeEnv::Static()->WsSession()), @@ -92,17 +109,18 @@ mWindowGroupName(), mKeyLockState(EKeyguardNotActive), mBatteryStatus(EBatteryStatusUnknown), + mUsbPersonality(0), + mEventLog(NULL), #endif // Q_OS_SYMBIAN mState(CxuiApplicationFrameworkMonitor::ForegroundOwned) { CX_DEBUG_ENTER_FUNCTION(); - #ifdef Q_OS_SYMBIAN mWindowGroup.EnableFocusChangeEvents(); mWindowGroupName = windowGroupName(mWsSession, mWindowGroupId); + mEventLog = new CxuiEventLog("CxuiApplicationFrameworkMonitorPrivate"); init(); #endif // Q_OS_SYMBIAN - CX_DEBUG_EXIT_FUNCTION(); } @@ -111,7 +129,11 @@ */ CxuiApplicationFrameworkMonitorPrivate::~CxuiApplicationFrameworkMonitorPrivate() { - CX_DEBUG_IN_FUNCTION(); + CX_DEBUG_ENTER_FUNCTION(); +#ifdef Q_OS_SYMBIAN + delete mEventLog; +#endif // Q_OS_SYMBIAN + CX_DEBUG_EXIT_FUNCTION(); } /*! @@ -123,6 +145,24 @@ return mState; } +/*! +* Is USB connected in mass memory mode? +* @return True if USB mass memory mode is active and connected, false otherwise. +*/ +bool CxuiApplicationFrameworkMonitorPrivate::isUsbMassMemoryModeActive() const +{ + bool active(false); +#ifdef Q_OS_SYMBIAN + // Mass memory mode activity can be seen from the KUsbWatcherSelectedPersonality property. + // When USB is connected in Mass Memory Mode, we get KUsbPersonalityIdMS as personality id. + // If USB is not connected, personality id is KUsbWatcherSelectedPersonalityNone. + active = (mUsbPersonality == KUsbPersonalityIdMS); +#endif // Q_OS_SYMBIAN + return active; +} + + + #ifdef Q_OS_SYMBIAN /*! * Slot to handle Symbian event. @@ -153,7 +193,7 @@ CX_DEBUG_ENTER_FUNCTION(); if (uid == KPSUidAvkonDomain.iUid && key == KAknKeyguardStatus) { - CX_DEBUG(("CxuiApplicationFrameworkMonitor - keylock status changed: %d -> %d", value.toInt(), mKeyLockState)); + CX_DEBUG(("CxuiApplicationFrameworkMonitor - keylock status changed: %d -> %d", mKeyLockState, value.toInt())); // Check if the keylock value has actually changed const int newKeyLockState = value.toInt(); @@ -163,7 +203,7 @@ setState(getCurrentState()); } } else if (uid == KPSUidHWRMPowerState.iUid && key == KHWRMBatteryStatus ) { - CX_DEBUG(("CxuiApplicationFrameworkMonitor - battery status changed: %d -> %d", value.toInt(), mBatteryStatus)); + CX_DEBUG(("CxuiApplicationFrameworkMonitor - battery status changed: %d -> %d", mBatteryStatus, value.toInt() )); // If status changed, check if battery is going empty. const int newBatteryStatus = value.toInt(); @@ -172,8 +212,29 @@ // Notify that battery is almost empty, // need to stop any recordings etc. - if( mBatteryStatus == EBatteryStatusEmpty ) { - emit batteryEmpty(); + if(mBatteryStatus == EBatteryStatusEmpty) { + emit q->batteryEmpty(); + } + } + } else if (uid == KPSUidUsbWatcher.iUid && key == KUsbWatcherSelectedPersonality) { + CX_DEBUG(("CxuiApplicationFrameworkMonitor - usb personality changed: %d -> %d", mUsbPersonality, value.toInt())); + + const int newUsbPersonality(value.toInt()); + if (newUsbPersonality != mUsbPersonality) { + // Check before saving the new state if mass memory mode was active, + // so we know when to emit the unactivated signal. + const bool wasUsbMassMemoryModeActive(isUsbMassMemoryModeActive()); + // Store new state. + mUsbPersonality = newUsbPersonality; + + // Save state to log. + if (mEventLog) { + mEventLog->append(EVENT_USB, QString::number(mUsbPersonality)); + } + + // Check if mass memory mode activity changed. + if (wasUsbMassMemoryModeActive != isUsbMassMemoryModeActive()) { + emit q->usbMassMemoryModeToggled(isUsbMassMemoryModeActive()); } } } @@ -201,6 +262,10 @@ mSettings.get(KPSUidAvkonDomain.iUid, KAknKeyguardStatus, Cxe::PublishAndSubscribe, value); mKeyLockState = value.toInt(); + // Get current USB personality + mSettings.get(KPSUidUsbWatcher.iUid, KUsbWatcherSelectedPersonality, Cxe::PublishAndSubscribe, value); + mUsbPersonality = value.toInt(); + bool ok = connect(&mSettings, SIGNAL(settingValueChanged(long int, unsigned long int, QVariant)), this, SLOT(handlePropertyEvent(long int, unsigned long int, QVariant))); CX_DEBUG_ASSERT(ok); @@ -215,7 +280,7 @@ * Helper method to handle Symbian event that specificly is of type QSymbianEvent::WindowServerEvent. * @param event Symbian event to be handled. (Ownership not taken.) */ -bool CxuiApplicationFrameworkMonitorPrivate::handleWindowServerEvent(const QSymbianEvent *event) +void CxuiApplicationFrameworkMonitorPrivate::handleWindowServerEvent(const QSymbianEvent *event) { // We receive tons of these events, so function start and end traces // are intentionally left out. @@ -242,13 +307,13 @@ const TWsVisibilityChangedEvent *visibilityEvent = wsEvent->VisibilityChanged(); if (visibilityEvent) { CX_DEBUG(("CxuiApplicationFrameworkMonitor - EFullyVisible: bits[%s]", - QString::number(TWsVisibilityChangedEvent::EFullyVisible, 2).toAscii().constData() )); + bitString(TWsVisibilityChangedEvent::EFullyVisible).toAscii().constData() )); CX_DEBUG(("CxuiApplicationFrameworkMonitor - EPartiallyVisible: bits[%s]", - QString::number(TWsVisibilityChangedEvent::EPartiallyVisible, 2).toAscii().constData() )); + bitString(TWsVisibilityChangedEvent::EPartiallyVisible).toAscii().constData() )); CX_DEBUG(("CxuiApplicationFrameworkMonitor - ENotVisible: bits[%s]", - QString::number(TWsVisibilityChangedEvent::ENotVisible, 2).toAscii().constData() )); + bitString(TWsVisibilityChangedEvent::ENotVisible).toAscii().constData() )); CX_DEBUG(("CxuiApplicationFrameworkMonitor - event: bits[%s]", - QString::number(visibilityEvent->iFlags, 2).toAscii().constData() )); + bitString(visibilityEvent->iFlags).toAscii().constData() )); } break; } @@ -256,8 +321,6 @@ break; } } - - return false; } /*! @@ -287,14 +350,17 @@ } if (mState != original) { - CX_DEBUG(("CxuiApplicationFrameworkMonitor - state change [%s] -> [%s]", - CxuiApplicationFrameworkMonitor::staticMetaObject.enumerator( - CxuiApplicationFrameworkMonitor::staticMetaObject.indexOfEnumerator("ForegroundState")).valueToKey(original), - CxuiApplicationFrameworkMonitor::staticMetaObject.enumerator( - CxuiApplicationFrameworkMonitor::staticMetaObject.indexOfEnumerator("ForegroundState")).valueToKey(mState) )); + // Print the event log with this foreground event included. + if (mEventLog) { + mEventLog->append( + EVENT_FOREGROUND, + CxuiApplicationFrameworkMonitor::staticMetaObject.enumerator( + CxuiApplicationFrameworkMonitor::staticMetaObject.indexOfEnumerator("ForegroundState")).valueToKey(mState)); + mEventLog->print(); + } // If state was changed, signal it to listeners. - emit foregroundStateChanged(mState); + emit q->foregroundStateChanged(mState); } } } @@ -312,6 +378,7 @@ if (mKeyLockState != EKeyguardNotActive) { // Keylock enabled is the same as if other application is in foreground. + CX_DEBUG(("CxuiApplicationFrameworkMonitor - key lock on")); state = CxuiApplicationFrameworkMonitor::ForegroundFullyLost; } else if (focusWindowGroupId == mWindowGroupId) { // If our window group has focus, we clearly are the foreground owning application. @@ -374,7 +441,6 @@ #ifdef CX_DEBUG QString name(windowGroupName(mWsSession, focusWgId)); - CX_DEBUG(("CxuiApplicationFrameworkMonitor - Own window group id: 0x%08x", mWindowGroupId)); CX_DEBUG(("CxuiApplicationFrameworkMonitor - Focused window group id: 0x%08x", focusWgId)); CX_DEBUG(("CxuiApplicationFrameworkMonitor - Own window group name: [%s]", mWindowGroupName.toAscii().constData())); diff -r 3075d9b614e6 -r 0e652f8f1fbd camerauis/cameraxui/cxui/src/cxuiapplicationstate.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/camerauis/cameraxui/cxui/src/cxuiapplicationstate.cpp Thu Jul 15 01:55:05 2010 +0300 @@ -0,0 +1,271 @@ +/* +* Copyright (c) 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" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#include + +#include "cxutils.h" +#include "cxuieventlog.h" +#include "cxuierrormanager.h" +#include "cxuiapplicationstate.h" + +namespace +{ + static const char *EVENT_APPLICATION_STATE = "application state"; +} + +/*! +* Constructor. +*/ +CxuiApplicationState::CxuiApplicationState(CxuiApplication &application, + CxeSettings &settings, + CxuiDocumentLoader *documentLoader) + : mState(Background), mApplicationMonitor(NULL), mErrorManager(NULL), mEventLog(NULL) +{ + mApplicationMonitor = new CxuiApplicationFrameworkMonitor(application, settings); + mErrorManager = new CxuiErrorManager(documentLoader); + + // Foreground state change signals + connect(mApplicationMonitor, SIGNAL(foregroundStateChanged(CxuiApplicationFrameworkMonitor::ForegroundState)), + this, SLOT(handleForegroundStateChanged(CxuiApplicationFrameworkMonitor::ForegroundState))); + + // Battery empty signal + connect(mApplicationMonitor, SIGNAL(batteryEmpty()), this, SLOT(handleBatteryEmpty())); + + // USB mass memory mode signal + connect(mApplicationMonitor, SIGNAL(usbMassMemoryModeToggled(bool)), + this, SLOT(handleUsbMassMemoryModeChanged(bool))); + + // Severe error signals + connect(mErrorManager, SIGNAL(errorPopupShown()), this, SLOT(handleSevereError())); + connect(mErrorManager, SIGNAL(errorPopupClosed()), this, SLOT(handleErrorCleared())); + +#ifdef CX_DEBUG + mEventLog = new CxuiEventLog("CxuiApplicationState"); +#endif +} + +/*! +* Destructor. +*/ +CxuiApplicationState::~CxuiApplicationState() +{ + delete mErrorManager; + delete mApplicationMonitor; + delete mEventLog; +} + +/*! +* Get current application state. +*/ +CxuiApplicationState::State CxuiApplicationState::currentState() const +{ + return mState; +} + +/*! +* Start monitoring the application state. +* Initial state is checked and signal emitted about state change *unless* state is Background. +*/ +void CxuiApplicationState::startMonitoring() +{ + CX_DEBUG_ENTER_FUNCTION(); + // Foreground handling checks for errors if needed. + handleForegroundStateChanged(mApplicationMonitor->foregroundState()); + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! +* Handle error from UI or engine. +* Error will be checked and if it is severe, application state will become Error and error note will be shown. +* If error is not severe, a warning note will be shown. +* @param error The error id. +*/ +void CxuiApplicationState::handleApplicationError(CxeError::Id error) +{ + CX_DEBUG_ENTER_FUNCTION(); + if (error != CxeError::None) { + mErrorManager->check(error); + // If error manager sees this error as severe one, it will signal that back. + // We will handle updating state in handleSevereError(). + // If only warning note (or nothing) is needed, application state is not changed. + } + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! +* Handle change in application foreground status. +* @param state New foreground status. +*/ +void CxuiApplicationState::handleForegroundStateChanged(CxuiApplicationFrameworkMonitor::ForegroundState state) +{ + CX_DEBUG_ENTER_FUNCTION(); + if (state == CxuiApplicationFrameworkMonitor::ForegroundFullyLost) { + CX_DEBUG(("CxuiApplicationState - application is in background")); + // Background overwrites even any error. We clear any active errors. + // When returning to background, error situation will be re-checked. + setState(Background); + mErrorManager->clear(); + } else { + CX_DEBUG(("CxuiApplicationState - application is in partial / full foreground")); + // Check that we were in background. Switching between partial and full background + // needs no actions. + if (currentState() == Background) { + CX_DEBUG(("CxuiApplicationState - application was in background before, moving to foreground")); + // Check that there's no active errors that have been ignored in background. + checkErrors(); + if (currentState() != Error) { + setState(Normal); + } + } + } + + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! +* Handle USB mass memory mode (USB MMM) activating or deactivating. +* If USB MMM activates, we enter error state and display error note. +* When USB MMM deactivates, we hide the note and move to standby mode. +* @param active Is the USB mass memory mode active. +*/ +void CxuiApplicationState::handleUsbMassMemoryModeChanged(bool active) +{ + CX_DEBUG_ENTER_FUNCTION(); + if (active) { + // USB error is not handled if: + // (a) other severe error already active + // (b) application is in background + if (currentState() == Normal || currentState() == Standby) { + // Emulate memory not accessible error. + handleApplicationError(CxeError::MemoryNotAccessible); + } + } else { + // If we had USB error, clear it now. + if (currentState() == Error) { + setState(Standby); + // Clear memory not accessible error. + mErrorManager->clear(); + } + } + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! +* Handle battery emptying. We need to stop all activity and exit the application. +*/ +void CxuiApplicationState::handleBatteryEmpty() +{ + CX_DEBUG_ENTER_FUNCTION(); + setState(Background); + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! +* Handle a severe error after Error Manager has analyzed it. +*/ +void CxuiApplicationState::handleSevereError() +{ + CX_DEBUG_ENTER_FUNCTION(); + // In background we do not change the state from Background to anything else. + if (currentState() != Background) { + setState(Error); + } + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! +* Severe error has been cleared. +* Check if we should return to normal or background state. +*/ +void CxuiApplicationState::handleErrorCleared() +{ + CX_DEBUG_ENTER_FUNCTION(); + // No state change if we are not currently in Error state. + if (currentState() == Error) { + setState(Normal); + } + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! +* Slot for requesting Standby state to be entered. +* Request is accepted only if current state is Normal. Otherwise call has no effect. +*/ +void CxuiApplicationState::enterStandby() +{ + CX_DEBUG_ENTER_FUNCTION(); + if (currentState() == Normal) { + setState(Standby); + } + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! +* Slot for requesting state change from Standby to Normal state. +* Request is accepted only if current state is Standby. Otherwise call has no effect. +*/ +void CxuiApplicationState::exitStandby() +{ + CX_DEBUG_ENTER_FUNCTION(); + if (currentState() == Standby) { + setState(Normal); + } + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! +* Set new state. +* If state is actually changing, stateChanged() signal is emitted. +*/ +void CxuiApplicationState::setState(State newState) +{ + if (mState != newState) { +#ifdef CX_DEBUG + if (mEventLog) { + mEventLog->append(EVENT_APPLICATION_STATE, + CxuiApplicationState::staticMetaObject.enumerator( + CxuiApplicationState::staticMetaObject. + indexOfEnumerator("State")).valueToKey(newState)); + mEventLog->print(); + } +#endif // CX_DEBUG + + State oldState = mState; + mState = newState; + emit stateChanged(newState, oldState); + } +} + +/*! +* Check if we have known errors active at the moment. +* State is set to CxuiApplicationState::Error, if error is found. +*/ +void CxuiApplicationState::checkErrors() +{ + CX_DEBUG_ENTER_FUNCTION(); + if (mApplicationMonitor->isUsbMassMemoryModeActive()) { + // Force Error state even if Background is still the current state. + // We use this method to check errors also when returning from background. + // Normally in Background state we do not enter Error state. + setState(Error); + handleApplicationError(CxeError::MemoryNotAccessible); + } + CX_DEBUG_EXIT_FUNCTION(); +} + + +// end of file diff -r 3075d9b614e6 -r 0e652f8f1fbd camerauis/cameraxui/cxui/src/cxuidocumentloader.cpp --- a/camerauis/cameraxui/cxui/src/cxuidocumentloader.cpp Thu May 13 21:30:19 2010 +0300 +++ b/camerauis/cameraxui/cxui/src/cxuidocumentloader.cpp Thu Jul 15 01:55:05 2010 +0300 @@ -45,7 +45,7 @@ QObject *CxuiDocumentLoader::createObject(const QString& type, const QString &name) { - OstTrace0( camerax_performance, CXUIDOCUMENTLOADER_CREATEOBJECT, "msg: e_CX_DOCLOADER_CREATEOBJECT 1" ); + OstTrace0(camerax_performance, CXUIDOCUMENTLOADER_1, "msg: e_CX_DOCUMENTLOADER_CREATEOBJECT 1"); QObject *object = NULL; if (type == "HbView") { @@ -55,7 +55,7 @@ object = new CxuiVideoPrecaptureView(); } else if (name == CxUiLayout::POSTCAPTURE_VIEW) { object = new CxuiPostcaptureView(); - } else if (name == CxUiLayout::STILL_SCENES_VIEW) { + } else if (name == CxUiLayout::SCENE_MODE_VIEW) { object = new CxuiSceneModeView(NULL); } } else if (type == "HbDialog") { @@ -66,13 +66,13 @@ } else if (type == "HbSlider") { if (name == CxUiLayout::SETTINGS_SLIDER_DIALOG_CONTENT_WIDGET) { object = new CxuiSettingSlider(NULL, mEngine); - } else if (name == CxUiLayout::STILL_PRE_CAPTURE_ZOOM_SLIDER + } else if (name == CxUiLayout::STILL_PRE_CAPTURE_ZOOM_SLIDER || name == CxUiLayout::VIDEO_PRE_CAPTURE_ZOOM_SLIDER) { object = new CxuiZoomSlider(); } } else if (type == "HbRadioButtonList") { if (name == CxUiLayout::SETTINGS_DIALOG_CONTENT_WIDGET - || name == CxUiLayout::SCENE_VIEW_RADIOBUTTONS) { + || name == CxUiLayout::SCENE_MODE_VIEW_RADIOBUTTONS) { object = new CxuiSettingRadioButtonList(NULL, mEngine); } } @@ -83,7 +83,7 @@ object = HbDocumentLoader::createObject(type, name); } - OstTrace0( camerax_performance, DUP1_CXUIDOCUMENTLOADER_CREATEOBJECT, "msg: e_CX_DOCLOADER_CREATEOBJECT 0" ); + OstTrace0(camerax_performance, CXUIDOCUMENTLOADER_2, "msg: e_CX_DOCUMENTLOADER_CREATEOBJECT 0"); return object; } diff -r 3075d9b614e6 -r 0e652f8f1fbd camerauis/cameraxui/cxui/src/cxuierrormanager.cpp --- a/camerauis/cameraxui/cxui/src/cxuierrormanager.cpp Thu May 13 21:30:19 2010 +0300 +++ b/camerauis/cameraxui/cxui/src/cxuierrormanager.cpp Thu Jul 15 01:55:05 2010 +0300 @@ -16,6 +16,7 @@ */ #include +#include #include #include #include @@ -33,10 +34,10 @@ /*! * Constructor */ -CxuiErrorManager::CxuiErrorManager(CxuiCaptureKeyHandler &keyHandler,CxuiDocumentLoader *documentLoader) : - mKeyHandler(keyHandler), +CxuiErrorManager::CxuiErrorManager(CxuiDocumentLoader *documentLoader) : mDocumentLoader(documentLoader), mErrorMsgPopup(NULL), + mErrorId(CxeError::None), mErrorSeverity(CxuiErrorManager::None) { CX_DEBUG_ENTER_FUNCTION(); @@ -54,23 +55,31 @@ /*! -* Analyze the error code and act accordingly. -* @param error Error code. +* Check the error code and show either error popup, warning popup or do nothing, +* if "no error" code is given. +* @param error Error id. If CxeError::None, no action is taken. Otherwise +* either warning or error popup is shown based on the severity of error. +* */ -void CxuiErrorManager::analyze(CxeError::Id error) +void CxuiErrorManager::check(CxeError::Id error) { CX_DEBUG_ENTER_FUNCTION(); - - mErrorMsgPopup = NULL; mErrorSeverity = CxuiErrorManager::None; if (error != CxeError::None) { + mErrorId = error; + // start evaluating the error. - QString errorMsgTxt = getErrorDetails(error); + QString errorText; + QString buttonText; + getErrorDetails(errorText, buttonText); - if(mErrorSeverity != CxuiErrorManager::None) { + if (mErrorSeverity != CxuiErrorManager::None) { + // Clear the old error if one for some reason exists. + clear(); + // show the error note to the user. - launchPopup(errorMsgTxt); + launchPopup(errorText, buttonText); } else { // ignore } @@ -79,15 +88,32 @@ CX_DEBUG_EXIT_FUNCTION(); } +/*! +* Close the open error popup. +*/ +void CxuiErrorManager::clear() +{ + CX_DEBUG_ENTER_FUNCTION(); + if (mErrorMsgPopup) { + mErrorMsgPopup->close(); + mErrorMsgPopup = NULL; + } + CX_DEBUG_EXIT_FUNCTION(); +} /*! * Slot that gets called when error note is closed. */ -void CxuiErrorManager::aboutToClosePopup() +void CxuiErrorManager::popupClosed(HbAction *action) { + Q_UNUSED(action) + CX_DEBUG_ENTER_FUNCTION(); + // Dialog or action instance cannot be used anymore. + mErrorMsgPopup = NULL; + // handle any use-cases when the error can be recovered - emit errorRecovered(); + emit errorPopupClosed(); CX_DEBUG_EXIT_FUNCTION(); } @@ -109,59 +135,71 @@ * and set the severity level, based on given error code. * @param error Error code to be analyzed. */ -QString CxuiErrorManager::getErrorDetails(CxeError::Id error) +void CxuiErrorManager::getErrorDetails(QString &errorText, QString &buttonText) { CX_DEBUG_ENTER_FUNCTION(); - QString msg("No Error"); - switch(error) { + switch (mErrorId) { + case CxeError::MemoryNotAccessible: + mErrorSeverity = CxuiErrorManager::Error; + errorText = hbTrId("txt_cam_info_error_usb_disconnected"); + buttonText = hbTrId("txt_cam_info_error_usb_disconnected_button"); + break; + case CxeError::InUse: + mErrorSeverity = CxuiErrorManager::Error; + errorText = hbTrId("txt_cam_info_camera_already_in_use"); + buttonText = hbTrId("txt_common_button_close"); + break; + case CxeError::DiskFull: + mErrorSeverity = CxuiErrorManager::Warning; + errorText = hbTrId("txt_cam_info_memory_full"); + break; + case CxeError::OutOfMemory: + mErrorSeverity = CxuiErrorManager::Error; + errorText = hbTrId("txt_cam_info_error_ram_full"); + buttonText = hbTrId("txt_common_ok"); + break; case CxeError::Died: case CxeError::InitializationFailed: case CxeError::HwNotAvailable: case CxeError::NotReady: - mErrorSeverity = CxuiErrorManager::Severe; - msg = hbTrId("txt_cam_info_error"); - break; - case CxeError::InUse: - mErrorSeverity = CxuiErrorManager::Severe; - msg = hbTrId("txt_cam_info_camera_already_in_use"); - break; - case CxeError::DiskFull: - mErrorSeverity = CxuiErrorManager::Warning; - msg = hbTrId("txt_cam_info_memory_full"); default: + mErrorSeverity = CxuiErrorManager::Error; + errorText = hbTrId("txt_cam_info_error"); + buttonText = hbTrId("txt_common_button_close"); break; } CX_DEBUG_EXIT_FUNCTION(); - - return msg; } /*! -* +* Show warning or error popup. +* @param errorText Message to be shown in the popup. +* @param buttonText Button text to be shown in the action button of the popup. Not used on warning popup. */ -void CxuiErrorManager::launchPopup(QString& errorMsgTxt) +void CxuiErrorManager::launchPopup(const QString &errorText, const QString &buttonText) { CX_DEBUG_ENTER_FUNCTION(); switch (mErrorSeverity) { - case CxuiErrorManager::Warning: - showLowSeverityNote(errorMsgTxt); + case CxuiErrorManager::None: break; - case CxuiErrorManager::Severe: - case CxuiErrorManager::Critical: - showHighSeverityNote(errorMsgTxt); + case CxuiErrorManager::Warning: + showWarningPopup(errorText); break; default: + showErrorPopup(errorText, buttonText); break; } + mErrorSeverity = CxuiErrorManager::None; + CX_DEBUG_EXIT_FUNCTION(); } /*! -* Show error note for high severity error. +* Show error note for severe error. */ -void CxuiErrorManager::showHighSeverityNote(QString& errorMsgTxt) +void CxuiErrorManager::showErrorPopup(const QString &errorText, const QString &buttonText) { // we always prepare the popup for the new message and hence we load the // popup everytime from document loader @@ -175,6 +213,8 @@ mErrorMsgPopup = qobject_cast(mDocumentLoader->findWidget(CxUiLayout::ERROR_POPUP)); CX_ASSERT_ALWAYS(mErrorMsgPopup); + mErrorMsgPopup->setAttribute(Qt::WA_DeleteOnClose, true); + mErrorMsgPopup->setTimeout(HbDialog::NoTimeout); // HbDialog's default background item is replaced with black rectangle QGraphicsRectItem *backgroundItem = new QGraphicsRectItem(); @@ -184,36 +224,32 @@ backgroundItem->setRect(origBgItem->boundingRect()); mErrorMsgPopup->setBackgroundItem(backgroundItem); - mErrorMsgPopup->setTimeout(HbDialog::NoTimeout); - mErrorMsgPopup->setBackgroundFaded(false); // color of standby text is set in the code. It cannot be done in docml HbLabel* label = qobject_cast(mDocumentLoader->findWidget(CxUiLayout::ERROR_TEXT_WIDGET)); label->setTextColor(Qt::white); - label->setPlainText(errorMsgTxt); + label->setPlainText(errorText); HbPushButton *exitButton = qobject_cast(mDocumentLoader->findWidget(CxUiLayout::ERROR_BUTTON_WIDGET)); - - if(mErrorSeverity == CxuiErrorManager::Severe) { + if (!buttonText.isEmpty()) { // inform ui about error recovery - emit aboutToRecoverError(); - QObject::connect(mErrorMsgPopup, SIGNAL(aboutToClose()), this, SLOT(closeApp())); + exitButton->setText(buttonText); + connect(exitButton, SIGNAL(released()), this, SLOT(closeApp())); exitButton->show(); - } else { - // TODO handle other severity cases here. } - mErrorMsgPopup->show(); + emit errorPopupShown(); + mErrorMsgPopup->open(this, SLOT(popupClosed(HbAction*))); CX_DEBUG_EXIT_FUNCTION(); } /*! -* Show error note for low severity error. +* Show warning note for low severity error. */ -void CxuiErrorManager::showLowSeverityNote(QString& errorMsgTxt) +void CxuiErrorManager::showWarningPopup(const QString &errorText) { CX_DEBUG_ENTER_FUNCTION(); - HbMessageBox::warning(errorMsgTxt); + HbMessageBox::warning(errorText); CX_DEBUG_EXIT_FUNCTION(); } diff -r 3075d9b614e6 -r 0e652f8f1fbd camerauis/cameraxui/cxui/src/cxuieventlog.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/camerauis/cameraxui/cxui/src/cxuieventlog.cpp Thu Jul 15 01:55:05 2010 +0300 @@ -0,0 +1,84 @@ +/* +* Copyright (c) 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" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#include "cxutils.h" +#include "cxuieventlog.h" + +/*! +* Event log item constructor. +* @param type Event type description +* @param id Event id description +*/ +CxuiEventLog::CxuiEvent::CxuiEvent(const QString &type, const QString &value) + : mTime(QTime::currentTime()), mType(type), mValue(value) +{ +} + + +/*! +* Event log constructor. +* @param name Event log name. +* @param size Maximum number of events stored to log. After maximum size is encountered, +* old events are discarded as new ones are added. +*/ +CxuiEventLog::CxuiEventLog(const QString& name, int size) + : mSize(size), + mName(name) +{ +} + +/*! +* Event log destructor. +*/ +CxuiEventLog::~CxuiEventLog() +{ +} + +/*! +* Append new event to the log. +* @param type Event type description +* @param id Event id description +*/ +void CxuiEventLog::append(const QString &type, const QString &value) +{ + if (mSize) { + if (mEvents.size() >= mSize) { + mEvents.removeFirst(); + } + mEvents.append(CxuiEvent(type, value)); + } +} + +/*! +* Print out the event log. +*/ +void CxuiEventLog::print() const +{ + if (mEvents.size()) { + + CX_DEBUG(("[INFO] >>> CameraX event log[%s]", mName.toAscii().constData())); + foreach(CxuiEvent e, mEvents) { + CX_DEBUG(("[INFO] <-> event: time[%s] type[%s] value[%s]", + e.mTime.toString("HH:mm:ss.zzz").toAscii().constData(), + e.mType.toAscii().constData(), + e.mValue.toAscii().constData())); + } + CX_DEBUG(("[INFO] <<< CameraX event log[%s]", mName.toAscii().constData())); + } +} + +// end of file diff -r 3075d9b614e6 -r 0e652f8f1fbd camerauis/cameraxui/cxui/src/cxuifullscreenpopup.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/camerauis/cameraxui/cxui/src/cxuifullscreenpopup.cpp Thu Jul 15 01:55:05 2010 +0300 @@ -0,0 +1,256 @@ +/* +* Copyright (c) 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" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#include +#include +#include +#include +#include +#include +#include "cxutils.h" +#include "cxuienums.h" +#include "cxuiview.h" +#include "cxuidocumentloader.h" +#include "cxuifullscreenpopup.h" + +/*! +* Constructor. +*/ +CxuiFullScreenPopup::CxuiFullScreenPopupLoader::CxuiFullScreenPopupLoader() + : HbDocumentLoader() +{ +} + +/*! +* Create object from DocML. +* Custom type of object created when object name matches the full screen dialog one. +* Other items are propagated to HbDocumentLoader for standard handling. +* @param type Object type (class name) +* @param name Object name, name of the item in DocML. +*/ +QObject *CxuiFullScreenPopup::CxuiFullScreenPopupLoader::createObject(const QString& type, const QString &name) +{ + CX_DEBUG_ENTER_FUNCTION(); + QObject *object = NULL; + + // HbWidget as type in DocML to support UI layout tool. + if (type == "HbWidget") { + if (name == CxUiLayout::FULL_SCREEN_POPUP) { + object = new CxuiFullScreenPopup(); + } + } + + if (object) { + object->setObjectName(name); + } else { + object = HbDocumentLoader::createObject(type, name); + } + + CX_DEBUG_EXIT_FUNCTION(); + return object; +} + +/*! +* Load a full screen popup from DocML and set given message and action text to it. +* @param scene Graphics scene where to insert the popup. +* @param message Popup message text. +* @param action Popup action button text. +*/ +CxuiFullScreenPopup *CxuiFullScreenPopup::create(QGraphicsScene *scene, + const QString &message, + const QString &action) +{ + CX_DEBUG_ENTER_FUNCTION(); + + bool ok(true); + + // Load popup structure from DocML. + CxuiFullScreenPopupLoader *loader = new CxuiFullScreenPopupLoader(); + loader->load(CxUiLayout::FULL_SCREEN_POPUP_XML, &ok); + CX_ASSERT_ALWAYS(ok); + + // Popup container widget. + CxuiFullScreenPopup *popup = qobject_cast(loader->findWidget(CxUiLayout::FULL_SCREEN_POPUP)); + CX_ASSERT_ALWAYS(popup); + // Popup needs scene to move in front of all widgets. + popup->setScene(scene); + // Add background graphic for popup. + QGraphicsRectItem *bg = new QGraphicsRectItem(popup); + bg->setRect(popup->geometry()); + bg->setBrush(Qt::black); + popup->setBackgroundItem(bg); + + // Popup text. + //!@todo: Move text color definition to DocML once supported there. + HbLabel *text = qobject_cast(loader->findWidget(CxUiLayout::FULL_SCREEN_POPUP_TEXT)); + CX_ASSERT_ALWAYS(text); + text->setPlainText(message); + text->setTextColor(Qt::white); + + // Action button. + // Hidden if empty text given. + HbPushButton *button = qobject_cast(loader->findWidget(CxUiLayout::FULL_SCREEN_POPUP_BUTTON)); + CX_ASSERT_ALWAYS(button); + if (action.isEmpty()) { + CX_DEBUG(("CxuiFullScreenPopup - no button text given, hiding button..")); + button->setVisible(false); + } else { + button->setText(action); + } + + delete loader; + loader = NULL; + + CX_DEBUG_EXIT_FUNCTION(); + return popup; +} + +/*! +* Popup destructor. +*/ +CxuiFullScreenPopup::~CxuiFullScreenPopup() +{ + CX_DEBUG_ENTER_FUNCTION(); + hide(); + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! +* Handle mouse press event. +*/ +void CxuiFullScreenPopup::handleMousePress() +{ + CX_DEBUG_ENTER_FUNCTION(); + // Give standard feedback. + HbInstantFeedback feedback(HbFeedback::BasicItem); + feedback.setModalities(HbFeedback::All); + feedback.play(); + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! +* Handle mouse release event. +*/ +void CxuiFullScreenPopup::handleMouseRelease() +{ + CX_DEBUG_ENTER_FUNCTION(); + //!@todo: sound disabling doesn't work in orbit yet so don't do feedback on release + // needs to be enabled when orbit support is done + // Give tactile feedback but no sound feedback on mouse release. + /* + HbInstantFeedback feedback(HbFeedback::BasicItem); + feedback.setModalities(HbFeedback::Tactile); + feedback.play(); + CX_DEBUG_EXIT_FUNCTION(); + */ +} + +/*! +* Show the popup. +* Checks current top most item in the scene and adds this popup in front of it. +* Input to below widgets is blocked. +*/ +void CxuiFullScreenPopup::show() +{ + CX_DEBUG_ENTER_FUNCTION(); + + CX_ASSERT_ALWAYS(mScene); + + if (!mPopupShown) { + mPopupShown = true; + // Store current top item z value. + qreal topZ(topZValue()); + // Add popup widget to scene to actually get it visible. + mScene->addItem(this); + // Make sure popup is just above the top item. + setZValue(topZ + 1); + + // Block input to other widgets below the popup. + setWindowFlags(Qt::Dialog); + setPanelModality(QGraphicsItem::PanelModal); + + // Show popup. + HbWidget::show(); + } + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! +* Hide the popup. +*/ +void CxuiFullScreenPopup::hide() +{ + CX_DEBUG_ENTER_FUNCTION(); + + if (mPopupShown) { + HbWidget::hide(); + // Double check non-nullness. + if (mScene) { + mScene->removeItem(this); + } + mPopupShown = false; + } + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! +* Get the z value of top item in scene. +* @return Top (max) z value. +*/ +qreal CxuiFullScreenPopup::topZValue() const +{ + CX_DEBUG_ENTER_FUNCTION(); + + qreal z(0); + if (mScene) { + const QList itemList(mScene->items(Qt::DescendingOrder)); + foreach (QGraphicsItem *item, itemList) { + // Max of z values. + z = (item && item->zValue() > z) ? item->zValue() : z; +#ifdef CX_DEBUG + const QGraphicsObject *gObject(item->toGraphicsObject()); + CX_DEBUG(("Item of class [%s] z value [%s]", + gObject ? gObject->metaObject()->className() : qPrintable(QString("QGraphicsItem")), + qPrintable(QString::number(item->zValue())))); +#endif // CX_DEBUG + } + } else { + CX_DEBUG(("[WARNING] No scene found, returning zero")); + } + CX_DEBUG_EXIT_FUNCTION(); + return z; +} + +/*! +* Store the scene in which this popup is to be shown. +*/ +void CxuiFullScreenPopup::setScene(QGraphicsScene *scene) +{ + mScene = scene; +} + +/*! +* Popup (private) constructor. +*/ +CxuiFullScreenPopup::CxuiFullScreenPopup() + : mScene(NULL), + mPopupShown(false) +{ + CX_DEBUG_IN_FUNCTION(); +} + +// end of file diff -r 3075d9b614e6 -r 0e652f8f1fbd camerauis/cameraxui/cxui/src/cxuipostcaptureview.cpp --- a/camerauis/cameraxui/cxui/src/cxuipostcaptureview.cpp Thu May 13 21:30:19 2010 +0300 +++ b/camerauis/cameraxui/cxui/src/cxuipostcaptureview.cpp 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" @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -30,9 +29,10 @@ #include #include #include -#include +#include #include +#include #include "cxeviewfindercontrol.h" #include "cxuienums.h" @@ -40,7 +40,6 @@ #include "cxeengine.h" #include "cxecameradevicecontrol.h" #include "cxestillcapturecontrol.h" -#include "cxeviewfindercontrol.h" #include "cxevideocapturecontrol.h" #include "cxestillimage.h" #include "cxutils.h" @@ -50,75 +49,74 @@ #include "cxenamespace.h" #include "cxuiserviceprovider.h" +#ifdef Q_OS_SYMBIAN #include "OstTraceDefinitions.h" #ifdef OST_TRACE_COMPILER_IN_USE #include "cxuipostcaptureviewTraces.h" #endif +#endif //Q_OS_SYMBIAN using namespace CxUiLayout; using namespace Cxe; -// CONSTANTS -const int CXUI_HIDE_CONTROLS_TIMEOUT = 6000; // 6 seconds -const QString PhotosAppExe = "photos.exe"; -const QString VideosAppExe = "videoplayer.exe"; -//!@todo Temporarily disabled. -//const int CXUI_STOP_VIEWFINDER_TIMEOUT = 5000; // 5 seconds -//const int CXUI_RELEASE_CAMERA_TIMEOUT = 10000; // 10 seconds +namespace { + const QString FILENAME_KEY = "filename"; + const int CXUI_STOP_VIEWFINDER_TIMEOUT = 5000; // 5 seconds + const int CXUI_RELEASE_CAMERA_TIMEOUT = 60000; // 60 seconds +} -// --------------------------------------------------------------------------- -// CxuiPostcaptureView::CxuiPostcaptureView -// -// --------------------------------------------------------------------------- -// + +/*! +* Constructor. +*/ CxuiPostcaptureView::CxuiPostcaptureView(QGraphicsItem *parent) : - HbView(parent), - mMainWindow(NULL), - mEngine(NULL), + CxuiView(parent), mStillToolbar(NULL), mVideoToolbar(NULL), mEmbeddedToolbar(NULL), mBackgroundItem(NULL), mImageLabel(NULL), - mHideControlsTimeout(this), + mShareUi(NULL), mStopViewfinderTimer(this), mReleaseCameraTimer(this), mPostcaptureTimer(this), - mTimersStarted(false) + mTimersStarted(false), + mDeleteNoteOpen(false), + mFilename(QString::null), + mThumbnailManager(NULL) { CX_DEBUG_IN_FUNCTION(); CX_DEBUG_EXIT_FUNCTION(); } -// --------------------------------------------------------------------------- -// CxuiPostcaptureView::~CxuiPostcaptureView -// -// --------------------------------------------------------------------------- -// +/*! +* Destructor. +*/ CxuiPostcaptureView::~CxuiPostcaptureView() { CX_DEBUG_ENTER_FUNCTION(); QCoreApplication::instance()->removeEventFilter(this); stopTimers(); + delete mThumbnailManager; + delete mShareUi; CX_DEBUG_EXIT_FUNCTION(); } -// --------------------------------------------------------------------------- -// CxuiPostcaptureView::construct -// -// --------------------------------------------------------------------------- -// +/*! +* Second phase construction. +*/ void CxuiPostcaptureView::construct(HbMainWindow *mainwindow, CxeEngine *engine, - CxuiDocumentLoader *documentLoader) + CxuiDocumentLoader *documentLoader, + CxuiCaptureKeyHandler *keyHandler, + HbActivityManager *activityManager) { + Q_UNUSED(keyHandler); CX_DEBUG_ENTER_FUNCTION(); - mMainWindow = mainwindow; - mEngine = engine; - mDocumentLoader = documentLoader; + CxuiView::construct(mainwindow, engine, documentLoader, NULL, activityManager); // set back action to go back to pre-capture HbAction *backAction = new HbAction(Hb::BackNaviAction, this); @@ -134,6 +132,8 @@ mImageLabel = qobject_cast(widget); CX_DEBUG_ASSERT(mImageLabel); + mShareUi = new ShareUi(); + // get toolbar pointers from the documentloader widget = mDocumentLoader->findWidget(STILL_POST_CAPTURE_TOOLBAR); // This resize is a workaround to get toolbar shown correctly. @@ -177,30 +177,30 @@ CX_DEBUG_EXIT_FUNCTION(); } -// --------------------------------------------------------------------------- -// CxuiPostcaptureView::handleCaptureKeyPressed -// -// --------------------------------------------------------------------------- -// +/*! +* Handle pressing capture key. +*/ void CxuiPostcaptureView::handleCaptureKeyPressed() { CX_DEBUG_ENTER_FUNCTION(); - goToPrecaptureView(); + if (!mDeleteNoteOpen) { + goToPrecaptureView(); + } CX_DEBUG_EXIT_FUNCTION(); } -// --------------------------------------------------------------------------- -// CxuiPostcaptureView::handleAutofocusKeyPressed -// -// --------------------------------------------------------------------------- -// +/*! +* Handle pressing auto focus key. +*/ void CxuiPostcaptureView::handleAutofocusKeyPressed() { CX_DEBUG_ENTER_FUNCTION(); - goToPrecaptureView(); + if (!mDeleteNoteOpen) { + goToPrecaptureView(); + } CX_DEBUG_EXIT_FUNCTION(); } @@ -210,53 +210,74 @@ */ void CxuiPostcaptureView::playVideo() { + CX_DEBUG_ENTER_FUNCTION(); - launchNotSupportedNotification(); - //! @todo needs an implementation - CX_DEBUG_IN_FUNCTION(); + stopTimers(); + releaseCamera(); + + QString videoFile(getCurrentFilename()); + + XQAiwRequest *videoRequest = mAppManager.create( + "com.nokia.symbian.IVideoView","playMedia(QString)", true); + + if (videoRequest) { + QVariantList fileList; + fileList.append(QVariant(videoFile)); + videoRequest->setArguments(fileList); + + CX_DEBUG(("CxuiPostcaptureView: sending request")); + QVariant result; + bool res = videoRequest->send(result); + if (res) { + CX_DEBUG(("CxuiPostcaptureView: request sent, received \"%s\"", + result.toString().toAscii().constData())); + } else { + CX_DEBUG(("CxuiPostcaptureView: request sending failed, error=%d", + videoRequest->lastError())); + } + delete videoRequest; + videoRequest = NULL; + } + + CX_DEBUG_EXIT_FUNCTION(); } -// --------------------------------------------------------------------------- -// CxuiPostcaptureView::showDeleteNote -// -// --------------------------------------------------------------------------- -// +/*! +* Show delete query. +*/ void CxuiPostcaptureView::showDeleteNote() { CX_DEBUG_ENTER_FUNCTION(); hideControls(); - if (mEngine->mode() == Cxe::VideoMode) { - HbMessageBox::question(hbTrId("txt_cam_other_delete_video_clip"), - this, - SLOT(handleDeleteDialogClosed(HbAction*))); - } else { - HbMessageBox::question(hbTrId("txt_cam_other_delete_image"), - this, - SLOT(handleDeleteDialogClosed(HbAction*))); - } + QString text(mEngine->mode() == Cxe::VideoMode + ? hbTrId("txt_cam_other_delete_video_clip") + : hbTrId("txt_cam_other_delete_image")); + HbMessageBox::question(text, + this, + SLOT(handleDeleteDialogClosed(int)), + HbMessageBox::Yes | HbMessageBox::No); + + mDeleteNoteOpen = true; CX_DEBUG_EXIT_FUNCTION(); } -// --------------------------------------------------------------------------- -// CxuiPostcaptureView::handleDeleteDialogClosed -// -// --------------------------------------------------------------------------- -// -void CxuiPostcaptureView::handleDeleteDialogClosed(HbAction *action) +/*! +* Handle closing delete query dialog. +* @param action HbMessageBox::Yes if user accepted the delete query, HbMessageBox::No if not. +*/ +void CxuiPostcaptureView::handleDeleteDialogClosed(int action) { CX_DEBUG_ENTER_FUNCTION(); hideControls(); - - HbMessageBox *dlg = qobject_cast(sender()); + mDeleteNoteOpen = false; - // check that it was "primary action" that closed the dialog - if (dlg && dlg->actions().at(0) == action) { - // User confirmed delete + // Check that user confirmed delete + if (action == HbMessageBox::Yes) { QString filename = getCurrentFilename(); QFileInfo fileInfo(filename); if (fileInfo.exists()) { @@ -267,7 +288,7 @@ // is being harvested by MdS etc. QDir dir = fileInfo.absolutePath(); bool ok = dir.remove(fileInfo.fileName()); - CX_DEBUG(("Delete file [%s], status %d", fileInfo.fileName().toAscii().constData(), ok)); + CX_DEBUG(("Delete file [%s], status %d", qPrintable(fileInfo.fileName()), ok)); // Go back to precapture view goToPrecaptureView(); @@ -287,25 +308,19 @@ stopTimers(); releaseCamera(); - + hideControls(); QString filename = getCurrentFilename(); - QStringList filelist; filelist.append(filename); - ShareUi dialog; - dialog.send(filelist, true); - - showControls(); + mShareUi->send(filelist, true); CX_DEBUG_EXIT_FUNCTION(); } -// --------------------------------------------------------------------------- -// CxuiPostcaptureView::goToPrecaptureView -// -// --------------------------------------------------------------------------- -// +/*! +* Go to pre-capture view. +*/ void CxuiPostcaptureView::goToPrecaptureView() { CX_DEBUG_ENTER_FUNCTION(); @@ -317,8 +332,8 @@ // Re-enabling starting timers the next time we enter post capture view. mTimersStarted = false; - // Make sure engine prepares for new image/video if necessary - mEngine->initMode(mEngine->mode()); + // reset saved filename + mFilename = QString::null; // Switch to pre-capture view emit changeToPrecaptureView(); @@ -327,11 +342,9 @@ CX_DEBUG_EXIT_FUNCTION(); } -// --------------------------------------------------------------------------- -// CxuiPostcaptureView::stopViewfinder -// -// --------------------------------------------------------------------------- -// +/*! +* Stop viewfinder. +*/ void CxuiPostcaptureView::stopViewfinder() { CX_DEBUG_ENTER_FUNCTION(); @@ -344,32 +357,12 @@ CX_DEBUG_EXIT_FUNCTION(); } -// --------------------------------------------------------------------------- -// CxuiPostcaptureView::releaseCamera -// -// --------------------------------------------------------------------------- -// -void CxuiPostcaptureView::releaseCamera() +/*! +* Hides toolbar. +*/ +void CxuiPostcaptureView::hideToolbar() { CX_DEBUG_ENTER_FUNCTION(); - - if (mMainWindow->currentView() == this) { - mEngine->cameraDeviceControl().release(); - } - mReleaseCameraTimer.stop(); - - CX_DEBUG_EXIT_FUNCTION(); -} - -// --------------------------------------------------------------------------- -// CxuiPostcaptureView::hideControls -// -// --------------------------------------------------------------------------- -// -void CxuiPostcaptureView::hideControls() -{ - CX_DEBUG_ENTER_FUNCTION(); - if (mStillToolbar) { mStillToolbar->hide(); } @@ -379,64 +372,13 @@ if (mEmbeddedToolbar) { mEmbeddedToolbar->hide(); } - - hideItems(Hb::AllItems); - - mControlsVisible = false; - - // stop hiding control timer - mHideControlsTimeout.stop(); - - - // give the keyboard focus back to the view - // for the view to receive key events - setFocus(); - CX_DEBUG_EXIT_FUNCTION(); } -// --------------------------------------------------------------------------- -// CxuiPostcaptureView::showControls -// -// --------------------------------------------------------------------------- -// -void CxuiPostcaptureView::showControls() -{ - CX_DEBUG_ENTER_FUNCTION(); - - showToolbar(); - - showItems(Hb::AllItems); - - mHideControlsTimeout.start(CXUI_HIDE_CONTROLS_TIMEOUT); - mControlsVisible = true; - - CX_DEBUG_EXIT_FUNCTION(); -} - -// --------------------------------------------------------------------------- -// CxuiPostcaptureView::toggleControls -// -// --------------------------------------------------------------------------- -// -void CxuiPostcaptureView::toggleControls() -{ - CX_DEBUG_ENTER_FUNCTION(); - - if (mControlsVisible) { - hideControls(); - } else { - showControls(); - } - - CX_DEBUG_EXIT_FUNCTION(); -} - -// --------------------------------------------------------------------------- -// CxuiPostcaptureView::eventFilter -// -// --------------------------------------------------------------------------- -// +/*! +* Handle events. +* Needed for restarting timers. +*/ bool CxuiPostcaptureView::eventFilter(QObject *object, QEvent *event) { Q_UNUSED(object) @@ -465,31 +407,73 @@ */ void CxuiPostcaptureView::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { - OstTrace0(camerax_performance, CXUIPOSTCAPTUREVIEW_SNAPSHOT_DRAW, "msg: e_CX_SHOT_TO_SNAPSHOT 0"); - QGraphicsWidget::paint(painter, option, widget); + OstTrace0(camerax_performance, CXUIPOSTCAPTUREVIEW_SNAPSHOT_DRAW, "msg: e_CX_SHOT_TO_SNAPSHOT 0"); + QGraphicsWidget::paint(painter, option, widget); +} + +/*! + * Restore view state from activity. + * @param activityId Activity id + * @param data Activity data + */ +void CxuiPostcaptureView::restoreActivity(const QString &activityId, const QVariant &data) +{ + Q_UNUSED(activityId); + CX_DEBUG_ENTER_FUNCTION(); + + // get filename. if filename is not found (toString() returns empty string) + // we will go back to pre-capture in updateSnapshotImage() + mFilename = data.toMap()[FILENAME_KEY].toString(); + CX_DEBUG(("Got filename %s from activity", mFilename.toAscii().data())); + + CX_DEBUG_EXIT_FUNCTION(); } -// --------------------------------------------------------------------------- -// CxuiPostcaptureView::mousePressEvent -// -// --------------------------------------------------------------------------- -// -void CxuiPostcaptureView::mousePressEvent(QGraphicsSceneMouseEvent *event) +/*! + * Save view state to activity. + */ +void CxuiPostcaptureView::saveActivity() { - //! @todo temporary workaround for title bar mouse event handling bug - if (event->type() == QEvent::GraphicsSceneMousePress && event->scenePos().y() > 70) { - mPostcaptureTimer.stop(); - toggleControls(); - event->accept(); + CX_DEBUG_ENTER_FUNCTION(); + QVariantMap data; + QVariantHash params; + + QString filename = getCurrentFilename(); + CX_DEBUG(("Saving filename %s", filename.toAscii().data())); + data.insert(FILENAME_KEY, filename); + + QImage img(mMainWindow->rect().size(), QImage::Format_ARGB32_Premultiplied); + QPainter p(&img); + mMainWindow->render(&p, mMainWindow->rect(), mMainWindow->rect()); + + QPixmap screenshot = QPixmap::fromImage(img); + + params.insert("screenshot", screenshot); + if (mEngine->mode() == Cxe::ImageMode) { + mActivityManager->removeActivity(CxuiActivityIds::STILL_POSTCAPTURE_ACTIVITY); + mActivityManager->addActivity(CxuiActivityIds::STILL_POSTCAPTURE_ACTIVITY, data, params); + } else { + mActivityManager->removeActivity(CxuiActivityIds::VIDEO_POSTCAPTURE_ACTIVITY); + mActivityManager->addActivity(CxuiActivityIds::VIDEO_POSTCAPTURE_ACTIVITY, data, params); } - + CX_DEBUG_EXIT_FUNCTION(); } -// --------------------------------------------------------------------------- -// CxuiPostcaptureView::showEvent -// -// --------------------------------------------------------------------------- -// +/*! + * Clear activity from activity manager. + */ +void CxuiPostcaptureView::clearActivity() +{ + CX_DEBUG_ENTER_FUNCTION(); + mActivityManager->removeActivity(CxuiActivityIds::STILL_POSTCAPTURE_ACTIVITY); + mActivityManager->removeActivity(CxuiActivityIds::VIDEO_POSTCAPTURE_ACTIVITY); + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! +* Show event for this view. +* Update snapshot and start timers. +*/ void CxuiPostcaptureView::showEvent(QShowEvent *event) { CX_DEBUG_ENTER_FUNCTION(); @@ -508,11 +492,10 @@ CX_DEBUG_EXIT_FUNCTION(); } -// --------------------------------------------------------------------------- -// CxuiPostcaptureView::hideEvent -// -// --------------------------------------------------------------------------- -// +/*! +* Hide event. +* Release snapshot and stop timers. +*/ void CxuiPostcaptureView::hideEvent(QHideEvent *event) { CX_DEBUG_ENTER_FUNCTION(); @@ -581,41 +564,50 @@ CX_DEBUG_EXIT_FUNCTION(); } -// --------------------------------------------------------------------------- -// CxuiPostcaptureView::setImage -// -// --------------------------------------------------------------------------- -// +/*! + * Updates snapshot image. In normal case snapshot is retrieved from engine + * but if we are restoring camera to post-capture through activity, then + * we get snapshot from thumbnail manager. + */ void CxuiPostcaptureView::updateSnapshotImage() { CX_DEBUG_ENTER_FUNCTION(); - QPixmap snapshot; + if (!mFilename.isNull()) { + CX_DEBUG(("CxuiPostcaptureView::updateSnapshot restoring activity")); + // filename set, we are restoring activity + if (QFile::exists(mFilename)) { + CX_DEBUG(("Filename ok, requesting thumbnail from TNM")); + if (!mThumbnailManager) { + mThumbnailManager = new ThumbnailManager(); + connect(mThumbnailManager, SIGNAL(thumbnailReady(QPixmap, void *, int, int)), + this, SLOT(handleThumbnailReady(QPixmap, void*, int, int))); + mThumbnailManager->setThumbnailSize(ThumbnailManager::ThumbnailLarge); + } + mThumbnailManager->getThumbnail(mFilename); + CX_DEBUG(("Thumbnail requested")); - if (mEngine->mode() == ImageMode) { - if( mEngine->stillCaptureControl().imageCount() > 0 ) { - snapshot = mEngine->stillCaptureControl()[0].snapshot(); + } else { + // file deleted + CX_DEBUG(("File %s has been deleted, going back to pre-capture", mFilename.toAscii().data())); + goToPrecaptureView(); } } else { - snapshot = mEngine->videoCaptureControl().snapshot(); + QPixmap snapshot; + if (mEngine->mode() == ImageMode) { + if( mEngine->stillCaptureControl().imageCount() > 0 ) { + snapshot = mEngine->stillCaptureControl()[0].snapshot(); + } + } else { + snapshot = mEngine->videoCaptureControl().snapshot(); + } + if (mImageLabel) { + mImageLabel->setIcon(HbIcon(QIcon(snapshot))); + } else { + // do nothing + } } - if (mImageLabel) { - mImageLabel->setIcon(HbIcon(QIcon(snapshot))); - } else { - // do nothing - } - - CX_DEBUG_EXIT_FUNCTION(); -} - -/*! - Launches "Not supported yet" notification. - */ -void CxuiPostcaptureView::launchNotSupportedNotification() -{ - CX_DEBUG_ENTER_FUNCTION(); - HbNotificationDialog::launchDialog("Notification", "Not supported yet"); CX_DEBUG_EXIT_FUNCTION(); } @@ -626,6 +618,15 @@ { CX_DEBUG_ENTER_FUNCTION(); + if (!mFilename.isNull()) { + // post-capture started by activity, engine doesn't contain correct + // filename anymore so use the stored one + CX_DEBUG(("Using filename saved in activity")); + CX_DEBUG_EXIT_FUNCTION(); + return mFilename; + } + + CX_DEBUG(("Getting filename from engine")); QString filename; if (mEngine->mode() == Cxe::VideoMode) { @@ -645,14 +646,6 @@ } /*! - Launches the Photos applications as a separate process -*/ -void CxuiPostcaptureView::launchPhotosApp() -{ - QProcess::startDetached(PhotosAppExe); -} - -/*! Sends current capture to client app and closes camera */ void CxuiPostcaptureView::select() @@ -667,71 +660,126 @@ } /*! - Launches the Videos applications as a separate process +* Handle exiting standby. */ -void CxuiPostcaptureView::launchVideosApp() +void CxuiPostcaptureView::exitStandby() { - //Releasing cameda device in order to free - //graphical memory - releaseCamera(); - QProcess::startDetached(VideosAppExe); + CX_DEBUG_ENTER_FUNCTION(); + + // Common functionality first. + CxuiView::exitStandby(); + + //!@note We should not start timers until we receive the ShowEvent + showControls(); + + CX_DEBUG_EXIT_FUNCTION(); } /*! - Handle cases when we loose focus +* Handle entering standby. */ -void CxuiPostcaptureView::handleFocusLost() +void CxuiPostcaptureView::enterStandby() { CX_DEBUG_ENTER_FUNCTION(); - // we have lost focus - releaseCamera(); + // Common functionality (release camera). + CxuiView::enterStandby(); + stopTimers(); hideControls(); CX_DEBUG_EXIT_FUNCTION(); } +/*! + * Handle thumbnail received from ThumbnailManager. + * + * @param thumbnail Thumbnail as QPixmap + * @param clientData Not used + * @param id Thumbnail manager request id + * @param errorCode Error code + */ +void CxuiPostcaptureView::handleThumbnailReady(QPixmap thumbnail, void *clientData, int id, int errorCode) +{ + CX_DEBUG_ENTER_FUNCTION(); + Q_UNUSED(clientData); + Q_UNUSED(id); + + if (thumbnail.isNull()) { + CX_DEBUG(("Received null thumbnail from TNM, going to pre-capture. Error=%d", errorCode)); + // null thumbnail, go to precapture + goToPrecaptureView(); + } else if (mImageLabel) { + mImageLabel->setIcon(HbIcon(QIcon(thumbnail))); + } + + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! + Start the timers +*/ void CxuiPostcaptureView::startTimers() { CX_DEBUG_ENTER_FUNCTION(); // we start timers only once in a given postcapture view session - if (!mTimersStarted) { - int postCaptureTimeout = 0; - QString settingId; - - if (mEngine->mode() == ImageMode) { - settingId = CxeSettingIds::STILL_SHOWCAPTURED; - } else { - settingId = CxeSettingIds::VIDEO_SHOWCAPTURED; - } - - if (!CxuiServiceProvider::isCameraEmbedded()) { - CxeError::Id err = mEngine->settings().get(settingId, postCaptureTimeout); - - if (postCaptureTimeout > 0 && err == CxeError::None) { - mPostcaptureTimer.start(postCaptureTimeout); - } else { - // do nothing - } - } - - // start the hide control timer. - mHideControlsTimeout.start(CXUI_HIDE_CONTROLS_TIMEOUT); - - //! @todo Temporarily disabling release timer because of - // graphics memory problems related to releasing and reserving again. - // mReleaseCameraTimer.start(CXUI_RELEASE_CAMERA_TIMEOUT); - // mStopViewfinderTimer.start(CXUI_STOP_VIEWFINDER_TIMEOUT); - - // we make sure that timers are started only once in a given postcaptureview session + if(!mTimersStarted) { + startPostcaptureTimer(); + startReleaseTimers(); mTimersStarted = true; } - // show controls when we get back focus - showControls(); + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! + Start the timer to return to pre-capture view +*/ +void CxuiPostcaptureView::startPostcaptureTimer() +{ + CX_DEBUG_ENTER_FUNCTION(); + + if (!mFilename.isNull()) { + // restored from activity, don't do post-capture timeout + CX_DEBUG_EXIT_FUNCTION(); + return; + } + + int postCaptureTimeout = 0; + QString settingId; + + if (mEngine->mode() == ImageMode) { + settingId = CxeSettingIds::STILL_SHOWCAPTURED; + } else { + settingId = CxeSettingIds::VIDEO_SHOWCAPTURED; + } + + if (!CxuiServiceProvider::isCameraEmbedded()) { + CxeError::Id err = mEngine->settings().get(settingId, postCaptureTimeout); + + if (postCaptureTimeout > 0 && err == CxeError::None) { + mPostcaptureTimer.start(postCaptureTimeout); + } else { + // do nothing + } + } + + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! + Start the timers to stop viewfinder and release the camera +*/ +void CxuiPostcaptureView::startReleaseTimers() +{ + CX_DEBUG_ENTER_FUNCTION(); + + // Release camera and stop viewfinder if user stays in postcapture long enough. + // Battery could otherwise drain fast. + mReleaseCameraTimer.start(CXUI_RELEASE_CAMERA_TIMEOUT); + mStopViewfinderTimer.start(CXUI_STOP_VIEWFINDER_TIMEOUT); CX_DEBUG_EXIT_FUNCTION(); } @@ -746,7 +794,7 @@ mPostcaptureTimer.stop(); mStopViewfinderTimer.stop(); - // Note: mTimersStarted is intentionally not reset here. + //!@note mTimersStarted is intentionally not reset here. // Once the timers are stopped, they are not to be started again until // we come from precapture view again. // E.g. returning from background could otherwise restart the timers and diff -r 3075d9b614e6 -r 0e652f8f1fbd camerauis/cameraxui/cxui/src/cxuiprecaptureview.cpp --- a/camerauis/cameraxui/cxui/src/cxuiprecaptureview.cpp Thu May 13 21:30:19 2010 +0300 +++ b/camerauis/cameraxui/cxui/src/cxuiprecaptureview.cpp 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" @@ -16,7 +16,6 @@ */ #include -#include #include #include #include @@ -55,48 +54,37 @@ #include "cxuisettingslider.h" #include "cxuisettingsinfo.h" #include "OstTraceDefinitions.h" +#include "cxuiserviceprovider.h" +#include "cxuizoomslider.h" +#include "cxuifullscreenpopup.h" + #ifdef OST_TRACE_COMPILER_IN_USE #include "cxuiprecaptureviewTraces.h" #endif -#include "cxuiserviceprovider.h" -#include "cxuizoomslider.h" - - -// CONSTANTS -const int CXUI_HIDE_CONTROLS_TIMEOUT = 6000; // 6 seconds -const QString PhotosAppExe = "photos.exe"; -const QString VideosAppExe = "videoplayer.exe"; +#include "cxegeotaggingtrail.h" using namespace CxUiLayout; using namespace CxUiSettings; using namespace CxUiInternal; - // --------------------------------------------------------------------------- // CxuiPrecaptureView::CxuiPrecaptureView // Constructor // --------------------------------------------------------------------------- // CxuiPrecaptureView::CxuiPrecaptureView(QGraphicsItem *parent) : - HbView(parent), - mEngine(0), + CxuiView(parent), mViewfinder(0), - mMainWindow(0), - mDocumentLoader(0), mDisplayHandler(0), - mControlsVisible(false), - mHideControlsTimeout(this), - mSlider(0), - mToolBar(0), mSettingsGrid(0), - mZoomVisible(false), mWidgetsLoaded(false), mSettingsDialog(NULL), mSettingsDialogList(NULL), - mKeyHandler(NULL), mQualityIcon(NULL), - mIndicators(NULL), + mGeoTaggingIndicatorIcon(NULL), + mFaceTrackingIcon(NULL), + mStandbyPopup(NULL), mSettingsDialogHeading(NULL), mSliderSettingsDialog(NULL), mSliderSettingsDialogHeading(NULL), @@ -118,22 +106,23 @@ CX_DEBUG_EXIT_FUNCTION(); } - +/** + * CxuiPrecaptureView::construct + * Construct-method handles initialisation tasks for this class. + * @param mainwindow + * @param engine + * @param documentLoader + * @param keyHandler + */ void CxuiPrecaptureView::construct(HbMainWindow *mainWindow, CxeEngine *engine, CxuiDocumentLoader *documentLoader, - CxuiCaptureKeyHandler * keyHandler) + CxuiCaptureKeyHandler * keyHandler, + HbActivityManager *activityManager) { CX_DEBUG_ENTER_FUNCTION(); - OstTrace0( camerax_performance, CXUIPRECAPTUREVIEW_CONSTRUCT, "msg: e_CX_PRECAPVIEW_CONST 1" ); + OstTrace0(camerax_performance, CXUIPRECAPTUREVIEW_CONSTRUCT_1, "msg: e_CX_PRECAPVIEW_CONSTRUCT 1"); - CX_ASSERT_ALWAYS(mainWindow); - CX_ASSERT_ALWAYS(engine); - CX_ASSERT_ALWAYS(documentLoader); - - mMainWindow = mainWindow; - mEngine = engine; - mDocumentLoader = documentLoader; - mKeyHandler = keyHandler; + CxuiView::construct(mainWindow, engine, documentLoader, keyHandler, activityManager); mSettingsInfo = new CxuiSettingsInfo(engine); CX_DEBUG_ASSERT(mSettingsInfo); @@ -150,6 +139,9 @@ connect(&mEngine->viewfinderControl(), SIGNAL(stateChanged(CxeViewfinderControl::State, CxeError::Id)), this, SLOT(handleVfStateChanged(CxeViewfinderControl::State, CxeError::Id))); + connect(&mEngine->geoTaggingTrail(), SIGNAL(stateChanged(CxeGeoTaggingTrail::State, CxeError::Id)), + this, SLOT(updateLocationIndicator(CxeGeoTaggingTrail::State, CxeError::Id))); + connect(&(mEngine->settings()), SIGNAL(settingValueChanged(const QString&,QVariant)), this, SLOT(handleSettingValueChanged(const QString&, QVariant))); @@ -167,30 +159,21 @@ connect(exitAction, SIGNAL(triggered()), CxuiServiceProvider::instance(), SLOT(sendFilenameToClientAndExit())); setNavigationAction(exitAction); } - OstTrace0( camerax_performance, DUP1_CXUIPRECAPTUREVIEW_CONSTRUCT, "msg: e_CX_PRECAPVIEW_CONST 0" ); + + OstTrace0(camerax_performance, CXUIPRECAPTUREVIEW_CONSTRUCT_2, "msg: e_CX_PRECAPVIEW_CONSTRUCT 0"); QCoreApplication::instance()->installEventFilter(this); CX_DEBUG_EXIT_FUNCTION(); } - -// --------------------------------------------------------------------------- -// CxuiPrecaptureView::prepareWindow -// -// --------------------------------------------------------------------------- -// -void CxuiPrecaptureView::prepareWindow() +/*! +* Is standby mode supported / needed by this view. +* Pre-capture views implement / need standby mode and return true. +* @return True if standby mode is supported, false otherwise. +*/ +bool CxuiPrecaptureView::isStandbyModeSupported() const { - CX_DEBUG_ENTER_FUNCTION(); - - if (mMainWindow) { - mEngine->viewfinderControl().setWindow(mMainWindow->effectiveWinId()); - setFlag(QGraphicsItem::ItemIsFocusable); - setFocusPolicy(Qt::StrongFocus); - setFocus(); - } - - CX_DEBUG_EXIT_FUNCTION(); + return true; } // --------------------------------------------------------------------------- @@ -240,93 +223,6 @@ } // --------------------------------------------------------------------------- -// CxuiPrecaptureView::hideControls -// -// --------------------------------------------------------------------------- -// -void CxuiPrecaptureView::hideControls() -{ - CX_DEBUG_ENTER_FUNCTION(); - - hideItems(Hb::AllItems); - hideZoom(); - mControlsVisible = false; - if (mHideControlsTimeout.isActive()) { - mHideControlsTimeout.stop(); - } - hideToolbar(); - - // show indicators when controls are hidden - showIndicators(); - - // give the keyboard focus back to the view - // for the view to receive key events - setFocus(); - - CX_DEBUG_EXIT_FUNCTION(); -} - -// --------------------------------------------------------------------------- -// CxuiPrecaptureView::hideToolbar -// -// --------------------------------------------------------------------------- -// -void CxuiPrecaptureView::hideToolbar() -{ - CX_DEBUG_ENTER_FUNCTION(); - if (mToolBar) { - mToolBar->hide(); - } - CX_DEBUG_EXIT_FUNCTION(); -} - -// --------------------------------------------------------------------------- -// CxuiPrecaptureView::hideZoom -// -// --------------------------------------------------------------------------- -// -void CxuiPrecaptureView::hideZoom() -{ - if (mSlider) { - mSlider->hide(); - } - mZoomVisible = false; -} - -// --------------------------------------------------------------------------- -// CxuiPrecaptureView::showZoom -// -// --------------------------------------------------------------------------- -// -void CxuiPrecaptureView::showZoom() -{ - CX_DEBUG_ENTER_FUNCTION(); - if (mSlider) { - - // if maxVal has not been set yet, ask for new parameters from engine - if (mSlider->maximum() <= 0) { - - // get the zoom range - int min = mEngine->zoomControl().min(); - int max = mEngine->zoomControl().max(); - - // only change values if they are acceptable and have changed - if ((max - min > 0) && ((mSlider->maximum() != max) || (mSlider->minimum() != min))) { - mSlider->setRange(min, max); - } - } - - // show zoom only if the slider has acceptable value - if (mSlider->maximum() > 0) { - mSlider->show(); - } - } - - mZoomVisible = true; - CX_DEBUG_EXIT_FUNCTION(); -} - -// --------------------------------------------------------------------------- // CxuiPrecaptureView::toggleZoom // // --------------------------------------------------------------------------- @@ -340,77 +236,6 @@ } } -// --------------------------------------------------------------------------- -// CxuiPrecaptureView::hideIndicators -// -// --------------------------------------------------------------------------- -// -void CxuiPrecaptureView::hideIndicators() -{ - if (mIndicators) { - mIndicators->hide(); - } -} - -// --------------------------------------------------------------------------- -// CxuiPrecaptureView::showIndicators -// -// --------------------------------------------------------------------------- -// -void CxuiPrecaptureView::showIndicators() -{ - if (mIndicators) { - mIndicators->show(); - } -} - -// --------------------------------------------------------------------------- -// CxuiPrecaptureView::showControls -// -// --------------------------------------------------------------------------- -// -void CxuiPrecaptureView::showControls() -{ - if (mEngine) { - bool videoCases = (mEngine->videoCaptureControl().state() == CxeVideoCaptureControl::Recording || - mEngine->videoCaptureControl().state() == CxeVideoCaptureControl::Paused); - - if (mEngine->isEngineReady() || videoCases) { - // show toolbar - showToolbar(); - // show zoom - showZoom(); - // show titlepane - showItems(Hb::AllItems); - - // hide indicators when controls are shown - hideIndicators(); - - mHideControlsTimeout.start(); - mControlsVisible = true; - } - } -} - -// --------------------------------------------------------------------------- -// CxuiPrecaptureView::showToolbar -// shows toolbar -// --------------------------------------------------------------------------- -// -void CxuiPrecaptureView::showToolbar() -{ - - CX_DEBUG_ENTER_FUNCTION(); - - // toolbar pointer is missing if widgets for the view have not been loaded - // from the DocML - if (mToolBar) { - mToolBar->show(); - } - - CX_DEBUG_EXIT_FUNCTION(); -} - /* * Event filter which filters tool bar mouse events and @@ -419,17 +244,23 @@ bool CxuiPrecaptureView::eventFilter(QObject *object, QEvent *event) { - Q_UNUSED(object) - bool eventWasConsumed = false; switch (event->type()) { case QEvent::GraphicsSceneMouseRelease: - mHideControlsTimeout.start(); + if (mStandbyPopup) { + mStandbyPopup->handleMouseRelease(); + } else { + mHideControlsTimeout.start(); + } break; case QEvent::GraphicsSceneMousePress: - mHideControlsTimeout.stop(); + if (object == mStandbyPopup) { + mStandbyPopup->handleMousePress(); + } else { + mHideControlsTimeout.stop(); + } break; default: break; @@ -452,27 +283,7 @@ // call load widgets to load app DocML and get the pointers to needed widgets loadWidgets(); } - - if (mControlsVisible) { - hideControls(); - } else { - showControls(); - } -} - - -// --------------------------------------------------------------------------- -// CxuiPrecaptureView::mousePressEvent -// -// --------------------------------------------------------------------------- -// -void CxuiPrecaptureView::mousePressEvent(QGraphicsSceneMouseEvent *event) -{ - //! @todo temporary workaround for title bar mouse event handling bug - if (event->type() == QEvent::GraphicsSceneMousePress && event->scenePos().y() > 70) { - toggleControls(); - event->accept(); - } + CxuiView::toggleControls(); } // --------------------------------------------------------------------------- @@ -582,16 +393,6 @@ CX_DEBUG_EXIT_FUNCTION(); } -// --------------------------------------------------------------------------- -// CxuiPrecaptureView::releaseCamera -// --------------------------------------------------------------------------- -void CxuiPrecaptureView::releaseCamera() -{ - CX_DEBUG_ENTER_FUNCTION(); - mEngine->cameraDeviceControl().release(); - CX_DEBUG_EXIT_FUNCTION(); -} - // --------------------------------------------------------------------------- // CxuiPrecaptureView::initCamera @@ -631,18 +432,48 @@ CX_DEBUG_EXIT_FUNCTION(); } - -/* - * CxuiPrecaptureView::handleFocusGained - */ -void CxuiPrecaptureView::handleFocusGained() +/*! +* Slot for entering standby mode. +* Show standby canvas in addition to base class implementation. +* @sa CxuiView::enterStandby() +*/ +void CxuiPrecaptureView::enterStandby() { CX_DEBUG_ENTER_FUNCTION(); - // Set the window size and handle again. - prepareWindow(); + // Release camera right away to avoid any problems with GPU memory. + CxuiView::enterStandby(); + + // If this view is still the current view, show popup. + // If we moved to precapture view because (error) standby during capturing, + // don't try show the popup. + if (mMainWindow->currentView() == this) { + // Show standby canvas / popup. + if (!mStandbyPopup) { + mStandbyPopup = CxuiFullScreenPopup::create(scene(), hbTrId("txt_cam_info_camera_in_standby_mode")); + } + mStandbyPopup->show(); + } + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! +* Slot for exiting standby mode. +* Hide the standby canvas and re-prepare camera. +* @sa CxuiView::exitStandby() +*/ +void CxuiPrecaptureView::exitStandby() +{ + CX_DEBUG_ENTER_FUNCTION(); + CxuiView::exitStandby(); + + if (mStandbyPopup) { + mStandbyPopup->hide(); + delete mStandbyPopup; + mStandbyPopup = NULL; + } + initCamera(); - CX_DEBUG_EXIT_FUNCTION(); } @@ -671,15 +502,21 @@ */ void CxuiPrecaptureView::prepareToCloseDialog(HbAction *action) { - if (!action) { - return; - } - // Check if the dialog was started from grid, and show the grid now if needed. // Autofocus key-press will clear the action to disable showing the grid. - QString fromGrid = action->property(PROPERTY_KEY_SETTING_GRID).toString(); - if (fromGrid.compare(QString(PROPERTY_KEY_TRUE)) == 0 ) { - showSettingsGrid(); + if (action) { + QString fromGrid = action->property(PROPERTY_KEY_SETTING_GRID).toString(); + if (fromGrid.compare(QString(PROPERTY_KEY_TRUE)) == 0 ) { + showSettingsGrid(); + } + // disable geotagging disclaimer after geotagging setting is triggered from FirstTimeUse dialog + QString settingId = action->property(PROPERTY_KEY_SETTING_ID).toString(); + int value = Cxe::GeoTaggingDisclaimerDisabled; + mEngine->settings().get(CxeSettingIds::GEOTAGGING_DISCLAIMER, value); + if (settingId == CxeSettingIds::GEOTAGGING && value == Cxe::GeoTaggingDisclaimerEnabled) { + // disable geotagging first-time-use dialog + disableGeotaggingDisclaimer(); + } } // Clear the starter actions to be sure they are not reused. @@ -689,6 +526,16 @@ if (mSliderSettingsDialog) { mSliderSettingsDialog->setStarterAction(NULL); } + + // Dialog will be deleted automatically when closed + // The pointers may become invalid at any time + mSettingsDialog = NULL; + mSettingsDialogList = NULL; + mSettingsDialogHeading = NULL; + + mSliderSettingsDialog = NULL; + mSliderSettingsDialogHeading = NULL; + mSettingsSlider = NULL; } @@ -748,6 +595,8 @@ return; } + hideControls(); + QString key = action->property(PROPERTY_KEY_SETTING_ID).toString(); CX_DEBUG(("settingsKey=%s", key.toAscii().constData())); @@ -794,7 +643,9 @@ // Adjust position and show the dialog. mSettingsDialog->setPreferredPos(getDialogPosition(), HbPopup::BottomRightCorner); + mSettingsDialog->setAttribute(Qt::WA_DeleteOnClose, true); mSettingsDialog->show(); + } } else { launchNotSupportedNotification(); @@ -856,6 +707,8 @@ return; } + hideControls(); + QString key = action->property(PROPERTY_KEY_SETTING_ID).toString(); CX_DEBUG(("settingsKey=%s", key.toAscii().constData())); @@ -903,7 +756,9 @@ // Adjust position and show the dialog. mSliderSettingsDialog->setFrameType(HbPopup::Weak); mSliderSettingsDialog->setPreferredPos(getDialogPosition(), HbPopup::BottomRightCorner); + mSliderSettingsDialog->setAttribute(Qt::WA_DeleteOnClose, true); mSliderSettingsDialog->show(); + } } else { launchNotSupportedNotification(); @@ -912,42 +767,6 @@ CX_DEBUG_EXIT_FUNCTION(); } -void CxuiPrecaptureView::launchPhotosApp() -{ - QProcess::startDetached(PhotosAppExe); -} - -/*! - * Launching Videos application as a separate process - */ -void CxuiPrecaptureView::launchVideosApp() -{ - //Releasing cameda device in order to free - //graphical memory - releaseCamera(); - QProcess::startDetached(VideosAppExe); -} - -/*! -* Show "not supported" notification. -*/ -void CxuiPrecaptureView::launchNotSupportedNotification() -{ - CX_DEBUG_ENTER_FUNCTION(); - HbNotificationDialog::launchDialog("Notification", "Not supported yet"); - CX_DEBUG_EXIT_FUNCTION(); -} - -/*! -* Show "Disk full" notification. -*/ -void CxuiPrecaptureView::launchDiskFullNotification() -{ - CX_DEBUG_ENTER_FUNCTION(); - HbMessageBox::warning(hbTrId("txt_cam_info_memory_full")); - CX_DEBUG_EXIT_FUNCTION(); -} - /** * Show settings grid. */ @@ -980,80 +799,6 @@ CX_DEBUG_EXIT_FUNCTION(); } -/** -* 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. -*/ -bool CxuiPrecaptureView::isPostcaptureOn() const -{ - CX_DEBUG_ENTER_FUNCTION(); - if (CxuiServiceProvider::isCameraEmbedded()) { - // always show post capture in embedded mode - return true; - } - - // Read the value from settings. Ignoring reading error. - // On error (missing settings) default to "postcapture on". - int showPostcapture(-1); - QString key; - if(mEngine) { - if (mEngine->mode() == Cxe::ImageMode) { - key = CxeSettingIds::STILL_SHOWCAPTURED; - } else { - key = CxeSettingIds::VIDEO_SHOWCAPTURED; - } - mEngine->settings().get(key, showPostcapture); - } - - CX_DEBUG_EXIT_FUNCTION(); - return showPostcapture != 0; // 0 == no postcapture -} - -/*! -* Adding zoom buttons to the slider -* \param slider Pointer to the slider object, where the buttons will be added -*/ -void CxuiPrecaptureView::addIncreaseDecreaseButtons(CxuiZoomSlider *slider) -{ - // get current slider elements - QList elements = slider->sliderElements(); - - // add increase and decrease elements to the slider - elements << HbSlider::IncreaseElement << HbSlider::DecreaseElement; - slider->setSliderElements(elements); - - // set icons for the increase and decrease element - slider->setElementIcon(HbSlider::DecreaseElement , HbIcon("qtg_mono_minus")); - slider->setElementIcon(HbSlider::IncreaseElement , HbIcon("qtg_mono_plus")); -} - - -/*! -* Function can be used to create a graphics item and setting it as a background -* item for HbWidget. graphicName refers to system wide graphic name. Given graphic -* can consist of one, three or nine pieces. Nine piece graphics are used by default. -* See HbFrameDrawer documentation for graphic naming. -*/ -void CxuiPrecaptureView::createWidgetBackgroundGraphic(HbWidget *widget, - const QString &graphicName, - HbFrameDrawer::FrameType frameType) -{ - if (widget) { - HbFrameDrawer *drawer = new HbFrameDrawer(graphicName, frameType); - - if (drawer) { - HbFrameItem *backgroundItem = new HbFrameItem(drawer, widget); - if (backgroundItem) { - // set item to fill the whole widget - backgroundItem->setGeometry(QRectF(QPointF(0, 0), widget->size())); - backgroundItem->setZValue(0); - widget->setBackgroundItem(backgroundItem); - } - } - } -} - /*! * Returns dialogs bottom right corner */ @@ -1103,33 +848,6 @@ return icon; } -/*! - Update the quality indicator -*/ -void CxuiPrecaptureView::updateQualityIcon() -{ - CX_DEBUG_ENTER_FUNCTION(); - - if (mQualityIcon && mEngine) { - QString key = ""; - QString icon = ""; - int currentValue = -1; - - if (mEngine->mode() == Cxe::VideoMode) { - key = CxeSettingIds::VIDEO_QUALITY; - } else { - key = CxeSettingIds::IMAGE_QUALITY; - } - - mEngine->settings().get(key, currentValue); - icon = getSettingItemIcon(key, currentValue); - - mQualityIcon->setIcon(HbIcon(icon)); - } - - CX_DEBUG_EXIT_FUNCTION(); -} - void CxuiPrecaptureView::handleSettingValueChanged(const QString& key, QVariant newValue) { CX_DEBUG_ENTER_FUNCTION(); @@ -1138,4 +856,91 @@ CX_DEBUG_EXIT_FUNCTION(); } +/*! + * Slot to keep track of state changes in GeotaggingLocation trail. We use these states to update + * the UI by enabling right icon. + */ +void CxuiPrecaptureView::updateLocationIndicator(CxeGeoTaggingTrail::State newState, CxeError::Id error) +{ + CX_DEBUG( ("CxuiPrecaptureView::updateLocationIndicator <> error: %d ", error)); + + if (mGeoTaggingIndicatorIcon) { + if (newState == CxeGeoTaggingTrail::DataAvailable && error == CxeError::None) { + CX_DEBUG(("CxuiPrecaptureView::updateLocationIndicator GPS data available, showing icon")); + mGeoTaggingIndicatorIcon->setIcon(HbIcon("qtg_mono_geotag")); + mGeoTaggingIndicatorIcon->show(); + } else { + CX_DEBUG(("CxuiPrecaptureView::handleIconChanged GPS data not available")); + mGeoTaggingIndicatorIcon->hide(); + } + } + + CX_DEBUG_EXIT_FUNCTION(); +} + + +/*! +* Lauches "Geotagging first-time use" notification to the user +*/ +void CxuiPrecaptureView::launchGeoTaggingDisclaimerDialog() +{ + CX_DEBUG_ENTER_FUNCTION(); + + HbMessageBox *ftuMessageBox = new HbMessageBox(hbTrId("txt_cam_info_captured_photos_and_videos_will_be_ta"), + HbMessageBox::MessageTypeInformation); + + HbAction *okAction = new HbAction(hbTrId("txt_common_button_ok")); + HbAction *settingsAction = new HbAction(hbTrId("txt_cam_opt_general_settings")); + + // connecting signals for dialog's actions + connect(okAction, + SIGNAL(triggered()), + this, + SLOT(disableGeotaggingDisclaimer())); + + connect(settingsAction, + SIGNAL(triggered()), + this, + SLOT(launchGeoTaggingSetting())); + + // adding buttons to the information message + ftuMessageBox->setStandardButtons(HbMessageBox::NoButton); + ftuMessageBox->addAction(okAction); + ftuMessageBox->addAction(settingsAction); + + ftuMessageBox->setAttribute(Qt::WA_DeleteOnClose, true); + ftuMessageBox->show(); + + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! +* Slot that disables Geotagging first-time use notification. +*/ +void CxuiPrecaptureView::disableGeotaggingDisclaimer() +{ + CX_DEBUG_ENTER_FUNCTION(); + + // disable geotagging first-time-use dialog + mEngine->settings().set(CxeSettingIds::GEOTAGGING_DISCLAIMER, Cxe::GeoTaggingDisclaimerDisabled); + + CX_DEBUG_EXIT_FUNCTION(); +} + + +/*! +* Slot that launches geotagging setting dialog. +*/ +void CxuiPrecaptureView::launchGeoTaggingSetting() +{ + CX_DEBUG_ENTER_FUNCTION(); + + QObject *action = sender(); + action->setProperty(PROPERTY_KEY_SETTING_ID, CxeSettingIds::GEOTAGGING); + launchSettingsDialog(action); + + CX_DEBUG_EXIT_FUNCTION(); +} + // end of file + diff -r 3075d9b614e6 -r 0e652f8f1fbd camerauis/cameraxui/cxui/src/cxuiscenemodeview.cpp --- a/camerauis/cameraxui/cxui/src/cxuiscenemodeview.cpp Thu May 13 21:30:19 2010 +0300 +++ b/camerauis/cameraxui/cxui/src/cxuiscenemodeview.cpp Thu Jul 15 01:55:05 2010 +0300 @@ -15,6 +15,7 @@ * */ #include +#include #include "cxenamespace.h" #include "cxesettings.h" @@ -49,13 +50,10 @@ * Constructor */ CxuiSceneModeView::CxuiSceneModeView(QGraphicsItem *parent) : - HbView(parent), - mMainWindow(NULL), + CxuiView(parent), mSettingsInfo(NULL), - mEngine(NULL), - mDocumentLoader(NULL), - mCaptureKeyHandler(NULL), - mScenesBackground(NULL) + mScenesBackground(NULL), + mScenesHeading(NULL) { CX_DEBUG_IN_FUNCTION(); } @@ -80,20 +78,19 @@ void CxuiSceneModeView::construct(HbMainWindow *mainwindow, CxeEngine *engine, CxuiDocumentLoader *documentLoader, - CxuiCaptureKeyHandler *keyHandler) + CxuiCaptureKeyHandler *keyHandler, + HbActivityManager *activityManager) { CX_DEBUG_ENTER_FUNCTION(); + CxuiView::construct(mainwindow, engine, documentLoader, keyHandler, activityManager); - mMainWindow = mainwindow; - mDocumentLoader = documentLoader; - mCaptureKeyHandler = keyHandler; - mEngine = engine; mSettingsInfo = new CxuiSettingsInfo(mEngine); setContentFullScreen(true); loadDefaultWidgets(); - mCameraReleaseTimer.setInterval(CXUI_SCENES_CAMERA_TIMEOUT); - connect(&mCameraReleaseTimer, SIGNAL(timeout()), this, SLOT(releaseCameraHw()), Qt::UniqueConnection); + mCameraReleaseTimer.setInterval(CXUI_SCENES_CAMERA_TIMEOUT); + mCameraReleaseTimer.setSingleShot(true); + connect(&mCameraReleaseTimer, SIGNAL(timeout()), this, SLOT(releaseCamera()), Qt::UniqueConnection); CX_DEBUG_EXIT_FUNCTION(); } @@ -108,21 +105,27 @@ QGraphicsWidget *widget = NULL; - widget = mDocumentLoader->findWidget(SCENE_VIEW_CONTAINER); + widget = mDocumentLoader->findWidget(SCENE_MODE_VIEW_CONTAINER); mScenesContainer = qobject_cast (widget); + mScenesHeading = qobject_cast( + mDocumentLoader->findWidget(SCENE_MODE_VIEW_HEADING_WIDGET)); + CX_ASSERT_ALWAYS(mScenesHeading); + //Now let's retreive the pointer to icon widget - widget = mDocumentLoader->findWidget(SCENE_VIEW_BG_IMAGE); + widget = mDocumentLoader->findWidget(SCENE_MODE_VIEW_BG_IMAGE); mScenesBackground = qobject_cast (widget); - widget = mDocumentLoader->findWidget(SCENE_VIEW_BG_IMAGE2); + widget = mDocumentLoader->findWidget(SCENE_MODE_VIEW_BG_IMAGE2); mScenesBackground2 = qobject_cast (widget); //Assuming that the automatic scene mode is always the default one CX_DEBUG(("CxuiSceneModeView::loadDefaultWidgets -> Now setting default image")); - mScenesBackground->setIcon(HbIcon(CXUI_SCENES_AUTOMATIC_IMAGE)); + HbIcon background(CXUI_SCENES_AUTOMATIC_IMAGE); + background.setMirroringMode(HbIcon::LayoutDirection); + mScenesBackground->setIcon(background); - widget = mDocumentLoader->findWidget(SCENE_VIEW_RADIOBUTTONS); + widget = mDocumentLoader->findWidget(SCENE_MODE_VIEW_RADIOBUTTONS); mScenesList = qobject_cast (widget); mTransitionAnimation = new QPropertyAnimation(mScenesBackground2, "opacity"); @@ -130,6 +133,10 @@ createWidgetBackgroundGraphic(mScenesContainer, TRANSPARENT_BACKGROUND_GRAPHIC); + //!@todo: View flags property is missing from HbView, + // so can't properly hide title bar / status bar there. + hideControls(); + connectSignals(); CX_DEBUG_EXIT_FUNCTION(); @@ -145,31 +152,6 @@ } /*! -* Function can be used to create a graphics item and setting it as a background -* item for HbWidget. graphicName refers to system wide graphic name. Given graphic -* can consist of one, three or nine pieces. Nine piece graphics are used by default. -* See HbFrameDrawer documentation for graphic naming. -*/ -void CxuiSceneModeView::createWidgetBackgroundGraphic(HbWidget *widget, - const QString &graphicName, - HbFrameDrawer::FrameType frameType) -{ - if (widget) { - HbFrameDrawer *drawer = new HbFrameDrawer(graphicName, frameType); - - if (drawer) { - HbFrameItem *backgroundItem = new HbFrameItem(drawer, widget); - if (backgroundItem) { - // set item to fill the whole widget - backgroundItem->setGeometry(QRectF(QPointF(0, 0), widget->size())); - backgroundItem->setZValue(0); - widget->setBackgroundItem(backgroundItem); - } - } - } -} - -/*! * This public method assumes that the view is already properly constructed */ void CxuiSceneModeView::loadBackgroundImages() @@ -184,10 +166,16 @@ mSettingPairList = data.mSettingPairList; mScenesList->init(&data); + if (mScenesHeading) { + mScenesHeading->setPlainText(data.mHeading); + } + if (mScenesBackground) { QString sceneId; mEngine->settings().get(data.mSettingId, sceneId); - mScenesBackground->setIcon(HbIcon(backgroundForScene(sceneId))); + HbIcon background(backgroundForScene(sceneId)); + background.setMirroringMode(HbIcon::LayoutDirection); + mScenesBackground->setIcon(background); } else { //First time displaying a list //Assuming that the automatic scene mode is always the default one and is on top of the list @@ -197,6 +185,28 @@ } /*! + * Save view state to activity. Scene mode view doesn't have it's own activity, just save + * correct pre-capture view. + */ +void CxuiSceneModeView::saveActivity() +{ + CX_DEBUG_ENTER_FUNCTION(); + QVariantMap data; + QVariantHash params; + + //@todo: add pre-capture icon as screenshot + if (mEngine->mode() == Cxe::ImageMode) { + mActivityManager->removeActivity(CxuiActivityIds::STILL_PRECAPTURE_ACTIVITY); + mActivityManager->addActivity(CxuiActivityIds::STILL_PRECAPTURE_ACTIVITY, data, params); + } else { + mActivityManager->removeActivity(CxuiActivityIds::VIDEO_PRECAPTURE_ACTIVITY); + mActivityManager->addActivity(CxuiActivityIds::VIDEO_PRECAPTURE_ACTIVITY, data, params); + } + + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! * Handle selecting value in scene list. */ void CxuiSceneModeView::handleSceneRadiobuttonPress(int index) @@ -205,7 +215,9 @@ CxUiSettings::SettingItem item = mSettingPairList.at(index); QString sceneId = item.mValue.toString(); - mScenesBackground2->setIcon(HbIcon(backgroundForScene(sceneId))); + HbIcon background(backgroundForScene(sceneId)); + background.setMirroringMode(HbIcon::LayoutDirection); + mScenesBackground2->setIcon(background); startBackgroundTransition(); CX_DEBUG_EXIT_FUNCTION(); } @@ -218,25 +230,25 @@ QString CxuiSceneModeView::backgroundForScene(const QString& sceneId) { //!@todo: This mapping should be added to the setting xml. - if (sceneId == CxeSettingIds::IMAGE_SCENE_AUTO) { + if (sceneId == Cxe::IMAGE_SCENE_AUTO) { return CXUI_SCENES_AUTOMATIC_IMAGE; - } else if (sceneId == CxeSettingIds::IMAGE_SCENE_PORTRAIT) { + } else if (sceneId == Cxe::IMAGE_SCENE_PORTRAIT) { return CXUI_SCENES_PORTRAIT_IMAGE; - } else if (sceneId == CxeSettingIds::IMAGE_SCENE_SCENERY) { + } else if (sceneId == Cxe::IMAGE_SCENE_SCENERY) { return CXUI_SCENES_LANDSCAPE_IMAGE; - } else if (sceneId == CxeSettingIds::IMAGE_SCENE_MACRO) { + } else if (sceneId == Cxe::IMAGE_SCENE_MACRO) { return CXUI_SCENES_CLOSEUP_IMAGE; - } else if (sceneId == CxeSettingIds::IMAGE_SCENE_SPORTS) { + } else if (sceneId == Cxe::IMAGE_SCENE_SPORTS) { return CXUI_SCENES_SPORT_IMAGE; - } else if (sceneId == CxeSettingIds::IMAGE_SCENE_NIGHT) { + } else if (sceneId == Cxe::IMAGE_SCENE_NIGHT) { return CXUI_SCENES_NIGHT_IMAGE; - } else if (sceneId == CxeSettingIds::IMAGE_SCENE_NIGHTPORTRAIT) { + } else if (sceneId == Cxe::IMAGE_SCENE_NIGHTPORTRAIT) { return CXUI_SCENES_NIGHT_PORTRAIT_IMAGE; - } else if (sceneId == CxeSettingIds::VIDEO_SCENE_AUTO) { + } else if (sceneId == Cxe::VIDEO_SCENE_AUTO) { return CXUI_SCENES_AUTOMATIC_IMAGE; - } else if (sceneId == CxeSettingIds::VIDEO_SCENE_LOWLIGHT) { + } else if (sceneId == Cxe::VIDEO_SCENE_LOWLIGHT) { return CXUI_SCENES_LOW_LIGHT_IMAGE; - } else if (sceneId == CxeSettingIds::VIDEO_SCENE_NIGHT) { + } else if (sceneId == Cxe::VIDEO_SCENE_NIGHT) { return CXUI_SCENES_NIGHT_IMAGE; } else { return ""; @@ -302,6 +314,24 @@ } /*! +* Allow showing UI controls? +* Title bar and other UI chrome is never shown in scene mode view. +*/ +bool CxuiSceneModeView::allowShowControls() const +{ + return false; +} + +/*! + * Play feedback when touching view outside of any widget? + * Feedback is not played in scene mode view. + */ +bool CxuiSceneModeView::isFeedbackEnabled() const +{ + return false; +} + +/*! * Slot to handle capture key full press. */ void CxuiSceneModeView::handleCaptureKeyPressed() @@ -329,22 +359,10 @@ CX_DEBUG_ENTER_FUNCTION(); mScenesList->handleClose(); mScenesBackground->setIcon(HbIcon()); - // Make sure engine prepares for new image/video if necessary - mEngine->initMode(mEngine->mode()); + mScenesHeading = NULL; emit viewCloseEvent(); CX_DEBUG_EXIT_FUNCTION(); } -/*! -* Slot to handle camera hw release timeout -*/ -void CxuiSceneModeView::releaseCameraHw() -{ - CX_DEBUG_ENTER_FUNCTION(); - mCameraReleaseTimer.stop(); - mEngine->cameraDeviceControl().release(); - CX_DEBUG_EXIT_FUNCTION(); -} - // end of file diff -r 3075d9b614e6 -r 0e652f8f1fbd camerauis/cameraxui/cxui/src/cxuiselftimer.cpp --- a/camerauis/cameraxui/cxui/src/cxuiselftimer.cpp Thu May 13 21:30:19 2010 +0300 +++ b/camerauis/cameraxui/cxui/src/cxuiselftimer.cpp 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" @@ -18,6 +18,10 @@ #include #include +#ifdef Q_OS_SYMBIAN +#include +#endif + #include "cxuiselftimer.h" #include "cxutils.h" #include "cxuienums.h" @@ -37,9 +41,12 @@ */ // constants + const int CONTINUOUS_POSTCAPTURE = -1; const int UNKNOWN = -99; +const static QString SELFTIMER_SOUND = "z:\\system\\sounds\\digital\\selftimer.wav"; + CxuiSelfTimer::CxuiSelfTimer(CxeSettings &settings) : mDelay(-1), mCounter(0), @@ -49,13 +56,38 @@ mTimerLabel(NULL), mCancelButton(NULL), mStartButton(NULL), - mSettings(settings) + mSettings(settings), + mSound(SELFTIMER_SOUND), + mUseSound(true) { CX_DEBUG_ENTER_FUNCTION(); connect(&mTimer, SIGNAL(timeout()), this, SLOT(timeout())); mTimer.setSingleShot(false); + // connect to capture sound signal in order to monitor + // warning tone changes + connect(&mSettings, + SIGNAL(settingValueChanged(long int, unsigned long int, QVariant)), + this, SLOT(enableSound(long int, unsigned long int, QVariant))); + + // get initial warning tone value from profile + QVariant value(0); + +#ifdef Q_OS_SYMBIAN + // get current profile setting for using camerasound + // camera sound follows warning tone setting + unsigned long int key = KProEngActiveWarningTones; + long int uid = KCRUidProfileEngine.iUid; + mSettings.get(uid, key, Cxe::Repository, value); +#endif + + // possible values are: + // 0 -> warning tones off + // 1 -> warning tones on + mUseSound = (value.toInt() == 1); + CX_DEBUG(("Warning tones enabled [%d]", value.toInt())); + CX_DEBUG_EXIT_FUNCTION(); } @@ -124,6 +156,14 @@ return mTimer.isActive(); } +/*! + Returns current timeout value of selftimer. + */ +int CxuiSelfTimer::getTimeout() const +{ + return mDelay; +} + /*! Slot for canceling the selftimer. Disables selftimer, sets back the postcapturetimeout if it has been changed by selftimer and emits signal to notify interested @@ -173,9 +213,13 @@ // so the UI seems to update smoother. updateWidgets(); + playSound(); + // Check if timer ran out if (mCounter >= mDelay) { mTimer.stop(); + mSound.stop(); + hideWidgets(); emit timerFinished(); } @@ -183,14 +227,37 @@ } /*! - Slot for resetting the selftimer countdown. Countdown is stopped, - and set back to starting value. Start button is set enabled. - + * Play selftimer sound. */ -void CxuiSelfTimer::reset() +void CxuiSelfTimer::playSound() { CX_DEBUG_ENTER_FUNCTION(); - reset(true); + + // play sounds only if warning tones are enabled + if (mUseSound) { + CX_DEBUG(("play")); + + int timeLeft = mDelay - mCounter; + + if (timeLeft <= 3) { + // play as fast as we can + if (mSound.isFinished()) { + mSound.setLoops(-1); + mSound.play(); + } + } else if (timeLeft <= 10) { + // play every second + mSound.setLoops(1); + mSound.play(); + } else { + // play once every two seconds + if (mCounter%2) { + mSound.setLoops(1); + mSound.play(); + } + } + } + CX_DEBUG_EXIT_FUNCTION(); } @@ -221,6 +288,7 @@ // start countdown mCounter = 0; + playSound(); mTimer.start(1000); // 1000 milliseconds == 1 second CX_DEBUG_EXIT_FUNCTION(); @@ -262,6 +330,7 @@ { // Stop timer and reset counter. mTimer.stop(); + mSound.stop(); mCounter = 0; // Set start buttonback to enabled. @@ -320,6 +389,29 @@ mWidgetContainer->hide(); } - +} +/*! + * Enables or disables the selftimer sound. + * \param uid UID of the changed setting + * \param key Key of the changed setting + * \param value New setting value + */ +void CxuiSelfTimer::enableSound(long int uid, unsigned long int key, QVariant value) +{ +#ifdef Q_OS_SYMBIAN + // selftimer is only interested in warning tones + if (uid == KCRUidProfileEngine.iUid && key == KProEngActiveWarningTones) { + CX_DEBUG_IN_FUNCTION(); + // possible values are: + // 0 -> warning tones off + // 1 -> warning tones on + mUseSound = (value.toInt() == 1); + } +#else + Q_UNUSED(uid); + Q_UNUSED(key); + Q_UNUSED(value); +#endif } + diff -r 3075d9b614e6 -r 0e652f8f1fbd camerauis/cameraxui/cxui/src/cxuisettingradiobuttonlist.cpp --- a/camerauis/cameraxui/cxui/src/cxuisettingradiobuttonlist.cpp Thu May 13 21:30:19 2010 +0300 +++ b/camerauis/cameraxui/cxui/src/cxuisettingradiobuttonlist.cpp 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" @@ -38,7 +38,9 @@ connect(this, SIGNAL(itemSelected(int)), this, SLOT(handleItemSelected(int))); } - +/*! +* Init contents of the listbox and select current setting value. +*/ void CxuiSettingRadioButtonList::init(CxUiSettings::RadioButtonListParams *data) { // first we reset the model and clear any previous data @@ -67,29 +69,74 @@ setSettingId(data->mSettingId); setListBoxType(data->mListboxType); + + // Store the original setting value and focus matching item. + QString value; + mEngine->settings().get(mSettingId, value); + CX_DEBUG(("CxuiSettingRadioButtonList - original value: [%s]", qPrintable(value))); + setOriginalSelectedItemByValue(QVariant(value)); + } +} + +/*! + * Sets the original selection of list by value. Can be used to override value read from + * CxeSettings or used to remember previously selected value in case of setting that is + * not read from CxeSettings (e.g. selftimer) + */ +void CxuiSettingRadioButtonList::setOriginalSelectedItemByValue(const QVariant &value) +{ + CX_DEBUG_ENTER_FUNCTION(); + + // Find the index of given value among setting values. + // Default to first item, if given value is not found. + int index = mSettingValues.indexOf(QVariant(value)); + if (index < 0) { + CX_DEBUG(("[WARNING] Value [%s] not found, selecting first item", qPrintable(value.toString()))); + index = 0; } + // Store the original value. + mOriginalIndex = index; + // Select the index with current value item. + setSelected(index); + // Ensure that currently selected item is visible. + scrollTo(currentIndex()); + + CX_DEBUG_EXIT_FUNCTION(); } +/*! +* Set list texts. +* @param values List of the texts. +*/ void CxuiSettingRadioButtonList::setItems(const QStringList &values) { mListModel->setItems(values); } +/*! +* Set the type of this list. +* @param type Type identifier, SingleLine or TwoLine. +*/ void CxuiSettingRadioButtonList::setListBoxType(int type) { mListModel->setListBoxType(type); } - +/*! +* Set id of the setting this list represents. +* @param id Id of the setting. +*/ void CxuiSettingRadioButtonList::setSettingId(const QString &id) { // Selected item is updated, when this list is shown. mSettingId = id; } - - +/*! +* Handle selecting an item. +* @param index Index of the selected item in list. +*/ void CxuiSettingRadioButtonList::handleItemSelected(int index) { CX_DEBUG_ENTER_FUNCTION(); @@ -102,41 +149,6 @@ CX_DEBUG_EXIT_FUNCTION(); } -void CxuiSettingRadioButtonList::showEvent(QShowEvent *event) -{ - CX_DEBUG_ENTER_FUNCTION(); - - initOriginalSelectedItem(); - QGraphicsWidget::showEvent(event); - - CX_DEBUG_EXIT_FUNCTION(); -} - - -/*! -* Get the value currently active in settings. -*/ -void CxuiSettingRadioButtonList::initOriginalSelectedItem() -{ - CX_DEBUG_ENTER_FUNCTION(); - - QString value; - int err = mEngine->settings().get(mSettingId, value); - CX_DEBUG(("CxuiSettingRadioButtonList - original value: [%s]", value.toAscii().data())); - - int index = 0; - - if (err == CxeError::None) { - index = mSettingValues.indexOf(QVariant(value)); - CX_DEBUG(("CxuiSettingRadioButtonList - got original index of: %d", index)); - } - - mOriginalIndex = index; - setSelected(mOriginalIndex); - - CX_DEBUG_EXIT_FUNCTION(); -} - /*! This slot can be used to set the selection accepted. */ @@ -153,6 +165,11 @@ CX_DEBUG_EXIT_FUNCTION(); } +/*! +* Handle closing the listbox. If the current selection was accepted, +* we commit the new value here. If current selection has been cancelled, +* we commit the original value. +*/ void CxuiSettingRadioButtonList::handleClose() { CX_DEBUG_ENTER_FUNCTION(); @@ -173,18 +190,18 @@ /*! - Commits value to the cenrep store. + Commits value to settings. */ void CxuiSettingRadioButtonList::commit(int index) { CX_DEBUG_ENTER_FUNCTION(); - CX_DEBUG(("id: %s", mSettingId.toAscii().data())); + CX_DEBUG(("CxuiSettingRadioButtonList - id: %s", qPrintable(mSettingId))); if (!mSettingId.isEmpty() && !mSettingValues.isEmpty()) { QVariant value = mSettingValues.at(index); if (value.type() == QVariant::Int) { - CX_DEBUG(("index:%d value:%d", index, value.toInt())); + CX_DEBUG(("CxuiSettingRadioButtonList - index:%d value:%d", index, value.toInt())); // Don't set the value again, if it is the current value. // For e.g. video quality it would result in re-preparation etc. @@ -198,11 +215,11 @@ emit valueSelected(value.toInt()); } else if (value.type() == QVariant::String) { - CX_DEBUG(("index:%d value:[%s]", index, value.toString().toAscii().constData())); + CX_DEBUG(("CxuiSettingRadioButtonList - index:%d value:[%s]", index, qPrintable(value.toString()))); QString current; CxeError::Id status(mEngine->settings().get(mSettingId, current)); - CX_DEBUG(("settings model value:[%s]", current.toAscii().constData())); + CX_DEBUG(("CxuiSettingRadioButtonList - settings model value:[%s]", qPrintable(current))); if (status != CxeError::None || current != value.toString()) { mEngine->settings().set(mSettingId, value.toString()); diff -r 3075d9b614e6 -r 0e652f8f1fbd camerauis/cameraxui/cxui/src/cxuisettingradiobuttonlistmodel.cpp --- a/camerauis/cameraxui/cxui/src/cxuisettingradiobuttonlistmodel.cpp Thu May 13 21:30:19 2010 +0300 +++ b/camerauis/cameraxui/cxui/src/cxuisettingradiobuttonlistmodel.cpp 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" @@ -19,6 +19,7 @@ #include "cxutils.h" // debug #include "cxuienums.h" +#include "cxuisettingsinfo.h" #include "cxuisettingradiobuttonlist.h" #include "cxuisettingradiobuttonlistmodel.h" @@ -79,10 +80,12 @@ CX_DEBUG(("CxuiSettingRadioButtonListModel: Listbox type is TwoLineListBox")); // two line list box // get the two strings - QStringList lines = setting.split(","); - QString first = lines[0]; - QString second = lines[1]; - list << first << second ; + QStringList lines = setting.split(CxUiSettings::NEW_LINE_CHAR); + // Split returns always atleast a single element list. + list << lines[0]; + if (lines.size() > 1) { + list << lines[1]; + } } else { CX_DEBUG(("CxuiSettingRadioButtonListModel: Listbox type is SingleLine")); list << setting; @@ -90,7 +93,7 @@ data = QVariant(list); } else { - CX_DEBUG(("[WARNING] CxuiSettingRadioButtonListModel: role is not DisplayRole!")); + // No action } CX_DEBUG_EXIT_FUNCTION(); diff -r 3075d9b614e6 -r 0e652f8f1fbd camerauis/cameraxui/cxui/src/cxuisettingsinfo.cpp --- a/camerauis/cameraxui/cxui/src/cxuisettingsinfo.cpp Thu May 13 21:30:19 2010 +0300 +++ b/camerauis/cameraxui/cxui/src/cxuisettingsinfo.cpp Thu Jul 15 01:55:05 2010 +0300 @@ -18,6 +18,7 @@ #include #include #include +#include #include "cxutils.h" #include "cxuienums.h" @@ -83,21 +84,12 @@ * CxuiSettingsInfo::CxuiSettingsInfo */ CxuiSettingsInfo::CxuiSettingsInfo(CxeEngine *engine) -: mEngine(engine) + : mMode(-1), mEngine(engine) { CX_DEBUG_ENTER_FUNCTION(); CX_ASSERT_ALWAYS(engine); mXmlReader = new CxuiSettingXmlReader(); - - // Initialize for the mode already so that the UI - // can already use the settings info even if engine isn't ready yet. - initForCurrentMode(CxeError::None); - - // Follow engine mode changes - connect(&engine->cameraDeviceControl(), SIGNAL(initModeComplete(CxeError::Id)), - this, SLOT(initForCurrentMode(CxeError::Id))); - CX_DEBUG_EXIT_FUNCTION(); } @@ -125,6 +117,9 @@ { CX_DEBUG_ENTER_FUNCTION(); + // Check that right content is loaded. Load now if not. + checkMode(); + bool found(false); if (key == CxeSettingIds::IMAGE_QUALITY || @@ -154,6 +149,9 @@ { CX_DEBUG_ENTER_FUNCTION(); + // Check that right content is loaded. Load now if not. + checkMode(); + bool found(false); if (mXmlReader) { @@ -209,30 +207,31 @@ int index = 0; // get the localized possible strings for each image quality setting - QString vga = hbTrId("txt_cam_dblist_vga"); - QString normal = hbTrId("txt_cam_dblist_ln_mpix"); - QString imagesLeft = hbTrId("txt_cam_dblist_hd_720p_val_ln_images_left"); - QString widescreen = hbTrId("txt_cam_dblist_ln_mpix_widescreen"); + QString vga = "txt_cam_dblist_vga"; + QString normal = "txt_cam_dblist_ln_mpix"; + QString imagesLeft = "txt_cam_dblist_hd_720p_val_ln_images_left"; + QString widescreen = "txt_cam_dblist_ln_mpix_widescreen"; foreach(CxeImageDetails quality, list) { // mapping the right value for each quality QString settingString; QString qualityIcon = ""; + qreal pxCount = quality.mMpxCount.toDouble(); if (quality.mWidth == KResVGA.width() && quality.mHeight == KResVGA.height()) { - settingString.append(vga); + settingString.append(hbTrId(vga.toAscii().constData())); settingString.append(" "); } if (quality.mAspectRatio == Cxe::AspectRatio16to9) { - settingString.append(widescreen.arg(quality.mMpxCount)); + settingString.append(hbTrId(widescreen.toAscii().constData()).arg(pxCount,0,'g',3)); } else { - settingString.append(normal.arg(quality.mMpxCount)); + settingString.append(hbTrId(normal.toAscii().constData()).arg(pxCount,0,'g',3)); } - settingString.append(","); - settingString.append(imagesLeft.arg(quality.mPossibleImages)); + settingString.append(NEW_LINE_CHAR); + settingString.append(HbParameterLengthLimiter(imagesLeft.toAscii().constData(), quality.mPossibleImages)); CX_DEBUG(( "Image quality setting string: %s", settingString.toAscii().constData())); if (quality.mMpxCount == "12") { @@ -307,7 +306,7 @@ qualityIcon = "qtg_mono_vga_wide"; } - settingString.append(","); + settingString.append(NEW_LINE_CHAR); time.sprintf("%02d:%02d", quality.mRemainingTime / 60, quality.mRemainingTime % 60); settingString.append(timeleft.arg(time)); @@ -326,23 +325,33 @@ CX_DEBUG_EXIT_FUNCTION(); } -/** -* Load new setting content based on the new mode. +/*! +* Check that the right content for current mode is loaded. +* +* UI gets "settings changed" / "scene changed" events quite +* early when switching mode (image / video). We cannot rely +* on CxeCameraDeviceControl::initModeComplete signal since +* that would be coming too late. (We would be using setting XML +* for the old mode, and setting keys/values/icons would not +* be found.) Better check this whenever UI requests for +* content for a setting, and reload the XML when needed. +* @see CxuiSettingsInfo::getSettingsContent(const QString &, RadioButtonListParams &) +* @see CxuiSettingsInfo::getSettingsContent(const QString &, SliderParams &) +* @see CxeCameraDeviceControl::initModeComplete(CxeError::Id) */ -void CxuiSettingsInfo::initForCurrentMode(CxeError::Id status) +void CxuiSettingsInfo::checkMode() { CX_DEBUG_ENTER_FUNCTION(); - if (status == CxeError::None) { + int oldMode = mMode; + mMode = mEngine->cameraDeviceControl().mode(); + if (mMode != oldMode) { // Select the setting XML file based on mode. QString sourceXml(mEngine->cameraDeviceControl().mode() == Cxe::ImageMode ? CxUiSettings::IMAGE_SETTING_MAPPING_FILE : CxUiSettings::VIDEO_SETTING_MAPPING_FILE); mXmlReader->setXmlSource(sourceXml); - } else { - // Clear XML reader content on error. - mXmlReader->setXmlSource(QString()); } CX_DEBUG_EXIT_FUNCTION(); diff -r 3075d9b614e6 -r 0e652f8f1fbd camerauis/cameraxui/cxui/src/cxuisettingxmlreader.cpp --- a/camerauis/cameraxui/cxui/src/cxuisettingxmlreader.cpp Thu May 13 21:30:19 2010 +0300 +++ b/camerauis/cameraxui/cxui/src/cxuisettingxmlreader.cpp Thu Jul 15 01:55:05 2010 +0300 @@ -18,6 +18,7 @@ #include #include #include +#include #include "cxutils.h" @@ -34,7 +35,8 @@ static const char *TAG_SETTING_LIST = "setting_list"; static const char *TAG_SETTING_SLIDER = "setting_slider"; static const char *TAG_ITEM = "item"; - static const char *TAG_ITEM_VARIANT = "lnItem"; + static const char *TAG_ITEM_VARIANT_LN = "lnItem"; + static const char *TAG_ITEM_VARIANT_L1 = "l1Item"; static const char *TAG_SETUP = "setup"; static const char *ATTRIBUTE_ID = "id"; @@ -47,6 +49,7 @@ static const char *ATTRIBUTE_VALUE = "value"; static const char *ATTRIBUTE_LOCALIZATION_ID = "string"; static const char *ATTRIBUTE_LOCALIZATION_ID_LN_VALUE = "lnValue"; + static const char *ATTRIBUTE_LOCALIZATION_ID_L1_VALUE = "l1Value"; static const char *ATTRIBUTE_SLIDER_MIN = "min"; static const char *ATTRIBUTE_SLIDER_MAX = "max"; @@ -310,18 +313,26 @@ value.setValue(string); } - // get the string text id from the xml, and format based on type. string = e.attribute(ATTRIBUTE_LOCALIZATION_ID); if (e.tagName() == TAG_ITEM) { - // get the localizable string from the hbtrid + // string without parameters: get localised string string = hbTrId(string.toAscii().constData()); - } else if (e.tagName() == TAG_ITEM_VARIANT) { + CX_DEBUG(("tag name <%s>", e.tagName().toAscii().constData())); + } else if (e.tagName() == TAG_ITEM_VARIANT_L1) { + // string with numeric parameter: get localised string and add numeric parameter + QString l1Value = e.attribute(ATTRIBUTE_LOCALIZATION_ID_L1_VALUE); + string = hbTrId(string.toAscii().constData()).arg(l1Value.toInt()); + CX_DEBUG(("tag name <%s>", e.tagName().toAscii().constData())); + CX_DEBUG(("attribute [%s] value[%s]", ATTRIBUTE_LOCALIZATION_ID_L1_VALUE, + string.toAscii().constData())); + } else if (e.tagName() == TAG_ITEM_VARIANT_LN) { QString lnValue = e.attribute(ATTRIBUTE_LOCALIZATION_ID_LN_VALUE); - // format the setting string - string = hbTrId(string.toAscii().constData(), lnValue.toInt()); + // string with count parameter: get localised string and add plural form numeric parameter + string = HbParameterLengthLimiter(string.toAscii().constData(), lnValue.toInt()); + CX_DEBUG(("tag name <%s>", e.tagName().toAscii().constData())); + CX_DEBUG(("attribute [%s] value[%s]", ATTRIBUTE_LOCALIZATION_ID_LN_VALUE, string.toAscii().constData())); } - CX_DEBUG(("attribute [%s] value[%s]", ATTRIBUTE_LOCALIZATION_ID, string.toAscii().constData())); if (!string.isNull()) { CxUiSettings::SettingItem setting; @@ -382,14 +393,14 @@ stepString = e.attribute(ATTRIBUTE_SLIDER_MAJOR_STEP); p->mMajorStep = stepString.toReal(); - // get the ln value from xml to generate strings for slider - QString lnValue = e.attribute(ATTRIBUTE_LOCALIZATION_ID_LN_VALUE); + // get the l1 value from xml to generate strings for slider + QString l1Value = e.attribute(ATTRIBUTE_LOCALIZATION_ID_L1_VALUE); // Don't create labels for slider if no strings are defined in settinsg xml // Create labels only for major ticks if (!minString.isEmpty() && !maxString.isEmpty()) { qreal step = p->mMajorStep; - qreal value = lnValue.toDouble(); + qreal value = l1Value.toDouble(); // generating all negative valued strings for slider setting while (value > 0) { // format the setting string @@ -401,7 +412,7 @@ // generating all non-negative valued strings for slider setting step = p->mMajorStep; value = 0; - while(value <= lnValue.toInt()) { + while(value <= l1Value.toInt()) { // format the setting string QString str = hbTrId(maxString.toAscii().constData()).arg(value,0,'f',1); p->mSettingStrings.append(str); @@ -409,8 +420,8 @@ } } - int min = -lnValue.toInt(); - int max = lnValue.toInt(); + int min = -l1Value.toInt(); + int max = l1Value.toInt(); p->mRange = qMakePair(min, max); } diff -r 3075d9b614e6 -r 0e652f8f1fbd camerauis/cameraxui/cxui/src/cxuistandby.cpp --- a/camerauis/cameraxui/cxui/src/cxuistandby.cpp Thu May 13 21:30:19 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,240 +0,0 @@ -/* -* Copyright (c) 2009 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" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -#include -#include -#include -#include -#include -#include -#include - -#include "cxutils.h" -#include "cxeengine.h" -#include "cxuienums.h" -#include "cxuistandby.h" -#include "cxuidocumentloader.h" -#include "cxeviewfindercontrol.h" -#include "cxuicapturekeyhandler.h" -#include "cxestillcapturecontrol.h" -#include "cxevideocapturecontrol.h" - - - -/* -* CxuiStandby::CxuiStandby -*/ -CxuiStandby::CxuiStandby(CxuiCaptureKeyHandler &keyHandler,CxuiDocumentLoader *documentLoader, CxeEngine *engine) -: mKeyHandler(keyHandler), - mDocumentLoader(documentLoader), - mEngine(engine), - mStandbyPopup(NULL), - mStandbyDialogVisible(false) -{ - CX_DEBUG_ENTER_FUNCTION(); - CX_ASSERT_ALWAYS(engine); - - // initialize standby timer - mStandbyTimer = new QTimer(this); - - // install event filter for application wide events - QCoreApplication::instance()->installEventFilter(this); - - CX_ASSERT_ALWAYS(mStandbyTimer); - connect(mStandbyTimer, SIGNAL(timeout()), this, SLOT(toStandby())); - mStandbyTimer->setSingleShot(true); - - CX_DEBUG_EXIT_FUNCTION(); -} - - - -/* -* CxuiStandby::~CxuiStandby() -*/ -CxuiStandby::~CxuiStandby() -{ - CX_DEBUG_IN_FUNCTION(); - // remove the event filter - QCoreApplication::instance()->removeEventFilter(this); - // stop standby timer - stopTimer(); -} - - -/* -* stops standby timer -*/ -void CxuiStandby::stopTimer() -{ - if(mStandbyTimer) { - mStandbyTimer->stop(); - } -} - -/* -* starts standby timer -*/ -void CxuiStandby::startTimer() -{ - if(mStandbyTimer) { - mStandbyTimer->start(CXUI_STANDBY_CAMERA_TIMEOUT); - } -} - - -/* -* handles mouse press events -* returns if mouse key press is consumed. -*/ -bool CxuiStandby::handleMouseEvent() -{ - bool keyHandled = false; - - // close the dialog if it's visible - if (mStandbyDialogVisible && mStandbyPopup) { - CX_DEBUG(( "closing the popup mStandbyDialogVisible = : %d", mStandbyDialogVisible )); - mStandbyPopup->close(); - keyHandled = true; - } else if (mStandbyTimer && mStandbyTimer->isActive()) { - // restart the timer only if it's running - startTimer(); - } - - return keyHandled; -} - - -/* -* switching to standby. -*/ -void CxuiStandby::toStandby() -{ - CX_DEBUG_ENTER_FUNCTION(); - - if (proceedToStandy()) { - - // signal for ui classes to prepare for standby - emit aboutToEnterStandby(); - - mStandbyDialogVisible = true; - - if (mStandbyPopup == NULL) { - CX_DEBUG(("Loading standby DocML")); - bool ok = false; - // Use document loader to create popup - mDocumentLoader->load(CxUiLayout::STANDBY_POPUP_XML, &ok); - CX_DEBUG(("standby load ok=%d", ok)); - mStandbyPopup = qobject_cast(mDocumentLoader->findWidget(CxUiLayout::STANDBY_POPUP)); - CX_ASSERT_ALWAYS(mStandbyPopup); - mStandbyPopup->setTimeout(HbDialog::NoTimeout); - mStandbyPopup->setBackgroundFaded(false); - mStandbyPopup->setPreferredPos(QPointF(0,0)); - // color of standby text is set in the code. It cannot be done in docml - HbLabel* label = qobject_cast(mDocumentLoader->findWidget(CxUiLayout::STANDBY_TEXT_WIDGET)); - label->setTextColor(Qt::white); - - // connecting "abouttoclose" signal to dismissStandby - connect(mStandbyPopup, SIGNAL(aboutToClose()), this, SLOT(dismissStandby())); - - // HbDialog's default background item is replaced with black rectangle - QGraphicsRectItem *backgroundItem = new QGraphicsRectItem(); - QBrush blackBrush = QBrush(Qt::black); - backgroundItem->setBrush(blackBrush); - QGraphicsItem *origBgItem = mStandbyPopup->backgroundItem(); - backgroundItem->setRect(origBgItem->boundingRect()); - mStandbyPopup->setBackgroundItem(backgroundItem); - - } - - CX_ASSERT_ALWAYS(mStandbyPopup); - - mStandbyPopup->show(); - // connecting half press or full press key signal to dismiss standby - connect(&mKeyHandler, SIGNAL(autofocusKeyPressed()), mStandbyPopup, SLOT(close())); - connect(&mKeyHandler, SIGNAL(captureKeyPressed()), mStandbyPopup, SLOT(close())); - } - - CX_DEBUG_EXIT_FUNCTION(); -} - - -/* -* dismisses standby -*/ -void CxuiStandby::dismissStandby() -{ - CX_DEBUG_ENTER_FUNCTION(); - - if(mStandbyDialogVisible) { - // stop the standby timer and close the pop-up - mStandbyDialogVisible = false; - //restart timer - startTimer(); - // signal for ui classes to prepare for standby exit - emit aboutToExitStandby(); - } - - CX_DEBUG_EXIT_FUNCTION(); -} - - - -/* -* checks if we can swtich to standby -*/ -bool CxuiStandby::proceedToStandy() -{ - CX_DEBUG_ENTER_FUNCTION(); - CX_ASSERT_ALWAYS(mEngine); - - bool ok = false; - if(!mStandbyDialogVisible && - mEngine->isEngineReady()) { - CX_DEBUG(("show standby dialog")); - ok = true; - } - - CX_DEBUG(( "CxuiStandby::proceedToStandy proceedToStandy: %d", ok )); - - return ok; -} - - - -/* -* Event filter which filters application wide mouse events. -*/ - -bool CxuiStandby::eventFilter(QObject *object, QEvent *event) -{ - Q_UNUSED(object); - - bool eventWasConsumed = false; - switch (event->type()) { - case QEvent::GraphicsSceneMouseMove: - case QEvent::GraphicsSceneMousePress: - case QEvent::GraphicsSceneMouseRelease: - eventWasConsumed = handleMouseEvent(); - break; - default: - break; - } - return eventWasConsumed; -} - -// end of file diff -r 3075d9b614e6 -r 0e652f8f1fbd camerauis/cameraxui/cxui/src/cxuistillprecaptureview.cpp --- a/camerauis/cameraxui/cxui/src/cxuistillprecaptureview.cpp Thu May 13 21:30:19 2010 +0300 +++ b/camerauis/cameraxui/cxui/src/cxuistillprecaptureview.cpp Thu Jul 15 01:55:05 2010 +0300 @@ -14,14 +14,16 @@ * Description: * */ +#include +#include +#include + #include #include #include #include #include #include -#include -#include #include #include #include @@ -31,6 +33,7 @@ #include // HbDeviceProfile #include #include +#include #include "cxuiselftimer.h" #include "cxeengine.h" @@ -82,19 +85,28 @@ delete mSelfTimer; } +/*! + * 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 + */ void CxuiStillPrecaptureView::construct(HbMainWindow *mainwindow, CxeEngine *engine, CxuiDocumentLoader *documentLoader, - CxuiCaptureKeyHandler *keyHandler) + CxuiCaptureKeyHandler *keyHandler, + HbActivityManager *activityManager) { CX_DEBUG_ENTER_FUNCTION(); OstTrace0( camerax_performance, CXUISTILLPRECAPTUREVIEW_CONSTRUCT, "msg: e_CX_STILLPRECAPVIEW_CONSTRUCT 1" ); // constuct base class - CxuiPrecaptureView::construct(mainwindow, engine, documentLoader, keyHandler); + CxuiPrecaptureView::construct(mainwindow, engine, documentLoader, keyHandler, activityManager); connect(&mEngine->autoFocusControl(), SIGNAL(stateChanged(CxeAutoFocusControl::State,CxeError::Id)), this, SLOT(handleAutoFocusStateChanged(CxeAutoFocusControl::State,CxeError::Id))); - connect(&mEngine->stillCaptureControl(), SIGNAL(snapshotReady(CxeError::Id, const QPixmap&, int)), + connect(&mEngine->stillCaptureControl(), SIGNAL(snapshotReady(CxeError::Id, const QImage&, int)), this, SLOT(handleSnapshot(CxeError::Id))); connect(&mEngine->stillCaptureControl(), SIGNAL(stateChanged(CxeStillCaptureControl::State, CxeError::Id)), this, SLOT(handleStillCaptureStateChanged(CxeStillCaptureControl::State, CxeError::Id))); @@ -111,39 +123,124 @@ mSelfTimer = new CxuiSelfTimer(mEngine->settings()); connect(mSelfTimer, SIGNAL(timerFinished()), this, SLOT(focusAndCapture())); + int value = Cxe::GeoTaggingDisclaimerDisabled; + mEngine->settings().get(CxeSettingIds::GEOTAGGING_DISCLAIMER, value); + if (value == Cxe::GeoTaggingDisclaimerEnabled) { + launchGeoTaggingDisclaimerDialog(); + } + OstTrace0( camerax_performance, DUP1_CXUISTILLPRECAPTUREVIEW_CONSTRUCT, "msg: e_CX_STILLPRECAPVIEW_CONSTRUCT 0" ); CX_DEBUG_EXIT_FUNCTION(); } +/*! + * Loads default widgets in layouts xml. + */ void CxuiStillPrecaptureView::loadDefaultWidgets() { CX_DEBUG_ENTER_FUNCTION(); - CX_DEBUG_ASSERT(mDocumentLoader); + CX_ASSERT_ALWAYS(mDocumentLoader); // get pointer to the viewfinder QGraphicsWidget *widget = NULL; widget = mDocumentLoader->findWidget(STILL_PRE_CAPTURE_VIEWFINDER); mViewfinder = qobject_cast(widget); - CX_DEBUG_ASSERT(mViewfinder); + CX_ASSERT_ALWAYS(mViewfinder); + + reloadIndicatorWidgets(); + CX_DEBUG_EXIT_FUNCTION(); +} +/*! + * Loads default indicators from docml and modifies the visibility + * according to current settings. + */ +void CxuiStillPrecaptureView::reloadIndicatorWidgets() +{ + CX_DEBUG_ENTER_FUNCTION(); + CX_ASSERT_ALWAYS(mDocumentLoader); + + bool ok = false; + mDocumentLoader->load(STILL_1ST_XML, STILL_PRE_CAPTURE_INDICATORS_SECTION, &ok); + CX_ASSERT_ALWAYS(ok); + + QGraphicsWidget *widget = NULL; widget = mDocumentLoader->findWidget(STILL_PRE_CAPTURE_QUALITY_ICON); mQualityIcon = qobject_cast(widget); - CX_DEBUG_ASSERT(mQualityIcon); + CX_ASSERT_ALWAYS(mQualityIcon); + + widget = mDocumentLoader->findWidget(STILL_PRE_CAPTURE_FLASHBLINK_INDICATOR_ICON); + HbLabel *flashBlinkingIcon = qobject_cast(widget); + CX_ASSERT_ALWAYS(flashBlinkingIcon); + + widget = mDocumentLoader->findWidget(STILL_PRE_CAPTURE_GEOTAGGING_INDICATOR_ICON); + mGeoTaggingIndicatorIcon = qobject_cast(widget); + CX_ASSERT_ALWAYS(mGeoTaggingIndicatorIcon); + + widget = mDocumentLoader->findWidget(STILL_PRE_CAPTURE_FACE_TRACKING_ICON); + mFaceTrackingIcon = qobject_cast(widget); + CX_ASSERT_ALWAYS(mFaceTrackingIcon); widget = mDocumentLoader->findWidget(STILL_PRE_CAPTURE_INDICATOR_CONTAINER); mIndicators = qobject_cast(widget); - CX_DEBUG_ASSERT(mIndicators); + CX_ASSERT_ALWAYS(mIndicators); + + QGraphicsLayout *layout = mIndicators->layout(); + QGraphicsLayoutItem *graphicsLayoutItem = NULL; + QGraphicsItem *graphicsItem = NULL; + QString key = ""; + int currentSettingValue = -1; + bool isSettingOff = false; + // Go through the items in the layout to check whether they should be + // shown or not in the indicator pane. Start from the last towards + // the first, so that removing items from between works correctly. + for (int i = layout->count() - 1; i >= 0; i--) { + graphicsLayoutItem = layout->itemAt(i); + isSettingOff = false; + if (graphicsLayoutItem) { + graphicsItem = graphicsLayoutItem->graphicsItem(); + currentSettingValue = -1; + if (graphicsItem == mGeoTaggingIndicatorIcon) { + key = CxeSettingIds::GEOTAGGING; + mEngine->settings().get(key, currentSettingValue); + if (currentSettingValue == Cxe::GeoTaggingOff) { + isSettingOff = true; + } + } else if (graphicsItem == mFaceTrackingIcon) { + key = CxeSettingIds::FACE_TRACKING; + mEngine->settings().get(key, currentSettingValue); + // facetracking 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 == flashBlinkingIcon) { + //remove flash indicator + isSettingOff = true; + } + if (isSettingOff) { + layout->removeAt(i); + } + } + } + // create background for indicator container createWidgetBackgroundGraphic(mIndicators, TRANSPARENT_BACKGROUND_GRAPHIC); + + mIndicators->setVisible(true); CX_DEBUG_EXIT_FUNCTION(); } - +/*! + * Loads widgets that are not part of the default section in layouts xml. + * Widgets are created at the time they are first loaded. + */ void CxuiStillPrecaptureView::loadWidgets() { CX_DEBUG_ENTER_FUNCTION(); - CX_DEBUG_ASSERT(mDocumentLoader); + CX_ASSERT_ALWAYS(mDocumentLoader); if( mWidgetsLoaded ) { CX_DEBUG(("Widgets already loaded")); @@ -157,14 +254,14 @@ OstTrace0( camerax_performance, DUP4_CXUISTILLPRECAPTUREVIEW_LOADWIDGETS, "msg: e_CX_DOCUMENTLOADER_LOAD 1" ); mDocumentLoader->load(STILL_1ST_XML, STILL_PRE_CAPTURE_WIDGETS_SECTION, &ok); - Q_ASSERT_X(ok, "camerax ui", "error in xml file parsing"); + CX_ASSERT_ALWAYS(ok); if (CxuiServiceProvider::isCameraEmbedded()) { mDocumentLoader->load(STILL_1ST_XML, STILL_PRE_CAPTURE_EMBEDDED_SECTION, &ok); } else { mDocumentLoader->load(STILL_1ST_XML, STILL_PRE_CAPTURE_STANDALONE_SECTION, &ok); } OstTrace0( camerax_performance, DUP5_CXUISTILLPRECAPTUREVIEW_LOADWIDGETS, "msg: e_CX_DOCUMENTLOADER_LOAD 0" ); - Q_ASSERT_X(ok, "camerax ui", "error in xml file parsing"); + CX_ASSERT_ALWAYS(ok); // get pointers to ui components from the layout data QGraphicsWidget *widget = NULL; @@ -172,8 +269,8 @@ widget = mDocumentLoader->findWidget(STILL_PRE_CAPTURE_ZOOM_SLIDER); mSlider = qobject_cast(widget); - CX_DEBUG_ASSERT(mSlider); - addIncreaseDecreaseButtons(mSlider); + CX_ASSERT_ALWAYS(mSlider); + mSlider->addZoomButtons(); createWidgetBackgroundGraphic(mSlider, TRANSPARENT_BACKGROUND_GRAPHIC); if (mSelfTimer) { @@ -186,30 +283,30 @@ HbWidget *container = NULL; widget = mDocumentLoader->findWidget(STILL_PRE_CAPTURE_SELFTIMER_CONTAINER); container = qobject_cast(widget); - CX_DEBUG_ASSERT(container); + CX_ASSERT_ALWAYS(container); createWidgetBackgroundGraphic(container, TRANSPARENT_BACKGROUND_GRAPHIC); // connect selftimer start button to hide controls widget = mDocumentLoader->findWidget(STILL_PRE_CAPTURE_SELFTIMER_START_BUTTON); HbPushButton *startButton = qobject_cast(widget); - CX_DEBUG_ASSERT(startButton); + CX_ASSERT_ALWAYS(startButton); connect(startButton, SIGNAL(released()), this, SLOT(hideControls())); widget = mDocumentLoader->findWidget(STILL_PRE_CAPTURE_TOOLBAR); - mToolBar = qobject_cast(widget); - CX_DEBUG_ASSERT(mToolBar); + mToolbar = qobject_cast(widget); + CX_ASSERT_ALWAYS(mToolbar); object = mDocumentLoader->findObject(STILL_PRE_CAPTURE_FLASH_ACTION); mFlashSetting = qobject_cast(object); - CX_DEBUG_ASSERT(mFlashSetting); + CX_ASSERT_ALWAYS(mFlashSetting); widget = mDocumentLoader->findWidget(STILL_PRE_CAPTURE_IMAGES_LEFT_LABEL); mImagesLeft = qobject_cast(widget); - CX_DEBUG_ASSERT(mImagesLeft); + CX_ASSERT_ALWAYS(mImagesLeft); widget = mDocumentLoader->findWidget(STILL_PRE_CAPTURE_IMAGES_LEFT_CONTAINER); mImagesLeftContainer = qobject_cast(widget); - CX_DEBUG_ASSERT(mImagesLeftContainer); + CX_ASSERT_ALWAYS(mImagesLeftContainer); createWidgetBackgroundGraphic(mImagesLeftContainer, TRANSPARENT_BACKGROUND_GRAPHIC); updateImagesLeftLabel(); @@ -240,27 +337,68 @@ } - // update toolbar flash icon + // Setting widgets loaded here so updating icons works. + mWidgetsLoaded = true; + + // Update toolbar flash mode icon int flash; if (mEngine->settings().get(CxeSettingIds::FLASH_MODE, flash) == CxeError::None) { handleSettingValueChanged(CxeSettingIds::FLASH_MODE, flash); } - // update toolbar scene mode - QString scene; - if (mEngine->settings().get(CxeSettingIds::IMAGE_SCENE, scene) == CxeError::None) { - handleSettingValueChanged(CxeSettingIds::IMAGE_SCENE, scene); + // Update toolbar scene mode icon + QString sceneId; + if (mEngine->settings().get(CxeSettingIds::SCENE_ID, sceneId) == CxeError::None) { + updateSceneIcon(sceneId); } hideControls(); - mWidgetsLoaded = true; + // View is ready. Needed for startup performance automated testing. + emit viewReady(); OstTrace0( camerax_performance, DUP1_CXUISTILLPRECAPTUREVIEW_LOADWIDGETS, "msg: e_CX_STILLPRECAPTUREVIEW_LOADWIDGETS 0" ); CX_DEBUG_EXIT_FUNCTION(); } /*! + * Restore view state from activity. + */ +void CxuiStillPrecaptureView::restoreActivity(const QString &activityId, const QVariant &data) +{ + Q_UNUSED(activityId); + Q_UNUSED(data); + + CX_DEBUG_ENTER_FUNCTION(); + // no need to restore any state + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! + * Save view state to activity. + */ +void CxuiStillPrecaptureView::saveActivity() +{ + CX_DEBUG_ENTER_FUNCTION(); + QVariantMap data; + QVariantHash params; + //@todo: add pre-capture icon as screenshot + mActivityManager->removeActivity(CxuiActivityIds::STILL_PRECAPTURE_ACTIVITY); + mActivityManager->addActivity(CxuiActivityIds::STILL_PRECAPTURE_ACTIVITY, data, params); + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! + * Clear activity from activity manager. + */ +void CxuiStillPrecaptureView::clearActivity() +{ + CX_DEBUG_ENTER_FUNCTION(); + mActivityManager->removeActivity(CxuiActivityIds::STILL_PRECAPTURE_ACTIVITY); + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! * Initializing settings grid */ void CxuiStillPrecaptureView::initializeSettingsGrid() @@ -271,45 +409,114 @@ // Initialize settings grid mSettingsGrid = new HbToolBarExtension; - action = mSettingsGrid->addAction(HbIcon("qtg_mono_exposure.svg"), hbTrId("txt_cam_button_exposure_compensation"), this, SLOT(launchSliderSetting())); + action = mSettingsGrid->addAction(HbIcon("qtg_mono_exposure"), hbTrId("txt_cam_button_exposure_compensation"), this, SLOT(launchSliderSetting())); action->setProperty(PROPERTY_KEY_SETTING_ID, CxeSettingIds::EV_COMPENSATION_VALUE); action->setProperty(PROPERTY_KEY_SETTING_GRID, PROPERTY_KEY_TRUE); - action = mSettingsGrid->addAction(HbIcon("qtg_mono_iso.svg"), hbTrId("txt_cam_button_iso"), this, SLOT(launchSetting())); + action = mSettingsGrid->addAction(HbIcon("qtg_mono_iso"), hbTrId("txt_cam_button_iso"), this, SLOT(launchSetting())); action->setProperty(PROPERTY_KEY_SETTING_ID, CxeSettingIds::LIGHT_SENSITIVITY); action->setProperty(PROPERTY_KEY_SETTING_GRID, PROPERTY_KEY_TRUE); - action = mSettingsGrid->addAction(HbIcon("qtg_small_rgb.svg"), hbTrId("txt_cam_button_color_tone"), this, SLOT(launchSetting())); + action = mSettingsGrid->addAction(HbIcon("qtg_small_rgb"), hbTrId("txt_cam_button_color_tone"), this, SLOT(launchSetting())); action->setProperty(PROPERTY_KEY_SETTING_ID, CxeSettingIds::COLOR_TONE); action->setProperty(PROPERTY_KEY_SETTING_GRID, PROPERTY_KEY_TRUE); - action = mSettingsGrid->addAction(HbIcon("qtg_mono_white_balance.svg"), hbTrId("txt_cam_button_white_balance"), this, SLOT(launchSetting())); + action = mSettingsGrid->addAction(HbIcon("qtg_mono_white_balance"), hbTrId("txt_cam_button_white_balance"), this, SLOT(launchSetting())); action->setProperty(PROPERTY_KEY_SETTING_ID, CxeSettingIds::WHITE_BALANCE); action->setProperty(PROPERTY_KEY_SETTING_GRID, PROPERTY_KEY_TRUE); - action = mSettingsGrid->addAction(HbIcon("qtg_mono_sharpness.svg"), hbTrId("txt_cam_grid_sharpness"), this, SLOT(launchSliderSetting())); + action = mSettingsGrid->addAction(HbIcon("qtg_mono_sharpness"), hbTrId("txt_cam_grid_sharpness"), this, SLOT(launchSliderSetting())); action->setProperty(PROPERTY_KEY_SETTING_ID, CxeSettingIds::SHARPNESS); action->setProperty(PROPERTY_KEY_SETTING_GRID, PROPERTY_KEY_TRUE); - action = mSettingsGrid->addAction(HbIcon("qtg_mono_contrast.svg"), hbTrId("txt_cam_button_contrast"), this, SLOT(launchSliderSetting())); + action = mSettingsGrid->addAction(HbIcon("qtg_mono_contrast"), hbTrId("txt_cam_button_contrast"), this, SLOT(launchSliderSetting())); action->setProperty(PROPERTY_KEY_SETTING_ID, CxeSettingIds::CONTRAST); action->setProperty(PROPERTY_KEY_SETTING_GRID, PROPERTY_KEY_TRUE); - mSettingsGrid->addAction(HbIcon("qtg_mono_face_tracking.svg"), hbTrId("txt_cam_button_face_tracking"), this, SLOT(launchNotSupportedNotification())); + action = mSettingsGrid->addAction(HbIcon("qtg_mono_face_tracking"), hbTrId("txt_cam_button_face_tracking"), this, SLOT(launchSetting())); + action->setProperty(PROPERTY_KEY_SETTING_ID, CxeSettingIds::FACE_TRACKING); action->setProperty(PROPERTY_KEY_SETTING_GRID, PROPERTY_KEY_TRUE); - connect(mKeyHandler, SIGNAL(autofocusKeyPressed()), mSettingsGrid, SLOT(close())); + connect(mCaptureKeyHandler, SIGNAL(autofocusKeyPressed()), mSettingsGrid, SLOT(close())); } } -void CxuiStillPrecaptureView::launchSceneModesPopup() +/** +* 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. +*/ +bool CxuiStillPrecaptureView::isPostcaptureOn() const { CX_DEBUG_ENTER_FUNCTION(); - hideControls(); - emit showScenesView(); + if (CxuiServiceProvider::isCameraEmbedded()) { + // always show post capture in embedded mode + CX_DEBUG_EXIT_FUNCTION(); + return true; + } + + // Read the value from settings. Ignoring reading error. + // On error (missing settings) default to "postcapture on". + int showPostcapture(-1); + if(mEngine) { + mEngine->settings().get(CxeSettingIds::STILL_SHOWCAPTURED, showPostcapture); + } + + CX_DEBUG_EXIT_FUNCTION(); + return showPostcapture != 0; // 0 == no postcapture +} + +/*! +* Update the scene mode icon. +* @param sceneId The new scene id. +*/ +void CxuiStillPrecaptureView::updateSceneIcon(const QString& sceneId) +{ + CX_DEBUG_ENTER_FUNCTION(); + + if (mEngine->mode() == Cxe::ImageMode) { + CX_DEBUG(("CxuiStillPrecaptureView - scene: %s", sceneId.toAscii().constData())); + + // No need to update icon, if widgets are not even loaded yet. + // We'll update the icon once the widgets are loaded. + if (mWidgetsLoaded) { + + QString iconObjectName = STILL_PRE_CAPTURE_SCENE_MODE_ACTION; + QString icon = getSettingItemIcon(CxeSettingIds::IMAGE_SCENE, sceneId); + + CX_DEBUG(("CxuiStillPrecaptureView - icon: %s", icon.toAscii().constData())); + + if (mDocumentLoader) { + QObject *obj = mDocumentLoader->findObject(iconObjectName); + CX_ASSERT_ALWAYS(obj); + qobject_cast(obj)->setIcon(HbIcon(icon)); + } + } else { + CX_DEBUG(("CxuiStillPrecaptureView - widgets not loaded yet, ignored!")); + } + } CX_DEBUG_EXIT_FUNCTION(); } +/*! + Update the quality indicator +*/ +void CxuiStillPrecaptureView::updateQualityIcon() +{ + CX_DEBUG_ENTER_FUNCTION(); + + if (mQualityIcon && mEngine) { + QString icon = ""; + int currentValue = -1; + + mEngine->settings().get(CxeSettingIds::IMAGE_QUALITY, currentValue); + icon = getSettingItemIcon(CxeSettingIds::IMAGE_QUALITY, currentValue); + + mQualityIcon->setIcon(HbIcon(icon)); + } + + CX_DEBUG_EXIT_FUNCTION(); +} void CxuiStillPrecaptureView::handleSnapshot(CxeError::Id error) { @@ -330,7 +537,7 @@ } } } else { - emit reportError(error); + emit errorEncountered(error); } CX_DEBUG_EXIT_FUNCTION(); @@ -387,7 +594,9 @@ mEngine->stillCaptureControl().reset(); //! @todo: Do not delete snapshots before images are really saved mEngine->stillCaptureControl().capture(); } else { - launchDiskFullNotification(); + // Inform that error was encountered. + // Error manager will show necessary message to user. + emit errorEncountered(CxeError::DiskFull); } } } else { @@ -455,30 +664,11 @@ default: break; } - //} CX_DEBUG_EXIT_FUNCTION(); } -void CxuiStillPrecaptureView::updateOrientation(Qt::Orientation orientation) -{ - CX_DEBUG_ENTER_FUNCTION(); - - hideControls(); - mMainWindow->setOrientation(orientation); - - if (orientation == Qt::Horizontal) { - CX_DEBUG(("New screen orientation is horizontal")); - mToolBar->setOrientation(Qt::Vertical); - } else { - CX_DEBUG(("New screen orientation is vertical")); - mToolBar->setOrientation(Qt::Horizontal); - } - - CX_DEBUG_EXIT_FUNCTION(); -} - /*! * Handle capture key full press. */ @@ -580,6 +770,7 @@ updateImagesLeftLabel(); updateQualityIcon(); + updateFaceTrackingIcon(); // cancel selftimer when returning to precapture // since selftimer needs to be turned off after capturing an image @@ -592,25 +783,36 @@ // in post-capture view, we need to start auto-focusing when entering // the still precapture view. if (event->type() == QEvent::Show && - mKeyHandler && mKeyHandler->isAutofocusKeyPressed()) { + mCaptureKeyHandler && mCaptureKeyHandler->isAutofocusKeyPressed()) { CX_DEBUG(("Still pre-capture coming visible and auto-focus key pressed -> starting AF")); handleAutofocusKeyPressed(); } } -void CxuiStillPrecaptureView::showToolbar() +/*! +* Allow showing UI controls? +*/ +bool CxuiStillPrecaptureView::allowShowControls() const { - if (mEngine && mEngine->isEngineReady()) { - CxuiPrecaptureView::showToolbar(); - } + // show controls when selftimer counter is not active + // and when autofocus key is not being pressed + bool engineOk(mEngine && mEngine->isEngineReady()); + bool selfTimerOk(!mSelfTimer || !mSelfTimer->isOngoing()); + bool keysOk(!mCaptureKeyHandler || !mCaptureKeyHandler->isAutofocusKeyPressed()); + + return engineOk && selfTimerOk && keysOk; } - +/*! +* Handle change in viewfinder state. +*/ void CxuiStillPrecaptureView::handleViewfinderStateChanged( - CxeViewfinderControl::State newState, CxeError::Id /*error*/) + CxeViewfinderControl::State newState, CxeError::Id error) { CX_DEBUG_ENTER_FUNCTION(); + // Call base class to get standby timer and display always visible when needed. + CxuiPrecaptureView::handleVfStateChanged(newState, error); if (newState == CxeViewfinderControl::Running) { @@ -621,7 +823,7 @@ } if(mMainWindow->currentView() == this && - mKeyHandler->isAutofocusKeyPressed()) { + mCaptureKeyHandler->isAutofocusKeyPressed()) { // Viewfinder just started and the user is pressing the auto-focus key. // Start focusing. @@ -646,6 +848,11 @@ } } +/*! + * 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 CxuiStillPrecaptureView::resetCapturePendingFlag() { CX_DEBUG_IN_FUNCTION(); @@ -653,43 +860,6 @@ mCapturePending = false; } -void CxuiStillPrecaptureView::showControls() -{ - // show controls when selftimer counter is not active - // and when autofocus key is not being pressed - if ( !(mSelfTimer && mSelfTimer->isOngoing()) && - (!mKeyHandler || !mKeyHandler->isAutofocusKeyPressed()) ) { - CxuiPrecaptureView::showControls(); - } - -} - -/*! -* Slot to handle application being sent to background. -*/ -void CxuiStillPrecaptureView::handleFocusLost() -{ - CX_DEBUG_ENTER_FUNCTION(); - - if (mSelfTimer && mSelfTimer->isOngoing()) { - // If self-timer is running, stop and reset the delay now. - mSelfTimer->reset(); - } - - // Release camera as we are going to background. - // If taking image is just ongoing, it will be cancelled by engine. - releaseCamera(); - - CX_DEBUG_EXIT_FUNCTION(); -} - -void CxuiStillPrecaptureView::handleFocusGained() -{ - CX_DEBUG_ENTER_FUNCTION(); - CxuiPrecaptureView::handleFocusGained(); - CX_DEBUG_EXIT_FUNCTION(); -} - /* Slot for handling scene mode change \param scene QVariantMap containing settings related to the new scene mode @@ -700,13 +870,7 @@ if (mEngine->mode() == Cxe::ImageMode) { // update toolbar scene mode icon - QString icon = getSettingItemIcon(CxeSettingIds::IMAGE_SCENE, scene[CxeSettingIds::SCENE_ID]); - CX_DEBUG((("New scene mode icon: %s"), icon.toAscii().constData())); - if (mDocumentLoader) { - QObject *obj = mDocumentLoader->findObject(STILL_PRE_CAPTURE_SCENE_MODE_ACTION); - CX_DEBUG_ASSERT(obj); - qobject_cast(obj)->setIcon(HbIcon(icon)); - } + updateSceneIcon(scene[CxeSettingIds::SCENE_ID].toString()); // for now, we are only interested in flashmode change if (scene.contains(CxeSettingIds::FLASH_MODE)) { @@ -724,6 +888,24 @@ CX_DEBUG_EXIT_FUNCTION(); } +/*! +* Enter standby mode. +*/ +void CxuiStillPrecaptureView::enterStandby() +{ + CX_DEBUG_ENTER_FUNCTION(); + + if (mSelfTimer && mSelfTimer->isOngoing()) { + // If self-timer is running, stop and reset the delay now. + mSelfTimer->reset(); + } + + // Base class handles releasing camera. + CxuiPrecaptureView::enterStandby(); + + CX_DEBUG_EXIT_FUNCTION(); +} + /* Slot for handling setting value changes. Notice that changing the scene mode does not emit settingValueChanged signal. @@ -744,6 +926,11 @@ updateQualityIcon(); // update images left when quality values are changed updateImagesLeftLabel(); + } else if (key == CxeSettingIds::FACE_TRACKING) { + reloadIndicatorWidgets(); + updateFaceTrackingIcon(); + } else if (key == CxeSettingIds::GEOTAGGING) { + reloadIndicatorWidgets(); } // update toolbar flash icon @@ -797,6 +984,10 @@ launchSettingsDialog(action); // special case to get value changed event to the selftimer class if (settingsKey == CxeSettingIds::SELF_TIMER) { + // if selftimer is active remember the previously selected value + if (mSelfTimer->isEnabled()) { + mSettingsDialogList->setOriginalSelectedItemByValue(mSelfTimer->getTimeout()); + } connect(mSettingsDialogList, SIGNAL(valueSelected(int)), mSelfTimer, SLOT(changeTimeOut(int))); } @@ -828,4 +1019,26 @@ CX_DEBUG_EXIT_FUNCTION(); } +/*! + Update the face tracking icon +*/ +void CxuiStillPrecaptureView::updateFaceTrackingIcon() +{ + CX_DEBUG_ENTER_FUNCTION(); + if (mFaceTrackingIcon && mEngine) { + QString key = ""; + QString icon = ""; + int currentValue = -1; + + key = CxeSettingIds::FACE_TRACKING; + + mEngine->settings().get(key, currentValue); + icon = getSettingItemIcon(key, currentValue); + + mFaceTrackingIcon->setIcon(HbIcon(icon)); + } + + CX_DEBUG_EXIT_FUNCTION(); +} + // end of file diff -r 3075d9b614e6 -r 0e652f8f1fbd camerauis/cameraxui/cxui/src/cxuivideoprecaptureview.cpp --- a/camerauis/cameraxui/cxui/src/cxuivideoprecaptureview.cpp Thu May 13 21:30:19 2010 +0300 +++ b/camerauis/cameraxui/cxui/src/cxuivideoprecaptureview.cpp Thu Jul 15 01:55:05 2010 +0300 @@ -18,6 +18,7 @@ #include #include +#include #include #include @@ -31,6 +32,7 @@ #include #include #include +#include #include "cxuivideoprecaptureview.h" #include "cxeengine.h" @@ -44,11 +46,12 @@ #include "cxuizoomslider.h" #include "cxuicapturekeyhandler.h" #include "cxuidocumentloader.h" +#include "cxuiserviceprovider.h" + #include "OstTraceDefinitions.h" #ifdef OST_TRACE_COMPILER_IN_USE #include "cxuivideoprecaptureviewTraces.h" #endif -#include "cxuiserviceprovider.h" using namespace Cxe; @@ -75,9 +78,9 @@ mRemainingTimeText(NULL), mRecordingIcon(NULL), mGoToStillAction(NULL), - mToolBarIdle(NULL), - mToolBarRec(NULL), - mToolBarPaused(NULL), + mToolbarIdle(NULL), + mToolbarRec(NULL), + mToolbarPaused(NULL), mVideoScenePopup(NULL), mVideoCaptureControl(NULL), mMenu(NULL), @@ -94,22 +97,32 @@ CX_DEBUG_EXIT_FUNCTION(); } +/*! + * Construct-method handles initialisation tasks for this class. + * @param mainwindow + * @param engine + * @param documentLoader + * @param keyHandler + */ void CxuiVideoPrecaptureView::construct(HbMainWindow *mainwindow, CxeEngine *engine, CxuiDocumentLoader *documentLoader, - CxuiCaptureKeyHandler *keyHandler) + CxuiCaptureKeyHandler *keyHandler, + HbActivityManager *activityManager) { CX_DEBUG_ENTER_FUNCTION(); - CxuiPrecaptureView::construct(mainwindow, engine, documentLoader, keyHandler); - mKeyHandler = keyHandler; + CxuiPrecaptureView::construct(mainwindow, engine, documentLoader, keyHandler, activityManager); + mCaptureKeyHandler = keyHandler; mVideoCaptureControl = &(engine->videoCaptureControl()); connect(&mElapsedTimer, SIGNAL(timeout()), this, SLOT(updateTimeLabels())); - connect(mVideoCaptureControl, SIGNAL(snapshotReady(CxeError::Id, const QPixmap&, const QString&)), + 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())); @@ -129,34 +142,105 @@ } +/*! + * Loads widgets that are needed right from the start. + */ void CxuiVideoPrecaptureView::loadDefaultWidgets() { CX_DEBUG_ENTER_FUNCTION(); - CX_DEBUG_ASSERT(mDocumentLoader); + CX_ASSERT_ALWAYS(mDocumentLoader); // get pointers to ui components from the layout data QGraphicsWidget *widget = NULL; widget = mDocumentLoader->findWidget(VIDEO_PRE_CAPTURE_VIEWFINDER); mViewfinder = qobject_cast (widget); - CX_DEBUG_ASSERT(mViewfinder); - - widget = mDocumentLoader->findWidget(VIDEO_PRE_CAPTURE_QUALITY_ICON); - mQualityIcon = qobject_cast (widget); - CX_DEBUG_ASSERT(mQualityIcon); + CX_ASSERT_ALWAYS(mViewfinder); - widget = mDocumentLoader->findWidget(VIDEO_PRE_CAPTURE_INDICATOR_CONTAINER_TOP); - mIndicators = qobject_cast(widget); - CX_DEBUG_ASSERT(mIndicators); - // Create background graphics for indicator container - createWidgetBackgroundGraphic(mIndicators, TRANSPARENT_BACKGROUND_GRAPHIC); + reloadIndicatorWidgets(); CX_DEBUG_EXIT_FUNCTION(); } +/*! + * Loads default indicators from docml and modifies the visibility + * according to current settings. + */ +void CxuiVideoPrecaptureView::reloadIndicatorWidgets() +{ + CX_DEBUG_ENTER_FUNCTION(); + CX_ASSERT_ALWAYS(mDocumentLoader); + + bool ok = false; + mDocumentLoader->load(VIDEO_1ST_XML, VIDEO_PRE_CAPTURE_INDICATORS_SECTION, &ok); + CX_ASSERT_ALWAYS(ok); + + QGraphicsWidget *widget = NULL; + widget = mDocumentLoader->findWidget(VIDEO_PRE_CAPTURE_QUALITY_ICON); + mQualityIcon = qobject_cast (widget); + CX_ASSERT_ALWAYS(mQualityIcon); + + widget = mDocumentLoader->findWidget(VIDEO_PRE_CAPTURE_VIDEOAUDIOMUTE_INDICATOR_ICON); + HbLabel *videoaudiomuteIndicatorIcon = qobject_cast(widget); + CX_ASSERT_ALWAYS(videoaudiomuteIndicatorIcon); + + widget = mDocumentLoader->findWidget(VIDEO_PRE_CAPTURE_STABILITY_INDICATOR_ICON); + HbLabel *videoStabilityIndicatorIcon = qobject_cast(widget); + CX_ASSERT_ALWAYS(videoStabilityIndicatorIcon); + + widget = mDocumentLoader->findWidget(VIDEO_PRE_CAPTURE_INDICATOR_CONTAINER_TOP); + mIndicators = qobject_cast(widget); + CX_ASSERT_ALWAYS(mIndicators); + + QGraphicsLayout *layout = mIndicators->layout(); + QGraphicsLayoutItem *graphicsLayoutItem = NULL; + QGraphicsItem *graphicsItem = NULL; + QString key = ""; + int currentSettingValue = -1; + bool isSettingOff = false; + // Go through the items in the layout to check whether they should be + // shown or not in the indicator pane. Start from the last towards + // the first, so that removing items from between works correctly. + for (int i = layout->count() - 1; i >= 0; i--) { + graphicsLayoutItem = layout->itemAt(i); + isSettingOff = false; + if (graphicsLayoutItem) { + graphicsItem = graphicsLayoutItem->graphicsItem(); + currentSettingValue = -1; + if (graphicsItem == videoaudiomuteIndicatorIcon) { + key = CxeSettingIds::VIDEO_MUTE_SETTING; + 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) { + // remove video stability indicator. + isSettingOff = true; + } + if (isSettingOff) { + layout->removeAt(i); + } + } + } + + // Create background graphics for indicator container + createWidgetBackgroundGraphic(mIndicators, TRANSPARENT_BACKGROUND_GRAPHIC); + + mIndicators->setVisible(true); + + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! + * Loads widgets that are not part of the default section in layouts xml. + * Widgets are created at the time they are first loaded. + */ void CxuiVideoPrecaptureView::loadWidgets() { CX_DEBUG_ENTER_FUNCTION(); - CX_DEBUG_ASSERT(mDocumentLoader); + CX_ASSERT_ALWAYS(mDocumentLoader); if (mWidgetsLoaded) { CX_DEBUG(("Widgets already loaded")); @@ -172,34 +256,34 @@ // load widgets section (creates the widgets) mDocumentLoader->load(VIDEO_1ST_XML, VIDEO_PRE_CAPTURE_WIDGETS_SECTION, &ok); - Q_ASSERT_X(ok, "camerax ui", "error in xml file parsing"); + CX_ASSERT_ALWAYS(ok); if (CxuiServiceProvider::isCameraEmbedded()) { mDocumentLoader->load(VIDEO_1ST_XML, VIDEO_PRE_CAPTURE_EMBEDDED_SECTION, &ok); } else { mDocumentLoader->load(VIDEO_1ST_XML, VIDEO_PRE_CAPTURE_STANDALONE_SECTION, &ok); } - Q_ASSERT_X(ok, "camerax ui", "error in xml file parsing"); + CX_ASSERT_ALWAYS(ok); // get needed pointers to some of the widgets widget = mDocumentLoader->findWidget(VIDEO_PRE_CAPTURE_ZOOM_SLIDER); mSlider = qobject_cast (widget); - CX_DEBUG_ASSERT(mSlider); + CX_ASSERT_ALWAYS(mSlider); //Let's add a plus and minus buttons to the slider - addIncreaseDecreaseButtons(mSlider); + mSlider->addZoomButtons(); createWidgetBackgroundGraphic(mSlider, TRANSPARENT_BACKGROUND_GRAPHIC); widget = mDocumentLoader->findWidget(VIDEO_PRE_CAPTURE_TOOLBAR); - mToolBarIdle = qobject_cast (widget); + mToolbarIdle = qobject_cast (widget); widget = mDocumentLoader->findWidget(VIDEO_PRE_CAPTURE_TOOLBAR_REC); - mToolBarRec = qobject_cast (widget); + mToolbarRec = qobject_cast (widget); widget = mDocumentLoader->findWidget(VIDEO_PRE_CAPTURE_TOOLBAR_PAUSED); - mToolBarPaused = qobject_cast (widget); + mToolbarPaused = qobject_cast (widget); - mToolBar = mToolBarIdle; + mToolbar = mToolbarIdle; - CX_DEBUG_ASSERT(mToolBarIdle); - CX_DEBUG_ASSERT(mToolBarRec); - CX_DEBUG_ASSERT(mToolBarPaused); + CX_ASSERT_ALWAYS(mToolbarIdle); + CX_ASSERT_ALWAYS(mToolbarRec); + CX_ASSERT_ALWAYS(mToolbarPaused); hideControls(); @@ -236,20 +320,20 @@ HbWidget *indicatorContainer; widget = mDocumentLoader->findWidget(VIDEO_PRE_CAPTURE_INDICATOR_CONTAINER_BOTTOM); indicatorContainer = qobject_cast(widget); - CX_DEBUG_ASSERT(indicatorContainer); + CX_ASSERT_ALWAYS(indicatorContainer); createWidgetBackgroundGraphic(indicatorContainer, TRANSPARENT_BACKGROUND_GRAPHIC); widget = mDocumentLoader->findWidget(VIDEO_PRE_CAPTURE_ELAPSED_TIME_LABEL); mElapsedTimeText = qobject_cast (widget); - CX_DEBUG_ASSERT(mElapsedTimeText); + CX_ASSERT_ALWAYS(mElapsedTimeText); widget = mDocumentLoader->findWidget(VIDEO_PRE_CAPTURE_REMAINING_TIME_LABEL); mRemainingTimeText = qobject_cast (widget); - CX_DEBUG_ASSERT(mRemainingTimeText); + CX_ASSERT_ALWAYS(mRemainingTimeText); widget = mDocumentLoader->findWidget(VIDEO_PRE_CAPTURE_RECORDING_ICON); mRecordingIcon = qobject_cast (widget); - CX_DEBUG_ASSERT(mRecordingIcon); + CX_ASSERT_ALWAYS(mRecordingIcon); mWidgetsLoaded = true; @@ -262,9 +346,56 @@ mRecordingAnimation->setLoopCount(-1); mRecordingAnimation->setEasingCurve(QEasingCurve::OutInQuad); + + // Update toolbar scene mode icon. + QString sceneId; + if (mEngine->settings().get(CxeSettingIds::SCENE_ID, sceneId) == CxeError::None) { + updateSceneIcon(sceneId); + } + // Initialize the video time counters. updateTimeLabels(); + // View is ready. Needed for startup performance automated testing. + emit viewReady(); + + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! + * Restore view state from activity. + */ +void CxuiVideoPrecaptureView::restoreActivity(const QString &activityId, const QVariant &data) +{ + Q_UNUSED(activityId); + Q_UNUSED(data); + + CX_DEBUG_ENTER_FUNCTION(); + // no need to restore any state + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! + * Save view state to activity. + */ +void CxuiVideoPrecaptureView::saveActivity() +{ + CX_DEBUG_ENTER_FUNCTION(); + QVariantMap data; + QVariantHash params; + //@todo: add pre-capture icon as screenshot + mActivityManager->removeActivity(CxuiActivityIds::VIDEO_PRECAPTURE_ACTIVITY); + mActivityManager->addActivity(CxuiActivityIds::VIDEO_PRECAPTURE_ACTIVITY, data, params); + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! + * Clear activity from activity manager. + */ +void CxuiVideoPrecaptureView::clearActivity() +{ + CX_DEBUG_ENTER_FUNCTION(); + mActivityManager->removeActivity(CxuiActivityIds::VIDEO_PRECAPTURE_ACTIVITY); CX_DEBUG_EXIT_FUNCTION(); } @@ -278,20 +409,96 @@ mSettingsGrid = new HbToolBarExtension; - action = mSettingsGrid->addAction(HbIcon("qtg_mono_exposure.svg"), hbTrId("txt_cam_button_exposure_compensation"), this, SLOT(launchSliderSetting())); + action = mSettingsGrid->addAction(HbIcon("qtg_mono_exposure"), hbTrId("txt_cam_button_exposure_compensation"), this, SLOT(launchSliderSetting())); action->setProperty(PROPERTY_KEY_SETTING_ID, CxeSettingIds::EV_COMPENSATION_VALUE); action->setProperty(PROPERTY_KEY_SETTING_GRID, PROPERTY_KEY_TRUE); - action = mSettingsGrid->addAction(HbIcon("qtg_small_rgb.svg"), hbTrId("txt_cam_button_color_tone"), this, SLOT(launchSetting())); + action = mSettingsGrid->addAction(HbIcon("qtg_small_rgb"), hbTrId("txt_cam_button_color_tone"), this, SLOT(launchSetting())); action->setProperty(PROPERTY_KEY_SETTING_ID, CxeSettingIds::COLOR_TONE); action->setProperty(PROPERTY_KEY_SETTING_GRID, PROPERTY_KEY_TRUE); - action = mSettingsGrid->addAction(HbIcon("qtg_mono_white_balance.svg"), hbTrId("txt_cam_button_white_balance"), this, SLOT(launchSetting())); + action = mSettingsGrid->addAction(HbIcon("qtg_mono_white_balance"), hbTrId("txt_cam_button_white_balance"), this, SLOT(launchSetting())); action->setProperty(PROPERTY_KEY_SETTING_ID, CxeSettingIds::WHITE_BALANCE); action->setProperty(PROPERTY_KEY_SETTING_GRID, PROPERTY_KEY_TRUE); - connect(mKeyHandler, SIGNAL(autofocusKeyPressed()), mSettingsGrid, SLOT(close())); + 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. +*/ +bool CxuiVideoPrecaptureView::isPostcaptureOn() const +{ + CX_DEBUG_ENTER_FUNCTION(); + if (CxuiServiceProvider::isCameraEmbedded()) { + // always show post capture in embedded mode + CX_DEBUG_EXIT_FUNCTION(); + return true; + } + + // Read the value from settings. Ignoring reading error. + // On error (missing settings) default to "postcapture on". + int showPostcapture(-1); + if(mEngine) { + mEngine->settings().get(CxeSettingIds::VIDEO_SHOWCAPTURED, showPostcapture); } + + CX_DEBUG_EXIT_FUNCTION(); + return showPostcapture != 0; // 0 == no postcapture +} + +/*! +* Update the scene mode icon. +* @param sceneId The new scene id. +*/ +void CxuiVideoPrecaptureView::updateSceneIcon(const QString& sceneId) +{ + CX_DEBUG_ENTER_FUNCTION(); + + if (mEngine->mode() == Cxe::VideoMode) { + CX_DEBUG(("CxuiPrecaptureView - scene: %s", sceneId.toAscii().constData())); + + // No need to update icon, if widgets are not even loaded yet. + // We'll update the icon once the widgets are loaded. + if (mWidgetsLoaded) { + QString iconObjectName = VIDEO_PRE_CAPTURE_SCENE_MODE_ACTION; + QString icon = getSettingItemIcon(CxeSettingIds::VIDEO_SCENE, sceneId); + + CX_DEBUG(("CxuiVideoPrecaptureView - icon: %s", icon.toAscii().constData())); + + if (mDocumentLoader) { + QObject *obj = mDocumentLoader->findObject(iconObjectName); + CX_ASSERT_ALWAYS(obj); + qobject_cast(obj)->setIcon(HbIcon(icon)); + } + } else { + CX_DEBUG(("CxuiVideoPrecaptureView - widgets not loaded yet, ignored!")); + } + } + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! + Update the quality indicator +*/ +void CxuiVideoPrecaptureView::updateQualityIcon() +{ + CX_DEBUG_ENTER_FUNCTION(); + + if (mQualityIcon && mEngine) { + QString icon = ""; + int currentValue = -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*/) @@ -312,7 +519,7 @@ mMenu = takeMenu(); mVideoCaptureControl->record(); } else { - launchDiskFullNotification(); + emit errorEncountered(CxeError::DiskFull); } CX_DEBUG_EXIT_FUNCTION(); @@ -335,44 +542,47 @@ void CxuiVideoPrecaptureView::stop() { CX_DEBUG_ENTER_FUNCTION(); - if (isPostcaptureOn()) { - CxeVideoCaptureControl::State state = mVideoCaptureControl->state(); - if (state == CxeVideoCaptureControl::Recording || - state == CxeVideoCaptureControl::Paused) { - mVideoCaptureControl->stop(); - // Continue in handleVideoStateChanged(). - } - } else { - // no postcapture - stopAndPrepareNewVideo(); + + CxeVideoCaptureControl::State state = mVideoCaptureControl->state(); + if (state == CxeVideoCaptureControl::Recording || + state == CxeVideoCaptureControl::Paused) { + mVideoCaptureControl->stop(); + // Continue in handleVideoStateChanged(). } - CX_DEBUG_EXIT_FUNCTION(); } -// CxuiVideoPrecaptureView::stopAndPrepareNewVideo() -// A version of stop that doesn't go to post-capture. When -// not going to post-capture, we need to prepare new video -void CxuiVideoPrecaptureView::stopAndPrepareNewVideo() -{ - CX_DEBUG_ENTER_FUNCTION(); - mVideoCaptureControl->stop(); - mElapsedTimer.stop(); - hideControls(); - if (mMenu) { - setMenu(mMenu); - mMenu = NULL; - } +/*! +* Allow showing UI controls? +*/ +bool CxuiVideoPrecaptureView::allowShowControls() const +{ + bool show(false); + if (mEngine) { + CxeVideoCaptureControl::State state(mEngine->videoCaptureControl().state()); - // prepare new video when old one is ready - connect(mVideoCaptureControl, SIGNAL(videoComposed(CxeError::Id, const QString&)), - this, SLOT(prepareNewVideo(CxeError::Id))); - - CX_DEBUG_EXIT_FUNCTION(); + show = (mEngine->isEngineReady() + || state == CxeVideoCaptureControl::Recording + || state == CxeVideoCaptureControl::Paused); + } + return show; } +/*! + * Play feedback when touching view outside of any widget? + * If video is paused feedback is off. Otherwise on. + */ +bool CxuiVideoPrecaptureView::isFeedbackEnabled() const +{ + CxeVideoCaptureControl::State state(mEngine->videoCaptureControl().state()); + if (state == CxeVideoCaptureControl::Paused) { + return false; + } else { + return true; + } +} // CxuiPrecaptureView::showToolbar() // Shows toolbar. Calls the base class implementation if not recording @@ -381,19 +591,19 @@ { CxeVideoCaptureControl::State state = mVideoCaptureControl->state(); if (state == CxeVideoCaptureControl::Recording) { - if (mToolBar != mToolBarRec) { - mToolBar->hide(); - mToolBar = mToolBarRec; + if (mToolbar != mToolbarRec) { + mToolbar->hide(); + mToolbar = mToolbarRec; } } else if (state ==CxeVideoCaptureControl::Ready) { - if (mToolBar != mToolBarIdle) { - mToolBar->hide(); - mToolBar = mToolBarIdle; + if (mToolbar != mToolbarIdle) { + mToolbar->hide(); + mToolbar = mToolbarIdle; } } else if (state == CxeVideoCaptureControl::Paused) { - if (mToolBar != mToolBarPaused) { - mToolBar->hide(); - mToolBar = mToolBarPaused; + if (mToolbar != mToolbarPaused) { + mToolbar->hide(); + mToolbar = mToolbarPaused; } } @@ -426,13 +636,12 @@ void CxuiVideoPrecaptureView::goToStill() { CX_DEBUG_ENTER_FUNCTION(); - OstTrace0( camerax_performance, DUP1_CXUIVIDEOPRECAPTUREVIEW_GOTOSTILL, "msg: e_CX_GO_TO_STILL_MODE 1" ); + OstTrace0( camerax_performance, CXUIVIDEOPRECAPTUREVIEW_GOTOSTILL, "msg: e_CX_GO_TO_STILL_MODE 1" ); hideControls(); mEngine->initMode(ImageMode); emit changeToPrecaptureView(); - OstTrace0( camerax_performance, DUP2_CXUIVIDEOPRECAPTUREVIEW_GOTOSTILL, "msg: e_CX_GO_TO_STILL_MODE 0" ); CX_DEBUG_EXIT_FUNCTION(); } @@ -516,7 +725,7 @@ { CX_DEBUG_ENTER_FUNCTION(); - TBool status = mVideoCaptureControl->elapsedTime(mTimeElapsed); + bool status = mVideoCaptureControl->elapsedTime(mTimeElapsed); CX_DEBUG(("Elapsed time: %d", mTimeElapsed)); CX_DEBUG(("status: %d", status)); @@ -571,25 +780,25 @@ break; case CxeVideoCaptureControl::Recording: hideControls(); + emit stopStandbyTimer(); if (mDocumentLoader){ mDocumentLoader->load(VIDEO_1ST_XML, VIDEO_PRE_CAPTURE_RECORDING); } mElapsedTimer.start(CXUI_ELAPSED_TIME_TIMEOUT); disableFeedback(); - if (mRecordingAnimation && mRecordingIcon) { - mRecordingAnimation->start(); - } + + // commented out the activation of the recording animation because + // it is causing issues when using SW rendering + //if (mRecordingAnimation && mRecordingIcon) { + // mRecordingAnimation->start(); + //} + break; case CxeVideoCaptureControl::Paused: mElapsedTimer.stop(); - if (mDocumentLoader){ mDocumentLoader->load(VIDEO_1ST_XML, VIDEO_PRE_CAPTURE_PAUSED); } - - if (mRecordingAnimation && mRecordingIcon) { - mRecordingAnimation->stop(); - } showControls(); enableFeedback(); mPauseTimer.start(); @@ -599,27 +808,34 @@ mDocumentLoader->load(VIDEO_1ST_XML, VIDEO_PRE_CAPTURE_PAUSED); } - if (mRecordingAnimation && mRecordingIcon) { - mRecordingAnimation->stop(); + // commented out the stopping of the recording animation since the activation + // is commented out also couple lines earlier + //if (mRecordingAnimation && mRecordingIcon) { + // mRecordingAnimation->stop(); + //} + + enableFeedback(); + emit startStandbyTimer(); + mElapsedTimer.stop(); + hideControls(); + + if (mMenu) { + setMenu(mMenu); + mMenu = NULL; } - enableFeedback(); if (isPostcaptureOn()) { - mElapsedTimer.stop(); - hideControls(); - - if (mRecordingAnimation && mRecordingIcon) { - mRecordingAnimation->stop(); - mRecordingIcon->setOpacity(0); - } - if (mMenu) { - setMenu(mMenu); - mMenu = NULL; - } - emit changeToPostcaptureView(); + } else { + // post capture off, we need prepare new video + // do the prepare when the previous video is ready + connect(mVideoCaptureControl, SIGNAL(videoComposed(CxeError::Id, const QString&)), + this, SLOT(prepareNewVideo(CxeError::Id))); } break; + case CxeVideoCaptureControl::PlayingStartSound: + // don't change anything + break; default: // in any other state, just hide the controls setRecordingItemsVisibility(false); @@ -629,24 +845,6 @@ CX_DEBUG_EXIT_FUNCTION(); } -void CxuiVideoPrecaptureView::updateOrientation(Qt::Orientation orientation) -{ - CX_DEBUG_ENTER_FUNCTION(); - - hideControls(); - mMainWindow->setOrientation(orientation); - - if (mToolBar) { - if (orientation == Qt::Horizontal) { - mToolBar->setOrientation(Qt::Vertical); - } else { - mToolBar->setOrientation(Qt::Horizontal); - } - } - - CX_DEBUG_EXIT_FUNCTION(); -} - void CxuiVideoPrecaptureView::handleCaptureKeyPressed() { CX_DEBUG_ENTER_FUNCTION(); @@ -677,19 +875,11 @@ disconnect(mVideoCaptureControl, SIGNAL(videoComposed(CxeError::Id, const QString&)), this, SLOT(prepareNewVideo(CxeError::Id))); } else { - emit reportError(error); + emit errorEncountered(error); } } -/** -* Toggle video light on / off. -*/ -void CxuiVideoPrecaptureView::toggleLight() -{ - launchNotSupportedNotification(); -} - void CxuiVideoPrecaptureView::handleQuitClicked() { CX_DEBUG_ENTER_FUNCTION(); @@ -709,25 +899,6 @@ CX_DEBUG_EXIT_FUNCTION(); } -void CxuiVideoPrecaptureView::handleFocusLost() -{ - CX_DEBUG_IN_FUNCTION(); - // Release camera. Stopping possibly ongoing recording is handled by engine. - releaseCamera(); -} - -void CxuiVideoPrecaptureView::handleBatteryEmpty() -{ - CX_DEBUG_ENTER_FUNCTION(); - - CxeVideoCaptureControl::State state = mVideoCaptureControl->state(); - if (state == CxeVideoCaptureControl::Recording){ - stop(); // delete recording icon - } - CX_DEBUG_EXIT_FUNCTION(); -} - - void CxuiVideoPrecaptureView::launchVideoScenePopup() { CX_DEBUG_ENTER_FUNCTION(); @@ -771,6 +942,10 @@ // update video remaining time counter when video quality is changed updateTimeLabels(); + } else if (key == CxeSettingIds::GEOTAGGING) { + reloadIndicatorWidgets(); + } else if (key == CxeSettingIds::VIDEO_MUTE_SETTING) { + reloadIndicatorWidgets(); } } @@ -778,6 +953,24 @@ } /*! +* Handle scene mode change. +* @param scene The new active scene mode. +*/ +void CxuiVideoPrecaptureView::handleSceneChanged(CxeScene &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()); + } + + 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. */ @@ -816,6 +1009,5 @@ return CxuiPrecaptureView::eventFilter(object, event); } - +//end of file -//end of file diff -r 3075d9b614e6 -r 0e652f8f1fbd camerauis/cameraxui/cxui/src/cxuiview.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/camerauis/cameraxui/cxui/src/cxuiview.cpp Thu Jul 15 01:55:05 2010 +0300 @@ -0,0 +1,469 @@ +/* +* Copyright (c) 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" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#include +#include +#include +#include +#include +#include +#include "cxuiview.h" +#include "cxutils.h" +#include "cxeengine.h" +#include "cxuidocumentloader.h" +#include "cxuicapturekeyhandler.h" +#include "cxecameradevicecontrol.h" +#include "cxevideocapturecontrol.h" +#include "cxuizoomslider.h" +#include "cxezoomcontrol.h" + +// CONSTANTS +const QString PhotosAppExe = "photos.exe"; +const QString VideosAppExe = "videoplayer.exe"; + +/*! +* Constructor +*/ +CxuiView::CxuiView(QGraphicsItem *parent) : + HbView(parent), + mMainWindow(NULL), + mEngine(NULL), + mDocumentLoader(NULL), + mSlider(NULL), + mToolbar(NULL), + mIndicators(NULL), + mHideControlsTimeout(this), + mControlsFeedback(HbFeedback::BasicItem) +{ + CX_DEBUG_IN_FUNCTION(); +} + +/*! +* Destructor +*/ +CxuiView::~CxuiView() +{ + CX_DEBUG_IN_FUNCTION(); +} + +/*! +* CxuiView::construct +*/ +void CxuiView::construct(HbMainWindow *mainWindow, CxeEngine *engine, + CxuiDocumentLoader *documentLoader, + CxuiCaptureKeyHandler * keyHandler, + HbActivityManager *activityManager) +{ + CX_DEBUG_ENTER_FUNCTION(); + + //Minimum requirements to construct the view + CX_ASSERT_ALWAYS(mainWindow); + CX_ASSERT_ALWAYS(engine); + CX_ASSERT_ALWAYS(documentLoader); + CX_ASSERT_ALWAYS(activityManager); + + mMainWindow = mainWindow; + mDocumentLoader = documentLoader; + mCaptureKeyHandler = keyHandler; + mEngine = engine; + mActivityManager = activityManager; + + // adjust the timer, and connect it to correct slot + connect(&mHideControlsTimeout, SIGNAL(timeout()), this, SLOT(hideControls())); + mHideControlsTimeout.setSingleShot(true); + mHideControlsTimeout.setInterval(CXUI_HIDE_CONTROLS_TIMEOUT); + + mControlsFeedback.setOwningWindow(mMainWindow); + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! +* Is standby mode supported / needed by this view. +* Default implementation returns false. +* Inherited classes need to re-implement this if standby mode is needed. +* @return True if standby mode is supported, false otherwise. +*/ +bool CxuiView::isStandbyModeSupported() const +{ + return false; +} + + +/*! +* CxuiView::updateOrientation +*/ +void CxuiView::updateOrientation(Qt::Orientation orientation) +{ + CX_DEBUG_ENTER_FUNCTION(); + + hideControls(); + mMainWindow->setOrientation(orientation); + + if (mToolbar) { + if (orientation == Qt::Horizontal) { + mToolbar->setOrientation(Qt::Vertical); + } else { + mToolbar->setOrientation(Qt::Horizontal); + } + } + + CX_DEBUG_EXIT_FUNCTION(); +} + + +/*! + * Restore view state from activity. Default implementation does nothing. + */ +void CxuiView::restoreActivity(const QString &activityId, const QVariant &data) +{ + Q_UNUSED(activityId); + Q_UNUSED(data); +} + +/*! + * Save view state to activity. Default implementation does nothing. + */ +void CxuiView::saveActivity() +{ + +} + +/*! + * Clear activity from activity manager. Default implementation does nothing. + */ +void CxuiView::clearActivity() +{ + +} + +/*! +* Allow showing UI controls? +* Default behaviour is that controls can be shown at any time. +*/ +bool CxuiView::allowShowControls() const +{ + return true; +} + +/*! + * Play feedback when touching view outside of any widget? + * Default behaviour is that feedback is always played. + */ +bool CxuiView::isFeedbackEnabled() const +{ + return true; +} + +/*! +* Toggle visibility of UI controls. +*/ +void CxuiView::toggleControls() +{ + CX_DEBUG_ENTER_FUNCTION(); + + if (mControlsVisible) { + hideControls(); + } else { + showControls(); + } + + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! +* Slot for entering standby mode. +* By default, release camera. +*/ +void CxuiView::enterStandby() +{ + CX_DEBUG_IN_FUNCTION(); + releaseCamera(); + CX_DEBUG_IN_FUNCTION(); +} + +/*! +* Slot for exiting standby mode. +* By default, no action needed. +*/ +void CxuiView::exitStandby() +{ + CX_DEBUG_IN_FUNCTION(); +} + +/*! +* CxuiView::launchNotSupportedNotification +* Show "not supported" notification. +*/ +void CxuiView::launchNotSupportedNotification() +{ + CX_DEBUG_ENTER_FUNCTION(); + HbNotificationDialog::launchDialog("Notification", "Not supported yet"); + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! + * CxuiView::launchScenesView + */ +void CxuiView::launchScenesView() +{ + CX_DEBUG_ENTER_FUNCTION(); + hideControls(); + emit showScenesView(); + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! + * CxuiView::launchPhotosApp + */ +void CxuiView::launchPhotosApp() +{ + // Release camera device in order to free resources for Photos application + releaseCamera(); + QProcess::startDetached(PhotosAppExe); +} + +/*! + * CxuiView::launchVideosApp + * Launching Videos application as a separate process + */ +void CxuiView::launchVideosApp() +{ + // Release camera device in order to free resources for Videos application + releaseCamera(); + QProcess::startDetached(VideosAppExe); +} + +/*! + * Releasing camera hw + */ +void CxuiView::releaseCamera() +{ + CX_DEBUG_ENTER_FUNCTION(); + mEngine->cameraDeviceControl().release(); + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! + * CxuiView::hideControls + */ +void CxuiView::hideControls() +{ + CX_DEBUG_ENTER_FUNCTION(); + + if (mHideControlsTimeout.isActive()) { + mHideControlsTimeout.stop(); + } + + // Hide title bar and status bar. + //!@todo: View flags property is missing from HbView, so can't set these in DocML. + HbView::HbViewFlags flags(HbView::ViewTitleBarTransparent + | HbView::ViewTitleBarFloating + | HbView::ViewTitleBarHidden + | HbView::ViewStatusBarTransparent + | HbView::ViewStatusBarFloating + | HbView::ViewStatusBarHidden); + setViewFlags(flags); + //!@todo: Once the flags are defined in DocML, we can just use these convenience functions + // to hide the title bar and status bar here. + //setTitleBarVisible(false); + //setStatusBarVisible(false); + + hideZoom(); + + hideToolbar(); + + // show indicators when controls are hidden + showIndicators(); + + mControlsVisible = false; + + // give the keyboard focus back to the view + // for the view to receive key events + setFocus(); + + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! + * CxuiView::showControls + */ +void CxuiView::showControls() +{ + if (allowShowControls()) { + // show toolbar + showToolbar(); + + // show zoom + showZoom(); + + // show title bar and status bar + setTitleBarVisible(true); + setStatusBarVisible(true); + + // hide indicators when controls are shown + hideIndicators(); + + mHideControlsTimeout.start(); + mControlsVisible = true; + } +} + +/*! + * CxuiView::hideToolbar + */ +void CxuiView::hideToolbar() +{ + CX_DEBUG_ENTER_FUNCTION(); + if (mToolbar) { + mToolbar->hide(); + } + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! + * CxuiView::showToolbar + */ +void CxuiView::showToolbar() +{ + CX_DEBUG_ENTER_FUNCTION(); + if (mToolbar) { + mToolbar->show(); + } + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! + * CxuiView::hideIndicators + */ +void CxuiView::hideIndicators() +{ + if (mIndicators) { + mIndicators->hide(); + } +} + +/*! + * CxuiView::showIndicators + */ +void CxuiView::showIndicators() +{ + if (mIndicators) { + mIndicators->show(); + } +} + +/*! + * CxuiView::hideZoom + */ +void CxuiView::hideZoom() +{ + if (mSlider) { + mSlider->hide(); + } + mZoomVisible = false; +} + +/*! + * CxuiView::showZoom + */ +void CxuiView::showZoom() +{ + CX_DEBUG_ENTER_FUNCTION(); + if (mSlider) { + + // if maxVal has not been set yet, ask for new parameters from engine + if (mSlider->maximum() <= 0) { + + // get the zoom range + int min = mEngine->zoomControl().min(); + int max = mEngine->zoomControl().max(); + + // only change values if they are acceptable and have changed + if ((max - min > 0) && ((mSlider->maximum() != max) || (mSlider->minimum() != min))) { + mSlider->setRange(min, max); + } + } + + // show zoom only if the slider has acceptable value + if (mSlider->maximum() > 0) { + mSlider->show(); + } + } + + mZoomVisible = true; + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! +* Function can be used to create a graphics item and setting it as a background +* item for HbWidget. graphicName refers to system wide graphic name. Given graphic +* can consist of one, three or nine pieces. Nine piece graphics are used by default. +* See HbFrameDrawer documentation for graphic naming. +*/ +void CxuiView::createWidgetBackgroundGraphic(HbWidget *widget, + const QString &graphicName, + HbFrameDrawer::FrameType frameType) +{ + if (widget) { + HbFrameDrawer *drawer = new HbFrameDrawer(graphicName, frameType); + + if (drawer) { + HbFrameItem *backgroundItem = new HbFrameItem(drawer, widget); + if (backgroundItem) { + // set item to fill the whole widget + backgroundItem->setGeometry(QRectF(QPointF(0, 0), widget->size())); + backgroundItem->setZValue(0); + widget->setBackgroundItem(backgroundItem); + } + } + } +} + +/*! + * Handle mouse press events on this view. Needed to implement toggling of + * controls and playing feedback. + * \param event event to be handled + */ +void CxuiView::mousePressEvent(QGraphicsSceneMouseEvent *event) +{ + //! @todo temporary workaround for title bar mouse event handling bug + if (event->type() == QEvent::GraphicsSceneMousePress && event->scenePos().y() > 70 && + isFeedbackEnabled()) { + mControlsFeedback.setModalities(HbFeedback::All); + mControlsFeedback.play(); + event->accept(); + } +} + +/*! + * Handle mouse release events on this view. Needed to implement toggling of + * controls and playing feedback. + * \param event to be handled + */ +void CxuiView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) +{ + //! @todo temporary workaround for title bar mouse event handling bug + if (event->type() == QEvent::GraphicsSceneMouseRelease && event->scenePos().y() > 70 && + isFeedbackEnabled()) { + mControlsFeedback.setModalities(HbFeedback::Tactile); + mControlsFeedback.play(); + toggleControls(); + event->accept(); + } +} + +// End of file diff -r 3075d9b614e6 -r 0e652f8f1fbd camerauis/cameraxui/cxui/src/cxuiviewmanager.cpp --- a/camerauis/cameraxui/cxui/src/cxuiviewmanager.cpp Thu May 13 21:30:19 2010 +0300 +++ b/camerauis/cameraxui/cxui/src/cxuiviewmanager.cpp Thu Jul 15 01:55:05 2010 +0300 @@ -17,12 +17,13 @@ #include #include #include -#include #include - +#include +#include +#include #include "cxuiapplication.h" -#include "cxuiapplicationframeworkmonitor.h" +#include "cxuiapplicationstate.h" #include "cxuiviewmanager.h" #include "cxuivideoprecaptureview.h" #include "cxuistillprecaptureview.h" @@ -36,217 +37,346 @@ #include "cxuienums.h" #include "cxutils.h" #include "cxuidocumentloader.h" -#include "cxuistandby.h" -#include "cxuierrormanager.h" #include "cxesettings.h" #include "cxememorymonitor.h" #include "cxuiserviceprovider.h" #include "cxuiscenemodeview.h" + +#ifdef Q_OS_SYMBIAN #include "OstTraceDefinitions.h" + #ifdef OST_TRACE_COMPILER_IN_USE #include "cxuiviewmanagerTraces.h" #endif +#endif //Q_OS_SYMBIAN + using namespace Cxe; using namespace CxUiLayout; +namespace +{ + static const int CXUI_STANDBY_CAMERA_TIMEOUT = 60000; // 60 seconds +} -// --------------------------------------------------------------------------- -// CxuiViewManager::CxuiViewManager -// -// --------------------------------------------------------------------------- -// + +/*! +* Constructor. +*/ CxuiViewManager::CxuiViewManager(CxuiApplication &application, HbMainWindow &mainWindow, CxeEngine &engine) : mApplication(application), mMainWindow(mainWindow), - mStillPrecaptureView(NULL), - mVideoPrecaptureView(NULL), - mPostcaptureView(NULL), mEngine(engine), mKeyHandler(NULL), - mApplicationMonitor(NULL), mCameraDocumentLoader(NULL), - mSceneModeView(NULL) + mApplicationState(NULL), + mErrorManager(NULL) { CX_DEBUG_ENTER_FUNCTION(); - // Application monitor - mApplicationMonitor = new CxuiApplicationFrameworkMonitor(mApplication, mEngine.settings()); - connect(mApplicationMonitor, SIGNAL(foregroundStateChanged(CxuiApplicationFrameworkMonitor::ForegroundState)), - this, SLOT(handleForegroundStateChanged(CxuiApplicationFrameworkMonitor::ForegroundState))); - connect(mApplicationMonitor, SIGNAL(batteryEmpty()), - this, SLOT(handleBatteryEmpty())); - - // Connect memory monitor start / stop to focused status - connect(this, SIGNAL(focusGained()), &mEngine.memoryMonitor(), SLOT(startMonitoring())); - connect(this, SIGNAL(focusLost()), &mEngine.memoryMonitor(), SLOT(stopMonitoring())); + // create mappings to map view name to correct docml file + mDocmlFilesByView.insert(STILL_PRE_CAPTURE_VIEW, STILL_1ST_XML); + mDocmlFilesByView.insert(VIDEO_PRE_CAPTURE_VIEW, VIDEO_1ST_XML); + mDocmlFilesByView.insert(POSTCAPTURE_VIEW, POSTCAPTURE_XML); + mDocmlFilesByView.insert(SCENE_MODE_VIEW, SCENEMODE_SETTING_XML); // Key handler mKeyHandler = new CxuiCaptureKeyHandler(mEngine); - mMainWindow.installEventFilter(this); // in order to filter capture and AF keys - - OstTrace0( camerax_performance, CXUIVIEWMANAGER_CXUIVIEWMANAGER, "msg: e_CX_VIEWMANAGER_CREATE_DOCLOADER 1" ); + // Document loader + OstTrace0(camerax_performance, CXUIVIEWMANAGER_CXUIVIEWMANAGER_1, "msg: e_CX_VIEWMANAGER_CREATE_DOCLOADER 1"); mCameraDocumentLoader = new CxuiDocumentLoader(&engine); - OstTrace0( camerax_performance, DUP1_CXUIVIEWMANAGER_CXUIVIEWMANAGER, "msg: e_CX_VIEWMANAGER_CREATE_DOCLOADER 0" ); - - // standby functionality and necessary signal connections - mStandbyHandler = new CxuiStandby(*mKeyHandler, mCameraDocumentLoader, &mEngine); - - connect(mStandbyHandler, SIGNAL(aboutToEnterStandby()),this, SLOT(aboutToLooseFocus())); - connect(mStandbyHandler, SIGNAL(aboutToExitStandby()),this, SLOT(aboutToGainFocus())); - - // error manager, handling errors and notifying users based on their severity - mErrorManager = new CxuiErrorManager(*mKeyHandler, mCameraDocumentLoader); + OstTrace0(camerax_performance, CXUIVIEWMANAGER_CXUIVIEWMANAGER_2, "msg: e_CX_VIEWMANAGER_CREATE_DOCLOADER 0"); - // connecting necessary signals from error manager to release and init camera. - connect(mErrorManager, SIGNAL(aboutToRecoverError()), this, SLOT(aboutToLooseFocus())); - connect(mErrorManager, SIGNAL(errorRecovered()), this, SLOT(aboutToGainFocus())); + // Application state + mApplicationState = new CxuiApplicationState(mApplication, mEngine.settings(), mCameraDocumentLoader); + CX_ASSERT_ALWAYS(mApplicationState); + bool ok = connect(mApplicationState, SIGNAL(stateChanged(CxuiApplicationState::State, CxuiApplicationState::State)), + this, SLOT(handleApplicationStateChanged(CxuiApplicationState::State, CxuiApplicationState::State))); + Q_ASSERT_X(ok, "CxuiViewManager", "Application state change signal connect failed."); + connect(this, SIGNAL(standbyExitRequested()), mApplicationState, SLOT(exitStandby()), Qt::QueuedConnection); - if (!CxuiServiceProvider::isCameraEmbedded()) { - // For embedded mode: don't create view yet, create - // when engine inits to correct mode - CX_DEBUG_ASSERT(mEngine.cameraDeviceControl().cameraIndex() == Cxe::PrimaryCameraIndex); - if (mEngine.mode() == Cxe::VideoMode) { - createVideoPrecaptureView(); - mMainWindow.blockSignals(true); - mMainWindow.setCurrentView(mVideoPrecaptureView, false); - mMainWindow.blockSignals(false); - } else { - createStillPrecaptureView(); - mMainWindow.blockSignals(true); - mMainWindow.setCurrentView(mStillPrecaptureView, false); - mMainWindow.blockSignals(false); - } - connectPreCaptureSignals(); - } + // Standby timer + mStandbyTimer.setInterval(CXUI_STANDBY_CAMERA_TIMEOUT); + mStandbyTimer.setSingleShot(true); + connect(&mStandbyTimer, SIGNAL(timeout()), mApplicationState, SLOT(enterStandby())); + + // Filter capture and AF keys and follow user activity from mouse events. + QCoreApplication::instance()->installEventFilter(this); + + // Monitor memory on normal state, not on standby, error or background. + connect(this, SIGNAL(normalStateEntered()), &mEngine.memoryMonitor(), SLOT(startMonitoring())); + connect(this, SIGNAL(normalStateExited()), &mEngine.memoryMonitor(), SLOT(stopMonitoring())); //connecting initmode signals connect(&mEngine.cameraDeviceControl(), SIGNAL(initModeComplete(CxeError::Id)), - this, SLOT(createPostcaptureView())); - - connect(&mEngine.cameraDeviceControl(), SIGNAL(initModeComplete(CxeError::Id)), - mErrorManager, SLOT(analyze(CxeError::Id))); + mApplicationState, SLOT(handleApplicationError(CxeError::Id))); connect(&mEngine.stillCaptureControl(), SIGNAL(imageCaptured(CxeError::Id, int)), - mErrorManager, SLOT(analyze(CxeError::Id))); + mApplicationState, SLOT(handleApplicationError(CxeError::Id))); + + // Register stylesheet. It will be automatically destroyed on application + // exit. + HbStyleLoader::registerFilePath(":/camerax/cxui.css"); + + // Create the view we are starting in, or connect signals so it + // will be created once we know the mode we are starting to. + initStartupView(); + + // For UI startup testing, we need to emit applicationReady signal once UI is ready to be used. + connect(mMainWindow.currentView(), SIGNAL(viewReady()), &mApplication, SIGNAL(applicationReady())); + + CX_DEBUG_EXIT_FUNCTION(); +} + + +/*! +* Destructor. +*/ +CxuiViewManager::~CxuiViewManager() +{ + CX_DEBUG_ENTER_FUNCTION(); + QCoreApplication::instance()->removeEventFilter(this); + + if (!CxuiServiceProvider::isCameraEmbedded()) { + currentView()->saveActivity(); + } + + delete mApplicationState; + delete mCameraDocumentLoader; + delete mKeyHandler; + + CX_DEBUG_EXIT_FUNCTION(); +} + + + +/*! +* Handle change in overall state of application. +* @param newState The new application state. +*/ +void CxuiViewManager::handleApplicationStateChanged(CxuiApplicationState::State newState, + CxuiApplicationState::State oldState) +{ + Q_UNUSED(oldState); + CX_DEBUG_ENTER_FUNCTION(); + + CxuiView *view = qobject_cast(mMainWindow.currentView()); + CX_DEBUG(("CxuiViewManager - current view %d", view)); + + switch (newState) { + case CxuiApplicationState::Normal: + // Disable raising to foreground with capture key. + disconnect(mKeyHandler, SIGNAL(captureKeyPressed()), this, SLOT(toForeground())); + + connectSignals(view); + + CX_DEBUG(("CxuiViewManager - emitting normalStateEntered")); + emit normalStateEntered(); + break; + case CxuiApplicationState::Standby: + if (view && !view->isStandbyModeSupported()) { + // If we move to Stanby, and current view does not + // support standby mode, move to Normal mode right away. + CX_DEBUG(("CxuiViewManager - view does not support stanbdy, exiting standby right away..")); + mApplicationState->exitStandby(); + } else { + handleExitingNormalState(); + } + break; + case CxuiApplicationState::Error: + case CxuiApplicationState::Background: + handleExitingNormalState(); - if (CxuiServiceProvider::isCameraEmbedded()) { - // connect signals to set up the view after image/video prepare + if (newState == CxuiApplicationState::Background) { + // Moved to background. + // Bring application back to foreground by capture key press + connect(mKeyHandler, SIGNAL(captureKeyPressed()), this, SLOT(toForeground())); + } + break; + } + + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! +* Helper method to handle (possible) exiting from normal state. +* @param oldState The previous state. +*/ +void CxuiViewManager::handleExitingNormalState() +{ + CX_DEBUG_ENTER_FUNCTION(); + // Store view that is active now. + CxuiView *view = qobject_cast(mMainWindow.currentView()); + CX_DEBUG(("CxuiViewManager - current view %d", view)); + + // Emit signal so current view can enter standby. + emit normalStateExited(); + // Disconnect signals so we don't send key event's etc. + // Using the view before normalStateExited() signal was emitted, + // just in case it caused view switch. + disconnectSignals(view); + // Make sure standby timer is not running. + stopStandbyTimer(); + + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! +* Slot for starting standby timer. +*/ +void CxuiViewManager::startStandbyTimer() +{ + CX_DEBUG_ENTER_FUNCTION(); + mStandbyTimer.start(); + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! +* Slot for stopping standby timer. +*/ +void CxuiViewManager::stopStandbyTimer() +{ + CX_DEBUG_ENTER_FUNCTION(); + mStandbyTimer.stop(); + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! + * Helper function to return current view cast to CxuiView. + */ +CxuiView* CxuiViewManager::currentView() const +{ + CxuiView *view = qobject_cast (mMainWindow.currentView()); + CX_ASSERT_ALWAYS(view); + return view; +} + +/*! +* Select and initialize the view we need to start into. +*/ +void CxuiViewManager::initStartupView() +{ + CX_DEBUG_ENTER_FUNCTION(); + + if (mApplication.activateReason() == Hb::ActivationReasonService) { + // For embedded mode: don't create view yet, create when engine inits to correct mode. + // Connect signals to set up the view after image/video prepare connect(&mEngine.stillCaptureControl(), SIGNAL(imagePrepareComplete(CxeError::Id)), this, SLOT(changeToPrecaptureView())); connect(&mEngine.videoCaptureControl(), SIGNAL(videoPrepareComplete(CxeError::Id)), this, SLOT(changeToPrecaptureView())); - // start standby timer now because view will not be ready when viewfinder is started - mStandbyHandler->startTimer(); + } else if (mApplication.activateReason() == Hb::ActivationReasonActivity) { + // restoring activity, read startup view from stored activity + + // view to start in + QString viewName = STILL_PRE_CAPTURE_VIEW; + + bool preCapture = true; + QString activityId = mApplication.activateId(); + if (activityId == CxuiActivityIds::STILL_PRECAPTURE_ACTIVITY) { + viewName = STILL_PRE_CAPTURE_VIEW; + } else if (activityId == CxuiActivityIds::STILL_POSTCAPTURE_ACTIVITY) { + viewName = POSTCAPTURE_VIEW; + preCapture = false; + } else if (activityId == CxuiActivityIds::VIDEO_PRECAPTURE_ACTIVITY) { + viewName = VIDEO_PRE_CAPTURE_VIEW; + } else if (activityId == CxuiActivityIds::VIDEO_POSTCAPTURE_ACTIVITY) { + viewName = POSTCAPTURE_VIEW; + preCapture = false; + } + + CxuiView *view = createView(viewName); + mMainWindow.setCurrentView(view, false); + + if (preCapture) { + connectPreCaptureSignals(); + } else { + connectPostCaptureSignals(); + } + + // Check the current application state, signalled to handleApplicationStateChanged. + mApplicationState->startMonitoring(); + + // restore view from activity + bool ok = mApplication.activityManager()->waitActivity(); + + view->restoreActivity(activityId, + mApplication.activityManager()->activityData(mApplication.activateId())); + + clearAllActivities(); + } else { + // normal start + // no activity id, get default view from engine state + CxuiView *view = NULL; + if (mEngine.mode() == Cxe::VideoMode) { + view = createView(VIDEO_PRE_CAPTURE_VIEW); + } else { + view = createView(STILL_PRE_CAPTURE_VIEW); + } + + mMainWindow.setCurrentView(view, false); + connectPreCaptureSignals(); + + // Check the current application state, signalled to handleApplicationStateChanged. + mApplicationState->startMonitoring(); + + clearAllActivities(); } CX_DEBUG_EXIT_FUNCTION(); } -// --------------------------------------------------------------------------- -// CxuiViewManager::~CxuiViewManager -// -// --------------------------------------------------------------------------- -// -CxuiViewManager::~CxuiViewManager() +/*! +* Create view and add it to main window. +*/ +CxuiView* CxuiViewManager::createView(const QString &viewName) { CX_DEBUG_ENTER_FUNCTION(); - delete mCameraDocumentLoader; - delete mKeyHandler; - delete mApplicationMonitor; + OstTrace0(camerax_performance, CXUIVIEWMANAGER_CREATEVIEW_IN, "msg: e_CX_CREATE_VIEW 1"); + + CX_DEBUG(("View name: %s", viewName.toAscii().data())); + + CxuiView* view = mViews[viewName]; + if (view == NULL) { + CX_DEBUG(("View not loaded yet, loading now")); + bool ok = false; + // Use document loader to create widgets and layouts + // (non-sectioned parts are parsed and loaded) + QString docmlFile = mDocmlFilesByView[viewName]; + CX_ASSERT_ALWAYS(mCameraDocumentLoader); + CX_ASSERT_ALWAYS(!docmlFile.isNull()); + + OstTrace0(camerax_performance, CXUIVIEWMANAGER_CREATEVIEW_2, "msg: e_CX_DOCUMENTLOADER_LOAD 1"); + mCameraDocumentLoader->load(docmlFile, &ok); + OstTrace0(camerax_performance, CXUIVIEWMANAGER_CREATEVIEW_4, "msg: e_CX_DOCUMENTLOADER_LOAD 0"); + Q_ASSERT_X(ok, "createView", "error in xml file parsing"); + + OstTrace0(camerax_performance, CXUIVIEWMANAGER_CREATEVIEW_6, "msg: e_CX_DOCUMENTLOADER_FINDWIDGET 1"); + QGraphicsWidget *widget = NULL; + // ask for the view widget pointer + widget = mCameraDocumentLoader->findWidget(viewName); + view = qobject_cast (widget); + CX_ASSERT_ALWAYS(view); + OstTrace0(camerax_performance, CXUIVIEWMANAGER_CREATEVIEW_8, "msg: e_CX_DOCUMENTLOADER_FINDWIDGET 1"); + + // call for needed consturction methods + view->construct(&mMainWindow, &mEngine, mCameraDocumentLoader, mKeyHandler, mApplication.activityManager()); + // .. and add to main window (which also takes ownership) + OstTrace0(camerax_performance, CXUIVIEWMANAGER_CREATEVIEW_10, "msg: e_CX_MAINWINDOW_ADDVIEW 1"); + mMainWindow.addView(view); + mViews.insert(viewName, view); + OstTrace0(camerax_performance, CXUIVIEWMANAGER_CREATEVIEW_12, "msg: e_CX_MAINWINDOW_ADDVIEW 0"); + } + + OstTrace0(camerax_performance, CXUIVIEWMANAGER_CREATEVIEW_OUT, "msg: e_CX_CREATE_VIEW 0"); CX_DEBUG_EXIT_FUNCTION(); -} - - -// --------------------------------------------------------------------------- -// CxuiViewManager::prepareWindow -// -// --------------------------------------------------------------------------- -// -void CxuiViewManager::prepareWindow() -{ - getPrecaptureView(mEngine.mode(), mEngine.cameraDeviceControl().cameraIndex())->prepareWindow(); -} - - -// --------------------------------------------------------------------------- -// CxuiViewManager::createStillPrecaptureView -// -// --------------------------------------------------------------------------- -// -void CxuiViewManager::createStillPrecaptureView() -{ - CX_DEBUG_ENTER_FUNCTION(); - OstTrace0( camerax_performance, CXUIVIEWMANAGER_CREATESTILLPRECAPTUREVIEW, "msg: e_CX_CREATE_STILLPRECAPTUREVIEW 1" ); - - // Use document loader to create widgets and layouts - // (non-sectioned parts are parsed and loaded) - OstTrace0( camerax_performance, DUP2_CXUIVIEWMANAGER_ADDPRECAPTUREVIEWS, "msg: e_CX_DOCLOADER_LOAD 1" ); - - bool ok = false; - CX_DEBUG_ASSERT(mCameraDocumentLoader); - mCameraDocumentLoader->load(STILL_1ST_XML, &ok); - Q_ASSERT_X(ok, "createStillPrecaptureView", "error in xml file parsing"); - - OstTrace0( camerax_performance, DUP2_CXUIVIEWMANAGER_CREATESTILLPRECAPTUREVIEW, "msg: e_CX_DOCLOADER_LOAD 0" ); - - OstTrace0( camerax_performance, DUP4_CXUIVIEWMANAGER_ADDPRECAPTUREVIEWS, "msg: e_CX_DOCLOADER_FINDWIDGET 1" ); - QGraphicsWidget *widget = NULL; - // ask for the still precapture view widget pointer - widget = mCameraDocumentLoader->findWidget(STILL_PRE_CAPTURE_VIEW); - mStillPrecaptureView = qobject_cast (widget); - CX_DEBUG_ASSERT(mStillPrecaptureView); - OstTrace0( camerax_performance, DUP5_CXUIVIEWMANAGER_ADDPRECAPTUREVIEWS, "msg: e_CX_DOCLOADER_FINDWIDGET 0" ); - - // call for needed consturction methods - mStillPrecaptureView->construct(&mMainWindow, &mEngine, mCameraDocumentLoader, mKeyHandler); - // .. and add to main window (which also takes ownership) - OstTrace0( camerax_performance, DUP1_CXUIVIEWMANAGER_MAINWINDOW_ADDVIEW, "msg: e_CX_MAINWINDOW_ADDVIEW 1" ); - mMainWindow.addView(widget); - OstTrace0( camerax_performance, DUP2_CXUIVIEWMANAGER_MAINWINDOW_ADDVIEW, "msg: e_CX_MAINWINDOW_ADDVIEW 0" ); - - OstTrace0( camerax_performance, DUP1_CXUIVIEWMANAGER_CREATESTILLPRECAPTUREVIEW, "msg: e_CX_CREATE_STILLPRECAPTUREVIEW 0" ); - - CX_DEBUG_EXIT_FUNCTION(); -} - -// --------------------------------------------------------------------------- -// CxuiViewManager::createStillScenesView -// -// --------------------------------------------------------------------------- -// -void CxuiViewManager::createSceneModesView() -{ - CX_DEBUG_ENTER_FUNCTION(); - - bool ok = false; - CX_DEBUG_ASSERT(mCameraDocumentLoader); - - // Use document loader to create widgets and layouts - // (non-sectioned parts are parsed and loaded) - mCameraDocumentLoader->load(SCENEMODE_SETTING_XML, &ok); - - QGraphicsWidget *widget = NULL; - - // ask for the scenes mode view widget pointer - widget = mCameraDocumentLoader->findWidget(STILL_SCENES_VIEW); - Q_ASSERT_X(ok && (widget != 0), "camerax ui", "invalid xml file"); - mSceneModeView = qobject_cast (widget); - - // call for needed construction methods - mSceneModeView->construct(&mMainWindow, &mEngine, mCameraDocumentLoader, mKeyHandler); - // .. and add to main window (which also takes ownership) - mMainWindow.addView(widget); - mSceneModeView->loadBackgroundImages(); - - connect(mSceneModeView, SIGNAL(viewCloseEvent()), this, SLOT(changeToPrecaptureView())); - CX_DEBUG_EXIT_FUNCTION(); + return view; } /*! @@ -256,148 +386,70 @@ void CxuiViewManager::showScenesView() { CX_DEBUG_ENTER_FUNCTION(); - if (!mSceneModeView) { - createSceneModesView(); - } - else { - mSceneModeView->loadBackgroundImages(); - } - CX_DEBUG_ASSERT(mSceneModeView); - mMainWindow.blockSignals(true); - mMainWindow.setCurrentView(mSceneModeView, false); - emit disableStandbyTimer(); - connectCaptureKeySignals(); - mMainWindow.blockSignals(false); - CX_DEBUG_EXIT_FUNCTION(); -} - + // Disconnect signals from old view. + disconnectSignals(); -// --------------------------------------------------------------------------- -// CxuiViewManager::createVideoPrecaptureView -// -// --------------------------------------------------------------------------- -// -void CxuiViewManager::createVideoPrecaptureView() -{ - CX_DEBUG_ENTER_FUNCTION(); - OstTrace0( camerax_performance, CXUIVIEWMANAGER_CREATEVIDEOPRECAPTUREVIEW, "msg: e_CX_CREATE_VIDEOPRECAPTUREVIEW 1" ); - - CX_DEBUG_ASSERT(mCameraDocumentLoader); + CxuiSceneModeView *view = qobject_cast(createView(SCENE_MODE_VIEW)); + CX_ASSERT_ALWAYS(view); + view->loadBackgroundImages(); - bool ok = false; - // load and create the default widgets in video xml - mCameraDocumentLoader->load(VIDEO_1ST_XML, &ok); - CX_DEBUG_ASSERT(ok); - - // get pointer to videoprecaptureview and do some initialisation - QGraphicsWidget *widget = NULL; - widget = mCameraDocumentLoader->findWidget(VIDEO_PRE_CAPTURE_VIEW); - mVideoPrecaptureView = qobject_cast (widget); - CX_DEBUG_ASSERT(mVideoPrecaptureView); - mVideoPrecaptureView->construct(&mMainWindow, &mEngine, mCameraDocumentLoader, mKeyHandler); - - // add view to main window - OstTrace0( camerax_performance, DUP3_CXUIVIEWMANAGER_MAINWINDOW_ADDVIEW, "msg: e_CX_MAINWINDOW_ADDVIEW 1" ); - mMainWindow.addView(mVideoPrecaptureView); - OstTrace0( camerax_performance, DUP4_CXUIVIEWMANAGER_MAINWINDOW_ADDVIEW, "msg: e_CX_MAINWINDOW_ADDVIEW 0" ); - OstTrace0( camerax_performance, DUP1_CXUIVIEWMANAGER_CREATEVIDEOPRECAPTUREVIEW, "msg: e_CX_CREATE_VIDEOPRECAPTUREVIEW 0" ); + mMainWindow.setCurrentView(view, false); + stopStandbyTimer(); + connectSceneModeSignals(); CX_DEBUG_EXIT_FUNCTION(); } -// --------------------------------------------------------------------------- -// CxuiViewManager::createStillPostcaptureView -// -// --------------------------------------------------------------------------- -// -void CxuiViewManager::createPostcaptureView() -{ - CX_DEBUG_ENTER_FUNCTION(); - CX_DEBUG_ASSERT(mCameraDocumentLoader); - OstTrace0( camerax_performance, CXUIVIEWMANAGER_CREATESTILLPOSTCAPTUREVIEW, "msg: e_CX_CREATE_STILLPOSTCAPTUREVIEW 1" ); - - if (!mPostcaptureView) { - bool ok = false; - mCameraDocumentLoader->load(POSTCAPTURE_XML, &ok); - CX_DEBUG_ASSERT(ok); - - // get pointer to videoprecaptureview and do some initialisation - QGraphicsWidget *widget = NULL; - widget = mCameraDocumentLoader->findWidget(POSTCAPTURE_VIEW); - mPostcaptureView = qobject_cast (widget); - CX_DEBUG_ASSERT(mPostcaptureView); - mPostcaptureView->construct(&mMainWindow, &mEngine, mCameraDocumentLoader); - - mMainWindow.addView(mPostcaptureView); - connect(mPostcaptureView, SIGNAL(changeToPrecaptureView()), this, SLOT(changeToPrecaptureView())); - - } - - OstTrace0( camerax_performance, DUP1_CXUIVIEWMANAGER_CREATESTILLPOSTCAPTUREVIEW, "msg: e_CX_CREATE_STILLPOSTCAPTUREVIEW 0" ); - CX_DEBUG_EXIT_FUNCTION(); -} - -// --------------------------------------------------------------------------- -// CxuiViewManager::getPrecaptureView -// -// --------------------------------------------------------------------------- -// +/*! +* Get the precapture view appropriate for given camera mode and index. +* If the view does not exist, it is created. +* @param mode Which camera mode the view should match. +* @param index Which camera index the view should match. +*/ CxuiPrecaptureView* CxuiViewManager::getPrecaptureView(Cxe::CameraMode mode, Cxe::CameraIndex camera) { CX_DEBUG_ENTER_FUNCTION(); - CX_DEBUG(("CxuiViewManager::getPrecaptureView() mode=%d, camera index=%d", mode, camera)); + CX_DEBUG(("CxuiViewManager::getPrecaptureView - mode=%d, camera index=%d", mode, camera)); CX_DEBUG_ASSERT(camera == Cxe::PrimaryCameraIndex); if (mode == ImageMode) { - CX_DEBUG(("CxuiViewManager::getPrecaptureView() image mode")); - if(!mStillPrecaptureView) { - createStillPrecaptureView(); - } - return mStillPrecaptureView; + CX_DEBUG(("CxuiViewManager::getPrecaptureView - image mode")); + return qobject_cast(createView(STILL_PRE_CAPTURE_VIEW)); + } else { - CX_DEBUG(("CxuiViewManager::getPrecaptureView() video mode")); - if(!mVideoPrecaptureView) { - createVideoPrecaptureView(); - } - return mVideoPrecaptureView; + CX_DEBUG(("CxuiViewManager::getPrecaptureView - video mode")); + return qobject_cast(createView(VIDEO_PRE_CAPTURE_VIEW)); } } -CxuiDocumentLoader* CxuiViewManager::documentLoader() -{ - return mCameraDocumentLoader; -} - -// --------------------------------------------------------------------------- -// CxuiViewManager::changeToPostcaptureView -// -// --------------------------------------------------------------------------- -// +/*! +* Move to post-capture view. +*/ void CxuiViewManager::changeToPostcaptureView() { CX_DEBUG_ENTER_FUNCTION(); + // Disconnect signals from old view. + disconnectSignals(); - if (!mPostcaptureView) { - createPostcaptureView(); - } + CxuiView *postCaptureView = createView(POSTCAPTURE_VIEW); + + mMainWindow.setCurrentView(postCaptureView, false); - mMainWindow.blockSignals(true); - mMainWindow.setCurrentView(mPostcaptureView, false); - mMainWindow.blockSignals(false); - - // connecting all necessary signals for postcapture view - connectPostCaptureSignals(); + // Connecting all necessary signals for postcapture view. + // Not connected yet if not in normal state. We connect the signals + // once we enter normal state again. + if (mApplicationState->currentState() == CxuiApplicationState::Normal) { + connectPostCaptureSignals(); + } CX_DEBUG_EXIT_FUNCTION(); } -// --------------------------------------------------------------------------- -// CxuiViewManager::changeToPrecaptureView -// -// --------------------------------------------------------------------------- -// +/*! +* Move to pre-capture view. +*/ void CxuiViewManager::changeToPrecaptureView() { CX_DEBUG_ENTER_FUNCTION(); @@ -410,25 +462,43 @@ this, SLOT(changeToPrecaptureView())); } - HbView *view = getPrecaptureView(mEngine.mode(), - mEngine.cameraDeviceControl().cameraIndex()); + // If normal mode is not active, don't switch to precapture view and reserve camera now. + if (mApplicationState->currentState() != CxuiApplicationState::Normal) { + CX_DEBUG(("CxuiViewManager - Change to precapture blocked as not normal mode (error, standby, background).")); + } else { + + // Disconnect signals from old view. + disconnectSignals(); + + HbView *view = getPrecaptureView(mEngine.mode(), + mEngine.cameraDeviceControl().cameraIndex()); + mMainWindow.setCurrentView(view, false); - mMainWindow.blockSignals(true); - mMainWindow.setCurrentView(view, false); - mMainWindow.blockSignals(false); + // Release resources needed by scene view. + HbView *sceneView = mViews.take(SCENE_MODE_VIEW); + if (sceneView) { + // This will not delete the view. + mMainWindow.removeView(sceneView); + // We can get to this slot from scene view, so don't delete the object too early. + sceneView->deleteLater(); + sceneView = NULL; + } - // connecting necessary pre-capture view signals - connectPreCaptureSignals(); - emit startStandbyTimer(); + // connecting necessary pre-capture view signals + connectPreCaptureSignals(); + // Make sure engine prepares for new image/video if necessary + mEngine.initMode(mEngine.mode()); + + startStandbyTimer(); + + } CX_DEBUG_EXIT_FUNCTION(); } -// --------------------------------------------------------------------------- -// CxuiViewManager::switchCamera -// -// --------------------------------------------------------------------------- -// +/*! +* Switch between cameras. +*/ void CxuiViewManager::switchCamera() { CX_DEBUG_ENTER_FUNCTION(); @@ -445,12 +515,8 @@ } CxuiPrecaptureView* view = getPrecaptureView(mEngine.mode(), nextCamera); - - mMainWindow.blockSignals(true); mMainWindow.setCurrentView(view, false); - mMainWindow.blockSignals(false); view->updateOrientation(nextViewOrientation); - view->prepareWindow(); connectPreCaptureSignals(); @@ -459,34 +525,201 @@ CX_DEBUG_EXIT_FUNCTION(); } -// --------------------------------------------------------------------------- -// CxuiViewManager::eventFilter -// -// --------------------------------------------------------------------------- -// +/*! +* Event filter function. +* Used to get mouse and key events for standby and capture key handling. +* @param object Target object. +* @param event Event to be checked. +*/ bool CxuiViewManager::eventFilter(QObject *object, QEvent *event) { Q_UNUSED(object) bool eventWasConsumed = false; + bool userActivity = false; - switch (event->type()) - { + switch (event->type()) { case QEvent::KeyPress: case QEvent::KeyRelease: + userActivity = true; eventWasConsumed = mKeyHandler->handleKeyEvent(event); + if (eventWasConsumed && mApplicationState->currentState() == CxuiApplicationState::Standby) { + // Queued exit from standby. + emit standbyExitRequested(); + } + break; + + case QEvent::GraphicsSceneMouseMove: + case QEvent::GraphicsSceneMousePress: + userActivity = true; + break; + case QEvent::GraphicsSceneMouseRelease: + userActivity = true; + if (mApplicationState->currentState() == CxuiApplicationState::Standby) { + // Queued exit from standby. + // Standby popup in view can receive mouse event before it is dismissed. + emit standbyExitRequested(); + } break; } + + // Restart standby timer if there is user activity. + // Only restart the timer if it is running, do not set it running here. + if (userActivity && mStandbyTimer.isActive()) { + startStandbyTimer(); + } + // No need to call base class implementation, because we derive from QObject directly. // QObject::eventFilter() implementation always returns false. return eventWasConsumed; } -// --------------------------------------------------------------------------- -// CxuiViewManager::connectCaptureKeySignals -// -// --------------------------------------------------------------------------- -// +/*! +* Connect signals specific to given view. +*/ +void CxuiViewManager::connectSignals(QObject *view) +{ + CX_DEBUG_ENTER_FUNCTION(); + OstTrace0(camerax_performance, CXUIVIEWMANAGER_CONNECTSIGNALS_1, "msg: e_CX_VIEWMANAGER_CONNECT_SIGNALS 1"); + + if (view) { + if (view == mViews[POSTCAPTURE_VIEW]) { + connectPostCaptureSignals(); + } else if (view == mViews[SCENE_MODE_VIEW]) { + connectSceneModeSignals(); + } else { + connectPreCaptureSignals(); + } + } + + OstTrace0(camerax_performance, CXUIVIEWMANAGER_CONNECTSIGNALS_2, "msg: e_CX_VIEWMANAGER_CONNECT_SIGNALS 0"); + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! +* Disconnect signals. +* We don't want to send or receive signals with inactive views, so this is done every time changing a view. +* @param view View object from which signals are disconnected. If NULL is given, current view is used. +*/ +void CxuiViewManager::disconnectSignals(QObject *view) +{ + CX_DEBUG_ENTER_FUNCTION(); + OstTrace0(camerax_performance, CXUIVIEWMANAGER_DISCONNECT_1, "msg: e_CX_VIEWMANAGER_DISCONNECT_SIGNALS 1"); + + // Disconnect all existing capture key signals + mKeyHandler->disconnect(); + + if (!view) { + // If view is not given, take current view. + view = mMainWindow.currentView(); + } + + CX_DEBUG(("CxuiViewManager - disconnecting from view %d", view)); + if (view) { + // Disconnect all signals from current view to us. + disconnect(view, 0, this, 0); + // Disconnect all signals from us to current view. + disconnect(this, 0, view, 0); + } + + OstTrace0(camerax_performance, CXUIVIEWMANAGER_DISCONNECT_2, "msg: e_CX_VIEWMANAGER_DISCONNECT_SIGNALS 0"); + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! +* Connect signals to pre-capture view. +*/ +void CxuiViewManager::connectPreCaptureSignals() +{ + CX_DEBUG_ENTER_FUNCTION(); + + disconnectSignals(); + + HbView *currentView = mMainWindow.currentView(); + + if (currentView != mViews[POSTCAPTURE_VIEW]) { + // connects all capture key signals. + connectCaptureKeySignals(); + + // connecting pre-capture view signals to standby timer. + connect(currentView, SIGNAL(startStandbyTimer()), this, SLOT(startStandbyTimer()), Qt::UniqueConnection); + connect(currentView, SIGNAL(stopStandbyTimer()), this, SLOT(stopStandbyTimer()), Qt::UniqueConnection); + connect(currentView, SIGNAL(changeToPrecaptureView()), this, SLOT(startStandbyTimer()), Qt::UniqueConnection); + connect(currentView, SIGNAL(changeToPostcaptureView()), this, SLOT(stopStandbyTimer()), Qt::UniqueConnection); + + // connecting pre-capture view signals to viewmanager slots + connect(currentView, SIGNAL(changeToPostcaptureView()), this, SLOT(changeToPostcaptureView()), Qt::UniqueConnection); + connect(currentView, SIGNAL(changeToPrecaptureView()), this, SLOT(changeToPrecaptureView()), Qt::UniqueConnection); + + //connecting scene modes signal + connect(currentView, SIGNAL(showScenesView()), this, SLOT(showScenesView()), Qt::UniqueConnection); + + connect(currentView, SIGNAL(switchCamera()), this, SLOT(switchCamera()), Qt::UniqueConnection); + + // connecting error signals from precapture view to application state. + connect(currentView, SIGNAL(errorEncountered(CxeError::Id)), + mApplicationState, SLOT(handleApplicationError(CxeError::Id)), + Qt::UniqueConnection); + + // Standby signals + connect(this, SIGNAL(normalStateEntered()), currentView, SLOT(exitStandby()), Qt::UniqueConnection); + connect(this, SIGNAL(normalStateExited()), currentView, SLOT(enterStandby()), Qt::UniqueConnection); + } + + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! +* Connect signals to post-capture view. +*/ +void CxuiViewManager::connectPostCaptureSignals() +{ + CX_DEBUG_ENTER_FUNCTION(); + + disconnectSignals(); + QObject *currentView = mMainWindow.currentView(); + if (currentView == mViews[POSTCAPTURE_VIEW]) { + + connect(currentView, SIGNAL(changeToPrecaptureView()), this, SLOT(changeToPrecaptureView()), Qt::UniqueConnection); + + // Standby signals + connect(this, SIGNAL(normalStateEntered()), currentView, SLOT(exitStandby()), Qt::UniqueConnection); + connect(this, SIGNAL(normalStateExited()), currentView, SLOT(enterStandby()), Qt::UniqueConnection); + + // connect necessary capturekey signals + connectCaptureKeySignals(); + } + + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! +* Connect signals to scene mode view. +*/ +void CxuiViewManager::connectSceneModeSignals() +{ + CX_DEBUG_ENTER_FUNCTION(); + disconnectSignals(); + + HbView *currentView = mMainWindow.currentView(); + + if (currentView == mViews[SCENE_MODE_VIEW]) { + + connectCaptureKeySignals(); + + // Standby signals for releasing camera + connect(this, SIGNAL(normalStateEntered()), currentView, SLOT(exitStandby())); + connect(this, SIGNAL(normalStateExited()), currentView, SLOT(enterStandby())); + + // Moving back to pre-capture view + connect(currentView, SIGNAL(viewCloseEvent()), this, SLOT(changeToPrecaptureView())); + } + CX_DEBUG_EXIT_FUNCTION(); +} + +/*! +* Connect key handler capture key signals. +*/ void CxuiViewManager::connectCaptureKeySignals() { CX_DEBUG_ENTER_FUNCTION(); @@ -508,104 +741,16 @@ CX_DEBUG_EXIT_FUNCTION(); } - -// --------------------------------------------------------------------------- -// CxuiViewManager::connectPreCaptureSignals -// -// --------------------------------------------------------------------------- -// -void CxuiViewManager::connectPreCaptureSignals() +/*! + * Clears all camera activities from activity manager. + */ +void CxuiViewManager::clearAllActivities() { - CX_DEBUG_ENTER_FUNCTION(); - - disconnectSignals(); - - QObject *currentView = mMainWindow.currentView(); - - if (currentView != mPostcaptureView) { - // connects all capture key signals. - connectCaptureKeySignals(); - - // connecting view manager focus events to pre-capture views - connect(this, SIGNAL(focusGained()), currentView, SLOT(handleFocusGained()), Qt::UniqueConnection); - connect(this, SIGNAL(focusLost()), currentView, SLOT(handleFocusLost()), Qt::UniqueConnection); - connect(this, SIGNAL(batteryEmpty()), currentView, SLOT(handleBatteryEmpty()), Qt::UniqueConnection); - - // in standby mode, we are interested in focus gain events for dismissing standby - connect(this, SIGNAL(focusGained()), mStandbyHandler, SLOT(handleMouseEvent()), Qt::UniqueConnection); - - // connecting key events to standby. - connect(mKeyHandler, SIGNAL(autofocusKeyPressed()), mStandbyHandler, SLOT(stopTimer()), Qt::UniqueConnection); - connect(mKeyHandler, SIGNAL(autofocusKeyReleased()), mStandbyHandler, SLOT(startTimer()), Qt::UniqueConnection); - connect(mKeyHandler, SIGNAL(captureKeyPressed()), mStandbyHandler, SLOT(startTimer()), Qt::UniqueConnection); - connect(mKeyHandler, SIGNAL(captureKeyReleased()), mStandbyHandler, SLOT(startTimer()), Qt::UniqueConnection); - connect(this, SIGNAL(disableStandbyTimer()), mStandbyHandler, SLOT(stopTimer()), Qt::UniqueConnection); - connect(this, SIGNAL(startStandbyTimer()), mStandbyHandler, SLOT(startTimer()), Qt::UniqueConnection); - - // connecting pre-capture view signals to standby. - connect(currentView, SIGNAL(startStandbyTimer()), mStandbyHandler, SLOT(startTimer()), Qt::UniqueConnection); - connect(currentView, SIGNAL(changeToPrecaptureView()), mStandbyHandler, SLOT(startTimer()), Qt::UniqueConnection); - connect(currentView, SIGNAL(stopStandbyTimer()), mStandbyHandler, SLOT(stopTimer()), Qt::UniqueConnection); - connect(currentView, SIGNAL(changeToPostcaptureView()), mStandbyHandler, SLOT(stopTimer()), Qt::UniqueConnection); - - // connecting precapture view signals to viewmanager slots - connect(currentView, SIGNAL(changeToPostcaptureView()), this, SLOT(changeToPostcaptureView()), Qt::UniqueConnection); - connect(currentView, SIGNAL(changeToPrecaptureView()), this, SLOT(changeToPrecaptureView()), Qt::UniqueConnection); - - //connecting scene modes signal - connect(currentView, SIGNAL(showScenesView()), this, SLOT(showScenesView()), Qt::UniqueConnection); - - connect(currentView, SIGNAL(switchCamera()), this, SLOT(switchCamera()), Qt::UniqueConnection); - - // connecting error signals from precapture view to errormanager. - connect(currentView, SIGNAL(reportError(CxeError::Id)), mErrorManager, SLOT(analyze(CxeError::Id)), Qt::UniqueConnection); - } - - CX_DEBUG_EXIT_FUNCTION(); -} - - -// --------------------------------------------------------------------------- -// CxuiViewManager::connectPostCaptureSignals -// -// --------------------------------------------------------------------------- -// -void CxuiViewManager::connectPostCaptureSignals() -{ - CX_DEBUG_ENTER_FUNCTION(); - - disconnectSignals(); - QObject *currentView = mMainWindow.currentView(); - if (currentView == mPostcaptureView) { - // connecting view manager focus events to pre-capture views - connect(this, SIGNAL(focusGained()), currentView, SLOT(startTimers()), Qt::UniqueConnection); - connect(this, SIGNAL(focusLost()), currentView, SLOT(handleFocusLost()), Qt::UniqueConnection); - connect(currentView, SIGNAL(changeToPrecaptureView()), mStandbyHandler, SLOT(startTimer()), Qt::UniqueConnection); - - // connect necessary capturekey signals - connectCaptureKeySignals(); - } - - CX_DEBUG_EXIT_FUNCTION(); -} - - - -/* -* CxuiViewManager::disconnectPreCaptureSignals -*/ -void CxuiViewManager::disconnectSignals() -{ - CX_DEBUG_ENTER_FUNCTION(); - - // Disconnect all existing capture key signals - mKeyHandler->disconnect(); - - disconnect(SIGNAL(focusGained())); - disconnect(SIGNAL(focusLost())); - disconnect(SIGNAL(batteryEmpty())); - - CX_DEBUG_EXIT_FUNCTION(); + HbActivityManager *activityManager = mApplication.activityManager(); + activityManager->removeActivity(CxuiActivityIds::STILL_PRECAPTURE_ACTIVITY); + activityManager->removeActivity(CxuiActivityIds::STILL_POSTCAPTURE_ACTIVITY); + activityManager->removeActivity(CxuiActivityIds::VIDEO_PRECAPTURE_ACTIVITY); + activityManager->removeActivity(CxuiActivityIds::VIDEO_POSTCAPTURE_ACTIVITY); } /*! @@ -615,10 +760,9 @@ { CX_DEBUG_ENTER_FUNCTION(); - if (mApplicationMonitor - && mApplicationMonitor->foregroundState() == CxuiApplicationFrameworkMonitor::ForegroundFullyLost) { + if (mApplicationState->currentState() == CxuiApplicationState::Background) { // Bring to foreground and gain focus. - CX_DEBUG(("CxuiViewManager - fully in background, bringing to foreground now.")); + CX_DEBUG(("CxuiViewManager - in background, bringing to foreground now.")); mMainWindow.raise(); mMainWindow.activateWindow(); } @@ -626,78 +770,4 @@ CX_DEBUG_EXIT_FUNCTION(); } -/*! -* Handle change in foreground state. -*/ -void CxuiViewManager::handleForegroundStateChanged(CxuiApplicationFrameworkMonitor::ForegroundState state) -{ - switch (state) { - case CxuiApplicationFrameworkMonitor::ForegroundPartiallyLost: - break; - case CxuiApplicationFrameworkMonitor::ForegroundFullyLost: - aboutToLooseFocus(); - break; - case CxuiApplicationFrameworkMonitor::ForegroundOwned: - aboutToGainFocus(); - break; - } -} - -// --------------------------------------------------------------------------- -// CxuiViewManager::aboutToLooseFocus() -// -// --------------------------------------------------------------------------- -// -void CxuiViewManager::aboutToLooseFocus() -{ - CX_DEBUG_ENTER_FUNCTION(); - - emit focusLost(); - disconnectSignals(); - - // We do not stop listening to capture key events even if we go to background, - // as capture key brings us back to foreground. - connect(mKeyHandler, SIGNAL(captureKeyPressed()), this, SLOT(toForeground())); - - CX_DEBUG_EXIT_FUNCTION(); -} - - -// --------------------------------------------------------------------------- -// CxuiViewManager::aboutToGainFocus -// -// --------------------------------------------------------------------------- -// -void CxuiViewManager::aboutToGainFocus() -{ - CX_DEBUG_ENTER_FUNCTION(); - - // Disconnect capture key event and bringing us to foreground connection (if there is one). - disconnect(mKeyHandler, SIGNAL(captureKeyPressed()), this, SLOT(toForeground())); - - // we are getting the focus. - if (mMainWindow.currentView() != mPostcaptureView) { - connectPreCaptureSignals(); - } else { - connectPostCaptureSignals(); - } - - if (mKeyHandler) { - mKeyHandler->listenKeys(true); - } - emit focusGained(); - - CX_DEBUG_EXIT_FUNCTION(); -} - -/*! -* Handle battery emptying -*/ -void CxuiViewManager::handleBatteryEmpty() -{ - CX_DEBUG_ENTER_FUNCTION(); - emit batteryEmpty(); - CX_DEBUG_EXIT_FUNCTION(); -} - // end of file diff -r 3075d9b614e6 -r 0e652f8f1fbd camerauis/cameraxui/cxui/src/cxuizoomslider.cpp --- a/camerauis/cameraxui/cxui/src/cxuizoomslider.cpp Thu May 13 21:30:19 2010 +0300 +++ b/camerauis/cameraxui/cxui/src/cxuizoomslider.cpp Thu Jul 15 01:55:05 2010 +0300 @@ -55,3 +55,22 @@ // underneath this slider event->accept(); } + +/*! +* Adding zoom buttons to the slider +*/ +void CxuiZoomSlider::addZoomButtons() +{ + // get current slider elements + QList elements = sliderElements(); + + // add increase and decrease elements to the slider + elements << HbSlider::IncreaseElement << HbSlider::DecreaseElement; + setSliderElements(elements); + + // set icons for the increase and decrease element + setElementIcon(HbSlider::DecreaseElement , HbIcon("qtg_mono_minus")); + setElementIcon(HbSlider::IncreaseElement , HbIcon("qtg_mono_plus")); +} + +//End of file diff -r 3075d9b614e6 -r 0e652f8f1fbd camerauis/cameraxui/cxui/src/main.cpp --- a/camerauis/cameraxui/cxui/src/main.cpp Thu May 13 21:30:19 2010 +0300 +++ b/camerauis/cameraxui/cxui/src/main.cpp 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" @@ -15,34 +15,39 @@ * */ -#include -#include #include #include // needed for localization -#include #include +#include #include -#include + +#ifdef Q_OS_SYMBIAN +#include +#include +#endif // Q_OS_SYMBIAN #include "cxeengine.h" #include "cxecameradevicecontrol.h" #include "cxuiapplication.h" #include "cxuiviewmanager.h" +#include "cxuiapplicationstate.h" +#include "cxuienums.h" #include "cxutils.h" #include "cxuiserviceprovider.h" +#ifdef Q_OS_SYMBIAN #include "OstTraceDefinitions.h" #ifdef OST_TRACE_COMPILER_IN_USE #include "mainTraces.h" -#endif +#endif // OST_TRACE_COMPILER_IN_USE +#endif // Q_OS_SYMBIAN using namespace Cxe; // CONSTANTS -const QString TRANSLATIONS_PATH = "z:/resource/qt/translations/"; -const QString TRANSLATIONS_FILE_NAME = "camera_"; -const QString COMMON_TRANSLATIONS_FILE_NAME = "common_"; +const QString TRANSLATIONS_PATH = "/resource/qt/translations/"; +const QString TRANSLATIONS_FILE = "camera"; int main(int argc, char *argv[]) { @@ -51,6 +56,11 @@ Q_INIT_RESOURCE(cxui); + // Use software rendering / raster graphics system to save GPU memory. + CX_DEBUG(("CxUI: Take raster graphics system into use..")); + QApplication::setGraphicsSystem("raster"); + CX_DEBUG(("CxUI: ..raster graphics system in use")); + OstTrace0( camerax_performance, DUP1__MAIN, "msg: e_CX_HBAPP_CREATION 1" ); CxuiApplication app(argc, argv); OstTrace0( camerax_performance, DUP2__MAIN, "msg: e_CX_HBAPP_CREATION 0" ); @@ -59,76 +69,97 @@ // Reserve and power on can then proceed in parallel with // ui construction. OstTrace0( camerax_performance, DUP7__MAIN, "msg: e_CX_CREATE_ENGINE 1" ); - CxeEngine *eng = CxeEngine::createEngine(); + CxeEngine *engine = CxeEngine::createEngine(); OstTrace0( camerax_performance, DUP8__MAIN, "msg: e_CX_CREATE_ENGINE 0" ); - if (XQServiceUtil::isService()) { + if (app.activateReason() == Hb::ActivationReasonService) { + CX_DEBUG(("CxUI: Camera started as service")); // Embedded mode. Engine is inited to correct mode // by service provider when request arrives CX_DEBUG(("CxUI: creating serviceprovider")); - CxuiServiceProvider::create(eng); + CxuiServiceProvider::create(engine); CX_DEBUG(("CxUI: done")); - } else { - // Normal mode. Init engine now. - OstTrace0( camerax_performance, DUP9__MAIN, "msg: e_CX_INIT_ENGINE 1" ); - //! @todo temporarily commented as part of a hack to change the startup sequence - // to avoid GOOM issues - //eng->initMode(Cxe::ImageMode); - OstTrace0( camerax_performance, DUP10__MAIN, "msg: e_CX_INIT_ENGINE 0" ); - } - - // Load the language specific localization files: application + common - OstTrace0( camerax_performance, DUP3__MAIN, "msg: e_CX_LOAD_TRANSLATIONS 1" ); - QTranslator translator; - QString lang = QLocale::system().name(); + } else if (app.activateReason() == Hb::ActivationReasonActivity) { + CX_DEBUG(("CxUI: Camera started as activity")); + Cxe::CameraMode mode = Cxe::ImageMode; + QString activityId = app.activateId(); + if (activityId == CxuiActivityIds::VIDEO_PRECAPTURE_ACTIVITY || + activityId == CxuiActivityIds::VIDEO_POSTCAPTURE_ACTIVITY) { + mode = Cxe::VideoMode; + } - CX_DEBUG(("CxUI: loading translation")); - bool ret = false; - ret = translator.load(TRANSLATIONS_PATH + TRANSLATIONS_FILE_NAME + lang); - CX_DEBUG(("load ok=%d", ret)); - app.installTranslator( &translator ); + if (activityId == CxuiActivityIds::STILL_PRECAPTURE_ACTIVITY || + activityId == CxuiActivityIds::VIDEO_PRECAPTURE_ACTIVITY) { + // init engine only if going to pre-capture + engine->initMode(mode); + } else { + // in post-capture don't init but set the correct mode to engine + // so init can be done later + engine->setMode(mode); + } + } else { + CX_DEBUG(("CxUI: Camera started as normal app")); + // normal start + engine->initMode(engine->mode()); + } - QTranslator commonTranslator; - CX_DEBUG(("CxUI: loading common translation")); - ret = false; - ret = commonTranslator.load(TRANSLATIONS_PATH + COMMON_TRANSLATIONS_FILE_NAME + lang); - CX_DEBUG(("load ok=%d", ret)); - app.installTranslator(&commonTranslator); +#ifdef Q_OS_SYMBIAN + //!@todo: Yield run time to system to get enough resources released to start camera. + CX_DEBUG(("CxUI: yield control for resource freeing..")); + User::After(2*1000*1000); // 2s + CX_DEBUG(("CxUI: waiting done..")); +#endif // Q_OS_SYMBIAN + + // Load language specific application localization file, e.g. "camera_en.qm" + // Translations need to be loaded before any widgets are created. + CX_DEBUG(("CxUI: Load translations..")); + OstTrace0( camerax_performance, DUP3__MAIN, "msg: e_CX_LOAD_TRANSLATIONS 1" ); + HbTranslator translator(TRANSLATIONS_PATH, TRANSLATIONS_FILE); + // Load language specific common localization file + translator.loadCommon(); OstTrace0( camerax_performance, DUP4__MAIN, "msg: e_CX_LOAD_TRANSLATIONS 0" ); + CX_DEBUG(("CxUI: ..translations loaded")); + // Create main window OstTrace0( camerax_performance, DUP5__MAIN, "msg: e_CX_MAINWINDOW_CREATION 1" ); - HbMainWindow *mainWindow = new HbMainWindow(0, Hb::WindowFlagTransparent | - Hb::WindowFlagNoBackground); - mainWindow->setAttribute(Qt::WA_NoBackground); + HbMainWindow mainWindow(0, Hb::WindowFlagTransparent | Hb::WindowFlagNoBackground); + mainWindow.setAttribute(Qt::WA_NoBackground); OstTrace0( camerax_performance, DUP6__MAIN, "msg: e_CX_MAINWINDOW_CREATION 0" ); - OstTrace0( camerax_performance, DUP11__MAIN, "msg: e_CX_CREATE_VIEW_MANAGER 1" ); - CxuiViewManager *viewManager = new CxuiViewManager(app, *mainWindow, *eng); - OstTrace0( camerax_performance, DUP12__MAIN, "msg: e_CX_CREATE_VIEW_MANAGER 0" ); - + // Set main window to landscape and full screen OstTrace0( camerax_performance, DUP13__MAIN, "msg: e_CX_MAINWINDOW_SETORIENTATION 1" ); - mainWindow->setOrientation(Qt::Horizontal); + mainWindow.setOrientation(Qt::Horizontal); OstTrace0( camerax_performance, DUP14__MAIN, "msg: e_CX_MAINWINDOW_SETORIENTATION 0" ); + OstTrace0( camerax_performance, DUP15__MAIN, "msg: e_CX_MAINWINDOW_FULLSCREEN 1" ); - OstTrace0( camerax_performance, DUP15__MAIN, "msg: e_CX_MAINWINDOW_FULLSCREEN 1" ); - mainWindow->showFullScreen(); +#ifdef Q_OS_SYMBIAN + mainWindow.showFullScreen(); +#else + /* + * todo : check if this is an Orbit bug or if there's a better solution + */ + mainWindow.resize(640, 360); + mainWindow.setOrientation(Qt::Vertical, false); + mainWindow.show(); + mainWindow.setOrientation(Qt::Horizontal, false); +#endif //Q_OS_SYMBIAN OstTrace0( camerax_performance, DUP16__MAIN, "msg: e_CX_MAINWINDOW_FULLSCREEN 0" ); + // Create view manager + OstTrace0( camerax_performance, DUP11__MAIN, "msg: e_CX_CREATE_VIEW_MANAGER 1" ); + CxuiViewManager *viewManager = new CxuiViewManager(app, mainWindow, *engine); + OstTrace0( camerax_performance, DUP12__MAIN, "msg: e_CX_CREATE_VIEW_MANAGER 0" ); + + // Give main window id to engine for setting up viewfinder window behind it OstTrace0( camerax_performance, DUP17__MAIN, "msg: e_CX_PREPAREWINDOW 1" ); - viewManager->prepareWindow(); + engine->viewfinderControl().setWindow(mainWindow.effectiveWinId()); OstTrace0( camerax_performance, DUP18__MAIN, "msg: e_CX_PREPAREWINDOW 0" ); - //! @todo initMode call added here as a temporary hack to change the startup sequence - // in order to avoid GOOM issues - User::After(2000000); - eng->initMode(Cxe::ImageMode); + int returnValue = app.exec(); - // delete service provider instance - CxuiServiceProvider::destroy(); - delete viewManager; - delete mainWindow; - delete eng; + CxuiServiceProvider::destroy(); // delete service provider instance + delete engine; return returnValue; } diff -r 3075d9b614e6 -r 0e652f8f1fbd camerauis/cameraxui/rom/camerax.iby --- a/camerauis/cameraxui/rom/camerax.iby Thu May 13 21:30:19 2010 +0300 +++ b/camerauis/cameraxui/rom/camerax.iby 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" @@ -23,13 +23,13 @@ // Ui S60_APP_EXE(cxui) data = DATAZ_\private\10003a3f\import\apps\cxui_reg.rsc \private\10003a3f\import\apps\cxui_reg.rsc -data = DATAZ_\APP_RESOURCE_DIR\cxui.mif APP_RESOURCE_DIR\cxui.mif // Sounds data = DATAZ_\system\sounds\digital\capture.wav system\sounds\digital\capture.wav data = DATAZ_\system\sounds\digital\videoStart.wav system\sounds\digital\videoStart.wav data = DATAZ_\system\sounds\digital\videoStop.wav system\sounds\digital\videoStop.wav data = DATAZ_\system\sounds\digital\autoFocus.wav system\sounds\digital\autoFocus.wav +data = DATAZ_\system\sounds\digital\selftimer.wav system\sounds\digital\selftimer.wav // CR key files data = DATAZ_\private\10202be9\20027017.txt private\10202be9\20027017.txt diff -r 3075d9b614e6 -r 0e652f8f1fbd camerauis/cameraxui/rom/camerax_stub.pkg --- a/camerauis/cameraxui/rom/camerax_stub.pkg Thu May 13 21:30:19 2010 +0300 +++ b/camerauis/cameraxui/rom/camerax_stub.pkg 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" @@ -30,5 +30,4 @@ "" - "z:\sys\bin\cxui.exe" "" - "z:\resource\apps\cxui.r*" "" - "z:\private\10003a3f\import\apps\cxui_reg.rsc" -"" - "z:\resource\apps\cxui.mif" "" - "z:\sys\bin\cxengine.dll" diff -r 3075d9b614e6 -r 0e652f8f1fbd camerauis/cameraxui/rom/camerax_stub.sis Binary file camerauis/cameraxui/rom/camerax_stub.sis has changed diff -r 3075d9b614e6 -r 0e652f8f1fbd camerauis/cameraxui/rom/cameraxresources.iby --- a/camerauis/cameraxui/rom/cameraxresources.iby Thu May 13 21:30:19 2010 +0300 +++ b/camerauis/cameraxui/rom/cameraxresources.iby 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" @@ -20,9 +20,7 @@ #include -data=DATAZ_\APP_RESOURCE_DIR\camera.rsc APP_RESOURCE_DIR\camera.rsc - -data=DATAZ_\QT_TRANSLATIONS_DIR\camera.qm QT_TRANSLATIONS_DIR\camera.qm +data=DATAZ_\QT_TRANSLATIONS_DIR\camera.qm QT_TRANSLATIONS_DIR\camera.qm S60_APP_RESOURCE(cxui)