diff -r 5b238bc8ffb6 -r 01504893d9cb photosgallery/viewframework/views/metadatadialog/inc/glximgvwrmetadatadialog.h
--- a/photosgallery/viewframework/views/metadatadialog/inc/glximgvwrmetadatadialog.h	Wed Sep 15 12:13:06 2010 +0300
+++ b/photosgallery/viewframework/views/metadatadialog/inc/glximgvwrmetadatadialog.h	Wed Oct 13 14:32:09 2010 +0300
@@ -25,41 +25,41 @@
 // SYSTEM INCLUDES
 #include <AknDialog.h>
 
+#include <alf/alfscreenbuffer.h>
 #include <glximgvwrmetadatacontainer.h>
-
+// FORWARD DECLARATIONS
+class CGlxMetadataCommandHandler;
+class CGlxCommandHandlerAddToContainer;
+class CGlxUiUtility;
 
 // CLASS DECLARATION
 /**
  *  CGlxImgVwrMetadataDialog
  * 
- *  Image Viewer Metadata dialog implementation
+ *  Metadata dialog implementation
  */
 class CGlxImgVwrMetadataDialog : public CAknDialog
+
     {
-public:
-    // Constructors and destructor
+public: // Constructors and destructor
 
     /**
      * Two-phased constructor.
      *
      * @param aURI uri or file name of item
      */
-    IMPORT_C static CGlxImgVwrMetadataDialog* NewL(const TDesC& aUri);
+    IMPORT_C static CGlxImgVwrMetadataDialog* NewL( const TDesC& aUri );
 
     /**
      * Destructor.
      */
     virtual ~CGlxImgVwrMetadataDialog();
 
-private:
-    /**
-     * Constructor.
-     * @param aURI uri or file name of item
-     */  
+private :
     CGlxImgVwrMetadataDialog(const TDesC& aUri);
 
-public:
-    // Functions from base classes
+
+public: // Functions from base classes
 
     /**
      * Initializes the dialog and calls CAknDialog's 
@@ -71,64 +71,105 @@
      */
     IMPORT_C TInt ExecuteLD();
 
-protected:
+    
+protected:  // Functions from base classes
+
     /**
      * From MEikCommandObserver Prosesses menucommands
      *
      * @param aCommandId     Commant value defined in resources.
      */
-    void ProcessCommandL(TInt aCommandId);
+    void ProcessCommandL( TInt aCommandId );
+
+    /**
+     * From MEikMenuObserver Initializes items on the menu
+     *
+     * @param aMenuId    Current menu's resource Id
+     * @param aMenuPane  Pointer to menupane
+     */
+    void DynInitMenuPaneL(TInt aMenuId, CEikMenuPane* aMenuPane);
+    //hanldes orientation changes.
+    void HandleResourceChange( TInt aType );
+    void SizeChanged();
 
-private:
+private:        
+    /**
+     * Initializes the dialog's controls before the dialog is sized and 
+     * layed out. Empty by default.
+     */
+    void PreLayoutDynInitL();
+
+    /**
+     * Initializes the dialog's controls after the dialog has been sized 
+     * but before it has been activated.
+     */
+    void PostLayoutDynInitL();
     /**
      * Symbian 2nd phase constructor.
+     * 
+     * @param aURI
      */
     void ConstructL();
 
     /**
+     * Constructs the Alf Environment and display
+     */
+    void ConstructAlfEnvL();
+
+    /**
      * Initalise the resource
+     *
      */
-    void InitResourceL();
+    void InitResourceL();   
+
+    /** 
+     * To deal with any specific commands
+     *
+     * @param aCommand The command to respond to
+     * @return ETrue if the command has been handled.
+     *
+     */
+    TBool HandleViewCommandL(TInt aCommand);
+
+
 
 private:
+
+    void Draw( const TRect& /*aRect*/ ) const;    
+    void HandlePointerEventL(const TPointerEvent& aPointerEvent);       
     /**
      * SetTitleL
      * Sets title for view
      * @param aTitleText title of view to be set
      */
-    void SetTitleL(const TDesC& aTitleText);
+    void SetTitleL(const TDesC& aTitleText);    
     /**
      * SetPreviousTitleL
      * Sets title of previous view
      */
     void SetPreviousTitleL();
 
-    /** 
-    * Sets the dialog toolbar visibility
-    * @param aVisible - ETrue for visible; EFalse otherwise.
-    */
     void SetDetailsDlgToolbarVisibility(TBool aVisible);
 
-public:
-    // from MEikDialogPageObserver
+public: // from MEikDialogPageObserver
     /**
      * @ref MEikDialogPageObserver::CreateCustomControlL
      */
     SEikControlInfo CreateCustomControlL(TInt aControlType);
 
 public:
-    /** 
-    * Handles the toolbar visiblity to be in sync with the calling app
-    * @param aVisible - ETrue for visible; EFalse otherwise.
-    */    
+    /*
+     *  
+     */
     void HandleToolbarResetting(TBool aVisible);
 
-private:
-    //data
+private: //data
+
     TInt iResourceOffset;
     TBool iStatusPaneAvailable;
-    HBufC* iPreviousTitle;
-    const TDesC& iUri;
+    CGlxUiUtility* iUiUtility;      
+    HBufC* iPreviousTitle;    
+    const TDesC& iUri; 
     CGlxImgVwrMetadataContainer* iContainer;
     };