diff -r 3916af29624a -r 7dd137878ff8 homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenuitemmodel.cpp --- a/homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenuitemmodel.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenuitemmodel.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -16,6 +16,8 @@ */ #include +#include +#include #include #include @@ -24,7 +26,7 @@ #include "hsiconsidleloader.h" // Constants -const QSize smallIconSize(55, 55); +const QSizeF smallIconSize(55, 55); /*! Constructor @@ -35,7 +37,13 @@ CaItemModel(query, parent), mIconsIdleLoader(NULL) { - setIconSize(smallIconSize); + qreal size; + if (hbInstance->style()->parameter( + QString("hb-param-graphic-size-primary-large"), size)) { + setIconSize(QSizeF(size, size)); + } else { + setIconSize(smallIconSize); + } mComponentId = 0; mUninstallNotifier = CaSoftwareRegistry::create()->createUninstallNotifier(); @@ -57,7 +65,7 @@ Sets sort order in the model */ void HsMenuItemModel::setSort( - HsSortAttribute sortAttribute) + Hs::HsSortAttribute sortAttribute) { HSMENUTEST_FUNC_ENTRY("HsMenuItemModel::setSort"); CaItemModel::setSort(HsMenuServiceUtils::sortBy(sortAttribute), @@ -82,7 +90,7 @@ QList icons; icons << CaItemModel::data(index, role); - icons << HbIcon(newIconId()); + icons << HbIcon(Hs::newIconId); variant = QVariant(icons); } else if (role == Hb::IndexFeedbackRole){ @@ -111,7 +119,7 @@ bool result = false; if (root().isValid() && (!(entry(index)->flags() & UsedEntryFlag)) - && entry(root())->entryTypeName() == collectionDownloadedTypeName()) { + && entry(root())->entryTypeName() == Hs::collectionDownloadedTypeName) { result = true; } HSMENUTEST_FUNC_EXIT("HsMenuItemModel::newIconNeeded");