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

equal deleted inserted replaced

-:feebad15db8c
+:c826656d6714
 #include <hbmainwindow.h>
 #include <QGraphicsSceneEvent>
 #include <hbstyleloader.h>
 #include <hbactivitymanager.h>
 #include <hbaction.h>
+#include <xqserviceutil.h>
 #include "cxuiapplication.h"
 #include "cxuiapplicationstate.h"
 #include "cxuiviewmanager.h"
 #include "cxuivideoprecaptureview.h"
 CxuiApplicationState::State oldState)
 {
 Q_UNUSED(oldState);
 CX_DEBUG_ENTER_FUNCTION();
-CxuiView *view = qobject_cast<CxuiView *>(mMainWindow.currentView());
+CxuiView *view = currentView();
 CX_DEBUG(("CxuiViewManager - current view %d", view));
 switch (newState) {
 case CxuiApplicationState::Normal:
 // Disable raising to foreground with capture key.
 */
 void CxuiViewManager::handleExitingNormalState()
 {
 CX_DEBUG_ENTER_FUNCTION();
 // Store view that is active now.
-CxuiView *view = qobject_cast<CxuiView *>(mMainWindow.currentView());
+CxuiView *view = 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.
 * Helper function to return current view cast to CxuiView.
 */
 CxuiView* CxuiViewManager::currentView() const
 {
 CxuiView *view = qobject_cast<CxuiView*> (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) {
+if (mApplication.activateReason() == Hb::ActivationReasonService ||
+// @todo: There's a bug in orbit and we never get Hb::ActivationReasonService as
+// activation reason. Use XQServiceUtil to determine if starting service as
+// a workaround for now
+XQServiceUtil::isService()) {
 // 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)),
 viewName = POSTCAPTURE_VIEW;
 preCapture = false;
 }
 CxuiView *view = createView(viewName);
-mMainWindow.setCurrentView(view, false);
 if (preCapture) {
-connectPreCaptureSignals();
+connectPreCaptureSignals(static_cast<CxuiPrecaptureView *>(view));
 } else {
 connectPostCaptureSignals();
 }
+mMainWindow.setCurrentView(view, false);
-// Check the current application state, signalled to handleApplicationStateChanged.
-mApplicationState->startMonitoring();
 // restore view from activity
 bool ok = mApplication.activityManager()->waitActivity();
 view->restoreActivity(activityId,
 if (mEngine.mode() == Cxe::VideoMode) {
 view = createView(VIDEO_PRE_CAPTURE_VIEW);
 } else {
 view = createView(STILL_PRE_CAPTURE_VIEW);
 }
+connectPreCaptureSignals(static_cast<CxuiPrecaptureView *>(view));
 mMainWindow.setCurrentView(view, false);
-connectPreCaptureSignals();
-// Check the current application state, signalled to handleApplicationStateChanged.
-mApplicationState->startMonitoring();
 clearAllActivities();
 }
+// Check the current application state, signalled to handleApplicationStateChanged.
+mApplicationState->startMonitoring();
 CX_DEBUG_EXIT_FUNCTION();
 }
 /*!
 CxuiSceneModeView *view = qobject_cast<CxuiSceneModeView*>(createView(SCENE_MODE_VIEW));
 CX_ASSERT_ALWAYS(view);
 view->loadBackgroundImages();
-mMainWindow.setCurrentView(view, false);
 stopStandbyTimer();
 connectSceneModeSignals();
+mMainWindow.setCurrentView(view, false);
 CX_DEBUG_EXIT_FUNCTION();
 }
 /*!
 CX_DEBUG_ENTER_FUNCTION();
 // Disconnect signals from old view.
 disconnectSignals();
 CxuiView *postCaptureView = createView(POSTCAPTURE_VIEW);
-mMainWindow.setCurrentView(postCaptureView, false);
 // 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();
 }
+// Connect signals before we set the post-capture view as current view.
+// We need to have signals connected if post-capture view for example
+// needs to move back to pre-capture view already in showEvent.
+mMainWindow.setCurrentView(postCaptureView, false);
 CX_DEBUG_EXIT_FUNCTION();
 }
 /*!
 } else {
 // Disconnect signals from old view.
 disconnectSignals();
-HbView *view = getPrecaptureView(mEngine.mode(),
+CxuiPrecaptureView *view =
-mEngine.cameraDeviceControl().cameraIndex());
+getPrecaptureView(mEngine.mode(), mEngine.cameraDeviceControl().cameraIndex());
+// Connect necessary pre-capture view signals.
+connectPreCaptureSignals(view);
 mMainWindow.setCurrentView(view, false);
 // Release resources needed by scene view.
 HbView *sceneView = mViews.take(SCENE_MODE_VIEW);
 if (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();
 // Make sure engine prepares for new image/video if necessary
 mEngine.initMode(mEngine.mode());
 startStandbyTimer();
 nextCamera = Cxe::PrimaryCameraIndex;
 nextViewOrientation = Qt::Horizontal;
 }
 CxuiPrecaptureView* view = getPrecaptureView(mEngine.mode(), nextCamera);
+connectPreCaptureSignals(view);
 mMainWindow.setCurrentView(view, false);
 view->updateOrientation(nextViewOrientation);
-connectPreCaptureSignals();
 mEngine.cameraDeviceControl().switchCamera(nextCamera);
 CX_DEBUG_EXIT_FUNCTION();
 }
 }
 /*!
 * Connect signals specific to given view.
 */
-void CxuiViewManager::connectSignals(QObject *view)
+void CxuiViewManager::connectSignals(CxuiView *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();
+connectPreCaptureSignals(static_cast<CxuiPrecaptureView *>(view));
 }
 }
 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)
+void CxuiViewManager::disconnectSignals(CxuiView *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();
+view = currentView();
 }
 CX_DEBUG(("CxuiViewManager - disconnecting from view %d", view));
 if (view) {
 // Disconnect all signals from current view to us.
 }
 /*!
 * Connect signals to pre-capture view.
 */
-void CxuiViewManager::connectPreCaptureSignals()
+void CxuiViewManager::connectPreCaptureSignals(CxuiPrecaptureView *view)
 {
 CX_DEBUG_ENTER_FUNCTION();
+// Disconnect from the current, "old" view
 disconnectSignals();
-HbView *currentView = mMainWindow.currentView();
+// connecting pre-capture view signals to standby timer.
+connect(view, SIGNAL(startStandbyTimer()),       this, SLOT(startStandbyTimer()), Qt::UniqueConnection);
-if (currentView != mViews[POSTCAPTURE_VIEW]) {
+connect(view, SIGNAL(stopStandbyTimer()),        this, SLOT(stopStandbyTimer()),  Qt::UniqueConnection);
-// connects all capture key signals.
+connect(view, SIGNAL(changeToPrecaptureView()),  this, SLOT(startStandbyTimer()), Qt::UniqueConnection);
-connectCaptureKeySignals();
+connect(view, SIGNAL(changeToPostcaptureView()), this, SLOT(stopStandbyTimer()),  Qt::UniqueConnection);
-// connecting pre-capture view signals to standby timer.
+// connecting pre-capture view signals to viewmanager slots
-connect(currentView, SIGNAL(startStandbyTimer()),       this, SLOT(startStandbyTimer()), Qt::UniqueConnection);
+connect(view, SIGNAL(changeToPostcaptureView()), this, SLOT(changeToPostcaptureView()), Qt::UniqueConnection);
-connect(currentView, SIGNAL(stopStandbyTimer()),        this, SLOT(stopStandbyTimer()),  Qt::UniqueConnection);
+connect(view, SIGNAL(changeToPrecaptureView()),  this, SLOT(changeToPrecaptureView()),  Qt::UniqueConnection);
-connect(currentView, SIGNAL(changeToPrecaptureView()),  this, SLOT(startStandbyTimer()), Qt::UniqueConnection);
-connect(currentView, SIGNAL(changeToPostcaptureView()), this, SLOT(stopStandbyTimer()),  Qt::UniqueConnection);
+//connecting scene modes signal
+connect(view, SIGNAL(showScenesView()), this, SLOT(showScenesView()), Qt::UniqueConnection);
-// connecting pre-capture view signals to viewmanager slots
-connect(currentView, SIGNAL(changeToPostcaptureView()), this, SLOT(changeToPostcaptureView()), Qt::UniqueConnection);
+connect(view, SIGNAL(switchCamera()), this, SLOT(switchCamera()), Qt::UniqueConnection);
-connect(currentView, SIGNAL(changeToPrecaptureView()),  this, SLOT(changeToPrecaptureView()),  Qt::UniqueConnection);
+// connecting error signals from precapture view to application state.
-//connecting scene modes signal
+connect(view, SIGNAL(errorEncountered(CxeError::Id)),
-connect(currentView, SIGNAL(showScenesView()), this, SLOT(showScenesView()), Qt::UniqueConnection);
+mApplicationState, SLOT(handleApplicationError(CxeError::Id)),
+Qt::UniqueConnection);
-connect(currentView, SIGNAL(switchCamera()), this, SLOT(switchCamera()), Qt::UniqueConnection);
+// Standby signals
-// connecting error signals from precapture view to application state.
+connect(this, SIGNAL(normalStateEntered()), view, SLOT(exitStandby()), Qt::UniqueConnection);
-connect(currentView, SIGNAL(errorEncountered(CxeError::Id)),
+connect(this, SIGNAL(normalStateExited()), view, SLOT(enterStandby()), Qt::UniqueConnection);
-mApplicationState, SLOT(handleApplicationError(CxeError::Id)),
-Qt::UniqueConnection);
+// connects all capture key signals.
+connectCaptureKeySignals(view);
+CX_DEBUG_EXIT_FUNCTION();
+}
+/*!
+* Connect signals to post-capture view.
+*/
+void CxuiViewManager::connectPostCaptureSignals()
+{
+CX_DEBUG_ENTER_FUNCTION();
+// Disconnect from the current, "old" view
+disconnectSignals();
+CxuiView *view = mViews[POSTCAPTURE_VIEW];
+if (view) {
+connect(view, SIGNAL(changeToPrecaptureView()), this, SLOT(changeToPrecaptureView()), Qt::UniqueConnection);
 // Standby signals
-connect(this, SIGNAL(normalStateEntered()), currentView, SLOT(exitStandby()), Qt::UniqueConnection);
+connect(this, SIGNAL(normalStateEntered()), view, SLOT(exitStandby()), Qt::UniqueConnection);
-connect(this, SIGNAL(normalStateExited()), currentView, SLOT(enterStandby()), Qt::UniqueConnection);
+connect(this, SIGNAL(normalStateExited()), view, SLOT(enterStandby()), Qt::UniqueConnection);
-}
+// connect necessary capturekey signals
-CX_DEBUG_EXIT_FUNCTION();
+connectCaptureKeySignals(view);
 }
+CX_DEBUG_EXIT_FUNCTION();
-/*!
+}
-* Connect signals to post-capture view.
-*/
+/*!
-void CxuiViewManager::connectPostCaptureSignals()
+* Connect signals to scene mode view.
-{
+*/
-CX_DEBUG_ENTER_FUNCTION();
+void CxuiViewManager::connectSceneModeSignals()
+{
+CX_DEBUG_ENTER_FUNCTION();
+// Disconnect from the current, "old" view
 disconnectSignals();
-QObject *currentView = mMainWindow.currentView();
-if (currentView == mViews[POSTCAPTURE_VIEW]) {
+CxuiView *view = mViews[SCENE_MODE_VIEW];
+if (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(normalStateEntered()), view, SLOT(exitStandby()));
-connect(this, SIGNAL(normalStateExited()), currentView, SLOT(enterStandby()));
+connect(this, SIGNAL(normalStateExited()), view, SLOT(enterStandby()));
 // Moving back to pre-capture view
-connect(currentView, SIGNAL(viewCloseEvent()), this, SLOT(changeToPrecaptureView()));
+connect(view, SIGNAL(viewCloseEvent()), this, SLOT(changeToPrecaptureView()));
+connectCaptureKeySignals(view);
 }
 CX_DEBUG_EXIT_FUNCTION();
 }
 /*!
 * Connect key handler capture key signals.
 */
-void CxuiViewManager::connectCaptureKeySignals()
+void CxuiViewManager::connectCaptureKeySignals(CxuiView *view)
 {
 CX_DEBUG_ENTER_FUNCTION();
 // Disconnect all existing capture key signals
 mKeyHandler->disconnect();
-QObject *currentView = mMainWindow.currentView();
+if (view) {
-if (currentView) {
 // If the view class does not implement the named slot, the connect will fail
 // and output some warnings as debug prints. This is by design.
-connect(mKeyHandler, SIGNAL(autofocusKeyPressed()),  currentView, SLOT(handleAutofocusKeyPressed()));
+connect(mKeyHandler, SIGNAL(autofocusKeyPressed()),  view, SLOT(handleAutofocusKeyPressed()));
-connect(mKeyHandler, SIGNAL(autofocusKeyReleased()), currentView, SLOT(handleAutofocusKeyReleased()));
+connect(mKeyHandler, SIGNAL(autofocusKeyReleased()), view, SLOT(handleAutofocusKeyReleased()));
-connect(mKeyHandler, SIGNAL(captureKeyPressed()),    currentView, SLOT(handleCaptureKeyPressed()));
+connect(mKeyHandler, SIGNAL(captureKeyPressed()),    view, SLOT(handleCaptureKeyPressed()));
-connect(mKeyHandler, SIGNAL(captureKeyReleased()),   currentView, SLOT(handleCaptureKeyReleased()));
+connect(mKeyHandler, SIGNAL(captureKeyReleased()),   view, SLOT(handleCaptureKeyReleased()));
 }
 CX_DEBUG_EXIT_FUNCTION();
 }

changeset 46	c826656d6714
parent 42	feebad15db8c
child 52	7e18d488ac5f