equal
deleted
inserted
replaced
111 |
111 |
112 void HbMenuContainer::delayedLayout() |
112 void HbMenuContainer::delayedLayout() |
113 { |
113 { |
114 Q_D(HbMenuContainer); |
114 Q_D(HbMenuContainer); |
115 foreach (QAction *action, d->menu->actions()) { |
115 foreach (QAction *action, d->menu->actions()) { |
|
116 QObject::connect(action, SIGNAL(triggered()), d->menu, SLOT(_q_onActionTriggered())); |
116 if (action->isVisible()) { |
117 if (action->isVisible()) { |
117 d->mVisibleActions.append(action); |
118 d->mVisibleActions.append(action); |
118 QObject::connect(action, SIGNAL(triggered()), d->menu, SLOT(_q_onActionTriggered())); |
|
119 addItem(action); |
119 addItem(action); |
120 } |
120 } |
121 } |
121 } |
122 } |
122 } |
123 |
123 |
133 HbAction *castedAction = qobject_cast<HbAction *>(action); |
133 HbAction *castedAction = qobject_cast<HbAction *>(action); |
134 if(!d->actionManager && castedAction && castedAction->commandRole() != HbAction::NoRole) { |
134 if(!d->actionManager && castedAction && castedAction->commandRole() != HbAction::NoRole) { |
135 d->actionManager = new HbActionManager(HbView::OptionsMenu, d->menu, d->menu->mainWindow() ); |
135 d->actionManager = new HbActionManager(HbView::OptionsMenu, d->menu, d->menu->mainWindow() ); |
136 } |
136 } |
137 if (d->actionManager && castedAction) { |
137 if (d->actionManager && castedAction) { |
138 pos = d->actionManager->position(castedAction, d->menu->actions()); |
138 pos = d->actionManager->position(castedAction, d->mVisibleActions); |
139 } else { |
139 } else { |
140 pos = d->mVisibleActions.indexOf(action); |
140 pos = d->mVisibleActions.indexOf(action); |
141 } |
141 } |
142 if (castedAction && castedAction->menu()) { |
142 if (castedAction && castedAction->menu()) { |
143 HbMenuPrivate::d_ptr(castedAction->menu())->setSubMenuItem(item); |
143 HbMenuPrivate::d_ptr(castedAction->menu())->setSubMenuItem(item); |