diff -r c5025ea871a1 -r 2922f70fca82 camerauis/cameraxui/cxengine/src/cxeenginesymbian.cpp --- a/camerauis/cameraxui/cxengine/src/cxeenginesymbian.cpp Thu Jul 15 01:46:05 2010 +0300 +++ b/camerauis/cameraxui/cxengine/src/cxeenginesymbian.cpp Thu Jul 15 01:49:11 2010 +0300 @@ -119,11 +119,11 @@ CX_DEBUG_ASSERT(mSettingsModel); mSettings = new CxeSettingsImp(*mSettingsModel); - + //! @todo a temporary hack to change the startup sequence to avoid GOOM problems static_cast(mSettings)->loadSettings(mode()); - - + + // Connect P&S key updates to settings signal. connect(settingsStore, SIGNAL(settingValueChanged(long int, unsigned long int, QVariant)), mSettings, SIGNAL(settingValueChanged(long int, unsigned long int, QVariant))); @@ -150,7 +150,8 @@ mSnapshotControl = new CxeSnapshotControl(*mCameraDevice); - mAutoFocusControl = new CxeAutoFocusControlSymbian(*mCameraDevice); + mAutoFocusControl = new CxeAutoFocusControlSymbian(*mCameraDevice, + *mSettings); mFileSaveThread = CxeFileSaveThreadFactory::createFileSaveThread(); @@ -205,6 +206,11 @@ mAutoFocusControl, SLOT(handleCameraEvent(int,int))); + connect(mCameraDeviceControl, + SIGNAL(cameraEvent(int,int)), + mStillCaptureControl, + SLOT(handleCameraEvent(int,int))); + // Connect signal for device ready events connect(mCameraDeviceControl, SIGNAL(deviceReady()),