FCL/sf/app/organizer: comparison calendarui/views/src/caleneventviewcontainer.cpp

equal deleted inserted replaced

-:bf573002ff72
+:aba12c885d83
 : CCalenContainer( aView, aServices ),
 					  iEntry(NULL),
 						  iEmbeddedFileOpened(EFalse)
 {
 	TRACE_ENTRY_POINT;
-	iNumOfLinesBeforeLocField = 0;
 	iLocaleChanged = EFalse;
 	TRACE_EXIT_POINT;
 }
 // ----------------------------------------------------------------------------
 // Insert the icon drawer into the Rich Text Editor.  This takes
 // ownership of the icon drawer.
 // Insert at index 0 in the document to cause the icons to be drawn when
 // the first line is visible.  The icons will not be drawn at position 0,
 // but this position must be on the screen for the icons to be drawn.
-iTextEditor->RichText()->InsertL( iTextEditor->RichText()->DocumentLength(), header );
+iTextEditor->RichText()->InsertL( 0, header );
 // Tell the text editor that it has been updated.  This will cause
 // a redraw.
 iTextEditor->HandleTextChangedL();
 	}
 break;
 }
 	if(IsEventHasMapLocationL())
 {
 // Update iNumOfLinesBeforeLocField
-CalcNumOfLinesBeforeLocation();
 // Add map icon to the icon drawer
 iconDrawer->AddIconL( MCalenServices::ECalenMapIcon );
 // Set the icon sizes
-iconDrawer->SetIconSizesFromLayout(iNumOfLinesBeforeLocField);
+iconDrawer->SetIconSizesFromLayout();
 }
 	SetIconsL(iconDrawer);
 	// Add Description
 AddDescriptionFieldL();
 {
 // nothing
 }
 }
 // Set the icon sizes
-aIconDrawer.SetIconSizesFromLayout(iNumOfLinesBeforeLocField);
+aIconDrawer.SetIconSizesFromLayout();
 // Get the icon drawer width
 iIconDrawerWidthInPixels = aIconDrawer.WidthInPixels();
 TRACE_EXIT_POINT;
 // Stores the necessary information in the context
 // and returns ETrue if event has geo coordinates else EFalse
 // ----------------------------------------------------------------------------
 TBool CCalenEventViewContainer::IsEventHasMapLocationL()
 	{
-	CCalGeoValue* geoValue = iEntry->GeoValueL();
+if(iEntry)
-	if(geoValue)
+{
-		{
+CCalGeoValue* geoValue = iEntry->GeoValueL();
-		delete geoValue;
+if(geoValue)
-		return 	ETrue;
+{
-		}
+delete geoValue;
-	else
+return 	ETrue;
-		{
+}
-		return 	EFalse;
+else
-		}
+{
+return 	EFalse;
+}
+}
+else
+{
+return EFalse;
+}
 	}
 // ----------------------------------------------------------------------------
 // CCalenEventViewContainer::IsEventHasNoLocationTextL
 // Returns ETrue if event has location text else EFalse
 // ----------------------------------------------------------------------------
 TBool CCalenEventViewContainer::IsEventHasNoLocationTextL()
 	{
-	TPtrC location = iEntry->LocationL();
+if(iEntry)
-	if(!location.Length())
+{
-		{
+TPtrC location = iEntry->LocationL();
-		return ETrue;
+if(!location.Length())
-		}
+{
-	else
+return ETrue;
-		{
+}
-		return EFalse;
+else
-		}
+{
+return EFalse;
+}
+}
+else
+{
+return EFalse;
+}
 	}
 // ----------------------------------------------------------------------------
 // CCalenEventView::OnLocaleChangedL
 // (other items were commented in a header).
 {
 OpenViewerL(attachmentToBeOpened);
 }
 }
-// ----------------------------------------------------------------------------
-// CCalenEventViewContainer::CalcNumOfLinesBeforeLocation
-// Calculates the number of line before locaiton field in the document of the rich text editor
-// (other items were commented in a header).
-// ----------------------------------------------------------------------------
-//
-void CCalenEventViewContainer::CalcNumOfLinesBeforeLocation()
-{
-TRACE_ENTRY_POINT;
-CCalGeoValue* geoValue = iEntry->GeoValueL();
-if(geoValue)
-{
-// Get the count of lines before location field
-// so that map icon is drwan exactly at the firlst line of location text on the event viewer
-HBufC* visualText = NULL;
-CArrayFixFlat<TInt>* lineWidths = new( ELeave )CArrayFixFlat<TInt>( 5 );
-CleanupStack::PushL( lineWidths );
-lineWidths->AppendL(iMaxWidth - iIconDrawerWidthInPixels);
-// trim of enter keys entered at the end of the summary text,
-TBuf<160> summary;
-summary.Append(iEventViewData->Summary());
-TChar ch = 0x2029; // For Enter key
-TInt length = iEventViewData->Summary().Length();
-TInt count = 0;
-while( length > 0 )
-{
-if(summary[--length] == ch)
-{
-count++;
-summary.Copy(summary.Left(length)); // trim off the enter key
-}
-}
-// Count the number of lines summary will occupy after squeezing enter keys at the end of the text
-CArrayFixFlat<TPtrC>* textLines = new(ELeave)CArrayFixFlat<TPtrC>(5);
-CleanupStack::PushL( textLines );
-visualText = AknBidiTextUtils::ConvertToVisualAndWrapToArrayWholeTextL(summary ,
-*lineWidths,
-*iHeadingFont,
-*textLines);
-iNumOfLinesBeforeLocField += textLines->Count() + iTimeFieldLines; // Added for time and date field
-if (iEventViewData->Summary() == KNullDesC) // If summary is NULL, then <Unnamed> will be added as first line, hence, increment it
-{
-iNumOfLinesBeforeLocField++;
-}
-iNumOfLinesBeforeLocField += count; // Add the number of enter keys added at the end of the summary
-iTimeFieldLines = 0; // Reset the value
-CleanupStack::PopAndDestroy(textLines);
-CleanupStack::PopAndDestroy(lineWidths);
-delete visualText;
-delete geoValue;
-}
-}
 // -----------------------------------------------------------------------------
 // CCalenCommonUI::FindPossibleInstanceL
 // Finds an instance with the given instance id and instance view.
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 {
 TRACE_ENTRY_POINT;
 BuildSearchBufferL();
 MCalenToolbar* toolbar = iServices.ToolbarOrNull();
 CFindItemDialog* finder = CFindItemDialog::NewL( *iSearchBuf, CFindItemEngine::EFindItemSearchPhoneNumberBin);
+finder->EnableSingleClick(ETrue);
 toolbar->SetToolbarVisibilityL(EFalse);
 finder->ExecuteLD();
 toolbar->SetToolbarVisibilityL(ETrue);
 TRACE_EXIT_POINT;
 {
 TRACE_ENTRY_POINT;
 BuildSearchBufferL();
 MCalenToolbar* toolbar = iServices.ToolbarOrNull();
 CFindItemDialog* finder = CFindItemDialog::NewL( *iSearchBuf, CFindItemEngine::EFindItemSearchURLBin);
+finder->EnableSingleClick(ETrue);
 toolbar->SetToolbarVisibilityL(EFalse);
 finder->ExecuteLD();
 toolbar->SetToolbarVisibilityL(ETrue);
 TRACE_EXIT_POINT;
 }
 {
 TRACE_ENTRY_POINT;
 BuildSearchBufferL();
 MCalenToolbar* toolbar = iServices.ToolbarOrNull();
 CFindItemDialog* finder = CFindItemDialog::NewL( *iSearchBuf, CFindItemEngine::EFindItemSearchMailAddressBin);
+finder->EnableSingleClick(ETrue);
 toolbar->SetToolbarVisibilityL(EFalse);
 finder->ExecuteLD();
 toolbar->SetToolbarVisibilityL(ETrue);
 TRACE_EXIT_POINT;
 }

branch	RCL_3
changeset 59	aba12c885d83
parent 48	bf573002ff72
child 60	96907930389d