--- a/controlpanelplugins/themeplugin/src/cpthemepreview.cpp	Wed Jul 14 07:09:46 2010 +0800
+++ b/controlpanelplugins/themeplugin/src/cpthemepreview.cpp	Fri Jul 23 11:04:51 2010 +0800
@@ -15,6 +15,7 @@
  *   
  */
 
+#include <QObject>
 #include <QString>
 #include <QGraphicsPixmapItem>
 #include <QGraphicsLinearLayout>
@@ -81,10 +82,13 @@
     }
     else {
         mPreviewIcon = new HbIconItem(mTheme.portraitPreviewIcon(), this);
+        //set to ignore aspect ratio so the layout would rezise the icon correctly.
+        mPreviewIcon->setAspectRatioMode(Qt::IgnoreAspectRatio);
+          
     }
-    
-    //set to ignore aspect ratio so the layout would rezise the icon correctly.
-    mPreviewIcon->setAspectRatioMode(Qt::IgnoreAspectRatio);
+    // set an object name for preview icon to make it testable for automation testing
+    mPreviewIcon->setObjectName(QString("themePreviewIcon"));
+
     
     bottomLayout->addItem(mPreviewIcon);
     containerLayout->addItem(bottomLayout);
@@ -158,7 +162,7 @@
 */
 void CpThemePreview::themeSelected()
 {
-    emit applyTheme(mTheme.name());
+    emit applyTheme(mTheme);
 }
 
 /*! 
@@ -181,9 +185,12 @@
         
         if(orientation == Qt::Horizontal) {
             mPreviewIcon->setIcon(mTheme.landscapePreviewIcon());
+            mPreviewIcon->setAspectRatioMode(Qt::KeepAspectRatio);
+                    
         }
         else {
             mPreviewIcon->setIcon(mTheme.portraitPreviewIcon());
+            mPreviewIcon->setAspectRatioMode(Qt::IgnoreAspectRatio);
         }
         
         previewLayout->addItem(mPreviewIcon);