--- a/cmmanager/gsconnsettingsplugin/src/gsconnsettingsselectiondlg.cpp Wed Jun 09 10:07:12 2010 +0300
+++ b/cmmanager/gsconnsettingsplugin/src/gsconnsettingsselectiondlg.cpp Mon Jun 21 16:06:29 2010 +0300
@@ -17,7 +17,6 @@
// Includes
#include "gsconnsettingsselectiondlg.h"
-#include <AknInfoPopupNoteController.h>
#include <StringLoader.h>
#include <eiklbo.h>
#include <gulalign.h>
@@ -34,42 +33,25 @@
// CGSConnSettingsSelectionDlg::NewL
// ---------------------------------------------------------------------------
//
-CGSConnSettingsSelectionDlg* CGSConnSettingsSelectionDlg::NewL(TInt aResourceID,
+CGSConnSettingsSelectionDlg* CGSConnSettingsSelectionDlg::NewL( TInt aResourceID,
TInt& aCurrentSelectionIndex,
- const MDesCArray* aItemArray,
- TInt aPopupResource)
+ const MDesCArray* aItemArray )
{
CGSConnSettingsSelectionDlg* self = new( ELeave ) CGSConnSettingsSelectionDlg(
aResourceID,
aCurrentSelectionIndex,
- aItemArray,
- aPopupResource );
- CleanupStack::PushL( self );
- self->ConstructL( aPopupResource );
- CleanupStack::Pop( self );
+ aItemArray );
return self;
}
// ---------------------------------------------------------------------------
-// CGSConnSettingsSelectionDlg::ConstructL
-// ---------------------------------------------------------------------------
-//
-void CGSConnSettingsSelectionDlg::ConstructL( TInt aPopupResource)
- {
- iPopupController = CAknInfoPopupNoteController::NewL();
- iPopupItems = iCoeEnv->ReadDesC16ArrayResourceL( aPopupResource );
-// ShowInfoPopupL();
- }
-
-// ---------------------------------------------------------------------------
// CGSConnSettingsSelectionDlg::CGSConnSettingsSelectionDlg
// ---------------------------------------------------------------------------
//
CGSConnSettingsSelectionDlg::CGSConnSettingsSelectionDlg(
TInt aResourceID,
TInt& aCurrentSelectionIndex,
- const MDesCArray* aItemArray,
- TInt /* aPopupResource */)
+ const MDesCArray* aItemArray )
: CAknRadioButtonSettingPage(
aResourceID,
aCurrentSelectionIndex,
@@ -84,16 +66,6 @@
//
CGSConnSettingsSelectionDlg::~CGSConnSettingsSelectionDlg()
{
- if ( iPopupController )
- {
- delete iPopupController;
- }
-
- if ( iPopupItems )
- {
- iPopupItems->Reset();
- delete iPopupItems;
- }
}
// ---------------------------------------------------------------------------
@@ -102,17 +74,8 @@
//
TKeyResponse CGSConnSettingsSelectionDlg::OfferKeyEventL( const TKeyEvent& aKeyEvent, TEventCode aType)
{
- TKeyResponse response ( EKeyWasNotConsumed );
-
+ TKeyResponse response( EKeyWasNotConsumed );
response = CAknRadioButtonSettingPage::OfferKeyEventL( aKeyEvent, aType );
-
- //EKeyNull enables here launching of popup note immediately when we enter the setting page
- if ( aKeyEvent.iCode == EKeyNull ||
- aKeyEvent.iCode == EKeyUpArrow ||
- aKeyEvent.iCode == EKeyDownArrow )
- {
- ShowInfoPopupL();
- }
return response;
}
@@ -124,28 +87,7 @@
CEikListBox* aListBox,
TListBoxEvent aEventType )
{
- if ( aEventType == EEventItemClicked ||
- aEventType == EEventItemSingleClicked )
- {
- ShowInfoPopupL();
- }
- CAknRadioButtonSettingPage::HandleListBoxEventL(aListBox, aEventType);
- }
-
-// ---------------------------------------------------------------------------
-// CGSConnSettingsSelectionDlg::ShowInfoPopupL
-// ---------------------------------------------------------------------------
-//
-void CGSConnSettingsSelectionDlg::ShowInfoPopupL()
- {
- TInt currentIndex = this->ListBoxControl()->CurrentItemIndex();
-
- iPopupController->HideInfoPopupNote();
-
- iPopupController->SetTextL( (*iPopupItems)[currentIndex] );
- iPopupController->SetTimeDelayBeforeShow( 500 );
- iPopupController->SetTimePopupInView( 0 ); //Zero means that popup stays in screen until it is destroyed
- iPopupController->ShowInfoPopupNote();
+ CAknRadioButtonSettingPage::HandleListBoxEventL( aListBox, aEventType );
}
// End of file