equal
deleted
inserted
replaced
17 |
17 |
18 // conversion |
18 // conversion |
19 #include <XQConversions> |
19 #include <XQConversions> |
20 // apparc |
20 // apparc |
21 #include <apparc.h> |
21 #include <apparc.h> |
22 #include <APGCLI.H> |
22 #include <apgcli.h> |
|
23 #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS |
|
24 #include <apaidpartner.h> |
|
25 #else |
|
26 #include <apaid.h> |
|
27 #endif |
23 // cfbsbitmap |
28 // cfbsbitmap |
24 #include <APGICNFL.H> |
29 #include <apgicnfl.h> |
25 |
30 |
26 #include <HbIcon> |
31 #include <HbIcon> |
27 #include "camenuiconutility.h" |
32 #include "camenuiconutility.h" |
28 #include "camenuiconmifutility.h" |
33 #include "camenuiconmifutility.h" |
29 #include "cabitmapadapter.h" |
34 #include "cabitmapadapter.h" |
221 HbIcon CaMenuIconUtility::getEntryIcon(const CaEntry& entry, |
226 HbIcon CaMenuIconUtility::getEntryIcon(const CaEntry& entry, |
222 const QSize &size) |
227 const QSize &size) |
223 { |
228 { |
224 HbIcon icon; |
229 HbIcon icon; |
225 icon = getIconFromEntry(entry); |
230 icon = getIconFromEntry(entry); |
226 |
231 |
227 if (icon.isNull() || !(icon.size().isValid())) { |
232 if (icon.isNull() || !(icon.size().isValid())) { |
228 TRAP_IGNORE(icon = getIconFromApparcL(entry, size)); |
233 TRAP_IGNORE(icon = getIconFromApparcL(entry, size)); |
229 } |
234 } |
230 |
235 |
231 if (icon.isNull() || !(icon.size().isValid())) { |
236 if (icon.isNull() || !(icon.size().isValid())) { |
232 icon = getDefaultIcon(entry); |
237 icon = getDefaultIcon(entry); |
233 } |
238 } |
234 |
239 |
235 return icon; |
240 if (entry.entryTypeName() == XQConversions::s60DescToQString( |
236 } |
241 KCaTypeWidget)) { |
237 |
242 icon.addBadge(Qt::AlignBottom | Qt::AlignLeft, |
238 |
243 HbIcon("qtg_small_hs_widget")); |
|
244 } |
|
245 return icon; |
|
246 } |