FCL/sf/app/phone: comparison phoneapp/phoneuiview2/src/phoneuiqtview.cpp

equal deleted inserted replaced

-:d1c62c765e48
+:cfea66083b62
 m_dialpad(0),
 m_menuSignalMapper(0),
 m_keyCapture(0),
 m_networkInfo(0),
 m_dialpadKeyHandler(0),
-m_restrictedMode(false)
+m_restrictedMode(false),
-{
+m_optionsMenu(0)
+{
+PHONE_TRACE
 // Set network name
 m_networkInfo = new QSystemNetworkInfo(this);
 QString networkName = m_networkInfo->networkName(QSystemNetworkInfo::WcdmaMode);
 if(networkName.isEmpty()) {
 networkName = m_networkInfo->networkName(QSystemNetworkInfo::GsmMode);
 setRestrictedMode(false);
 }
 PhoneUIQtView::~PhoneUIQtView ()
 {
+foreach (QList<HbAction *> *actions, m_bubbleActionMap) {
+qDeleteAll(*actions);
+delete actions;
+}
+qDeleteAll(m_participantListActions);
+qDeleteAll(m_expandActionMap);
+qDeleteAll(m_bubbleMap);
 qDeleteAll(m_toolbarActions);
 m_window.removeEventFilter(this);
+delete m_keyCapture;
 delete m_volumeSlider;
 delete m_dialpad;
+delete m_optionsMenu;
 }
 BubbleManagerIF& PhoneUIQtView::bubbleManager()
 {
 return *m_bubbleManager;
 void PhoneUIQtView::addBubbleCommand (
 int bubbleId,
 const PhoneAction& action )
 {
-HbAction* bubbleAction = new HbAction ();
+PHONE_TRACE
+HbAction *bubbleAction = new HbAction ();
 bubbleAction->setText (action.text());
 bubbleAction->setIcon (action.icon());
 setActionRole(action,*bubbleAction);
 m_bubbleManager->addAction (bubbleId, bubbleAction);
 QList<int> bubbles = m_bubbleMap.keys();
 bool found(false);
 for ( int i=0; i<bubbles.size(); ++i ) {
 if (bubbleId==bubbles[i]){
-connect(bubbleAction, SIGNAL (triggered ()), m_bubbleMap.value(bubbleId), SLOT (map ()));
+connect(bubbleAction, SIGNAL (triggered ()), m_bubbleMap[bubbleId], SLOT (map ()));
-m_bubbleMap.value(bubbleId)->setMapping(bubbleAction, action.command());
+m_bubbleMap[bubbleId]->setMapping(bubbleAction, action.command());
-m_bubbleActionMap.value(bubbleId)->append(bubbleAction);
+m_bubbleActionMap[bubbleId]->append(bubbleAction);
 found = true;
 }
 }
 if (!found) {
 void PhoneUIQtView::addParticipantListAction(
 int commandId,
 const QString& text,
 const HbIcon& icon)
 {
+PHONE_TRACE
 HbAction* action = new HbAction ();
 action->setText (text);
 action->setIcon (icon);
 m_bubbleManager->addParticipantListAction(action);
 m_participantListActions.append( action );
 }
 void PhoneUIQtView::clearParticipantListActions()
 {
+PHONE_TRACE
 if (m_participantListSignalMapper) {
 m_bubbleManager->clearParticipantListActions();
 foreach (HbAction *action, m_participantListActions ) {
 m_participantListSignalMapper->removeMappings(action);
 }
 void PhoneUIQtView::clearBubbleCommands (int bubbleId)
 {
+PHONE_TRACE
 m_bubbleManager->clearActions (bubbleId);
 QSignalMapper *mapper = m_bubbleMap.value(bubbleId);
 if (mapper) {
 QList<HbAction *> *actions = m_bubbleActionMap.value(bubbleId);
 }
 void PhoneUIQtView::setToolbarActions(const QList<PhoneAction*>& actions)
 {
+PHONE_TRACE
 // clear current toolbar actions
 for (int i=0;i<toolBar()->actions().count();++i) {
 m_signalMapper->removeMappings(
 static_cast<HbAction*>(toolBar()->actions().at(i)));
 }
 }
 void PhoneUIQtView::setVolumeSliderValue (
 int value, int commandId, int maxVolumeValue, int minVolumeValue)
 {
+PHONE_TRACE
 m_volumeCommandId = commandId;
 if (!m_volumeSlider) {
 m_volumeSlider = new HbVolumeSliderPopup ();
 m_volumeSlider->setDismissPolicy(HbDialog::TapOutside);
 emit command (m_volumeCommandId);
 }
 void PhoneUIQtView::setExpandAction(int bubbleId, int commandId)
 {
+PHONE_TRACE
 removeExpandAction(bubbleId);
 HbAction* action = new HbAction();
 m_bubbleManager->setExpandAction(bubbleId, action);
 m_expandActionMap.insert(bubbleId,action);
 }
 void PhoneUIQtView::removeExpandAction(int bubbleId)
 {
+PHONE_TRACE
 if (m_expandActionMap.contains(bubbleId)) {
 m_bubbleManager->setExpandAction(bubbleId, 0);
 HbAction* action = m_expandActionMap.value(bubbleId);
 m_expandSignalMapper->removeMappings(action);
 m_expandActionMap.remove(bubbleId);
 {
 m_window.show();
 }
 void PhoneUIQtView::setMenuActions(const QList<PhoneAction*>& actions)
 {
+PHONE_TRACE
-for (int i=menu()->actions().count(); 0<i; --i) {
+HbMenu* optionsMenu = m_optionsMenu ? m_optionsMenu : menu();
-HbAction* action = static_cast<HbAction*>(menu()->actions().at(i-1));
+for (int i=optionsMenu->actions().count(); 0<i; --i) {
+HbAction* action = static_cast<HbAction*>(optionsMenu->actions().at(i-1));
 m_menuSignalMapper->removeMappings(action);
-menu()->removeAction(action);
+optionsMenu->removeAction(action);
 delete action;
 }
 for (int i=0; i<actions.count(); ++i) {
 HbAction* action = new HbAction();
 action->setText(actions.at(i)->text());
-menu()->addAction(action);
+optionsMenu->addAction(action);
 connect(action, SIGNAL(triggered()), m_menuSignalMapper, SLOT(map()));
 m_menuSignalMapper->setMapping(action, actions.at(i)->command());
 }
+updateMenuVisibility();
 }
 HbMenu &PhoneUIQtView::menuReference()
 {
-return *menu();
+PHONE_TRACE
+HbMenu* optionsMenu = m_optionsMenu ? m_optionsMenu : menu();
+return *optionsMenu;
 }
 void PhoneUIQtView::captureKey(Qt::Key key, bool capture)
 {
 if (capture) {
 }
 }
 void PhoneUIQtView::handleOrientationChange(Qt::Orientation orientation)
 {
+PHONE_TRACE
 if (orientation==Qt::Horizontal) {
 toolBar()->setOrientation(Qt::Horizontal);
 }
 m_bubbleManager->handleOrientationChange(orientation);
 }
 bool PhoneUIQtView::eventFilter(QObject *watched, QEvent * event)
 {
 Q_UNUSED(watched);
-PHONE_DEBUG2("PhoneUIQtView::eventFilter event type:", event->type());
+PHONE_TRACE2(":event type", event->type())
 // Allow send key only when there is callbutton enabled or no text in input field
 bool sendKeyAllowed = m_dialpad->isCallButtonEnabled() ||
 (m_dialpad->editor().text().length() == 0);
 }
 }
 void PhoneUIQtView::setDialpadPosition()
 {
+PHONE_TRACE
 QRectF screenRect(m_window.layoutRect());
 if (m_window.orientation() == Qt::Horizontal) {
 // dialpad takes half of the screen
 m_dialpad->setPos(QPointF(screenRect.width()/2,
 }
 }
 void PhoneUIQtView::setActionRole(const PhoneAction& pa, HbAction& action)
 {
+PHONE_TRACE
 if (pa.actionRole()==PhoneAction::Accept) {
 action.setSoftKeyRole(QAction::PositiveSoftKey);
 } else if (pa.actionRole()==PhoneAction::Decline) {
 action.setSoftKeyRole(QAction::NegativeSoftKey);
 }
 }
 void PhoneUIQtView::createToolBarActions()
 {
+PHONE_TRACE
 for (int i=0;i<4;++i) {
 HbAction* action = new HbAction();
 connect(action, SIGNAL(triggered()), m_signalMapper, SLOT(map()));
 m_toolbarActions.append(action);
 }
 }
+void PhoneUIQtView::updateMenuVisibility()
+{
+PHONE_TRACE
+bool visible = false;
+HbView* view = m_window.currentView();
+HbMenu* optionsMenu = m_optionsMenu ? m_optionsMenu : menu();
+foreach( QAction* action, optionsMenu->actions()){
+if(action->isVisible()){
+visible = true;
+break;
+}
+}
+PHONE_DEBUG2("PhoneUIQtView::updateMenuVisibility -  visible", visible);
+if (!visible && !m_optionsMenu) {
+PHONE_DEBUG("PhoneUIQtView::updateMenuVisibility - takeMenu");
+//takeMenu() - Removes the menu from the view and returns it to the caller.
+//ownership of the menu is transfered.
+m_optionsMenu = view->takeMenu();
+} else if (visible && m_optionsMenu) {
+// ownership of the menu is transfered
+view->setMenu(m_optionsMenu);
+m_optionsMenu = 0;
+}
+}
 void PhoneUIQtView::shutdownPhoneApp()
 {
 PHONE_DEBUG("PhoneUIQtView::shutdownPhoneApp");
 QCoreApplication::quit();
 }
 }
 }
 void PhoneUIQtView::setRestrictedMode(bool restrictedMode)
 {
+PHONE_TRACE
 m_restrictedMode = restrictedMode;
 m_backAction->setEnabled(!restrictedMode);
 m_dialpad->setCallButtonEnabled(false);
 m_dialpad->editor().setText(""); // Clead dialpad
 if (m_restrictedMode) {

changeset 76	cfea66083b62
parent 60	1eef62f5c541
child 78	baacf668fe89