--- a/appinstaller/AppinstUi/Plugin/CommonUI/Src/CUIDetailsDialog.cpp Thu Aug 19 10:02:49 2010 +0300
+++ b/appinstaller/AppinstUi/Plugin/CommonUI/Src/CUIDetailsDialog.cpp Tue Aug 31 15:21:33 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -18,16 +18,16 @@
// INCLUDE FILES
-#include <aknmessagequerydialog.h>
-#include <aknlistquerydialog.h> // remove
-#include <StringLoader.h>
+//#include <aknmessagequerydialog.h>
+//#include <aknlistquerydialog.h> // remove
+//#include <StringLoader.h>
#include <bautils.h>
#include <eikenv.h>
#include <data_caging_path_literals.hrh>
#include <SWInstCommonUI.rsg>
#include <pathinfo.h>
-#include <avkon.rsg>
-#include <drmuihandling.h> // DRM::CDrmUiHandling
+//#include <avkon.rsg>
+#include <DRMHelper.h>
#include "CUIDetailsDialog.h"
#include "CUICertificateDetailsDialog.h"
@@ -49,7 +49,7 @@
// -----------------------------------------------------------------------------
//
CCUIDetailsDialog::CCUIDetailsDialog()
- : iCbaResourceId( R_AVKON_SOFTKEYS_OK_EMPTY )
+// : iCbaResourceId( R_AVKON_SOFTKEYS_OK_EMPTY )
{
}
@@ -233,7 +233,7 @@
TInt CCUIDetailsDialog::ShowDialogL( MCUIInfoIterator& aIterator )
{
TInt result( 0 );
-
+/*
CleanupStack::PushL( this );
PopulateArrayL( aIterator );
@@ -279,7 +279,7 @@
result = dlg->RunLD();
CleanupStack::PopAndDestroy( 2 ); // message, this
-
+*/
return result;
}
@@ -344,6 +344,7 @@
//
HBufC* CCUIDetailsDialog::GetMessageDescriptorLC()
{
+ /*
TInt size( 0 );
TInt index( 0 );
@@ -380,8 +381,10 @@
CleanupStack::Pop( message );
CleanupStack::PopAndDestroy( 2, type );
CleanupStack::PushL( message );
-
- return message;
+
+ return message;
+ */
+ return NULL;
}
// -----------------------------------------------------------------------------
@@ -392,6 +395,7 @@
//
void CCUIDetailsDialog::AddCertificatesLC( HBufC*& aMessage )
{
+ /*
HBufC* certHeading = StringLoader::LoadLC( R_SWCOMMON_DETAIL_CERTIFICATES );
HBufC* certificateLink = LoadLinkLC( R_SWCOMMON_DETAIL_VALUE_VIEW_CERT );
HBufC* newString = HBufC::NewL( certHeading->Length() +
@@ -411,6 +415,7 @@
aMessage = newString;
CleanupStack::PushL( aMessage );
+ */
}
// -----------------------------------------------------------------------------
@@ -421,6 +426,7 @@
//
void CCUIDetailsDialog::AddDrmLC( HBufC*& aMessage )
{
+ /*
HBufC* drmHeading = StringLoader::LoadLC( R_SWCOMMON_DETAIL_DRM );
HBufC* drmLink = LoadLinkLC( R_SWCOMMON_DETAIL_VALUE_VIEW_DRM );
HBufC* newString = HBufC::NewL( drmHeading->Length() +
@@ -440,6 +446,7 @@
aMessage = newString;
CleanupStack::PushL( aMessage );
+ */
}
// -----------------------------------------------------------------------------
@@ -478,6 +485,7 @@
//
void CCUIDetailsDialog::DoShowCertificatesL()
{
+ /*
if ( iCommonCertificates.Count() > 1 )
{
CDesCArrayFlat *itemArray = new( ELeave ) CDesCArrayFlat( 2 );
@@ -520,7 +528,8 @@
CCUICertificateDetailsDialog::NewL();
certDlg->ExecuteLD( *( iCommonCertificates[0] ) );
- }
+ }
+ */
}
// -----------------------------------------------------------------------------
@@ -531,9 +540,9 @@
//
void CCUIDetailsDialog::DoShowDrmL()
{
- DRM::CDrmUiHandling *drmUiHandler = DRM::CDrmUiHandling::NewLC();
- drmUiHandler->ShowDetailsViewL( iFile );
- CleanupStack::PopAndDestroy( drmUiHandler );
+ CDRMHelper* helper = CDRMHelper::NewLC( *iCoeEnv );
+ helper->LaunchDetailsViewEmbeddedL( iFile );
+ CleanupStack::PopAndDestroy( helper );
}
// -----------------------------------------------------------------------------
@@ -544,6 +553,7 @@
//
HBufC* CCUIDetailsDialog::LoadLinkLC( TInt aResourceId )
{
+ /*
HBufC* link = StringLoader::LoadLC( aResourceId );
HBufC* tmp = link->ReAllocL( link->Length() + KLinkTagOpen().Length() + KLinkTagClose().Length() );
@@ -554,7 +564,9 @@
link->Des().Insert(0, KLinkTagOpen);
link->Des().Append( KLinkTagClose );
- return link;
+ return link;
+ */
+ return NULL;
}
// End of File