diff -r b023a8d2866a -r ea65f74e6de4 photosgallery/viewframework/views/metadatadialog/inc/glximgvwrmetadatacontainer.h
--- a/photosgallery/viewframework/views/metadatadialog/inc/glximgvwrmetadatacontainer.h	Thu Jul 15 18:39:01 2010 +0300
+++ b/photosgallery/viewframework/views/metadatadialog/inc/glximgvwrmetadatacontainer.h	Thu Aug 19 09:55:03 2010 +0300
@@ -11,15 +11,9 @@
 *
 * Contributors:
 *
-* Description: 
+* Description: Image viewer metadata dialog container implementation
 *
 */
-/*
- * glximgvwrmetadatacontainer.h
- *
- *  Created on: Oct 22, 2009
- *      Author: sourbasu
- */
 
 #ifndef GLXIMGVWRMETADATACONTAINER_H_
 #define GLXIMGVWRMETADATACONTAINER_H_
@@ -49,120 +43,117 @@
 public MGlxMediaListObserver
 
     {
-public:  // Constructors and destructor
-    void ViewDynInitMenuPaneL(TInt aResourceId, CEikMenuPane *aMenuPane);
+public:
+    // Constructors and destructor
     /**
-    * Symbian standard tow phase construction.Construct object of CGlxImgVwrMetadataContainer object.
-    * 
-    * @param aRect rect for control
-    * @param aMediaList media list
-    * @return Metadata container object
-    */
-    static CGlxImgVwrMetadataContainer* NewL( const TRect& aRect,const TDesC& aUri);
-    
+     * Symbian standard tow phase construction.Construct object of CGlxImgVwrMetadataContainer object.
+     * 
+     * @param aRect rect for control
+     * @param aMediaList media list
+     * @return Metadata container object
+     */
+    static CGlxImgVwrMetadataContainer* NewL(const TRect& aRect,
+            const TDesC& aUri);
+
     /**
-    * Symbian standard tow phase construction.Construct object of CGlxImgVwrMetadataContainer object.
-    * 
-    * @param aRect rect for control
-    * @param aMediaList media list
-    * @return Metadata container object
-    */  
-    static CGlxImgVwrMetadataContainer* NewLC( const TRect& aRect,const TDesC& aUri);
-    
+     * Symbian standard tow phase construction.Construct object of CGlxImgVwrMetadataContainer object.
+     * 
+     * @param aRect rect for control
+     * @param aMediaList media list
+     * @return Metadata container object
+     */
+    static CGlxImgVwrMetadataContainer* NewLC(const TRect& aRect,
+            const TDesC& aUri);
+
     /**
-    * Destructor
-    */       
+     * Destructor
+     */
     ~CGlxImgVwrMetadataContainer();
 
-public: 
-        
-   // @ref CAknSettingItemList::CreateSettingItemL
-   CAknSettingItem* CreateSettingItemL(TInt aIdentifier);
-   
-   // @ref CAknSettingItemList::HandleListBoxEventL
-   void HandleListBoxEventL(CEikListBox* aListBox,
-                                 TListBoxEvent aEventType);
-   void HandleListboxChangesL();
-   
-   //Enable disble the options based on the current selected item
-   TBool IsItemModifiable();
-   //Change MSK
+public:
+
+    // @ref CAknSettingItemList::CreateSettingItemL
+    CAknSettingItem* CreateSettingItemL(TInt aIdentifier);
+
+    // @ref CAknSettingItemList::HandleListBoxEventL
+    void HandleListBoxEventL(CEikListBox* aListBox, TListBoxEvent aEventType);
+    void HandleListboxChangesL();
+
+    //Change MSK
     void ChangeMskL();
+
     //Enable marquee support
     void EnableMarqueingL();
-    
-    
-    
-    
+
 public:
-        //MedialistObserver APIS
-        void HandleItemAddedL( TInt aStartIndex, TInt aEndIndex, MGlxMediaList* aList );
-        void HandleItemRemovedL( TInt aStartIndex, TInt aEndIndex, MGlxMediaList*/* aList */);
-        void HandleAttributesAvailableL( TInt aItemIndex, 
-        const RArray<TMPXAttribute>& aAttributes, MGlxMediaList* aList );    
-        void HandleFocusChangedL( NGlxListDefs::TFocusChangeType aType, 
-        TInt aNewIndex, TInt aOldIndex, MGlxMediaList* aList );
-        void HandleItemSelectedL(TInt aIndex, TBool aSelected, MGlxMediaList* aList );
-        void HandleMessageL( const CMPXMessage& aMessage, MGlxMediaList* aList );
-        void HandleError( TInt aError );
-        void HandleCommandCompleteL( CMPXCommand* aCommandResult, TInt aError, 
-        MGlxMediaList* aList );
-        void HandleMediaL( TInt aListIndex, MGlxMediaList* aList );
-        void HandleItemModifiedL( const RArray<TInt>& aItemIndexes, MGlxMediaList* aList );
-        void HandleErrorL();
-        MGlxMediaList& MediaList();
-        void HandleCommandCompleteL(TAny* aSessionId, 
-                CMPXCommand* /*aCommandResult*/, TInt aError, MGlxMediaList* aList);
+    //MedialistObserver APIS
+    void HandleItemAddedL(TInt aStartIndex, TInt aEndIndex,
+            MGlxMediaList* aList);
+    void
+            HandleItemRemovedL(TInt aStartIndex, TInt aEndIndex,
+                    MGlxMediaList*/* aList */);
+    void HandleAttributesAvailableL(TInt aItemIndex, const RArray<
+            TMPXAttribute>& aAttributes, MGlxMediaList* aList);
+    void HandleFocusChangedL(NGlxListDefs::TFocusChangeType aType,
+            TInt aNewIndex, TInt aOldIndex, MGlxMediaList* aList);
+    void HandleItemSelectedL(TInt aIndex, TBool aSelected,
+            MGlxMediaList* aList);
+    void HandleMessageL(const CMPXMessage& aMessage, MGlxMediaList* aList);
+    void HandleError(TInt aError);
+    void HandleCommandCompleteL(CMPXCommand* aCommandResult, TInt aError,
+            MGlxMediaList* aList);
+    void HandleMediaL(TInt aListIndex, MGlxMediaList* aList);
+    void HandleItemModifiedL(const RArray<TInt>& aItemIndexes,
+            MGlxMediaList* aList);
+    MGlxMediaList& MediaList();
+    void HandleCommandCompleteL(TAny* aSessionId,
+            CMPXCommand* /*aCommandResult*/, TInt aError,
+            MGlxMediaList* aList);
 
 private:
 
-        /**
-        * C++ constructor.
-        * 
-        * @param aMediaList media list
-        */
-        CGlxImgVwrMetadataContainer(const TDesC& aUri);
-        
-        /**
-        * Symbian 2nd phase constructor
-        * @param aRect rect for this control
-        */      
-        void ConstructL( const TRect& aRect);
-        void CreateMediaListForSelectedItemL();
-        void SetAttributesL(TMPXAttribute attribute);
-        void EditItemL(TInt aIndex, TBool aCalledFromMenu);
-        void SetNameDescriptionL(TInt aItem);
-        void SetDurationLIicenseItemVisibilityL();
-        TBool IsLicenseItem();
+    /**
+     * C++ constructor.
+     * 
+     * @param aMediaList media list
+     */
+    CGlxImgVwrMetadataContainer(const TDesC& aUri);
+
+    /**
+     * Symbian 2nd phase constructor
+     * @param aRect rect for this control
+     */
+    void ConstructL(const TRect& aRect);
+    void CreateMediaListForSelectedItemL();
+    void SetAttributesL(TMPXAttribute attribute);
+    void EditItemL(TInt aIndex, TBool aCalledFromMenu);
+    void SetLicenseItemVisibilityL();
 
-        /**
-         * Create Image Viewer manager Instance
-         */
-        void CreateImageViewerInstanceL();
-        
-        /**
-         * Delete Image Viewer manager Instance
-         */
-        void DeleteImageViewerInstance();
+    /**
+     * Create Image Viewer manager Instance
+     */
+    void CreateImageViewerInstanceL();
+
+    /**
+     * Delete Image Viewer manager Instance
+     */
+    void DeleteImageViewerInstance();
 
-   
-private:    //data
-    
-        //Flag to check if the item is a video.
-        TBool iVideo;
-        //To check if marquee is enabled.
-        TBool iMarquee;
-        //to set visible license items based on the Item.
-        TBool iSetVisible;
-        RBuf iTextSetter;
-        const TDesC& iUri ;
-        MGlxMediaList* iItemMediaList;
-        CGlxAttributeContext* iMainListAttributecontext;
-        TGlxSelectionIterator iSelectionIterator;
-        // For image viewer, not own
-        CGlxImageViewerManager* iImageViewerInstance;
+private:
+    //data
+    //Flag to check if the item is a video.
+    TBool iVideo;
+    //To check if marquee is enabled.
+    TBool iMarquee;
+    //to set visible license items based on the Item.
+    TBool iSetVisible;
+    RBuf iTextSetter;
+    const TDesC& iUri;
+    MGlxMediaList* iItemMediaList;
+    CGlxAttributeContext* iMainListAttributecontext;
+    TGlxSelectionIterator iSelectionIterator;
+    // For image viewer, not own
+    CGlxImageViewerManager* iImageViewerInstance;
     };
 
-
-
 #endif /* GLXIMGVWRMETADATACONTAINER_H_ */