1128 } |
1128 } |
1129 } |
1129 } |
1130 //Added to remove Copy-option when sender number is not valid (for example it has alphabets) |
1130 //Added to remove Copy-option when sender number is not valid (for example it has alphabets) |
1131 if ( iFlags.iValidSenderNumber || IsBodyFocused() ) |
1131 if ( iFlags.iValidSenderNumber || IsBodyFocused() ) |
1132 { |
1132 { |
|
1133 iFindItemMenu->SetSenderHighlightStatus( ( senderHighlighted && |
|
1134 iView->ControlById( EMsgComponentIdFrom ) == iView->FocusedControl() ) ); |
|
1135 iFindItemMenu->SetSenderDisplayText( senderNumber ); |
1133 if( !iFlags.iVoIPNumber ) |
1136 if( !iFlags.iVoIPNumber ) |
1134 { |
1137 { |
1135 iFindItemMenu->SetSenderHighlightStatus( |
|
1136 iView->ControlById( EMsgComponentIdFrom ) == iView->FocusedControl() ); |
|
1137 iFindItemMenu->SetSenderDisplayText( senderNumber ); |
|
1138 iFindItemMenu->AddItemFindMenuL( |
1138 iFindItemMenu->AddItemFindMenuL( |
1139 FindItemHighlighted() ? iView->ItemFinder() : 0, |
1139 FindItemHighlighted() ? iView->ItemFinder() : 0, |
1140 aMenuPane, EFindItemMenuPlaceHolder, |
1140 aMenuPane, EFindItemMenuPlaceHolder, |
1141 senderNumber, |
1141 senderNumber, |
1142 iFlags.iIsEmailMessage ? EFalse : ( iRecipientstring.Length() != 0 ) ); |
1142 iFlags.iIsEmailMessage ? EFalse : ( iRecipientstring.Length() != 0 ) ); |
1143 } |
1143 } |
1144 else |
1144 else |
1145 { |
1145 { |
1146 iFindItemMenu->SetSenderHighlightStatus( |
|
1147 iView->ControlById( EMsgComponentIdFrom ) == iView->FocusedControl() ); |
|
1148 iFindItemMenu->SetSenderDisplayText( senderNumber ); |
|
1149 iFindItemMenu->AddItemFindMenuL( |
1146 iFindItemMenu->AddItemFindMenuL( |
1150 FindItemHighlighted() ? iView->ItemFinder() : 0, |
1147 FindItemHighlighted() ? iView->ItemFinder() : 0, |
1151 aMenuPane, EFindItemMenuPlaceHolder, |
1148 aMenuPane, EFindItemMenuPlaceHolder, |
1152 senderNumber, |
1149 senderNumber, |
1153 ETrue ); |
1150 ETrue ); |
2057 } |
2054 } |
2058 |
2055 |
2059 //to reduce flickering after sending a message. |
2056 //to reduce flickering after sending a message. |
2060 if (!(iEditorBaseFeatures & EStayInViewerAfterReply )) |
2057 if (!(iEditorBaseFeatures & EStayInViewerAfterReply )) |
2061 { |
2058 { |
2062 iToolbar->SetToolbarVisibility( EFalse ); |
2059 if(iToolbar) |
|
2060 { |
|
2061 iToolbar->SetToolbarVisibility( EFalse ); |
|
2062 } |
2063 iView->MakeVisible( EFalse ); |
2063 iView->MakeVisible( EFalse ); |
2064 iNaviDecorator->MakeVisible( EFalse ); |
2064 iNaviDecorator->MakeVisible( EFalse ); |
2065 } |
2065 } |
2066 |
2066 |
2067 TRAPD(err, DoReplyFwdL( aForward )); |
2067 TRAPD(err, DoReplyFwdL( aForward )); |
2068 if(!(err == KErrNone) ) |
2068 if(!(err == KErrNone) ) |
2069 { |
2069 { |
2070 iNaviDecorator->MakeVisible( ETrue ); |
2070 iNaviDecorator->MakeVisible( ETrue ); |
2071 iView->MakeVisible( ETrue ); |
2071 iView->MakeVisible( ETrue ); |
2072 iToolbar->SetToolbarVisibility( ETrue ); |
2072 if(iToolbar) |
|
2073 { |
|
2074 iToolbar->SetToolbarVisibility( ETrue ); |
|
2075 } |
2073 } |
2076 } |
2074 |
2077 |
2075 } |
2078 } |
2076 |
2079 |
2077 // --------------------------------------------------------- |
2080 // --------------------------------------------------------- |