equal
deleted
inserted
replaced
431 iListLayout->SetSize( screenRect.Size() ); |
431 iListLayout->SetSize( screenRect.Size() ); |
432 iListLayout->UpdateChildrenLayout(); |
432 iListLayout->UpdateChildrenLayout(); |
433 |
433 |
434 // header and dividers |
434 // header and dividers |
435 CreateListSkeletonL(); |
435 CreateListSkeletonL(); |
|
436 //moved from CreateListSkeletonL(); |
|
437 SetupTitlePaneTextL(); |
436 // list model items |
438 // list model items |
437 CreateListItemsL(); |
439 CreateListItemsL(); |
438 |
440 |
439 if ( iAttachmentsList->IsEmpty(iLocalNode) && |
441 if ( iAttachmentsList->IsEmpty(iLocalNode) && |
440 !iAttachmentsList->ItemVisualizer(iLocalNode).IsHidden() ) |
442 !iAttachmentsList->ItemVisualizer(iLocalNode).IsHidden() ) |
516 iRemoteNodeVisualiser, |
518 iRemoteNodeVisualiser, |
517 iRemoteNode ); |
519 iRemoteNode ); |
518 |
520 |
519 iAttachmentsList->SetItemsAlwaysExtendedL(ETrue); |
521 iAttachmentsList->SetItemsAlwaysExtendedL(ETrue); |
520 |
522 |
521 SetupTitlePaneTextL(); |
|
522 } |
523 } |
523 |
524 |
524 // --------------------------------------------------------------------------- |
525 // --------------------------------------------------------------------------- |
525 // CreateListItemsL |
526 // CreateListItemsL |
526 // |
527 // |
714 if ( composeView->NewMessage() ) |
715 if ( composeView->NewMessage() ) |
715 { |
716 { |
716 // compose view is open, so remove attachment there |
717 // compose view is open, so remove attachment there |
717 composeView->NewMessage()->RemoveChildPartL( |
718 composeView->NewMessage()->RemoveChildPartL( |
718 item->MailMsgPartId() ); |
719 item->MailMsgPartId() ); |
|
720 if ( iItems.Count() == 1 ) |
|
721 { |
|
722 composeView->NewMessage()->ResetFlag( EFSMsgFlag_Attachments ); |
|
723 } |
719 } |
724 } |
720 else |
725 else |
721 { |
726 { |
722 CFSEmailUiSendAttachmentsListVisualiser* parentView = |
727 CFSEmailUiSendAttachmentsListVisualiser* parentView = |
723 static_cast<CFSEmailUiSendAttachmentsListVisualiser*>( |
728 static_cast<CFSEmailUiSendAttachmentsListVisualiser*>( |
730 parentView->EditorParams().iFolderId, |
735 parentView->EditorParams().iFolderId, |
731 parentView->EditorParams().iMsgId, |
736 parentView->EditorParams().iMsgId, |
732 EFSMsgDataStructure ); |
737 EFSMsgDataStructure ); |
733 CleanupStack::PushL( msg ); |
738 CleanupStack::PushL( msg ); |
734 msg->RemoveChildPartL( item->MailMsgPartId() ); |
739 msg->RemoveChildPartL( item->MailMsgPartId() ); |
|
740 msg->ResetFlag( EFSMsgFlag_Attachments ); |
735 msg->SaveMessageL(); |
741 msg->SaveMessageL(); |
736 CleanupStack::PopAndDestroy( msg ); |
742 CleanupStack::PopAndDestroy( msg ); |
737 } |
743 } |
738 |
744 |
739 // Remove attachment item from model |
745 // Remove attachment item from model |
797 if ( !err ) |
803 if ( !err ) |
798 { |
804 { |
799 RemoveAndDestroy( i ); |
805 RemoveAndDestroy( i ); |
800 } |
806 } |
801 } |
807 } |
|
808 msg->ResetFlag( EFSMsgFlag_Attachments ); |
802 msg->SaveMessageL(); |
809 msg->SaveMessageL(); |
803 |
810 |
804 // Delete msg if we own it |
811 // Delete msg if we own it |
805 if ( !composeView->NewMessage() ) |
812 if ( !composeView->NewMessage() ) |
806 { |
813 { |