diff -r d17dc5398051 -r 329d304c1aa1 iaupdate/IAD/updater/inc/iaupdaterdialog.h --- a/iaupdate/IAD/updater/inc/iaupdaterdialog.h Fri Jun 11 13:45:18 2010 +0300 +++ b/iaupdate/IAD/updater/inc/iaupdaterdialog.h Thu Jun 24 12:37:54 2010 +0300 @@ -25,30 +25,26 @@ #include #include +#include + // FORWARD DECLARATIONS class MIAUpdaterCancelObserver; - /** * Class for showing the global note dialog when installing self update. -* -* @code -* @endcode -* @lib -* @since S60 */ -class CIAUpdaterDialog : public CActive +class CIAUpdaterDialog : public CBase, + public MHbDeviceProgressDialogObserver { public: /** * Two-phased constructor. */ - static CIAUpdaterDialog* NewL( RFs& aFs, MIAUpdaterCancelObserver& aObserver ); - + static CIAUpdaterDialog* NewL( MIAUpdaterCancelObserver& aObserver ); /** * Two-phased constructor. */ - static CIAUpdaterDialog* NewLC( RFs& aFs, MIAUpdaterCancelObserver& aObserver ); + static CIAUpdaterDialog* NewLC( MIAUpdaterCancelObserver& aObserver ); /** @@ -73,60 +69,59 @@ */ void CancelWaitingNoteL(); + /** + * From base class MHbDeviceProgressDialogObserver + */ + void ProgressDialogCancelled( + const CHbDeviceProgressDialogSymbian* aProgressDialog); + + /** + * From base class MHbDeviceProgressDialogObserver + */ + void ProgressDialogClosed( + const CHbDeviceProgressDialogSymbian* aProgressDialog); + + private: /** * Constructor. */ - CIAUpdaterDialog( RFs& aFs, MIAUpdaterCancelObserver& aObserver ); + CIAUpdaterDialog( MIAUpdaterCancelObserver& aObserver ); /** * 2nd phase constructor. */ void ConstructL(); - - /** - * Read resource string. - * @since - * @param aResourceId Id of the resource. - * @return Resource buffer. - */ - HBufC* ReadResourceLC( TInt aResourceId ); - -private: // from CActive - + /** - * Cancels async request - * @see CActive::DoCancel - * + * Destroy wait note. */ - void DoCancel(); - - /** - * When the server side has finished operation, the CActive object will - * be informed about it, and as a result RunL will be called. This function - * well inform the observer that the operation has been completed. - * @see CActive::RunL - * - */ - void RunL(); + void CIAUpdaterDialog::DestroyGlobalWaitNote(); + private: // data - // Resource file. - //RResourceFile iResourceFile; - - // File server handle. - RFs& iFs; - - //CAknGlobalNote* iNote; + /** + * Not owned, install observer. + */ + MIAUpdaterCancelObserver* iObserver; + /** + * Own, Global wait note. + */ + CHbDeviceProgressDialogSymbian* iGlobalWaitNote; - // Dialog id for canceling dialog. - TInt iNoteId; - - MIAUpdaterCancelObserver* iObserver; //not owned + /** + * Own, resouce of global note. + */ + HBufC* iGlobalResource; + + /** + * Check Load Success .ts file successfully or not + */ + TBool iIsResolverSuccess; };