equal
deleted
inserted
replaced
35 #include "wmplugin.h" |
35 #include "wmplugin.h" |
36 #include "wmeffectmanager.h" |
36 #include "wmeffectmanager.h" |
37 #include "wmwidgetdata.h" |
37 #include "wmwidgetdata.h" |
38 #include "wminstaller.h" |
38 #include "wminstaller.h" |
39 #include "wmlistbox.h" |
39 #include "wmlistbox.h" |
|
40 #include "wmconfiguration.h" |
40 |
41 |
41 const TInt KExecuteCommandDelay( 50000 ); // 50ms |
42 const TInt KExecuteCommandDelay( 50000 ); // 50ms |
42 const TInt KMaxCmdExecutionCount( 6 ); |
43 const TInt KMaxCmdExecutionCount( 6 ); |
43 |
44 |
44 // --------------------------------------------------------- |
45 // --------------------------------------------------------- |
75 // delete members |
76 // delete members |
76 delete iResourceLoader; |
77 delete iResourceLoader; |
77 delete iEffectManager; |
78 delete iEffectManager; |
78 delete iPostponedContent; |
79 delete iPostponedContent; |
79 delete iWmInstaller; |
80 delete iWmInstaller; |
|
81 delete iConfiguration; |
80 } |
82 } |
81 |
83 |
82 // --------------------------------------------------------- |
84 // --------------------------------------------------------- |
83 // CWmPlugin::CWmPlugin |
85 // CWmPlugin::CWmPlugin |
84 // --------------------------------------------------------- |
86 // --------------------------------------------------------- |
138 CEikMenuBar* menuBar = CEikonEnv::Static()->AppUiFactory()->MenuBar(); |
140 CEikMenuBar* menuBar = CEikonEnv::Static()->AppUiFactory()->MenuBar(); |
139 if ( menuBar && menuBar->IsDisplayed() ) |
141 if ( menuBar && menuBar->IsDisplayed() ) |
140 { |
142 { |
141 menuBar->StopDisplayingMenuBar(); |
143 menuBar->StopDisplayingMenuBar(); |
142 } |
144 } |
143 |
145 |
|
146 // load configuration again, there might be change |
|
147 delete iConfiguration; |
|
148 iConfiguration = NULL; |
|
149 |
144 TRAP_IGNORE( |
150 TRAP_IGNORE( |
|
151 iConfiguration = CWmConfiguration::NewL( ResourceLoader() ); |
145 iEffectManager->BeginFullscreenEffectL( |
152 iEffectManager->BeginFullscreenEffectL( |
146 KAppStartEffectStyle ); |
153 KAppStartEffectStyle ); |
147 iViewAppUi->ActivateLocalViewL( |
154 iViewAppUi->ActivateLocalViewL( |
148 TUid::Uid( EWmMainContainerViewId ) ); |
155 TUid::Uid( EWmMainContainerViewId ) ); |
149 ); |
156 ); |
150 } |
157 } |
151 } |
158 } |
282 KExecuteCommandDelay, |
289 KExecuteCommandDelay, |
283 KExecuteCommandDelay, |
290 KExecuteCommandDelay, |
284 TCallBack( ExecuteCommand, this ) ); |
291 TCallBack( ExecuteCommand, this ) ); |
285 } |
292 } |
286 } |
293 } |
|
294 |
|
295 // delete config |
|
296 delete iConfiguration; |
|
297 iConfiguration = NULL; |
287 } |
298 } |
288 |
299 |
289 // --------------------------------------------------------- |
300 // --------------------------------------------------------- |
290 // CWmPlugin::ForwardNumericKeysToPhone |
301 // CWmPlugin::ForwardNumericKeysToPhone |
291 // --------------------------------------------------------- |
302 // --------------------------------------------------------- |
445 CWmInstaller& CWmPlugin::WmInstaller() |
456 CWmInstaller& CWmPlugin::WmInstaller() |
446 { |
457 { |
447 return *iWmInstaller; |
458 return *iWmInstaller; |
448 } |
459 } |
449 |
460 |
|
461 // ---------------------------------------------------- |
|
462 // CWmPlugin::Configuration |
|
463 // ---------------------------------------------------- |
|
464 // |
|
465 CWmConfiguration& CWmPlugin::Configuration() |
|
466 { |
|
467 return *iConfiguration; |
|
468 } |
|
469 |
450 // --------------------------------------------------------- |
470 // --------------------------------------------------------- |
451 // CWmPlugin::GetUnistalledWidget |
471 // CWmPlugin::GetUnistalledWidget |
452 // --------------------------------------------------------- |
472 // --------------------------------------------------------- |
453 // |
473 // |
454 CWmWidgetData* CWmPlugin::GetUninstalledWidgetByUid( TUid aUid ) |
474 CWmWidgetData* CWmPlugin::GetUninstalledWidgetByUid( TUid aUid ) |