14 * Description: Native SISX SIF (Software Install Framework) plugin. |
14 * Description: Native SISX SIF (Software Install Framework) plugin. |
15 * |
15 * |
16 */ |
16 */ |
17 |
17 |
18 #include "sisxsifpluginuihandler.h" // CSisxSifPluginUiHandler |
18 #include "sisxsifpluginuihandler.h" // CSisxSifPluginUiHandler |
|
19 #include "sisxsifpluginerrorhandler.h" // CSisxSifPluginErrorHandler |
19 #include "sisxsifplugin.pan" // Panic codes |
20 #include "sisxsifplugin.pan" // Panic codes |
20 #include "sisxsifcleanuputils.h" // CleanupResetAndDestroyPushL |
21 #include "sisxsifcleanuputils.h" // CleanupResetAndDestroyPushL |
21 #include "sisxsifuiselectioncache.h" // CSisxUISelectionCache |
22 #include "sisxsifuiselectioncache.h" // CSisxUISelectionCache |
22 #include <sifui.h> // CSifUi |
23 #include <sifui.h> // CSifUi |
23 #include <sifuiappinfo.h> // CSifUiAppInfo |
24 #include <sifuiappinfo.h> // CSifUiAppInfo |
47 |
48 |
48 // --------------------------------------------------------------------------- |
49 // --------------------------------------------------------------------------- |
49 // CSisxSifPluginUiHandler::NewL() |
50 // CSisxSifPluginUiHandler::NewL() |
50 // --------------------------------------------------------------------------- |
51 // --------------------------------------------------------------------------- |
51 // |
52 // |
52 CSisxSifPluginUiHandler* CSisxSifPluginUiHandler::NewL( RFs& aFs ) |
53 CSisxSifPluginUiHandler* CSisxSifPluginUiHandler::NewL( RFs& aFs, |
|
54 CSisxSifPluginErrorHandler& aErrorHandler ) |
53 { |
55 { |
54 FLOG( _L("CSisxSifPluginUiHandler::NewL") ); |
56 FLOG( _L("CSisxSifPluginUiHandler::NewL") ); |
55 CSisxSifPluginUiHandler *self = new( ELeave ) CSisxSifPluginUiHandler( aFs ); |
57 CSisxSifPluginUiHandler *self = new( ELeave ) CSisxSifPluginUiHandler( aFs, aErrorHandler ); |
56 CleanupStack::PushL( self ); |
58 CleanupStack::PushL( self ); |
57 self->ConstructL(); |
59 self->ConstructL(); |
58 CleanupStack::Pop( self ); |
60 CleanupStack::Pop( self ); |
59 return self; |
61 return self; |
60 } |
62 } |
86 // --------------------------------------------------------------------------- |
88 // --------------------------------------------------------------------------- |
87 // CSisxSifPluginUiHandler::DisplayErrorL() |
89 // CSisxSifPluginUiHandler::DisplayErrorL() |
88 // --------------------------------------------------------------------------- |
90 // --------------------------------------------------------------------------- |
89 // |
91 // |
90 void CSisxSifPluginUiHandler::DisplayErrorL( const Swi::CAppInfo& /*aAppInfo*/, |
92 void CSisxSifPluginUiHandler::DisplayErrorL( const Swi::CAppInfo& /*aAppInfo*/, |
91 Swi::TErrorDialog /*aType*/, const TDesC& /*aParam*/ ) |
93 Swi::TErrorDialog aType, const TDesC& aParam ) |
92 { |
94 { |
93 FLOG( _L("CSisxSifPluginUiHandler::DisplayErrorL") ); |
95 FLOG( _L("CSisxSifPluginUiHandler::DisplayErrorL") ); |
|
96 SetDisplayErrorL( aType, aParam ); |
94 } |
97 } |
95 |
98 |
96 // --------------------------------------------------------------------------- |
99 // --------------------------------------------------------------------------- |
97 // CSisxSifPluginUiHandler:: |
100 // CSisxSifPluginUiHandler:: |
98 // --------------------------------------------------------------------------- |
101 // --------------------------------------------------------------------------- |
436 |
439 |
437 // --------------------------------------------------------------------------- |
440 // --------------------------------------------------------------------------- |
438 // CSisxSifPluginUiHandler::DisplayFailedL() |
441 // CSisxSifPluginUiHandler::DisplayFailedL() |
439 // --------------------------------------------------------------------------- |
442 // --------------------------------------------------------------------------- |
440 // |
443 // |
441 void CSisxSifPluginUiHandler::DisplayFailedL( TErrorCategory /*aCategory*/, |
444 void CSisxSifPluginUiHandler::DisplayFailedL( const CSisxSifPluginErrorHandler& aError ) |
442 TInt aErrorCode, const TDesC& aErrorMessage, const TDesC& /*aErrorDetails*/ ) |
445 { |
443 { |
446 FLOG_1( _L("CSisxSifPluginUiHandler::DisplayFailedL, error code %d"), aError.ErrorCode() ); |
444 FLOG_1( _L("CSisxSifPluginUiHandler::DisplayFailedL, aError=%d"), aErrorCode ); |
|
445 |
447 |
446 // TODO: add error details |
448 // TODO: add error details |
447 iSifUi->ShowFailedL( aErrorCode, aErrorMessage ); |
449 iSifUi->ShowFailedL( aError.ErrorCode(), aError.ErrorMessage() ); |
448 } |
450 } |
449 |
451 |
450 // --------------------------------------------------------------------------- |
452 // --------------------------------------------------------------------------- |
451 // CSisxSifPluginUiHandler::CSisxSifPluginUiHandler() |
453 // CSisxSifPluginUiHandler::CSisxSifPluginUiHandler() |
452 // --------------------------------------------------------------------------- |
454 // --------------------------------------------------------------------------- |
453 // |
455 // |
454 CSisxSifPluginUiHandler::CSisxSifPluginUiHandler( RFs& aFs ) : |
456 CSisxSifPluginUiHandler::CSisxSifPluginUiHandler( RFs& aFs, |
455 CSisxSifPluginUiHandlerBase( aFs ) |
457 CSisxSifPluginErrorHandler& aErrorHandler ) : |
|
458 CSisxSifPluginUiHandlerBase( aFs, aErrorHandler ) |
456 { |
459 { |
457 } |
460 } |
458 |
461 |
459 // --------------------------------------------------------------------------- |
462 // --------------------------------------------------------------------------- |
460 // CSisxSifPluginUiHandler::ConstructL() |
463 // CSisxSifPluginUiHandler::ConstructL() |