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

equal deleted inserted replaced

-:fa6d9f75d6a6
+:2094593137f5
 mIndicators(NULL),
 mSettingsDialogHeading(NULL),
 mSliderSettingsDialog(NULL),
 mSliderSettingsDialogHeading(NULL),
 mSettingsSlider(NULL),
-mSettingsInfo(NULL)
+mSettingsInfo(NULL),
+mSettingsDialogOkAction(NULL),
+mSliderSettingsDialogOkAction(NULL)
 {
 CX_DEBUG_ENTER_FUNCTION();
 mDisplayHandler = new CxuiDisplayPropertyHandler();
 CX_DEBUG_EXIT_FUNCTION();
 }
 //
 // ---------------------------------------------------------------------------
 //
 void CxuiPrecaptureView::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
-if (event->type() == QEvent::GraphicsSceneMousePress) {
+//! @todo temporary workaround for title bar mouse event handling bug
+if (event->type() == QEvent::GraphicsSceneMousePress && event->scenePos().y() > 70) {
 toggleControls();
 event->accept();
 }
 }
 mSettingsDialogList = qobject_cast<CxuiSettingRadioButtonList *>(
 documentLoader->findWidget(SETTINGS_DIALOG_CONTENT_WIDGET));
 CX_ASSERT_ALWAYS(mSettingsDialogList);
+QObject *object = documentLoader->findObject(SETTINGS_DIALOG_OK_ACTION);
+mSettingsDialogOkAction = qobject_cast<HbAction *>(object);
+CX_DEBUG_ASSERT(mSettingsDialogOkAction);
 CX_DEBUG_EXIT_FUNCTION();
 delete documentLoader;
 documentLoader = NULL;
 // Store action that starts the dialog.
 // Dialog passes this along with it's signals,
 // so we can easily decide if we show grid again or not.
 mSettingsDialog->setStarterAction(qobject_cast<HbAction *>(action));
-HbAction *okAction = mSettingsDialog->primaryAction();
+if (mSettingsDialogOkAction) {
-if (okAction) {
+// disconnect ok action from dialog so that dialog won't be closed
-// disconnect primary action from dialog so that dialog won't be closed
 // automatically when action is triggered. handleSelectionAccepted
 // is called instead
-okAction->disconnect(mSettingsDialog);
+mSettingsDialogOkAction->disconnect(mSettingsDialog);
-connect(okAction, SIGNAL(triggered()), mSettingsDialogList, SLOT(handleSelectionAccepted()));
+connect(mSettingsDialogOkAction, SIGNAL(triggered()), mSettingsDialogList, SLOT(handleSelectionAccepted()));
 // Close the dialog when new setting value is committed
 connect(mSettingsDialogList, SIGNAL(selectionCommitted()), mSettingsDialog, SLOT(close()));
 connect(mSettingsDialog, SIGNAL(aboutToClose()), mSettingsDialogList, SLOT(handleClose()));
 mSettingsSlider = qobject_cast<CxuiSettingSlider *>(
 documentLoader->findWidget(SETTINGS_SLIDER_DIALOG_CONTENT_WIDGET));
 CX_ASSERT_ALWAYS(mSettingsSlider);
+QObject *object = documentLoader->findObject(SETTINGS_DIALOG_OK_ACTION);
+mSliderSettingsDialogOkAction = qobject_cast<HbAction *>(object);
+CX_DEBUG_ASSERT(mSliderSettingsDialogOkAction);
 CX_DEBUG_EXIT_FUNCTION();
 delete documentLoader;
 documentLoader = NULL;
 // Store action that starts the dialog.
 // Dialog passes this along with it's signals,
 // so we can easily decide if we show grid again or not.
 mSliderSettingsDialog->setStarterAction(qobject_cast<HbAction *>(action));
-HbAction *okAction = mSliderSettingsDialog->primaryAction();
+if (mSliderSettingsDialogOkAction) {
-if (okAction) {
+// disconnect ok action from dialog so that dialog won't be closed
-// disconnect primary action from dialog so that dialog won't be closed
 // automatically when action is triggered. handleSelectionAccepted
 // is called instead
-okAction->disconnect(mSliderSettingsDialog);
+mSliderSettingsDialogOkAction->disconnect(mSliderSettingsDialog);
-connect(okAction, SIGNAL(triggered()), mSettingsSlider, SLOT(handleSelectionAccepted()));
+connect(mSliderSettingsDialogOkAction, SIGNAL(triggered()), mSettingsSlider, SLOT(handleSelectionAccepted()));
 // Close the dialog when new setting value is committed
 connect(mSettingsSlider, SIGNAL(selectionCommitted()), mSliderSettingsDialog, SLOT(close()));
 connect(mSliderSettingsDialog, SIGNAL(aboutToClose()), mSettingsSlider, SLOT(handleClose()));
 * Show "not supported" notification.
 */
 void CxuiPrecaptureView::launchNotSupportedNotification()
 {
 CX_DEBUG_ENTER_FUNCTION();
+HbNotificationDialog::launchDialog("Notification", "Not supported yet");
-// Instantiate a popup
-HbNotificationDialog note;
-note.setTitle("Notification");
-note.setText("Not supported yet");
-note.exec();
 CX_DEBUG_EXIT_FUNCTION();
 }
 /*!
 * Show "Disk full" notification.
 * \param slider Pointer to the slider object, where the buttons will be added
 */
 void CxuiPrecaptureView::addIncreaseDecreaseButtons(CxuiZoomSlider *slider)
 {
 // get current slider elements
-QList<HbSlider::SliderElement> elements = slider->elements();
+QList<QVariant> elements = slider->sliderElements();
 // add increase and decrease elements to the slider
 elements << HbSlider::IncreaseElement << HbSlider::DecreaseElement;
-slider->setElements(elements);
+slider->setSliderElements(elements);
 // set icons for the increase and decrease element
-slider->setIcon(HbSlider::DecreaseElement , HbIcon("qtg_mono_minus"));
+slider->setElementIcon(HbSlider::DecreaseElement , HbIcon("qtg_mono_minus"));
-slider->setIcon(HbSlider::IncreaseElement , HbIcon("qtg_mono_plus"));
+slider->setElementIcon(HbSlider::IncreaseElement , HbIcon("qtg_mono_plus"));
 }
 /*!
 * Function can be used to create a graphics item and setting it as a background
 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()));

changeset 24	2094593137f5
parent 21	fa6d9f75d6a6
child 29	699651f2666f