diff -r 0f07cd1b5772 -r 1984aceb8774 calendarui/controller/inc/calenmultidbeditor.h
--- a/calendarui/controller/inc/calenmultidbeditor.h	Mon Mar 15 12:40:18 2010 +0200
+++ b/calendarui/controller/inc/calenmultidbeditor.h	Wed Mar 31 21:29:10 2010 +0300
@@ -23,11 +23,15 @@
 //  INCLUDES
 #include <AknForm.h>
 #include <gdi.h>
+#include <calennotificationhandler.h>
 
 class CalenAppUi;
 class CAknNavigationControlContainer;
 class CCalenController;
 class CCalCalendarInfo;
+class CCalenMultipleDbUi;
+class CCalenColourSelectionGrid;
+
 
 /**
 * Class defining Map icon picture, derived from CPicture
@@ -104,8 +108,9 @@
     /**
      * Two-phased constructor.
      */
-    static CCalenMultiDBEditor* NewL( CCalCalendarInfo& aCalendarInfo,
-            CCalenController& aController, TBool aEditFlag);
+    static CCalenMultiDBEditor* NewL(CCalenMultipleDbUi& aMultipleDbui,
+                                    CCalCalendarInfo& aCalendarInfo,
+                                    CCalenController& aController, TBool aEditFlag);
 
     /**
      * From Base class.
@@ -124,8 +129,9 @@
     /**
      * C++ constructor.
      */
-    CCalenMultiDBEditor( CCalCalendarInfo&  aCalendarInfo,
-            CCalenController& aController, TBool aEditFlag);
+    CCalenMultiDBEditor(CCalenMultipleDbUi& aMultipleDbui,
+                        CCalCalendarInfo&  aCalendarInfo,
+                        CCalenController& aController, TBool aEditFlag);
 
     
 protected:  // Functions from base classes
@@ -159,9 +165,12 @@
      */
 	void ReadDataFromFormL( TBool aContinueOnError );
 	
-	
+	void HandleDialogPageEventL( TInt aEventID );
 	
-	void HandleDialogPageEventL( TInt aEventID );
+	/*
+	 * from CAknDialog
+	 */
+	void FocusChanged(TDrawNow aDrawNow);
 	
 private:
 
@@ -234,6 +243,11 @@
 	*/
 	void SetVisiblityFieldL( TBool aStatusVal );
 	
+	/*
+	 * Load colors for grid
+	 */
+	void LoadColorsL();
+	
 	/**
 	* setup title pane for the status pane
 	* @return void 
@@ -271,13 +285,18 @@
     CCalenController& iController;
     TInt iColVal;		// Color id
     TBool iCalendarStatus;
-    TRgb iColors;
     CDbColorPicture* iPicture;
     TBool iEditFlag;
     CAknNavigationControlContainer*   iNaviContainer;
     //Sync field, EFalse then Sync off else Sync On
     TBool                             iSyncStatus;
     TCalendarConflicts                iConflict;
+    
+    CCalenMultipleDbUi&               iMultipleDbUi;
+	 
+	CArrayFixFlat<TRgb>*              iRgbColors;
+    TBool                             iNoneChoosen;
+    TRgb                              iChoosenColor;
     };
 
 #endif // CALENMULTIDBEDITOR_H