diff -r bab96b7ed1a4 -r f39ed5e045e0 phoneuis/bubblemanager2/bubblecore/src/bubbleconferencehandler.cpp --- a/phoneuis/bubblemanager2/bubblecore/src/bubbleconferencehandler.cpp Tue Jun 15 14:14:38 2010 +0100 +++ b/phoneuis/bubblemanager2/bubblecore/src/bubbleconferencehandler.cpp Thu Jul 22 16:33:21 2010 +0100 @@ -15,12 +15,12 @@ * */ -#include +#include + #include #include #include #include -#include #include "bubblemanager2.h" #include "bubbleconferencehandler.h" @@ -29,6 +29,7 @@ #include "bubbleparticipantlistitem.h" #include "bubbleparticipantlistmodel.h" #include "bubblebutton.h" +#include "bubbleheadingwidget.h" static const int BUBBLE_SELECTION_TIMEOUT = 3000; @@ -39,14 +40,9 @@ QObject* parent ) : BubbleHandler(widgetManager,view,container,parent) { - mTimerLabel = - qobject_cast(widget(BubbleWidgetManager::ConferenceTimer)); - Q_ASSERT(mTimerLabel); - HbDeviceProfile profile; - HbFontSpec spec(HbFontSpec::Secondary); - spec.setTextHeight(4*HbDeviceProfile::current().unitValue()); - mTimerLabel->setFontSpec(spec); - mTimerLabel->setAlignment(Qt::AlignLeft); + mHeading = + qobject_cast(widget(BubbleWidgetManager::Heading)); + Q_ASSERT(mHeading); mButtonCenter = qobject_cast(widget(BubbleWidgetManager::CenterButton)); @@ -63,6 +59,11 @@ Q_ASSERT(mList); mModel = new BubbleParticipantListModel(); mList->setModel(mModel); + + HbAbstractItemView::ItemAnimations noCreationAndRemovalAnimations = HbAbstractItemView::All; + noCreationAndRemovalAnimations ^= HbAbstractItemView::Appear; + noCreationAndRemovalAnimations ^= HbAbstractItemView::Disappear; + mList->setEnabledAnimations(noCreationAndRemovalAnimations); mPrototype = qobject_cast( @@ -91,7 +92,7 @@ mSelectionTimer->stop(); mPrototype->clearActions(); - mTimerLabel->hide(); + mHeading->reset(); mButtonCenter->hide(); mButtonCenter->setDown(false); mButtonCenter->disconnect(); @@ -125,15 +126,7 @@ !(mHeader->callFlags()&BubbleManagerIF::NoCiphering)); } - if (header.timerCost().length()) { - QColor color; - color = HbColorScheme::color("list_item_title_normal"); - if (color.isValid()) { - mTimerLabel->setTextColor(color); - } - mTimerLabel->setPlainText(header.timerCost()); - mTimerLabel->show(); - } + mHeading->readBubbleHeader(header); setButtons(mHeader->actions()); @@ -148,6 +141,8 @@ BubbleUtils::setButtonStyleForAction(*mButtonCenter,*action); connect(mButtonCenter, SIGNAL( clicked() ), action, SLOT( trigger() ) ); + connect(mButtonCenter, SIGNAL( longPress(QPointF)), + action, SLOT( trigger() ) ); mButtonCenter->show(); } else if (actions.count()==2 && mButtonLeft && mButtonRight ) { // Left button @@ -156,6 +151,8 @@ BubbleUtils::setButtonStyleForAction(*mButtonLeft,*action1); connect( mButtonLeft, SIGNAL( clicked() ), action1, SLOT( trigger() ) ); + connect(mButtonLeft, SIGNAL( longPress(QPointF)), + action1, SLOT( trigger() ) ); mButtonLeft->show(); // Right button HbAction* action2 = actions.at(1); @@ -163,6 +160,8 @@ BubbleUtils::setButtonStyleForAction(*mButtonRight,*action2); connect( mButtonRight, SIGNAL( clicked() ), action2, SLOT( trigger() ) ); + connect(mButtonRight, SIGNAL( longPress(QPointF)), + action2, SLOT( trigger() ) ); mButtonRight->show(); } } @@ -183,10 +182,7 @@ void BubbleConferenceHandler::updateTimerDisplayNow() { - Q_ASSERT(mHeader); - - mTimerLabel->setPlainText(mHeader->timerCost()); - mTimerLabel->update(); + mHeading->updateTimerDisplayNow(); } void BubbleConferenceHandler::handleItemSelected(