diff -r 7333d7932ef7 -r 8b7f4e561641 iaupdate/IAD/ui/src/iaupdateagreement.cpp --- a/iaupdate/IAD/ui/src/iaupdateagreement.cpp Tue Aug 31 15:21:33 2010 +0300 +++ b/iaupdate/IAD/ui/src/iaupdateagreement.cpp Wed Sep 01 12:22:02 2010 +0100 @@ -18,15 +18,18 @@ //INCLUDES -#include -#include -#include #include "iaupdateagreement.h" #include "iaupdatefirsttimeinfo.h" +#include "iaupdatedialogutil.h" #include "iaupdate.hrh" #include "iaupdateprivatecrkeys.h" +#include +#include +#include // CAknMessageQueryDialog +#include +#include // ================= MEMBER FUNCTIONS ======================= @@ -107,6 +110,11 @@ accepted = ETrue; firstTimeInfo->SetAgreementAcceptedL(); } + else if ( ShowDialogL( R_IAUPDATE_SOFTKEYS_ACCEPT_DECLINE__ACCEPT ) == EAknSoftkeyYes ) + { + accepted = ETrue; + firstTimeInfo->SetAgreementAcceptedL(); + } } CleanupStack::PopAndDestroy( firstTimeInfo ); return accepted; @@ -126,6 +134,18 @@ + + +// --------------------------------------------------------------------------- +// CIAUpdateAgreement::ShowAgreementL +// +// --------------------------------------------------------------------------- +// +void CIAUpdateAgreement::ShowAgreementL() + { + ShowDialogL( R_AVKON_SOFTKEYS_OK_EMPTY ); + } + // --------------------------------------------------------------------------- // CIAUpdateAgreement::AgreementAcceptedL // @@ -139,9 +159,14 @@ return ret; } - - - /*HBufC* text_1 = StringLoader::LoadLC( R_IAUPDATE_AGREEMENT_DIALOG_TEXT_1 ); +// --------------------------------------------------------------------------- +// CIAUpdateAgreement::ShowDialogL +// +// --------------------------------------------------------------------------- +// +TInt CIAUpdateAgreement::ShowDialogL( TInt aCbaResourceId ) + { + HBufC* text_1 = StringLoader::LoadLC( R_IAUPDATE_AGREEMENT_DIALOG_TEXT_1 ); HBufC* text_2 = StringLoader::LoadLC( R_IAUPDATE_AGREEMENT_DIALOG_TEXT_2 ); HBufC* text_3 = StringLoader::LoadLC( R_IAUPDATE_AGREEMENT_DIALOG_TEXT_3 ); HBufC* text_4 = StringLoader::LoadLC( R_IAUPDATE_AGREEMENT_DIALOG_TEXT_4 ); @@ -155,7 +180,7 @@ CleanupStack::PushL( numberArray ); numberArray->AppendL( 2007 ); numberArray->AppendL( 2009 ); - //HBufC* text_copyright = StringLoader::LoadLC( R_IAUPDATE_AGREEMENT_DIALOG_COPYRIGHT, *numberArray ); + HBufC* text_copyright = StringLoader::LoadLC( R_IAUPDATE_AGREEMENT_DIALOG_COPYRIGHT, *numberArray ); TPtr ptr = text_copyright->Des(); AknTextUtils::DisplayTextLanguageSpecificNumberConversion( ptr ); @@ -205,8 +230,7 @@ TInt ret = dlg->RunLD(); - return ret;*/ - //return KErrNone; - + return ret; + } // End of File