diff -r 427125ac6cb8 -r 7eb70891911c vmbx/vmbxengine/src/vmbxuiutilities.cpp --- a/vmbx/vmbxengine/src/vmbxuiutilities.cpp Thu May 27 13:23:05 2010 +0300 +++ b/vmbx/vmbxengine/src/vmbxuiutilities.cpp Fri Jun 11 14:07:16 2010 +0300 @@ -75,7 +75,7 @@ { VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ConstructL =>" ); // create resource handler - iUiHandler = CVmbxUiHandler::NewL(); + TRAP_IGNORE(iUiHandler = CVmbxUiHandler::NewL()); VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ConstructL <=" ); } @@ -88,6 +88,11 @@ const TVmbxQueryMode & aMode, TDes& aNumber ) { VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowQueryL =>" ); + if ( !iUiHandler ) + { + VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowQueryL no qt env Exit" ) + User::Leave(KErrNotSupported); + } VMBLOGSTRING2( "VMBX: CVmbxUiUtilities::ShowQueryL: aNumber =%S ", &aNumber ); TInt result( KErrNone ); FOREVER @@ -122,13 +127,128 @@ break; }// number NULL } - }// End FOREVER; + }// End FOREVER VMBLOGSTRING2( "VMBX: CVmbxUiUtilities::ShowQueryL: result=%I ", result ); User::LeaveIfError( result ); VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowQueryL <=" ); } // --------------------------------------------------------------------------- +// VmbxUtilities::ShowInformationdNote +// +// --------------------------------------------------------------------------- +// +void CVmbxUiUtilities::ShowInformationdNoteL(const TVmbxNoteType aType ) + { + VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowInformationdNoteL =>" ); + if ( iUiHandler ) + { + iUiHandler->ShowInformationdNoteL( aType ); + } + VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowInformationdNoteL <=" ); + } + +// --------------------------------------------------------------------------- +// VmbxUtilities::ShowDefineSelectionDialogL +// Show define number in selection list +// --------------------------------------------------------------------------- +// +void CVmbxUiUtilities::ShowDefineSelectionDialogL( TVmbxType& aType, + TInt& aResult ) + { + VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowDefineSelectionDialogL =>" ); + if (!iUiHandler ) + { + VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowDefineSelectionDialogL\ + no qt env Exit" ) + User::Leave(KErrNotSupported); + } + iUiHandler->ShowDefineSelectionDialogL( aType, aResult ); + VMBLOGSTRING3( "VMBX: CVmbxUiUtilities::ShowDefineSelectionDialogL: \ + aType=%I, aResult=%I <=", aType, aResult ); + VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowDefineSelectionDialogL <=" ); + } + +// --------------------------------------------------------------------------- +// VmbxUtilities::ShowCallSelectionDialogL +// Show call number in selection list +// --------------------------------------------------------------------------- +// +void CVmbxUiUtilities::ShowCallSelectionDialogL( + const RPointerArray& aArray, + TVoiceMailboxParams& aParams, + TInt& aResult ) + { + VMBLOGSTRING("VMBX: CVmbxUiUtilities::ShowCallSelectionDialogL =>"); + if (!iUiHandler) + { + VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowCallSelectionDialogL\ + no qt env Exit" ) + User::Leave(KErrNotSupported); + } + if ( aArray.Count() < 1 ) + { + User::Leave( KErrArgument ); + } + iUiHandler->ShowCallSelectionDialogL( aArray, aParams, aResult ); + VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowCallSelectionDialogL <=" ); + } + +// -------------------------------------------------------------------------- +// CVmbxUiUtilities::ShowNotAllowedEditingDialogL +// -------------------------------------------------------------------------- +// +void CVmbxUiUtilities::ShowNotAllowedEditingDialogL() + { + VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowNotAllowedEditingDialogL =>" ); + // Information user can't edit. + if ( iUiHandler) + { + iUiHandler->ShowInformationdNoteL( ENotAllowUserEditing ); + } + VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowNotAllowedEditingDialogL <=" ); + } + +// --------------------------------------------------------------------------- +// VmbxUtilities::ShowInvalidWarningDialogL +// +// --------------------------------------------------------------------------- +// +void CVmbxUiUtilities::ShowInvalidWarningDialogL() + { + VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowInvalidWarningDialogL =>" ); + if ( iUiHandler) + { + iUiHandler->ShowInformationdNoteL( EInvalidNumber ); + } + VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowInvalidWarningDialogL <=" ); + } + +// --------------------------------------------------------------------------- +// VmbxUtilities::DismissDialogL +// Tries to close all open dialogs +// --------------------------------------------------------------------------- +// +void CVmbxUiUtilities::DismissDialogL() + { + VMBLOGSTRING( + "VMBX: CVmbxUiUtilities::DismissDialogL EMPTY IMPLEMENTATION!=>" ); + VMBLOGSTRING( "VMBX: CVmbxUiUtilities::DismissDialogL <=" ); + } + +// Commented out because branding is not supported yet. +// --------------------------------------------------------------------------- +// CVmbxUiUtilities::GetVmbxImageL +// +// --------------------------------------------------------------------------- +/* +CGulIcon* CVmbxUiUtilities::GetVmbxImageL( + const TVoiceMailboxParams& aParams ) + { + VMBLOGSTRING( "VMBX: CVmbxUiUtilities::GetVmbxImageL" ); +*/ + +// --------------------------------------------------------------------------- // VmbxUtilities::ShowQueryDialogL // Show query dialog // --------------------------------------------------------------------------- @@ -143,113 +263,19 @@ { VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowQueryDialogL: \ User::Leave( KErrNotSupported )" ); - User::Leave( KErrNotSupported ); + User::Leave( KErrArgument ); } VMBLOGSTRING2( "VMBX: CVmbxUiUtilities::ShowQueryDialogL: in\ aNumber = %S", &aNumber ); // to show dialog via qt part VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowQueryDialogL to show qt" ); - iUiHandler->ShowVmbxQueryDialog( aType, aNumber, aResult ); + iUiHandler->ShowVmbxQueryDialogL( aType, aNumber, aResult ); VMBLOGSTRING2( "VMBX: CVmbxUiUtilities::ShowQueryDialogL: out\ aNumber = %S", &aNumber ); VMBLOGSTRING2( "VMBX: CVmbxUiUtilities::ShowQueryDialogL: aResult=%I <=", aResult ); } -// --------------------------------------------------------------------------- -// VmbxUtilities::ShowInvalidWarningDialogL -// -// --------------------------------------------------------------------------- -// -void CVmbxUiUtilities::ShowInvalidWarningDialogL() - { - VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowInvalidWarningDialogL =>" ); - iUiHandler->ShowInformationdNoteL( EInvalidNumber ); - VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowInvalidWarningDialogL <=" ); - } - -// --------------------------------------------------------------------------- -// VmbxUtilities::ShowInformationdNote -// -// --------------------------------------------------------------------------- -// -void CVmbxUiUtilities::ShowInformationdNoteL(const TVmbxNoteType aType ) - { - VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowInformationdNoteL =>" ); - iUiHandler->ShowInformationdNoteL( aType ); - VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowInformationdNoteL <=" ); - } - -// --------------------------------------------------------------------------- -// VmbxUtilities::ShowDefineSelectionDialog -// Show define number in selection list -// --------------------------------------------------------------------------- -// -void CVmbxUiUtilities::ShowDefineSelectionDialog( TVmbxType& aType, - TInt& aResult ) - { - VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowDefineSelectionDialogL =>" ); - iUiHandler->ShowDefineSelectionDialog( aType, aResult ); - VMBLOGSTRING3( "VMBX: CVmbxUiUtilities::ShowDefineSelectionDialogL: \ - aType=%I, aResult=%I <=", aType, aResult ); - VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowDefineSelectionDialogL <=" ); - } - -// --------------------------------------------------------------------------- -// VmbxUtilities::ShowCallSelectionDialogL -// Show call number in selection list -// --------------------------------------------------------------------------- -// -void CVmbxUiUtilities::ShowCallSelectionDialogL( - const RPointerArray& aArray, - TVoiceMailboxParams& aParams, - TInt& aResult ) - { - VMBLOGSTRING("VMBX: CVmbxUiUtilities::ShowCallSelectionDialogL =>"); - if ( aArray.Count() < 1 ) - { - User::Leave(KErrArgument); - } - iUiHandler->ShowCallSelectionDialogL( aArray, aParams, aResult ); - VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowCallSelectionDialogL <=" ); - } - -// --------------------------------------------------------------------------- -// VmbxUtilities::DismissDialogL -// Tries to close all open dialogs -// --------------------------------------------------------------------------- -// -void CVmbxUiUtilities::DismissDialogL() - { - VMBLOGSTRING( - "VMBX: CVmbxUiUtilities::DismissDialogL EMPTY IMPLEMENTATION!=>" ); - VMBLOGSTRING( "VMBX: CVmbxUiUtilities::DismissDialogL <=" ); - } - -// Commented out because branding is not supported yet. -// --------------------------------------------------------------------------- -// CVmbxUiUtilities::GetVmbxImageL -// -// --------------------------------------------------------------------------- -/* -CGulIcon* CVmbxUiUtilities::GetVmbxImageL( - const TVoiceMailboxParams& aParams ) - { - VMBLOGSTRING( "VMBX: CVmbxUiUtilities::GetVmbxImageL" ); -*/ - -// -------------------------------------------------------------------------- -// CVmbxUiUtilities::ShowNotAllowedEditingDialog -// -------------------------------------------------------------------------- -// -void CVmbxUiUtilities::ShowNotAllowedEditingDialogL() - { - VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowNotAllowedEditingDialogL =>" ); - // Information user can't edit. - iUiHandler->ShowInformationdNoteL( ENotAllowUserEditing ); - VMBLOGSTRING( "VMBX: CVmbxUiUtilities::ShowNotAllowedEditingDialogL <=" ); - } - // ----------------------------------------------------------------------------- // CVmbxUiUtilities::FetchNumberFromPhonebook2L // Create and show Phonebook's Single Fetch Dialog