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

equal deleted inserted replaced

-:d9aefe59d544
+:3075d9b614e6
 #include <hbtransparentwindow.h>
 #include <hbmenu.h>
 #include <hbdialog.h>
 #include <hbdeviceprofile.h>
 #include <hbnotificationdialog.h>
+#include <hbmessagebox.h>
 #include <hbaction.h>
 #include <hbstyle.h>
 #include <hbframeitem.h>
+#include <hbwidget.h>
 #include "cxeengine.h"
 #include "cxeviewfindercontrol.h"
 #include "cxezoomcontrol.h"
 #include "cxecameradevicecontrol.h"
 #include "OstTraceDefinitions.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";
 mWidgetsLoaded(false),
 mSettingsDialog(NULL),
 mSettingsDialogList(NULL),
 mKeyHandler(NULL),
 mQualityIcon(NULL),
+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();
 }
 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();
 {
 if (mZoomVisible) {
 hideZoom();
 } else {
 showZoom();
+}
+}
+// ---------------------------------------------------------------------------
+// CxuiPrecaptureView::hideIndicators
+//
+// ---------------------------------------------------------------------------
+//
+void CxuiPrecaptureView::hideIndicators()
+{
+if (mIndicators) {
+mIndicators->hide();
+}
+}
+// ---------------------------------------------------------------------------
+// CxuiPrecaptureView::showIndicators
+//
+// ---------------------------------------------------------------------------
+//
+void CxuiPrecaptureView::showIndicators()
+{
+if (mIndicators) {
+mIndicators->show();
 }
 }
 // ---------------------------------------------------------------------------
 // CxuiPrecaptureView::showControls
 showToolbar();
 // show zoom
 showZoom();
 // show titlepane
 showItems(Hb::AllItems);
+// hide indicators when controls are shown
+hideIndicators();
 mHideControlsTimeout.start();
 mControlsVisible = true;
 }
 }
 }
 //
 // ---------------------------------------------------------------------------
 //
 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
+CX_DEBUG_EXIT_FUNCTION();
-HbNotificationDialog note;
+}
-note.setTitle("Notification");
-note.setText("Not supported yet");
+/*!
-note.exec();
+* 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.
 /*!
 * Adding zoom buttons to the slider
 * \param slider Pointer to the slider object, where the buttons will be added
 */
-void CxuiPrecaptureView::addIncreaseDecreaseButtons(HbSlider* slider)
+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
 */
 void CxuiPrecaptureView::createWidgetBackgroundGraphic(HbWidget *widget,
 const QString &graphicName,
 HbFrameDrawer::FrameType frameType)
 {
-HbFrameDrawer *drawer = new HbFrameDrawer(graphicName, frameType);
+if (widget) {
+HbFrameDrawer *drawer = new HbFrameDrawer(graphicName, frameType);
-if (drawer && widget) {
-HbFrameItem *backgroundItem = new HbFrameItem(drawer, widget);
+if (drawer) {
-if (backgroundItem) {
+HbFrameItem *backgroundItem = new HbFrameItem(drawer, widget);
-// set item to fill the whole widget
+if (backgroundItem) {
-backgroundItem->setGeometry(QRectF(QPointF(0, 0), widget->size()));
+// set item to fill the whole widget
-backgroundItem->setZValue(0);
+backgroundItem->setGeometry(QRectF(QPointF(0, 0), widget->size()));
-widget->setBackgroundItem(backgroundItem);
+backgroundItem->setZValue(0);
+widget->setBackgroundItem(backgroundItem);
+}
 }
 }
 }
 /*!
 \param value Setting value
 \return Returns string containing icon locigal name
 */
 QString CxuiPrecaptureView::getSettingItemIcon(const QString &key, QVariant value)
 {
+CX_DEBUG_ENTER_FUNCTION();
 CxUiSettings::RadioButtonListParams data;
 QString icon = "";
 if (mSettingsInfo && mSettingsInfo->getSettingsContent(key, data)) {
 CxUiSettings::SettingItem setting;
 foreach (setting, data.mSettingPairList) {
 icon = setting.mIcon;
 break;
 }
 }
 }
+CX_DEBUG((("Setting icon name [%s]"), icon.toAscii().constData()));
+CX_DEBUG_EXIT_FUNCTION();
 return icon;
 }
 /*!
 Update the quality indicator

changeset 28	3075d9b614e6
parent 19	d9aefe59d544
child 38	0f0b4c1d7744
child 43	0e652f8f1fbd