--- a/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleutils/ut_bubbleutils.cpp	Mon May 03 12:31:11 2010 +0300
+++ b/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleutils/ut_bubbleutils.cpp	Fri May 14 15:51:57 2010 +0300
@@ -20,21 +20,13 @@
 #include <hbapplication.h>
 #include <hbtextitem.h>
 #include <hbiconitem.h>
-#include <hbpushbutton.h>
+#include <bubblebutton.h>
 #include <hbaction.h>
 
 #include "bubbletest.h"
 #include "bubbleutils.h"
 #include "bubbleheader.h"
-#include "bubblestyleoption.h"
-#include "bubblebuttonstyle.h"
-
-class BubbleButtonStyleMock : public BubbleButtonStyle
-{
-public:
-    BubbleButtonStyleMock() {};
-    BubbleButtonStyle::ButtonColor color() {return mButtonColor; };
-};
+#include "bubbleconferenceheader.h"
 
 class ut_BubbleUtils : public QObject
 {
@@ -62,9 +54,15 @@
 
     void test_compareHeaders();
 
-    void test_stylePluginNameWithPath();
+    void test_setButtonStyleForAction();
 
-    void test_setButtonStyleForAction();
+    void test_voiceCallStatusIcon();
+    void test_videoCallStatusIcon();
+    void test_voipCallStatusIcon();
+
+    void test_numberTypeIcon();
+
+    void test_cipheringIcon();
 
 private:
 };
@@ -81,414 +79,445 @@
 {
     // incoming call
     BubbleHeader header;
-    BubbleStyleOption opt;
+    HbTextItem text1;
+    HbTextItem text2;
+    HbTextItem text3;
+    int cliLine;
+    int timerLine;
     
     header.setCallState( BubbleManager::Incoming );
     header.setCli( "john", Qt::ElideRight );
     header.setText( "calling", Qt::ElideRight );
     
-    BubbleUtils::setCallHeaderTexts3Lines(header, opt);
+    BubbleUtils::setCallHeaderTexts3Lines(header, text1, text2, text3, cliLine, timerLine);
     
-    QVERIFY( opt.mText1 == "john" );
-    QVERIFY( opt.mText1Clip == Qt::ElideRight );
-    QVERIFY( opt.mText2 == "calling" );
-    QVERIFY( opt.mText2Clip == Qt::ElideRight );
-    QVERIFY( opt.mText3 == "" );
+    QVERIFY( text1.text() == "john" );
+    QVERIFY( text1.elideMode() == Qt::ElideRight );
+    QVERIFY( text2.text() == "calling" );
+    QVERIFY( text2.elideMode() == Qt::ElideRight );
+    QVERIFY( text3.text() == "" );
     
     // add secondary cli
-    opt = BubbleStyleOption();
     header.setSecondaryCli( "12345", Qt::ElideLeft );
-    BubbleUtils::setCallHeaderTexts3Lines(header, opt);
+
+    BubbleUtils::setCallHeaderTexts3Lines(header, text1, text2, text3, cliLine, timerLine);
         
-    QVERIFY( opt.mText1 == "john" );
-    QVERIFY( opt.mText1Clip == Qt::ElideRight );
-    QVERIFY( opt.mText2 == "12345" );
-    QVERIFY( opt.mText2Clip == Qt::ElideLeft );
-    QVERIFY( opt.mText3 == "calling" );
+    QVERIFY( text1.text() == "john" );
+    QVERIFY( text1.elideMode() == Qt::ElideRight );
+    QVERIFY( text2.text() == "12345" );
+    QVERIFY( text2.elideMode() == Qt::ElideLeft );
+    QVERIFY( text3.text() == "calling" );
 }
 
 void ut_BubbleUtils::test_setCallHeaderTexts3Lines_waiting()
 {
     // incoming call
     BubbleHeader header;
-    BubbleStyleOption opt;
+    HbTextItem text1;
+    HbTextItem text2;
+    HbTextItem text3;
+    int cliLine;
+    int timerLine;
 
     header.setCallState( BubbleManager::Waiting );
     header.setCli( "john", Qt::ElideRight );
     header.setText( "waiting", Qt::ElideRight );
 
-    BubbleUtils::setCallHeaderTexts3Lines(header, opt);
+    BubbleUtils::setCallHeaderTexts3Lines(header, text1, text2, text3, cliLine, timerLine);
 
-    QVERIFY( opt.mText1 == "john" );
-    QVERIFY( opt.mText1Clip == Qt::ElideRight );
-    QVERIFY( opt.mText2 == "waiting" );
-    QVERIFY( opt.mText2Clip == Qt::ElideRight );
-    QVERIFY( opt.mText3 == "" );
+    QVERIFY( text1.text() == "john" );
+    QVERIFY( text1.elideMode() == Qt::ElideRight );
+    QVERIFY( text2.text() == "waiting" );
+    QVERIFY( text2.elideMode() == Qt::ElideRight );
+    QVERIFY( text3.text() == "" );
 
     // add secondary cli
-    opt = BubbleStyleOption();
     header.setSecondaryCli( "12345", Qt::ElideLeft );
-    BubbleUtils::setCallHeaderTexts3Lines(header, opt);
+    BubbleUtils::setCallHeaderTexts3Lines(header, text1, text2, text3, cliLine, timerLine);
 
-    QVERIFY( opt.mText1 == "john" );
-    QVERIFY( opt.mText1Clip == Qt::ElideRight );
-    QVERIFY( opt.mText2 == "12345" );
-    QVERIFY( opt.mText2Clip == Qt::ElideLeft );
-    QVERIFY( opt.mText3 == "waiting" );
+    QVERIFY( text1.text() == "john" );
+    QVERIFY( text1.elideMode() == Qt::ElideRight );
+    QVERIFY( text2.text() == "12345" );
+    QVERIFY( text2.elideMode() == Qt::ElideLeft );
+    QVERIFY( text3.text() == "waiting" );
 }
 
 void ut_BubbleUtils::test_setCallHeaderTexts3Lines_active()
 {
     // active call
     BubbleHeader header;
-    BubbleStyleOption opt;
+    HbTextItem text1;
+    HbTextItem text2;
+    HbTextItem text3;
+    int cliLine;
+    int timerLine;
 
     header.setCallState( BubbleManager::Active );
     header.setCli( "john", Qt::ElideRight );
     header.setText( "", Qt::ElideRight );
     
-    BubbleUtils::setCallHeaderTexts3Lines(header, opt);
+    BubbleUtils::setCallHeaderTexts3Lines(header, text1, text2, text3, cliLine, timerLine);
     
-    QVERIFY( opt.mText1 == "john" );
-    QVERIFY( opt.mText1Clip == Qt::ElideRight );
-    QVERIFY( opt.mText2 == "" );
-    QVERIFY( opt.mText3 == "" );
+    QVERIFY( text1.text() == "john" );
+    QVERIFY( text1.elideMode() == Qt::ElideRight );
+    QVERIFY( text2.text() == "" );
+    QVERIFY( text3.text() == "" );
     
     // add timer
-    opt = BubbleStyleOption();
     header.setTimerCost( "00:00" );
-    BubbleUtils::setCallHeaderTexts3Lines(header, opt);
-    QVERIFY( opt.mText1 == "john" );
-    QVERIFY( opt.mText1Clip == Qt::ElideRight );
-    QVERIFY( opt.mText2 == "00:00" );
-    QVERIFY( opt.mText2Clip == Qt::ElideRight );
-    QVERIFY( opt.mText3 == "" );
+    BubbleUtils::setCallHeaderTexts3Lines(header, text1, text2, text3, cliLine, timerLine);
+    QVERIFY( text1.text()== "john" );
+    QVERIFY( text1.elideMode() == Qt::ElideRight );
+    QVERIFY( text2.text() == "00:00" );
+    QVERIFY( text2.elideMode() == Qt::ElideRight );
+    QVERIFY( text3.text() == "" );
     header.setTimerCost( "" );
     
     // add secondary cli
-    opt = BubbleStyleOption();
     header.setSecondaryCli( "12345", Qt::ElideLeft );
-    BubbleUtils::setCallHeaderTexts3Lines(header, opt);
+    BubbleUtils::setCallHeaderTexts3Lines(header, text1, text2, text3, cliLine, timerLine);
         
-    QVERIFY( opt.mText1 == "john" );
-    QVERIFY( opt.mText1Clip == Qt::ElideRight );
-    QVERIFY( opt.mText2 == "12345" );
-    QVERIFY( opt.mText2Clip == Qt::ElideLeft );
-    QVERIFY( opt.mText3 == "" );
+    QVERIFY( text1.text() == "john" );
+    QVERIFY( text1.elideMode() == Qt::ElideRight );
+    QVERIFY( text2.text() == "12345" );
+    QVERIFY( text2.elideMode() == Qt::ElideLeft );
+    QVERIFY( text3.text() == "" );
     
     // add timer
-    opt = BubbleStyleOption();
     header.setTimerCost( "00:00" );
-    BubbleUtils::setCallHeaderTexts3Lines(header, opt);
-    QVERIFY( opt.mText1 == "john" );
-    QVERIFY( opt.mText1Clip == Qt::ElideRight );
-    QVERIFY( opt.mText2 == "12345" );
-    QVERIFY( opt.mText2Clip == Qt::ElideLeft );
-    QVERIFY( opt.mText3 == "00:00" );
-    QVERIFY( opt.mText3Clip == Qt::ElideRight );
+    BubbleUtils::setCallHeaderTexts3Lines(header, text1, text2, text3, cliLine, timerLine);
+    QVERIFY( text1.text()== "john" );
+    QVERIFY( text1.elideMode() == Qt::ElideRight );
+    QVERIFY( text2.text() == "12345" );
+    QVERIFY( text2.elideMode() == Qt::ElideLeft );
+    QVERIFY( text3.text() == "00:00" );
+    QVERIFY( text3.elideMode() == Qt::ElideRight );
 }
 
 void ut_BubbleUtils::test_setCallHeaderTexts3Lines_disconnected()
 {
     // disconnected call
     BubbleHeader header;
-    BubbleStyleOption opt;
+    HbTextItem text1;
+    HbTextItem text2;
+    HbTextItem text3;
+    int cliLine;
+    int timerLine;
 
     header.setCallState( BubbleManager::Disconnected );
     header.setCli( "john", Qt::ElideRight );
     header.setText( "discon", Qt::ElideRight );
     header.setTimerCost( "00:00" );
     
-    BubbleUtils::setCallHeaderTexts3Lines(header, opt);
-    QVERIFY( opt.mText1 == "john" );
-    QVERIFY( opt.mText1Clip == Qt::ElideRight );
-    QVERIFY( opt.mText2 == "discon" );
-    QVERIFY( opt.mText2Clip == Qt::ElideRight );
-    QVERIFY( opt.mText3 == "" );
+    BubbleUtils::setCallHeaderTexts3Lines(header, text1, text2, text3, cliLine, timerLine);
+    QVERIFY( text1.text() == "john" );
+    QVERIFY( text1.elideMode() == Qt::ElideRight );
+    QVERIFY( text2.text() == "discon" );
+    QVERIFY( text2.elideMode() == Qt::ElideRight );
+    QVERIFY( text3.text() == "" );
     
     // add secondary cli
-    opt = BubbleStyleOption();
     header.setSecondaryCli( "12345", Qt::ElideLeft );
-    BubbleUtils::setCallHeaderTexts3Lines(header, opt);
+    BubbleUtils::setCallHeaderTexts3Lines(header, text1, text2, text3, cliLine, timerLine);
         
-    QVERIFY( opt.mText1 == "john" );
-    QVERIFY( opt.mText1Clip == Qt::ElideRight );
-    QVERIFY( opt.mText2 == "12345" );
-    QVERIFY( opt.mText2Clip == Qt::ElideLeft );
-    QVERIFY( opt.mText3 == "discon" );
-    QVERIFY( opt.mText3Clip == Qt::ElideRight );
+    QVERIFY( text1.text() == "john" );
+    QVERIFY( text1.elideMode() == Qt::ElideRight );
+    QVERIFY( text2.text() == "12345" );
+    QVERIFY( text2.elideMode() == Qt::ElideLeft );
+    QVERIFY( text3.text() == "discon" );
+    QVERIFY( text3.elideMode() == Qt::ElideRight );
 }
 
 void ut_BubbleUtils::test_setCallHeaderTexts3Lines_outgoing()
 {
     // outgoing call
     BubbleHeader header;
-    BubbleStyleOption opt;
+    HbTextItem text1;
+    HbTextItem text2;
+    HbTextItem text3;
+    int cliLine;
+    int timerLine;
 
     header.setCallState( BubbleManager::Outgoing );
     header.setCli( "john", Qt::ElideRight );
     header.setText( "calling", Qt::ElideRight );
     
-    BubbleUtils::setCallHeaderTexts3Lines(header, opt);
+    BubbleUtils::setCallHeaderTexts3Lines(header, text1, text2, text3, cliLine, timerLine);
     
-    QVERIFY( opt.mText1 == "calling" );
-    QVERIFY( opt.mText1Clip == Qt::ElideRight );
-    QVERIFY( opt.mText2 == "john" );
-    QVERIFY( opt.mText2Clip == Qt::ElideRight );
-    QVERIFY( opt.mText3 == "" );
+    QVERIFY( text1.text() == "calling" );
+    QVERIFY( text1.elideMode() == Qt::ElideRight );
+    QVERIFY( text2.text() == "john" );
+    QVERIFY( text2.elideMode() == Qt::ElideRight );
+    QVERIFY( text3.text() == "" );
     
     // add secondary cli
-    opt = BubbleStyleOption();
     header.setSecondaryCli( "12345", Qt::ElideLeft );
-    BubbleUtils::setCallHeaderTexts3Lines(header, opt);
+    BubbleUtils::setCallHeaderTexts3Lines(header, text1, text2, text3, cliLine, timerLine);
         
-    QVERIFY( opt.mText1 == "calling" );
-    QVERIFY( opt.mText1Clip == Qt::ElideRight );
-    QVERIFY( opt.mText2 == "john" );
-    QVERIFY( opt.mText2Clip == Qt::ElideRight );
-    QVERIFY( opt.mText3 == "12345" );
-    QVERIFY( opt.mText3Clip == Qt::ElideLeft );
+    QVERIFY( text1.text() == "calling" );
+    QVERIFY( text1.elideMode() == Qt::ElideRight );
+    QVERIFY( text2.text() == "john" );
+    QVERIFY( text2.elideMode() == Qt::ElideRight );
+    QVERIFY( text3.text() == "12345" );
+    QVERIFY( text3.elideMode() == Qt::ElideLeft );
 }
 
 void ut_BubbleUtils::test_setCallHeaderTexts3Lines_alerting()
 {
     // alerting call
     BubbleHeader header;
-    BubbleStyleOption opt;
+    HbTextItem text1;
+    HbTextItem text2;
+    HbTextItem text3;
+    int cliLine;
+    int timerLine;
 
     header.setCallState( BubbleManager::Alerting );
     header.setCli( "john", Qt::ElideRight );
     header.setText( "calling", Qt::ElideRight );
     
-    BubbleUtils::setCallHeaderTexts3Lines(header, opt);
+    BubbleUtils::setCallHeaderTexts3Lines(header, text1, text2, text3, cliLine, timerLine);
     
-    QVERIFY( opt.mText1 == "john" );
-    QVERIFY( opt.mText1Clip == Qt::ElideRight );
-    QVERIFY( opt.mText2 == "" );
-    QVERIFY( opt.mText3 == "" );
+    QVERIFY( text1.text() == "john" );
+    QVERIFY( text1.elideMode() == Qt::ElideRight );
+    QVERIFY( text2.text() == "" );
+    QVERIFY( text3.text() == "" );
     
     // add secondary cli
-    opt = BubbleStyleOption();
     header.setSecondaryCli( "12345", Qt::ElideLeft );
-    BubbleUtils::setCallHeaderTexts3Lines(header, opt);
+    BubbleUtils::setCallHeaderTexts3Lines(header, text1, text2, text3, cliLine, timerLine);
         
-    QVERIFY( opt.mText1 == "john" );
-    QVERIFY( opt.mText1Clip == Qt::ElideRight );
-    QVERIFY( opt.mText2 == "12345" );
-    QVERIFY( opt.mText2Clip == Qt::ElideLeft );
-    QVERIFY( opt.mText3 == "" );
+    QVERIFY( text1.text() == "john" );
+    QVERIFY( text1.elideMode() == Qt::ElideRight );
+    QVERIFY( text2.text() == "12345" );
+    QVERIFY( text2.elideMode() == Qt::ElideLeft );
+    QVERIFY( text3.text() == "" );
 }
 
 void ut_BubbleUtils::test_setCallHeaderTexts3Lines_held()
 {
     // held
     BubbleHeader header;
-    BubbleStyleOption opt;
+    HbTextItem text1;
+    HbTextItem text2;
+    HbTextItem text3;
+    int cliLine;
+    int timerLine;
 
     header.setCallState( BubbleManager::OnHold );
     header.setCli( "john", Qt::ElideRight );
     header.setText( "on hold", Qt::ElideRight );
     header.setTimerCost( "00:00" );
     
-    BubbleUtils::setCallHeaderTexts3Lines(header, opt);
+    BubbleUtils::setCallHeaderTexts3Lines(header, text1, text2, text3, cliLine, timerLine);
     
-    QVERIFY( opt.mText1 == "john" );
-    QVERIFY( opt.mText1Clip == Qt::ElideRight );
-    QVERIFY( opt.mText2 == "on hold" );
-    QVERIFY( opt.mText2Clip == Qt::ElideRight );
-    QVERIFY( opt.mText3 == "" );
+    QVERIFY( text1.text() == "john" );
+    QVERIFY( text1.elideMode() == Qt::ElideRight );
+    QVERIFY( text2.text() == "on hold" );
+    QVERIFY( text2.elideMode() == Qt::ElideRight );
+    QVERIFY( text3.text() == "" );
     
     // add secondary cli
-    opt = BubbleStyleOption();
     header.setSecondaryCli( "12345", Qt::ElideLeft );
-    BubbleUtils::setCallHeaderTexts3Lines(header, opt);
+    BubbleUtils::setCallHeaderTexts3Lines(header, text1, text2, text3, cliLine, timerLine);
         
-    QVERIFY( opt.mText1 == "john" );
-    QVERIFY( opt.mText1Clip == Qt::ElideRight );
-    QVERIFY( opt.mText2 == "12345" );
-    QVERIFY( opt.mText2Clip == Qt::ElideLeft );
-    QVERIFY( opt.mText3 == "on hold" );
-    QVERIFY( opt.mText3Clip == Qt::ElideRight );
+    QVERIFY( text1.text() == "john" );
+    QVERIFY( text1.elideMode() == Qt::ElideRight );
+    QVERIFY( text2.text() == "12345" );
+    QVERIFY( text2.elideMode() == Qt::ElideLeft );
+    QVERIFY( text3.text() == "on hold" );
+    QVERIFY( text3.elideMode() == Qt::ElideRight );
 }
 
 void ut_BubbleUtils::test_setCallHeaderTexts3Lines_alerttodisconnected()
 {
     // incoming call
     BubbleHeader header;
-    BubbleStyleOption opt;
+    HbTextItem text1;
+    HbTextItem text2;
+    HbTextItem text3;
+    int cliLine;
+    int timerLine;
 
     header.setCallState( BubbleManager::Incoming );
     header.setCallState( BubbleManager::AlertToDisconnected );
     header.setCli( "john", Qt::ElideRight );
     header.setText( "disconnected", Qt::ElideRight );
 
-    BubbleUtils::setCallHeaderTexts3Lines(header, opt);
+    BubbleUtils::setCallHeaderTexts3Lines(header, text1, text2, text3, cliLine, timerLine);
 
-    QVERIFY( opt.mText1 == "john" );
-    QVERIFY( opt.mText1Clip == Qt::ElideRight );
-    QVERIFY( opt.mText2 == "disconnected" );
-    QVERIFY( opt.mText2Clip == Qt::ElideRight );
-    QVERIFY( opt.mText3 == "" );
+    QVERIFY( text1.text() == "john" );
+    QVERIFY( text1.elideMode() == Qt::ElideRight );
+    QVERIFY( text2.text() == "disconnected" );
+    QVERIFY( text2.elideMode() == Qt::ElideRight );
+    QVERIFY( text3.text() == "" );
 
     // add secondary cli
-    opt = BubbleStyleOption();
     header.setSecondaryCli( "12345", Qt::ElideLeft );
-    BubbleUtils::setCallHeaderTexts3Lines(header, opt);
+    BubbleUtils::setCallHeaderTexts3Lines(header, text1, text2, text3, cliLine, timerLine);
 
-    QVERIFY( opt.mText1 == "john" );
-    QVERIFY( opt.mText1Clip == Qt::ElideRight );
-    QVERIFY( opt.mText2 == "12345" );
-    QVERIFY( opt.mText2Clip == Qt::ElideLeft );
-    QVERIFY( opt.mText3 == "disconnected" );
+    QVERIFY( text1.text() == "john" );
+    QVERIFY( text1.elideMode() == Qt::ElideRight );
+    QVERIFY( text2.text() == "12345" );
+    QVERIFY( text2.elideMode() == Qt::ElideLeft );
+    QVERIFY( text3.text() == "disconnected" );
 }
 
 void ut_BubbleUtils::test_setCallHeaderTexts2Lines_waiting()
 {
     // waiting call
     BubbleHeader header;
-    BubbleStyleOption opt;
+    HbTextItem text1;
+    HbTextItem text2;
+    int cliLine;
+    int timerLine;
 
     header.setCallState( BubbleManager::Waiting );
     header.setCli( "john", Qt::ElideRight );
     header.setText( "waiting", Qt::ElideRight );
 
-    BubbleUtils::setCallHeaderTexts2Lines(header, opt);
+    BubbleUtils::setCallHeaderTexts2Lines(header, text1, text2, cliLine, timerLine);
 
-    QVERIFY( opt.mText1 == "john" );
-    QVERIFY( opt.mText1Clip == Qt::ElideRight );
-    QVERIFY( opt.mText2 == "waiting" );
-    QVERIFY( opt.mText2Clip == Qt::ElideRight );
-    QVERIFY( opt.mText3 == "" );
+    QVERIFY( text1.text() == "john" );
+    QVERIFY( text1.elideMode() == Qt::ElideRight );
+    QVERIFY( text2.text() == "waiting" );
+    QVERIFY( text2.elideMode() == Qt::ElideRight );
 
     // add secondary cli
-    opt = BubbleStyleOption();
     header.setSecondaryCli("12345",Qt::ElideLeft);
-    BubbleUtils::setCallHeaderTexts2Lines(header, opt);
-    QVERIFY( opt.mText1 == "john" );
-    QVERIFY( opt.mText1Clip == Qt::ElideRight );
-    QVERIFY( opt.mText2 == "waiting" );
-    QVERIFY( opt.mText2Clip == Qt::ElideRight );
-    QVERIFY( opt.mText3 == "" );
+    BubbleUtils::setCallHeaderTexts2Lines(header, text1, text2, cliLine, timerLine);
+    QVERIFY( text1.text() == "john" );
+    QVERIFY( text1.elideMode() == Qt::ElideRight );
+    QVERIFY( text2.text() == "waiting" );
+    QVERIFY( text2.elideMode() == Qt::ElideRight );
 }
 
 void ut_BubbleUtils::test_setCallHeaderTexts2Lines_alerttodisconnected()
 {
     // waiting call
     BubbleHeader header;
-    BubbleStyleOption opt;
+    HbTextItem text1;
+    HbTextItem text2;
+    int cliLine;
+    int timerLine;
 
-    header.setCallState( BubbleManager::Waiting );
+    header.setCallState( BubbleManager::AlertToDisconnected );
     header.setCli( "john", Qt::ElideRight );
     header.setText( "disconnected", Qt::ElideRight );
 
-    BubbleUtils::setCallHeaderTexts2Lines(header, opt);
+    BubbleUtils::setCallHeaderTexts2Lines(header, text1, text2, cliLine, timerLine);
 
-    QVERIFY( opt.mText1 == "john" );
-    QVERIFY( opt.mText1Clip == Qt::ElideRight );
-    QVERIFY( opt.mText2 == "disconnected" );
-    QVERIFY( opt.mText2Clip == Qt::ElideRight );
-    QVERIFY( opt.mText3 == "" );
+    QVERIFY( text1.text() == "john" );
+    QVERIFY( text1.elideMode() == Qt::ElideRight );
+    QVERIFY( text2.text() == "disconnected" );
+    QVERIFY( text2.elideMode() == Qt::ElideRight );
 
     // add secondary cli
-    opt = BubbleStyleOption();
     header.setSecondaryCli("12345",Qt::ElideLeft);
-    BubbleUtils::setCallHeaderTexts2Lines(header, opt);
-    QVERIFY( opt.mText1 == "john" );
-    QVERIFY( opt.mText1Clip == Qt::ElideRight );
-    QVERIFY( opt.mText2 == "disconnected" );
-    QVERIFY( opt.mText2Clip == Qt::ElideRight );
-    QVERIFY( opt.mText3 == "" );
+    BubbleUtils::setCallHeaderTexts2Lines(header, text1, text2, cliLine, timerLine);
+    QVERIFY( text1.text() == "john" );
+    QVERIFY( text1.elideMode() == Qt::ElideRight );
+    QVERIFY( text2.text() == "disconnected" );
+    QVERIFY( text2.elideMode() == Qt::ElideRight );
 }
 
 void ut_BubbleUtils::test_setCallHeaderTexts2Lines_active()
 {
     // active call
     BubbleHeader header;
-    BubbleStyleOption opt;
+    HbTextItem text1;
+    HbTextItem text2;
+    int cliLine;
+    int timerLine;
 
     header.setCallState( BubbleManager::Active );
     header.setCli( "john", Qt::ElideRight );
     header.setText( "", Qt::ElideRight );
 
-    BubbleUtils::setCallHeaderTexts2Lines(header, opt);
+    BubbleUtils::setCallHeaderTexts2Lines(header, text1, text2, cliLine, timerLine);
 
-    QVERIFY( opt.mText1 == "john" );
-    QVERIFY( opt.mText1Clip == Qt::ElideRight );
-    QVERIFY( opt.mText2 == "" );
-    QVERIFY( opt.mText3 == "" );
+    QVERIFY( text1.text() == "john" );
+    QVERIFY( text1.elideMode() == Qt::ElideRight );
+    QVERIFY( text2.text() == "" );
 
     // add timer
-    opt = BubbleStyleOption();
     header.setTimerCost( "00:00" );
-    BubbleUtils::setCallHeaderTexts2Lines(header, opt);
-    QVERIFY( opt.mText1 == "john" );
-    QVERIFY( opt.mText1Clip == Qt::ElideRight );
-    QVERIFY( opt.mText2 == "00:00" );
-    QVERIFY( opt.mText2Clip == Qt::ElideRight );
-    QVERIFY( opt.mText3 == "" );
+    BubbleUtils::setCallHeaderTexts2Lines(header, text1, text2, cliLine, timerLine);
+    QVERIFY( text1.text() == "john" );
+    QVERIFY( text1.elideMode() == Qt::ElideRight );
+    QVERIFY( text2.text() == "00:00" );
+    QVERIFY( text2.elideMode() == Qt::ElideRight );
 }
 
 void ut_BubbleUtils::test_setCallHeaderTexts2Lines_held()
 {
     // held
     BubbleHeader header;
-    BubbleStyleOption opt;
+    HbTextItem text1;
+    HbTextItem text2;
+    int cliLine;
+    int timerLine;
 
     header.setCallState( BubbleManager::OnHold );
     header.setCli( "john", Qt::ElideRight );
     header.setText( "on hold", Qt::ElideRight );
     header.setTimerCost( "00:00" );
 
-    BubbleUtils::setCallHeaderTexts2Lines(header, opt);
+    BubbleUtils::setCallHeaderTexts2Lines(header, text1, text2, cliLine, timerLine);
 
-    QVERIFY( opt.mText1 == "john" );
-    QVERIFY( opt.mText1Clip == Qt::ElideRight );
-    QVERIFY( opt.mText2 == "on hold" );
-    QVERIFY( opt.mText2Clip == Qt::ElideRight );
-    QVERIFY( opt.mText3 == "" );
+    QVERIFY( text1.text() == "john" );
+    QVERIFY( text1.elideMode() == Qt::ElideRight );
+    QVERIFY( text2.text() == "on hold" );
+    QVERIFY( text2.elideMode() == Qt::ElideRight );
 }
 
 void ut_BubbleUtils::test_setCallHeaderTexts2Lines_disconnected()
 {
     // disconnected call
     BubbleHeader header;
-    BubbleStyleOption opt;
+    HbTextItem text1;
+    HbTextItem text2;
+    int cliLine;
+    int timerLine;
 
     header.setCallState( BubbleManager::Disconnected );
     header.setCli( "john", Qt::ElideRight );
     header.setText( "discon", Qt::ElideRight );
     header.setTimerCost( "00:00" );
 
-    BubbleUtils::setCallHeaderTexts2Lines(header, opt);
-    QVERIFY( opt.mText1 == "john" );
-    QVERIFY( opt.mText1Clip == Qt::ElideRight );
-    QVERIFY( opt.mText2 == "discon" );
-    QVERIFY( opt.mText2Clip == Qt::ElideRight );
-    QVERIFY( opt.mText3 == "" );
+    BubbleUtils::setCallHeaderTexts2Lines(header, text1, text2, cliLine, timerLine);
+    QVERIFY( text1.text() == "john" );
+    QVERIFY( text1.elideMode() == Qt::ElideRight );
+    QVERIFY( text2.text() == "discon" );
+    QVERIFY( text2.elideMode() == Qt::ElideRight );
 }
 
 void ut_BubbleUtils::test_setCallHeaderTexts2Lines_outgoing()
 {
     // outgoing
     BubbleHeader header;
-    BubbleStyleOption opt;
+    HbTextItem text1;
+    HbTextItem text2;
+    int cliLine;
+    int timerLine;
 
     header.setCallState(BubbleManager::Outgoing);
     header.setCli("john", Qt::ElideRight);
     header.setText("calling", Qt::ElideRight);
     header.setTimerCost("00:00");
 
-    BubbleUtils::setCallHeaderTexts2Lines(header, opt);
-    QCOMPARE(opt.mText1, QString("calling"));
-    QCOMPARE(opt.mText1Clip, Qt::ElideRight);
-    QCOMPARE(opt.mText2, QString("john"));
-    QCOMPARE(opt.mText2Clip, Qt::ElideRight);
+    BubbleUtils::setCallHeaderTexts2Lines(header, text1, text2, cliLine, timerLine);
+    QCOMPARE(text1.text(), QString("calling"));
+    QCOMPARE(text1.elideMode(), Qt::ElideRight);
+    QCOMPARE(text2.text(), QString("john"));
+    QCOMPARE(text2.elideMode(), Qt::ElideRight);
 }
 
 void ut_BubbleUtils::test_compareHeaders()
 {
     BubbleHeader header1;
     BubbleHeader header2;
+    BubbleConferenceHeader headerC;
 
     header1.setCallState(BubbleManagerIF::Active);
     header2.setCallState(BubbleManagerIF::Waiting);
@@ -497,40 +526,207 @@
     header1.setCallState(BubbleManagerIF::Active);
     header2.setCallState(BubbleManagerIF::OnHold);
     QVERIFY( BubbleUtils::compareHeaders(&header1,&header2) == true );
-}
 
-void ut_BubbleUtils::test_stylePluginNameWithPath()
-{
-#if defined(Q_OS_SYMBIAN)
-    QString name(BubbleUtils::stylePluginNameWithPath("bubblestyleplugin.dll"));
-    QVERIFY(name=="z:/resource/qt/plugins/phone/bubblestyleplugin.dll");
-#elif defined(Q_OS_WIN)
-    QString name(BubbleUtils::stylePluginNameWithPath("bubblestyleplugin.dll"));
-    QVERIFY(name=="c:/hb/bin/bubblestyleplugin.dll");
-#else // Q_OS_UNIX
-    QString name(BubbleUtils::stylePluginNameWithPath("bubblestyleplugin.dll"));
-    QVERIFY(name=="/home/lib/bubblestyleplugin.dll");
-#endif
+    headerC.setCallState(BubbleManagerIF::Active);
+    header1.setCallState(BubbleManagerIF::OnHold);
+
+    QVERIFY( BubbleUtils::compareHeaders(&headerC,&header1) == false );
 }
 
 void ut_BubbleUtils::test_setButtonStyleForAction()
 {
-    HbPushButton button;
-    BubbleButtonStyleMock style;
-    button.setStyle(&style);
+    BubbleButton button;
     HbAction action;
 
     action.setSoftKeyRole(QAction::NoSoftKey);
     BubbleUtils::setButtonStyleForAction(button,action);
-    QVERIFY(style.color()==BubbleButtonStyle::Default);
+    QVERIFY(button.buttonType()==BubbleButton::DefaultButton);
 
     action.setSoftKeyRole(QAction::PositiveSoftKey);
     BubbleUtils::setButtonStyleForAction(button,action);
-    QVERIFY(style.color()==BubbleButtonStyle::Green);
+    QVERIFY(button.buttonType()==BubbleButton::GreenButton);
 
     action.setSoftKeyRole(QAction::NegativeSoftKey);
     BubbleUtils::setButtonStyleForAction(button,action);
-    QVERIFY(style.color()==BubbleButtonStyle::Red);
+    QVERIFY(button.buttonType()==BubbleButton::RedButton);
+}
+
+void ut_BubbleUtils::test_voiceCallStatusIcon()
+{
+    HbIconItem icon;
+    icon.hide();
+
+    // test different voice call states
+
+    BubbleUtils::setCallStatusIcon(
+        BubbleManagerIF::Incoming, BubbleManagerIF::Normal, icon);
+    QVERIFY(icon.iconName()=="voice_call_waiting_anim");
+    QVERIFY(icon.isVisible()==true);
+
+    BubbleUtils::setCallStatusIcon(
+        BubbleManagerIF::Waiting, BubbleManagerIF::Normal, icon);
+    QVERIFY(icon.iconName()=="voice_call_waiting_anim");
+
+    BubbleUtils::setCallStatusIcon(
+        BubbleManagerIF::Alerting, BubbleManagerIF::Normal, icon);
+    QVERIFY(icon.iconName()=="voice_call_waiting_anim");
+
+    BubbleUtils::setCallStatusIcon(
+        BubbleManagerIF::Active, BubbleManagerIF::Normal, icon);
+    QVERIFY(icon.iconName()=="qtg_large_active_call");
+
+    BubbleUtils::setCallStatusIcon(
+        BubbleManagerIF::Outgoing, BubbleManagerIF::Normal, icon);
+    QVERIFY(icon.iconName()=="qtg_large_active_call");
+
+    BubbleUtils::setCallStatusIcon(
+        BubbleManagerIF::OnHold, BubbleManagerIF::Normal, icon);
+    QVERIFY(icon.iconName()=="qtg_large_waiting_call");
+
+    BubbleUtils::setCallStatusIcon(
+        BubbleManagerIF::Disconnected, BubbleManagerIF::Normal, icon);
+    QVERIFY(icon.iconName()=="qtg_large_end_call");
+
+    BubbleUtils::setCallStatusIcon(
+        BubbleManagerIF::AlertToDisconnected, BubbleManagerIF::Normal, icon);
+    QVERIFY(icon.iconName()=="qtg_large_end_call");
+
+    icon.hide();
+    BubbleUtils::setCallStatusIcon(
+        BubbleManagerIF::None, BubbleManagerIF::Normal, icon);
+    QVERIFY(icon.iconName()=="");
+    QVERIFY(icon.isVisible()==false);
+}
+
+void ut_BubbleUtils::test_videoCallStatusIcon()
+{
+    HbIconItem icon;
+    icon.hide();
+
+    // test different voice call states
+
+    BubbleUtils::setCallStatusIcon(
+        BubbleManagerIF::Incoming, BubbleManagerIF::Video, icon);
+    QVERIFY(icon.iconName()=="video_call_waiting_anim");
+    QVERIFY(icon.isVisible()==true);
+
+    BubbleUtils::setCallStatusIcon(
+        BubbleManagerIF::Waiting, BubbleManagerIF::Video, icon);
+    QVERIFY(icon.iconName()=="video_call_waiting_anim");
+
+    BubbleUtils::setCallStatusIcon(
+        BubbleManagerIF::Alerting, BubbleManagerIF::Video, icon);
+    QVERIFY(icon.iconName()=="video_call_waiting_anim");
+
+    BubbleUtils::setCallStatusIcon(
+        BubbleManagerIF::Active, BubbleManagerIF::Video, icon);
+    QVERIFY(icon.iconName()=="qtg_large_video_call_active");
+
+    BubbleUtils::setCallStatusIcon(
+        BubbleManagerIF::Outgoing, BubbleManagerIF::Video, icon);
+    QVERIFY(icon.iconName()=="qtg_large_video_call_active");
+
+    BubbleUtils::setCallStatusIcon(
+        BubbleManagerIF::OnHold, BubbleManagerIF::Video, icon);
+    QVERIFY(icon.iconName()=="qtg_large_video_call_waiting");
+
+    BubbleUtils::setCallStatusIcon(
+        BubbleManagerIF::Disconnected, BubbleManagerIF::Video, icon);
+    QVERIFY(icon.iconName()=="qtg_large_end_call");
+
+    BubbleUtils::setCallStatusIcon(
+        BubbleManagerIF::AlertToDisconnected, BubbleManagerIF::Video, icon);
+    QVERIFY(icon.iconName()=="qtg_large_end_call");
+
+    icon.hide();
+    BubbleUtils::setCallStatusIcon(
+        BubbleManagerIF::None, BubbleManagerIF::Video, icon);
+    QVERIFY(icon.iconName()=="");
+    QVERIFY(icon.isVisible()==false);
+}
+
+void ut_BubbleUtils::test_voipCallStatusIcon()
+{
+    HbIconItem icon;
+    icon.hide();
+
+    // test different voice call states
+
+    BubbleUtils::setCallStatusIcon(
+        BubbleManagerIF::Incoming, BubbleManagerIF::VoIPCall, icon);
+    QVERIFY(icon.iconName()=="voip_call_waiting_anim");
+    QVERIFY(icon.isVisible()==true);
+
+    BubbleUtils::setCallStatusIcon(
+        BubbleManagerIF::Waiting, BubbleManagerIF::VoIPCall, icon);
+    QVERIFY(icon.iconName()=="voip_call_waiting_anim");
+
+    BubbleUtils::setCallStatusIcon(
+        BubbleManagerIF::Alerting, BubbleManagerIF::VoIPCall, icon);
+    QVERIFY(icon.iconName()=="voip_call_waiting_anim");
+
+    BubbleUtils::setCallStatusIcon(
+        BubbleManagerIF::Active, BubbleManagerIF::VoIPCall, icon);
+    QVERIFY(icon.iconName()=="qtg_large_voip_call_active");
+
+    BubbleUtils::setCallStatusIcon(
+        BubbleManagerIF::Outgoing, BubbleManagerIF::VoIPCall, icon);
+    QVERIFY(icon.iconName()=="qtg_large_voip_call_active");
+
+    BubbleUtils::setCallStatusIcon(
+        BubbleManagerIF::OnHold, BubbleManagerIF::VoIPCall, icon);
+    QVERIFY(icon.iconName()=="qtg_large_voip_call_waiting");
+
+    BubbleUtils::setCallStatusIcon(
+        BubbleManagerIF::Disconnected, BubbleManagerIF::VoIPCall, icon);
+    QVERIFY(icon.iconName()=="qtg_large_end_call");
+
+    BubbleUtils::setCallStatusIcon(
+        BubbleManagerIF::AlertToDisconnected, BubbleManagerIF::VoIPCall, icon);
+    QVERIFY(icon.iconName()=="qtg_large_end_call");
+
+    icon.hide();
+    BubbleUtils::setCallStatusIcon(
+        BubbleManagerIF::None, BubbleManagerIF::VoIPCall, icon);
+    QVERIFY(icon.iconName()=="");
+    QVERIFY(icon.isVisible()==false);
+}
+
+void ut_BubbleUtils::test_numberTypeIcon()
+{
+    HbIconItem icon;
+    icon.hide();
+
+    BubbleUtils::setNumberTypeIcon(
+        BubbleManagerIF::Incoming, BubbleManagerIF::Diverted, icon);
+    QVERIFY(icon.iconName()==":/qtg_mono_call_diverted.svg");
+    QVERIFY(icon.isVisible()==true);
+
+    BubbleUtils::setNumberTypeIcon(
+        BubbleManagerIF::Waiting, BubbleManagerIF::Diverted, icon);
+    QVERIFY(icon.iconName()==":/qtg_mono_call_diverted.svg");
+    QVERIFY(icon.isVisible()==true);
+
+    BubbleUtils::setNumberTypeIcon(
+        BubbleManagerIF::Incoming, BubbleManagerIF::Normal, icon);
+    QVERIFY(icon.iconName()=="");
+    QVERIFY(icon.isVisible()==false);
+}
+
+void ut_BubbleUtils::test_cipheringIcon()
+{
+    HbIconItem icon;
+    icon.hide();
+
+    BubbleUtils::setCipheringIcon(
+        BubbleManagerIF::Incoming, BubbleManagerIF::NoCiphering, icon);
+    QVERIFY(icon.iconName()=="qtg_mono_ciphering_off");
+    QVERIFY(icon.isVisible()==true);
+
+    BubbleUtils::setCipheringIcon(
+        BubbleManagerIF::Incoming, BubbleManagerIF::Normal, icon);
+    QVERIFY(icon.iconName()=="");
+    QVERIFY(icon.isVisible()==false);
 }
 
 BUBBLE_TEST_MAIN(ut_BubbleUtils)