diff -r 96907930389d -r 12af337248b1 calendarui/regionalplugins/Thai/src/CalenThaiPlugin.cpp --- a/calendarui/regionalplugins/Thai/src/CalenThaiPlugin.cpp Thu Aug 19 09:53:43 2010 +0300 +++ b/calendarui/regionalplugins/Thai/src/CalenThaiPlugin.cpp Tue Aug 31 15:13:43 2010 +0300 @@ -11,25 +11,19 @@ * * Contributors: * -* Description: Calendar Thai Plugin. +* Description: * */ - #include "calendarui_debug.h" +#include + #include -#include #include -#include -#include -#include - -#include -#include -#include - - +#include +#include +#include #include "CalenThaiPlugin.h" @@ -77,25 +71,13 @@ CCalenThaiPlugin::~CCalenThaiPlugin() { TRACE_ENTRY_POINT; - - if(iLabelControl) - { - delete iLabelControl; - iLabelControl = NULL; - } - - if(iInfoBarText) - { - delete iInfoBarText; - iInfoBarText = NULL; - } - - if ( iServices ) + + if (iServices) { iServices->CancelNotifications(this); iServices->Release(); } - + TRACE_EXIT_POINT; } @@ -104,8 +86,7 @@ // ---------------------------------------------------------------------------- // CCalenThaiPlugin::CCalenThaiPlugin(MCalenServices* aServices) - : iServices(aServices), - iInfoBarText(NULL) + : iServices(aServices) { TRACE_ENTRY_POINT; TRACE_EXIT_POINT; @@ -118,31 +99,7 @@ void CCalenThaiPlugin::ConstructL() { TRACE_ENTRY_POINT; - iServices->RegisterForNotificationsL( this, ECalenNotifyContextChanged ); - iLabelControl = CCalenPluginLabel::NewL(*this); - TRACE_EXIT_POINT; - } - -// ---------------------------------------------------------------------------- -// CCalenThaiPlugin::SetLabelContentL -// ---------------------------------------------------------------------------- -// -void CCalenThaiPlugin::SetLabelContentL( CEikLabel& aLabel ) - { - TRACE_ENTRY_POINT; - const CFont* labelFont = NULL; - labelFont = AknLayoutUtils::FontFromId(EAknLogicalFontPrimarySmallFont,NULL); - aLabel.SetFont( labelFont ); - aLabel.SetLabelAlignment(ELayoutAlignCenter); - aLabel.SetTextL( iThaiYearText ); - MAknsSkinInstance* skin = AknsUtils::SkinInstance(); - TRgb color; - TInt error = AknsUtils::GetCachedColor(skin, color, - KAknsIIDQsnTextColors, EAknsCIQsnTextColorsCG6); - if (error == KErrNone) - { - aLabel.OverrideColorL(EColorLabelText, color); - } + iServices->RegisterForNotificationsL(this, ECalenNotifyContextChanged); TRACE_EXIT_POINT; } @@ -158,26 +115,6 @@ TRACE_EXIT_POINT; } -// ---------------------------------------------------------------------------- -// CCalenThaiPlugin::GetCustomViewsL -// ---------------------------------------------------------------------------- -// -void CCalenThaiPlugin::GetCustomViewsL( RPointerArray& - /*aCustomViewArray */) - { - TRACE_ENTRY_POINT; - TRACE_EXIT_POINT; - } -// ---------------------------------------------------------------------------- -// CCalenThaiPlugin::GetCustomSettingsL -// ---------------------------------------------------------------------------- -// -void CCalenThaiPlugin::GetCustomSettingsL( RPointerArray& - /*aCustomSettingArray */) - { - TRACE_ENTRY_POINT; - TRACE_EXIT_POINT; - } // ---------------------------------------------------------------------------- // CCalenThaiPlugin::HandleCommandL @@ -190,97 +127,50 @@ TRACE_EXIT_POINT; return EFalse; } - -// ---------------------------------------------------------------------------- -// CCalenThaiPlugin::CalenCommandHandlerExtensionL -// -// ---------------------------------------------------------------------------- -// -TAny* CCalenThaiPlugin::CalenCommandHandlerExtensionL( TUid /*aExtensionUid*/ ) - { - TRACE_ENTRY_POINT; - TRACE_EXIT_POINT; - return NULL; - } - // ---------------------------------------------------------------------------- // CCalenThaiPlugin::InfobarL // This function is called in case of Avkon views // ---------------------------------------------------------------------------- // -CCoeControl* CCalenThaiPlugin::InfobarL( const TRect& aRect ) +HbWidget* CCalenThaiPlugin::InfobarL( ) { TRACE_ENTRY_POINT; - if(!iLabelControl) - { - return NULL; - } - - //Update the local information based on current context - //from framework. - UpdateLocalizerInfoL(); - //Set the content for the label - iLabelControl->SetRect(aRect); - SetLabelContentL(*iLabelControl); + + CalenPluginLabel* labelControl = new CalenPluginLabel(); + TRAP_IGNORE(UpdateLocalizerInfoL()); + QString text = QString::fromUtf16(iThaiYearText.Ptr(), + iThaiYearText.Length()); + labelControl->setPlainText(text); TRACE_EXIT_POINT; - return iLabelControl; + return labelControl; + } // ---------------------------------------------------------------------------- -// CCalenThaiPlugin::InfobarL -// This function is called in case of Hitchcock views +// CCalenThaiPlugin::InfobarTextL +// This function is called to get Infobar text // ---------------------------------------------------------------------------- // -const TDesC& CCalenThaiPlugin::InfobarL() +QString* CCalenThaiPlugin::InfobarTextL() { - TRACE_ENTRY_POINT; - if(iInfoBarText) - { - delete iInfoBarText; - iInfoBarText = NULL; - } - - //Update the local information based on current context - //from framework. - UpdateLocalizerInfoL(); - iInfoBarText = iThaiYearText.AllocLC(); - CleanupStack::Pop(); - - TRACE_EXIT_POINT; - return *iInfoBarText; + TRACE_ENTRY_POINT; + TRAP_IGNORE(UpdateLocalizerInfoL()); + QString text = QString::fromUtf16(iThaiYearText.Ptr(),iThaiYearText.Length()); + TRACE_EXIT_POINT; + return (new QString(text)); } // ---------------------------------------------------------------------------- -// CCalenThaiPlugin::CustomPreviewPaneL -// ---------------------------------------------------------------------------- -// -MCalenPreview* CCalenThaiPlugin::CustomPreviewPaneL( TRect& /*aRect*/ ) - { - TRACE_ENTRY_POINT - TRACE_EXIT_POINT - return NULL; - } - -// ---------------------------------------------------------------------------- -// CCalenThaiPlugin::PreviewPaneL +// CCalenThaiPlugin::CustomiseMenu +// This function is called to add menuitem // ---------------------------------------------------------------------------- // -CCoeControl* CCalenThaiPlugin::PreviewPaneL( TRect& /*aRect*/ ) - { - TRACE_ENTRY_POINT; - UpdateLocalizerInfoL(); - if(iLabelControl) - { - delete iLabelControl; - iLabelControl = NULL; - } - iLabelControl = CCalenPluginLabel::NewL(*this); - SetLabelContentL(*iLabelControl); - - TRACE_EXIT_POINT; - return iLabelControl; - } - +void CCalenThaiPlugin::CustomiseMenu(HbMenu* aHbMenu) + { + TRACE_ENTRY_POINT; + Q_UNUSED(aHbMenu); + TRACE_EXIT_POINT; + } // ---------------------------------------------------------------------------- // CCalenThaiPlugin::HandleNotification // ---------------------------------------------------------------------------- @@ -296,122 +186,44 @@ } // ---------------------------------------------------------------------------- -// CCalenThaiPlugin::CommandHandlerL -// ---------------------------------------------------------------------------- -// -MCalenCommandHandler* CCalenThaiPlugin::CommandHandlerL( TInt - /*aCommand*/) - { - TRACE_ENTRY_POINT; - TRACE_EXIT_POINT; - return NULL; - } -// ---------------------------------------------------------------------------- -// CCalenThaiPlugin::RemoveViewsFromCycle -// ---------------------------------------------------------------------------- -// -void CCalenThaiPlugin::RemoveViewsFromCycle( RArray& /*aViews*/ ) - { - TRACE_ENTRY_POINT; - TRACE_EXIT_POINT; - } - -// ---------------------------------------------------------------------------- -// CCalenThaiPlugin::CanBeEnabledDisabled +// CCalenEditorsPlugin::CommandHandlerL // ---------------------------------------------------------------------------- -// -TBool CCalenThaiPlugin::CanBeEnabledDisabled() - { - TRACE_ENTRY_POINT; - TRACE_EXIT_POINT; - return ETrue; - } - -// ---------------------------------------------------------------------------- -// CCalenThaiPlugin::CalenCustomisationExtensionL -// ---------------------------------------------------------------------------- -// -TAny* CCalenThaiPlugin::CalenCustomisationExtensionL( TUid /*aExtensionUid*/ ) - { - TRACE_ENTRY_POINT; - TRACE_EXIT_POINT; - return NULL; - } -// ---------------------------------------------------------------------------- -// CCalenThaiPlugin::CustomiseMenuPaneL -// ---------------------------------------------------------------------------- -// -TBool CCalenThaiPlugin::CustomiseMenuPaneL( TInt /*aResourceId*/, - CEikMenuPane* /*aMenuPane*/) + +MCalenCommandHandler* CCalenThaiPlugin::CommandHandlerL( TInt aCommand ) { TRACE_ENTRY_POINT; - TRACE_EXIT_POINT; - return EFalse; - } -// ---------------------------------------------------------------------------- -// CCalenPluginLabel::NewL -// ---------------------------------------------------------------------------- -// -CCalenPluginLabel* CCalenPluginLabel::NewL(CCalenThaiPlugin& aPlugin) - { - TRACE_ENTRY_POINT; - CCalenPluginLabel* self = new(ELeave)CCalenPluginLabel(aPlugin); - CleanupStack::PushL(self); - self->ConstructL(); - CleanupStack::Pop(self); + Q_UNUSED(aCommand); TRACE_EXIT_POINT; - return self; - } - -// ---------------------------------------------------------------------------- -// CCalenPluginLabel::CCalenPluginLabel -// ---------------------------------------------------------------------------- -// -CCalenPluginLabel::CCalenPluginLabel(CCalenThaiPlugin& aPlugin) : iPlugin(aPlugin) - { - TRACE_ENTRY_POINT; - TRACE_EXIT_POINT; + return NULL; } -// ---------------------------------------------------------------------------- -// CCalenPluginLabel::ConstructL -// ---------------------------------------------------------------------------- -// -void CCalenPluginLabel::ConstructL() - { + +CalenPluginLabel::CalenPluginLabel(QGraphicsItem* parent) + :HbLabel(parent) + { + TRACE_ENTRY_POINT; + + setAlignment(Qt::AlignCenter); + setTextColor(Qt::blue); + setTextWrapping(Hb::TextWrapping); + setOpacity(12); + TRACE_EXIT_POINT; + } + +CalenPluginLabel::~CalenPluginLabel() + { TRACE_ENTRY_POINT; TRACE_EXIT_POINT; - } -// ---------------------------------------------------------------------------- -// CCalenPluginLabel::~CCalenPluginLabel -// ---------------------------------------------------------------------------- -// -CCalenPluginLabel::~CCalenPluginLabel() - { + } + +void CalenPluginLabel::paint ( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget ) + { TRACE_ENTRY_POINT; - TRACE_EXIT_POINT; - } -// ---------------------------------------------------------------------------- -// CCalenPluginLabel::Draw -// ---------------------------------------------------------------------------- -// -void CCalenPluginLabel::Draw( const TRect& aRect) const - { - TRACE_ENTRY_POINT; - CEikLabel::Draw(aRect); - TRACE_EXIT_POINT; - } -// ---------------------------------------------------------------------------- -// CCalenPluginLabel::HandlePointerEventL -// ---------------------------------------------------------------------------- -// -void CCalenPluginLabel::HandlePointerEventL(const TPointerEvent& - /*aPointerEvent*/) - { - TRACE_ENTRY_POINT; - TRACE_EXIT_POINT; - } - + Q_UNUSED(painter); + Q_UNUSED(option); + Q_UNUSED(widget); + TRACE_EXIT_POINT; + } //EOF