equal
deleted
inserted
replaced
118 { |
118 { |
119 delete iNaviDecorator; |
119 delete iNaviDecorator; |
120 } |
120 } |
121 if ( iTitlePane ) |
121 if ( iTitlePane ) |
122 { |
122 { |
123 // set old text back, if we have it... |
123 // set old text back, if we have it and if we are going back to |
|
124 // Connectivity Settings view |
124 if ( iOldTitleText ) |
125 if ( iOldTitleText ) |
125 { |
126 { |
126 TRAP_IGNORE( iTitlePane->SetTextL( *iOldTitleText ) ); |
127 if ( iExitReason == KDialogUserBack ) |
|
128 { |
|
129 TRAP_IGNORE( iTitlePane->SetTextL( *iOldTitleText ) ); |
|
130 } |
127 delete iOldTitleText; |
131 delete iOldTitleText; |
128 } |
132 } |
129 } |
133 } |
130 if ( iConnSettingsImpl ) |
134 if ( iConnSettingsImpl ) |
131 { |
135 { |
363 } |
367 } |
364 case ECmManagerUiCmdDestUserExit: |
368 case ECmManagerUiCmdDestUserExit: |
365 { |
369 { |
366 CLOG_WRITE( "CDestDlg::ProcessCommandL command: exit"); |
370 CLOG_WRITE( "CDestDlg::ProcessCommandL command: exit"); |
367 iExitReason = KDialogUserExit; |
371 iExitReason = KDialogUserExit; |
|
372 iCmManagerImpl->WatcherUnRegister(); |
|
373 TryExitL( iExitReason ); |
|
374 break; |
368 } |
375 } |
369 case EAknSoftkeyBack: |
376 case EAknSoftkeyBack: |
370 { |
377 { |
|
378 iExitReason = KDialogUserBack; |
371 iCmManagerImpl->WatcherUnRegister(); |
379 iCmManagerImpl->WatcherUnRegister(); |
372 TryExitL( iExitReason ); |
380 TryExitL( iExitReason ); |
373 break; |
381 break; |
374 } |
382 } |
375 case ECmManagerUiCmdDestEdit: |
383 case ECmManagerUiCmdDestEdit: |
401 break; |
409 break; |
402 } |
410 } |
403 } |
411 } |
404 if ( iConnSettingsImpl->RunDefaultConnecitonRBPageL( selection ) ) |
412 if ( iConnSettingsImpl->RunDefaultConnecitonRBPageL( selection ) ) |
405 { |
413 { |
406 defConnValue = selection.ConvertToDefConn(); |
414 defConnValue = selection.ConvertToDefConn(); |
407 ShowDefaultSetNoteL( defConnValue ); |
|
408 |
415 |
409 iCmManagerImpl->WriteDefConnL( defConnValue ); |
416 iCmManagerImpl->WriteDefConnL( defConnValue ); |
410 HandleListboxDataChangeL(); |
417 HandleListboxDataChangeL(); |
411 } |
418 } |
412 break; |
419 break; |
609 case EAknSoftkeyBack: |
616 case EAknSoftkeyBack: |
610 { |
617 { |
611 if (!iProcessing) |
618 if (!iProcessing) |
612 { |
619 { |
613 *iExiting = EFalse; |
620 *iExiting = EFalse; |
|
621 iExitReason = KDialogUserBack; |
614 retval = ETrue; |
622 retval = ETrue; |
615 } |
623 } |
616 break; |
624 break; |
617 } |
625 } |
618 case EAknSoftkeyOptions: |
626 case EAknSoftkeyOptions: |
1075 iListbox->SetCurrentItemIndexAndDraw( |
1083 iListbox->SetCurrentItemIndexAndDraw( |
1076 lbmodel->MdcaCount() - 1 ); |
1084 lbmodel->MdcaCount() - 1 ); |
1077 } |
1085 } |
1078 |
1086 |
1079 iListbox->HandleItemAdditionL(); |
1087 iListbox->HandleItemAdditionL(); |
1080 |
1088 |
1081 TCmCommonUi::ShowNoteL( R_CMWIZARD_NEW_DEST_ADDED, |
|
1082 destName, |
|
1083 TCmCommonUi::ECmOkNote ); |
|
1084 |
|
1085 // Sets the mittle soft key text to "Open" |
1089 // Sets the mittle soft key text to "Open" |
1086 SetMskL( R_QTN_MSK_OPEN ); |
1090 SetMskL( R_QTN_MSK_OPEN ); |
1087 |
1091 |
1088 } |
1092 } |
1089 if(dest) |
1093 if(dest) |