FCL/sf/mw/hb: comparison src/hbcore/gui/hbdialog.cpp

equal deleted inserted replaced

-:7516d6d86cf5
+:ed14f46c0e55
 #include "hbstyleoptionpopup_p.h"
 #include "hbdeviceprofile.h"
 #include "hbevent.h"
 #include "hbtoolbar_p.h"
 #include "hbglobal_p.h"
+#include "hbstyletextprimitivedata.h"
+#include "hbstyleframeprimitivedata.h"
 #include <QPainter>
 #include <QGraphicsSceneMouseEvent>
 #include <QStyleOptionGraphicsItem>
 #include <QShowEvent>
 #include <QEventLoop>
 #include <QPointer>
 #include <QDebug>
 #include <QApplication> // krazy:exclude=qclasses
-#include <hbfeedbackmanager.h>
 #ifdef HB_EFFECTS
 #include "hbeffectinternal_p.h"
-#define HB_POPUP_ITEM_TYPE "HB_POPUP"
 #endif
 /*!
 @beta
 @hbcore
 \class HbDialog
-\brief HbDialog is a base class for different dialogs in Hb library.
+\brief The HbDialog class is a concrete class for simple application dialogs
+and a base class for a variety of convenience application dialog and popup classes.
-\image html hbpopup.png "A dialog with a header widget, a list as a content widget, and two action buttons."
+An application dialog is a popup that opens in response to application events.
-HbDialog is a concrete class. The content for a custom dialog is
+Popup dialogs float above the top layer of the application view, usually overlapping
-implemented in a separate widget, which is set to the dialog with
+the area reserved for the application content. An application can use a dialog to
-method setContentWidget().
+provide information, give warnings, and ask the user to answer a question or
+select an option. Avoid overusing dialogs because they can interrupt the user's
+workflow. When dialogs appear too frequently, users tend to dismiss them without
-An example of how to create a simple modal dialog and show it.
+reading them properly, just to get them out of the way.
+%HbDialog is a concrete class that you can use directly in your applications.
+However, there are a variety of convenience classes that derive from it,
+so check whether there is one that meets your needs. You can create a custom
+dialog by deriving a class from %HbDialog and adding a custom widget to it.
+\image html hbpopup.png "A dialog with a heading widget, a list content widget, and two action buttons"
+You can add three types of content to an %HbDialog object. If you do not add any
+content, an %HbDialog object is simply a bordered rectangle. The three types of
+content are:
+- <b>A heading widget</b>. This is shown at the top of the dialog and is typically
+a simple HbLabel object that describes the purpose of the dialog. To add a heading
+widget, call setHeadingWidget().
+- <b>A content widget</b>. Positioned below the heading, this contains the main
+dialog content. To add a content widget, call setContentWidget().
+- \b Actions. These are generic command (HbAction) objects, which you add to the
+dialog by calling the QGraphicsWidget::addAction() family of functions. The actions
+appear as buttons on a toolbar at the bottom of the dialog. (The toolbar appears when
+you add the first action to the dialog.) When the user taps one of these buttons, it
+dismisses the dialog and the action's \link HbAction::triggered() triggered()\endlink
+signal is emitted. Connect this signal to the slot that will perform the command.
+%HbDialog is derived from HbPopup, which provides generic features for all popup
+classes. These features include properties that control the dialog's dismiss policy,
+background fade policy, timeout, frame background type, and whether it is modal.
+Unlike a non-modal dialog, a modal dialog stops the user interacting with anything outside
+of the dialog until it closes. You set and get the modality by calling setModal()
+and isModal(), respectively. Typically modal dialogs use the fade background feature,
+whereas non-modal dialogs do not. How you open a dialog depends on whether it is
+modal: if the dialog is modal use one of the open() overloads and otherwise use
+\link QGraphicsItem::show() show()\endlink. Make sure you use the appropriate method,
+because this ensures the correct touch event handling.
+\note Services that generate device-wide and system-wide messages use the HbDeviceDialog
+class and not HbDialog.
+\section _usecases_hbdialog Using the HbDialog class
+\subsection _uc_001_hbdialog Creating and showing a simple modal dialog
+This example demonstrates how to create a simple modal dialog and show it. Notice
+that we show a modal dialog by calling one of the open() overloads.
 \snippet{ultimatecodesnippet/ultimatecodesnippet.cpp,13}
-An example of how to handle dialog signals from previous example.
+\subsection _uc_002_hbdialog Handling dialog signals
+This example continues the previous one, which connects the dialog's
+finished(HbAction*) signal to the following slot in the call to
+open(QObject *,const char*) on the final line. This example shows how this slot
+handles the finished(HbAction*) signal.
 \snippet{ultimatecodesnippet/ultimatecodesnippet.cpp,53}
-An example of how to handle if finished(int) is connected instead of finished(HbAction*) in above example.
+\subsection _uc_003_hbdialog Handling dialog signals: alternative method
-\snippet{ultimatecodesnipped/ultimatecodesnippet.cpp,55}
+This example demonstrates an alternative way of handling dialog signals.
-An example of how to create a non-modal dialog and show it.
+This example assumes that the finished(int) overload is connected instead of
+finished(HbAction*); for example, by using open(QObject *, const char *), like
+this:
+\code
+dialog->open(this, SLOT(dialogClosed(int)));
+\endcode
+The finished(int) signal is emitted by calling accept() and reject() or done().
+Here is an example of a function that handles finished(int):
+\snippet{ultimatecodesnippet/ultimatecodesnippet.cpp,58}
+\subsection _uc_004_hbdialog Creating and showing a non-modal dialog
+This final example shows how to create a non-modal dialog and show it.
+Notice that we display a non-modal dialog by calling \link QGraphicsItem::show()
+show()\endlink.
 \snippet{ultimatecodesnippet/ultimatecodesnippet.cpp,26}
-*/
+\sa HbPopup, HbDeviceDialog, HbInputDialog, HbMessageBox, HbProgressDialog,
+HbNotificationDialog, HbColorDialog, HbSelectionDialog, HbVolumeSliderPopup,
+HbZoomSliderPopup
+*/
+/*!
+\enum HbDialog::DialogCode
+Indicates whether the dialog was accepted or rejected.
+\sa finished(int), done()
+*/
+/*!
+\var HbDialog::Rejected
+Indicates that the user selected the Cancel action (or equivalent).
+*/
+/*!
+\var HbDialog::Accepted
+Indicates that the user selected the OK action (or equivalent).
+*/
 /*!
 \fn void HbDialog::finished( int code )
-This signal is emitted when the dialog is closed.
+This signal is emitted when the dialog closes. \a code is an
-This will have the HbDialog::DialogCode as the parameter code.
+HbDialog::DialogCode value.
 \sa done(), accept(), reject()
 */
 /*!
 \fn void HbDialog::finished( HbAction *action )
-This signal is emitted when an action has been triggered in a dialog.
+This signal is emitted when an action is triggered in a dialog.
-The parameter will be the triggered action.
+The parameter is the action that was triggered.
 */
 /*!
 \fn void HbDialog::accepted( )
-This signal is emitted when the dialog is closed and the user
+This signal is emitted by a call to accept() or to \link done()
-has accepted the dialog. which implies that either action has triggered
+done(HbDialog::Accepted)\endlink. Typically this means that the user
-or through function call the accept method is called, causing this signal.
+has selected the OK button (or equivalent).
 \sa done(), accept(), reject()
 */
 /*!
 \fn void HbDialog::rejected( )
-This signal is emitted when the dialog is closed and the user
+This signal is emitted by a call to reject() or to \link done()
-has rejected the dialog. which implies that either action triggered
+done(HbDialog::Rejected)\endlink. Typically this means that the user
-or through function call the reject method is called, causing this signal.
+has selected the Cancel action (or equivalent).
 \sa done(), accept(), reject()
 */
+/*!
-/*!
-\reimp
 \fn int HbDialog::type() const
 */
 HbDialogPrivate::HbDialogPrivate( ) :
 contentWidget(0),
 headingWidget(0),
 primaryAction(0),
 secondaryAction(0),
 closingAction(0),
-toolBar(0)
+toolBar(0),
+dismissOnAction(true),
+headingFrameItem(0)
 {
 }
 HbDialogPrivate::~HbDialogPrivate()
 {
 }
-/*!
+/*
 Relayouts the popup. If expandSize is true it the new calculated size of the popup
 cannot be smaller than the current size.
 */
 void HbDialogPrivate::doLayout()
 {
 }
 q->updateGeometry();
 }
-/*!
+void HbDialogPrivate::createHeadingBackground()
+{
+Q_Q(HbDialog);
+if (headingFrameItem) {
+delete headingFrameItem;
+headingFrameItem = 0;
+}
+headingFrameItem = q->style()->createPrimitive(HbStyle::PT_FrameItem, "background", q);
+HbStyleFramePrimitiveData data;
+q->initPrimitiveData(&data, headingFrameItem);
+data.fillWholeRect = true;
+data.frameType = HbFrameDrawer::ThreePiecesHorizontal;
+if (mFullScreen) {
+data.frameGraphicsName = QLatin1String("qtg_fr_fullscreen_heading");
+} else {
+data.frameGraphicsName = QLatin1String("qtg_fr_popup_heading");
+}
+q->style()->updatePrimitive(headingFrameItem, &data, q);
+headingFrameItem->update();
+}
+void HbDialogPrivate::_q_actionTriggered() {
+Q_Q(HbDialog);
+if (dismissOnAction) {
+q->close();
+}
+}
+/*
 Utility function removes the spaces from string if any
 */
 void HbDialogPrivate::removeSpaces(QString& string)
 {
 QString tempStr(string);
 if(!ch.isSpace())
 string.append(ch);
 }
 }
-/*!
+void HbDialogPrivate::setFullScreen(bool enable)
-Constructs a dialog with given  \a parent graphics item.\n
+{
-Note: dialogs with \a parent set as 0 are behaving as real popups.
+//If the dialog is in fullscreen, normal toolbar graphics will be used
-This is actually the intended use. \sa HbPopup::HbPopup
+if (enable) {
+if (toolBar) {
+HbToolBarPrivate::d_ptr(toolBar)->updateDialogToolbar(false);
+}
+} else {
+if (toolBar){
+HbToolBarPrivate::d_ptr(toolBar)->updateDialogToolbar(true);
+}
+}
+HbPopupPrivate::setFullScreen(enable);
+//If heading is available, update fullscreen heading graphics
+if (!headingText.isEmpty() || headingWidget) {
+createHeadingBackground();
+}
+}
+/*!
+Constructs a dialog with the given \a parent. For a popup dialog (which
+means that it opens above all other objects, at the highest z-order),
+set \a parent to 0. This is the primary intended use of this class.
+If \a parent is non-zero, the dialog is embedded in the parent QGraphicsItem.
+The properties provided by HbPopup are then ignored and the aboutToClose() signal is
+not emitted.
+\sa HbPopup::HbPopup()
 */
 HbDialog::HbDialog(QGraphicsItem *parent) :
 HbPopup(*new HbDialogPrivate, parent)
 {
 Q_D(HbDialog);
 d->q_ptr = this;
-d->timeout = HbPopupPrivate::timeoutValue(HbPopup::NoTimeout);
+d->pendingTimeout = HbPopup::NoTimeout;
 }
 /*!
 \internal
 */
 HbDialog::HbDialog(HbDialogPrivate &dd, QGraphicsItem *parent) :
 HbPopup(dd, parent)
 {
 Q_D(HbDialog);
 d->q_ptr = this;
-d->timeout = HbPopupPrivate::timeoutValue(HbPopup::NoTimeout);
+d->pendingTimeout = HbPopup::NoTimeout;
 }
 /*!
-Destroys the popup.
+Destructor.
 */
 HbDialog::~HbDialog()
 {
 }
 /*!
-Returns the widget which is being added to the heading area
+Returns the heading widget, if one has been added to the dialog; otherwise this
-\sa setHeadingWidget()
+function returns null.
+\sa setHeadingWidget()
 */
 QGraphicsWidget * HbDialog::headingWidget() const
 {
 Q_D(const HbDialog);
 return (d->headingWidget);
 }
 /*!
-Adds \a widget to the heading area. Ownership of the widget is transferred
+Adds \a headingWidget to the heading area of the dialog. This transfers ownership
-to popup. If \a headingWidget is 0 the heading widget is removed.
+of the heading widget to the dialog.
-\sa headingWidget()
+To remove a heading widget from a dialog, set \a headingWidget to 0.
+\sa headingWidget()
 */
 void HbDialog::setHeadingWidget(QGraphicsWidget *headingWidget)
 {
 Q_D(HbDialog);
 if (d->headingWidget == headingWidget)
 return;
 if (d->headingWidget)
 delete d->headingWidget;
 d->headingWidget = headingWidget;
+d->headingText = QString();
 if (headingWidget) {
 setProperty("heading_layout", true);
-headingWidget->setParentItem(this);
+d->headingWidget->setParentItem(this);
+d->headingWidget->setZValue(zValue()+1);
 HbStyle::setItemName(headingWidget,"heading");
 } else {
 setProperty("heading_layout", false);
 }
+if (headingWidget) {
+d->createHeadingBackground();
+} else {
+if (d->headingFrameItem) {
+delete d->headingFrameItem;
+d->headingFrameItem = 0;
+}
+}
 repolish();
 }
 /*!
-Returns the content widget property of the popup.
+Returns the heading text, if one has been added to the dialog; otherwise this
-HbDialog only draws a bordered rect, the rest is drawn by the content widget.
+function returns empty string.
-\sa setContentWidget()
+\sa setHeadingText()
+*/
+QString HbDialog::headingText() const
+{
+Q_D(const HbDialog);
+return d->headingText;
+}
+/*!
+Sets \a heading as the title of the dialog.
+To remove the title from the dialog, set an empty string as \a heading.
+\sa headingText()
+*/
+void HbDialog::setHeadingText(const QString &heading)
+{
+Q_D(HbDialog);
+if (d->headingWidget) {
+delete d->headingWidget;
+d->headingWidget = 0;
+}
+d->headingText = heading;
+if (!heading.isEmpty()) {
+d->headingWidget = qobject_cast<QGraphicsWidget *>(style()->createPrimitive(HbStyle::PT_TextItem, "heading", this));
+d->headingWidget->setZValue(zValue()+1);
+HbStyleTextPrimitiveData data;
+initPrimitiveData(&data, d->headingWidget);
+data.text = heading;
+style()->updatePrimitive(d->headingWidget, &data, this);
+d->headingWidget->update();
+d->createHeadingBackground();
+setProperty("heading_layout", true);
+} else {
+setProperty("heading_layout", false);
+if (d->headingFrameItem) {
+delete d->headingFrameItem;
+d->headingFrameItem = 0;
+}
+}
+repolish();
+}
+/*!
+Returns the content widget, if one has been added to the dialog; otherwise this
+function returns null.
+The content widget provides the main content for the dialog. Without a content
+widget (and a heading widget and some actions), an HbDialog object is simply a
+bordered rectangle.
+\sa setContentWidget()
 */
 QGraphicsWidget *HbDialog::contentWidget() const
 {
 Q_D(const HbDialog);
 return d->contentWidget;
 }
 /*!
-Sets the content widget property of the popup.
+Adds \a contentWidget to the dialog. This transfers ownership of the content
-HbDialog only draws a bordered rect, the rest is drawn by the content widget.
+widget to the dialog.
-Ownership of the widget is transferred
-to popup. If \a contentWidget is 0 the content widget is removed.
+To remove a content widget from a dialog, set \a headingWidget to 0.
-\sa contentWidget()
+\sa contentWidget()
 */
 void HbDialog::setContentWidget(QGraphicsWidget *contentWidget)
 {
 Q_D(HbDialog);
 if (d->contentWidget == contentWidget)
 return;
 if (d->contentWidget)
 delete d->contentWidget;
-prepareGeometryChange(); // needed to paint screen properly
 d->contentWidget = contentWidget;
 if (contentWidget) {
 contentWidget->setParentItem(this);
+if (contentWidget->inherits("HbAbstractItemView")) {
+setProperty("list_content", true);
+} else {
+setProperty("list_content", false);
+}
 HbStyle::setItemName(contentWidget,"content");
 }
 repolish();
 }
 /*!
-\deprecated HbDialog::primaryAction() const
+\deprecated This function is deprecated.
-is deprecated.
-It returns the primary action added to the control area
+Returns the action added by calling setPrimaryAction().
-\sa setPrimaryAction()
 */
 HbAction* HbDialog::primaryAction() const
 {
 HB_DEPRECATED("HbAction* HbDialog::primaryAction() is deprecated. Use QGraphicsWidget action api instead");
 Q_D(const HbDialog);
 return d->primaryAction;
 }
 /*!
-\deprecated HbDialog::setPrimaryAction(HbAction*)
+Returns the \c dismissOnAction property, which controls whether the dialog closes
-is deprecated. Please use QGraphicsWidget::addAction() family of functions instead.
+when one of its actions is triggered.
-It adds the given action to the control area.
+\sa setDismissOnAction()
-It is added to the left side of the control area if the layout direction of the application
+*/
-is left-to-right and in the vice-versa if the layout direction of the application
+bool HbDialog::dismissOnAction() const
-is right-to-left.
+{
-\sa primaryAction()
+Q_D(const HbDialog);
+return d->dismissOnAction;
+}
+/*!
+Sets the \c dismissOnAction property, which controls whether the dialog closes
+when one of its actions is triggered.
+\sa dismissOnAction()
+*/
+void HbDialog::setDismissOnAction( bool dismissOnAction )
+{
+Q_D(HbDialog);
+d->dismissOnAction = dismissOnAction;
+}
+/*!
+\deprecated This function is deprecated. Add actions by calling one of
+the QGraphicsWidget::addAction() family of functions instead.
+Adds \a action to the left side of the dialog's toolbar if the layout is left
+to right and to the right side of the toolbar if the layout is right to left.
+\sa primaryAction()
 */
 void HbDialog::setPrimaryAction(HbAction *action)
 {
 HB_DEPRECATED("HbDialog::setPrimaryAction(HbAction *action) is deprecated. Use QGraphicsWidget action api instead");
+/* HbDialog::setPrimaryAction deprecation action coloring - begin */
+action->setProperty("invalid_addition", true);
+/* HbDialog::setPrimaryAction deprecation action coloring - end */
 Q_D(HbDialog);
 if (d->primaryAction && action != d->primaryAction) {
 removeAction(d->primaryAction);
 }
 d->primaryAction = action;
 }
 insertAction(before, action);
 }
 /*!
-\deprecated HbDialog::secondaryAction() const
+\deprecated This function is deprecated.
-is deprecated.
-It returns the secondary action added to the control area
+Returns the action added by calling setSecondaryAction().
-\sa setSecondaryAction()
 */
 HbAction* HbDialog::secondaryAction() const
 {
 HB_DEPRECATED("HbAction* HbDialog::secondaryAction() is deprecated. Use QGraphicsWidget action api instead");
 Q_D(const HbDialog);
 return(d->secondaryAction);
 }
 /*!
-\deprecated HbDialog::setSecondaryAction(HbAction*)
+\deprecated This function is deprecated. Add actions by calling one of
-is deprecated. Please use QGraphicsWidget::addAction() family of functions instead.
+the QGraphicsWidget::addAction() family of functions instead.
-It adds the given action to the control area.
-It is added to the right side of the control area if the layout direction of the application
+Adds \a action to the right side of the dialog's toolbar if the layout is left
-is left-to-right and in the vice-versa if the layout direction of the application
+to right and to the left side of the toolbar if the layout is right to left.
-is right-to-left.
 \sa secondaryAction()
 */
 void HbDialog::setSecondaryAction(HbAction *action)
 {
 HB_DEPRECATED("HbDialog::setSecondaryAction(HbAction *action) is deprecated. Use QGraphicsWidget action api instead");
+/* HbDialog::setPrimaryAction deprecation action coloring - begin */
+action->setProperty("invalid_addition", true);
+/* HbDialog::setPrimaryAction deprecation action coloring - end */
 Q_D(HbDialog);
 if (d->secondaryAction && action != d->secondaryAction) {
 removeAction(d->secondaryAction);
 }
 d->secondaryAction = action;
 addAction(action);
 }
 /*!
-This is a slot which shows the dialog and returns immediately.
+Displays the dialog and returns immediately.
-\sa open(QObject*,const char*)
+Use this function to open \b modal dialogs. To open \b non-modal dialogs,
+call \link QGraphicsItem::show() show()\endlink.
+\overload
+\sa open(QObject*, const char*), HbPopup::isModal()
 */
 void HbDialog::open()
 {
 open(0,0);
 }
 /*!
+Displays the dialog, connects the finished(HbAction*) or finished(int) signal to a
-Shows the dialog as modal dialog returning immediately.
+receiver object's slot, and returns immediately. Disambiguation between the two
+signals is done at runtime. The signal is disconnected from the slot when the dialog
-Connects finished(HbAction*) or finished(int) signal to the slot specified by \a receiver and
+closes.
-\a member. The signal will be disconnected from the slot when the
-popup is closed. disambiguation between which method to connect to is done at runtime.
+Use this function to open \b modal dialogs. To open \b non-modal dialogs,
+call \link QGraphicsItem::show() show()\endlink.
-For non modal popups, use show().
-*/
+\overload
+\param receiver The object that is to receive the signal.
+\param member The slot on the receiver to which the signal is to connect.
+\sa HbPopup::isModal()
+*/
 void HbDialog::open( QObject* receiver, const char* member )
 {
 Q_D(HbDialog);
 if ( receiver && member ) {
 d->memberToDisconnectOnClose = member;
 } else {
 d->receiverToDisconnectOnClose = 0;
 d->memberToDisconnectOnClose.clear();
 }
+d->showingInProgress = true;
 show();
 }
 /*!
-Closes the dialog and emits finished ,accepted and rejected signals appropriately.
+Closes the dialog and emits the \link finished(int) finished(HbDialog::DialogCode)
+\endlink signal and either the accepted() or rejected() signal, depending on the
-If the dialog is accepted the code is HbDialog::Accepted, if it is rejected code
+value of \a code.
-is HbDialog::Rejected.
-As with HbWidget::close(), done() deletes the dialog if the
+Like \link QGraphicsWidget::close() close()\endlink, this function deletes the
-Qt::WA_DeleteOnClose flag is set.
+dialog if the Qt::WA_DeleteOnClose flag is set.
-\sa accept(), reject()
+\param code Pass HbDialog::Accepted to indicate that the user clicked the OK
+button (or equivalent) and HbDialog::Rejected to indicate that the user
+clicked the Cancel button (or equivalent).
+\sa accept(), reject()
 */
 void HbDialog::done( int code )
 {
 HbAction *action=qobject_cast<HbAction*>(sender());
 if(!action) {
 else if(code == Rejected) {
 emit rejected();
 }
 }
 /*!
-Hides the modal dialog and emits finished(HbDialog::Accepted),accepted() and finished(HbAction*) signals.
+Closes the dialog and emits the \link finished(int) finished(HbDialog::Accepted)\endlink,
+accepted(), and finished(HbAction*) signals. Typically, you call this function when the
-\sa reject(), done()
+user selects the OK action (or equivalent).
+Like \link QGraphicsWidget::close() close()\endlink, this function deletes the
+dialog if the Qt::WA_DeleteOnClose flag is set.
+\b Example:
+\code
+// Create the OK action.
+mOkAction = new HbAction("OK");
+// Connect its triggered signal to the dialog's accept() slot.
+connect(mOkAction, SIGNAL(triggered()), this, SLOT(accept()));
+// Add the action to the dialog.
+addAction(mOkAction);
+\endcode
+\sa reject(), done()
 */
 void HbDialog::accept()
 {
 done(Accepted);
 }
 /*!
-Hides the modal dialog and emits finished(HbDialog::Rejected),rejected() and finished(HbAction*) signals.
+Closes the dialog and emits the \link finished(int) finished(HbDialog::Rejected)\endlink,
+rejected(), and finished(HbAction*) signals. Typically, you call this function when
-\sa accept(), done()
+the user selects the Cancel action (or equivalent).
+Like \link QGraphicsWidget::close() close()\endlink, this function deletes the
+dialog if the Qt::WA_DeleteOnClose flag is set.
+\b Example:
+\code
+// Create the Cancel action.
+mCancelAction = new HbAction("Cancel");
+// Connect its triggered signal to the dialog's reject() slot.
+connect(mCancelAction, SIGNAL(triggered()), this, SLOT(reject()));
+// Add the action to the dialog.
+addAction(mCancelAction);
+\endcode
+\sa accept(), done()
 */
 void HbDialog::reject()
 {
 done(Rejected);
 }
 /*!
-\reimp
 */
 //
 // Sets the focus to its content widget.
 //
 void HbDialog::focusInEvent(QFocusEvent *event)
 contentWidget()->setFocus();
 }
 }
 /*!
-\reimp
 */
 void HbDialog::closeEvent ( QCloseEvent * event )
 {
 Q_D(HbDialog);
 HbPopup::closeEvent(event);
 }
 /*!
-\reimp
 */
 void HbDialog::changeEvent(QEvent *event)
 {
 Q_D(HbDialog);
 if (event->type() == QEvent::StyleChange ||
 HbPopup::changeEvent(event);
 }
 /*!
-\reimp
 */
 bool HbDialog::event(QEvent *event)
 {
 Q_D(HbDialog);
 if(event->type() != QEvent::ShortcutOverride && event->type() != QEvent::GestureOverride)
 event->accept();
 if (event->type() == QEvent::ActionAdded) {
 if (!d->toolBar) {
-// TODO: HbToolBar private interface should make it possible to choose
-// different graphics for tool buttons.
 d->toolBar = new HbToolBar();
+d->toolBar->setFlag(QGraphicsItem::ItemIsPanel, false);
 d->toolBar->setParentItem(this);
 HbStyle::setItemName(d->toolBar ,"controls");
 setProperty("controls_layout", true);
 d->toolBar->setOrientation(Qt::Horizontal);
-HbToolBarPrivate::d_ptr(d->toolBar)->mDialogToolBar = true;
+// Choose different graphics for tool buttons.
+if (!d->mFullScreen) {
+HbToolBarPrivate::d_ptr(d->toolBar)->mDialogToolBar = true;
+}
 repolish();
 }
 QActionEvent *actionEvent = static_cast<QActionEvent *>(event);
 d->toolBar->insertAction (actionEvent->before(), actionEvent->action());
 if (!parentItem()) { // only for popup without parent
-connect(actionEvent->action(), SIGNAL(triggered()), this, SLOT(close()));
+connect(actionEvent->action(), SIGNAL(triggered()), this, SLOT(_q_actionTriggered()));
 }
 d->doLayout();
 return true;
 } else if (event->type() == QEvent::ActionRemoved) {
 }
 return HbPopup::event(event);
 }
 /*!
-\reimp
+Reimplemented from QGraphicsWidget.
 */
 QSizeF HbDialog::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
 {
 QSizeF hint = HbPopup::sizeHint(which, constraint);

changeset 34	ed14f46c0e55
parent 7	923ff622b8b9