diff -r 42814f902fe6 -r 38571fd2a704 calendarui/regionalplugins/lunarVietnamese/src/calenlunarvietnameseplugin.cpp --- a/calendarui/regionalplugins/lunarVietnamese/src/calenlunarvietnameseplugin.cpp Fri Feb 19 22:49:53 2010 +0200 +++ b/calendarui/regionalplugins/lunarVietnamese/src/calenlunarvietnameseplugin.cpp Fri Mar 12 15:42:35 2010 +0200 @@ -32,6 +32,10 @@ #include #include +#include +#include +#include + #include "calendarui_debug.h" #include "calenlunarvietnameseplugin.h" #include "calenlunarvietnameselocalizer.h" @@ -203,6 +207,16 @@ aLabel.SetLabelAlignment(ELayoutAlignCenter); aLabel.SetTextL( *newLinedText); + // Query the text colour based on the theme and update the label text + MAknsSkinInstance* skin = AknsUtils::SkinInstance(); + TRgb color; + TInt error = AknsUtils::GetCachedColor(skin, color, + KAknsIIDQsnTextColors, EAknsCIQsnTextColorsCG6); + if (error == KErrNone) + { + aLabel.OverrideColorL(EColorLabelText, color); + } + CleanupStack::PopAndDestroy( newLinedText ); CleanupStack::PopAndDestroy( lineWidths ); CleanupStack::PopAndDestroy( textLines ); @@ -227,6 +241,16 @@ aLabel.SetLabelAlignment(ELayoutAlignCenter); aLabel.SetTextL( iExtraRowText ); + // Query the text colour based on the theme and update the label text + MAknsSkinInstance* skin = AknsUtils::SkinInstance(); + TRgb color; + TInt error = AknsUtils::GetCachedColor(skin, color, + KAknsIIDQsnTextColors, EAknsCIQsnTextColorsCG6); + if (error == KErrNone) + { + aLabel.OverrideColorL(EColorLabelText, color); + } + TRACE_EXIT_POINT; } @@ -673,10 +697,15 @@ // ----------------------------------------------------------------------------- // void CCalenPluginLabel::HandlePointerEventL(const TPointerEvent& - /*aPointerEvent*/) + aPointerEvent) { TRACE_ENTRY_POINT; - iPlugin.ShowDetailsL(); + + if ( aPointerEvent.iType == TPointerEvent::EButton1Up ) + { + iPlugin.ShowDetailsL(); + } + TRACE_EXIT_POINT; }