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

equal deleted inserted replaced

-:730c025d4b77
+:f378acbc9cfb
 HbMenuPrivate::HbMenuPrivate():
 HbPopupPrivate(),
 menuItemView(0),
 subMenuAction(0),
 activeSubMenu(0),
-resultAction(0),
 actionTriggered(false),
 menuType(HbMenu::ContextMenu),
 mSubMenuItem(0),
 mRightMargin(0.0),
 mDownMargin(0.0),
 delayMenuConstruction(true),
-receiverToDisconnectOnClose(0)
+receiverToDisconnectOnClose(0),
+mNumberOfColumns(1)
 {
 }
 HbMenuPrivate::~HbMenuPrivate()
 {
 hasEffects = HbEffectInternal::add("HB_MENU", "menu_disappear", "disappear");
 if (hasEffects) {
 hasEffects = HbEffectInternal::add("HB_menuitem", "menuitem_press", "clicked");
 }
-if (hasEffects ) {
-hasEffects = HbEffectInternal::add("HB_POPUP",
-"dialog_rotate",
-"orientationswitch");
-}
 }
 #endif
 }
 void HbMenuPrivate::_q_triggerAction(HbMenuItem *currentItem)
 if (hasEffects) {
 HbEffect::start(currentItem, "HB_menuitem", "clicked");
 }
 #endif
 HbAction *hbAction = qobject_cast<HbAction *>(currentItem->action());
+q->setActiveAction(hbAction);
 if (hbAction && hbAction->menu() && !actionTriggered) {
 hbAction->trigger();
 stopTimeout();
 openSubmenu(currentItem);
 } else {
 q->close();
-resultAction = hbAction;
 if (!actionTriggered) { // prevent duplicate events
 currentItem->action()->trigger();
 }
 actionTriggered = true;
 }
 if (!activeItem) {
 activeAction(activeItem);
 }
 if (activeItem && activeItem->action() && activeItem->action()->isEnabled()) {
 HbAction *hbAction = qobject_cast<HbAction *>(activeItem->action());
-q->setActiveAction(hbAction);
 if (!hbAction)
 return;
 HbMenu *subMenu = hbAction->menu();
 if ( subMenu ) {
 subMenu->setLayoutDirection(q->layoutDirection());
 } else {
 startTimeout();
 }
 }
-void HbMenuPrivate::_q_handleMenuAfterOrientationChange()
+void HbMenuPrivate::_q_handleMenuClose()
 {
 Q_Q(HbMenu);
 if ( menuType == HbMenu::ContextMenu || menuType == HbMenu::OptionsMenu ) {
 if(activeSubMenu){
 HbAction* action = activeSubMenu->activeAction();
 q->close();
 }
 }
 /*!
-closes the menu after Orientation change
+Handles menu close
 */
-void HbMenuPrivate::closeMenuAfterOrientationChange()
+void HbMenuPrivate::closeMenu()
 {
 Q_Q(HbMenu);
 HbMainWindow* w(q->mainWindow());
 if ( w ){
 QObject::disconnect( w, SIGNAL(aboutToChangeOrientation()),
-q, SLOT(_q_handleMenuAfterOrientationChange()));
+q, SLOT(_q_handleMenuClose()));
 QObject::connect( w, SIGNAL(aboutToChangeOrientation()),
-q, SLOT(_q_handleMenuAfterOrientationChange()));
+q, SLOT(_q_handleMenuClose()));
+QObject::disconnect( w, SIGNAL(aboutToChangeView(HbView*, HbView*)),
+q, SLOT(_q_handleMenuClose()));
+QObject::connect( w, SIGNAL(aboutToChangeView(HbView*, HbView*)),
+q, SLOT(_q_handleMenuClose()));
 }
 }
 void HbMenuPrivate::closeMenuRecursively(HbAction* menuAction)
 {
 After you add an action to your menu, you specify a receiver object and its slot (you can also
 add an action and specify a receiver slot at the same time).
 The receiver is notifed when the action is triggered (QAction::triggered()).
 HbMenu also has a triggered() menu signal, which signals which HbAction was triggered in the menu.
-Context menu example:
+An example of how to create an option menu.
+\snippet{ultimatecodesnippet/ultimatecodesnippet.cpp,2}
-A menu and a few actions are created. The triggered() signal of the menu is connected to
-the mute() function of the enclosing class (implementation not shown).
+An example of how to create and show a context menu from the gesture.
-The exec() function shows the menu.
+\snippet{ultimatecodesnippet/ultimatecodesnippet.cpp,54}
-User needs to connect to "longPress" signal and implement corresponding slot. This enables
-longpress events to be received from list.
-\dontinclude decoratorlistdemo/contentwidget.cpp
-\skip // Create new menu
-\until ( coords );
 \sa HbDialog, HbView
 */
 /*!
 d->q_ptr = this;
 d->init();
 setTitle(title);
 }
+/*!
+Protected constructor.
+*/
 HbMenu::HbMenu(HbMenuPrivate &dd, QGraphicsItem *parent) :
 HbPopup(dd, parent)
 {
 Q_D(HbMenu);
 d->q_ptr = this;
 \sa insertSeparator
 */
 HbAction *HbMenu::addSeparator()
 {
-return insertSeparator(0);
+//functionality removed for now
+//return insertSeparator(0);
+return 0;
 }
 /*!
 Inserts a new separator action and inserts it into this menu's list of actions before \a action.
 \param before is the action before which the separator is inserted.
 \sa addSeparator
 */
 HbAction *HbMenu::insertSeparator(HbAction *before)
 {
-HbAction *action = new HbAction(this);
+Q_UNUSED(before);
+//functionality removed for now
+/*HbAction *action = new HbAction(this);
 action->setSeparator(true);
 action->setEnabled(true);
 action->setVisible(true);
 insertAction(before, action);
-return action;
+return action;*/
+return 0;
 }
 /*!
 \return the current active action, or 0 if no action item is currently active.
 */
 {
 menuAction()->setText(title);
 }
 /*!
-\return the menu title. For a sub-menu, the title is the sub-menu action text.
+Returns the menu title. For a sub-menu, the title is the sub-menu action text.
+\return the menu title.
 \sa setTitle()
 */
 QString HbMenu::title() const
 {
 return menuAction()->text();
 }
 /*!
-\return the menu type. By default a menu is a context menu.
+Returns the menu type. By default a menu is a context menu.
+\return the menu type.
 */
 HbMenu::MenuType HbMenu::menuType() const
 {
 Q_D(const HbMenu);
 return d->menuType;
 QVariant HbMenu::itemChange( GraphicsItemChange change, const QVariant & value )
 {
 Q_D(HbMenu);
 if (change == QGraphicsItem::ItemSceneHasChanged) {
-d->closeMenuAfterOrientationChange();
+d->closeMenu();
 }
 if (change == QGraphicsItem::ItemVisibleChange) {
 if (value.toBool() && d->delayMenuConstruction) {
 d->delayedLayout();
 }
 if (value.toBool()) {
-d->resultAction = 0;
 d->actionTriggered = false;
 }
 else if (!value.toBool() && !d->menuItemView){
 d->delayMenuConstruction = true;
 }
 }
 return HbPopup::event(event);
 }
+/*!
+\reimp
+*/
 void HbMenu::polish(HbStyleParameters &params)
 {
 Q_D(HbMenu);
+const QString NumberOfCols = "number-of-columns";
+params.addParameter(NumberOfCols);
 if (d->mSubMenuItem) {
 const QString RightMargin = "submenu-right-offset";
 const QString DownMargin = "submenu-bottom-margin";
 params.addParameter(RightMargin);
 params.addParameter(DownMargin);
 }
 d->setSubMenuPosition();
 } else {
 HbPopup::polish(params);
 }
-}
+if (!params.value(NumberOfCols).isNull()) {
+int cols = params.value(NumberOfCols).toInt();
+if (d->mNumberOfColumns != cols) {
+d->mNumberOfColumns = cols;
+if (d->menuItemView) {
+d->menuItemView->updateContainer();
+}
+}
+}
+}
+/*!
+\reimp
+Returns the shape of this item as a QPainterPath.
+*/
 QPainterPath HbMenu::shape() const
 {
-/*
+/*QRectF rect = QRectF(-1.0, -1.0, boundingRect().width() + 1.0, boundingRect().height() + 1.0);
-QRectF sceneRect = mapRectToScene(QRectF(-0.5, -0.5, boundingRect().width() + 0.5, boundingRect().height() + 0.5));
+QRectF clipRect = rect.intersected(mapRectFromParent(QRectF(pos().x() - 1.0, pos().y() - 1.0, size().width() + 1.0, size().height() + 1.0)));
-QRectF clipRect = sceneRect.intersected(QRectF(pos().x() - 0.5, pos().y() - 0.5, size().width() + 0.5, size().height() + 0.5));
 QPainterPath path;
-path.addRect(mapRectFromScene(clipRect));
+path.addRect(clipRect);
-return path.intersected(HbPopup::shape());
+return path;*/
-*/
 return HbPopup::shape();
 }
 /*!

branch	GCC_SURGE
changeset 15	f378acbc9cfb
parent 6	c3690ec91ef8
child 21	4633027730f5
child 34	ed14f46c0e55