@@ -57,8 +65,10 @@ - - + + + + diff -r 6b911d05207e -r bc5a64e5bc3c phoneuis/bubblemanager2/bubblecore/xml/bubble_layout_5.docml --- a/phoneuis/bubblemanager2/bubblecore/xml/bubble_layout_5.docml Wed Jun 23 18:12:20 2010 +0300 +++ b/phoneuis/bubblemanager2/bubblecore/xml/bubble_layout_5.docml Tue Jul 06 14:15:47 2010 +0300 @@ -27,8 +27,8 @@

- - + +

diff -r 6b911d05207e -r bc5a64e5bc3c phoneuis/bubblemanager2/bubblecore/xml/bubbleheadingwidget.css --- a/phoneuis/bubblemanager2/bubblecore/xml/bubbleheadingwidget.css Wed Jun 23 18:12:20 2010 +0300 +++ b/phoneuis/bubblemanager2/bubblecore/xml/bubbleheadingwidget.css Tue Jul 06 14:15:47 2010 +0300 @@ -5,76 +5,111 @@ layout: three_lines_layout; } +BubbleHeadingWidget[layoutOption="three_lines_1"] +{ + layout: three_lines_layout_1; +} + +BubbleHeadingWidget[layoutOption="three_lines_2"] +{ + layout: three_lines_layout_2; +} + BubbleHeadingWidget[layoutOption="two_lines"] { layout: two_lines_layout; } +BubbleHeadingWidget[layoutOption="two_lines_1"] +{ + layout: two_lines_layout_1; +} + +BubbleHeadingWidget[layoutOption="two_lines_2"] +{ + layout: two_lines_layout_2; +} + + BubbleHeadingWidget[layoutOption="one_line"] { layout: one_line_layout; } +BubbleHeadingWidget[layoutOption="one_line_1"] +{ + layout: one_line_layout_1; +} + +BubbleHeadingWidget[layoutOption="one_line_2"] +{ + layout: one_line_layout_2; +} + BubbleHeadingWidget:text_line_1 { text-height: var(hb-param-text-height-primary); - left: -var(hb-param-margin-gene-middle-horizontal); color: var(qtc_list_item_title_normal); text-line-count-min:1; text-line-count-max:1; } -BubbleHeadingWidget:text_line_2[layoutOption!="one_line"] +BubbleHeadingWidget:text_line_2 { text-height: var(hb-param-text-height-primary); - pref-width: -1; - left: -var(hb-param-margin-gene-middle-horizontal); - top: -var(hb-param-margin-gene-middle-vertical); text-align: left; color: var(qtc_list_item_title_normal); text-line-count-min:1; text-line-count-max:1; - size-policy-horizontal: expanding; + pref-width: -1; + top: -var(hb-param-margin-gene-middle-vertical); + text-align: left; + size-policy-horizontal: expanding; } BubbleHeadingWidget:text_line_2[layoutOption="one_line"] { - text-height: var(hb-param-text-height-primary); pref-width: 35un; /* not in spec yet, fixed value needed for localisation */ left: -var(hb-param-margin-gene-middle-horizontal); text-align: right; - color: var(qtc_list_item_title_normal); - text-line-count-min:1; - text-line-count-max:1; + size-policy-horizontal: fixed; +} + +BubbleHeadingWidget:text_line_2[layoutOption="one_line_1"] +{ + pref-width: 35un; + left: -var(hb-param-margin-gene-middle-horizontal); + text-align: right; + size-policy-horizontal: fixed; +} + +BubbleHeadingWidget:text_line_2[layoutOption="one_line_2"] +{ + pref-width: 35un; + left: -var(hb-param-margin-gene-middle-horizontal); + text-align: right; size-policy-horizontal: fixed; } BubbleHeadingWidget:text_line_3 { text-height: var(hb-param-text-height-primary); - left: -var(hb-param-margin-gene-middle-horizontal); top: -var(hb-param-margin-gene-middle-vertical); color: var(qtc_list_item_title_normal); text-line-count-min:1; text-line-count-max:1; } -BubbleHeadingWidget:status_icon -{ - fixed-width: var(hb-param-graphic-size-primary-large); - fixed-height: var(hb-param-graphic-size-primary-large); -} - -BubbleHeadingWidget:number_type_icon +BubbleHeadingWidget:indicator_icon_1 { fixed-height: var(hb-param-graphic-size-secondary); fixed-width: var(hb-param-graphic-size-secondary); color: var(qtc_list_item_title_normal); } -BubbleHeadingWidget:ciphering_icon +BubbleHeadingWidget:indicator_icon_2 { - fixed-height: 2.5un; - fixed-width: 2.5un; + fixed-height: var(hb-param-graphic-size-secondary); + fixed-width: var(hb-param-graphic-size-secondary); color: var(qtc_list_item_title_normal); } diff -r 6b911d05207e -r bc5a64e5bc3c phoneuis/bubblemanager2/bubblecore/xml/bubbleheadingwidget.widgetml --- a/phoneuis/bubblemanager2/bubblecore/xml/bubbleheadingwidget.widgetml Wed Jun 23 18:12:20 2010 +0300 +++ b/phoneuis/bubblemanager2/bubblecore/xml/bubbleheadingwidget.widgetml Tue Jul 06 14:15:47 2010 +0300 @@ -1,63 +1,136 @@ - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + - - - - - - - - - - + - + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 6b911d05207e -r bc5a64e5bc3c phoneuis/bubblemanager2/bubblecore/xml/bubbleparticipantlistbuttons.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneuis/bubblemanager2/bubblecore/xml/bubbleparticipantlistbuttons.css Tue Jul 06 14:15:47 2010 +0300 @@ -0,0 +1,12 @@ + +BubbleParticipantListButtons{ + layout:default; +} + +BubbleParticipantListButtons::button-1 { + fixed-height: 7.5un; +} + +BubbleParticipantListButtons::button-2 { + fixed-height: 7.5un; +} diff -r 6b911d05207e -r bc5a64e5bc3c phoneuis/bubblemanager2/bubblecore/xml/bubbleparticipantlistbuttons.widgetml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneuis/bubblemanager2/bubblecore/xml/bubbleparticipantlistbuttons.widgetml Tue Jul 06 14:15:47 2010 +0300 @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 6b911d05207e -r bc5a64e5bc3c phoneuis/bubblemanager2/bubblecore/xml/bubbleparticipantlistitem.css --- a/phoneuis/bubblemanager2/bubblecore/xml/bubbleparticipantlistitem.css Wed Jun 23 18:12:20 2010 +0300 +++ b/phoneuis/bubblemanager2/bubblecore/xml/bubbleparticipantlistitem.css Tue Jul 06 14:15:47 2010 +0300 @@ -1,44 +1,4 @@ -BubbleParticipantListItem[layoutOption="collapsed"] { - layout:collapsed; -} - -BubbleParticipantListItem[layoutOption="expanded"] { - layout:expanded; -} - -BubbleParticipantListItem::icon { - fixed-width: var(hb-param-graphic-size-primary-medium); - fixed-height: var(hb-param-graphic-size-primary-medium); -} - -BubbleParticipantListItem::ciphering { - fixed-width: 2.0un; - fixed-height: 2.0un; - left: (hb-param-margin-gene-middle-horizontal); - top: (hb-param-margin-gene-middle-vertical); - color: var(qtc_list_item_title_normal); +BubbleParticipantListItem{ + layout:default; } - -BubbleParticipantListItem::expand-indi { - fixed-width: var(hb-param-graphic-size-primary-small); - fixed-height: var(hb-param-graphic-size-primary-small); - right: var(hb-param-margin-gene-middle-horizontal); -} - -BubbleParticipantListItem::text -{ - text-height: var(hb-param-text-height-primary); - font-variant: primary; - color: var(qtc_list_item_title_normal); - left: var(hb-param-margin-gene-middle-horizontal); - right: var(hb-param-margin-gene-middle-horizontal); -} - -BubbleParticipantListItem::button-1 { - fixed-height: 9.0un; -} - -BubbleParticipantListItem::button-2 { - fixed-height: 9.0un; -} diff -r 6b911d05207e -r bc5a64e5bc3c phoneuis/bubblemanager2/bubblecore/xml/bubbleparticipantlistitem.widgetml --- a/phoneuis/bubblemanager2/bubblecore/xml/bubbleparticipantlistitem.widgetml Wed Jun 23 18:12:20 2010 +0300 +++ b/phoneuis/bubblemanager2/bubblecore/xml/bubbleparticipantlistitem.widgetml Tue Jul 06 14:15:47 2010 +0300 @@ -1,50 +1,14 @@ - - - - - - + - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 6b911d05207e -r bc5a64e5bc3c phoneuis/bubblemanager2/inc/bubblemanager2.h --- a/phoneuis/bubblemanager2/inc/bubblemanager2.h Wed Jun 23 18:12:20 2010 +0300 +++ b/phoneuis/bubblemanager2/inc/bubblemanager2.h Tue Jul 06 14:15:47 2010 +0300 @@ -344,6 +344,7 @@ void findNextDrawableHeader(int& index) const; void polishEvent(); void releaseImageIfNotUsed(const QString& imageFileName); + void releaseNonCachedViews(); private slots: void showExpanded( int bubbleId ); diff -r 6b911d05207e -r bc5a64e5bc3c phoneuis/bubblemanager2/tsrc/bubbletest2/bubbletestview.cpp --- a/phoneuis/bubblemanager2/tsrc/bubbletest2/bubbletestview.cpp Wed Jun 23 18:12:20 2010 +0300 +++ b/phoneuis/bubblemanager2/tsrc/bubbletest2/bubbletestview.cpp Tue Jul 06 14:15:47 2010 +0300 @@ -317,7 +317,7 @@ if (mCallTimer->isChecked()) { bubbleManager().setCallTime( mConfBubbleId, "0:00" ); } - bubbleManager().addAction(mConfBubbleId, mHold); + bubbleManager().addAction(mConfBubbleId, mMute); bubbleManager().addAction(mConfBubbleId, mEndConference); bubbleManager().clearParticipantListActions(); bubbleManager().addParticipantListAction(mPrivate); @@ -455,10 +455,8 @@ if ( mContactName->isChecked() ) { bubbleManager().setCli(bubble, "Gloria Andersson", Qt::ElideRight); bubbleManager().setSecondaryCli( bubble, "+35850123456789" ); - mPhoneNumber.clear(); } else { - mPhoneNumber.append("+35850123456789"); - bubbleManager().setCli(bubble, mPhoneNumber, Qt::ElideRight); + bubbleManager().setCli(bubble, "+35850123456789", Qt::ElideRight); } setCallObject(bubble, ":resources/contactpic.jpg"); @@ -479,14 +477,13 @@ bubbleManager().setCli(bubble, "John Doe", Qt::ElideRight); bubbleManager().setSecondaryCli(bubble, "+35840987654321"); } - mPhoneNumber.clear(); } else { if (callCount()==2) { - mPhoneNumber.append("+35850232323232"); + bubbleManager().setCli(bubble, "+35850232323232", Qt::ElideRight); } else { - mPhoneNumber.append("+35840987654321"); + bubbleManager().setCli(bubble, "+35840987654321", Qt::ElideRight); } - bubbleManager().setCli(bubble, mPhoneNumber, Qt::ElideRight); + } setCallObject(bubble, ":resources/contactpic3.png"); bubbleManager().setNumberType(bubble, BubbleManager::Mobile); @@ -507,10 +504,8 @@ if ( mContactName->isChecked() ) { bubbleManager().setCli( bubble, "Bart Simpson", Qt::ElideRight ); bubbleManager().setSecondaryCli( bubble, "+35890987654321" ); - mPhoneNumber.clear(); } else { - mPhoneNumber.append("+35890987654321"); - bubbleManager().setCli( bubble, mPhoneNumber, Qt::ElideRight ); + bubbleManager().setCli( bubble, "+35890987654321", Qt::ElideRight ); } setCallObject(bubble, ":resources/contactpic2.jpg"); bubbleManager().setLabel( bubble, "Calling", Qt::ElideRight ); @@ -520,16 +515,6 @@ case BubbleManager::Alerting: { - if ( mPhoneNumber.length() ) { - QString cli("Call %1"); - QString index; - index.setNum(bubble+1); - cli = cli.arg(index); - bubbleManager().setCli( bubble, cli, Qt::ElideRight ); - bubbleManager().setSecondaryCli( bubble, mPhoneNumber ); - mPhoneNumber.clear(); - } - if ( mEmergencyCall->isChecked() ) { bubbleManager().setCli( bubble, "Emergency call", Qt::ElideRight ); } @@ -538,16 +523,6 @@ case BubbleManager::Active: { - if ( mPhoneNumber.length() && bubble!=mConfBubbleId ) { - QString cli("Call %1"); - QString index; - index.setNum(bubble+1); - cli = cli.arg(index); - bubbleManager().setCli( bubble, cli, Qt::ElideRight ); - bubbleManager().setSecondaryCli( bubble, mPhoneNumber ); - mPhoneNumber.clear(); - } - if ( mCallTimer->isChecked() ) { bubbleManager().setCallTime( bubble, "0:00" ); } @@ -585,27 +560,8 @@ void BubbleTestView::setBubbleActions(int bubble, BubbleManagerIF::PhoneCallState state ) { if (bubble==mConfBubbleId) { - // check, if all call are in conference - bool swapButton = false; - QListIterator calls(mCalls); - while(calls.hasNext()) { - TestCall call = calls.next(); - if (!call.isConf && !call.isInConf) { - swapButton = true; - } - } - bubbleManager().clearActions(bubble); - - if (swapButton) { - bubbleManager().addAction(bubble, mSwap); - } else { - if (state == BubbleManager::OnHold) - bubbleManager().addAction(bubble, mUnhold); - else - bubbleManager().addAction(bubble, mHold); - } - + bubbleManager().addAction(bubble, mMute); bubbleManager().addAction(bubble, mEndConference); return; } @@ -627,31 +583,27 @@ case BubbleManager::Outgoing: case BubbleManager::Alerting: // flow through { + bubbleManager().addAction( bubble, mMute ); bubbleManager().addAction( bubble, mEndCall ); break; } case BubbleManager::OnHold: { - bubbleManager().addAction( bubble, mUnhold ); + if (mMuted) { + bubbleManager().addAction( bubble, mUnmute ); + } else { + bubbleManager().addAction( bubble, mMute ); + } bubbleManager().addAction( bubble, mEndCall ); } break; default: // Active call { - HbAction* action; - - if (!mEmergencyCall->isChecked()) { - int i; - if ( (mCalls.count()>1 && !callIndexByState(BubbleManagerIF::Waiting,i)) - || (mCalls.count()> 1 && mProvideJoin) ) { - action = mJoin; - } else { - action = mHold; - } - - bubbleManager().addAction( bubble, action ); + if (mMuted) { + bubbleManager().addAction( bubble, mUnmute ); + } else { + bubbleManager().addAction( bubble, mMute ); } - bubbleManager().addAction( bubble, mEndCall ); break; } @@ -744,7 +696,17 @@ void BubbleTestView::setMuted() { mMuted = !mMuted; - updateToolBarActions(); + int bubble = bubbleManager().expandedBubble(); + QListIterator calls(mCalls); + while (calls.hasNext()) { + TestCall call = calls.next(); + if (call.bubbleId==bubble) { + bubbleManager().startChanges(); + setBubbleActions(bubble, (BubbleManagerIF::PhoneCallState)call.callState); + bubbleManager().endChanges(); + } + } + bubbleManager().setPhoneMuted( mMuted ); setFocus(); // hack because toolbar steals the focus } @@ -776,13 +738,17 @@ mCalls.removeAt(i); mConfBubbleId = -1; callIndexByBubbleId(selection,i); - int held = (i==0) ? 1 : 0; + int held = (i==0) ? 1 : 0; // ?? setBubbleActions(selection,BubbleManagerIF::Active); setBubbleData(selection,BubbleManagerIF::Active); setBubbleActions(held,BubbleManagerIF::OnHold); setBubbleData(held,BubbleManagerIF::OnHold); - mCalls[0].isInConf = false; - mCalls[1].isInConf = false; + mCalls[i].isInConf = false; + mCalls[i].callState = BubbleManagerIF::Active; + int callId; + callIndexByBubbleId(held, callId); + mCalls[callId].callState = BubbleManagerIF::OnHold; + mCalls[callId].isInConf = false; setExpandActions(); } bubbleManager().endChanges(); @@ -849,6 +815,7 @@ // not connected to anywhere mActivateLoudspeaker = new HbAction(HbIcon("qtg_mono_speaker"), "", this); + connect( mActivateLoudspeaker, SIGNAL(triggered()), this, SLOT(createIncomingCall()), Qt::QueuedConnection ); mActivateHandset = new HbAction(HbIcon("qtg_mono_mobile"), "", this); mSendMessage = new HbAction(HbIcon("qtg_mono_send"), "", this); mSilence = new HbAction(HbIcon("qtg_mono_speaker_off"), "", this); @@ -898,54 +865,61 @@ toolBar()->addAction(mSendMessage); toolBar()->addAction(mSilence); } else { + toolBar()->addAction(mActivateLoudspeaker); + + if (callCount()==1) { + toolBar()->addAction(mHold); + } else { + toolBar()->addAction(mSwap); + } + + if (callCount()==1) { + toolBar()->addAction(mOpenContacts); + } else { + toolBar()->addAction(mJoin); + } + toolBar()->addAction(mOpenDialer); - if (!mMuted) { - toolBar()->addAction(mMute); - } else if (mMuted) { - toolBar()->addAction(mUnmute); - } - toolBar()->addAction(mActivateLoudspeaker); - toolBar()->addAction(mOpenContacts); } } void BubbleTestView::createBubbleActions() { - mAnswer = new HbAction( HbIcon("qtg_mono_call"),"Answer", this); + mAnswer = new HbAction( HbIcon("qtg_mono_call"),QString(), this); mAnswer->setSoftKeyRole(QAction::PositiveSoftKey); connect( mAnswer, SIGNAL( triggered() ), this, SLOT( answerCall() ) ); - mReject= new HbAction( HbIcon("qtg_mono_reject_call"),"Reject", this); + mReject= new HbAction( HbIcon("qtg_mono_reject_call"),QString(), this); mReject->setSoftKeyRole(QAction::NegativeSoftKey); connect( mReject, SIGNAL( triggered() ), this, SLOT( rejectCall() ) ); - mHold = new HbAction( HbIcon("qtg_mono_hold_call"),"Hold", this); + mHold = new HbAction( HbIcon("qtg_mono_hold_call"),QString(), this); connect( mHold, SIGNAL( triggered() ), this, SLOT( toggleHold() ) ); - mUnhold = new HbAction( HbIcon("qtg_mono_call"),"Activate", this); + mUnhold = new HbAction( HbIcon("qtg_mono_call"),QString(), this); connect( mUnhold, SIGNAL( triggered() ), this, SLOT( toggleHold() ) ); - mSwap = new HbAction( HbIcon("qtg_mono_hold_call"),"Swap", this); + mSwap = new HbAction( HbIcon("qtg_mono_hold_call"),QString(), this); connect( mSwap, SIGNAL( triggered() ), this, SLOT( toggleHold() ) ); - mEndCall = new HbAction(HbIcon("qtg_mono_end_call"),"End call", this); + mEndCall = new HbAction(HbIcon("qtg_mono_end_call"),QString(), this); mEndCall->setSoftKeyRole(QAction::NegativeSoftKey); connect( mEndCall, SIGNAL( triggered() ), this, SLOT( endCall() ) ); - mEndConference = new HbAction(HbIcon("qtg_mono_end_all_call"),"End conference", this); + mEndConference = new HbAction(HbIcon("qtg_mono_end_call"),QString(), this); mEndConference->setSoftKeyRole(QAction::NegativeSoftKey); connect( mEndConference, SIGNAL( triggered() ), this, SLOT( endConferenceCall() ) ); - mJoin = new HbAction(HbIcon("qtg_mono_join_call"),"Join", this); + mJoin = new HbAction(HbIcon("qtg_mono_join_call"),QString(), this); connect( mJoin, SIGNAL( triggered() ), this, SLOT(joinToConference()) ); - mPrivate = new HbAction(HbIcon("qtg_mono_private_call"),"Private", this); + mPrivate = new HbAction(HbIcon("qtg_mono_private_call"),QString(), this); connect( mPrivate, SIGNAL( triggered() ), this, SLOT(handlePrivate()) ); - mDrop = new HbAction(HbIcon("qtg_mono_drop_call"),"Drop", this); + mDrop = new HbAction(HbIcon("qtg_mono_drop_call"),QString(), this); connect( mDrop, SIGNAL( triggered() ), this, SLOT(handleDrop()) ); - mReplace = new HbAction(HbIcon("qtg_mono_replace_call"),"Replace", this); + mReplace = new HbAction(HbIcon("qtg_mono_replace_call"),QString(), this); connect( mReplace, SIGNAL( triggered() ), this, SLOT(replaceActiveCall()) ); mUpdateUiControls = new HbAction(QString(), this); @@ -1026,13 +1000,13 @@ callIndexByBubbleId(mConfBubbleId, i); BubbleManagerIF::PhoneCallState confState = (BubbleManagerIF::PhoneCallState)mCalls[i].callState; - qDebug() << "toggleConferenceHoldDelayed state:" << confState; + // qDebug() << "toggleConferenceHoldDelayed state:" << confState; QListIterator calls(mCalls); int j=0; while(calls.hasNext()) { TestCall call = calls.next(); - qDebug() << "toggleConferenceHoldDelayed callState:" << call.callState; + // qDebug() << "toggleConferenceHoldDelayed callState:" << call.callState; if (call.isInConf && call.callState!=confState) { bubbleManager().startChanges(); setBubbleData(call.bubbleId, confState); diff -r 6b911d05207e -r bc5a64e5bc3c phoneuis/bubblemanager2/tsrc/bubbletest2/bubbletestview.h --- a/phoneuis/bubblemanager2/tsrc/bubbletest2/bubbletestview.h Wed Jun 23 18:12:20 2010 +0300 +++ b/phoneuis/bubblemanager2/tsrc/bubbletest2/bubbletestview.h Tue Jul 06 14:15:47 2010 +0300 @@ -137,7 +137,6 @@ HbAction *mConnectTester; QMap mTestBubbleIds; - QString mPhoneNumber; int mConfBubbleId; bool mProvideJoin; }; diff -r 6b911d05207e -r bc5a64e5bc3c phoneuis/bubblemanager2/tsrc/unit/mt_bubblemanager2/mt_bubblemanager2.cpp --- a/phoneuis/bubblemanager2/tsrc/unit/mt_bubblemanager2/mt_bubblemanager2.cpp Wed Jun 23 18:12:20 2010 +0300 +++ b/phoneuis/bubblemanager2/tsrc/unit/mt_bubblemanager2/mt_bubblemanager2.cpp Tue Jul 06 14:15:47 2010 +0300 @@ -410,7 +410,7 @@ mouseClickWidgetAction("eb:leftButton",&action8); mouseClickWidgetAction("eb:rightButton",&action5); - // try to click conference list + // click conference list QTest::mouseClick(mainWindow->viewport(),Qt::LeftButton,0,QPoint(100,100)); QTest::qWait( 2*WAIT_TIME ); diff -r 6b911d05207e -r bc5a64e5bc3c phoneuis/bubblemanager2/tsrc/unit/runall.cmd --- a/phoneuis/bubblemanager2/tsrc/unit/runall.cmd Wed Jun 23 18:12:20 2010 +0300 +++ b/phoneuis/bubblemanager2/tsrc/unit/runall.cmd Tue Jul 06 14:15:47 2010 +0300 @@ -25,6 +25,7 @@ call runtest.cmd ut_bubbleheadingwidget call runtest.cmd ut_bubbleimagewidget call runtest.cmd ut_bubbleparticipantlistitem +call runtest.cmd ut_bubblebutton rem call runtest.cmd mt_bubblemanager2 ) @@ -38,6 +39,7 @@ call runtest_w32.cmd ut_bubbleheadingwidget call runtest_w32.cmd ut_bubbleimagewidget call runtest_w32.cmd ut_bubbleparticipantlistitem +call runtest_w32.cmd ut_bubblebutton rem call runtest_w32.cmd mt_bubblemanager2 ) diff -r 6b911d05207e -r bc5a64e5bc3c phoneuis/bubblemanager2/tsrc/unit/unit.pro --- a/phoneuis/bubblemanager2/tsrc/unit/unit.pro Wed Jun 23 18:12:20 2010 +0300 +++ b/phoneuis/bubblemanager2/tsrc/unit/unit.pro Tue Jul 06 14:15:47 2010 +0300 @@ -26,4 +26,5 @@ SUBDIRS += ut_bubbleimagewidget SUBDIRS += ut_bubbleparticipantlistitem SUBDIRS += ut_bubbleeffecthandler +SUBDIRS += ut_bubblebutton SUBDIRS += mt_bubblemanager2 diff -r 6b911d05207e -r bc5a64e5bc3c phoneuis/bubblemanager2/tsrc/unit/ut_bubblebutton/resources/qtg_mono_call.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneuis/bubblemanager2/tsrc/unit/ut_bubblebutton/resources/qtg_mono_call.svg Tue Jul 06 14:15:47 2010 +0300 @@ -0,0 +1,6 @@ + + + diff -r 6b911d05207e -r bc5a64e5bc3c phoneuis/bubblemanager2/tsrc/unit/ut_bubblebutton/ut_bubblebutton.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneuis/bubblemanager2/tsrc/unit/ut_bubblebutton/ut_bubblebutton.cpp Tue Jul 06 14:15:47 2010 +0300 @@ -0,0 +1,158 @@ +/*! +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#include +#include + +#include +#include +#include +#include +#include +#include + +#include "bubbletest.h" +#include "bubblebutton.h" + +class TestBubbleButton : public BubbleButton +{ +public: + TestBubbleButton() {}; + ~TestBubbleButton() {}; + + bool testSceneEvent(QEvent *event) { return BubbleButton::sceneEvent(event); }; +}; + +class ut_BubbleButton : public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + void cleanupTestCase(); + + void testButtonType(); + void testUpdatePrimitives(); + void testSceneEvent(); + +private: + TestBubbleButton *mButton; +}; + +void ut_BubbleButton::initTestCase() +{ + mButton = new TestBubbleButton(); + mButton->setIcon(HbIcon(":/resources/qtg_mono_call.svg")); +} + +void ut_BubbleButton::cleanupTestCase() +{ + delete mButton; +} + +void ut_BubbleButton::testButtonType() +{ + QVERIFY(mButton->buttonType()==BubbleButton::DefaultButton); + mButton->setButtonType(BubbleButton::GreenButton); + QVERIFY(mButton->buttonType()==BubbleButton::GreenButton); + mButton->setButtonType(BubbleButton::RedButton); + QVERIFY(mButton->buttonType()==BubbleButton::RedButton); +} + +void ut_BubbleButton::testUpdatePrimitives() +{ + // function button + HbFrameItem* frame = + qgraphicsitem_cast( + static_cast(mButton)->primitive("background")); + QVERIFY(frame); + + HbIconItem* icon = + qgraphicsitem_cast( + static_cast(mButton)->primitive("icon")); + QVERIFY(icon); + + QColor iconColor; + + mButton->setVisible(false); + mButton->setButtonType(BubbleButton::DefaultButton); + mButton->setVisible(true); + + QVERIFY(frame->frameDrawer().frameGraphicsName()!="qtg_fr_btn_green_normal"); + QVERIFY(frame->frameDrawer().frameGraphicsName()!="qtg_fr_btn_green_normal"); + iconColor = HbColorScheme::color("qtc_button_normal"); + QVERIFY(icon->color()==iconColor); + mButton->setDown(true); + QVERIFY(frame->frameDrawer().frameGraphicsName()!="qtg_fr_btn_green_pressed"); + QVERIFY(frame->frameDrawer().frameGraphicsName()!="qtg_fr_btn_green_pressed"); + iconColor = HbColorScheme::color("qtc_button_pressed"); + QVERIFY(icon->color()==iconColor); + + + mButton->setDown(false); + mButton->setVisible(false); + mButton->setButtonType(BubbleButton::RedButton); + mButton->setVisible(true); + + QVERIFY(frame->frameDrawer().frameGraphicsName()=="qtg_fr_btn_red_normal"); + iconColor = HbColorScheme::color("qtc_callhandling_reject_normal"); + QVERIFY(icon->color()==iconColor); + mButton->setDown(true); + QVERIFY(frame->frameDrawer().frameGraphicsName()=="qtg_fr_btn_red_pressed"); + iconColor = HbColorScheme::color("qtc_callhandling_reject_pressed"); + QVERIFY(icon->color()==iconColor); + + mButton->setDown(false); + mButton->setVisible(false); + mButton->setButtonType(BubbleButton::GreenButton); + mButton->setVisible(true); + + QVERIFY(frame->frameDrawer().frameGraphicsName()=="qtg_fr_btn_green_normal"); + iconColor = HbColorScheme::color("qtc_callhandling_answer_normal"); + QVERIFY(icon->color()==iconColor); + mButton->setDown(true); + QVERIFY(frame->frameDrawer().frameGraphicsName()=="qtg_fr_btn_green_pressed"); + iconColor = HbColorScheme::color("qtc_callhandling_answer_pressed"); + QVERIFY(icon->color()==iconColor); +} + +void ut_BubbleButton::testSceneEvent() +{ + QEvent event(QEvent::UngrabMouse); + QSignalSpy spy( mButton, SIGNAL( clicked()) ); + QSignalSpy spy2( mButton, SIGNAL( released()) ); + mButton->setVisible(false); + mButton->setDown(false); + mButton->testSceneEvent(&event); + QVERIFY(spy.count()==0); + QVERIFY(spy2.count()==0); + + QEvent eventNone(QEvent::None); + mButton->testSceneEvent(&eventNone); + QVERIFY(spy.count()==0); + QVERIFY(spy2.count()==0); + + mButton->setVisible(true); + mButton->setDown(true); + mButton->testSceneEvent(&event); + QVERIFY(spy.count()==1); + QVERIFY(spy2.count()==1); + QVERIFY(mButton->isDown()==false); +} + +BUBBLE_TEST_MAIN(ut_BubbleButton) +#include "ut_bubblebutton.moc" diff -r 6b911d05207e -r bc5a64e5bc3c phoneuis/bubblemanager2/tsrc/unit/ut_bubblebutton/ut_bubblebutton.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneuis/bubblemanager2/tsrc/unit/ut_bubblebutton/ut_bubblebutton.pro Tue Jul 06 14:15:47 2010 +0300 @@ -0,0 +1,36 @@ +# +# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# +# + +TEMPLATE = app +TARGET = +DEPENDPATH += . ../../../bubblecore/src +INCLUDEPATH += . ../../../bubblecore/src ../../../inc ../shared +CONFIG += hb qtestlib + +symbian { + INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE +} else:win32 { + DESTDIR = ./ +} + +RESOURCES += ut_bubblebutton.qrc + +HEADERS += ../../../bubblecore/src/bubblebutton.h + +SOURCES += ut_bubblebutton.cpp \ + ../../../bubblecore/src/bubblebutton.cpp + diff -r 6b911d05207e -r bc5a64e5bc3c phoneuis/bubblemanager2/tsrc/unit/ut_bubblebutton/ut_bubblebutton.qrc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneuis/bubblemanager2/tsrc/unit/ut_bubblebutton/ut_bubblebutton.qrc Tue Jul 06 14:15:47 2010 +0300 @@ -0,0 +1,5 @@ + + + resources/qtg_mono_call.svg + + diff -r 6b911d05207e -r bc5a64e5bc3c phoneuis/bubblemanager2/tsrc/unit/ut_bubblecontainerwidget/ut_bubblecontainerwidget.cpp --- a/phoneuis/bubblemanager2/tsrc/unit/ut_bubblecontainerwidget/ut_bubblecontainerwidget.cpp Wed Jun 23 18:12:20 2010 +0300 +++ b/phoneuis/bubblemanager2/tsrc/unit/ut_bubblecontainerwidget/ut_bubblecontainerwidget.cpp Tue Jul 06 14:15:47 2010 +0300 @@ -24,10 +24,21 @@ #include #include #include +#include #include "bubbletest.h" #include "bubblecontainerwidget.h" +class TestBubbleContainerWidget : public BubbleContainerWidget +{ +public: + TestBubbleContainerWidget() {}; + ~TestBubbleContainerWidget() {}; + + void testMouseMove(QGraphicsSceneMouseEvent *event) + { BubbleContainerWidget::mouseMoveEvent(event); }; +}; + class ut_BubbleContainerWidget : public QObject { Q_OBJECT @@ -41,17 +52,22 @@ void testMouseMove(); private: - BubbleContainerWidget* mContainer; + TestBubbleContainerWidget* mContainer; HbMainWindow* mMainWindow; - int mStyleBaseId; }; void ut_BubbleContainerWidget::initTestCase() { mMainWindow = new HbMainWindow(); - mContainer = new BubbleContainerWidget(); + mContainer = new TestBubbleContainerWidget(); mMainWindow->addView(mContainer); mMainWindow->show(); + + HbFrameItem* frame = + qgraphicsitem_cast( + static_cast(mContainer)->primitive("background")); + QVERIFY(frame->frameDrawer().frameGraphicsName()=="qtg_fr_list_normal"); + QVERIFY(frame->isVisible()==false); } void ut_BubbleContainerWidget::cleanupTestCase() @@ -90,11 +106,36 @@ QPointF clickPos = mContainer->scenePos() + mContainer->rect().center(); QPoint windowPos = mMainWindow->mapFromScene( clickPos ); - QPoint windowPos2 = windowPos+QPoint(10,10); + + // move within + QTest::mousePress( mMainWindow->viewport(), Qt::LeftButton, 0, windowPos, 100 ); // QTest::mouseMove() doesn't work - QTest::mouseMove( mMainWindow->viewport(), windowPos2 ); - QCOMPARE( spy.count(), 0 ); + QGraphicsSceneMouseEvent moveEvent(QEvent::MouseMove); + moveEvent.setButtons(Qt::LeftButton); + moveEvent.setPos(windowPos-QPointF(1,1)); + mContainer->testMouseMove(&moveEvent); + + QTest::mouseRelease( mMainWindow->viewport(), Qt::LeftButton, 0, windowPos, 100 ); + QCOMPARE( spy.count(), 1 ); + + + // move out + QTest::mousePress( mMainWindow->viewport(), Qt::LeftButton, 0, windowPos, 100 ); + moveEvent.setPos(QPointF(-10,-10)); + mContainer->testMouseMove(&moveEvent); + + QTest::mouseRelease( mMainWindow->viewport(), Qt::LeftButton, 0, windowPos, 100 ); + QCOMPARE( spy.count(), 1 ); + + // move in + QTest::mousePress( mMainWindow->viewport(), Qt::LeftButton, 0, QPoint(1,1), 100 ); + moveEvent.setPos(QPointF(windowPos)); + mContainer->testMouseMove(&moveEvent); + + QTest::mouseRelease( mMainWindow->viewport(), Qt::LeftButton, 0, windowPos, 100 ); + QCOMPARE( spy.count(), 1 ); + } BUBBLE_TEST_MAIN(ut_BubbleContainerWidget) diff -r 6b911d05207e -r bc5a64e5bc3c phoneuis/bubblemanager2/tsrc/unit/ut_bubbleeffecthandler/ut_bubbleeffecthandler.cpp --- a/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleeffecthandler/ut_bubbleeffecthandler.cpp Wed Jun 23 18:12:20 2010 +0300 +++ b/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleeffecthandler/ut_bubbleeffecthandler.cpp Tue Jul 06 14:15:47 2010 +0300 @@ -64,6 +64,7 @@ void testMuteAppearEffect(); void testMuteDisappearEffect(); + void testCancelAllEffects(); private: HbMainWindow* mWindow; @@ -118,5 +119,22 @@ mEffectHandler->removeEffect(mContainer->mLabel,BubbleMutedDisappear); } +void ut_BubbleEffectHandler::testCancelAllEffects() +{ + QVERIFY(mContainer->mLabel->isVisible()==false); + QTest::qWait(500); + + mContainer->mLabel->setPlainText("Appearing"); + + mEffectHandler->addEffect(mContainer->mLabel,BubbleMutedAppear); + mEffectHandler->startEffect(BubbleMutedAppear); + QTest::qWait(100); + QVERIFY(HbEffect::effectRunning(mContainer->mLabel)); + mEffectHandler->cancelAllEffects(mContainer->mLabel); + QVERIFY(!HbEffect::effectRunning(mContainer->mLabel)); + + mEffectHandler->removeEffect(mContainer->mLabel,BubbleMutedAppear); +} + BUBBLE_TEST_MAIN(ut_BubbleEffectHandler) #include "ut_bubbleeffecthandler.moc" diff -r 6b911d05207e -r bc5a64e5bc3c phoneuis/bubblemanager2/tsrc/unit/ut_bubbleheadingwidget/resources/bubbleheadingwidget.css --- a/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleheadingwidget/resources/bubbleheadingwidget.css Wed Jun 23 18:12:20 2010 +0300 +++ b/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleheadingwidget/resources/bubbleheadingwidget.css Tue Jul 06 14:15:47 2010 +0300 @@ -5,66 +5,111 @@ layout: three_lines_layout; } +BubbleHeadingWidget[layoutOption="three_lines_1"] +{ + layout: three_lines_layout_1; +} + +BubbleHeadingWidget[layoutOption="three_lines_2"] +{ + layout: three_lines_layout_2; +} + BubbleHeadingWidget[layoutOption="two_lines"] { layout: two_lines_layout; } +BubbleHeadingWidget[layoutOption="two_lines_1"] +{ + layout: two_lines_layout_1; +} + +BubbleHeadingWidget[layoutOption="two_lines_2"] +{ + layout: two_lines_layout_2; +} + + BubbleHeadingWidget[layoutOption="one_line"] { layout: one_line_layout; } -BubbleHeadingWidget:text_line_1 +BubbleHeadingWidget[layoutOption="one_line_1"] { - preferred-height: var(hb-param-text-height-primary); - left: -var(hb-param-margin-gene-middle-horizontal); - color: var(qtc_list_item_title_normal); + layout: one_line_layout_1; +} + +BubbleHeadingWidget[layoutOption="one_line_2"] +{ + layout: one_line_layout_2; } -BubbleHeadingWidget:text_line_2[layoutOption!="one_line"] +BubbleHeadingWidget:text_line_1 { - preferred-height: var(hb-param-text-height-primary); - preferred-width: -1; - left: -var(hb-param-margin-gene-middle-horizontal); + text-height: var(hb-param-text-height-primary); + color: var(qtc_list_item_title_normal); + text-line-count-min:1; + text-line-count-max:1; +} + +BubbleHeadingWidget:text_line_2 +{ + text-height: var(hb-param-text-height-primary); + text-align: left; + color: var(qtc_list_item_title_normal); + text-line-count-min:1; + text-line-count-max:1; + pref-width: -1; top: -var(hb-param-margin-gene-middle-vertical); text-align: left; - color: var(qtc_list_item_title_normal); + size-policy-horizontal: expanding; } BubbleHeadingWidget:text_line_2[layoutOption="one_line"] { - preferred-height: var(hb-param-text-height-primary); - preferred-width: 30un; + pref-width: 35un; /* not in spec yet, fixed value needed for localisation */ left: -var(hb-param-margin-gene-middle-horizontal); text-align: right; - color: var(qtc_list_item_title_normal); + size-policy-horizontal: fixed; +} + +BubbleHeadingWidget:text_line_2[layoutOption="one_line_1"] +{ + pref-width: 35un; + left: -var(hb-param-margin-gene-middle-horizontal); + text-align: right; + size-policy-horizontal: fixed; +} + +BubbleHeadingWidget:text_line_2[layoutOption="one_line_2"] +{ + pref-width: 35un; + left: -var(hb-param-margin-gene-middle-horizontal); + text-align: right; + size-policy-horizontal: fixed; } BubbleHeadingWidget:text_line_3 { - preferred-height: var(hb-param-text-height-primary); - left: -var(hb-param-margin-gene-middle-horizontal); + text-height: var(hb-param-text-height-primary); top: -var(hb-param-margin-gene-middle-vertical); color: var(qtc_list_item_title_normal); + text-line-count-min:1; + text-line-count-max:1; } -BubbleHeadingWidget:status_icon -{ - fixed-width: var(hb-param-graphic-size-primary-large); - fixed-height: var(hb-param-graphic-size-primary-large); -} - -BubbleHeadingWidget:number_type_icon +BubbleHeadingWidget:indicator_icon_1 { fixed-height: var(hb-param-graphic-size-secondary); fixed-width: var(hb-param-graphic-size-secondary); color: var(qtc_list_item_title_normal); } -BubbleHeadingWidget:ciphering_icon +BubbleHeadingWidget:indicator_icon_2 { - fixed-height: 2.5un; - fixed-width: 2.5un; + fixed-height: var(hb-param-graphic-size-secondary); + fixed-width: var(hb-param-graphic-size-secondary); color: var(qtc_list_item_title_normal); } diff -r 6b911d05207e -r bc5a64e5bc3c phoneuis/bubblemanager2/tsrc/unit/ut_bubbleheadingwidget/resources/bubbleheadingwidget.widgetml --- a/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleheadingwidget/resources/bubbleheadingwidget.widgetml Wed Jun 23 18:12:20 2010 +0300 +++ b/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleheadingwidget/resources/bubbleheadingwidget.widgetml Tue Jul 06 14:15:47 2010 +0300 @@ -1,63 +1,136 @@ - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + - - - - - - - - - - + - + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 6b911d05207e -r bc5a64e5bc3c phoneuis/bubblemanager2/tsrc/unit/ut_bubbleheadingwidget/ut_bubbleheadingwidget.cpp --- a/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleheadingwidget/ut_bubbleheadingwidget.cpp Wed Jun 23 18:12:20 2010 +0300 +++ b/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleheadingwidget/ut_bubbleheadingwidget.cpp Tue Jul 06 14:15:47 2010 +0300 @@ -24,6 +24,8 @@ #include #include #include +#include +#include #include "bubbletest.h" #include "bubbleheadingwidget.h" @@ -46,7 +48,14 @@ private: BubbleHeadingWidget* mHeading; HbMainWindow* mMainWindow; - int mStyleBaseId; + + HbTextItem* mText1; + HbTextItem* mText2; + HbTextItem* mText3; + + HbIconItem* mIndi1; + HbIconItem* mIndi2; + }; void ut_BubbleHeadingWidget::initTestCase() @@ -55,6 +64,23 @@ mHeading = new BubbleHeadingWidget(); mMainWindow->addView(mHeading); mMainWindow->show(); + + mText1 = qgraphicsitem_cast( + static_cast(mHeading)->primitive("text_line_1")); + QVERIFY(mText1); + mText2 = qgraphicsitem_cast( + static_cast(mHeading)->primitive("text_line_2")); + QVERIFY(mText2); + mText3 = qgraphicsitem_cast( + static_cast(mHeading)->primitive("text_line_3")); + QVERIFY(mText3); + + mIndi1 = qgraphicsitem_cast( + static_cast(mHeading)->primitive("indicator_icon_1")); + QVERIFY(mIndi1); + mIndi2 = qgraphicsitem_cast( + static_cast(mHeading)->primitive("indicator_icon_2")); + QVERIFY(mIndi2); } void ut_BubbleHeadingWidget::cleanupTestCase() @@ -70,6 +96,49 @@ void ut_BubbleHeadingWidget::testThreeLinedHeading() { + mHeading->setLineCount(3); + + BubbleHeader header; + header.setCli("John Doe",Qt::ElideRight); + header.setSecondaryCli("12345",Qt::ElideLeft); + header.setText("",Qt::ElideRight); + header.setTimerCost("0:00"); + header.setCallState(BubbleManagerIF::Active); + header.setCallFlag(BubbleManagerIF::NoCiphering); + QVERIFY(mHeading->lineCount()==3); + mHeading->readBubbleHeader(header); + mHeading->show(); + QTest::qWait(200); + QVERIFY(mHeading->layout()=="three_lines_1"); + + QVERIFY(mText1->text()=="John Doe"); + QVERIFY(mText2->text()=="12345"); + QVERIFY(mText2->alignment()&Qt::AlignLeft); + QVERIFY(mText3->text()=="0:00"); + + header.setTimerCost("0:01"); + mHeading->updateTimerDisplayNow(); + QVERIFY(mText3->text()=="0:01"); + + header.setCallState(BubbleManagerIF::Incoming); + header.setCallFlag(BubbleManagerIF::NoCiphering); + header.setCallFlag(BubbleManagerIF::Diverted); + mHeading->readBubbleHeader(header); + mHeading->show(); + QTest::qWait(200); + QVERIFY(mHeading->layout()=="three_lines_2"); + + header.setCallFlags(BubbleManagerIF::Normal); + mHeading->readBubbleHeader(header); + mHeading->show(); + QTest::qWait(200); + QVERIFY(mHeading->layout()=="three_lines"); +} + +void ut_BubbleHeadingWidget::testTwoLinedHeading() +{ + mHeading->setLineCount(2); + BubbleHeader header; header.setCli("John Doe",Qt::ElideRight); header.setSecondaryCli("12345",Qt::ElideLeft); @@ -77,34 +146,41 @@ header.setTimerCost("0:00"); header.setCallState(BubbleManagerIF::Active); header.setCallFlag(BubbleManagerIF::NoCiphering); - mHeading->setLineCount(3); - Q_ASSERT(mHeading->lineCount()==3); + QVERIFY(mHeading->lineCount()==2); mHeading->readBubbleHeader(header); mHeading->show(); - QTest::qWait(1000); - mHeading->updateTimerDisplayNow(); -} + QTest::qWait(200); + QVERIFY(mHeading->layout()=="two_lines_1"); + + QVERIFY(mText1->text()=="John Doe"); + QVERIFY(mText2->text()=="0:00"); + QVERIFY(mText2->alignment()&Qt::AlignLeft); + QVERIFY(!mText3->isVisible()); -void ut_BubbleHeadingWidget::testTwoLinedHeading() -{ - BubbleHeader header; - header.setCli("John Doe",Qt::ElideRight); - header.setSecondaryCli("12345",Qt::ElideLeft); - header.setText("",Qt::ElideRight); - header.setTimerCost("0:00"); - header.setCallState(BubbleManagerIF::Outgoing); + header.setTimerCost("0:01"); + mHeading->updateTimerDisplayNow(); + QVERIFY(mText2->text()=="0:01"); + + header.setCallState(BubbleManagerIF::Incoming); header.setCallFlag(BubbleManagerIF::NoCiphering); - - mHeading->setLineCount(2); - Q_ASSERT(mHeading->lineCount()==2); + header.setCallFlag(BubbleManagerIF::Diverted); mHeading->readBubbleHeader(header); mHeading->show(); - QTest::qWait(100); - mHeading->updateTimerDisplayNow(); + QTest::qWait(200); + QVERIFY(mHeading->layout()=="two_lines_2"); + + header.setCallFlags(BubbleManagerIF::Normal); + mHeading->readBubbleHeader(header); + mHeading->show(); + QTest::qWait(200); + QVERIFY(mHeading->layout()=="two_lines"); + } void ut_BubbleHeadingWidget::testOneLinedHeading() { + mHeading->setLineCount(1); + BubbleHeader header; header.setCli("John Doe",Qt::ElideRight); header.setSecondaryCli("12345",Qt::ElideLeft); @@ -112,14 +188,37 @@ header.setTimerCost("0:00"); header.setCallState(BubbleManagerIF::Active); header.setCallFlag(BubbleManagerIF::NoCiphering); - - mHeading->setLineCount(1); - Q_ASSERT(mHeading->lineCount()==1); - header.setCallState(BubbleManagerIF::OnHold); + QVERIFY(mHeading->lineCount()==1); mHeading->readBubbleHeader(header); mHeading->show(); - QTest::qWait(100); + QTest::qWait(200); + QVERIFY(mHeading->layout()=="one_line_1"); + QVERIFY(mText1->text()=="John Doe"); + QVERIFY(mText2->text()=="0:00"); + QVERIFY(mText2->alignment()&Qt::AlignRight); + QVERIFY(!mText3->isVisible()); + + header.setTimerCost("0:01"); mHeading->updateTimerDisplayNow(); + QVERIFY(mText2->text()=="0:01"); + + header.setCallState(BubbleManagerIF::Incoming); + header.setCallFlag(BubbleManagerIF::NoCiphering); + header.setCallFlag(BubbleManagerIF::Diverted); + mHeading->hide(); + mHeading->readBubbleHeader(header); + mHeading->show(); + QTest::qWait(200); + QVERIFY(mHeading->layout()=="one_line_2"); + QVERIFY(mText2->alignment()&Qt::AlignRight); + + header.setCallFlags(BubbleManagerIF::Normal); + mHeading->hide(); + mHeading->readBubbleHeader(header); + mHeading->show(); + QTest::qWait(200); + QVERIFY(mHeading->layout()=="one_line"); + QVERIFY(mText2->alignment()&Qt::AlignRight); } BUBBLE_TEST_MAIN(ut_BubbleHeadingWidget) diff -r 6b911d05207e -r bc5a64e5bc3c phoneuis/bubblemanager2/tsrc/unit/ut_bubbleimagewidget/mock_bubbleimagemanager.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleimagewidget/mock_bubbleimagemanager.cpp Tue Jul 06 14:15:47 2010 +0300 @@ -0,0 +1,55 @@ +/*! +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#include +#include +#include "bubbleimagemanager.h" + +QPixmap* _pixmap; + +BubbleImageManager::BubbleImageManager(QObject* parent) + : QObject(parent), d_ptr(0) +{ + _pixmap = new QPixmap; +} + +BubbleImageManager::~BubbleImageManager() +{ + delete _pixmap; +} + +const QPixmap* BubbleImageManager::pixmap( + const QString& imageFileName) +{ + return _pixmap; +} + +void BubbleImageManager::loadImage(const QString& imageFileName) +{ + QImage image(imageFileName); + _pixmap->fromImage(image); + + emit pixmapReady(imageFileName); +} + +void BubbleImageManager::unloadImage(const QString& imageFileName) +{ +} + +void BubbleImageManager::releasePixmaps() +{ +} diff -r 6b911d05207e -r bc5a64e5bc3c phoneuis/bubblemanager2/tsrc/unit/ut_bubbleimagewidget/ut_bubbleimagewidget.cpp --- a/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleimagewidget/ut_bubbleimagewidget.cpp Wed Jun 23 18:12:20 2010 +0300 +++ b/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleimagewidget/ut_bubbleimagewidget.cpp Tue Jul 06 14:15:47 2010 +0300 @@ -24,6 +24,7 @@ #include #include #include +#include #include "bubbletest.h" #include "bubbleimagewidget.h" @@ -37,12 +38,12 @@ void initTestCase(); void cleanupTestCase(); - void testPixmap(); - void testWidePixmap(); - void testDefaultAvatar(); + void testSetImage(); void testSetKeepSquareShape(); + void testSizeHint(); + private: QString fileNameWithPath(const QString& fileName); @@ -50,17 +51,9 @@ BubbleImageWidget* mImage; HbMainWindow* mMainWindow; BubbleImageManager* mImageManager; + HbIconItem* mAvatar; }; -QString ut_BubbleImageWidget::fileNameWithPath(const QString& fileName) -{ -#ifdef __WINS__ - return "c:/data/images/" + fileName; -#else - return ":/data/" + fileName; -#endif -} - void ut_BubbleImageWidget::initTestCase() { mMainWindow = new HbMainWindow(); @@ -68,6 +61,12 @@ mImage = new BubbleImageWidget(*mImageManager); mMainWindow->addView(mImage); mMainWindow->show(); + + mAvatar = qgraphicsitem_cast( + static_cast(mImage)->primitive("default_avatar")); + QVERIFY(mAvatar); + QVERIFY(mAvatar->alignment()==Qt::AlignCenter); + QVERIFY(mAvatar->aspectRatioMode()==Qt::KeepAspectRatioByExpanding); } void ut_BubbleImageWidget::cleanupTestCase() @@ -76,32 +75,22 @@ delete mImageManager; } -void ut_BubbleImageWidget::testPixmap() -{ - mImage->hide(); - mImage->setImage(fileNameWithPath("pixmap.png")); - mImage->show(); - // set same image again - QTest::qWait(500); - // there is now way to verify using public API -} - -void ut_BubbleImageWidget::testWidePixmap() +void ut_BubbleImageWidget::testSetImage() { - mImage->hide(); - mImage->setImage(fileNameWithPath("pixmap_wide.png")); - mImage->show(); - QTest::qWait(500); - // there is now way to verify using public API -} + mImage->setImage(""); + QVERIFY(mAvatar->iconName()=="qtg_large_avatar"); + QVERIFY(mAvatar->isVisible()); -void ut_BubbleImageWidget::testDefaultAvatar() -{ - mImage->hide(); - mImage->setImage(""); + QSignalSpy spy( mImageManager, SIGNAL(pixmapReady(QString))); + mImage->setImage(":/data/pixmap.png"); + QVERIFY(mAvatar->isNull()); + QVERIFY(!mAvatar->isVisible()); + QVERIFY(spy.count()==1); + QList arguments = spy.takeFirst(); + QVERIFY(arguments.at(0).toString()==":/data/pixmap.png"); + mImage->show(); - QTest::qWait(500); - // there is now way to verify using public API + QTest::qWait(100); } void ut_BubbleImageWidget::testSetKeepSquareShape() @@ -116,5 +105,12 @@ QVERIFY(mImage->sizePolicy().horizontalPolicy()==QSizePolicy::Expanding); } +void ut_BubbleImageWidget::testSizeHint() +{ + mImage->setKeepSquareShape(true); + QSizeF hint = mImage->preferredSize(); + // .. +} + BUBBLE_TEST_MAIN(ut_BubbleImageWidget) #include "ut_bubbleimagewidget.moc" diff -r 6b911d05207e -r bc5a64e5bc3c phoneuis/bubblemanager2/tsrc/unit/ut_bubbleimagewidget/ut_bubbleimagewidget.pro --- a/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleimagewidget/ut_bubbleimagewidget.pro Wed Jun 23 18:12:20 2010 +0300 +++ b/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleimagewidget/ut_bubbleimagewidget.pro Tue Jul 06 14:15:47 2010 +0300 @@ -25,31 +25,17 @@ INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE TARGET.EPOCALLOWDLLDATA = 1 TARGET.CAPABILITY = ALL -TCB - - - BLD_INF_RULES.prj_exports += \ - "./data/pixmap.png /epoc32/winscw/c/data/images/pixmap.png" - BLD_INF_RULES.prj_exports += \ - "./data/pixmap_wide.png /epoc32/winscw/c/data/images/pixmap_wide.png" - } else:win32 { DESTDIR = ./ } # HEADERS += ../../../bubblecore/src/bubbleimagewidget.h \ - ../../../bubblecore/src/bubbleimagemanager.h \ - ../../../bubblecore/src/bubbleimagemanager_p.h -SOURCES += ut_bubbleimagewidget.cpp \ - ../../../bubblecore/src/bubbleimagewidget.cpp \ - ../../../bubblecore/src/bubbleimagemanager.cpp + ../../../bubblecore/src/bubbleimagemanager.h -symbian { - SOURCES += ../../../bubblecore/src/bubbleimagemanager_p.cpp - LIBS += -lthumbnailmanagerqt -} else:win32 { - SOURCES += ../../../bubblecore/src/bubbleimagemanager_p_stub.cpp -} +SOURCES += ut_bubbleimagewidget.cpp \ + mock_bubbleimagemanager.cpp \ + ../../../bubblecore/src/bubbleimagewidget.cpp \ RESOURCES += ut_bubbleimagewidget.qrc diff -r 6b911d05207e -r bc5a64e5bc3c phoneuis/bubblemanager2/tsrc/unit/ut_bubbleparticipantlistitem/ut_bubbleparticipantlistitem.cpp --- a/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleparticipantlistitem/ut_bubbleparticipantlistitem.cpp Wed Jun 23 18:12:20 2010 +0300 +++ b/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleparticipantlistitem/ut_bubbleparticipantlistitem.cpp Tue Jul 06 14:15:47 2010 +0300 @@ -75,7 +75,6 @@ mItem->addAction(&act1); mItem->addAction(&act2); mItem->updateChildItems(); - mItem->setExpanded(true); mItem->updateChildItems(); } diff -r 6b911d05207e -r bc5a64e5bc3c phoneuis/bubblemanager2/tsrc/unit/ut_bubbleutils/ut_bubbleutils.cpp --- a/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleutils/ut_bubbleutils.cpp Wed Jun 23 18:12:20 2010 +0300 +++ b/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleutils/ut_bubbleutils.cpp Tue Jul 06 14:15:47 2010 +0300 @@ -56,13 +56,7 @@ void test_setButtonStyleForAction(); - void test_voiceCallStatusIcon(); - void test_videoCallStatusIcon(); - void test_voipCallStatusIcon(); - - void test_numberTypeIcon(); - - void test_cipheringIcon(); + void test_setIndicators(); private: }; @@ -214,7 +208,8 @@ QVERIFY( text1.elideMode() == Qt::ElideRight ); QVERIFY( text2.text() == "discon" ); QVERIFY( text2.elideMode() == Qt::ElideRight ); - QVERIFY( text3.text() == "" ); + QVERIFY( text3.text() == "00:00" ); + QVERIFY( text2.elideMode() == Qt::ElideRight ); // add secondary cli header.setSecondaryCli( "12345", Qt::ElideLeft ); @@ -222,6 +217,29 @@ QVERIFY( text1.text() == "john" ); QVERIFY( text1.elideMode() == Qt::ElideRight ); + QVERIFY( text2.text() == "discon" ); + QVERIFY( text2.elideMode() == Qt::ElideRight ); + QVERIFY( text3.text() == "00:00" ); + QVERIFY( text3.elideMode() == Qt::ElideRight ); + + // without call timer + text3.setText(QString()); + header.setTimerCost(QString()); + header.setSecondaryCli(QString(), Qt::ElideNone); + + 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 + header.setSecondaryCli( "12345", Qt::ElideLeft ); + 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() == "discon" ); @@ -551,182 +569,51 @@ QVERIFY(button.buttonType()==BubbleButton::RedButton); } -void ut_BubbleUtils::test_voiceCallStatusIcon() +void ut_BubbleUtils::test_setIndicators() { - 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"); + HbIconItem icon1; + icon1.hide(); + HbIconItem icon2; + icon2.hide(); - 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::setIndicators( + BubbleManagerIF::Incoming, BubbleManagerIF::NoCiphering, icon1, icon2); + QVERIFY(icon1.iconName()=="qtg_mono_ciphering_off"); + QVERIFY(icon1.isVisible()==true); + QVERIFY(icon2.iconName()==""); + QVERIFY(icon2.isVisible()==false); - 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"); + BubbleUtils::setIndicators( + BubbleManagerIF::Incoming, BubbleManagerIF::Diverted, icon1, icon2); + QVERIFY(icon1.iconName()=="qtg_mono_call_diverted"); + QVERIFY(icon1.isVisible()==true); + QVERIFY(icon2.iconName()==""); + QVERIFY(icon2.isVisible()==false); - 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::setIndicators( + BubbleManagerIF::Active, BubbleManagerIF::Diverted, icon1, icon2); + QVERIFY(icon1.iconName()==""); + QVERIFY(icon1.isVisible()==false); + QVERIFY(icon2.iconName()==""); + QVERIFY(icon2.isVisible()==false); - 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"); - QVERIFY(icon.isVisible()==true); + int flags = 0; + flags |= BubbleManagerIF::NoCiphering; + flags |= BubbleManagerIF::Diverted; + BubbleUtils::setIndicators( + BubbleManagerIF::Incoming, flags, icon1, icon2); + QVERIFY(icon1.iconName()=="qtg_mono_ciphering_off"); + QVERIFY(icon1.isVisible()==true); + QVERIFY(icon2.iconName()=="qtg_mono_call_diverted"); + QVERIFY(icon2.isVisible()==true); - BubbleUtils::setNumberTypeIcon( - BubbleManagerIF::Waiting, BubbleManagerIF::Diverted, icon); - QVERIFY(icon.iconName()=="qtg_mono_call_diverted"); - 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); + BubbleUtils::setIndicators( + BubbleManagerIF::Incoming, BubbleManagerIF::Normal, icon1, icon2); + QVERIFY(icon1.iconName()==""); + QVERIFY(icon1.isVisible()==false); + QVERIFY(icon2.iconName()==""); + QVERIFY(icon2.isVisible()==false); } BUBBLE_TEST_MAIN(ut_BubbleUtils)