160 // --------------------------------------------------------------------------- |
160 // --------------------------------------------------------------------------- |
161 // CSifUiPrivate::ShowProgressL() |
161 // CSifUiPrivate::ShowProgressL() |
162 // --------------------------------------------------------------------------- |
162 // --------------------------------------------------------------------------- |
163 // |
163 // |
164 void CSifUiPrivate::ShowProgressL( const CSifUiAppInfo& aAppInfo, |
164 void CSifUiPrivate::ShowProgressL( const CSifUiAppInfo& aAppInfo, |
165 TInt aProgressBarFinalValue ) |
165 TInt aProgressBarFinalValue, CSifUi::TInstallingPhase aPhase ) |
166 { |
166 { |
167 ChangeNoteTypeL( ESifUiProgressNote ); |
167 ChangeNoteTypeL( ESifUiProgressNote ); |
168 |
168 |
169 AddParamsAppInfoL( aAppInfo ); |
169 AddParamsAppInfoL( aAppInfo ); |
170 AddParamL( KSifUiProgressNoteFinalValue, aProgressBarFinalValue ); |
170 AddParamL( KSifUiProgressNoteFinalValue, aProgressBarFinalValue ); |
171 iProgressBarFinalValue = aProgressBarFinalValue; |
171 iProgressBarFinalValue = aProgressBarFinalValue; |
|
172 AddParamL( KSifUiProgressNotePhase, aPhase ); |
|
173 iInstallingPhase = aPhase; |
172 AddParamsHiddenButtonsL(); |
174 AddParamsHiddenButtonsL(); |
173 |
175 |
174 UpdateDialogOrIndicatorWithoutWaitingL(); |
176 UpdateDialogOrIndicatorWithoutWaitingL(); |
175 } |
177 } |
176 |
178 |
535 if( iAppInfo ) |
538 if( iAppInfo ) |
536 { |
539 { |
537 AddParamsAppInfoL( *iAppInfo ); |
540 AddParamsAppInfoL( *iAppInfo ); |
538 } |
541 } |
539 AddParamsCertificatesL(); |
542 AddParamsCertificatesL(); |
|
543 if( iProgressBarFinalValue ) |
|
544 { |
|
545 AddParamL( KSifUiProgressNoteFinalValue, iProgressBarFinalValue ); |
|
546 } |
|
547 if( iProgressBarCurrentValue ) |
|
548 { |
|
549 AddParamL( KSifUiProgressNoteValue, iProgressBarCurrentValue ); |
|
550 } |
|
551 AddParamL( KSifUiProgressNotePhase, iInstallingPhase ); |
|
552 AddParamsHiddenButtonsL(); |
540 // TODO: AddParamsIconL(); |
553 // TODO: AddParamsIconL(); |
541 AddParamsHiddenButtonsL(); |
|
542 } |
554 } |
543 |
555 |
544 // --------------------------------------------------------------------------- |
556 // --------------------------------------------------------------------------- |
545 // CSifUiPrivate::ActivateInstallIndicatorL() |
557 // CSifUiPrivate::ActivateInstallIndicatorL() |
546 // --------------------------------------------------------------------------- |
558 // --------------------------------------------------------------------------- |
551 { |
563 { |
552 iIndicator = CHbIndicatorSymbian::NewL(); |
564 iIndicator = CHbIndicatorSymbian::NewL(); |
553 iIndicator->SetObserver( this ); |
565 iIndicator->SetObserver( this ); |
554 } |
566 } |
555 |
567 |
|
568 UpdateInstallIndicatorProgressL(); |
|
569 } |
|
570 |
|
571 // --------------------------------------------------------------------------- |
|
572 // CSifUiPrivate::UpdateInstallIndicatorProgressL() |
|
573 // --------------------------------------------------------------------------- |
|
574 // |
|
575 void CSifUiPrivate::UpdateInstallIndicatorProgressL() |
|
576 { |
|
577 CHbSymbianVariantMap* parameters = CHbSymbianVariantMap::NewL(); |
|
578 CleanupStack::PushL( parameters ); |
|
579 |
|
580 CHbSymbianVariant* param = NULL; |
|
581 |
556 if( iAppInfo && iAppInfo->Name().Length() ) |
582 if( iAppInfo && iAppInfo->Name().Length() ) |
557 { |
583 { |
558 CHbSymbianVariant* param = NULL; |
|
559 TPtrC appName = iAppInfo->Name(); |
584 TPtrC appName = iAppInfo->Name(); |
560 param = CHbSymbianVariant::NewL( &appName, CHbSymbianVariant::EDes ); |
585 param = CHbSymbianVariant::NewL( &appName, CHbSymbianVariant::EDes ); |
561 CleanupStack::PushL( param ); |
586 parameters->Add( KSifUiInstallIndicatorAppName, param ); |
562 iIndicator->Activate( KSifUiInstallIndicatorType, param ); |
587 } |
563 CleanupStack::PopAndDestroy( param ); |
588 if( iInstallingPhase ) |
564 } |
589 { |
565 else |
590 param = CHbSymbianVariant::NewL( &iInstallingPhase, CHbSymbianVariant::EInt ); |
566 { |
591 parameters->Add( KSifUiInstallIndicatorPhase, param ); |
567 iIndicator->Activate( KSifUiInstallIndicatorType ); |
592 } |
568 } |
|
569 } |
|
570 |
|
571 // --------------------------------------------------------------------------- |
|
572 // CSifUiPrivate::UpdateInstallIndicatorProgressL() |
|
573 // --------------------------------------------------------------------------- |
|
574 // |
|
575 void CSifUiPrivate::UpdateInstallIndicatorProgressL() |
|
576 { |
|
577 if( iProgressBarFinalValue ) |
593 if( iProgressBarFinalValue ) |
578 { |
594 { |
579 CHbSymbianVariant* param = NULL; |
|
580 TInt progressPercent = KProgFull * iProgressBarCurrentValue / iProgressBarFinalValue; |
595 TInt progressPercent = KProgFull * iProgressBarCurrentValue / iProgressBarFinalValue; |
581 param = CHbSymbianVariant::NewL( &progressPercent, CHbSymbianVariant::EInt ); |
596 param = CHbSymbianVariant::NewL( &progressPercent, CHbSymbianVariant::EInt ); |
582 CleanupStack::PushL( param ); |
597 parameters->Add( KSifUiInstallIndicatorProgress, param ); |
583 iIndicator->Activate( KSifUiInstallIndicatorType, param ); |
598 } |
584 CleanupStack::PopAndDestroy( param ); |
599 |
585 } |
600 // TODO: should both install indicator and device dialog use the same variant map? |
|
601 |
|
602 param = CHbSymbianVariant::NewL( parameters, CHbSymbianVariant::EVariantMap ); |
|
603 CleanupStack::Pop( parameters ); |
|
604 CleanupStack::PushL( param ); |
|
605 iIndicator->Activate( KSifUiInstallIndicatorType, param ); |
|
606 CleanupStack::PopAndDestroy( param ); |
586 } |
607 } |
587 |
608 |
588 // --------------------------------------------------------------------------- |
609 // --------------------------------------------------------------------------- |
589 // CSifUiPrivate::CloseInstallIndicator() |
610 // CSifUiPrivate::CloseInstallIndicator() |
590 // --------------------------------------------------------------------------- |
611 // --------------------------------------------------------------------------- |