# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1271251807 -10800
# Node ID 65e535be25c8890e2bfa7335a3225e6e3b2a7485
# Parent  c377fbf92a1297867ec4387faac6a72468c9c8fa
Revision: 201013
Kit: 201015

diff -r c377fbf92a12 -r 65e535be25c8 mulwidgets/gesturehelper/src/gesturehelperimpl.cpp
--- a/mulwidgets/gesturehelper/src/gesturehelperimpl.cpp	Wed Mar 31 22:30:13 2010 +0300
+++ b/mulwidgets/gesturehelper/src/gesturehelperimpl.cpp	Wed Apr 14 16:30:07 2010 +0300
@@ -275,8 +275,11 @@
              
             // we shouldnot consider pointer number here. If pointer 1 is
             // already touched and dragging and we recieve a down of pointer 0     
-                    
-            if( iPointerCount == 1 )
+            if( iPointerCount == 0 && pointerNumber == 1)
+                {
+                return EFalse;                
+                }        
+            else if( iPointerCount == 1 )
                 {
                 if(iCurrentPointer == pointerNumber )
                     {
diff -r c377fbf92a12 -r 65e535be25c8 mulwidgets/mulcoverflowwidget/src/mulbaseelement.cpp
--- a/mulwidgets/mulcoverflowwidget/src/mulbaseelement.cpp	Wed Mar 31 22:30:13 2010 +0300
+++ b/mulwidgets/mulcoverflowwidget/src/mulbaseelement.cpp	Wed Apr 14 16:30:07 2010 +0300
@@ -1249,14 +1249,15 @@
         	if (mData->mIsMirrored)
         		{
         		CAlfLayout* main  = (CAlfLayout*)findVisual( KMainLayoutIndex );
-				TSize topLayoutSize = main->Size().Target().AsSize();
+						TSize topLayoutSize = main->Size().Target().AsSize();
         		rightPosx = topLayoutSize.iWidth - aCounterLctDimension.posx ;
         		leftPosx = rightPosx - numOfPixels;
         		}
         	else
         		{
-        		rightPosx = aCounterLctDimension.posx + aCounterLctDimension.width; 
-        		leftPosx = rightPosx - numOfPixels;
+        		//rightPosx = aCounterLctDimension.posx + aCounterLctDimension.width; 
+        		//leftPosx = rightPosx - numOfPixels;
+        		leftPosx = aCounterLctDimension.posx;
         		}
 	   		mData->mCounterVisual->SetPos(TAlfRealPoint(leftPosx,aCounterLctDimension.posy));
 		    mData->mCounterVisual->SetSize(TAlfRealPoint(numOfPixels ,aCounterLctDimension.height));
diff -r c377fbf92a12 -r 65e535be25c8 mulwidgets/mulcoverflowwidget/src/mulcovertemplate4.cpp
--- a/mulwidgets/mulcoverflowwidget/src/mulcovertemplate4.cpp	Wed Mar 31 22:30:13 2010 +0300
+++ b/mulwidgets/mulcoverflowwidget/src/mulcovertemplate4.cpp	Wed Apr 14 16:30:07 2010 +0300
@@ -231,11 +231,7 @@
 	int mainPaneVerityId = 1;
 	int imagePaneVerityId = 6;
 	int videoPaneVerityId = 0;
-	int counterPaneVerityId = 6;
-	if(AknLayoutUtils::CbaLocation() == AknLayoutUtils::EAknCbaLocationRight)
-	    {
-	    counterPaneVerityId = 8;
-	    }
+	int counterPaneVerityId = 8;
 	
 	CAlfVisual* main = mData->mBaseElement->findVisual(KMainLayoutIndex);        
 	CAlfLayout* prntLay = main->Layout();
diff -r c377fbf92a12 -r 65e535be25c8 mulwidgets/mulsliderwidget/rom/mulsliderwidget.iby
--- a/mulwidgets/mulsliderwidget/rom/mulsliderwidget.iby	Wed Mar 31 22:30:13 2010 +0300
+++ b/mulwidgets/mulsliderwidget/rom/mulsliderwidget.iby	Wed Apr 14 16:30:07 2010 +0300
@@ -23,19 +23,6 @@
 
 SCALABLE_IMAGE(APP_BITMAP_DIR,APP_BITMAP_DIR,mulsliderwidget)
 
-data=EPOCROOT##epoc32\data\z\resource\slider\mui_cover_handle.svg	\resource\slider\mui_cover_handle.svg
-data=EPOCROOT##epoc32\data\z\resource\slider\mui_handle.png	        \resource\slider\mui_handle.png
-data=EPOCROOT##epoc32\data\z\resource\slider\mui_slider_progress.svg	\resource\slider\mui_slider_progress.svg
-data=EPOCROOT##epoc32\data\z\resource\slider\mui_slider_lsc.svg	\resource\slider\mui_slider_lsc.svg
-data=EPOCROOT##epoc32\data\z\resource\slider\mui_dl_progress_lsc.svg	\resource\slider\mui_dl_progress_lsc.svg
-data=EPOCROOT##epoc32\data\z\resource\slider\mui_slider_prt.svg 	\resource\slider\mui_slider_prt.svg
-data=EPOCROOT##epoc32\data\z\resource\slider\qgn_indi_slider_zoom_in.svg	     \resource\slider\qgn_indi_slider_zoom_in.svg	
-data=EPOCROOT##epoc32\data\z\resource\slider\qgn_indi_slider_zoom_out.svg        \resource\slider\qgn_indi_slider_zoom_out.svg
-data=EPOCROOT##epoc32\data\z\resource\slider\qgn_indi_volumeslider_audio_off.svg \resource\slider\qgn_indi_volumeslider_audio_off.svg
-data=EPOCROOT##epoc32\data\z\resource\slider\qgn_indi_volumeslider_audio_on.svg  \resource\slider\qgn_indi_volumeslider_audio_on.svg
-data=EPOCROOT##epoc32\data\z\resource\slider\qgn_indi_volumeslider_minus.svg     \resource\slider\qgn_indi_volumeslider_minus.svg
-data=EPOCROOT##epoc32\data\z\resource\slider\qgn_indi_volumeslider_plus.svg		 \resource\slider\qgn_indi_volumeslider_plus.svg
-
 #endif // __MULSLIDERWIDGET_IBY__
 
 // End of file
diff -r c377fbf92a12 -r 65e535be25c8 mulwidgets/mulsliderwidget/src/mulverticalslider.cpp
--- a/mulwidgets/mulsliderwidget/src/mulverticalslider.cpp	Wed Mar 31 22:30:13 2010 +0300
+++ b/mulwidgets/mulsliderwidget/src/mulverticalslider.cpp	Wed Apr 14 16:30:07 2010 +0300
@@ -302,9 +302,9 @@
     CAlfControl* ctrl = (CAlfControl*)&control();  
     TAknLayoutRect layoutRect;
     //get the lct rect for mBaseSliderLayout and set it            
-    // aaslider_pane(2)
+    // aaslider_pane(3)
     layoutRect = MulSliderUtils::GetComponentRect(
-            EVSliderPane,mData->mMainLayout,KVariety2);
+            EVSliderPane,mData->mMainLayout,KVariety3);
     mData->mBaseSliderLayout->SetRect(
             TRect( TPoint(layoutRect.Rect().iTl.iX,layoutRect.Rect().iTl.iY  ),
                     TSize( layoutRect.Rect().Size().iWidth,