Revision: 200951
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Thu, 07 Jan 2010 12:57:45 +0200
changeset 1 c16131d01695
parent 0 e83bab7cf002
child 2 b1a1f09f9110
Revision: 200951 Kit: 201001
mulwidgets/muldatamodel/src/mulcachemanager.cpp
mulwidgets/mulsliderwidget/inc/mulsliderdefinitions.h
mulwidgets/mulsliderwidget/rom/mulsliderwidget.iby
mulwidgets/mulsliderwidget/src/mulverticalslider.cpp
--- a/mulwidgets/muldatamodel/src/mulcachemanager.cpp	Thu Dec 17 08:56:02 2009 +0200
+++ b/mulwidgets/muldatamodel/src/mulcachemanager.cpp	Thu Jan 07 12:57:45 2010 +0200
@@ -2,9 +2,9 @@
 * Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
--- a/mulwidgets/mulsliderwidget/inc/mulsliderdefinitions.h	Thu Dec 17 08:56:02 2009 +0200
+++ b/mulwidgets/mulsliderwidget/inc/mulsliderdefinitions.h	Thu Jan 07 12:57:45 2010 +0200
@@ -2,9 +2,9 @@
 * Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
--- a/mulwidgets/mulsliderwidget/rom/mulsliderwidget.iby	Thu Dec 17 08:56:02 2009 +0200
+++ b/mulwidgets/mulsliderwidget/rom/mulsliderwidget.iby	Thu Jan 07 12:57:45 2010 +0200
@@ -21,6 +21,8 @@
 
 ECOM_PLUGIN( mulsliderwidget.dll, mulsliderwidget.rsc )
 
+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
--- a/mulwidgets/mulsliderwidget/src/mulverticalslider.cpp	Thu Dec 17 08:56:02 2009 +0200
+++ b/mulwidgets/mulsliderwidget/src/mulverticalslider.cpp	Thu Jan 07 12:57:45 2010 +0200
@@ -143,7 +143,7 @@
     
 // bitmap file path
 _LIT(KAvkonBitmapFile,"\\resource\\apps\\avkon2.mbm");
-_LIT(KImageViewerBitmapFile,"\\resource\\apps\\ImageViewer.mif");
+_LIT(KSliderBitmapFile,"\\resource\\apps\\mulsliderwidget.mif");
 
 const TInt KAlfTrackTopTextureId = 1;
 const TInt KAlfTrackBottomTextureId = 2;
@@ -604,7 +604,7 @@
             AknIconUtils::CreateIconL(
                    aBitmap,
                    aMaskBitmap,
-                   KImageViewerBitmapFile,
+                   KSliderBitmapFile,
                    EMbmMulsliderwidgetQgn_indi_nslider_zoom_in,
                    EMbmMulsliderwidgetQgn_indi_nslider_zoom_in_mask );    
 
@@ -624,7 +624,7 @@
              AknIconUtils::CreateIconL(
                     aBitmap,
                     aMaskBitmap,
-                    KImageViewerBitmapFile,
+                    KSliderBitmapFile,
                     EMbmMulsliderwidgetQgn_indi_nslider_zoom_out,
                     EMbmMulsliderwidgetQgn_indi_nslider_zoom_out_mask );