# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1262861865 -7200 # Node ID c16131d016959ad06894d151397f9d19a48ceaf6 # Parent e83bab7cf0025403e76e8e98f74d8ceeafb94c57 Revision: 200951 Kit: 201001 diff -r e83bab7cf002 -r c16131d01695 mulwidgets/muldatamodel/src/mulcachemanager.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. diff -r e83bab7cf002 -r c16131d01695 mulwidgets/mulsliderwidget/inc/mulsliderdefinitions.h --- 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. diff -r e83bab7cf002 -r c16131d01695 mulwidgets/mulsliderwidget/rom/mulsliderwidget.iby --- 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 diff -r e83bab7cf002 -r c16131d01695 mulwidgets/mulsliderwidget/src/mulverticalslider.cpp --- 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 );