MCL/sf/mw/appinstall: comparison appinstaller/AppinstUi/Plugin/CommonUI/Src/CUIDialogs.cpp

equal deleted inserted replaced

-:7333d7932ef7
+:8b7f4e561641
 // INCLUDE FILES
 #include <bautils.h>
 #include <eikenv.h>
 #include <StringLoader.h>
-//#include <AknQueryDialog.h>
+#include <AknQueryDialog.h>
 #include <eikprogi.h>
-//#include <aknnotewrappers.h>
+#include <aknnotewrappers.h>
 #include <data_caging_path_literals.hrh>
 #include <SWInstCommonUI.rsg>
-//#include <aknmessagequerydialog.h>
+#include <aknmessagequerydialog.h>
 #include <hlplch.h>
-//#include <csxhelp/am.hlp.hrh>
+#include <csxhelp/am.hlp.hrh>
 #include <coehelp.h>
 #include <featmgr.h>
 #include <sysutil.h>
 #ifdef RD_MULTIPLE_DRIVE
 #include <driveinfo.h>
 #endif //RD_MULTIPLE_DRIVE
-//#include <akninputblock.h>
+#include <akninputblock.h>
 #include "CUIDialogs.h"
 #include "CUIDriveUtils.h"
 #include "CUIWaitDialog.h"
 #include "CUIProgressDialog.h"
 TFileName fileName;
 fileName.Append( KDC_RESOURCE_FILES_DIR );
 fileName.Append( KCUIResourceFileName );
 iResourceFileOffset = CUIUtils::LoadResourceFileL( fileName, iCoeEnv );
-//    iAbsorber = CAknInputBlock::NewLC();
+iAbsorber = CAknInputBlock::NewLC();
-//    CleanupStack::Pop( iAbsorber );
+CleanupStack::Pop( iAbsorber );
 FeatureManager::InitializeLibL();
 }
 // -----------------------------------------------------------------------------
 if( iResourceFileOffset )
 {
 iCoeEnv->DeleteResourceFile( iResourceFileOffset );
 }
-//    delete iAbsorber;
+delete iAbsorber;
 FeatureManager::UnInitializeLib();
 }
 // -----------------------------------------------------------------------------
 //
 EXPORT_C TBool CCUIDialogs::ShowConfirmationQueryL( const TDesC& aDisplayString,
 TInt aSoftkeyResourceId ) const
 {
 TBool response( EFalse );
-/*
 CAknQueryDialog* note =
 CAknQueryDialog::NewL( CAknQueryDialog::EConfirmationTone );
 note->PrepareLC( R_SWCOMMON_GENERAL_CONFIRMATION_QUERY );
 note->SetPromptL( aDisplayString );
 if ( note->RunLD() )
 {
 response = ETrue;
 }
-*/
 return response;
 }
 // -----------------------------------------------------------------------------
 // CCUIDialogs::ShowDriveSelectionDialogL
 EXPORT_C TInt CCUIDialogs::ShowDriveSelectionDialogL(
 TInt64 aSize,
 const RArray<TDriveUnit>& aDriveUnits,
 const RArray<TInt64>& aDriveSpaces,
 TInt& aSelectionResult )
 {
 TInt result( KErrNone );
-/*
 // Sanity check
 if ( aSize <= 0 )
 {
 aSize = 1;
 }
 CleanupStack::PopAndDestroy( string );
 }
 }
 CleanupStack::PopAndDestroy( driveUtils );
-*/
 return result;
 }
 // -----------------------------------------------------------------------------
 // CCUIDialogs::ShowSecurityWarningDialogL
 // Show a security warning dialog.
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 EXPORT_C TBool CCUIDialogs::ShowSecurityWarningDialogL()
 {
 TBool result( EFalse );
-/*
 // Load resources
 HBufC* text = StringLoader::LoadLC( R_SWCOMMON_SECURITY_WARNING );
 HBufC* linkText = NULL;
 if ( FeatureManager::FeatureSupported( KFeatureIdHelp ) )
 {
 {
 result = ETrue;
 }
 CleanupStack::PopAndDestroy( 3, text ); // message, linkText, text
-*/
 return result;
 }
 // -----------------------------------------------------------------------------
 // CCUIDialogs::ShowErrorNoteL
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 EXPORT_C void CCUIDialogs::ShowErrorNoteL( const TDesC& aErrorText ) const
 {
-/*
 CAknErrorNote* note = new (ELeave) CAknErrorNote( ETrue );
 note->ExecuteLD( aErrorText );
-*/
 }
 // -----------------------------------------------------------------------------
 // CCUIDialogs::ResetProgressDialogL
 // Resets the progress bar in the progress dialog.
 const MDesCArray& aInstalledFolderArray,
 const CAknIconArray& aIconArray,
 TInt& aIndexOfAppToBeStarted ) const
 {
-/*
 aIndexOfAppToBeStarted = KErrNotFound;
 // Prepare for showing the installation complete query
 CDesCArray *itemArray = new( ELeave ) CDesCArrayFlat( 1 );
 CleanupStack::PushL( itemArray );
 else
 	{
 	aIndexOfAppToBeStarted = KErrNotFound;
 	}
 return appIsStarted;
-*/
-return EFalse;
 }
 // -----------------------------------------------------------------------------
 // CCUIDialogs::ShowUninstallConfirmationForSeveralAppsL
 // Show an installation complete query.
 EXPORT_C TBool CCUIDialogs::ShowUninstallConfirmationForSeveralAppsL(
 const TDesC& aApplicationGroup,
 const MDesCArray& aApplicationArray,
 TInt aSoftkeyResourceId ) const
 	{
-/*
 HBufC* appList = HBufC::NewLC( 0 );
 TInt count = aApplicationArray.MdcaCount();
 for ( TInt i = 0; i < count; i++ )
 	{
 	HBufC* tmp = appList;
 {
 response = ETrue;
 }
 CleanupStack::PopAndDestroy( message );
 return response;
-*/
-return EFalse;
 	}
 //
 // -----------------------------------------------------------------------------
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 TInt CCUIDialogs::ShowSecurityWarningHelp( TAny* aPtr )
 {
-//TRAP_IGNORE( reinterpret_cast<CCUIDialogs*>(aPtr)->LaunchHelpL( KAM_HLP_INSTALL_UNTRUSTED ) );
+TRAP_IGNORE( reinterpret_cast<CCUIDialogs*>(aPtr)->LaunchHelpL( KAM_HLP_INSTALL_UNTRUSTED ) );
 return KErrNone;
 }

branch	RCL_3
changeset 26	8b7f4e561641
parent 25	7333d7932ef7