equal
deleted
inserted
replaced
76 '8', '8' }, |
76 '8', '8' }, |
77 { KDialerNoIcon, KDialerNoIcon, |
77 { KDialerNoIcon, KDialerNoIcon, |
78 '9', '9' }, |
78 '9', '9' }, |
79 { KDialerNoIcon, KDialerNoIcon, |
79 { KDialerNoIcon, KDialerNoIcon, |
80 EStdKeyNkpAsterisk, '*' }, |
80 EStdKeyNkpAsterisk, '*' }, |
81 { KDialerNoIcon, KDialerNoIcon, |
81 { EMbmDialerQgn_indi_dialer_internet, |
|
82 EMbmDialerQgn_indi_dialer_internet_mask, |
82 '0', '0' }, |
83 '0', '0' }, |
83 { KDialerNoIcon, KDialerNoIcon, |
84 { KDialerNoIcon, KDialerNoIcon, |
84 EStdKeyHash, '#' } |
85 EStdKeyHash, '#' } |
85 }; |
86 }; |
86 |
87 |
124 CDialerKeyPadContainer::CDialerKeyPadContainer( |
125 CDialerKeyPadContainer::CDialerKeyPadContainer( |
125 const CCoeControl& aContainer, |
126 const CCoeControl& aContainer, |
126 TDialerOperationMode aOperatingMode ) |
127 TDialerOperationMode aOperatingMode ) |
127 : CDialerContainerBase ( |
128 : CDialerContainerBase ( |
128 const_cast<CCoeControl&>(aContainer) ), |
129 const_cast<CCoeControl&>(aContainer) ), |
129 iOperatingMode( aOperatingMode ), |
130 iOperatingMode( aOperatingMode ) |
130 iButtonCount( KNumberOfButtons ) |
|
131 { |
131 { |
132 } |
132 } |
133 |
133 |
134 // Destructor |
134 // Destructor |
135 CDialerKeyPadContainer::~CDialerKeyPadContainer() |
135 CDialerKeyPadContainer::~CDialerKeyPadContainer() |
136 { |
136 { |
137 for ( TInt i = 0; i < iButtonCount; i++ ) |
137 iButtons.ResetAndDestroy(); |
138 { |
|
139 delete iButtons[i]; |
|
140 } |
|
141 iButtons.Close(); |
|
142 iCoeEnv->RemoveForegroundObserver( *this ); |
138 iCoeEnv->RemoveForegroundObserver( *this ); |
143 delete iKeyLabelManager; |
139 delete iKeyLabelManager; |
144 } |
140 } |
145 |
141 |
146 // --------------------------------------------------------------------------- |
142 // --------------------------------------------------------------------------- |
420 break; |
416 break; |
421 } |
417 } |
422 } |
418 } |
423 |
419 |
424 __ASSERT_ALWAYS( tappedButton, |
420 __ASSERT_ALWAYS( tappedButton, |
425 _L("CDialerKeyPadContainer::HandleControlEventL, invalid button handle")); |
421 _L("CDialerKeyPadContainer::HandleControlEventL, invalid button handle")); // TODO: This is meaningless statement, use either Panic or make this only comment. |
426 |
422 |
427 // Send key event to phone. |
423 // Send key event to phone. |
428 TKeyEvent keyEvent; |
424 TKeyEvent keyEvent; |
429 keyEvent.iScanCode = tappedButton->ScanCode(); |
425 keyEvent.iScanCode = tappedButton->ScanCode(); |
430 keyEvent.iModifiers = 0; |
426 keyEvent.iModifiers = 0; |