--- a/ui/views/gridview/inc/glxgridview.h	Tue Jul 06 14:16:16 2010 +0300
+++ b/ui/views/gridview/inc/glxgridview.h	Wed Aug 18 09:48:53 2010 +0300
@@ -26,12 +26,15 @@
 //Qt/Orbit forward declarations
 class HbMainWindow;
 class QAbstractItemModel;
-class HgWidget;
+class HgGrid;
 class GlxModelWrapper;
 class HbPushButton;
 class HbIconItem;
 class HbCheckBox;
 class HbLabel;
+class GlxSettingInterface;
+class HbGroupBox;
+class QGraphicsLinearLayout;
 
 class GlxGridView : public GlxView
 {
@@ -42,7 +45,7 @@
     ~GlxGridView();
     void activate() ;
     void deActivate();
-    void initializeView(QAbstractItemModel *model);
+    void initializeView( QAbstractItemModel *model, GlxView *preView );
     void setModel(QAbstractItemModel *model);
     void addToolBar( HbToolBar *toolBar );
     void enableMarking() ;
@@ -86,22 +89,28 @@
     void showHbItems();
     int getSubState();
     void showNoImageString();
+    
+    //It is used to hide and show the toolbar
+    //In album grid it is not required to show the tool bar
+    void updateToolBar();
 
 	HbMainWindow        *mWindow;          // no ownership
 	QAbstractItemModel  *mModel ;
-	HgWidget            *mWidget;          // HG Grid Widget
+	HgGrid              *mWidget;          // HG Grid Widget
 	QItemSelectionModel *mSelectionModel;  // Selected items model
     GlxModelWrapper     *mModelWrapper;    // Temp Model Wrapper, so That Role Change not a problem
-    HbPushButton        *mUiOnButton;
-    HbPushButton        *mCameraButton;    // Camera Button, when item count is zero
+    HbPushButton        *mUiOnButton;    
     bool                 mScrolling;
     HbIconItem          *mIconItem;
     HbCheckBox          *mMarkCheckBox;    // Mark All checkbox 
-    HbLabel             *mCountItem;       // Item count of the grid
-    HbLabel             *mMainLabel;       
-    HbLabel             *mCountLabel;      // Marked item count
+    HbGroupBox          *mTotalImagesCount;       // Item count of the grid
+    HbGroupBox          *mMarkSelectHeading;    
+    HbLabel             *mMarkCountLabel;      // Marked item count
     HbLabel             *mZeroItemLabel;   // zero itemcount
-    HbLabel             *mAlbumName;
+    HbGroupBox          *mAlbumNameHeading;
+    QGraphicsLinearLayout *mMarkContainer;
+    GlxSettingInterface *mSettings;    
+    HbWidget *mMarkingWidget;
 };
 
 #endif /* GLXGRIDVIEW_H_ */