diff -r 2f259fa3e83a -r 8ca85d2f0db7 uifw/AvKon/src/AknProgressDialog.cpp --- a/uifw/AvKon/src/AknProgressDialog.cpp Tue Feb 02 01:00:49 2010 +0200 +++ b/uifw/AvKon/src/AknProgressDialog.cpp Fri Feb 19 23:04:46 2010 +0200 @@ -30,6 +30,8 @@ #include "aknnoteattributes.h" #include +#include "akntrace.h" + #ifdef RD_UI_TRANSITION_EFFECTS_POPUPS #include @@ -101,6 +103,8 @@ TInt anInterval,CEikDialog** aSelfPtr) : CAknNoteDialog(aSelfPtr),iInternalTimerControl(ETrue) { + _AKNTRACE_FUNC_ENTER; + _AKNTRACE("aFinalValue = %d anIncrement = %d anInterval = %d", aFinalValue, anIncrement, anInterval); #ifdef RD_UI_TRANSITION_EFFECTS_POPUPS GfxTransEffect::Register( this, KGfxWaitNoteControlUid ); #endif @@ -109,15 +113,18 @@ iModel.iIncrement = anIncrement; iModel.iRunning = EFalse; AKNTASHOOK_ADD( this, "CAknProgressDialog" ); + _AKNTRACE_FUNC_EXIT; } EXPORT_C CAknProgressDialog::CAknProgressDialog(CEikDialog** aSelfPtr) : CAknNoteDialog(aSelfPtr),iInternalTimerControl(EFalse) { + _AKNTRACE_FUNC_ENTER; #ifdef RD_UI_TRANSITION_EFFECTS_POPUPS GfxTransEffect::Register( this, KGfxWaitNoteControlUid ); #endif AKNTASHOOK_ADD( this, "CAknProgressDialog" ); + _AKNTRACE_FUNC_EXIT; } EXPORT_C CAknProgressDialog::CAknProgressDialog(CEikDialog** aSelfPtr, @@ -126,14 +133,18 @@ iVisibilityDelayOff( aVisibilityDelayOff ), iInternalTimerControl(EFalse) { + _AKNTRACE_FUNC_ENTER; + _AKNTRACE("iVisibilityDelayOff = %d ", aVisibilityDelayOff); #ifdef RD_UI_TRANSITION_EFFECTS_POPUPS GfxTransEffect::Register( this, KGfxWaitNoteControlUid ); #endif AKNTASHOOK_ADD( this, "CAknProgressDialog" ); + _AKNTRACE_FUNC_EXIT; } EXPORT_C CAknProgressDialog::~CAknProgressDialog() { + _AKNTRACE_FUNC_ENTER; AKNTASHOOK_REMOVE(); if ( iInternalTimerControl ) { @@ -143,6 +154,7 @@ delete iCancelWhileHidden; delete iProgressTimer; delete iProgressDialogTimer; + _AKNTRACE_FUNC_EXIT; } EXPORT_C void CAknProgressDialog::PreLayoutDynInitL() @@ -175,6 +187,8 @@ TInt CAknProgressDialog::DialogTimerEvent() { + _AKNTRACE_FUNC_ENTER; + _AKNTRACE("CAknProgressDialog::DialogTimerEvent iState = %d", iState); switch ( iState ) { case EProcessOnDisplayOff: @@ -259,11 +273,14 @@ delete iProgressDialogTimer; iProgressDialogTimer = NULL; } + _AKNTRACE_FUNC_EXIT; return KErrNone; } EXPORT_C void CAknProgressDialog::ProcessFinishedL() - { + { + _AKNTRACE_FUNC_ENTER; + _AKNTRACE("CAknProgressDialog::ProcessFinishedL iState = %d", iState); switch ( iState ) { case EProcessOnDisplayOff: @@ -281,10 +298,13 @@ default: break; } + _AKNTRACE_FUNC_EXIT; } EXPORT_C TInt CAknProgressDialog::RunLD() { + _AKNTRACE_FUNC_ENTER; + _AKNTRACE("RunLD iInternalTimerControl = %d iVisibilityDelayOff = %d", iInternalTimerControl, iVisibilityDelayOff); CAknNoteControl* note = NoteControl(); note->CreateProgressBarL(); @@ -338,7 +358,7 @@ iEikonEnv->EikAppUi()->AddToStackL(this,ECoeStackPriorityDialog,ECoeStackFlagRefusesAllKeys); } - + _AKNTRACE_FUNC_EXIT; return CAknNoteDialog::RunLD(); } @@ -388,20 +408,24 @@ EXPORT_C TBool CAknProgressDialog::OkToExitL(TInt aButtonId) { + _AKNTRACE_FUNC_ENTER; // if dialog is invisible and app isn't exiting, eg during view switch, // don't stop the progress dialog - it's most likely part of some // asynchronous operation. if ((iState == EProcessOnDisplayOff && !CAknEnv::AppWithShutterRunning()) || aButtonId == EAknSoftkeyEmpty ) { + _AKNTRACE("CAknProgressDialog::OkToExitL return for EProcessOnDisplayOff"); delete iCancelWhileHidden; iCancelWhileHidden = NULL; return EFalse; } if ( iCallback ) { + _AKNTRACE("CAknProgressDialog::OkToExitL succeed to execut DialogDismissedL"); iCallback->DialogDismissedL(aButtonId); } + _AKNTRACE_FUNC_EXIT; return ETrue; }