--- a/uifw/ganes/src/HgIndicatorManager.cpp Wed Sep 15 12:29:17 2010 +0300
+++ b/uifw/ganes/src/HgIndicatorManager.cpp Wed Oct 13 14:50:15 2010 +0300
@@ -47,7 +47,6 @@
delete iPlaybackIndicatorIcon;
delete iMmcIcon;
delete iMarkIcon;
- delete iMarkIconOff;
delete iPauseIndicatorIcon;
delete iBrokenPlaylistIcon;
delete iBrokenTrackIcon;
@@ -110,15 +109,9 @@
// Skinned icons
// Mark icon
- InitIconL( iMarkIcon, KAknsIIDQgnPropCheckboxOn,
- EMbmGanesQgn_prop_checkbox_on,
- EMbmGanesQgn_prop_checkbox_on_mask,
- aIndicatorSize );
-
- // Mark icon, off state
- InitIconL( iMarkIconOff, KAknsIIDQgnPropCheckboxOff,
- EMbmGanesQgn_prop_checkbox_off,
- EMbmGanesQgn_prop_checkbox_off_mask,
+ InitIconL( iMarkIcon, KAknsIIDQgnPropSubMarked,
+ EMbmGanesQgn_prop_sub_marked,
+ EMbmGanesQgn_prop_sub_marked_mask,
aIndicatorSize );
// DRM valid icon
@@ -193,8 +186,7 @@
const TRect& aRect,
TInt aFlags,
TAknWindowComponentLayout aFirstIndicatorLayout,
- TAknWindowComponentLayout aSecondIndicatorLayout,
- TBool aMarkingMode
+ TAknWindowComponentLayout aSecondIndicatorLayout
) const
{
TAknLayoutRect secondIndicator;
@@ -213,12 +205,6 @@
++indicatorsDrawn;
rect = firstIndicator;
}
- else if(aMarkingMode)
- {
- rect.DrawImage(aGc, iMarkIconOff->Bitmap(), iMarkIconOff->Mask());
- ++indicatorsDrawn;
- rect = firstIndicator;
- }
if( DrawIndicator(aGc, rect, aFlags, memIndicator) )
{
@@ -248,7 +234,7 @@
CWindowGc& aGc,
TAknLayoutRect& aRect,
TInt aFlags,
- TBool& aMemIndicator
+ TBool& aMemIndicator
) const
{
TBool ret = EFalse;