phonesettings/cpphonesettingsplugins/callsplugin/src/cpcallsplugingroup.cpp
branchGCC_SURGE
changeset 51 f39ed5e045e0
parent 30 ebdbd102c78a
parent 46 bc5a64e5bc3c
equal deleted inserted replaced
40:bab96b7ed1a4 51:f39ed5e045e0
    94     QObject::connect(
    94     QObject::connect(
    95         this, 
    95         this, 
    96         SIGNAL(cancelNote(int)),
    96         SIGNAL(cancelNote(int)),
    97         phoneNotes, 
    97         phoneNotes, 
    98         SLOT(cancelNote(int)));
    98         SLOT(cancelNote(int)));
       
    99     QObject::connect(
       
   100         this, 
       
   101         SIGNAL(showNotificationDialog(const QString&)),
       
   102         phoneNotes, 
       
   103         SLOT(showNotificationDialog(const QString&)));
    99     
   104     
   100     // Create combobox string <-> setting mappings 
   105     // Create combobox string <-> setting mappings 
   101     insertMappedListItems(); 
   106     insertMappedListItems(); 
   102        
   107        
   103     // Greate settings items
   108     // Greate settings items
   104     createCLIItem();
   109     createCLIItem();
   105     createCallWaitingtem();
   110     createCallWaitingtem();
   106     createSoftRejectItem();
   111     createSoftRejectItem();
   107     createShowCallDurationItem();
   112     createShowCallDurationItem();
       
   113     createOwnVideoInReceivedCall();
   108     
   114     
   109     // Connect setting item signals
   115     // Connect setting item signals
   110     connectCLIItem();
   116     connectCLIItem();
   111     connectCallWaitingItem();
   117     connectCallWaitingItem();
   112     connectSoftRejectItem();
   118     connectSoftRejectItem();
   113     connectShowCallDurationItem();
   119     connectShowCallDurationItem();
       
   120     connectOwnVideoInReceivedCall();
   114     
   121     
   115     m_callWaitingDistinguishEnabled = 
   122     m_callWaitingDistinguishEnabled = 
   116        m_cpSettingsWrapper->isFeatureCallWaitingDistiquishNotProvisionedEnabled();
   123        m_cpSettingsWrapper->isFeatureCallWaitingDistiquishNotProvisionedEnabled();
   117     
   124     
   118     DPRINT << ": OUT";
   125     DPRINT << ": OUT";
   146     m_DataItemShowCallDuration =
   153     m_DataItemShowCallDuration =
   147         new CpSettingFormItemData(
   154         new CpSettingFormItemData(
   148             HbDataFormModelItem::ToggleValueItem,
   155             HbDataFormModelItem::ToggleValueItem,
   149             hbTrId("txt_phone_formlabel_show_call_duration"),
   156             hbTrId("txt_phone_formlabel_show_call_duration"),
   150             this);
   157             this);
   151 
   158     m_DataItemShowCallDuration->setObjectName(
       
   159             "showCallDurationDataItem"); 
       
   160     
   152     if (showCallDurationStatus) {
   161     if (showCallDurationStatus) {
   153         m_DataItemShowCallDuration->setContentWidgetData(
   162         m_DataItemShowCallDuration->setContentWidgetData(
   154             "text", QVariant(hbTrId("txt_phone_setlabel_val_yes")));
   163             "text", QVariant(hbTrId("txt_phone_setlabel_val_yes")));
   155         m_DataItemShowCallDuration->setContentWidgetData(
   164         m_DataItemShowCallDuration->setContentWidgetData(
   156             "additionalText", QVariant(hbTrId("txt_phone_setlabel_val_no")));
   165             "additionalText", QVariant(hbTrId("txt_phone_setlabel_val_no")));
   183     m_DataItemSoftRejectTextEditor = 
   192     m_DataItemSoftRejectTextEditor = 
   184         new CpSettingFormItemData(
   193         new CpSettingFormItemData(
   185             HbDataFormModelItem::TextItem,
   194             HbDataFormModelItem::TextItem,
   186             hbTrId("txt_phone_setlabel_soft_reject"),
   195             hbTrId("txt_phone_setlabel_soft_reject"),
   187             this);
   196             this);
       
   197     m_DataItemSoftRejectTextEditor->setObjectName(
       
   198             "softRejectTextEditorDataItem");
       
   199     
   188     m_DataItemSoftRejectTextEditor->setContentWidgetData(
   200     m_DataItemSoftRejectTextEditor->setContentWidgetData(
   189         "text", QVariant(softRejectText));
   201         "text", QVariant(softRejectText));
   190     m_DataItemSoftRejectTextEditor->setContentWidgetData(
   202     m_DataItemSoftRejectTextEditor->setContentWidgetData(
   191         "maxLength", QVariant(160));
   203         "maxLength", QVariant(160));
   192     m_DataItemSoftRejectTextEditor->setContentWidgetData(
   204     m_DataItemSoftRejectTextEditor->setContentWidgetData(
   208     m_DataItemCLI = 
   220     m_DataItemCLI = 
   209         new CpSettingFormItemData(
   221         new CpSettingFormItemData(
   210             HbDataFormModelItem::ComboBoxItem,
   222             HbDataFormModelItem::ComboBoxItem,
   211             hbTrId("txt_phone_setlabel_send_my_caller_id"),
   223             hbTrId("txt_phone_setlabel_send_my_caller_id"),
   212             this);
   224             this);
       
   225     m_DataItemCLI->setObjectName("cliDataItem");
       
   226     
   213     // CLI combo box items string list 
   227     // CLI combo box items string list 
   214     QStringList list;
   228     QStringList list;
   215     QMapIterator<int, QString> cliSettingMapIterator(m_cliSettingMap);
   229     QMapIterator<int, QString> cliSettingMapIterator(m_cliSettingMap);
   216     while (cliSettingMapIterator.hasNext()) {
   230     while (cliSettingMapIterator.hasNext()) {
   217         cliSettingMapIterator.next();
   231         cliSettingMapIterator.next();
   222     
   236     
   223     DPRINT << ": OUT";
   237     DPRINT << ": OUT";
   224 }
   238 }
   225 
   239 
   226 /*!
   240 /*!
       
   241   CpCallsPluginGroup::createOwnVideoInReceivedCall.
       
   242  */
       
   243 void CpCallsPluginGroup::createOwnVideoInReceivedCall()
       
   244 {
       
   245     DPRINT << ": IN";
       
   246     
       
   247     // Read Own video in received call value from Cenrep 
       
   248     int ownVideoInReceivedCallStatus = 
       
   249             m_cpSettingsWrapper->readVtVideoSending();
       
   250     DPRINT << "ownVideoInReceivedCallStatus:" << ownVideoInReceivedCallStatus;
       
   251     
       
   252     m_OwnVideoInReceivedCall =
       
   253         new CpSettingFormItemData(
       
   254             HbDataFormModelItem::ComboBoxItem,
       
   255             hbTrId("txt_phone_setlabel_own_video_in_received_call"),
       
   256             this);
       
   257     m_OwnVideoInReceivedCall->setObjectName(
       
   258             "ownVideoInReceivedCallDataItem");
       
   259     
       
   260     QStringList ownVideoSelections;
       
   261     ownVideoSelections
       
   262         <<hbTrId("txt_phone_setlabel_own_video_in_val_show_automatic")
       
   263         <<hbTrId("txt_phone_setlabel_own_video_in_val_ask_first")
       
   264         <<hbTrId("txt_phone_setlabel_own_video_in_val_dont_show");
       
   265 
       
   266     m_OwnVideoInReceivedCall->setContentWidgetData(
       
   267         "items", QVariant(ownVideoSelections));
       
   268     
       
   269     QVariant indexValue(ownVideoInReceivedCallStatus);
       
   270     m_OwnVideoInReceivedCall->setContentWidgetData(
       
   271         QString("currentIndex"), indexValue);
       
   272     
       
   273     appendChild( m_OwnVideoInReceivedCall ); 
       
   274     DPRINT << ": OUT";    
       
   275 }
       
   276 
       
   277 /*!
   227   CpCallsPluginGroup::createCallWaitingtem.
   278   CpCallsPluginGroup::createCallWaitingtem.
   228  */
   279  */
   229 void CpCallsPluginGroup::createCallWaitingtem()
   280 void CpCallsPluginGroup::createCallWaitingtem()
   230 {
   281 {
   231     DPRINT << ": IN";
   282     DPRINT << ": IN";
   233     m_DataItemCallWaiting = 
   284     m_DataItemCallWaiting = 
   234         new CpSettingFormItemData(
   285         new CpSettingFormItemData(
   235             HbDataFormModelItem::ToggleValueItem,
   286             HbDataFormModelItem::ToggleValueItem,
   236             hbTrId("txt_phone_setlabel_call_waiting"),
   287             hbTrId("txt_phone_setlabel_call_waiting"),
   237             this);
   288             this);
   238 
   289     m_DataItemCallWaiting->setObjectName("callWaitingDataItem"); 
   239     m_DataItemCallWaiting->setContentWidgetData(
   290     m_DataItemCallWaiting->setContentWidgetData(
   240         "text", QVariant(hbTrId("txt_phone_setlabel_call_waiting_val_check_status")));
   291         "text", QVariant(hbTrId("txt_phone_setlabel_call_waiting_val_check_status")));
   241     m_DataItemCallWaiting->setContentWidgetData(
   292     m_DataItemCallWaiting->setContentWidgetData(
   242         "additionalText", QVariant(hbTrId("txt_phone_setlabel_call_waiting_val_check_status")));
   293         "additionalText", QVariant(hbTrId("txt_phone_setlabel_call_waiting_val_check_status")));
   243 
   294 
   248 /*!
   299 /*!
   249   CpCallsPluginGroup::connectShowCallDurationItem.
   300   CpCallsPluginGroup::connectShowCallDurationItem.
   250  */
   301  */
   251 void CpCallsPluginGroup::connectShowCallDurationItem()
   302 void CpCallsPluginGroup::connectShowCallDurationItem()
   252 {
   303 {
   253     DPRINT << ": IN";
   304     DPRINT;
   254     
       
   255     m_helper.addConnection(
   305     m_helper.addConnection(
   256         m_DataItemShowCallDuration, SIGNAL(clicked()),
   306         m_DataItemShowCallDuration, SIGNAL(valueChanged(QPersistentModelIndex, QVariant)),
   257         this, SLOT(showCallDurationStateChanged()));
   307         this, SLOT(showCallDurationStateChanged()));
   258 
       
   259     DPRINT << ": OUT";
       
   260 }
   308 }
   261  
   309  
   262 /*!
   310 /*!
   263   CpCallsPluginGroup::connectSoftRejectItem.
   311   CpCallsPluginGroup::connectSoftRejectItem.
   264  */
   312  */
   265 void CpCallsPluginGroup::connectSoftRejectItem()
   313 void CpCallsPluginGroup::connectSoftRejectItem()
   266 {
   314 {
   267     DPRINT << ": IN";
   315     DPRINT;
   268 
       
   269     m_helper.addConnection(
   316     m_helper.addConnection(
   270         m_DataItemSoftRejectTextEditor, SIGNAL(editingFinished()),
   317         m_DataItemSoftRejectTextEditor, SIGNAL(editingFinished()),
   271         this, SLOT(softRejectTextChanged()));
   318         this, SLOT(softRejectTextChanged()));
   272 
       
   273     DPRINT << ": OUT";
       
   274 }
   319 }
   275 
   320 
   276 /*!
   321 /*!
   277   CpCallsPluginGroup::connectCLIItem.
   322   CpCallsPluginGroup::connectCLIItem.
   278  */
   323  */
   279 void CpCallsPluginGroup::connectCLIItem()
   324 void CpCallsPluginGroup::connectCLIItem()
   280 {
   325 {
   281     DPRINT << ": IN";
   326     DPRINT;
   282     
       
   283     m_helper.addConnection(
   327     m_helper.addConnection(
   284         m_DataItemCLI, SIGNAL(currentIndexChanged(int)),
   328         m_DataItemCLI, SIGNAL(currentIndexChanged(int)),
   285         this, SLOT(cliCurrentIndexChanged(int)));
   329         this, SLOT(cliCurrentIndexChanged(int)));
   286     // Fetch current CLI value 
   330     // Fetch current CLI value 
   287     int cliValue(ClirNetworkDefault);
   331     int cliValue(ClirNetworkDefault);
   291         m_DataItemCLI->setContentWidgetData(
   335         m_DataItemCLI->setContentWidgetData(
   292             QString("currentIndex"), indexValue);
   336             QString("currentIndex"), indexValue);
   293     } else {
   337     } else {
   294         DPRINT << "Error: " << err;
   338         DPRINT << "Error: " << err;
   295     }
   339     }
   296     
   340 }
   297     DPRINT << ": OUT";
   341 
       
   342 /*!
       
   343   CpCallsPluginGroup::connectOwnVideoInReceivedCall.
       
   344  */
       
   345 void CpCallsPluginGroup::connectOwnVideoInReceivedCall()
       
   346 {
       
   347     DPRINT;
       
   348     m_helper.addConnection(
       
   349         m_OwnVideoInReceivedCall, SIGNAL(currentIndexChanged(int)),
       
   350             this, SLOT(ownVideoInReceivedCallStateChanged(int)));
   298 }
   351 }
   299 
   352 
   300 /*!
   353 /*!
   301   CpCallsPluginGroup::connectCallWaitingItem.
   354   CpCallsPluginGroup::connectCallWaitingItem.
   302  */
   355  */
   303 void CpCallsPluginGroup::connectCallWaitingItem()
   356 void CpCallsPluginGroup::connectCallWaitingItem()
   304 {
   357 {
   305     DPRINT << ": IN";
   358     DPRINT;
   306 
       
   307     m_helper.addConnection(
   359     m_helper.addConnection(
   308         m_DataItemCallWaiting, SIGNAL(clicked()),
   360         m_DataItemCallWaiting, SIGNAL(valueChanged(QPersistentModelIndex, QVariant)),
   309         this, SLOT(callWaitingCurrentIndexChanged()));
   361         this, SLOT(callWaitingCurrentIndexChanged()));
   310 
       
   311     DPRINT << ": OUT";
       
   312 }
   362 }
   313 
   363 
   314 /*!
   364 /*!
   315   CpCallsPluginGroup::showCallDurationStateChanged.
   365   CpCallsPluginGroup::showCallDurationStateChanged.
   316  */
   366  */
   319     DPRINT << ": IN";
   369     DPRINT << ": IN";
   320 
   370 
   321     QVariant text = m_DataItemShowCallDuration->contentWidgetData("text");
   371     QVariant text = m_DataItemShowCallDuration->contentWidgetData("text");
   322     QString showCallDurationText = text.toString();
   372     QString showCallDurationText = text.toString();
   323 
   373 
   324     if (showCallDurationText == hbTrId("txt_phone_setlabel_val_yes")) {
   374     if(m_cpSettingsWrapper->isOngoingCall()) {
   325         m_cpSettingsWrapper->setShowCallDuration(true);
   375         // ongoing call, operation not allowed, refresh ui.
   326     } else if (showCallDurationText == hbTrId("txt_phone_setlabel_val_no")){
   376         bool showCallDurationStatus = m_cpSettingsWrapper->showCallDuration();
   327         m_cpSettingsWrapper->setShowCallDuration(false);
   377         DPRINT << ": ongoing call case, status: " << showCallDurationStatus;
       
   378 
       
   379         if (showCallDurationStatus) {
       
   380             m_DataItemShowCallDuration->setContentWidgetData(
       
   381                 "text", QVariant(hbTrId("txt_phone_setlabel_val_yes")));
       
   382             m_DataItemShowCallDuration->setContentWidgetData(
       
   383                 "additionalText", QVariant(hbTrId("txt_phone_setlabel_val_no")));
       
   384         } else {
       
   385             m_DataItemShowCallDuration->setContentWidgetData(
       
   386                 "text", QVariant(hbTrId("txt_phone_setlabel_val_no")));
       
   387             m_DataItemShowCallDuration->setContentWidgetData(
       
   388                 "additionalText", QVariant(hbTrId("txt_phone_setlabel_val_yes")));
       
   389         }
       
   390         emit showGlobalNote(
       
   391             m_activeNoteId, 
       
   392             emit hbTrId("txt_phone_info_not_allowed"), 
       
   393             HbMessageBox::MessageTypeInformation);
   328     } else {
   394     } else {
   329         DPRINT << "nothing done";
   395         if (showCallDurationText == hbTrId("txt_phone_setlabel_val_yes")) {
       
   396             m_cpSettingsWrapper->setShowCallDuration(true);
       
   397         } else if (showCallDurationText == hbTrId("txt_phone_setlabel_val_no")){
       
   398             m_cpSettingsWrapper->setShowCallDuration(false);
       
   399         } else {
       
   400             DPRINT << "nothing done";
       
   401         }
   330     }
   402     }
   331 
   403 
   332     DPRINT << ": OUT";
   404     DPRINT << ": OUT";
   333 }
   405 }
   334 
   406 
   339 {
   411 {
   340     DPRINT << ": IN";
   412     DPRINT << ": IN";
   341     
   413     
   342     QVariant text = m_DataItemSoftRejectTextEditor->contentWidgetData("text");
   414     QVariant text = m_DataItemSoftRejectTextEditor->contentWidgetData("text");
   343     QString softRejectText = text.toString();  
   415     QString softRejectText = text.toString();  
   344     if (!softRejectText.isEmpty()) {
   416     if (!softRejectText.isNull()) {
   345         DPRINT << "softRejectText:" << softRejectText;
   417         DPRINT << "softRejectText:" << softRejectText;
   346         m_cpSettingsWrapper->writeSoftRejectText(softRejectText, true);
   418         m_cpSettingsWrapper->writeSoftRejectText(softRejectText, true);
   347     }
   419     }
   348 
   420 
   349     DPRINT << ": OUT";
   421     DPRINT << ": OUT";
   361 
   433 
   362     if (callWaitingText == hbTrId("txt_phone_setlabel_call_waiting_val_check_status")) {
   434     if (callWaitingText == hbTrId("txt_phone_setlabel_call_waiting_val_check_status")) {
   363         // Clicked first time, user want to check feature status
   435         // Clicked first time, user want to check feature status
   364         DPRINT << "checking status";
   436         DPRINT << "checking status";
   365         m_callWaitingWrapper->getCallWaitingStatus();
   437         m_callWaitingWrapper->getCallWaitingStatus();
   366     }
   438     } else if (callWaitingText == hbTrId("txt_phone_setlabel_call_waiting_val_on")) {
   367 
       
   368     else if (callWaitingText == hbTrId("txt_phone_setlabel_call_waiting_val_on")) {
       
   369         DPRINT << "activate";
   439         DPRINT << "activate";
   370         // User want to activate call waiting feature
   440         // User want to activate call waiting feature
   371         m_callWaitingWrapper->setCallWaiting(
   441         m_callWaitingWrapper->setCallWaiting(
   372             PSetCallWaitingWrapper::ActivateCallWaiting,
   442             PSetCallWaitingWrapper::ActivateCallWaiting,
   373             AllTeleAndBearer);
   443             AllTeleAndBearer);
   374     }
   444     } else if (callWaitingText == hbTrId("txt_phone_setlabel_call_waiting_val_off")) {
   375     else if (callWaitingText == hbTrId("txt_phone_setlabel_call_waiting_val_off")) {
       
   376         DPRINT << "deactivate";
   445         DPRINT << "deactivate";
   377         // User want to deactivate call waiting feature
   446         // User want to deactivate call waiting feature
   378         m_callWaitingWrapper->setCallWaiting(
   447         m_callWaitingWrapper->setCallWaiting(
   379             PSetCallWaitingWrapper::DeactivateCallWaiting,
   448             PSetCallWaitingWrapper::DeactivateCallWaiting,
   380             AllTeleAndBearer);
   449             AllTeleAndBearer);
   381     }
   450     } else {
   382     else {
   451         DWARNING << ": Error, unhandled index!";
   383         DPRINT << "nothing done";
       
   384     }
   452     }
   385 
   453 
   386     DPRINT << ": OUT";
   454     DPRINT << ": OUT";
   387 }
   455 }
   388 
   456 
   402         DPRINT << "Error: negative index!";
   470         DPRINT << "Error: negative index!";
   403     }
   471     }
   404 
   472 
   405     DPRINT << ": OUT";
   473     DPRINT << ": OUT";
   406 }
   474 }
   407     
   475 
       
   476 /*!
       
   477   CpCallsPluginGroup::ownVideoInReceivedCallStateChanged.
       
   478  */
       
   479 void CpCallsPluginGroup::ownVideoInReceivedCallStateChanged(int index)
       
   480 {
       
   481     DPRINT << ": IN : index: " << index;
       
   482     
       
   483     if (index >= 0) {
       
   484         //store to Cenrep
       
   485         int ret = m_cpSettingsWrapper->writeVtVideoSending(index);
       
   486         DPRINT << 
       
   487             "m_cpSettingsWrapper->writeVtVideoSending(index) ret: " << ret;
       
   488     }else{
       
   489         DPRINT << "Error: negative index!";
       
   490     }
       
   491            
       
   492     DPRINT << ": OUT";
       
   493 }
       
   494 
   408 /*!
   495 /*!
   409   CpCallsPluginGroup::insertMappedListItems.
   496   CpCallsPluginGroup::insertMappedListItems.
   410  */
   497  */
   411 void CpCallsPluginGroup::insertMappedListItems()
   498 void CpCallsPluginGroup::insertMappedListItems()
   412 {
   499 {
   413     DPRINT << ": IN";
   500     DPRINT << ": IN";
   414 
       
   415     m_cliSettingMap.insert(ClirNetworkDefault, hbTrId("txt_phone_setlabel_val_default"));
   501     m_cliSettingMap.insert(ClirNetworkDefault, hbTrId("txt_phone_setlabel_val_default"));
   416     m_cliSettingMap.insert(ClirExplicitSuppress, hbTrId("txt_phone_setlabel_val_yes"));
   502     m_cliSettingMap.insert(ClirExplicitSuppress, hbTrId("txt_phone_setlabel_val_yes"));
   417     m_cliSettingMap.insert(ClirExplicitInvoke, hbTrId("txt_phone_setlabel_val_no"));
   503     m_cliSettingMap.insert(ClirExplicitInvoke, hbTrId("txt_phone_setlabel_val_no"));
   418 
       
   419     DPRINT << ": OUT";
   504     DPRINT << ": OUT";
   420 }
   505 }
   421 
   506 
   422 /*!
   507 /*!
   423   CpCallsPluginGroup::handleCallWaitingGetStatus.
   508   CpCallsPluginGroup::handleCallWaitingGetStatus.
   426     PSetCallWaitingWrapper::PsCallWaitingStatus status,
   511     PSetCallWaitingWrapper::PsCallWaitingStatus status,
   427     const QList<unsigned char> &basicServiceGroupIds)
   512     const QList<unsigned char> &basicServiceGroupIds)
   428 {
   513 {
   429     DPRINT << ": IN status: " << status;
   514     DPRINT << ": IN status: " << status;
   430     // This happens only in the very first time when clicked.
   515     // This happens only in the very first time when clicked.
   431 
       
   432     emit cancelNote(m_activeNoteId);
   516     emit cancelNote(m_activeNoteId);
   433     
   517     
   434     bool alsCaseOnly = false;
   518     bool alsCaseOnly = false;
   435     if (1 == basicServiceGroupIds.count() &&
   519     if (1 == basicServiceGroupIds.count() &&
   436         AltTele == static_cast<BasicServiceGroups>(basicServiceGroupIds.at(0))) {
   520         AltTele == static_cast<BasicServiceGroups>(basicServiceGroupIds.at(0))) {
   439     }
   523     }
   440 
   524 
   441     if (m_callWaitingDistinguishEnabled &&
   525     if (m_callWaitingDistinguishEnabled &&
   442             PSetCallWaitingWrapper::StatusNotProvisioned == status) {
   526             PSetCallWaitingWrapper::StatusNotProvisioned == status) {
   443         DPRINT << ": not provisioned";
   527         DPRINT << ": not provisioned";
   444         emit showGlobalNote(m_activeNoteId,
   528         emit showNotificationDialog(hbTrId("txt_phone_info_request_not_completed"));
   445             hbTrId("txt_phone_info_request_not_completed"), 
       
   446             HbMessageBox::MessageTypeInformation);
       
   447     } else if (PSetCallWaitingWrapper::StatusActive == status && !alsCaseOnly) {
   529     } else if (PSetCallWaitingWrapper::StatusActive == status && !alsCaseOnly) {
   448         DPRINT << ": status active";
   530         DPRINT << ": status active";
   449         m_DataItemCallWaiting->setContentWidgetData(
   531         m_DataItemCallWaiting->setContentWidgetData(
   450             "text", QVariant(hbTrId("txt_phone_setlabel_call_waiting_val_on")));
   532             "text", QVariant(hbTrId("txt_phone_setlabel_call_waiting_val_on")));
   451         m_DataItemCallWaiting->setContentWidgetData(
   533         m_DataItemCallWaiting->setContentWidgetData(
   470     int result )
   552     int result )
   471 {
   553 {
   472     DPRINT << ": IN";
   554     DPRINT << ": IN";
   473     emit cancelNote(m_activeNoteId);
   555     emit cancelNote(m_activeNoteId);
   474     if (result) {
   556     if (result) {
   475         emit showGlobalNote(m_activeNoteId,
   557         emit showNotificationDialog(hbTrId("txt_phone_info_request_not_confirmed"));
   476             hbTrId("txt_phone_info_request_not_confirmed"), 
       
   477             HbMessageBox::MessageTypeWarning);
       
   478     } else {
   558     } else {
   479         switch (command){
   559         switch (command){
   480             case PSetCallWaitingWrapper::ActivateCallWaiting:
   560             case PSetCallWaitingWrapper::ActivateCallWaiting:
   481                 emit showGlobalNote(m_activeNoteId,
   561                 emit showNotificationDialog(hbTrId("txt_phone_info_call_waiting_activated"));
   482                     hbTrId("txt_phone_info_call_waiting_activated"), 
       
   483                     HbMessageBox::MessageTypeInformation);
       
   484                 break;
   562                 break;
   485             case PSetCallWaitingWrapper::DeactivateCallWaiting:
   563             case PSetCallWaitingWrapper::DeactivateCallWaiting:
   486                 emit showGlobalNote(m_activeNoteId,
   564                 emit showNotificationDialog(hbTrId("txt_phone_info_call_waiting_deactivated"));
   487                     hbTrId("txt_phone_info_call_waiting_deactivated"), 
       
   488                     HbMessageBox::MessageTypeInformation);
       
   489                 break;
   565                 break;
   490             default: 
   566             default: 
   491                 emit showGlobalNote(m_activeNoteId,
   567                 emit showNotificationDialog(hbTrId("txt_phone_info_result_unknown"));
   492                     hbTrId("txt_phone_info_result_unknown"), 
       
   493                     HbMessageBox::MessageTypeInformation);
       
   494                 break;
   568                 break;
   495         }
   569         }
   496     }
   570     }
   497     DPRINT << ": OUT";
   571     DPRINT << ": OUT";
   498 } 
   572 } 
   505     DPRINT << ": IN";
   579     DPRINT << ": IN";
   506     DPRINT << "ongoing:" << ongoing << ", interrupted:" << interrupted;
   580     DPRINT << "ongoing:" << ongoing << ", interrupted:" << interrupted;
   507     Q_ASSERT(!(ongoing && interrupted));
   581     Q_ASSERT(!(ongoing && interrupted));
   508     
   582     
   509     if (ongoing) {
   583     if (ongoing) {
   510         emit showGlobalProgressNote(m_activeNoteId, hbTrId("txt_phone_info_requesting"));
   584         emit showGlobalProgressNote(m_activeNoteId, hbTrId("txt_common_info_requesting"));
   511     }
   585     }
   512     
   586     
   513     if (interrupted) {
   587     if (interrupted) {
   514         emit cancelNote(m_activeNoteId);
   588         emit cancelNote(m_activeNoteId);
   515     }
   589     }
   522  */
   596  */
   523 void CpCallsPluginGroup::handleCallWaitingError(int errorCode)
   597 void CpCallsPluginGroup::handleCallWaitingError(int errorCode)
   524 {
   598 {
   525     DPRINT << ": IN";
   599     DPRINT << ": IN";
   526     DPRINT << "errorCode:" << errorCode;
   600     DPRINT << "errorCode:" << errorCode;
   527     
   601 
   528     emit cancelNote(m_activeNoteId);
   602     emit cancelNote(m_activeNoteId);
   529     
       
   530     emit showGlobalErrorNote(m_activeNoteId, errorCode);
   603     emit showGlobalErrorNote(m_activeNoteId, errorCode);
   531     
   604     
   532     DPRINT << ": OUT";
   605     DPRINT << ": OUT";
   533 }
   606 }
   534 
   607