src/hbcore/decorators/hbtitlebar.cpp
changeset 6 c3690ec91ef8
parent 5 627c4a0fd0e7
child 7 923ff622b8b9
equal deleted inserted replaced
5:627c4a0fd0e7 6:c3690ec91ef8
    73     q->connect(mTitlePane, SIGNAL(launchPopup(QPointF)), mMainWindow, SLOT(_q_launchMenu(QPointF)));
    73     q->connect(mTitlePane, SIGNAL(launchPopup(QPointF)), mMainWindow, SLOT(_q_launchMenu(QPointF)));
    74     q->connect(q, SIGNAL(activated(const QList<IndicatorClientInfo> &)), 
    74     q->connect(q, SIGNAL(activated(const QList<IndicatorClientInfo> &)), 
    75         mIndicatorButton, SLOT(activate(const QList<IndicatorClientInfo> &)));
    75         mIndicatorButton, SLOT(activate(const QList<IndicatorClientInfo> &)));
    76     q->connect(q, SIGNAL(deactivated(const QList<IndicatorClientInfo> &)), 
    76     q->connect(q, SIGNAL(deactivated(const QList<IndicatorClientInfo> &)), 
    77         mIndicatorButton, SLOT(deactivate(const QList<IndicatorClientInfo> &)));
    77         mIndicatorButton, SLOT(deactivate(const QList<IndicatorClientInfo> &)));
       
    78     q->connect(q, SIGNAL(allActivated(const QList<IndicatorClientInfo> &)), 
       
    79         mIndicatorButton, SLOT(activateAll(const QList<IndicatorClientInfo> &)));
    78     q->connect(mMainWindow, SIGNAL(currentViewChanged(HbView*)), q, SLOT(currentViewChanged(HbView*)));
    80     q->connect(mMainWindow, SIGNAL(currentViewChanged(HbView*)), q, SLOT(currentViewChanged(HbView*)));
    79     q->connect(mDefaultNavigationAction, SIGNAL(triggered()), qApp, SLOT(quit()));  
    81     q->connect(mDefaultNavigationAction, SIGNAL(triggered()), qApp, SLOT(quit()));  
    80 
    82 
    81     q->setFlag(QGraphicsItem::ItemIsPanel, true);
    83     q->setFlag(QGraphicsItem::ItemIsPanel, true);
    82 }
    84 }
   385         } else {
   387         } else {
   386             translate(-screenSize.width(), 0);
   388             translate(-screenSize.width(), 0);
   387         }
   389         }
   388     }
   390     }
   389 
   391 
       
   392     d->mIndicatorButton->currentViewChanged(view);
       
   393 
   390     // only do repolish if titlebar properties have changed
   394     // only do repolish if titlebar properties have changed
   391     if (d->mPreviousTitleBarProperties != view->viewFlags()) {
   395     if (d->mPreviousTitleBarProperties != view->viewFlags()) {
   392         d->initTitleBarHandle(view);
   396         d->initTitleBarHandle(view);
   393         d->initSceneEventFilters(view);
   397         d->initSceneEventFilters(view);
   394         d->mPreviousTitleBarProperties = view->viewFlags();
   398         d->mPreviousTitleBarProperties = view->viewFlags();
   461         break;
   465         break;
   462     }
   466     }
   463     case QEvent::Gesture: {
   467     case QEvent::Gesture: {
   464         QGestureEvent *gestureEvent = static_cast<QGestureEvent*>(event);
   468         QGestureEvent *gestureEvent = static_cast<QGestureEvent*>(event);
   465         if (HbPanGesture *pan = qobject_cast<HbPanGesture*>(gestureEvent->gesture(Qt::PanGesture))) {
   469         if (HbPanGesture *pan = qobject_cast<HbPanGesture*>(gestureEvent->gesture(Qt::PanGesture))) {
   466             if(pan->state() == Qt::GestureUpdated || pan->state() == Qt::GestureFinished) {
   470             if (pan->state() == Qt::GestureFinished) {
   467                 if(pan->sceneDelta().x() < -0) {
   471                 if(pan->sceneDelta().x() < -0) {
   468                     gestureLeft();
   472                     gestureLeft();
   469                 }
   473                 }
   470                 if(pan->sceneDelta().x() > 0) {
   474                 else if (pan->sceneDelta().x() > 0) {
   471                     gestureRight();
   475                     gestureRight();
   472                 }
   476                 }
   473                 gestureEvent->accept();
   477                 gestureEvent->accept();
   474             }
   478             }
   475         }
   479         }