diff -r 0410b3201a77 -r afe7195bb6c3 iaupdate/IAD/ui/inc/iaupdateuicontroller.h --- a/iaupdate/IAD/ui/inc/iaupdateuicontroller.h Tue Jun 15 13:36:10 2010 +0100 +++ b/iaupdate/IAD/ui/inc/iaupdateuicontroller.h Thu Jul 22 16:35:01 2010 +0100 @@ -28,6 +28,7 @@ #include "iaupdatecontrollerobserver.h" #include "iaupdatenodeobserver.h" #include "iaupdatewaitdialogobserver.h" +#include "iaupdatedialogobserver.h" #include "iaupdatestarterobserver.h" #include "iaupdateroaminghandlerobserver.h" #include "iaupdaterefreshobserver.h" @@ -48,10 +49,12 @@ class MIAUpdateHistory; class MIAUpdateFwNode; class IAUpdateWaitDialog; +class IAUpdateDialogUtil; class QString; class CIAUpdateNodeId; class CEikonEnv; +class HbAction; // CLASS DECLARATION @@ -66,7 +69,8 @@ public MIAUpdateWaitDialogObserver, public MIAUpdateStarterObserver, public MIAUpdateRoamingHandlerObserver, - public MIAUpdateRefreshObserver + public MIAUpdateRefreshObserver, + public IAUpdateDialogObserver { public: //new functions @@ -238,6 +242,13 @@ TBool ForcedRefresh() const; void SetForcedRefresh( TBool aForcedRefresh ); + + /** + * Set node list to normal state after update. + */ + void RefreshNodeList(); + + /** * Is client role "testing" * @@ -330,6 +341,10 @@ * This is called when the dialog is closed. */ void HandleWaitDialogCancel(); + +private: // From IAUpdateDialogObserver + + void dialogFinished(HbAction *action); private: // From MIAUpdateRefreshObserver @@ -354,6 +369,8 @@ private: // new functions + + void AgreementHandledL(); /** * Called when refreshing updates list is completed. @@ -546,6 +563,14 @@ ESelfUpdating }; + enum TDialogState + { + ENoDialog, + EAgreement, + EInsufficientMemory + }; + + MIAUpdateUiControllerObserver& iObserver; MIAUpdateController* iController; @@ -559,6 +584,8 @@ RPointerArray iPreviousSelections; RPointerArray iServicePackNodes; + + IAUpdateDialogUtil *mDialogUtil; IAUpdateWaitDialog *mWaitDialog; @@ -586,6 +613,8 @@ TState iState; + TDialogState iDialogState; + TBool iClosingAllowedByClient; CIAUpdateUiConfigData* iConfigData; @@ -605,6 +634,8 @@ TBool iForcedRefresh; TBool iTestRole; + + HbAction *mPrimaryAction; };