--- a/calendarui/controller/inc/calenactionui.h	Thu Aug 19 09:53:43 2010 +0300
+++ b/calendarui/controller/inc/calenactionui.h	Tue Aug 31 15:13:43 2010 +0300
@@ -11,30 +11,27 @@
 *
 * Contributors:
 *
-* Description:   Calendar controller
+* Description:  Calendar controller
 *
 */
 
 
-
 #ifndef CALENACTIONUI_H
 #define CALENACTIONUI_H
 
 // INCLUDES
 #include <e32base.h>
-#include <calencommandhandler.h>
-#include <calencommands.hrh>
+#include "hb_calencommands.hrh"
+#include "calencommandhandler.h"
 
 // FORWARD DECLARATIONS
 class CCalenController;
-class CCalenDeleteUi;
+class CalenDeleteUi;
 class CCalenEditUi;
-class CCalenLocationUi;
-class CCalenCustomisationManager;
 class MCalenCommandHandler;
-class CCalenAttachmentUi;
 
 // CLASS DEFINITIONS
+
 /**
  * The action ui handles events passed from the controller and delegates
  * them to the appropriate place (i.e. the specific action ui classes).
@@ -42,89 +39,55 @@
 class CCalenActionUi : public CBase,
                        public MCalenCommandHandler
     {
-
-public:  // Construction and destruction
-
-    /**
-     * 1st phase constructor
-     * @param aController A reference to calencontroller
-     */
-    static CCalenActionUi* NewL( CCalenController& aController );
-
-    /**
-     * Virtual destructor
-     */
-    virtual ~CCalenActionUi();
-
-public: // From MCalenCommandHandler
+    public:  // Construction and destruction
+        /**
+         * 1st phase constructor
+         * @param aController A reference to CCalenController
+         */
+        static CCalenActionUi* NewL( CCalenController& aController );
+        
+        /**
+         * Virtual destructor
+         */
+        virtual ~CCalenActionUi();
 
-    /**
-     * Handles key presses.
-     * 
-     * @param aCommand The command Id of the key.
-     */
-    TBool HandleCommandL( const TCalenCommand& aCommand );
-
-    /**
-     * Allows extending this API without breaking BC.
-     * 
-     * @param aExtensionUid specifies
-     * @return extension of the requested type
-     */
-    TAny* CalenCommandHandlerExtensionL( TUid aExtensionUid );
-
-public:  // New functions
-
-    /**
-     * Handle actionui related command
-     * @param aCommand A command to be handled
-     * @return a boolean showing wether the command is being handled or not
-     */
-    //TBool HandleActionUiCommandL( TInt aCommand );
+    public: // MCalenCommandHandler
+        TBool HandleCommandL( const TCalenCommand& aCommand );
 
-    /**
-     * Gets a command handler or NULL.
-     */
-    MCalenCommandHandler* GetCommandHandlerL( TInt aCommand );
-	
-	 /**
-     * Function to tell whether editor is active or not
-     * @return ETrue if editor is active else EFalse
-     */
-    TBool IsEditorActive();
-
-private:  // Construction and destruction
-
-    /**
-     * C++ constructor, non-leaving
-     * @param aController A reference to the calencontroller
-     */
-    CCalenActionUi( CCalenController& aController );
+    public:  // New functions
+        
+        /**
+         * Gets a command handler or NULL.
+         */
+        MCalenCommandHandler* GetCommandHandlerL( TInt aCommand );
+        /**
+        * This Function saves the entries
+        * should only calls after edit or create function has called 
+        */
+        void saveAndCloseEditor();
 
-    /**
-     * 2nd phase constructor
-     */
-    void ConstructL();
-
-private:  // New functions
+    private:  // Construction and destruction
+        /**
+         * C++ constructor, non-leaving
+         * @param aController A reference to the CCalenController
+         */
+        CCalenActionUi( CCalenController& aController );
+        
+        /**
+         * 2nd phase constructor
+         */
+        void ConstructL();
+        
+        /**
+         * Launches the settings view
+         */
+        void launchSettingsView();
+   
 
-    /**
-     * Show settings dialog
-     */
-    void ShowSettingsL();
-    /**
-     * Show calenders dialog
-     */
-    void ShowCalendarsL();
-
-private:  // Data
-
-    CCalenDeleteUi* iDeleteUi;          // pointer to the deleteui
-    CCalenEditUi* iEditUi;              // pointer to the seditui
-    CCalenLocationUi* iLocationUi;      // pointer to the locationui
-    CCalenController& iController;      // reference to the calencontroller
-    CCalenAttachmentUi* iAttachmentUi;
-
+    private:  // Data
+        CalenDeleteUi*             iDeleteUi;     // pointer to the deleteui
+        CCalenEditUi*                iEditUi;         // pointer to the seditui       
+        CCalenController&           iController;    // reference to the CCalenController
     };
 
 #endif // CALENACTIONUI_H