equal
deleted
inserted
replaced
364 TInt aIndex, |
364 TInt aIndex, |
365 TInt aIconIndex, |
365 TInt aIconIndex, |
366 TUid aApplicationUid ) |
366 TUid aApplicationUid ) |
367 { |
367 { |
368 TMcePrintableText tempText = aNewItem.iPrintableText; // let's save string |
368 TMcePrintableText tempText = aNewItem.iPrintableText; // let's save string |
369 |
369 TMcePrintableText secondarytxt = aNewItem.iSecondaryText; |
370 aNewItem.iExtraItem = ETrue; |
370 aNewItem.iExtraItem = ETrue; |
371 // make sure it will not be mixed with items in msgs |
371 // make sure it will not be mixed with items in msgs |
372 TMceBitmapListItem bitmapItem; |
372 TMceBitmapListItem bitmapItem; |
373 bitmapItem.iExtraItem = ETrue; |
373 bitmapItem.iExtraItem = ETrue; |
374 bitmapItem.iMtm = aApplicationUid ; //KUidMsvLocalServiceMtmValue; |
374 bitmapItem.iMtm = aApplicationUid ; //KUidMsvLocalServiceMtmValue; |
401 |
401 |
402 aNewItem.iPrintableText.Zero(); |
402 aNewItem.iPrintableText.Zero(); |
403 aNewItem.iPrintableText.AppendNum( index ); |
403 aNewItem.iPrintableText.AppendNum( index ); |
404 aNewItem.iPrintableText.Append( KColumnListSeparator ); |
404 aNewItem.iPrintableText.Append( KColumnListSeparator ); |
405 aNewItem.iPrintableText.Append( tempText ); |
405 aNewItem.iPrintableText.Append( tempText ); |
|
406 aNewItem.iPrintableText.Append( KColumnListSeparator ); |
|
407 aNewItem.iPrintableText.Append( secondarytxt ); |
406 |
408 |
407 InsertL( aIndex, aNewItem ); |
409 InsertL( aIndex, aNewItem ); |
408 } |
410 } |
409 |
411 |
410 // ---------------------------------------------------- |
412 // ---------------------------------------------------- |
1084 TInt depricatedResource = reader.ReadInt16(); // this is not used anymore, but left in resource so no DC break. |
1086 TInt depricatedResource = reader.ReadInt16(); // this is not used anymore, but left in resource so no DC break. |
1085 extraItem.iIconIndex = reader.ReadInt16(); |
1087 extraItem.iIconIndex = reader.ReadInt16(); |
1086 TUid applicationUid; |
1088 TUid applicationUid; |
1087 applicationUid.iUid = reader.ReadUint32(); |
1089 applicationUid.iUid = reader.ReadUint32(); |
1088 extraItem.iApplicationUid = applicationUid.iUid; |
1090 extraItem.iApplicationUid = applicationUid.iUid; |
1089 |
1091 // secondary text |
|
1092 txt = reader.ReadHBufCL(); //secondary text |
|
1093 if(txt) |
|
1094 { |
|
1095 extraItem.iSecondaryText.Copy( *txt ); |
|
1096 delete txt; |
|
1097 txt = NULL; |
|
1098 } |
|
1099 else |
|
1100 { |
|
1101 extraItem.iSecondaryText.Copy(KNullDesC()); |
|
1102 } |
1090 iExtraItemsArray->AppendL( extraItem ); |
1103 iExtraItemsArray->AppendL( extraItem ); |
1091 extraItem.iCommandId++; |
1104 extraItem.iCommandId++; |
1092 } |
1105 } |
1093 CleanupStack::PopAndDestroy(); // reader |
1106 CleanupStack::PopAndDestroy(); // reader |
1094 resources.Close(); |
1107 resources.Close(); |
1128 const TMceMainViewExtraItem& extraItem = (*iExtraItemsArray)[aIndex]; |
1141 const TMceMainViewExtraItem& extraItem = (*iExtraItemsArray)[aIndex]; |
1129 TMceListItem tempItem; |
1142 TMceListItem tempItem; |
1130 tempItem.iExtraItem = ETrue; |
1143 tempItem.iExtraItem = ETrue; |
1131 tempItem.iMsvId = extraItem.iCommandId; |
1144 tempItem.iMsvId = extraItem.iCommandId; |
1132 tempItem.iPrintableText.Copy( extraItem.iPrintableText ); |
1145 tempItem.iPrintableText.Copy( extraItem.iPrintableText ); |
|
1146 tempItem.iSecondaryText.Copy(extraItem.iSecondaryText); |
1133 TUid appUid; |
1147 TUid appUid; |
1134 appUid.iUid = extraItem.iApplicationUid; |
1148 appUid.iUid = extraItem.iApplicationUid; |
1135 AddExtraItemWithIconL( tempItem, Count(), extraItem.iIconIndex, appUid ); |
1149 AddExtraItemWithIconL( tempItem, Count(), extraItem.iIconIndex, appUid ); |
1136 } |
1150 } |
1137 } |
1151 } |