diff -r 55d60436f00b -r d68a4b5d5885 clock2/clockui/uilayer/clockmainview/inc/clockmaincontainer.h
--- a/clock2/clockui/uilayer/clockmainview/inc/clockmaincontainer.h	Tue May 11 16:12:24 2010 +0300
+++ b/clock2/clockui/uilayer/clockmainview/inc/clockmaincontainer.h	Tue May 25 12:41:10 2010 +0300
@@ -36,9 +36,10 @@
 class CAknDoubleStyleListBox;
 
 class CClockMarqueeLabel;
+class CAknButton;
 
 // Constants
-const TInt KZeroAlarms( 1 );
+const TInt KZeroAlarms( 0 );
 
 // Class declaration
 /**
@@ -47,7 +48,8 @@
 * @exe clock.exe
 */
 class CClockMainContainer : public CCoeControl,
-                            public MEikListBoxObserver
+                            public MEikListBoxObserver,
+                            public MCoeControlObserver
 	{
 	public:			// Constructor and destructor
 			
@@ -103,6 +105,8 @@
         * may be obtained by accessing the list box itself.
         */
         void HandleListBoxEventL( CEikListBox* aListBox, TListBoxEvent aEventType );
+        
+        void HandleControlEventL( CCoeControl* aControl, TCoeEvent aEventType );
     	
 	public:         // New functions
 	    
@@ -146,6 +150,16 @@
 		* @brief Reconstructs the marquee label and prepares it for marqueeing again.
 		*/
 		void ResetMarqueeLabelL();
+
+      /**
+        * @brief Calculates correct rect and sets if ro NewAlarmButton
+        */
+		void SetCorrectRectForNewAlarmButton();
+
+		/**
+        * @brief Switches clock type
+        */
+		void SwitchClockTypeL();
     	
    	private:    	// Functions from base classes
 
@@ -316,6 +330,10 @@
 		* @brief Holds the date.
 		*/
 		HBufC*									iDateString;
+		
+		CAknButton*   iNewAlarmButton;
+		
+		TTime                                   iPreviousClockTypeSwitch;
 
 	};