--- a/ganeswidgets/src/hggridcontainer.cpp	Fri Jun 11 16:25:05 2010 +0100
+++ b/ganeswidgets/src/hggridcontainer.cpp	Thu Jul 22 16:36:56 2010 +0100
@@ -18,9 +18,9 @@
 #include <QGesture>
 #include <QPainter>
 #include <QTimer>
-#include <hblabel.h>
-#include <hbgridviewitem>
-#include <hbmainwindow>
+#include <HbLabel>
+#include <HbGridViewItem>
+#include <HbMainWindow>
 #include "hggridcontainer.h"
 #include "hgmediawallrenderer.h"
 #include "hgquad.h"
@@ -29,17 +29,18 @@
 #include "hgwidgetitem.h"
 #include "trace.h"
 
-#include <hbgridviewitem>
-#include <hbgridview>
-#include <hbiconitem>
-#include <qabstractitemmodel>
+#include <HbGridView>
+#include <HbIconItem>
+#include <QAbstractItemModel>
 #include "hglongpressvisualizer.h"
 
 
 static const qreal KCameraMaxYAngle(20);
 static const qreal KSpringVelocityToCameraYAngleFactor(2);
 
-HgGridContainer::HgGridContainer(QGraphicsItem *parent) : HgContainer(parent)
+HgGridContainer::HgGridContainer(QGraphicsItem *parent) :
+    HgContainer(parent),
+    mEffect3dEnabled(true)
 {
 
     mUserItemSize = QSize(120,120);
@@ -75,7 +76,7 @@
 
 qreal HgGridContainer::getCameraDistance(qreal springVelocity)
 {
-    if (mRenderer->getScrollDirection() == Qt::Vertical)
+    if (mRenderer->getScrollDirection() == Qt::Vertical || !mEffect3dEnabled)
         return 0;
     
     return qAbs(springVelocity * 0.01f);
@@ -83,7 +84,7 @@
 
 qreal HgGridContainer::getCameraRotationY(qreal springVelocity)
 {
-    if (mRenderer->getScrollDirection() == Qt::Vertical)
+    if (mRenderer->getScrollDirection() == Qt::Vertical || !mEffect3dEnabled)
         return 0;
 
     return qBound(-KCameraMaxYAngle, springVelocity * KSpringVelocityToCameraYAngleFactor, KCameraMaxYAngle);
@@ -119,3 +120,17 @@
         mSelectionModel->setCurrentIndex(item->modelIndex(), QItemSelectionModel::Current);
     }    
 }
+
+void HgGridContainer::setEffect3dEnabled(bool effect3dEnabled)
+{
+    if (mEffect3dEnabled != effect3dEnabled) {
+        // Setting has changed. redraw screen.
+        mEffect3dEnabled = effect3dEnabled;
+        update();
+    }
+}
+
+bool HgGridContainer::effect3dEnabled() const
+{
+    return mEffect3dEnabled;
+}