diff -r b023a8d2866a -r ea65f74e6de4 photosgallery/viewframework/views/metadatadialog/src/glximgvwrmetadatadialog.cpp
--- a/photosgallery/viewframework/views/metadatadialog/src/glximgvwrmetadatadialog.cpp	Thu Jul 15 18:39:01 2010 +0300
+++ b/photosgallery/viewframework/views/metadatadialog/src/glximgvwrmetadatadialog.cpp	Thu Aug 19 09:55:03 2010 +0300
@@ -20,31 +20,18 @@
 
 //system includes
 #include <AknUtils.h>                   //for AknUtils
-#include <lbsposition.h> 
 #include <akntitle.h>
-#include <coeaui.h>
 #include <data_caging_path_literals.hrh>// KDC_APP_RESOURCE_DIR 
-#include <eikmenub.h>                   // for CEikMenuBar
 #include <StringLoader.h>
 #include <akntoolbar.h>
-#include <glxcommandhandleraddtocontainer.h>         // For CGlxCommandHandlerAddToContainer
 
 //User includes
 #include <glxmetadatadialog.rsg>
 #include <glxresourceutilities.h>
 #include <glxlog.h>
 #include <glxtracer.h>
-#include <glxcollectionpluginall.hrh>
-#include <glxfilterfactory.h>               // for TGlxFilterFactory
-#include <glxuiutility.h>
 #include <glxcommandhandlers.hrh>
-#include <hlplch.h>                     // for HlpLauncher
-#include <photos.hlp.hrh>
-#include <glxgallery.hrh>
 #include <glxdetailsboundcommand.hrh>
-#include <glxscreenfurniture.h>
-#include <glxuiutilities.rsg>
-#include <glxpanic.h>                    // For Panics
 #include "glxmetadatacommandhandler.h"
 
 // ============================ MEMBER FUNCTIONS ===============================
@@ -64,10 +51,14 @@
     return self;
     }
 
+// -----------------------------------------------------------------------------
+// CGlxImgVwrMetadataDialog
+// -----------------------------------------------------------------------------
+//
 CGlxImgVwrMetadataDialog::CGlxImgVwrMetadataDialog(const TDesC& aUri):iUri(aUri)
     {
+    }
 
-    }
 // -----------------------------------------------------------------------------
 // ConstructL
 // -----------------------------------------------------------------------------
@@ -93,13 +84,11 @@
         iStatusPaneAvailable = ETrue;       
         }
 
-    // make the toolbar disabled
-    SetDetailsDlgToolbarVisibility(EFalse);        
-
     // do we have status pane
     if( statusPane )
         {
-        GLX_LOG_INFO1("GLX_UMP::CGlxImgVwrMetadataDialog::ConstructL::STATUS PANE = %d",statusPane->IsVisible());    
+        GLX_LOG_INFO1("GLX_UMP::CGlxImgVwrMetadataDialog::ConstructL::STATUS PANE = %d",
+                statusPane->IsVisible());    
         // load the title text
         HBufC* text = StringLoader::LoadL(R_GLX_METADATA_VIEW_TITLE_DETAILS, iEikonEnv );
         SetTitleL( *text );
@@ -109,9 +98,6 @@
             }
         iAvkonAppUi->StatusPane()->MakeVisible(ETrue);             
         }
-
-    iUiUtility = CGlxUiUtility::UtilityL(); 
-
     } 
 
 // -----------------------------------------------------------------------------
@@ -120,10 +106,8 @@
 //
 CGlxImgVwrMetadataDialog::~CGlxImgVwrMetadataDialog()
     {
-
     TRACER("CGlxImgVwrMetadataDialog::~CGlxImgVwrMetadataDialog");
 
-
     //To Disable the status pane if the dialog is launched from fullscreenview  
     if (!iStatusPaneAvailable && iAvkonAppUi)
         {
@@ -143,11 +127,6 @@
         TRAP_IGNORE(iAvkonAppUi->ProcessCommandL(EGlxCmdResetView));
         }
 
-    if( iUiUtility )
-        {
-        iUiUtility->Close();
-        }
-
     if (iResourceOffset)
         {
         CCoeEnv::Static()->DeleteResourceFile(iResourceOffset);
@@ -179,56 +158,41 @@
     TRACER("CGlxImgVwrMetadataDialog::ExecuteLD");     
     return CAknDialog::ExecuteLD( R_IMG_VIEWER_METADATA_DIALOG );
     }
+
 // -----------------------------------------------------------------------------
 // ProcessCommandL
 // -----------------------------------------------------------------------------
 //
-void CGlxImgVwrMetadataDialog::ProcessCommandL( TInt aCommandId )
+void CGlxImgVwrMetadataDialog::ProcessCommandL(TInt /*aCommandId*/)
     {
     TRACER("CGlxImgVwrMetadataDialog::ProcessCommandL");
     // hide menu bar
     iMenuBar->StopDisplayingMenuBar();
     }
+
 //-----------------------------------------------------------------------------
 // CGlxImgVwrMetadataDialog::CreateCustomControlL
 //-----------------------------------------------------------------------------
 SEikControlInfo CGlxImgVwrMetadataDialog::CreateCustomControlL(TInt 
         aControlType)
     {
-    GLX_LOG_INFO("CShwSlideshowSettingsDialog::CreateCustomControlL");
+    GLX_LOG_INFO("CGlxImgVwrMetadataDialog::CreateCustomControlL");
 
     // create control info, no flags or trailer text set
     SEikControlInfo controlInfo;
-    controlInfo.iControl        = NULL;
-    controlInfo.iTrailerTextId  = 0;
-    controlInfo.iFlags          = 0;
+    controlInfo.iControl = NULL;
+    controlInfo.iTrailerTextId = 0;
+    controlInfo.iFlags = 0;
     if (aControlType == EMetaDataDialogListBox)
         {
-        iContainer = CGlxImgVwrMetadataContainer::NewL(iAvkonAppUi->ClientRect(),iUri);        
+        iContainer = CGlxImgVwrMetadataContainer::NewL(
+                iAvkonAppUi->ClientRect(), iUri);
         controlInfo.iControl = iContainer; // giving ownership   
         }
     return controlInfo; // returns ownership of ItemList
     }
 
 // -----------------------------------------------------------------------------
-// CGlxImgVwrMetadataDialog::DynInitMenuPaneL
-// -----------------------------------------------------------------------------
-//
-void CGlxImgVwrMetadataDialog::DynInitMenuPaneL(TInt /*aMenuId*/,
-        CEikMenuPane* /*aMenuPane*/)
-    {
-    //no implementation
-    }
-
-//-----------------------------------------------------------------------------
-// CGlxImgVwrMetadataDialog::SizeChanged
-//-----------------------------------------------------------------------------
-void CGlxImgVwrMetadataDialog::SizeChanged()
-    {
-    TRACER("CGlxImgVwrMetadataDialog::SizeChanged");
-    CAknDialog::SizeChanged();
-    }
-// -----------------------------------------------------------------------------
 // CGlxImgVwrMetadataDialog::InitResourceL
 // -----------------------------------------------------------------------------
 //
@@ -246,65 +210,12 @@
     iResourceOffset = CCoeEnv::Static()->AddResourceFileL(resourceFile);
     }  
 
-
-// -----------------------------------------------------------------------------
-// CGlxImgVwrMetadataDialog::HandleViewCommandL
-// -----------------------------------------------------------------------------
-//    
-TBool CGlxImgVwrMetadataDialog::HandleViewCommandL( TInt /*aCommand*/ )
-    {
-    TRACER("CGlxImgVwrMetadataDialog::HandleViewCommandL");
-    return EFalse;
-    }
-// ---------------------------------------------------------------------------
-// CGlxImgVwrMetadataDialog::PreLayoutDynInitL
-// ---------------------------------------------------------------------------
-//
-void CGlxImgVwrMetadataDialog::PreLayoutDynInitL()
-    {
-    // No Implementation
-    }
-
-//-----------------------------------------------------------------------------
-// CGlxImgVwrMetadataDialog::PostLayoutDynInitL
-//-----------------------------------------------------------------------------
-//
-void CGlxImgVwrMetadataDialog::PostLayoutDynInitL()
-    {}
-
-//-----------------------------------------------------------------------------
-// CGlxImgVwrMetadataDialog::Draw
-//-----------------------------------------------------------------------------
-//
-void CGlxImgVwrMetadataDialog::Draw( const TRect& /*aRect*/ ) const
-{
-TRACER("CGlxImgVwrMetadataDialog::Draw");
-TRect rect;
-AknLayoutUtils::LayoutMetricsRect (AknLayoutUtils::EMainPane, rect);
-
-// Get the standard graphics context
-CWindowGc& gc = SystemGc();
-gc.SetBrushColor(KRgbWhite);
-gc.DrawRect(rect);
-}
-
-//-----------------------------------------------------------------------------
-// CGlxImgVwrMetadataDialog::HandlePointerEventL
-//-----------------------------------------------------------------------------
-//
-void CGlxImgVwrMetadataDialog::HandlePointerEventL(
-        const TPointerEvent& aPointerEvent)
-    {
-    TRACER("CGlxImgVwrMetadataDialog::HandlePointerEventL");
-    CCoeControl::HandlePointerEventL( aPointerEvent );
-    }
-
 // ---------------------------------------------------------------------------
 // CGlxImgVwrMetadataDialog::SetTitleL()
 // ---------------------------------------------------------------------------
 void CGlxImgVwrMetadataDialog::SetTitleL(const TDesC& aTitleText)
     {
-    TRACER("CGlxFetcherContainer::SetTitleL");
+    TRACER("CGlxImgVwrMetadataDialog::SetTitleL");
     CEikStatusPane* statusPane = iEikonEnv->AppUiFactory()->StatusPane();
     CleanupStack::PushL(statusPane);
     // get pointer to the default title pane control
@@ -328,7 +239,7 @@
 // ---------------------------------------------------------------------------
 void CGlxImgVwrMetadataDialog::SetPreviousTitleL()
     {
-    TRACER("CGlxFetcherContainer::SetPreviousTitleL");
+    TRACER("CGlxImgVwrMetadataDialog::SetPreviousTitleL");
     CEikStatusPane* prevStatusPane = iEikonEnv->AppUiFactory()->StatusPane();
     CleanupStack::PushL(prevStatusPane);
     CAknTitlePane* prevTitlePane = ( CAknTitlePane* )prevStatusPane->ControlL(
@@ -342,16 +253,7 @@
     CleanupStack::Pop(prevTitlePane);
     CleanupStack::Pop(prevStatusPane);
     }
-// -----------------------------------------------------------------------------
-// CGlxImgVwrMetadataDialog::HandleResourceChange
-// -----------------------------------------------------------------------------
-//
-void CGlxImgVwrMetadataDialog::HandleResourceChange( TInt aType )
-    {
-    TRACER("CGlxImgVwrMetadataDialog::HandleResourceChange");
-    //Handle global resource changes, such as scalable UI or skin events and orientation change (override)
-    CAknDialog::HandleResourceChange( aType );
-    }
+
 // -----------------------------------------------------------------------------
 // CGlxImgVwrMetadataDialog::HandleToolbarResetting
 // -----------------------------------------------------------------------------