diff -r 96907930389d -r 12af337248b1 calendarui/regionalplugins/Thai/inc/CalenThaiPlugin.h
--- a/calendarui/regionalplugins/Thai/inc/CalenThaiPlugin.h	Thu Aug 19 09:53:43 2010 +0300
+++ b/calendarui/regionalplugins/Thai/inc/CalenThaiPlugin.h	Tue Aug 31 15:13:43 2010 +0300
@@ -11,27 +11,39 @@
 *
 * Contributors:
 *
-* Description:   Calendar Thai Plugin.
+* Description:  
  *
 */
 
 
-
 #ifndef __CALENTHAIPLUGIN_H__
 #define __CALENTHAIPLUGIN_H__
 
 #include <e32base.h>
-#include <ConeResLoader.h>
-#include <eiklabel.h>
+#include <coneresloader.h>
+
+#include <hblabel.h>
 
 #include <calencommandhandler.h>
 #include <calennotificationhandler.h>
 #include <calenservices.h>
-#include <calencustomisation.h>
+
+
+#include "calencustomisation.h"
+
+class HbWidget;
+class QString;
+class HbMenu;
 
-#include "CalendarVariant.hrh"
+class CalenPluginLabel : public HbLabel
+    {
+public:
+    CalenPluginLabel(QGraphicsItem *parent=0);
+    ~CalenPluginLabel();     
 
-class MCalenPreview;
+private:
+    void paint ( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 );    
+    };
 
 NONSHARABLE_CLASS(CCalenThaiPlugin) : public CCalenCustomisation,
                                       public MCalenCommandHandler,
@@ -41,29 +53,21 @@
             static CCalenThaiPlugin* NewL( MCalenServices* aServices );
             virtual ~CCalenThaiPlugin();
                 
-    protected://From CCalenCustomisation
-        
-        	void GetCustomViewsL(  RPointerArray<CCalenView>& aCustomViewArray );
-    		void GetCustomSettingsL( RPointerArray<CAknSettingItem>& aCustomSettingArray );
-            CCoeControl* InfobarL( const TRect& aRect );
-            const TDesC& InfobarL();
-            MCalenPreview* CustomPreviewPaneL( TRect& aRect );
-            CCoeControl* PreviewPaneL(  TRect& aRect );
-            MCalenCommandHandler* CommandHandlerL( TInt aCommand );
-            void RemoveViewsFromCycle( RArray<TInt>& aViews );
-            TBool CustomiseMenuPaneL( TInt aResourceId, CEikMenuPane* aMenuPane );
-            TBool CanBeEnabledDisabled();
-            TAny* CalenCustomisationExtensionL( TUid aExtensionUid );
+    protected://From CCalenCustomisation        
+        	
+            HbWidget* InfobarL( );               
+			MCalenCommandHandler* CommandHandlerL( TInt aCommand );
+			QString* InfobarTextL();
+			void CustomiseMenu(HbMenu* aHbMenu);
             
     protected:// From MCalenCommandHandler
             TBool HandleCommandL( const TCalenCommand& aCommand );
-            TAny* CalenCommandHandlerExtensionL( TUid aExtensionUid );
         
     protected://From MCalenNotificationHandler 
             void HandleNotification(const TCalenNotification aNotification );
         
     private:
-            void SetLabelContentL( CEikLabel& aLabel );
+           
             void UpdateLocalizerInfoL();
         
     private: // own methods
@@ -71,27 +75,9 @@
             void ConstructL();
             
     private: // data
-            TBuf<200> iThaiYearText;
-            CEikLabel* iLabelControl ;//Owns
-            MCalenServices* iServices;
-            HBufC* iInfoBarText; //Owns
+            TBuf<200> iThaiYearText;            
+            MCalenServices* iServices;           
     };
 
 
-NONSHARABLE_CLASS(CCalenPluginLabel) : public CEikLabel 
-	{
-	public:
-        	static CCalenPluginLabel* NewL(CCalenThaiPlugin& iPlugin);
-        	~CCalenPluginLabel();
-	
-	private:
-	        CCalenPluginLabel(CCalenThaiPlugin& iPlugin);
-        	void ConstructL();
-        	void HandlePointerEventL(const TPointerEvent& aPointerEvent);
-        	void Draw( const TRect& aRect) const;
-        	
-	private:
-	       CCalenThaiPlugin& iPlugin;
-	};	
-
 #endif // __CALENTHAIPLUGIN_H__