equal
deleted
inserted
replaced
116 CCalenEventViewContainer::CCalenEventViewContainer(CCalenNativeView* aView, |
116 CCalenEventViewContainer::CCalenEventViewContainer(CCalenNativeView* aView, |
117 MCalenServices& aServices ) |
117 MCalenServices& aServices ) |
118 : CCalenContainer( aView, aServices ), |
118 : CCalenContainer( aView, aServices ), |
119 iEntry(NULL), |
119 iEntry(NULL), |
120 iAutomaticHlValue(ETrue), |
120 iAutomaticHlValue(ETrue), |
121 iAutomaticHlInitialized(EFalse) |
121 iAutomaticHlInitialized(EFalse), |
|
122 iEmbeddedFileOpened(EFalse) |
122 { |
123 { |
123 TRACE_ENTRY_POINT; |
124 TRACE_ENTRY_POINT; |
124 iNumOfLinesBeforeLocField = 0; |
125 iNumOfLinesBeforeLocField = 0; |
125 iLocaleChanged = EFalse; |
126 iLocaleChanged = EFalse; |
126 TRACE_EXIT_POINT; |
127 TRACE_EXIT_POINT; |
559 case TPointerEvent::EButton1Down: |
560 case TPointerEvent::EButton1Down: |
560 { |
561 { |
561 iTextEditor->SetFocus(ETrue); |
562 iTextEditor->SetFocus(ETrue); |
562 |
563 |
563 // TODO: Uncomment this when enabling attachment support |
564 // TODO: Uncomment this when enabling attachment support |
564 if(iEventViewData) |
565 if(iEventViewData && !iEmbeddedFileOpened) |
565 { |
566 { |
566 |
567 |
567 if(iEventViewData->AttachmentCount()) |
568 if(iEventViewData->AttachmentCount()) |
568 { |
569 { |
569 CTextView *textView = iTextEditor->TextView(); |
570 CTextView *textView = iTextEditor->TextView(); |
2784 // |
2785 // |
2785 void CCalenEventViewContainer::HandleServerAppExit( TInt aReason) |
2786 void CCalenEventViewContainer::HandleServerAppExit( TInt aReason) |
2786 { |
2787 { |
2787 TRACE_ENTRY_POINT; |
2788 TRACE_ENTRY_POINT; |
2788 |
2789 |
|
2790 iEmbeddedFileOpened = EFalse; |
2789 if (aReason == EAknCmdExit) |
2791 if (aReason == EAknCmdExit) |
2790 { |
2792 { |
2791 //issue this notification, which will be handled by attachmentui. |
2793 //issue this notification, which will be handled by attachmentui. |
2792 } |
2794 } |
2793 |
2795 |
2951 |
2953 |
2952 TInt ret = KErrNone; |
2954 TInt ret = KErrNone; |
2953 |
2955 |
2954 if(datatype == KNotePadTextDataType()) |
2956 if(datatype == KNotePadTextDataType()) |
2955 { |
2957 { |
|
2958 if(iEmbeddedFileOpened) |
|
2959 { |
|
2960 return; |
|
2961 } |
|
2962 iEmbeddedFileOpened = ETrue; |
2956 const TDesC& notepadTitle = _L("NotePad"); |
2963 const TDesC& notepadTitle = _L("NotePad"); |
2957 ret = CNotepadApi::ExecFileViewerL( aFile, |
2964 ret = CNotepadApi::ExecFileViewerL( aFile, |
2958 ¬epadTitle, |
2965 ¬epadTitle, |
2959 ETrue, |
2966 ETrue, |
2960 ETrue, |
2967 ETrue, |
2961 KCharacterSetIdentifierIso88591 ); |
2968 KCharacterSetIdentifierIso88591 ); |
|
2969 iEmbeddedFileOpened = EFalse; |
2962 |
2970 |
2963 } |
2971 } |
2964 else |
2972 else |
2965 { |
2973 { |
2966 //doc handler will open the other files (other than text file). |
2974 //doc handler will open the other files (other than text file). |
2967 TRAP( ret, iDocHandler->OpenFileEmbeddedL( aFile, datatype ) ); |
2975 TRAP( ret, iDocHandler->OpenFileEmbeddedL( aFile, datatype ) ); |
|
2976 |
|
2977 if(ret == KErrNone) |
|
2978 { |
|
2979 iEmbeddedFileOpened = ETrue; |
|
2980 } |
2968 } |
2981 } |
2969 |
2982 |
2970 switch(ret) |
2983 switch(ret) |
2971 { |
2984 { |
2972 case KErrNone: |
2985 case KErrNone: |