equal
deleted
inserted
replaced
45 delete iDrmExpIcon; |
45 delete iDrmExpIcon; |
46 delete iVideoIcon; |
46 delete iVideoIcon; |
47 delete iPlaybackIndicatorIcon; |
47 delete iPlaybackIndicatorIcon; |
48 delete iMmcIcon; |
48 delete iMmcIcon; |
49 delete iMarkIcon; |
49 delete iMarkIcon; |
50 delete iMarkIconOff; |
|
51 delete iPauseIndicatorIcon; |
50 delete iPauseIndicatorIcon; |
52 delete iBrokenPlaylistIcon; |
51 delete iBrokenPlaylistIcon; |
53 delete iBrokenTrackIcon; |
52 delete iBrokenTrackIcon; |
54 delete iCorruptedTrackIcon; |
53 delete iCorruptedTrackIcon; |
55 delete iMassStorageIcon; |
54 delete iMassStorageIcon; |
108 EMbmGanesQgn_indi_media_thumbnail_mask, |
107 EMbmGanesQgn_indi_media_thumbnail_mask, |
109 aIndicatorSize ); |
108 aIndicatorSize ); |
110 |
109 |
111 // Skinned icons |
110 // Skinned icons |
112 // Mark icon |
111 // Mark icon |
113 InitIconL( iMarkIcon, KAknsIIDQgnPropCheckboxOn, |
112 InitIconL( iMarkIcon, KAknsIIDQgnPropSubMarked, |
114 EMbmGanesQgn_prop_checkbox_on, |
113 EMbmGanesQgn_prop_sub_marked, |
115 EMbmGanesQgn_prop_checkbox_on_mask, |
114 EMbmGanesQgn_prop_sub_marked_mask, |
116 aIndicatorSize ); |
|
117 |
|
118 // Mark icon, off state |
|
119 InitIconL( iMarkIconOff, KAknsIIDQgnPropCheckboxOff, |
|
120 EMbmGanesQgn_prop_checkbox_off, |
|
121 EMbmGanesQgn_prop_checkbox_off_mask, |
|
122 aIndicatorSize ); |
115 aIndicatorSize ); |
123 |
116 |
124 // DRM valid icon |
117 // DRM valid icon |
125 InitIconL( iDrmIcon, KAknsIIDQgnPropDrmRightsValidSuper, |
118 InitIconL( iDrmIcon, KAknsIIDQgnPropDrmRightsValidSuper, |
126 EMbmGanesQgn_prop_drm_rights_valid_super, |
119 EMbmGanesQgn_prop_drm_rights_valid_super, |
191 void CHgIndicatorManager::DrawIndicators( |
184 void CHgIndicatorManager::DrawIndicators( |
192 CWindowGc& aGc, |
185 CWindowGc& aGc, |
193 const TRect& aRect, |
186 const TRect& aRect, |
194 TInt aFlags, |
187 TInt aFlags, |
195 TAknWindowComponentLayout aFirstIndicatorLayout, |
188 TAknWindowComponentLayout aFirstIndicatorLayout, |
196 TAknWindowComponentLayout aSecondIndicatorLayout, |
189 TAknWindowComponentLayout aSecondIndicatorLayout |
197 TBool aMarkingMode |
|
198 ) const |
190 ) const |
199 { |
191 { |
200 TAknLayoutRect secondIndicator; |
192 TAknLayoutRect secondIndicator; |
201 secondIndicator.LayoutRect(aRect, aSecondIndicatorLayout); |
193 secondIndicator.LayoutRect(aRect, aSecondIndicatorLayout); |
202 |
194 |
210 if( aFlags & CHgItem::EHgItemFlagMarked ) |
202 if( aFlags & CHgItem::EHgItemFlagMarked ) |
211 { |
203 { |
212 rect.DrawImage(aGc, iMarkIcon->Bitmap(), iMarkIcon->Mask()); |
204 rect.DrawImage(aGc, iMarkIcon->Bitmap(), iMarkIcon->Mask()); |
213 ++indicatorsDrawn; |
205 ++indicatorsDrawn; |
214 rect = firstIndicator; |
206 rect = firstIndicator; |
215 } |
|
216 else if(aMarkingMode) |
|
217 { |
|
218 rect.DrawImage(aGc, iMarkIconOff->Bitmap(), iMarkIconOff->Mask()); |
|
219 ++indicatorsDrawn; |
|
220 rect = firstIndicator; |
|
221 } |
207 } |
222 |
208 |
223 if( DrawIndicator(aGc, rect, aFlags, memIndicator) ) |
209 if( DrawIndicator(aGc, rect, aFlags, memIndicator) ) |
224 { |
210 { |
225 ++indicatorsDrawn; |
211 ++indicatorsDrawn; |
246 |
232 |
247 TBool CHgIndicatorManager::DrawIndicator( |
233 TBool CHgIndicatorManager::DrawIndicator( |
248 CWindowGc& aGc, |
234 CWindowGc& aGc, |
249 TAknLayoutRect& aRect, |
235 TAknLayoutRect& aRect, |
250 TInt aFlags, |
236 TInt aFlags, |
251 TBool& aMemIndicator |
237 TBool& aMemIndicator |
252 ) const |
238 ) const |
253 { |
239 { |
254 TBool ret = EFalse; |
240 TBool ret = EFalse; |
255 |
241 |
256 if( aFlags & CHgItem::EHgItemFlagsPlaybackIndicator ) |
242 if( aFlags & CHgItem::EHgItemFlagsPlaybackIndicator ) |