diff -r 96907930389d -r 12af337248b1 calendarui/regionalplugins/calenregionalutil/src/calenextrarowformatter.cpp --- a/calendarui/regionalplugins/calenregionalutil/src/calenextrarowformatter.cpp Thu Aug 19 09:53:43 2010 +0300 +++ b/calendarui/regionalplugins/calenregionalutil/src/calenextrarowformatter.cpp Tue Aug 31 15:13:43 2010 +0300 @@ -15,15 +15,21 @@ * */ +#include +#include + +#include +#include #include "calendarui_debug.h" -#include "calenextrarowformatter.h" -#include -#include -#include -#include -#include +#include "CalenExtraRowFormatter.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "calenextrarowformatterTraces.h" +#endif +// Constants +const TInt KZero( 0 ); // ----------------------------------------------------------------------------- // CollapseDuplicatesL @@ -31,25 +37,25 @@ // void CollapseDuplicatesL( TDes& aStr, TInt aPos, const TDesC& aSub ) { - TRACE_ENTRY_POINT; - + OstTraceFunctionEntry0( _COLLAPSEDUPLICATESL_ENTRY ); const TInt sublen = aSub.Length(); - if (aStr.Length() == 0 || sublen == 0) + if (aStr.Length() == KZero || sublen == KZero || aPos < KZero || (aPos >aStr.Length())) { + OstTraceFunctionExit0( _COLLAPSEDUPLICATESL_EXIT ); return; } TPtrC remaining = aStr.Mid( aPos ); TInt fstInRemaining = remaining.Find( aSub ); - if ( fstInRemaining >= 0 ) + if ( fstInRemaining >= KZero ) { TInt restPos = fstInRemaining + sublen; TPtrC rest = remaining.Mid( restPos ); TInt sndInRest = rest.Find( aSub ); // 1) two substrings found in sequence - if (sndInRest == 0) + if (sndInRest == KZero) { // replace second substring with empty string TInt fst = aPos + fstInRemaining; @@ -59,7 +65,7 @@ CollapseDuplicatesL( aStr, fst, aSub ); } // 2) substring found later in string - else if (sndInRest > 0) + else if (sndInRest > KZero) { // continue collapsing from this second substring TInt snd = aPos + restPos + sndInRest; @@ -68,16 +74,17 @@ // 3) No second substring found -> nothing to collapse else { - TRACE_EXIT_POINT; + OstTraceFunctionExit0( DUP1__COLLAPSEDUPLICATESL_EXIT ); return; } } // No substring found else { - TRACE_EXIT_POINT; + OstTraceFunctionExit0( DUP2__COLLAPSEDUPLICATESL_EXIT ); return; } + OstTraceFunctionExit0( DUP3__COLLAPSEDUPLICATESL_EXIT ); } // ----------------------------------------------------------------------------- @@ -86,22 +93,21 @@ // void RemoveLeadingAndTrailingL( TDes& aStr, const TDesC& aSub ) { - TRACE_ENTRY_POINT; - + OstTraceFunctionEntry0( _REMOVELEADINGANDTRAILINGL_ENTRY ); // Trailing const TInt sublen = aSub.Length(); - if ( aStr.Right( sublen ).Find( aSub ) == 0 ) + if ( aStr.Right( sublen ).Find( aSub ) == KZero ) { aStr.Replace( aStr.Length() - sublen, sublen, KNullDesC ); } // Leading - if ( aStr.Left( sublen ).Find( aSub ) == 0 ) + if ( aStr.Left( sublen ).Find( aSub ) == KZero ) { - aStr.Replace( 0, sublen, KNullDesC ); + aStr.Replace( KZero, sublen, KNullDesC ); } - TRACE_EXIT_POINT; + OstTraceFunctionExit0( _REMOVELEADINGANDTRAILINGL_EXIT ); } // ----------------------------------------------------------------------------- @@ -110,14 +116,13 @@ // EXPORT_C CCalenExtraRowFormatter* CCalenExtraRowFormatter::NewL() { - TRACE_ENTRY_POINT; - + OstTraceFunctionEntry0( CCALENEXTRAROWFORMATTER_NEWL_ENTRY ); CCalenExtraRowFormatter* self = new (ELeave) CCalenExtraRowFormatter; CleanupStack::PushL(self); self->ConstructL(); CleanupStack::Pop(self); - TRACE_EXIT_POINT; + OstTraceFunctionExit0( CCALENEXTRAROWFORMATTER_NEWL_EXIT ); return self; } @@ -127,8 +132,8 @@ // EXPORT_C CCalenExtraRowFormatter::~CCalenExtraRowFormatter() { - TRACE_ENTRY_POINT; - TRACE_EXIT_POINT; + OstTraceFunctionEntry0( CCALENEXTRAROWFORMATTER_CCALENEXTRAROWFORMATTER_ENTRY ); + OstTraceFunctionExit0( CCALENEXTRAROWFORMATTER_CCALENEXTRAROWFORMATTER_EXIT ); } // ----------------------------------------------------------------------------- @@ -137,8 +142,8 @@ // CCalenExtraRowFormatter::CCalenExtraRowFormatter() { - TRACE_ENTRY_POINT; - TRACE_EXIT_POINT; + OstTraceFunctionEntry0( DUP1_CCALENEXTRAROWFORMATTER_CCALENEXTRAROWFORMATTER_ENTRY ); + OstTraceFunctionExit0( DUP1_CCALENEXTRAROWFORMATTER_CCALENEXTRAROWFORMATTER_EXIT ); } // ----------------------------------------------------------------------------- @@ -147,8 +152,8 @@ // void CCalenExtraRowFormatter::ConstructL() { - TRACE_ENTRY_POINT; - TRACE_EXIT_POINT; + OstTraceFunctionEntry0( CCALENEXTRAROWFORMATTER_CONSTRUCTL_ENTRY ); + OstTraceFunctionExit0( CCALENEXTRAROWFORMATTER_CONSTRUCTL_EXIT ); } @@ -158,207 +163,95 @@ // EXPORT_C TPtrC CCalenExtraRowFormatter::FormatExtraRowInformationL( CCalenLunarLocalizedInfo& aLocInfo, - RArray& aPrioritizedFields, - TInt aMaxWidth, - const CFont& aFont - ,TBool aTwoLines - ) - { - TRACE_ENTRY_POINT; - - - if ( aPrioritizedFields.Count() == 0) - { - iText = KNullDesC; - - TRACE_EXIT_POINT; - return iText; - } + RArray& aPrioritizedFields ) +{ + OstTraceFunctionEntry0( CCALENEXTRAROWFORMATTER_FORMATEXTRAROWINFORMATIONL_ENTRY ); + if ( aPrioritizedFields.Count() == KZero) + { + iText = KNullDesC; - // Initialize substring labels - RArray subLabels; - CleanupClosePushL( subLabels ); - subLabels.AppendL( CCalenLunarLocalizedInfo::EAnimalYear ); - subLabels.AppendL( CCalenLunarLocalizedInfo::ELunarYear ); - subLabels.AppendL( CCalenLunarLocalizedInfo::ELunarMonthAndDay ); - subLabels.AppendL( CCalenLunarLocalizedInfo::EFestival ); - subLabels.AppendL( CCalenLunarLocalizedInfo::ESolarTerm ); - - // ASSERT that all prioritized fields can be found from subLabels - for ( TInt i=0; i < aPrioritizedFields.Count(); i++) - { - ASSERT( subLabels.Find( aPrioritizedFields[i] ) >= 0 ); - } - - TBool fits = EFalse; + OstTraceFunctionExit0( CCALENEXTRAROWFORMATTER_FORMATEXTRAROWINFORMATIONL_EXIT ); + return iText; + } - do - { - // Initialize substring array - CPtrCArray* subs = new (ELeave) CPtrCArray(10); - CleanupStack::PushL( subs ); - for ( TInt i = 0; i < subLabels.Count(); i++) - { - subs->AppendL( TPtrC( KNullDesC ) ); - } - // subs->InsertL( 0, TPtrC( KNullDesC ), 5 ); - - // Set wanted fields to substring array - for ( TInt i = 0; i < aPrioritizedFields.Count(); i++) - { - CCalenLunarLocalizedInfo::TField field = aPrioritizedFields[i]; - TInt subIx = subLabels.Find( field ); - // Replace - subs->Delete(subIx); -#ifdef _DEBUG - RDebug::Print( _L("A sub count %d"), subs->Count() ); -#endif - subs->InsertL(subIx, TPtrC( aLocInfo.GetField( field ) ) ); -#ifdef _DEBUG - RDebug::Print( _L("B sub count %d"), subs->Count() ); - RDebug::Print( _L("B field %S"), &(subs->At(subIx)) ); -#endif - - } - - // Format all fields to extra row - HBufC* extraRowFmt = StringLoader::LoadLC( R_CALE_EXTRA_ROW_LUNAR ); - -#ifdef _DEBUG - RDebug::RawPrint( *extraRowFmt ); -#endif - - TBuf<1000> fmt = *extraRowFmt; - for (TInt i=0; i < subLabels.Count(); i++) - { -#ifdef _DEBUG - RDebug::Print( _L("Before Format") ); - RDebug::RawPrint( fmt ); -#endif - StringLoader::Format( iText, - fmt, - i + 1, // %0U is a separator - subs->At( i ) ); - fmt = iText; -#ifdef _DEBUG - RDebug::Print( _L("After Format") ); - RDebug::RawPrint( fmt ); -#endif - } - - // Now we have something like "Year of Dog%0U%0U6/11%0U%0U" - // First We need to remove multiple occurences of %0U - _LIT(KSeparatorFmt, "%0U"); - - CollapseDuplicatesL( iText, 0, KSeparatorFmt ); -#ifdef _DEBUG - RDebug::Print( _L("After collapse") ); - RDebug::RawPrint( iText ); -#endif + // Initialize substring labels + RArray subLabels; + CleanupClosePushL( subLabels ); + subLabels.AppendL( CCalenLunarLocalizedInfo::EAnimalYear ); + subLabels.AppendL( CCalenLunarLocalizedInfo::ELunarYear ); + subLabels.AppendL( CCalenLunarLocalizedInfo::ELunarMonthAndDay ); + subLabels.AppendL( CCalenLunarLocalizedInfo::EFestival ); + subLabels.AppendL( CCalenLunarLocalizedInfo::ESolarTerm ); + + // ASSERT that all prioritized fields can be found from subLabels + for ( TInt i=0; i < aPrioritizedFields.Count(); i++) + { + ASSERT( subLabels.Find( aPrioritizedFields[i] ) >= KZero ); + } + + // Initialize substring array + CPtrCArray* subs = new (ELeave) CPtrCArray(10); + CleanupStack::PushL( subs ); + for ( TInt i = 0; i < subLabels.Count(); i++) + { + subs->AppendL( TPtrC( KNullDesC ) ); + } - // Remove leading and trailing %0U - // By now, we are sure that there is max 1 %0U in the beginning - // and in the end of string. - RemoveLeadingAndTrailingL( iText, KSeparatorFmt ); -#ifdef _DEBUG - RDebug::Print( _L("After leading and trailing removal") ); - RDebug::RawPrint( iText ); -#endif - - - // If there are now separators anymore, then do not fill them - TBool hasSeparators = iText.Find( KSeparatorFmt ) >= 0; - - if ( hasSeparators ) - { - - // fill in separators - HBufC* separator = StringLoader::LoadLC( R_CALE_LUNAR_SEPARATOR ); - fmt = iText; - StringLoader::Format( iText, - fmt, - 0, // %0U is a separator - *separator ); - -#ifdef _DEBUG - RDebug::Print( _L("After separator insert") ); - RDebug::RawPrint( iText ); -#endif - CleanupStack::PopAndDestroy( separator ); - } - - - CleanupStack::PopAndDestroy( extraRowFmt ); - CleanupStack::PopAndDestroy( subs ); - - fits = TryToFitL( iText, aMaxWidth, aFont - - , aTwoLines - - ); - if ( ! fits ) - { - iText = KNullDesC; - TInt last = aPrioritizedFields.Count() - 1; - if ( last >= 0 ) - { - aPrioritizedFields.Remove( last ); - } - } + // Set wanted fields to substring array + for ( TInt i = 0; i < aPrioritizedFields.Count(); i++) + { + CCalenLunarLocalizedInfo::TField field = aPrioritizedFields[i]; + TInt subIx = subLabels.Find( field ); + // Replace + subs->Delete(subIx); + RDebug::Print( _L("A sub count %d"), subs->Count() ); + subs->InsertL(subIx, TPtrC( aLocInfo.GetField( field ) ) ); + RDebug::Print( _L("B sub count %d"), subs->Count() ); + RDebug::Print( _L("B field %S"), &(subs->At(subIx)) ); - - } while ( ! fits && aPrioritizedFields.Count() ); - - CleanupStack::PopAndDestroy( &subLabels ); - - - - TRACE_EXIT_POINT; - return iText; - } + } + TBuf<100> textBuf; + QStringList textDataStringList; + for (TInt i=0; i < subLabels.Count(); i++) { + textBuf = subs->At( i ); + textDataStringList.append( + QString((QChar*)textBuf.Ptr(),textBuf.Length())); + } + // Get the locale specific separator + QString separator = hbTrId("txt_calendar_preview_title_cale_separator"); + + // Format all fields to single row + QString textDataString; + textDataString = hbTrId( + "txt_calendar_preview_title_123242526").arg( + textDataStringList.at(0)).arg( + separator).arg( + textDataStringList.at(1)).arg( + textDataStringList.at(2)).arg( + textDataStringList.at(3)).arg( + textDataStringList.at(4)); -// ----------------------------------------------------------------------------- -// CCalenExtraRowFormatter::TryToFitL -// ----------------------------------------------------------------------------- -// -TBool CCalenExtraRowFormatter::TryToFitL( const TDesC& aStr, TInt aMaxWidth, const CFont& aFont - , TBool aTwoLines ) - { - TRACE_ENTRY_POINT; - - TBool result(EFalse); - if(aTwoLines) - { - CArrayFixFlat* textLines = new(ELeave)CArrayFixFlat( 3 ); - CleanupStack::PushL( textLines ); - - CArrayFixFlat* lineWidths = new( ELeave )CArrayFixFlat( 1 ); - CleanupStack::PushL( lineWidths ); - - lineWidths->AppendL( aMaxWidth ); - - HBufC* visualText = AknBidiTextUtils::ConvertToVisualAndWrapToArrayWholeTextL( - aStr, - *lineWidths, - aFont, - *textLines); + iText = static_cast ( + textDataString.utf16()), textDataString.length(); - result = (textLines->Count() <= 2); - - CleanupStack::PopAndDestroy( lineWidths ); - CleanupStack::PopAndDestroy( textLines ); - delete visualText; - } - else - { - CFont::TMeasureTextInput::TFlags logicalOrder = static_cast(0); - TInt textW = AknBidiTextUtils::MeasureTextBoundsWidth( aFont, aStr, logicalOrder ); - result = (textW <= aMaxWidth); - } - - TRACE_EXIT_POINT; - return result; - } + // Now we have something like "Year of Dog%2GengYin%2%2" + // where %2 is the separator txt_calendar_preview_title_cale_separator + // First We need to remove multiple occurences of separator + textBuf = static_cast ( + separator.utf16()), separator.length(); + CollapseDuplicatesL( iText, 0, textBuf); + + // Remove leading and trailing separators + // Leading separator won't be there but trailing one is there for sure + RemoveLeadingAndTrailingL( iText, textBuf ); + + // CleanUp + CleanupStack::PopAndDestroy( subs ); + CleanupStack::PopAndDestroy( &subLabels ); + + OstTraceFunctionExit0( DUP1_CCALENEXTRAROWFORMATTER_FORMATEXTRAROWINFORMATIONL_EXIT ); + return iText; +} //EOF