# HG changeset patch # User hgs # Date 1269379692 -7200 # Node ID e492551a0d544bb756fb10304d77bca74b1edb1f # Parent 7feec50967db9f539d5b5d3fc07dbd2ea1028730 201005 diff -r 7feec50967db -r e492551a0d54 common.pri --- a/common.pri Tue Mar 23 23:17:02 2010 +0200 +++ b/common.pri Tue Mar 23 23:28:12 2010 +0200 @@ -110,5 +110,10 @@ } } -#ONLY FOR DEVELOPMENT! REMOVE THIS BEFORE EACH HS_Domain RELEASE! -symbian: MMP_RULES += EXPORTUNFROZEN +release:DEFINES+=QT_NO_DEBUG_OUTPUT + +symbian { +SYMBIAN_PLATFORMS = WINSCW ARMV5 +# ONLY FOR DEVELOPMENT! REMOVE THIS BEFORE EACH HS_Domain RELEASE! +MMP_RULES += EXPORTUNFROZEN +} diff -r 7feec50967db -r e492551a0d54 contentpublishingsrv/contentharvester/contentharvesterserver/src/contentharvesterengine.cpp --- a/contentpublishingsrv/contentharvester/contentharvesterserver/src/contentharvesterengine.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentpublishingsrv/contentharvester/contentharvesterserver/src/contentharvesterengine.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -19,7 +19,7 @@ // for CleanupResetAndDestroyPushL #include #include // harvesting plugin -#include +#include #include #include "charvesterpluginvalidator.h" diff -r 7feec50967db -r e492551a0d54 contentpublishingsrv/contentharvester/contentharvesterswiplugin/src/chswiplugin.cpp --- a/contentpublishingsrv/contentharvester/contentharvesterswiplugin/src/chswiplugin.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentpublishingsrv/contentharvester/contentharvesterswiplugin/src/chswiplugin.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -21,7 +21,7 @@ #include #include -#include +#include #include "cpglobals.h" _LIT( KHsWidgetPublisher, "hswidgetpublisher"); diff -r 7feec50967db -r e492551a0d54 contentpublishingsrv/contentharvester/factorysettingsplugin/inc/chfactsetutils.h --- a/contentpublishingsrv/contentharvester/factorysettingsplugin/inc/chfactsetutils.h Tue Mar 23 23:17:02 2010 +0200 +++ b/contentpublishingsrv/contentharvester/factorysettingsplugin/inc/chfactsetutils.h Tue Mar 23 23:28:12 2010 +0200 @@ -20,7 +20,7 @@ #define FACTSETCHUTILS_H // INCLUDES -#include +#include // CLASS DECLARATION class CGECODefaultObject; diff -r 7feec50967db -r e492551a0d54 contentpublishingsrv/contentharvester/factorysettingsplugin/src/chfactorysettingsdomparser.cpp --- a/contentpublishingsrv/contentharvester/factorysettingsplugin/src/chfactorysettingsdomparser.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentpublishingsrv/contentharvester/factorysettingsplugin/src/chfactorysettingsdomparser.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include +#include #include "chfactorysettingsdomparser.h" #include "chfactorysettingsglobals.h" #include "chfactsetutils.h" diff -r 7feec50967db -r e492551a0d54 contentpublishingsrv/contentharvester/factorysettingsplugin/src/chfactsetutils.cpp --- a/contentpublishingsrv/contentharvester/factorysettingsplugin/src/chfactsetutils.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentpublishingsrv/contentharvester/factorysettingsplugin/src/chfactsetutils.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -18,7 +18,7 @@ // INCLUDE FILES #include -#include +#include #include "chfactsetutils.h" #include "chfactorysettingsglobals.h" diff -r 7feec50967db -r e492551a0d54 contentpublishingsrv/contentpublishingserver/cpserver/group/bld.inf --- a/contentpublishingsrv/contentpublishingserver/cpserver/group/bld.inf Tue Mar 23 23:17:02 2010 +0200 +++ b/contentpublishingsrv/contentpublishingserver/cpserver/group/bld.inf Tue Mar 23 23:28:12 2010 +0200 @@ -23,12 +23,10 @@ PRJ_EXPORTS -../data/backup_registration.xml /epoc32/release/winscw/udeb/z/private/20016b7b/backup_registration.xml -../data/backup_registration.xml /epoc32/data/z/private/20016b7b/backup_registration.xml +../data/backup_registration.xml z:/private/20016b7b/backup_registration.xml // Cenrep -../data/20016b7b.txt /epoc32/release/winscw/udeb/z/private/10202be9/20016b7b.txt -../data/20016b7b.txt /epoc32/data/z/private/10202be9/20016b7b.txt +../data/20016b7b.txt z:/private/10202be9/20016b7b.txt ../inc/cpglobals.h |../../../../inc/cpglobals.h ../inc/cpserverdef.h |../../../../inc/cpserverdef.h diff -r 7feec50967db -r e492551a0d54 contentpublishingsrv/contentpublishingserver/cpserver/src/cpnotificationhandler.cpp --- a/contentpublishingsrv/contentpublishingserver/cpserver/src/cpnotificationhandler.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentpublishingsrv/contentpublishingserver/cpserver/src/cpnotificationhandler.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -17,7 +17,7 @@ */ -#include +#include #include #include "cpnotificationhandler.h" diff -r 7feec50967db -r e492551a0d54 contentpublishingsrv/contentpublishingserver/cpserver/src/cpserver.cpp --- a/contentpublishingsrv/contentpublishingserver/cpserver/src/cpserver.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentpublishingsrv/contentpublishingserver/cpserver/src/cpserver.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -16,7 +16,7 @@ */ -#include +#include #include #include diff -r 7feec50967db -r e492551a0d54 contentpublishingsrv/contentpublishingserver/cpserver/src/cpserveractionmanager.cpp --- a/contentpublishingsrv/contentpublishingserver/cpserver/src/cpserveractionmanager.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentpublishingsrv/contentpublishingserver/cpserver/src/cpserveractionmanager.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -15,9 +15,9 @@ * */ -#include -#include -#include +#include +#include +#include #include "cpserveractionmanager.h" #include "cpdebug.h" diff -r 7feec50967db -r e492551a0d54 contentpublishingsrv/contentpublishingserver/cpserver/src/cpserverdatamanager.cpp --- a/contentpublishingsrv/contentpublishingserver/cpserver/src/cpserverdatamanager.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentpublishingsrv/contentpublishingserver/cpserver/src/cpserverdatamanager.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -16,9 +16,9 @@ */ -#include -#include -#include +#include +#include +#include #include "cpserverdatamanager.h" #include "ccontentmap.h" diff -r 7feec50967db -r e492551a0d54 contentpublishingsrv/contentpublishingserver/cpserver/src/cpserversession.cpp --- a/contentpublishingsrv/contentpublishingserver/cpserver/src/cpserversession.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentpublishingsrv/contentpublishingserver/cpserver/src/cpserversession.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -20,7 +20,7 @@ #include // for CleanupResetAndDestroyPushL #include -#include +#include #include "cpserversession.h" #include "cpliwmap.h" diff -r 7feec50967db -r e492551a0d54 contentpublishingsrv/contentpublishingutils/contentpublishingmap/inc/cpliwmap.h --- a/contentpublishingsrv/contentpublishingutils/contentpublishingmap/inc/cpliwmap.h Tue Mar 23 23:17:02 2010 +0200 +++ b/contentpublishingsrv/contentpublishingutils/contentpublishingmap/inc/cpliwmap.h Tue Mar 23 23:28:12 2010 +0200 @@ -18,7 +18,7 @@ #ifndef C_CPLIWIDSMAP_H #define C_CPLIWIDSMAP_H -#include +#include #include #include "cpglobals.h" diff -r 7feec50967db -r e492551a0d54 contentpublishingsrv/contentpublishingutils/contentpublishingmap/inc/cpsecuritypolicy.h --- a/contentpublishingsrv/contentpublishingutils/contentpublishingmap/inc/cpsecuritypolicy.h Tue Mar 23 23:17:02 2010 +0200 +++ b/contentpublishingsrv/contentpublishingutils/contentpublishingmap/inc/cpsecuritypolicy.h Tue Mar 23 23:28:12 2010 +0200 @@ -12,7 +12,7 @@ * Contributors: * * Description: Class used by session to handle access control list - * Version : %version: ou1s60ui#5 % << Don't touch! Updated by Synergy at check-out. + * Version : %version: ou1s60ui#4.1.1 % << Don't touch! Updated by Synergy at check-out. * */ diff -r 7feec50967db -r e492551a0d54 contentpublishingsrv/contentpublishingutils/contentpublishingmap/inc/cpssqlcommands.h --- a/contentpublishingsrv/contentpublishingutils/contentpublishingmap/inc/cpssqlcommands.h Tue Mar 23 23:17:02 2010 +0200 +++ b/contentpublishingsrv/contentpublishingutils/contentpublishingmap/inc/cpssqlcommands.h Tue Mar 23 23:28:12 2010 +0200 @@ -12,7 +12,7 @@ * Contributors: * * Description: - * Version : %version: ou1s60ui#8 % << Don't touch! Updated by Synergy at check-out. + * Version : %version: ou1s60ui#7.1.1 % << Don't touch! Updated by Synergy at check-out. * */ diff -r 7feec50967db -r e492551a0d54 contentpublishingsrv/contentpublishingutils/contentpublishingmap/src/ccontentmap.cpp --- a/contentpublishingsrv/contentpublishingutils/contentpublishingmap/src/ccontentmap.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentpublishingsrv/contentpublishingutils/contentpublishingmap/src/ccontentmap.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -16,7 +16,7 @@ */ -#include +#include #include "ccontentmap.h" #include "cpglobals.h" diff -r 7feec50967db -r e492551a0d54 contentpublishingsrv/contentpublishingutils/contentpublishingmap/src/cpliwmap.cpp --- a/contentpublishingsrv/contentpublishingutils/contentpublishingmap/src/cpliwmap.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentpublishingsrv/contentpublishingutils/contentpublishingmap/src/cpliwmap.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -16,10 +16,10 @@ */ -#include -#include -#include -#include +#include +#include +#include +#include #include "cpliwmap.h" #include "cpdebug.h" diff -r 7feec50967db -r e492551a0d54 contentpublishingsrv/contentpublishingutils/contentpublishingmap/src/cpsecuritypolicy.cpp --- a/contentpublishingsrv/contentpublishingutils/contentpublishingmap/src/cpsecuritypolicy.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentpublishingsrv/contentpublishingutils/contentpublishingmap/src/cpsecuritypolicy.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -12,13 +12,13 @@ * Contributors: * * Description: ?Description - * Version : %version: ou1s60ui#6 % << Don't touch! Updated by Synergy at check-out. + * Version : %version: ou1s60ui#5.1.2 % << Don't touch! Updated by Synergy at check-out. * */ #include -#include +#include #include #include "cpsecuritypolicy.h" diff -r 7feec50967db -r e492551a0d54 contentpublishingsrv/contentpublishingutils/contentpublishingmap/src/cpublisherregistrymap.cpp --- a/contentpublishingsrv/contentpublishingutils/contentpublishingmap/src/cpublisherregistrymap.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentpublishingsrv/contentpublishingutils/contentpublishingmap/src/cpublisherregistrymap.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -16,7 +16,7 @@ */ -#include +#include #include "cpserverdef.h" #include "cpublisherregistrymap.h" diff -r 7feec50967db -r e492551a0d54 contentpublishingsrv/contentpublishingutils/pluginvalidator/src/cblacklisthandler.cpp --- a/contentpublishingsrv/contentpublishingutils/pluginvalidator/src/cblacklisthandler.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentpublishingsrv/contentpublishingutils/pluginvalidator/src/cblacklisthandler.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -15,7 +15,7 @@ * */ -#include +#include #include #include "cpserverdef.h" diff -r 7feec50967db -r e492551a0d54 contentstorage/bwins/camenuu.def --- a/contentstorage/bwins/camenuu.def Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/bwins/camenuu.def Tue Mar 23 23:28:12 2010 +0200 @@ -18,4 +18,5 @@ ?SetDBPropertyL@CCaStorageProxy@@QAEXABVTDesC16@@0@Z @ 17 NONAME ; void CCaStorageProxy::SetDBPropertyL(class TDesC16 const &, class TDesC16 const &) ?AddL@CCaStorageProxy@@QAEXPAVCCaInnerEntry@@H@Z @ 18 NONAME ; void CCaStorageProxy::AddL(class CCaInnerEntry *, int) ?CustomSortL@CCaStorageProxy@@QAEXABV?$RArray@H@@H@Z @ 19 NONAME ; void CCaStorageProxy::CustomSortL(class RArray const &, int) + ?LoadDataBaseFromRomL@CCaStorageProxy@@QAEXXZ @ 20 NONAME ; void CCaStorageProxy::LoadDataBaseFromRomL(void) diff -r 7feec50967db -r e492551a0d54 contentstorage/caclient/caclient.pro --- a/contentstorage/caclient/caclient.pro Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/caclient/caclient.pro Tue Mar 23 23:28:12 2010 +0200 @@ -15,6 +15,9 @@ # TEMPLATE = lib +CONFIG += hb +HB = hbcore + DEFINES += CACLIENT_LIB include(../../common.pri) diff -r 7feec50967db -r e492551a0d54 contentstorage/caclient/inc/caentry_p.h --- a/contentstorage/caclient/inc/caentry_p.h Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/caclient/inc/caentry_p.h Tue Mar 23 23:28:12 2010 +0200 @@ -28,6 +28,7 @@ #include "caicondescription.h" class CaEntry; +class HbIcon; class CaEntryPrivate: public QSharedData { @@ -60,7 +61,7 @@ QString attribute(const QString &name) const; void setAttribute(const QString &name, const QString &value); - QPixmap makeIcon(const QSize &size) const; + HbIcon makeIcon(const QSize &size) const; EntryRole role() const; void setRole(const EntryRole &role); diff -r 7feec50967db -r e492551a0d54 contentstorage/caclient/inc/caicondescription_p.h --- a/contentstorage/caclient/inc/caicondescription_p.h Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/caclient/inc/caicondescription_p.h Tue Mar 23 23:28:12 2010 +0200 @@ -18,7 +18,7 @@ #ifndef CAICONDESCRIPTION_PRIVATE_H #define CAICONDESCRIPTION_PRIVATE_H -#include +#include #include class CaIconDescription; diff -r 7feec50967db -r e492551a0d54 contentstorage/caclient/s60/inc/caobjectadapter.h --- a/contentstorage/caclient/s60/inc/caobjectadapter.h Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/caclient/s60/inc/caobjectadapter.h Tue Mar 23 23:28:12 2010 +0200 @@ -22,7 +22,6 @@ // CLASS DECLARATION #include -#include #include @@ -36,6 +35,8 @@ class CaNotifierFilter; class CCaInnerEntry; class CCaInnerNotifierFilter; +class HbIcon; +class CFbsBitmap; /** * CaObjectAdapter @@ -124,11 +125,9 @@ /** * Creates icon. * @param entry entry. - * @return QPixmap. + * @return HbIcon. */ - static QPixmap makeIcon( - const CaEntry& entry, - const QSize &size); + static HbIcon makeIcon(const CaEntry& entry, const QSize &size); /** * Converts notifier type to inner notifier type. @@ -183,11 +182,9 @@ /** * Creates icon. Leaving version. * @param entry entry. - * @return QPixmap. + * @return HbIcon. */ - static QPixmap makeIconL( - const CaEntry& entry, - const QSize &size); + static HbIcon makeIconL(const CaEntry& entry, const QSize &size); /** * Make bitmap copy, used to get rid of compression for extended bitmap diff -r 7feec50967db -r e492551a0d54 contentstorage/caclient/s60/src/caclientproxy.cpp --- a/contentstorage/caclient/s60/src/caclientproxy.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/caclient/s60/src/caclientproxy.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -18,7 +18,7 @@ #include #include #include -#include // charconv.lib +#include // charconv.lib #include #include "caclientproxy.h" diff -r 7feec50967db -r e492551a0d54 contentstorage/caclient/s60/src/caobjectadapter.cpp --- a/contentstorage/caclient/s60/src/caobjectadapter.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/caclient/s60/src/caobjectadapter.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -18,11 +18,12 @@ #include #include #include -#include +#include #include #include -#include +#include #include +#include #include #include @@ -315,15 +316,15 @@ //---------------------------------------------------------------------------- // //---------------------------------------------------------------------------- -QPixmap CaObjectAdapter::makeIcon(const CaEntry &entry, const QSize &size) +HbIcon CaObjectAdapter::makeIcon(const CaEntry &entry, const QSize &size) { - QPixmap pixmap; - TRAPD(leaveCode, pixmap = makeIconL(entry, size)); + HbIcon icon; + TRAPD(leaveCode, icon = makeIconL(entry, size)); USE_QDEBUG_IF(leaveCode) << "CaObjectAdapter::makeIcon leaveCode:" << leaveCode; - return pixmap; + return icon; } //---------------------------------------------------------------------------- @@ -401,19 +402,19 @@ //---------------------------------------------------------------------------- // //---------------------------------------------------------------------------- -QPixmap CaObjectAdapter::makeIconL(const CaEntry &entry, const QSize &size) +HbIcon CaObjectAdapter::makeIconL(const CaEntry &entry, const QSize &size) { - QPixmap pixmap; + HbIcon icon; CCaInnerEntry *innerEntry = CCaInnerEntry::NewLC(); CaObjectAdapter::convertL(entry, *innerEntry); - //get the icon (jpg, png, gif ...) - if (entry.iconDescription().filename() != "") { - pixmap = QPixmap(entry.iconDescription().filename()). - scaled(size, Qt::KeepAspectRatioByExpanding); + QString filename(entry.iconDescription().filename()); + if (!filename.isEmpty()) { + icon = HbIcon(filename); } //try to load symbian icon from multi-bitmap (mbm, mbg) - if (pixmap.isNull()) { + if (icon.isNull() || !(icon.size().isValid())) { CAknIcon *aknIcon = CaMenuIconUtility::GetItemIcon(*innerEntry); + QPixmap pixmap; if (aknIcon) { CleanupStack::PushL(aknIcon); @@ -441,11 +442,11 @@ } pixmap = pixmap.scaled(size, Qt::KeepAspectRatioByExpanding); CleanupStack::PopAndDestroy(aknIcon); + icon = HbIcon(QIcon(pixmap)); } } - CleanupStack::PopAndDestroy(innerEntry); - return pixmap; + return icon; } //---------------------------------------------------------------------------- diff -r 7feec50967db -r e492551a0d54 contentstorage/caclient/src/caentry.cpp --- a/contentstorage/caclient/src/caentry.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/caclient/src/caentry.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -17,7 +17,7 @@ #include #include -#include +#include #include "caentry.h" #include "caentry_p.h" @@ -394,21 +394,20 @@ /*! Creates an icon. \param size icon size to display - \retval created icon (QPixmap). + \retval created icon (HbIcon). \code ... QSize iconSize( 50, 80 ); - QPixmap pixmap = resultEntry->makeIcon( iconSize ); - QIcon icon(pixmap); + HbIcon icon = resultEntry->makeIcon( iconSize ); \b Output: - pixmap.width() == 50 - pixmap.height() == 80 - pixmap.size() == iconSize; + icon.width() == 50 + icon.height() == 80 + icon.size() == iconSize; \endcode */ -QPixmap CaEntry::makeIcon(const QSize& size) const +HbIcon CaEntry::makeIcon(const QSize& size) const { return m_d->makeIcon(size); } @@ -615,9 +614,9 @@ /*! Creates an icon. \param size icon size to display - \retval created icon (QPixmap). + \retval created icon (HbIcon). */ -QPixmap CaEntryPrivate::makeIcon(const QSize& size) const +HbIcon CaEntryPrivate::makeIcon(const QSize& size) const { return CaObjectAdapter::makeIcon(*m_q, size); } diff -r 7feec50967db -r e492551a0d54 contentstorage/caclient/src/caitemmodel.cpp --- a/contentstorage/caclient/src/caitemmodel.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/caclient/src/caitemmodel.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -15,7 +15,7 @@ * */ -#include +#include #include "caitemmodel.h" #include "caitemmodel_p.h" @@ -412,7 +412,7 @@ case Qt::DisplayRole: return displayRole(modelIndex); case Qt::DecorationRole: - return QVariant(QIcon(entry(modelIndex)->makeIcon(mSize))); + return QVariant(HbIcon(entry(modelIndex)->makeIcon(mSize))); case CaItemModel::IdRole: return QVariant(entry(modelIndex)->id()); case CaItemModel::TypeRole: diff -r 7feec50967db -r e492551a0d54 contentstorage/caclient/src/caitemmodellist.cpp --- a/contentstorage/caclient/src/caitemmodellist.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/caclient/src/caitemmodellist.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -78,10 +78,12 @@ void CaItemModelList::reloadEntries(const CaQuery &query) { clear(); - mOrderedList = mService->getEntryIds(query); - for (int i = 0; i < mOrderedList.count(); i++) { - mEntriesHash.insert(mOrderedList[i], mService->getEntry( - mOrderedList[i])); + int id=0; + QList eList = mService->getEntries(query); + for (int i = 0; i < eList.count(); i++) { + id = eList[i]->id(); + mOrderedList << id; + mEntriesHash.insert(id, eList[i]); } } diff -r 7feec50967db -r e492551a0d54 contentstorage/caclient/src/caservice.cpp --- a/contentstorage/caclient/src/caservice.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/caclient/src/caservice.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -890,7 +890,7 @@ /*! Set new order of collection's items set by user. \groupId Group id. - \param collectionIds consists of new order of items. + \param entryIdList consists of new order of items. \retval true if new order of collection's items is set correctly, otherwise return false. */ diff -r 7feec50967db -r e492551a0d54 contentstorage/caclient/stub/inc/caobjectadapter.h --- a/contentstorage/caclient/stub/inc/caobjectadapter.h Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/caclient/stub/inc/caobjectadapter.h Tue Mar 23 23:28:12 2010 +0200 @@ -24,6 +24,7 @@ class QSize; class CaEntry; class CaIconDescription; +class HbIcon; /** * CaObjectAdapter @@ -39,7 +40,7 @@ * @param size size of the icon * @return QPixmap. */ - static QPixmap makeIcon( + static HbIcon makeIcon( const CaEntry& entry, const QSize &size); diff -r 7feec50967db -r e492551a0d54 contentstorage/caclient/stub/src/canotifiers.cpp --- a/contentstorage/caclient/stub/src/canotifiers.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/caclient/stub/src/canotifiers.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -16,6 +16,7 @@ */ #include +#include #include "canotifiers.h" #include "caclientnotifierproxy.h" diff -r 7feec50967db -r e492551a0d54 contentstorage/caclient/stub/src/caobjectadapter.cpp --- a/contentstorage/caclient/stub/src/caobjectadapter.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/caclient/stub/src/caobjectadapter.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -15,33 +15,32 @@ * */ -#include +#include +#include + #include "caobjectadapter.h" #include "caentry.h" #include "caicondescription.h" - +#include //---------------------------------------------------------------------------- // //---------------------------------------------------------------------------- -QPixmap CaObjectAdapter::makeIcon(const CaEntry &entry, const QSize &size) +HbIcon CaObjectAdapter::makeIcon(const CaEntry &entry, const QSize &size) { - QPixmap icon; - if (!entry.iconDescription().filename().isEmpty()) { - icon = QPixmap(entry.iconDescription().filename()).scaled(size); + HbIcon icon; + QString filename(entry.iconDescription().filename()); + if(!filename.isEmpty()) { + icon = HbIcon(filename); } - if (icon.isNull()) { - if (entry.role() == GroupEntryRole) { - icon = QPixmap("./resource/folder.png").scaled(size); - } - else { - icon = QPixmap("./resource/application.png").scaled(size); - } + if (icon.isNull() || !(icon.size().isValid())) { + icon = HbIcon(QDir(".").absoluteFilePath("resource/application.png")); } return icon; } + //---------------------------------------------------------------------------- // //---------------------------------------------------------------------------- diff -r 7feec50967db -r e492551a0d54 contentstorage/casrv/caappscanner/data/caappscanner.rss --- a/contentstorage/casrv/caappscanner/data/caappscanner.rss Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/casrv/caappscanner/data/caappscanner.rss Tue Mar 23 23:28:12 2010 +0200 @@ -15,7 +15,7 @@ * */ -#include +#include #include "casrvpluginuids.hrh" RESOURCE REGISTRY_INFO theInfo diff -r 7feec50967db -r e492551a0d54 contentstorage/casrv/calocalizerscanner/Contentstorage_texmap_en_GB.qm Binary file contentstorage/casrv/calocalizerscanner/Contentstorage_texmap_en_GB.qm has changed diff -r 7feec50967db -r e492551a0d54 contentstorage/casrv/calocalizerscanner/Contentstorage_texmap_en_GB.ts --- a/contentstorage/casrv/calocalizerscanner/Contentstorage_texmap_en_GB.ts Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ - - - - - - GroupBox widget, shows the label for the Office collection. - Office - Office - - applib_09 - subtitle - ap - False - - - GroupBox widget, shows the label for the Games collection. - Games - Games - - applib_09 - subtitle - ap - False - - - List item primary text. Predefined collection for products that have more than 4 items to be grouped under "Office". - Office - Office - - applib_03 - dblist_1 - ap - False - - - List item primary text. Predefined collection for products that have more than 4 games preinstalled. - Games - Games - - applib_03 - dblist_1 - ap - False - - - List item primary text. Predefined, dynamic collection for post-installed applications. - Downloads - Downloads - - applib_03 - dblist_1 - ap - False - - - GroupBox widget, shows the label for the Downloads collection. - Downloads - Downloads - - applib_05 - subtitle - ap - False - - - diff -r 7feec50967db -r e492551a0d54 contentstorage/casrv/calocalizerscanner/Contentstorage_texmap_fr_FR.qm Binary file contentstorage/casrv/calocalizerscanner/Contentstorage_texmap_fr_FR.qm has changed diff -r 7feec50967db -r e492551a0d54 contentstorage/casrv/calocalizerscanner/Contentstorage_texmap_fr_FR.ts --- a/contentstorage/casrv/calocalizerscanner/Contentstorage_texmap_fr_FR.ts Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ - - - - - - GroupBox widget, shows the label for the Office collection. - Biurowe - Biurowe - - applib_09 - subtitle - ap - False - - - GroupBox widget, shows the label for the Games collection. - Gry - Gry - - applib_09 - subtitle - ap - False - - - List item primary text. Predefined collection for products that have more than 4 items to be grouped under "Office". - Biurowe - Biurowe - - applib_03 - dblist_1 - ap - False - - - List item primary text. Predefined collection for products that have more than 4 games preinstalled. - Gry - Gry - - applib_03 - dblist_1 - ap - False - - - List item primary text. Predefined, dynamic collection for post-installed applications. - Sciagniete - Sciagniete - - applib_03 - dblist_1 - ap - False - - - GroupBox widget, shows the label for the Downloads collection. - Sciagniete - Sciagniete - - applib_05 - subtitle - ap - False - - - diff -r 7feec50967db -r e492551a0d54 contentstorage/casrv/calocalizerscanner/Contentstorage_texmap_pl_PL.qm Binary file contentstorage/casrv/calocalizerscanner/Contentstorage_texmap_pl_PL.qm has changed diff -r 7feec50967db -r e492551a0d54 contentstorage/casrv/calocalizerscanner/Contentstorage_texmap_pl_PL.ts --- a/contentstorage/casrv/calocalizerscanner/Contentstorage_texmap_pl_PL.ts Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ - - - - - - GroupBox widget, shows the label for the Office collection. - Biurowe - Biurowe - - applib_09 - subtitle - ap - False - - - GroupBox widget, shows the label for the Games collection. - Gry - Gry - - applib_09 - subtitle - ap - False - - - List item primary text. Predefined collection for products that have more than 4 items to be grouped under "Office". - Biurowe - Biurowe - - applib_03 - dblist_1 - ap - False - - - List item primary text. Predefined collection for products that have more than 4 games preinstalled. - Gry - Gry - - applib_03 - dblist_1 - ap - False - - - List item primary text. Predefined, dynamic collection for post-installed applications. - Sciagniete - Sciagniete - - applib_03 - dblist_1 - ap - False - - - GroupBox widget, shows the label for the Downloads collection. - Sciagniete - Sciagniete - - applib_05 - subtitle - ap - False - - - diff -r 7feec50967db -r e492551a0d54 contentstorage/casrv/calocalizerscanner/calocalizerscanner.pro --- a/contentstorage/casrv/calocalizerscanner/calocalizerscanner.pro Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/casrv/calocalizerscanner/calocalizerscanner.pro Tue Mar 23 23:28:12 2010 +0200 @@ -16,10 +16,7 @@ include(.\..\..\..\common.pri) -TRANSLATIONS=Contentstorage_texmap_pl_PL.ts \ - Contentstorage_texmap_fr_FR.ts \ - Contentstorage_texmap_en_GB.ts - +TRANSLATIONS=contentstorage.ts symbian: { DEPENDPATH += ./inc \ @@ -62,7 +59,7 @@ } -exportResources(./*.qm, resource) +exportResources(./*.qm, resource/qt/translations) diff -r 7feec50967db -r e492551a0d54 contentstorage/casrv/calocalizerscanner/contentstorage.qm Binary file contentstorage/casrv/calocalizerscanner/contentstorage.qm has changed diff -r 7feec50967db -r e492551a0d54 contentstorage/casrv/calocalizerscanner/contentstorage.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contentstorage/casrv/calocalizerscanner/contentstorage.ts Tue Mar 23 23:28:12 2010 +0200 @@ -0,0 +1,66 @@ + + + + + + GroupBox widget, shows the label for the Office collection. + Office + Office + + applib_09 + subtitle + ap + False + + + GroupBox widget, shows the label for the Games collection. + Games + Games + + applib_09 + subtitle + ap + False + + + List item primary text. Predefined collection for products that have more than 4 items to be grouped under "Office". + Office + Office + + applib_03 + dblist_1 + ap + False + + + List item primary text. Predefined collection for products that have more than 4 games preinstalled. + Games + Games + + applib_03 + dblist_1 + ap + False + + + List item primary text. Predefined, dynamic collection for post-installed applications. + Downloads + Downloads + + applib_03 + dblist_1 + ap + False + + + GroupBox widget, shows the label for the Downloads collection. + Downloads + Downloads + + applib_05 + subtitle + ap + False + + + diff -r 7feec50967db -r e492551a0d54 contentstorage/casrv/calocalizerscanner/data/calocalizerscanner.rss --- a/contentstorage/casrv/calocalizerscanner/data/calocalizerscanner.rss Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/casrv/calocalizerscanner/data/calocalizerscanner.rss Tue Mar 23 23:28:12 2010 +0200 @@ -15,7 +15,7 @@ * */ -#include +#include #include "casrvpluginuids.hrh" RESOURCE REGISTRY_INFO theInfo diff -r 7feec50967db -r e492551a0d54 contentstorage/casrv/calocalizerscanner/src/calocalizerscannerproxy.cpp --- a/contentstorage/casrv/calocalizerscanner/src/calocalizerscannerproxy.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/casrv/calocalizerscanner/src/calocalizerscannerproxy.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -98,7 +98,7 @@ void CCaLocalizerScannerProxy::PerformL() { QString locale = QLocale::system().name(); - QString filename = QString( "Contentstorage_texmap_" ) + locale; + QString filename = QString( "contentstorage_" ) + locale; if( !LoadTranslator( filename ) ) { //User::Leave(KErrNotFound); TODO what here @@ -124,10 +124,10 @@ { TBool loaded( false ); // load from rom or testbase - loaded = iTranslator->load( filename, QString( "z:/resource" ) ); + loaded = iTranslator->load( filename, QString( "z:/resource/qt/translations" ) ); if( !loaded ) { - loaded = iTranslator->load( filename, QString( "c:/resource" ) ); + loaded = iTranslator->load( filename, QString( "c:/resource/qt/translations" ) ); } return loaded; diff -r 7feec50967db -r e492551a0d54 contentstorage/casrv/carunningappmonitor/data/carunningappmonitor.rss --- a/contentstorage/casrv/carunningappmonitor/data/carunningappmonitor.rss Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/casrv/carunningappmonitor/data/carunningappmonitor.rss Tue Mar 23 23:28:12 2010 +0200 @@ -15,7 +15,7 @@ * */ -#include +#include #include "casrvpluginuids.hrh" RESOURCE REGISTRY_INFO theInfo diff -r 7feec50967db -r e492551a0d54 contentstorage/casrv/casatmonitor/data/casatmonitor.rss --- a/contentstorage/casrv/casatmonitor/data/casatmonitor.rss Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/casrv/casatmonitor/data/casatmonitor.rss Tue Mar 23 23:28:12 2010 +0200 @@ -15,7 +15,7 @@ * */ -#include +#include #include "casrvpluginuids.hrh" RESOURCE REGISTRY_INFO theInfo diff -r 7feec50967db -r e492551a0d54 contentstorage/casrv/cawidgetscanner/data/cawidgetscanner.rss --- a/contentstorage/casrv/cawidgetscanner/data/cawidgetscanner.rss Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/casrv/cawidgetscanner/data/cawidgetscanner.rss Tue Mar 23 23:28:12 2010 +0200 @@ -17,7 +17,7 @@ // INCLUDES -#include +#include #include "casrvpluginuids.hrh" // RESOURCE DEFINITIONS diff -r 7feec50967db -r e492551a0d54 contentstorage/casrv/cawidgetscanner/inc/cawidgetstoragehandler.h --- a/contentstorage/casrv/cawidgetscanner/inc/cawidgetstoragehandler.h Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/casrv/cawidgetscanner/inc/cawidgetstoragehandler.h Tue Mar 23 23:28:12 2010 +0200 @@ -38,7 +38,7 @@ class CCaWidgetStorageHandler : public CBase { public: - CA_STORAGE_TEST_FRIEND_CLASS (T_CaHSWidgetScanner) + CA_STORAGE_TEST_FRIEND_CLASS (T_CaWidgetScanner) public: // Constructors and destructor diff -r 7feec50967db -r e492551a0d54 contentstorage/casrv/cawidgetscanner/src/cawidgetscannerparser.cpp --- a/contentstorage/casrv/cawidgetscanner/src/cawidgetscannerparser.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/casrv/cawidgetscanner/src/cawidgetscannerparser.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include "cawidgetscannerparser.h" #include "widgetscannerutils.h" diff -r 7feec50967db -r e492551a0d54 contentstorage/castorage/inc/casqlitestorage.h --- a/contentstorage/castorage/inc/casqlitestorage.h Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/castorage/inc/casqlitestorage.h Tue Mar 23 23:28:12 2010 +0200 @@ -18,6 +18,7 @@ #ifndef C_CASTORAGE_ENGINE_H #define C_CASTORAGE_ENGINE_H +#include #include #include #include "castorage.h" @@ -61,6 +62,10 @@ ~CCaSqLiteStorage(); //from CCpStorage + /** + * Loads data base from rom. + */ + void LoadDataBaseFromRomL(); /** * Localizes one entry attribute. @@ -74,7 +79,8 @@ * * @param aMap Filtering and sorting criteria */ - void GetLocalizationsL( RPointerArray& aResultContainer ); + void GetLocalizationsL( + RPointerArray& aResultContainer ); /** * Fetches data from database. @@ -82,7 +88,7 @@ * @param aQuery . * @param aResultContainer Target for results. */ - void GetEntriesL( const CCaInnerQuery* aQuery, + void GetEntriesL( const CCaInnerQuery* aQuery, RPointerArray& aResultContainer ); /** @@ -131,7 +137,7 @@ * @param aEntryId. */ void TouchL( const TInt aEntryId ); - + /** * Get database property from db. * @@ -139,14 +145,15 @@ * @param aPropertyValue The value of property. */ void DbPropertyL( const TDesC& aProperty, TDes& aPropertyValue ); - + /** * Set property . * * @param aProperty The property to set. * @param aPropertyValue The value of property. */ - void SetDBPropertyL( const TDesC& aProperty, const TDesC& aPropertyValue ); + void SetDBPropertyL( const TDesC& aProperty, + const TDesC& aPropertyValue ); /** * Remove from localization table . @@ -154,7 +161,7 @@ * @param aEntryId Entry Id to remove. */ void RemoveFromLocalizationL( const TInt aEntryId ); - + /** * Organizes data within a group in custom order. * @@ -166,7 +173,7 @@ private: /** - * Perform the second phase construction of a CCpStorageEngine + * Perform the second phase construction of a CCpStorageEngine * object. */ void ConstructL(); @@ -177,31 +184,33 @@ CCaSqLiteStorage(); TInt CreatePrivateDirPath( TFileName& aPrivatePath, - const TDesC& aDrive, const TDesC& aDbName, RFs& aFsSession ); - + const TDesC& aDrive, const TDesC& aDbName ); + void ExecuteStatementL( const TDesC& aStatement ); - + void ExecuteAddL( CCaInnerEntry* aEntry, RPointerArray& sqlQuery ); - + void ExecuteRemoveL( const RArray& aEntryIds ); - + void ExecuteRemoveFromLocalizationL( const TInt aEntryId ); - + void ExecuteOrganizeL( const RArray& aEntryIds, TCaOperationParams aParams ); - + void ExecuteTouchL( const TInt aEntryId ); - + void ExecuteDbPropertyL( const TDesC& aProperty, TDes& aPropertyValue ); - - void ExecuteSetDbPropertyL( const TDesC& aProperty, const TDesC& aPropertyValue ); - - void ExecuteCustomSortL( const RArray& aEntryIds, const TInt aGroupId, + + void ExecuteSetDbPropertyL( const TDesC& aProperty, + const TDesC& aPropertyValue ); + + void ExecuteCustomSortL( const RArray& aEntryIds, + const TInt aGroupId, RPointerArray& aSqlQuery ); - + void RemoveOldEntriesFromLaunchTableL( TInt aDays ); - + void VerifyOrganizeParamsL( const RArray& aEntryIds, TCaOperationParams aParams ); @@ -221,6 +230,26 @@ */ RSqlDatabase iSqlDb; + /** + * Path to data base in private path on C-drive. + */ + TFileName iPrivatePathCDriveDb; + + /** + * Path to data base in private path on Z-drive. + */ + TFileName iPrivatePathZDriveDb; + + /** + * Private path on C-drive. + */ + TFileName iPrivatePathCDrive; + + /** + * RFs session. + */ + RFs iRfs; + }; #endif //C_CASTORAGE_ENGINE_H diff -r 7feec50967db -r e492551a0d54 contentstorage/castorage/inc/castorage.h --- a/contentstorage/castorage/inc/castorage.h Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/castorage/inc/castorage.h Tue Mar 23 23:28:12 2010 +0200 @@ -53,14 +53,14 @@ * @param aResultContainer The result list of entries . * for a specific select. */ - virtual void GetEntriesL( const CCaInnerQuery* aQuery, + virtual void GetEntriesL( const CCaInnerQuery* aQuery, RPointerArray& aResultContainer ) = 0; /** * Fetches data from database by ids. * * @param aQuery The query information to select specific entries. - * @param aResultIdArray The result list of entries' ids. + * @param aResultIdArray The result list of entries' ids. * for a specific select. */ virtual void GetEntriesIdsL( const CCaInnerQuery* aQuery, @@ -73,7 +73,7 @@ * @param aParentIdArray The result list of parents' ids * for a specific select. */ - virtual void GetParentsIdsL( const RArray& aEntryIdArray, + virtual void GetParentsIdsL( const RArray& aEntryIdArray, RArray& aParentIdArray ) = 0; /** @@ -105,7 +105,7 @@ * @param aEntryId The entry id for which touch data should be stored. */ virtual void TouchL( const TInt aEntryId ) = 0; - + /** * Get database property from db. * @@ -113,7 +113,7 @@ * @param aPropertyValue The value of property. */ virtual void DbPropertyL( const TDesC& aProperty, TDes& aPropertyValue ) = 0; - + /** * Set property . * @@ -121,14 +121,14 @@ * @param aPropertyValue The value of property. */ virtual void SetDBPropertyL( const TDesC& aProperty, const TDesC& aPropertyValue ) = 0; - + /** * Remove from localization table . * * @param aEntryId Entry Id to remove. */ virtual void RemoveFromLocalizationL( const TInt aEntryId ) = 0; - + /** * Organizes data within a group in custom order. * @@ -136,7 +136,12 @@ * @param aGroupId Group to sort. */ virtual void CustomSortL( const RArray& aEntryIds, - const TInt aGroupId ) = 0; + const TInt aGroupId ) = 0; + + /** + * Loads data base from rom. + */ + virtual void LoadDataBaseFromRomL() = 0; }; diff -r 7feec50967db -r e492551a0d54 contentstorage/castorage/src/casqlitestorage.cpp --- a/contentstorage/castorage/src/casqlitestorage.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/castorage/src/casqlitestorage.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -14,10 +14,8 @@ * Description: * */ - -#include +#include "casqlitestorage.h" #include "caconsts.h" -#include "casqlitestorage.h" #include "casqlcommands.h" #include "casqlquery.h" #include "casqlquerycreator.h" @@ -42,51 +40,56 @@ // void CCaSqLiteStorage::ConstructL() { - RFs rfs; - CleanupClosePushL( rfs ); - User::LeaveIfError( rfs.Connect() ); + User::LeaveIfError( iRfs.Connect() ); - TFileName privatePathCDriveDb; - User::LeaveIfError( CreatePrivateDirPath( privatePathCDriveDb, KCDrive, - KDbName, rfs ) ); + User::LeaveIfError( CreatePrivateDirPath( iPrivatePathCDriveDb, KCDrive, + KDbName ) ); - TFileName privatePathZDriveDb; - User::LeaveIfError( CreatePrivateDirPath( privatePathZDriveDb, KZDrive, - KDbName, rfs ) ); + User::LeaveIfError( CreatePrivateDirPath( iPrivatePathZDriveDb, KZDrive, + KDbName ) ); - TFileName privatePathCDrive; - User::LeaveIfError( CreatePrivateDirPath( privatePathCDrive, KCDrive, - KNullDesC, rfs ) ); + User::LeaveIfError( CreatePrivateDirPath( iPrivatePathCDrive, KCDrive, + KNullDesC ) ); - if( iSqlDb.Open( privatePathCDriveDb, &KSqlDbConfig ) ) + if( iSqlDb.Open( iPrivatePathCDriveDb, &KSqlDbConfig ) ) { - if( ( BaflUtils::FileExists( rfs, privatePathCDriveDb ) ) ) - { - User::LeaveIfError( BaflUtils::DeleteFile( rfs, - privatePathCDriveDb ) ); - } + //we could not load data base from C-drive lets try Rom + LoadDataBaseFromRomL(); + } + } - if( !( BaflUtils::FileExists( rfs, privatePathZDriveDb ) ) ) - { - User::Panic( _L("fatal error - castoragedb not exists in ROM"), - KErrNotFound ); - } - else - { - if( !( BaflUtils::FolderExists( rfs, privatePathCDrive ) ) ) - { - User::LeaveIfError( rfs.CreatePrivatePath( EDriveC ) ); - } - User::LeaveIfError( BaflUtils::CopyFile( rfs, - privatePathZDriveDb, privatePathCDrive ) ); - User::LeaveIfError( rfs.SetAtt( privatePathCDriveDb, - KEntryAttNormal, KEntryAttReadOnly ) ); - User::LeaveIfError( iSqlDb.Open( privatePathCDriveDb, - &KSqlDbConfig ) ); - } +// --------------------------------------------------------------------------- +// CCASqLiteStorage::NewL() +// +// --------------------------------------------------------------------------- +// +void CCaSqLiteStorage::LoadDataBaseFromRomL() + { + if( ( BaflUtils::FileExists( iRfs, iPrivatePathCDriveDb ) ) ) + { + iSqlDb.Close(); + User::LeaveIfError( BaflUtils::DeleteFile( iRfs, + iPrivatePathCDriveDb ) ); } - CleanupStack::PopAndDestroy( &rfs ); + if( !( BaflUtils::FileExists( iRfs, iPrivatePathZDriveDb ) ) ) + { + User::Panic( _L("fatal error - castoragedb not exists in ROM"), + KErrNotFound ); + } + else + { + if( !( BaflUtils::FolderExists( iRfs, iPrivatePathCDrive ) ) ) + { + User::LeaveIfError( iRfs.CreatePrivatePath( EDriveC ) ); + } + User::LeaveIfError( BaflUtils::CopyFile( iRfs, + iPrivatePathZDriveDb, iPrivatePathCDrive ) ); + User::LeaveIfError( iRfs.SetAtt( iPrivatePathCDriveDb, + KEntryAttNormal, KEntryAttReadOnly ) ); + User::LeaveIfError( iSqlDb.Open( iPrivatePathCDriveDb, + &KSqlDbConfig ) ); + } } // --------------------------------------------------------------------------- @@ -122,6 +125,7 @@ CCaSqLiteStorage::~CCaSqLiteStorage() { iSqlDb.Close(); + iRfs.Close(); } // --------------------------------------------------------------------------- @@ -130,7 +134,7 @@ // --------------------------------------------------------------------------- // TInt CCaSqLiteStorage::CreatePrivateDirPath( TFileName& aPrivatePath, - const TDesC& aDrive, const TDesC& aDbName, RFs& aFsSession ) + const TDesC& aDrive, const TDesC& aDbName ) { TInt error( KErrNone ); @@ -138,7 +142,7 @@ TFileName KPathWithoutDrive( KDoubleSlash ); #else TFileName KPathWithoutDrive; - error = aFsSession.PrivatePath( KPathWithoutDrive ); + error = iRfs.PrivatePath( KPathWithoutDrive ); if( error != KErrNone ) { return error; @@ -197,11 +201,13 @@ CleanupStack::PopAndDestroy( sqlLocalizeEntryQuery ); } -void CCaSqLiteStorage::GetLocalizationsL( RPointerArray& aResultContainer ) +void CCaSqLiteStorage::GetLocalizationsL( + RPointerArray& aResultContainer ) { CCaSqlQuery* sqlGetLocalizationsQuery = CCaSqlQuery::NewLC( iSqlDb ); - CaSqlQueryCreator::CreateGetLocalizationsQueryL( sqlGetLocalizationsQuery ); - + CaSqlQueryCreator::CreateGetLocalizationsQueryL( + sqlGetLocalizationsQuery ); + sqlGetLocalizationsQuery->PrepareL(); sqlGetLocalizationsQuery->ExecuteLocalizationsL( aResultContainer ); CleanupStack::PopAndDestroy( sqlGetLocalizationsQuery ); @@ -212,7 +218,7 @@ // // --------------------------------------------------------------------------- // -void CCaSqLiteStorage::GetEntriesIdsL( const CCaInnerQuery* aQuery, +void CCaSqLiteStorage::GetEntriesIdsL( const CCaInnerQuery* aQuery, RArray& aResultIdArray ) { CCaSqlQuery* sqlGetEntriesIdsQuery = CCaSqlQuery::NewLC( iSqlDb ); @@ -273,7 +279,7 @@ ExecuteStatementL( KSqlStatementCommit ); CleanupStack::PopAndDestroy( &sqlQueries ); - + if( aUpdate ) { RemoveFromLocalizationL( aEntry->GetId() ); @@ -298,7 +304,7 @@ } // --------------------------------------------------------------------------- -// CCASqLiteStorage::OrganizeL( const RArray& aEntryIds, +// CCASqLiteStorage::OrganizeL( const RArray& aEntryIds, // TCaOperationParams aParams ) // // --------------------------------------------------------------------------- @@ -334,8 +340,8 @@ } // --------------------------------------------------------------------------- -// CCASqLiteStorage::DbPropertyL( ( const TDesC& aProperty, TDes& aPropertyValue ) -// +// CCASqLiteStorage::DbPropertyL +// ( const TDesC& aProperty, TDes& aPropertyValue ) // --------------------------------------------------------------------------- // void CCaSqLiteStorage::DbPropertyL( const TDesC& aProperty, @@ -352,8 +358,8 @@ } // --------------------------------------------------------------------------- -// CCASqLiteStorage::SetDBPropertyL( const TDesC& aProperty, const TDesC& aPropertyValue ) -// +// CCASqLiteStorage::SetDBPropertyL +// ( const TDesC& aProperty, const TDesC& aPropertyValue ) // --------------------------------------------------------------------------- // void CCaSqLiteStorage::SetDBPropertyL( const TDesC& aProperty, @@ -386,10 +392,9 @@ ExecuteStatementL( KSqlStatementCommit ); } - // --------------------------------------------------------------------------- -// CCaSqLiteStorage::CustomSortL( const RArray& aEntryIds, const TInt aGroupId ) -// +// CCaSqLiteStorage::CustomSortL +// ( const RArray& aEntryIds, const TInt aGroupId ) // --------------------------------------------------------------------------- // void CCaSqLiteStorage::CustomSortL( const RArray& aEntryIds, @@ -398,7 +403,8 @@ RPointerArray sqlQueries; CleanupResetAndDestroyPushL( sqlQueries ); - CaSqlQueryCreator::CreateCustomSortQueryL( aEntryIds, sqlQueries, iSqlDb ); + CaSqlQueryCreator::CreateCustomSortQueryL( + aEntryIds, sqlQueries, iSqlDb ); ExecuteStatementL( KSqlStatementBegin ); TRAPD( err, ExecuteCustomSortL( aEntryIds, aGroupId, sqlQueries ) ); @@ -413,8 +419,8 @@ } // --------------------------------------------------------------------------- -// CCaSqLiteStorage::ExecuteCustomSortL( const RArray& aEntryIds, const TInt aGroupId ) -// +// CCaSqLiteStorage::ExecuteCustomSortL +// ( const RArray& aEntryIds, const TInt aGroupId ) // --------------------------------------------------------------------------- // void CCaSqLiteStorage::ExecuteCustomSortL( const RArray& aEntryIds, @@ -424,7 +430,7 @@ { TInt newPosition = i + 1; TInt entryId = aEntryIds[i]; - + aSqlQuery[i]->PrepareL(); aSqlQuery[i]->BindValuesForCustomSortL( aGroupId, entryId, newPosition ); aSqlQuery[i]->ExecuteL(); @@ -462,12 +468,12 @@ } // --------------------------------------------------------------------------- -// CCASqLiteStorage::ExecuteAddL(CCaInnerEntry* aEntry, +// CCASqLiteStorage::ExecuteAddL(CCaInnerEntry* aEntry, // RPointerArray& sqlQuery) // // --------------------------------------------------------------------------- // -void CCaSqLiteStorage::ExecuteAddL( CCaInnerEntry* aEntry, +void CCaSqLiteStorage::ExecuteAddL( CCaInnerEntry* aEntry, RPointerArray& aSqlQuery ) { TBool isAttributeDeleted( EFalse ); @@ -484,7 +490,7 @@ CCaInnerEntry::TIconAttributes iconAttributes; TInt countIcons = query->ExecuteL( iconAttributes ); CleanupStack::PopAndDestroy( query ); - + aSqlQuery[i]->PrepareL(); aSqlQuery[i]->BindValuesForAddL( aEntry ); TInt tmpId( 0 ); @@ -639,9 +645,9 @@ sqlQueries[i]->PrepareL(); for( TInt j = 0; j < aEntryIds.Count(); j++ ) { - TInt k = (revereseInsertOrder) ? + TInt k = (revereseInsertOrder) ? (aEntryIds.Count() - 1) - j : j; - sqlQueries[i]->BindValuesForOrganizeL( + sqlQueries[i]->BindValuesForOrganizeL( aEntryIds, aParams, aEntryIds[k] ); sqlQueries[i]->ExecuteL(); sqlQueries[i]->ResetStatement(); diff -r 7feec50967db -r e492551a0d54 contentstorage/cautils/src/cainnernotifierfilter.cpp --- a/contentstorage/cautils/src/cainnernotifierfilter.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/cautils/src/cainnernotifierfilter.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -16,7 +16,7 @@ */ #include -#include +#include #include "cainnernotifierfilter.h" // ======== MEMBER FUNCTIONS ======== diff -r 7feec50967db -r e492551a0d54 contentstorage/cautils/src/cainnerquery.cpp --- a/contentstorage/cautils/src/cainnerquery.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/cautils/src/cainnerquery.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -16,7 +16,7 @@ */ #include -#include +#include #include "cadef.h" #include "cainnerquery.h" diff -r 7feec50967db -r e492551a0d54 contentstorage/extinc/camenuiconutility.h --- a/contentstorage/extinc/camenuiconutility.h Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/extinc/camenuiconutility.h Tue Mar 23 23:28:12 2010 +0200 @@ -19,7 +19,7 @@ #ifndef __CAMENUICONUTILITY_H__ #define __CAMENUICONUTILITY_H__ -#include +#include class CCaInnerEntry; diff -r 7feec50967db -r e492551a0d54 contentstorage/extinc/casathandler.h --- a/contentstorage/extinc/casathandler.h Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/extinc/casathandler.h Tue Mar 23 23:28:12 2010 +0200 @@ -18,12 +18,12 @@ #ifndef __CASATHANDLER_H__ #define __CASATHANDLER_H__ -#include +#include #include -#include +#include #ifdef SIM_ATK_SERVICE_API_V1 -#include // MCL +#include // MCL #else #include // 5.0 #endif diff -r 7feec50967db -r e492551a0d54 contentstorage/extsrc/caiconutility.cpp --- a/contentstorage/extsrc/caiconutility.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/extsrc/caiconutility.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -17,11 +17,11 @@ // INCLUDE FILES #include -#include +#include #include #include #include -#include +#include #include "cadef.h" #include "cautils.h" #include "cainnerentry.h" diff -r 7feec50967db -r e492551a0d54 contentstorage/group/camenu.mmp --- a/contentstorage/group/camenu.mmp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/group/camenu.mmp Tue Mar 23 23:28:12 2010 +0200 @@ -12,7 +12,7 @@ * Contributors: * * Description: -* Version : %version: ou1s60ui#20 % << Don't touch! Updated by Synergy at check-out. +* Version : %version: ou1s60ui#19.1.1 % << Don't touch! Updated by Synergy at check-out. * */ diff -r 7feec50967db -r e492551a0d54 contentstorage/handlerinc/cauninstalloperation.h --- a/contentstorage/handlerinc/cauninstalloperation.h Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/handlerinc/cauninstalloperation.h Tue Mar 23 23:28:12 2010 +0200 @@ -19,7 +19,7 @@ #define C_CAUNINSTALLOPERATION_H #include -#include +#include /** * Uninstall CMenuOperation diff -r 7feec50967db -r e492551a0d54 contentstorage/inc/cadef.h --- a/contentstorage/inc/cadef.h Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/inc/cadef.h Tue Mar 23 23:28:12 2010 +0200 @@ -12,7 +12,7 @@ * Contributors: * * Description: Definition of different constants - * Version : %version: ou1s60ui#11 % << Don't touch! Updated by Synergy at check-out. + * Version : %version: ou1s60ui#10.1.1 % << Don't touch! Updated by Synergy at check-out. * */ diff -r 7feec50967db -r e492551a0d54 contentstorage/inc/cainternaltypes.h --- a/contentstorage/inc/cainternaltypes.h Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/inc/cainternaltypes.h Tue Mar 23 23:28:12 2010 +0200 @@ -12,7 +12,7 @@ * Contributors: * * Description: Definition of different constants - * Version : %version: ou1s60ui#4 % << Don't touch! Updated by Synergy at check-out. + * Version : %version: ou1s60ui#3.1.1 % << Don't touch! Updated by Synergy at check-out. * */ #ifndef CAINTERNALTYPES_H diff -r 7feec50967db -r e492551a0d54 contentstorage/srvinc/castorageproxy.h --- a/contentstorage/srvinc/castorageproxy.h Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/srvinc/castorageproxy.h Tue Mar 23 23:28:12 2010 +0200 @@ -35,7 +35,7 @@ class CCaStorageProxy: public CBase { public: - + /** * Two-phased constructor. */ @@ -50,7 +50,7 @@ * Destructor. */ ~CCaStorageProxy(); - + /** * Localizes one entry attribute * @@ -63,14 +63,15 @@ * * @param aResultContainer Target for results. */ - IMPORT_C void GetLocalizationsL( RPointerArray& aResultContainer ); + IMPORT_C void GetLocalizationsL( + RPointerArray& aResultContainer ); /** * Fetches data from storage. * @param aQuery Query filter for entries to be fetched. * @param aResult Result entry container. */ - IMPORT_C void GetEntriesL( const CCaInnerQuery* aQuery, + IMPORT_C void GetEntriesL( const CCaInnerQuery* aQuery, RPointerArray& aResultContainer ); /** @@ -83,7 +84,7 @@ /** * Adds or Updates data to storage. - * In case when data is added the input aEntry serves + * In case when data is added the input aEntry serves * also as an output entry. * @param aEntry Entry data. * @param aUpdate is entry updated by a client @@ -98,7 +99,7 @@ /** * Organizes entries in storage. - * @param aEntryIds Entry ids to be organized + * @param aEntryIds Entry ids to be organized * (insert, remove, append, prepend are possible). * @param aParams Organize parameters. */ @@ -106,12 +107,12 @@ TCaOperationParams aParams ); /** - * Executes touch specific actions on storage. + * Executes touch specific actions on storage. * Should be called when e.g. entry is clicked. * @param aEntry entry to be touched */ IMPORT_C void TouchL( CCaInnerEntry* aEntry ); - + /** * Get database property on storage. * @@ -119,30 +120,37 @@ * @param aPropertyValue The value of property. */ IMPORT_C void DbPropertyL( const TDesC& aProperty, TDes& aPropertyValue ); - + /** * Set property action on storage. * * @param aProperty The property to set. * @param aPropertyValue The value of property. */ - IMPORT_C void SetDBPropertyL( const TDesC& aProperty, const TDesC& aPropertyValue ); - + IMPORT_C void SetDBPropertyL( const TDesC& aProperty, + const TDesC& aPropertyValue ); + /** * Organizes data within a group in custom order in storage. * * @param aEntryIds Ids of entries in custom order. * @param aGroupId Group to sort. */ - IMPORT_C void CustomSortL( const RArray& aEntryIds, const TInt aGroupId ); - + IMPORT_C void CustomSortL( const RArray& aEntryIds, + const TInt aGroupId ); + + /** + * Loads data base from rom. + */ + IMPORT_C void LoadDataBaseFromRomL(); + /** * Add a session. Ownership not taken, this object only keeps a list of * sessions that are dependent on its engine. * @param aSession Session. */ void AddSessionL( MCaSessionNorifier* aHandlerNotifier ); - + /** * Remove a session. Safe to call if not added. * When no more sessions remain dependent on this object, timed @@ -173,7 +181,7 @@ /** * Sessions using this engine. Own. */ - RPointerArray iHandlerNotifier; + RPointerArray iHandlerNotifier; }; #endif //CASTORAGEPROXY_H diff -r 7feec50967db -r e492551a0d54 contentstorage/srvsrc/casrv.cpp --- a/contentstorage/srvsrc/casrv.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/srvsrc/casrv.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -15,6 +15,7 @@ * */ // INCLUDE FILES +#include #include #include #include "casrv.h" @@ -56,7 +57,7 @@ // ==================== GLOBAL FUNCTIONS ==================== // --------------------------------------------------------- -// +// // --------------------------------------------------------- // EXPORT_C TInt RunCaServer() @@ -107,7 +108,7 @@ // ==================== MEMBER FUNCTIONS ==================== // --------------------------------------------------------- -// +// // --------------------------------------------------------- // CCaSrv* CCaSrv::NewL() @@ -120,7 +121,7 @@ } // --------------------------------------------------------- -// +// // --------------------------------------------------------- // CCaSrv::~CCaSrv() @@ -142,7 +143,7 @@ } // --------------------------------------------------------- -// +// // --------------------------------------------------------- // CCaStorageProxy* CCaSrv::GetStorageProxy() @@ -151,7 +152,7 @@ } // --------------------------------------------------------- -// +// // --------------------------------------------------------- // CCaSrv::CCaSrv() : @@ -160,7 +161,7 @@ } // --------------------------------------------------------- -// +// // --------------------------------------------------------- // void CCaSrv::ConstructL() @@ -170,11 +171,19 @@ StopScheduler, NULL ) ); iStorageProxy = CCaStorageProxy::NewL(); iSrvEngUtils = CCaSrvEngUtils::NewL(); - iSrvManager = CCaSrvManager::NewL( *iStorageProxy, iSrvEngUtils ); + TRAPD( err, iSrvManager = CCaSrvManager::NewL( + *iStorageProxy, iSrvEngUtils ) ); + if( KSqlErrNotDb <= err && err <= KSqlErrGeneral ) + { + //problem in loading one of plugins, probably data base is corrupted + //lets load it from ROM and try again + iStorageProxy->LoadDataBaseFromRomL(); + iSrvManager = CCaSrvManager::NewL( *iStorageProxy, iSrvEngUtils ); + } } // --------------------------------------------------------- -// +// // --------------------------------------------------------- // CSession2* CCaSrv::NewSessionL( const TVersion& aVersion, @@ -192,7 +201,7 @@ } // --------------------------------------------------------- -// +// // --------------------------------------------------------- // void CCaSrv::IncreaseSessionCount() @@ -201,7 +210,7 @@ } // --------------------------------------------------------- -// +// // --------------------------------------------------------- // void CCaSrv::DecreaseSessionCount() diff -r 7feec50967db -r e492551a0d54 contentstorage/srvsrc/casrvengutils.cpp --- a/contentstorage/srvsrc/casrvengutils.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/srvsrc/casrvengutils.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -15,7 +15,7 @@ * the content arsenal server itself * */ -#include +#include #include #include #include diff -r 7feec50967db -r e492551a0d54 contentstorage/srvsrc/casrvnotifier.cpp --- a/contentstorage/srvsrc/casrvnotifier.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/srvsrc/casrvnotifier.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -15,7 +15,7 @@ * */ -#include +#include #include "casrvnotifier.h" #include "cainnernotifierfilter.h" #include "cainnerentry.h" diff -r 7feec50967db -r e492551a0d54 contentstorage/srvsrc/castorageproxy.cpp --- a/contentstorage/srvsrc/castorageproxy.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/contentstorage/srvsrc/castorageproxy.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -36,7 +36,7 @@ } // --------------------------------------------------------------------------- -// +// // --------------------------------------------------------------------------- // void CCaStorageProxy::ConstructL() @@ -87,9 +87,9 @@ iStorage->GetEntriesL( aQuery, aResultContainer ); } -// ----------------------------------------------------------------------------- -// -// --------------- -------------------------------------------------------------- +// --------------------------------------------------------------------------- +// +// --------------------------------------------------------------------------- // EXPORT_C void CCaStorageProxy::GetEntriesIdsL(const CCaInnerQuery* aQuery, RArray& aResultIdArray) @@ -97,9 +97,9 @@ iStorage->GetEntriesIdsL( aQuery, aResultIdArray ); } -// ----------------------------------------------------------------------------- -// -// --------------- -------------------------------------------------------------- +// --------------------------------------------------------------------------- +// +// --------------------------------------------------------------------------- // EXPORT_C void CCaStorageProxy::AddL( CCaInnerEntry* aEntry, TBool aUpdate ) { @@ -123,9 +123,9 @@ CleanupStack::PopAndDestroy( &parentArray ); } -// ----------------------------------------------------------------------------- -// -// --------------- -------------------------------------------------------------- +// --------------------------------------------------------------------------- +// +// --------------------------------------------------------------------------- // EXPORT_C void CCaStorageProxy::RemoveL( const RArray& aEntryIds ) { @@ -145,7 +145,7 @@ { for( TInt j( 0 ); j < iHandlerNotifier.Count(); j++ ) { - iHandlerNotifier[j]->EntryChanged( resultContainer[i], + iHandlerNotifier[j]->EntryChanged( resultContainer[i], ERemoveChangeType, parentArray ); } } @@ -154,9 +154,9 @@ CleanupStack::PopAndDestroy( query ); } -// ----------------------------------------------------------------------------- -// -// --------------- -------------------------------------------------------------- +// --------------------------------------------------------------------------- +// +// --------------------------------------------------------------------------- // EXPORT_C void CCaStorageProxy::OrganizeL( const RArray& aEntryIds, TCaOperationParams aParams ) @@ -173,36 +173,36 @@ CleanupStack::PopAndDestroy( &parentArray ); } -// ----------------------------------------------------------------------------- -// -// ------------------------------------------------------------------------------ +// --------------------------------------------------------------------------- +// +// --------------------------------------------------------------------------- // EXPORT_C void CCaStorageProxy::TouchL( CCaInnerEntry* aEntry ) { CCaInnerQuery* touchQuery = CCaInnerQuery::NewLC(); - + TInt entryId = aEntry->GetId(); - + if ( entryId == 0 && aEntry->GetUid() != 0) { CCaInnerQuery* idQuery = CCaInnerQuery::NewLC(); idQuery->SetUid( static_cast( aEntry->GetUid()) ); - + RArray idArray; CleanupClosePushL( idArray ); - + iStorage->GetEntriesIdsL( idQuery, idArray ); - + if (idArray.Count() == 1 ) { entryId = idArray[0]; aEntry->SetId( entryId ); - } - - CleanupStack::PopAndDestroy( &idArray ); - CleanupStack::PopAndDestroy( idQuery ); + } + + CleanupStack::PopAndDestroy( &idArray ); + CleanupStack::PopAndDestroy( idQuery ); } - + RArray id; CleanupClosePushL( id ); id.AppendL( entryId ); @@ -224,7 +224,8 @@ iStorage->GetParentsIdsL( id, parentArray ); for( TInt i = 0; i < iHandlerNotifier.Count(); i++ ) { - iHandlerNotifier[i]->EntryChanged( resultArray[0], EUpdateChangeType, + iHandlerNotifier[i]->EntryChanged( resultArray[0], + EUpdateChangeType, parentArray ); } CleanupStack::PopAndDestroy( &parentArray ); @@ -235,9 +236,9 @@ CleanupStack::PopAndDestroy( touchQuery ); } -// ----------------------------------------------------------------------------- -// -// ------------------------------------------------------------------------------ +// --------------------------------------------------------------------------- +// +// --------------------------------------------------------------------------- // EXPORT_C void CCaStorageProxy::GetLocalizationsL( RPointerArray& aResultArray ) @@ -245,9 +246,9 @@ iStorage->GetLocalizationsL( aResultArray ); } -// ----------------------------------------------------------------------------- -// -// ------------------------------------------------------------------------------ +// --------------------------------------------------------------------------- +// +// --------------------------------------------------------------------------- // EXPORT_C void CCaStorageProxy::LocalizeEntryL( CCaLocalizationEntry& aLocalization ) @@ -255,9 +256,9 @@ iStorage->LocalizeEntryL( aLocalization ); } -// ----------------------------------------------------------------------------- -// -// ------------------------------------------------------------------------------ +// --------------------------------------------------------------------------- +// +// --------------------------------------------------------------------------- // EXPORT_C void CCaStorageProxy::DbPropertyL( const TDesC& aProperty, TDes& aPropertyValue ) @@ -265,9 +266,9 @@ iStorage->DbPropertyL( aProperty, aPropertyValue ); } -// ----------------------------------------------------------------------------- -// -// ------------------------------------------------------------------------------ +// --------------------------------------------------------------------------- +// +// --------------------------------------------------------------------------- // EXPORT_C void CCaStorageProxy::SetDBPropertyL( const TDesC& aProperty, const TDesC& aPropertyValue ) @@ -275,15 +276,15 @@ iStorage->SetDBPropertyL( aProperty, aPropertyValue ); } -// ----------------------------------------------------------------------------- -// -// ------------------------------------------------------------------------------ +// --------------------------------------------------------------------------- +// +// --------------------------------------------------------------------------- // EXPORT_C void CCaStorageProxy::CustomSortL( const RArray& aEntryIds, const TInt aGroupId ) { iStorage->CustomSortL( aEntryIds, aGroupId ); - + RArray parentArray; CleanupClosePushL( parentArray ); parentArray.AppendL( aGroupId ); @@ -294,19 +295,29 @@ CleanupStack::PopAndDestroy( &parentArray ); } +// --------------------------------------------------------------------------- +// +// --------------------------------------------------------------------------- +// +EXPORT_C void CCaStorageProxy::LoadDataBaseFromRomL() + { + iStorage->LoadDataBaseFromRomL(); + } + // --------------------------------------------------------- -// +// // --------------------------------------------------------- // void CCaStorageProxy::AddSessionL( MCaSessionNorifier* aHandlerNotifier ) { - __ASSERT_ALWAYS( iHandlerNotifier.Find( aHandlerNotifier ) == KErrNotFound, + __ASSERT_ALWAYS( + iHandlerNotifier.Find( aHandlerNotifier ) == KErrNotFound, User::Invariant() ); iHandlerNotifier.AppendL( aHandlerNotifier ); } // --------------------------------------------------------- -// +// // --------------------------------------------------------- // void CCaStorageProxy::RemoveSession( MCaSessionNorifier* aHandlerNotifier ) diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/contentstorage_api/caentry.h --- a/homescreensrv_plat/contentstorage_api/caentry.h Tue Mar 23 23:17:02 2010 +0200 +++ b/homescreensrv_plat/contentstorage_api/caentry.h Tue Mar 23 23:28:12 2010 +0200 @@ -19,8 +19,8 @@ #define CAENTRY_H #include -#include #include +#include #include "caclient_global.h" #include "cadefs.h" @@ -29,8 +29,8 @@ CA_CLIENT_TEST_CLASS( TestCaClient ) class CaObjectAdapter; - class CaEntryPrivate; +class HbIcon; class CACLIENT_EXPORT CaEntry { @@ -66,7 +66,7 @@ QString attribute(const QString &name) const; void setAttribute(const QString &name, const QString &value); - QPixmap makeIcon(const QSize &size = QSize(70, 70)) const; + HbIcon makeIcon(const QSize &size = QSize(70, 70)) const; EntryRole role() const; diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/menu_sat_interface_api/tsrc/conf/ui_menusatinterfacetest.cfg --- a/homescreensrv_plat/menu_sat_interface_api/tsrc/conf/ui_menusatinterfacetest.cfg Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -[StifSettings] -[StifSettings] -CheckHeapBalance= off -[EndStifSettings] - -############################################################## -# Test -############################################################## - - -[Test] -title Test_SatUiVisibleL -create menusatinterfacetest msi -msi Test_SatUiVisibleL -delete msi -[Endtest] - -[Test] -title Test_SatUiVisibleIconIdL -create menusatinterfacetest msi -msi Test_SatUiVisibleIconIdL -delete msi -[Endtest] - -[Test] -title Test_SatInterfaceConstructL -create menusatinterfacetest msi -msi Test_SatInterfaceConstructL -delete msi -[Endtest] diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/menu_sat_interface_api/tsrc/data/satapi.bat --- a/homescreensrv_plat/menu_sat_interface_api/tsrc/data/satapi.bat Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -rem /* -rem * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -rem * All rights reserved. -rem * This component and the accompanying materials are made available -rem * under the terms of "Eclipse Public License v1.0" -rem * which accompanies this distribution, and is available -rem * at the URL "http://www.eclipse.org/legal/epl-v10.html". -rem * -rem * Initial Contributors: -rem * Nokia Corporation - initial contribution. -rem * -rem * Contributors: -rem * -rem * Description: -rem * -rem */ -md c:\data\stif\sat_results\ -ATSInterface.exe -testmodule TestScripter -config c:\testframework\ui_menusatinterfacetest.cfg \ No newline at end of file diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/menu_sat_interface_api/tsrc/group/bld.inf --- a/homescreensrv_plat/menu_sat_interface_api/tsrc/group/bld.inf Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -PRJ_PLATFORMS -DEFAULT - -PRJ_EXPORTS -../init/ui_menusatinterfacetest.ini c:/testframework/ui_menusatinterfacetest.ini -../conf/ui_menusatinterfacetest.cfg c:/testframework/ui_menusatinterfacetest.cfg -../data/satapi.bat c:/satapi.bat - -PRJ_MMPFILES - -PRJ_TESTMMPFILES -menusatinterfacetest.mmp - -// End of File \ No newline at end of file diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/menu_sat_interface_api/tsrc/group/coverageafter.bat --- a/homescreensrv_plat/menu_sat_interface_api/tsrc/group/coverageafter.bat Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -@rem -@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -@rem All rights reserved. -@rem This component and the accompanying materials are made available -@rem under the terms of "Eclipse Public License v1.0" -@rem which accompanies this distribution, and is available -@rem at the URL "http://www.eclipse.org/legal/epl-v10.html". -@rem -@rem Initial Contributors: -@rem Nokia Corporation - initial contribution. -@rem -@rem Contributors: -@rem -@rem Description: -@rem - -call cd ../../../../contentstorage/casatinterface/group -call ctcpost -p profile.txt -call ctc2html -nsb -i profile.txt diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/menu_sat_interface_api/tsrc/group/decision.bat --- a/homescreensrv_plat/menu_sat_interface_api/tsrc/group/decision.bat Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -@rem -@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -@rem All rights reserved. -@rem This component and the accompanying materials are made available -@rem under the terms of "Eclipse Public License v1.0" -@rem which accompanies this distribution, and is available -@rem at the URL "http://www.eclipse.org/legal/epl-v10.html". -@rem -@rem Initial Contributors: -@rem Nokia Corporation - initial contribution. -@rem -@rem Contributors: -@rem -@rem Description: -@rem - -call cd ../../../../contentstorage/casatinterface/group - -call del mon.sym -call del mon.dat -call rmdir /s /q CTCHTML - -call bldmake bldfiles -call abld makefile winscw udeb -call abld reallyclean winscw udeb -call ctcwrap -i fd -C "EXCLUDE=*" -C "NO_EXCLUDE+../*" abld build winscw udeb - -call cd ../../../homescreensrv_plat/menu_sat_interface_api/tsrc/group/ -call bldmake bldfiles -call abld makefile winscw udeb -call abld reallyclean winscw udeb -call abld test build winscw udeb \ No newline at end of file diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/menu_sat_interface_api/tsrc/group/menusatinterfacetest.mmp --- a/homescreensrv_plat/menu_sat_interface_api/tsrc/group/menusatinterfacetest.mmp Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ -#include - -TARGET menusatinterfacetest.dll -TARGETTYPE dll -UID 0x1000008D 0x02FE5167 - -CAPABILITY ALL -TCB - -SOURCEPATH ../src -SOURCE menusatinterfacetest.cpp -SOURCE menusatinterfacetestblocks.cpp menusatinterfacetestutils.cpp waitactive.cpp - -USERINCLUDE ../inc -USERINCLUDE ../../inc - -MW_LAYER_SYSTEMINCLUDE - -LIBRARY euser.lib -LIBRARY stiftestinterface.lib -LIBRARY MenuInterface.lib - -LANG SC - -// End of File diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/menu_sat_interface_api/tsrc/group/menusatinterfacetest.pkg --- a/homescreensrv_plat/menu_sat_interface_api/tsrc/group/menusatinterfacetest.pkg Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -; -; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -; All rights reserved. -; This component and the accompanying materials are made available -; under the terms of "Eclipse Public License v1.0" -; which accompanies this distribution, and is available -; at the URL "http://www.eclipse.org/legal/epl-v10.html". -; -; Initial Contributors: -; Nokia Corporation - initial contribution. -; -; Contributors: -; -; Description: -; -; obrtester.pkg -; -;Language - standard language definitions -&EN - -; standard SIS file header -#{"satapitest"},(0x02FE5168),1,0,0 - -;Localised Vendor name -%{"Vendor-EN"} - -;Unique Vendor name -:"Vendor" - -;Supports Series 60 v 3.0 -[0x101F7961], 0, 0, 0, {"Series60ProductID"} - -;Files to install - - "\epoc32\release\armv5\urel\menusatinterfacetest.dll" - "!:\sys\bin\menusatinterfacetest.dll" - "..\init\ui_menusatinterfacetest.ini" -"!:\testframework\ui_menusatinterfacetest.ini" - "..\conf\ui_menusatinterfacetest.cfg" -"!:\testframework\ui_menusatinterfacetest.cfg" - "..\data\satapi.bat" -"!:\satapi.bat" diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/menu_sat_interface_api/tsrc/group/menusatinterfacetest_sisx.bat --- a/homescreensrv_plat/menu_sat_interface_api/tsrc/group/menusatinterfacetest_sisx.bat Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -@rem -@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -@rem All rights reserved. -@rem This component and the accompanying materials are made available -@rem under the terms of "Eclipse Public License v1.0" -@rem which accompanies this distribution, and is available -@rem at the URL "http://www.eclipse.org/legal/epl-v10.html". -@rem -@rem Initial Contributors: -@rem Nokia Corporation - initial contribution. -@rem -@rem Contributors: -@rem -@rem Description: -@rem -@echo off - -if exist menusatinterfacetest.sisx del menusatinterfacetest.sisx - -makesis menusatinterfacetest.pkg -signsis menusatinterfacetest.sis menusatinterfacetest.sisx rd.cer rd-key.pem - - -if exist menusatinterfacetest.sisx ( -echo menusatinterfacetest.sisx creation SUCCEEDED -del menusatinterfacetest.sis -) - -if not exist menusatinterfacetest.sisx ( -echo menusatinterfacetest.sisx creation FAILED -) \ No newline at end of file diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/menu_sat_interface_api/tsrc/group/rd-key.pem --- a/homescreensrv_plat/menu_sat_interface_api/tsrc/group/rd-key.pem Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXAIBAAKBgQDLRF+r1FGGkCwTrb420kbnAps7gi1yYUcXYUdWeFTuBeQe5eW4 -6Y+LWaA8HMlDdoHRB0FgASisYcFagwno9+oFf4AJka4H1gWEs5XTGwAA1s0d8XGh -7W7Dt9F5FZij8F7/9Pi6+FhhxZFIf1DD+yry9D7+Sp+BgdNALe4XOpf25QIBAwKB -gQCHgupyjYuvCsgNHn7PNtnvVxInrB5MQNoPli+O+uNJWUK/Q+57Rl+yO8AoEzDX -pFaLWiuVVhsdloDnAgabT/FXzYncs6uOHyEUV+dSXb78vtLPJqAX+Fg2i3hOXreB -yskcZ13/OsKVOu5wgrJkx2baZufkqMwOSytf5y9nwjEIKwJBAP+inobagVNrN62j -KQva3cC+UN/6XnKdTc0CA6bHyLOaJoH1xiMwG/VS2PGjHI0tiSMNtLn/QPpHJ003 -iabGhdUCQQDLjp/9UjFT6K6CF66Chqf30pZXhx+GTSQZmv/gvZiMly7X9fX9BGX3 -2MbJohBC4yI21XKTbisWywkF73Hwh+TRAkEAqmxprzxWN5zPyRdwspHpKymLP/w+ -9xOJM1atGdqFzRFvAU6EF3Vn+OHl9my9s3OwwgkjJqorUYTE3iUGby8D4wJBAIe0 -aqjhdjfwdFa6dFcEb/qMZDpaFQQzbWZnVUB+ZbMPdI/5TqitmU/l2dvBYCyXbCSO -TGJJcg8yBgP09qBamIsCQFL7j1tM0XPVQJQ89WpKCld7O9ORxRGVj1eG0tWijrH8 -mGbYh8SGCVoWV3vrKSS8GBrFVgQnqUaHuEdtM7tpCAQ= ------END RSA PRIVATE KEY----- diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/menu_sat_interface_api/tsrc/group/rd.cer --- a/homescreensrv_plat/menu_sat_interface_api/tsrc/group/rd.cer Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICzDCCAjWgAwIBAgIBADANBgkqhkiG9w0BAQUFADArMRAwDgYDVQQKEwdSRCBD -ZXJ0MRcwFQYDVQQDEw5SRCBDZXJ0aWZpY2F0ZTAeFw0wNDExMTUxMjQyMDZaFw0z -NzA5MjMxMjQyMDZaMCsxEDAOBgNVBAoTB1JEIENlcnQxFzAVBgNVBAMTDlJEIENl -cnRpZmljYXRlMIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDLRF+r1FGGkCwT -rb420kbnAps7gi1yYUcXYUdWeFTuBeQe5eW46Y+LWaA8HMlDdoHRB0FgASisYcFa -gwno9+oFf4AJka4H1gWEs5XTGwAA1s0d8XGh7W7Dt9F5FZij8F7/9Pi6+FhhxZFI -f1DD+yry9D7+Sp+BgdNALe4XOpf25QIBA6OCAQAwgf0wDAYDVR0TBAUwAwEB/zAL -BgNVHQ8EBAMCAoQwHQYDVR0OBBYEFFi/kuGzxhVpjGxe9ZwlxC3fH9jFMFMGA1Ud -IwRMMEqAFFi/kuGzxhVpjGxe9ZwlxC3fH9jFoS+kLTArMRAwDgYDVQQKEwdSRCBD -ZXJ0MRcwFQYDVQQDEw5SRCBDZXJ0aWZpY2F0ZYIBADBsBgNVHSAEZTBjMGEGBFUd -IAAwWTATBggrBgEFBQcCARYHaHR0cDovLzBCBggrBgEFBQcCAjA2GjRGb3IgUiZE -IHVzYWdlIG9ubHkuIFRoaXMgY2VydGlmaWNhdGUgaXMgbm90IHRydXN0ZWQuMA0G -CSqGSIb3DQEBBQUAA4GBAHGB4RQMAgBdeT2hxfOr6f2nA/dZm+M5yX5daUtZnET9 -Ed0A9sazLawfN2G1KFQT9kxEParAyoAkpbMAsRrnRz/9cM3OHgFm/NiKRnf50DpT -7oCx0I/65mVD2kt+xXE62/Ii5KPnTufIkPi2uLvURCia1tTS8JmJ8dtxDGyQt8BR ------END CERTIFICATE----- diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/menu_sat_interface_api/tsrc/inc/menusatinterfacetest.h --- a/homescreensrv_plat/menu_sat_interface_api/tsrc/inc/menusatinterfacetest.h Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,98 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ -#ifndef TESTCLASS_H -#define TESTCLASS_H - -// INCLUDES -#include -#include -#include -#include -#include -#include - - -#include - -// CLASS DECLARATION - -/** -* CMenuSatInterfaceTest test class for STIF Test Framework TestScripter. -* Class for testing CMenuSATInterface. -* -* @lib ?library -* @since ?Series60_version -*/ -NONSHARABLE_CLASS(CMenuSatInterfaceTest) : public CScriptBase - { - public: // Constructors and destructor - - /** - * Two-phased constructor. - */ - static CMenuSatInterfaceTest* NewL( CTestModuleIf& aTestModuleIf ); - - /** - * Destructor. - */ - virtual ~CMenuSatInterfaceTest(); - - public: // Functions from base classes - - /** - * From CScriptBase Runs a script line. - * @since ?Series60_version - * @param aItem Script line containing method name and parameters - * @return Symbian OS error code - */ - virtual TInt RunMethodL( CStifItemParser& aItem ); - - private: - - /** - * C++ default constructor. - */ - CMenuSatInterfaceTest( CTestModuleIf& aTestModuleIf ); - - /** - * By default Symbian 2nd phase constructor is private. - */ - void ConstructL(); - - /** - * Test methods are listed below. - */ - TInt Test_SatUiVisibleL(CStifItemParser& /*aItem*/ ); - TInt Test_SatUiVisibleIconIdL(CStifItemParser& /*aItem*/ ); - TInt Test_SatInterfaceConstructL(CStifItemParser& /*aItem*/ ); - - /** - * Utility methods are listed below. - */ - void WaitL(TInt aMicroSec); - - private: // Data - /** - * Data tosave enviroment statebefore testing. - */ - TInt iIconId; - - }; - -#endif // TESTCLASS_H - -// End of File diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/menu_sat_interface_api/tsrc/inc/waitactive.h --- a/homescreensrv_plat/menu_sat_interface_api/tsrc/inc/waitactive.h Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,63 +0,0 @@ -/* -* Copyright (c) 2006-2006 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Plugin Interface -* -*/ - - -#ifndef C_WAITACTIVE_H -#define C_WAITACTIVE_H - -#include - -/** - * Helper wait active class - */ - class CWaitActive : public CTimer - { - -public: - - - static CWaitActive* NewL( ); - - ~CWaitActive(); - - void Wait(TTimeIntervalMicroSeconds32 anInterval); - -protected: - - /** - * From CActive, RunL. - * Handles the active object’s request completion event - */ - void RunL(); - - -private: - - CWaitActive(); - - void ConstructL(); - -private: - - /* - * Own. - */ - CActiveSchedulerWait* iActiveScheduler; - }; - - -#endif // C_WAITACTIVE_H \ No newline at end of file diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/menu_sat_interface_api/tsrc/init/ui_menusatinterfacetest.ini --- a/homescreensrv_plat/menu_sat_interface_api/tsrc/init/ui_menusatinterfacetest.ini Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,181 +0,0 @@ -# -# This is STIFTestFramework initialization file -# Comment lines start with '#'-character. -# See STIF TestFramework users guide.doc for instructions - -# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -# Set following test engine settings: -# - Set Test Reporting mode. TestReportMode's possible values are: -# + 'Summary': Summary of the tested test cases. -# + 'Environment': Hardware and software info. -# + 'TestCases': Test case report. -# + 'FullReport': Set of all above ones. -# + Example 'TestReportMode= Summary TestCases' -# -# - CreateTestReport setting controls report creation mode -# + YES, Test report will created. -# + NO, No Test report. -# -# - File path indicates the base path of the test report. -# - File name indicates the name of the test report. -# -# - File format indicates the type of the test report. -# + TXT, Test report file will be txt type, for example 'TestReport.txt'. -# + HTML, Test report will be html type, for example 'TestReport.html'. -# -# - File output indicates output source of the test report. -# + FILE, Test report logging to file. -# + RDEBUG, Test report logging to using rdebug. -# -# - File Creation Mode indicates test report overwriting if file exist. -# + OVERWRITE, Overwrites if the Test report file exist. -# + APPEND, Continue logging after the old Test report information if -# report exist. -# - Sets a device reset module's dll name(Reboot). -# + If Nokia specific reset module is not available or it is not correct one -# StifHWResetStub module may use as a template for user specific reset -# module. - -[Engine_Defaults] - -TestReportMode= FullReport # Possible values are: 'Empty', 'Summary', 'Environment', - 'TestCases' or 'FullReport' - -CreateTestReport= YES # Possible values: YES or NO - -TestReportFilePath= C:\data\stif\sat_results\ -TestReportFileName= menusatinterfacetest_test_report - -TestReportFormat= HTML # Possible values: TXT or HTML -TestReportOutput= FILE # Possible values: FILE or RDEBUG -TestReportFileCreationMode= OVERWRITE # Possible values: OVERWRITE or APPEND -UITestingSupport= YES # Possible values: YES or NO -SeparateProcesses= YES # Possible values: YES or NO (default: NO) -DeviceResetDllName= StifResetForNokia.dll # e.g. 'StifHWResetStub.dll' for user specific reseting - -[End_Defaults] -# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -# Module configurations start -# Modules are added between module tags -# tags. Module name is specified after ModuleName= tag, like -# ModuleName= XXXXXXXXX -# Modules might have initialisation file, specified as -# IniFile= c:\testframework\YYYYYY -# Modules might have several configuration files, like -# TestCaseFile= c:\testframework\NormalCases.txt -# TestCaseFile= c:\testframework\SmokeCases.txt -# TestCaseFile= c:\testframework\ManualCases.txt - -# (TestCaseFile is synonym for old term ConfigFile) - -# Following case specifies demo module settings. Demo module -# does not read any settings from file, so tags -# IniFile and TestCaseFile are not used. -# In the simplest case it is enough to specify only the -# name of the test module when adding new test module - -#[New_Module] -#ModuleName= dom_test2 -#[End_Module] - - -# Load testmoduleXXX, optionally with initialization file and/or test case files -[New_Module] -ModuleName= testscripter - -#TestModuleXXX used initialization file -#IniFile= c:\testframework\init.txt - -#TestModuleXXX used configuration file(s) - -TestCaseFile= c:\testframework\ui_menusatinterfacetest.cfg - - -[End_Module] - - -# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -# Set STIFTestFramework logging overwrite parameters for Logger. -# Hardware and emulator environment logging path and styles can -# be configured from here to overwrite the Logger's implemented values. -# -# Settings description: -# - Indicates option for creation log directory/directories. If log directory/directories -# is/are not created by user they will make by software. -# + YES, Create log directory/directories if not allready exist. -# + NO, Log directory/directories not created. Only created one is used. -# -# - Overwrite emulator path setting. -# + Example: If 'EmulatorBasePath= C:\LOGS\TestFramework\' and in code is defined -# Logger's path 'D:\\LOGS\\Module\\' with those definition the path -# will be 'C:\LOGS\TestFramework\LOGS\Module\' -# -# - Overwrite emulator's logging format. -# + TXT, Log file(s) will be txt type(s), for example 'Module.txt'. -# + HTML, Log file(s) will be html type(s), for example 'Module.html'. -# -# - Overwrited emulator logging output source. -# + FILE, Logging to file(s). -# + RDEBUG, Logging to using rdebug(s). -# -# - Overwrite hardware path setting (Same description as above in emulator path). -# - Overwrite hardware's logging format(Same description as above in emulator format). -# - Overwrite hardware's logging output source(Same description as above in emulator output). -# -# - File Creation Mode indicates file overwriting if file exist. -# + OVERWRITE, Overwrites if file(s) exist. -# + APPEND, Continue logging after the old logging information if file(s) exist. -# -# - Will thread id include to the log filename. -# + YES, Thread id to log file(s) name, Example filename 'Module_b9.txt'. -# + NO, No thread id to log file(s), Example filename 'Module.txt'. -# -# - Will time stamps include the to log file. -# + YES, Time stamp added to each line in log file(s). Time stamp is -# for example'12.Nov.2003 115958 LOGGING INFO' -# + NO, No time stamp(s). -# -# - Will line breaks include to the log file. -# + YES, Each logging event includes line break and next log event is in own line. -# + NO, No line break(s). -# -# - Will event ranking include to the log file. -# + YES, Event ranking number added to each line in log file(s). Ranking number -# depends on environment's tics, for example(includes time stamp also) -# '012 12.Nov.2003 115958 LOGGING INFO' -# + NO, No event ranking. -# - -[Logger_Defaults] - -#NOTE: If you want to set Logger using next setting(s) remove comment(s)'#' - -#CreateLogDirectories= YES # Possible values: YES or NO - -#EmulatorBasePath= C:\LOGS\TestFramework\ -#EmulatorFormat= HTML # Possible values: TXT or HTML -#EmulatorOutput= FILE # Possible values: FILE or RDEBUG - -#HardwareBasePath= D:\LOGS\TestFramework\ -#HardwareFormat= HTML # Possible values: TXT or HTML -#HardwareOutput= FILE # Possible values: FILE or RDEBUG - -#FileCreationMode= OVERWRITE # Possible values: OVERWRITE or APPEND - -#ThreadIdToLogFile= YES # Possible values: YES or NO -#WithTimeStamp= YES # Possible values: YES or NO -#WithLineBreak= YES # Possible values: YES or NO -#WithEventRanking= YES # Possible values: YES or NO - -[End_Logger_Defaults] -# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - -# End of file \ No newline at end of file diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/menu_sat_interface_api/tsrc/src/menusatinterfacetest.cpp --- a/homescreensrv_plat/menu_sat_interface_api/tsrc/src/menusatinterfacetest.cpp Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,94 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ -// INCLUDE FILES -#include -#include -#include "menusatinterfacetest.h" - -//MCS -#include - -// CONSTANTS -_LIT( KSatName, "Plus Mega" ); - -// ============================ MEMBER FUNCTIONS =============================== - - -TInt CMenuSatInterfaceTest::Test_SatUiVisibleL(CStifItemParser& ) - { - TInt result (KErrGeneral); - - TBool visible = ETrue; - CMenuSATInterface* interface = new(ELeave) CMenuSATInterface(); - CleanupStack::PushL( interface ); - interface->MakeSatUiVisible( visible, KSatName ); - CleanupStack::PopAndDestroy( interface ); - - TBuf<256> name; - TInt error = RProperty::Get( KCRUidMenu, KMenuSatUIName, name ); - - if( name == KSatName() - && error == KErrNone ) - { - result = KErrNone; - } - return result; - } - -// --------------------------------------------------------------------------- -// -// --------------------------------------------------------------------------- -// -TInt CMenuSatInterfaceTest::Test_SatUiVisibleIconIdL(CStifItemParser& ) - { - TInt result (KErrGeneral); - - TBool visible = ETrue; - TUint8 iconInfoId = 21; - CMenuSATInterface* interface = new(ELeave) CMenuSATInterface(); - CleanupStack::PushL( interface ); - interface->MakeSatUiVisible( visible, KSatName, iconInfoId ); - CleanupStack::PopAndDestroy( interface ); - - TInt iconInfoIdTest = -1; - RProperty::Get( KCRUidMenu, KMenuSatUIIconId, iconInfoIdTest ); - - if( iconInfoIdTest == iconInfoId ) - { - result = KErrNone; - } - return result; - } - -// --------------------------------------------------------------------------- -// -// --------------------------------------------------------------------------- -// -TInt CMenuSatInterfaceTest::Test_SatInterfaceConstructL(CStifItemParser& ) - { - TInt result (KErrGeneral); - - CMenuSATInterface* interface = new(ELeave) CMenuSATInterface(); - if( interface ) - { - result = KErrNone; - } - return result; - } - - -// End of File diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/menu_sat_interface_api/tsrc/src/menusatinterfacetestblocks.cpp --- a/homescreensrv_plat/menu_sat_interface_api/tsrc/src/menusatinterfacetestblocks.cpp Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ -// INCLUDE FILES -#include -#include -#include -#include "menusatinterfacetest.h" - -// ============================ MEMBER FUNCTIONS =============================== - -// ----------------------------------------------------------------------------- -// CMenuSatInterfaceTest::RunMethodL -// Run specified method. Contains also table of test mothods and their names. -// ----------------------------------------------------------------------------- -// -TInt CMenuSatInterfaceTest::RunMethodL( - CStifItemParser& aItem ) - { - - static TStifFunctionInfo const KFunctions[] = - { - ENTRY( "Test_SatUiVisibleL", CMenuSatInterfaceTest::Test_SatUiVisibleL), - ENTRY( "Test_SatUiVisibleIconIdL", CMenuSatInterfaceTest::Test_SatUiVisibleIconIdL), - ENTRY( "Test_SatInterfaceConstructL", CMenuSatInterfaceTest::Test_SatInterfaceConstructL), - }; - - const TInt count = sizeof( KFunctions ) / - sizeof( TStifFunctionInfo ); - - return RunInternalL( KFunctions, count, aItem ); - - } - -// End of File diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/menu_sat_interface_api/tsrc/src/menusatinterfacetestutils.cpp --- a/homescreensrv_plat/menu_sat_interface_api/tsrc/src/menusatinterfacetestutils.cpp Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,124 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ -#include -#include -#include "menusatinterfacetest.h" -#include "waitactive.h" - -// ============================ MEMBER FUNCTIONS =============================== - -// ----------------------------------------------------------------------------- -// CClientServiceTester::CClientServiceTester -// C++ default constructor can NOT contain any code, that -// might leave. -// ----------------------------------------------------------------------------- -// - - -// ----------------------------------------------------------------------------- -// CClientServiceTester::NewL -// Two-phased constructor. -// ----------------------------------------------------------------------------- -// -CMenuSatInterfaceTest::CMenuSatInterfaceTest( - CTestModuleIf& aTestModuleIf ): - CScriptBase( aTestModuleIf ) - { - TestModuleIf().SetBehavior( CTestModuleIf::ETestLeaksMem ); - } - -// ----------------------------------------------------------------------------- -// CClientServiceTester::ConstructL -// Symbian 2nd phase constructor can leave. -// ----------------------------------------------------------------------------- -// -void CMenuSatInterfaceTest::ConstructL() - { - ///save preconditions - RProperty::Get( KCRUidMenu, KMenuSatUIIconId, iIconId ); - //save preconditions - } - -// ----------------------------------------------------------------------------- -// CClientServiceTester::NewL -// Two-phased constructor. -// ----------------------------------------------------------------------------- -// -CMenuSatInterfaceTest* CMenuSatInterfaceTest::NewL( - CTestModuleIf& aTestModuleIf ) - { - CMenuSatInterfaceTest* self = new (ELeave) CMenuSatInterfaceTest( aTestModuleIf ); - - CleanupStack::PushL( self ); - self->ConstructL(); - CleanupStack::Pop(); - - return self; - } - -// Destructor -CMenuSatInterfaceTest::~CMenuSatInterfaceTest() - { - ///load preconditions - RProperty::Set( KCRUidMenu, KMenuSatUIIconId, iIconId ); - //load preconditions - WaitL(20000); - } - -// ========================== OTHER EXPORTED FUNCTIONS ========================= - -// ----------------------------------------------------------------------------- -// LibEntryL is a polymorphic Dll entry point. -// Returns: CScriptBase: New CScriptBase derived object -// ----------------------------------------------------------------------------- -// -EXPORT_C CScriptBase* LibEntryL( - CTestModuleIf& aTestModuleIf ) // Backpointer to STIF Test Framework - { - - return ( CScriptBase* ) CMenuSatInterfaceTest::NewL( aTestModuleIf ); - - } - -// ----------------------------------------------------------------------------- -// E32Dll is a DLL entry point function. -// Returns: KErrNone -// ----------------------------------------------------------------------------- -// -#ifndef EKA2 // Hide Dll entry point to EKA2 -GLDEF_C TInt E32Dll( - TDllReason /*aReason*/) // Reason code - { - return(KErrNone); - - } -#endif // EKA2 - - -// --------------------------------------------------------------------------- -// -// --------------------------------------------------------------------------- -// - - -void CMenuSatInterfaceTest::WaitL(TInt aMicroSec) - { - CWaitActive* wait = CWaitActive::NewL(); - wait->Wait(aMicroSec); - delete wait; - } - diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/menu_sat_interface_api/tsrc/src/waitactive.cpp --- a/homescreensrv_plat/menu_sat_interface_api/tsrc/src/waitactive.cpp Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,91 +0,0 @@ -/* -* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -#include "waitactive.h" - -// ======== MEMBER FUNCTIONS ======== - - -void CWaitActive::ConstructL() - { - CTimer::ConstructL(); - iActiveScheduler = new ( ELeave ) CActiveSchedulerWait(); - } - - -CWaitActive* CWaitActive::NewL() - { - CWaitActive* self = new( ELeave ) CWaitActive; - CleanupStack::PushL( self ); - self->ConstructL(); - CleanupStack::Pop(); - return self; - } - -// ---------------------------------------------------------------------------- -// CIsvTelCallAppTelephony::CIsvTelCallAppTelephony() -// Default constructor. -// ---------------------------------------------------------------------------- -// -CWaitActive::CWaitActive() - :CTimer( EPriorityStandard ) - { - CActiveScheduler::Add( this ); - } - -// --------------------------------------------------------------------------- -// destructor -// --------------------------------------------------------------------------- -CWaitActive::~CWaitActive() - { - Cancel(); - delete iActiveScheduler; - } - -// --------------------------------------------------------------------------- -// destructor -// --------------------------------------------------------------------------- -void CWaitActive::Wait(TTimeIntervalMicroSeconds32 anInterval) - { - After(anInterval); - iActiveScheduler->Start(); - - } - - - -// ---------------------------------------------------------------------------- -// void CIsvTelCallAppTelephony::RunL() -// Handles the active object’s request completion event. -// ---------------------------------------------------------------------------- -// -void CWaitActive::CWaitActive::RunL() - { - // CActiveScheduler::Stop(); - iActiveScheduler->AsyncStop(); - - } - - - - - - - - - - diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/menu_sat_interface_api/tsrc/t_menu_sat_interface_api/inc/menusatinterfacetest.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreensrv_plat/menu_sat_interface_api/tsrc/t_menu_sat_interface_api/inc/menusatinterfacetest.h Tue Mar 23 23:28:12 2010 +0200 @@ -0,0 +1,66 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ +#ifndef MENU_SAT_INTERFACE_TEST_H +#define MENU_SAT_INTERFACE_TEST_H + +#include +#include +#include +#include "ca2internalCRkeys.h" + + +// CLASS DECLARATION + +/** +* CMenuSatInterfaceTest test class for STIF Test Framework TestScripter. +* Class for testing CMenuSATInterface. +* +* @lib ?library +* @since ?Series60_version +*/ +class CMenuSatInterfaceTest : public QObject + { + Q_OBJECT + public: // Constructors and destructor + CMenuSatInterfaceTest(); + virtual ~CMenuSatInterfaceTest(); + + private slots: // Functions from base classes + + /** + * Test methods are listed below. + */ + void Test_SatUiVisibleL(); + void Test_SatUiVisibleIconIdL(); + void Test_SatInterfaceConstructL(); + + /** + * Utility methods are listed below. + */ + void WaitL(TInt aMicroSec); + + private: // Data + /** + * Data tosave enviroment statebefore testing. + */ + TInt iIconId; + + }; + +#endif // TESTCLASS_H + +// End of File diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/menu_sat_interface_api/tsrc/t_menu_sat_interface_api/inc/waitactive.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreensrv_plat/menu_sat_interface_api/tsrc/t_menu_sat_interface_api/inc/waitactive.h Tue Mar 23 23:28:12 2010 +0200 @@ -0,0 +1,63 @@ +/* +* Copyright (c) 2006-2006 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Plugin Interface +* +*/ + + +#ifndef C_WAITACTIVE_H +#define C_WAITACTIVE_H + +#include + +/** + * Helper wait active class + */ + class CWaitActive : public CTimer + { + +public: + + + static CWaitActive* NewL( ); + + ~CWaitActive(); + + void Wait(TTimeIntervalMicroSeconds32 anInterval); + +protected: + + /** + * From CActive, RunL. + * Handles the active object’s request completion event + */ + void RunL(); + + +private: + + CWaitActive(); + + void ConstructL(); + +private: + + /* + * Own. + */ + CActiveSchedulerWait* iActiveScheduler; + }; + + +#endif // C_WAITACTIVE_H \ No newline at end of file diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/menu_sat_interface_api/tsrc/t_menu_sat_interface_api/src/menusatinterfacetest.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreensrv_plat/menu_sat_interface_api/tsrc/t_menu_sat_interface_api/src/menusatinterfacetest.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -0,0 +1,96 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ +// INCLUDE FILES +#include +#include "menusatinterfacetest.h" + + +// CONSTANTS +_LIT( KSatName, "Plus Mega" ); + +// ============================ MEMBER FUNCTIONS =============================== + + +void CMenuSatInterfaceTest::Test_SatUiVisibleL() + { + TInt result (KErrGeneral); + + TBool visible = ETrue; + TRAP(result, + CMenuSATInterface* interface = new(ELeave) CMenuSATInterface(); + CleanupStack::PushL( interface ); + + interface->MakeSatUiVisible( visible, KSatName ); + CleanupStack::PopAndDestroy( interface ); + ); + TBuf<256> name; + TInt error = RProperty::Get( KCRUidCa, KCaSatUIName, name ); + + if( name == KSatName() + && error == KErrNone ) + { + result = KErrNone; + } + QVERIFY(result == KErrNone); + } + +// --------------------------------------------------------------------------- +// +// --------------------------------------------------------------------------- +// +void CMenuSatInterfaceTest::Test_SatUiVisibleIconIdL() + { + TInt result (KErrGeneral); + + TBool visible = ETrue; + TUint8 iconInfoId = 21; + TRAP(result, + CMenuSATInterface* interface = new(ELeave) CMenuSATInterface(); + CleanupStack::PushL( interface ); + interface->MakeSatUiVisible( visible, KSatName, iconInfoId ); + CleanupStack::PopAndDestroy( interface ); + ); + TInt iconInfoIdTest = -1; + RProperty::Get( KCRUidCa, KCaSatUIIconId, iconInfoIdTest ); + + if( iconInfoIdTest == iconInfoId ) + { + result = KErrNone; + } + QVERIFY(result == KErrNone); + } + +// --------------------------------------------------------------------------- +// +// --------------------------------------------------------------------------- +// +void CMenuSatInterfaceTest::Test_SatInterfaceConstructL() + { + TInt result (KErrGeneral); + + TRAP(result, + CMenuSATInterface* interface = new(ELeave) CMenuSATInterface(); + if( interface ) + { + result = KErrNone; + } + ); + QVERIFY(result == KErrNone); + } + +QTEST_MAIN(CMenuSatInterfaceTest) +// End of File diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/menu_sat_interface_api/tsrc/t_menu_sat_interface_api/src/menusatinterfacetestutils.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreensrv_plat/menu_sat_interface_api/tsrc/t_menu_sat_interface_api/src/menusatinterfacetestutils.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -0,0 +1,59 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ +#include +#include "menusatinterfacetest.h" +#include "waitactive.h" + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// CClientServiceTester::CClientServiceTester +// C++ default constructor can NOT contain any code, that +// might leave. +// ----------------------------------------------------------------------------- +// + + +// ----------------------------------------------------------------------------- +// CClientServiceTester::NewL +// Two-phased constructor. +// ----------------------------------------------------------------------------- +// +CMenuSatInterfaceTest::CMenuSatInterfaceTest( ) + { + RProperty::Get( KCRUidCa, KCaSatUIIconId, iIconId ); + } + + +// Destructor +CMenuSatInterfaceTest::~CMenuSatInterfaceTest() + { + ///load preconditions + RProperty::Set( KCRUidCa, KCaSatUIIconId, iIconId ); + //load preconditions + WaitL(20000); + } + + + +void CMenuSatInterfaceTest::WaitL(TInt aMicroSec) + { + CWaitActive* wait = CWaitActive::NewL(); + wait->Wait(aMicroSec); + delete wait; + } + diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/menu_sat_interface_api/tsrc/t_menu_sat_interface_api/src/waitactive.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreensrv_plat/menu_sat_interface_api/tsrc/t_menu_sat_interface_api/src/waitactive.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -0,0 +1,91 @@ +/* +* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#include "waitactive.h" + +// ======== MEMBER FUNCTIONS ======== + + +void CWaitActive::ConstructL() + { + CTimer::ConstructL(); + iActiveScheduler = new ( ELeave ) CActiveSchedulerWait(); + } + + +CWaitActive* CWaitActive::NewL() + { + CWaitActive* self = new( ELeave ) CWaitActive; + CleanupStack::PushL( self ); + self->ConstructL(); + CleanupStack::Pop(); + return self; + } + +// ---------------------------------------------------------------------------- +// CIsvTelCallAppTelephony::CIsvTelCallAppTelephony() +// Default constructor. +// ---------------------------------------------------------------------------- +// +CWaitActive::CWaitActive() + :CTimer( EPriorityStandard ) + { + CActiveScheduler::Add( this ); + } + +// --------------------------------------------------------------------------- +// destructor +// --------------------------------------------------------------------------- +CWaitActive::~CWaitActive() + { + Cancel(); + delete iActiveScheduler; + } + +// --------------------------------------------------------------------------- +// destructor +// --------------------------------------------------------------------------- +void CWaitActive::Wait(TTimeIntervalMicroSeconds32 anInterval) + { + After(anInterval); + iActiveScheduler->Start(); + + } + + + +// ---------------------------------------------------------------------------- +// void CIsvTelCallAppTelephony::RunL() +// Handles the active object’s request completion event. +// ---------------------------------------------------------------------------- +// +void CWaitActive::CWaitActive::RunL() + { + // CActiveScheduler::Stop(); + iActiveScheduler->AsyncStop(); + + } + + + + + + + + + + diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/menu_sat_interface_api/tsrc/tsrc.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreensrv_plat/menu_sat_interface_api/tsrc/tsrc.pro Tue Mar 23 23:28:12 2010 +0200 @@ -0,0 +1,21 @@ +# +# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + +TEMPLATE = subdirs + +SUBDIRS = t_menu_sat_interface_api + +CONFIG += ordered diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/sapi_actionhandler/actionhandlerplugins/data/actionhandlerplugins.rss --- a/homescreensrv_plat/sapi_actionhandler/actionhandlerplugins/data/actionhandlerplugins.rss Tue Mar 23 23:17:02 2010 +0200 +++ b/homescreensrv_plat/sapi_actionhandler/actionhandlerplugins/data/actionhandlerplugins.rss Tue Mar 23 23:28:12 2010 +0200 @@ -16,7 +16,7 @@ */ -#include +#include #include "ahpluginuids.hrh" // --------------------------------------------------------------------------- diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/sapi_actionhandler/actionhandlerplugins/group/ahplugins.mmp --- a/homescreensrv_plat/sapi_actionhandler/actionhandlerplugins/group/ahplugins.mmp Tue Mar 23 23:17:02 2010 +0200 +++ b/homescreensrv_plat/sapi_actionhandler/actionhandlerplugins/group/ahplugins.mmp Tue Mar 23 23:28:12 2010 +0200 @@ -25,7 +25,7 @@ CAPABILITY CAP_ECOM_PLUGIN SOURCEPATH ../src -SOURCE proxy.cpp +SOURCE Proxy.cpp SOURCE ahpapplauncher.cpp SOURCE ahtelkeyhandler.cpp SOURCE ahhelplauncher.cpp diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/sapi_actionhandler/actionhandlerplugins/src/Proxy.cpp --- a/homescreensrv_plat/sapi_actionhandler/actionhandlerplugins/src/Proxy.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/homescreensrv_plat/sapi_actionhandler/actionhandlerplugins/src/Proxy.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -17,7 +17,7 @@ #include -#include +#include #include "ahpapplauncher.h" #include "ahtelkeyhandler.h" #include "ahhelplauncher.h" diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/sapi_actionhandler/actionhandlerplugins/src/ahhelplauncher.cpp --- a/homescreensrv_plat/sapi_actionhandler/actionhandlerplugins/src/ahhelplauncher.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/homescreensrv_plat/sapi_actionhandler/actionhandlerplugins/src/ahhelplauncher.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -17,8 +17,8 @@ #include -#include // help launcher -#include +#include // help launcher +#include #include "ahproperties.hrh" #include "ahhelplauncher.h" diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/sapi_actionhandler/actionhandlerplugins/src/ahpapplauncher.cpp --- a/homescreensrv_plat/sapi_actionhandler/actionhandlerplugins/src/ahpapplauncher.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/homescreensrv_plat/sapi_actionhandler/actionhandlerplugins/src/ahpapplauncher.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -19,10 +19,10 @@ #include #include #include -#include +#include #include -#include -#include +#include +#include #include "ahproperties.hrh" #include "ahpapplauncher.h" diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/sapi_actionhandler/actionhandlerplugins/src/ahtelkeyhandler.cpp --- a/homescreensrv_plat/sapi_actionhandler/actionhandlerplugins/src/ahtelkeyhandler.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/homescreensrv_plat/sapi_actionhandler/actionhandlerplugins/src/ahtelkeyhandler.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -18,7 +18,7 @@ #include // AIW #include //include\oem -#include +#include #include "ahtelkeyhandler.h" #include "ahproperties.hrh" diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/sapi_actionhandler/actionhandlerservice/data/actionhandlerservice.rss --- a/homescreensrv_plat/sapi_actionhandler/actionhandlerservice/data/actionhandlerservice.rss Tue Mar 23 23:17:02 2010 +0200 +++ b/homescreensrv_plat/sapi_actionhandler/actionhandlerservice/data/actionhandlerservice.rss Tue Mar 23 23:28:12 2010 +0200 @@ -17,7 +17,7 @@ #include -#include +#include RESOURCE REGISTRY_INFO theInfo { diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/sapi_actionhandler/actionhandlerservice/inc/actionhandlerinterface.h --- a/homescreensrv_plat/sapi_actionhandler/actionhandlerservice/inc/actionhandlerinterface.h Tue Mar 23 23:17:02 2010 +0200 +++ b/homescreensrv_plat/sapi_actionhandler/actionhandlerservice/inc/actionhandlerinterface.h Tue Mar 23 23:28:12 2010 +0200 @@ -19,7 +19,7 @@ #ifndef C_ACTIONHANDLERINTERFACE_H #define C_ACTIONHANDLERINTERFACE_H -#include +#include class CPluginValidator; class CLiwMap; diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/sapi_actionhandler/actionhandlerservice/inc/serviceerrno.h --- a/homescreensrv_plat/sapi_actionhandler/actionhandlerservice/inc/serviceerrno.h Tue Mar 23 23:17:02 2010 +0200 +++ b/homescreensrv_plat/sapi_actionhandler/actionhandlerservice/inc/serviceerrno.h Tue Mar 23 23:28:12 2010 +0200 @@ -13,7 +13,7 @@ * * Description: Top level service provider error codes. * %created_by: smatasah % - * %date_created: Fri Jan 22 17:24:14 2010 % + * %date_created: Wed Jan 27 16:21:04 2010 % * */ /********************************************************************** @@ -22,7 +22,7 @@ * Instance: bh1sapi_1 * Description: Top level service provider error codes. * %created_by: smatasah % - * %date_created: Fri Jan 22 17:24:14 2010 % + * %date_created: Wed Jan 27 16:21:04 2010 % * **********************************************************************/ #ifndef SERVICEERRNO_H diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/sapi_actionhandler/actionhandlerservice/src/actionhandlerservice.cpp --- a/homescreensrv_plat/sapi_actionhandler/actionhandlerservice/src/actionhandlerservice.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/homescreensrv_plat/sapi_actionhandler/actionhandlerservice/src/actionhandlerservice.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -16,9 +16,9 @@ */ -#include -#include -#include +#include +#include +#include #include "ahplugindefs.h" #include "actionhandlerservice.h" diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/sapi_contentpublishing/data/cpclient.rss --- a/homescreensrv_plat/sapi_contentpublishing/data/cpclient.rss Tue Mar 23 23:17:02 2010 +0200 +++ b/homescreensrv_plat/sapi_contentpublishing/data/cpclient.rss Tue Mar 23 23:28:12 2010 +0200 @@ -17,7 +17,7 @@ #include -#include +#include RESOURCE REGISTRY_INFO theInfo { diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/sapi_contentpublishing/inc/cdatasourceinterface.h --- a/homescreensrv_plat/sapi_contentpublishing/inc/cdatasourceinterface.h Tue Mar 23 23:17:02 2010 +0200 +++ b/homescreensrv_plat/sapi_contentpublishing/inc/cdatasourceinterface.h Tue Mar 23 23:28:12 2010 +0200 @@ -19,7 +19,7 @@ #ifndef CDATASOURCEINTERFACE_H #define CDATASOURCEINTERFACE_H -#include +#include class CCPClient; diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/sapi_contentpublishing/inc/cpclientiterable.h --- a/homescreensrv_plat/sapi_contentpublishing/inc/cpclientiterable.h Tue Mar 23 23:17:02 2010 +0200 +++ b/homescreensrv_plat/sapi_contentpublishing/inc/cpclientiterable.h Tue Mar 23 23:28:12 2010 +0200 @@ -19,7 +19,7 @@ #ifndef C_CPSERVERITERABLE_H #define C_CPSERVERITERABLE_H -#include +#include /** * Implemenation of abstract interface to iterate over data items diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/sapi_contentpublishing/inc/serviceerrno.h --- a/homescreensrv_plat/sapi_contentpublishing/inc/serviceerrno.h Tue Mar 23 23:17:02 2010 +0200 +++ b/homescreensrv_plat/sapi_contentpublishing/inc/serviceerrno.h Tue Mar 23 23:28:12 2010 +0200 @@ -13,7 +13,7 @@ * * Description: Top level service provider error codes. * %created_by: smatasah % -* %date_created: Fri Jan 22 17:25:13 2010 % +* %date_created: Wed Jan 27 16:22:10 2010 % * */ /********************************************************************** @@ -22,7 +22,7 @@ * Instance: bh1sapi_1 * Description: Top level service provider error codes. * %created_by: smatasah % -* %date_created: Fri Jan 22 17:25:13 2010 % +* %date_created: Wed Jan 27 16:22:10 2010 % * **********************************************************************/ #ifndef SERVICEERRNO_H diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/sapi_contentpublishing/src/cpclient.cpp --- a/homescreensrv_plat/sapi_contentpublishing/src/cpclient.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/homescreensrv_plat/sapi_contentpublishing/src/cpclient.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -16,7 +16,7 @@ */ -#include +#include #include "cpliwmap.h" #include "cpclient.h" diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/sapi_contentpublishing/src/cpclientactivenotifier.cpp --- a/homescreensrv_plat/sapi_contentpublishing/src/cpclientactivenotifier.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/homescreensrv_plat/sapi_contentpublishing/src/cpclientactivenotifier.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -16,8 +16,8 @@ */ -#include -#include +#include +#include #include "cpclientactivenotifier.h" #include "ccontentmap.h" #include "cpdebug.h" diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/sapi_contentpublishing/src/cpclientiterable.cpp --- a/homescreensrv_plat/sapi_contentpublishing/src/cpclientiterable.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/homescreensrv_plat/sapi_contentpublishing/src/cpclientiterable.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -15,7 +15,7 @@ * */ -#include +#include #include "cpclientiterable.h" #include "cpglobals.h" diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/sapi_contentpublishing/src/cpclientservice.cpp --- a/homescreensrv_plat/sapi_contentpublishing/src/cpclientservice.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/homescreensrv_plat/sapi_contentpublishing/src/cpclientservice.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -16,9 +16,9 @@ */ -#include -#include -#include +#include +#include +#include #include "cpclientservice.h" #include "cpdebug.h" diff -r 7feec50967db -r e492551a0d54 homescreensrv_plat/sapi_contentpublishing/src/cpclientsession.cpp --- a/homescreensrv_plat/sapi_contentpublishing/src/cpclientsession.cpp Tue Mar 23 23:17:02 2010 +0200 +++ b/homescreensrv_plat/sapi_contentpublishing/src/cpclientsession.cpp Tue Mar 23 23:28:12 2010 +0200 @@ -16,8 +16,8 @@ */ -#include -#include +#include +#include #include "cpserverdef.h" #include "cpliwmap.h" diff -r 7feec50967db -r e492551a0d54 hswidgetmodel/examples/helloworldwidgetprovider/helloworldwidget/inc/helloworldwidget.h --- a/hswidgetmodel/examples/helloworldwidgetprovider/helloworldwidget/inc/helloworldwidget.h Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Example of home screen widget -* -*/ - -#ifndef HELLOWORLDWIDGET_H -#define HELLOWORLDWIDGET_H - -#include - -class QPushButton; - -class HelloWorldWidget : public HsWidget -{ - Q_OBJECT - -public: - HelloWorldWidget(QGraphicsItem *parent = 0, Qt::WindowFlags flags = 0); - ~HelloWorldWidget(); - -public: - QRectF boundingRect() const; - QPainterPath shape() const; - -protected: - StartResult onStart(); - StopResult onStop(); - SuspendResult onSuspend(); - ResumeResult onResume(); - -private: - Q_DISABLE_COPY(HelloWorldWidget) - QPushButton *mButton; -}; - - -#endif // HELLOWORLDWIDGET_H diff -r 7feec50967db -r e492551a0d54 hswidgetmodel/examples/helloworldwidgetprovider/helloworldwidget/src/helloworldwidget.cpp --- a/hswidgetmodel/examples/helloworldwidgetprovider/helloworldwidget/src/helloworldwidget.cpp Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,158 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Example of home screen widget -* -*/ - - -#include -#include -#include "helloworldwidget.h" - -/*! - - -@page page_developing_home_screen_widget Creating Home Screen Widget - -Since the home screen widget concept is still open, these APIs may still be subject to changes and additions. - -Creating a home screen widget includes the following three steps: - -
    -
  • @ref page_developing_home_screen_widget
    • -
  • @ref page_creating_widget_provider
    • -
  • @ref page_deploying_widget_provider
    • -
- -Each home screen widget is inherited from HsWidget base class and HsWidget itself inherits HbWidget. -Usually you need to re-implement \c paint, \c boundingRect and \c shape functions from QGraphicsWidget -and HsWidget::onStart, HsWidget::onStop, HsWidget::onSuspend, HsWidget::onResume functions -from HsWidget. - -Instructions how to add widget to provider plugin can be found from @ref page_creating_widget_provider. - -See @ref section_widget_state_machine for widget life cycle in detail. - -The steps to create a widget are: -
    -
  1. Declare a widget class that inherits from \c HsWidget. - -
  2. Implement constructor for the class where needed children are created. - -
  3. Implement destructor. - -
  4. Implement HsWidget::onStart() function. This is called by widget runtime to start the widget. - -
  5. Implement HsWidget::onStop() function. When called widget should stop all the processing started in \c onStart() function. - -
  6. Implement HsWidget::onSuspend() if needed. - -
  7. Implement HsWidget::onResume() if needed. - -
- -Example of the home screen widget is HelloWorldWidget. - - -@section section_widget_resources Widget resources - -Currently widgets are lacking of a unified way to handle widget resources. -This functionality will be added in the near future. Meanwhile we recommend using compiled-in resources. -How to do it is explained here. - -*/ - -/*! - - \ingroup group_helloworld_widget - \class HelloWorldWidget - \brief Example implementation for home screen widget. - - HelloWorldWidget derived from the HsWidget and implements - needed functions for the home screen widget. - - - -*/ - - -/*! - Constructs a widget which is a child of \a parent, with widget flags set to \a flags. -*/ -HelloWorldWidget::HelloWorldWidget(QGraphicsItem* parent, Qt::WindowFlags flags) - : HsWidget(parent, flags), - mButton(0) -{ - QGraphicsProxyWidget *proxy = new QGraphicsProxyWidget(this); - mButton = new QPushButton("Hello World"); - proxy->setWidget(mButton); -} - -/*! - Destructor -*/ -HelloWorldWidget::~HelloWorldWidget() -{ - -} - -/*! - Return bounding rect -*/ -QRectF HelloWorldWidget::boundingRect() const -{ - return childrenBoundingRect(); -} - -/*! - Return shape -*/ -QPainterPath HelloWorldWidget::shape() const -{ - QPainterPath path; - path.addRect(boundingRect()); - return path; -} - -/*! - Widget runtime starts widget -*/ -HsWidget::StartResult HelloWorldWidget::onStart() -{ - return StartResultRunning; -} - -/*! - Widget runtime stops widget -*/ -HsWidget::StopResult HelloWorldWidget::onStop() -{ - return StopResultFinished; -} - -/*! - Widget runtime suspends widget -*/ -HsWidget::SuspendResult HelloWorldWidget::onSuspend() -{ - return SuspendResultSuspended; -} - -/*! - Widget runtime resumes widget -*/ -HsWidget::ResumeResult HelloWorldWidget::onResume() -{ - return ResumeResultRunning; -} diff -r 7feec50967db -r e492551a0d54 hswidgetmodel/examples/helloworldwidgetprovider/helloworldwidgetprovider.pro --- a/hswidgetmodel/examples/helloworldwidgetprovider/helloworldwidgetprovider.pro Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,72 +0,0 @@ -# -# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -# All rights reserved. -# This component and the accompanying materials are made available -# under the terms of "Eclipse Public License v1.0" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: Example of home screen widget -# - -TEMPLATE = lib - -CONFIG += plugin hb - -CONFIG(debug, debug|release) { - DESTDIR = debug - LIBS += -L../../../../bin/debug -} -else { - DESTDIR = release - LIBS += -L../../../../bin/release -} - -LIBS += -lhswidgetmodel - -HEADERS += ./inc/*.h \ - ./helloworldwidget/inc/*.h - -SOURCES += ./src/*.cpp \ - ./helloworldwidget/src/*.cpp - -DEPENDPATH += ./inc \ - ./src - -INCLUDEPATH += ./inc \ - ./helloworldwidget/inc - - -symbian: { - INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE - - # get your own symbian uid - TARGET.UID3 = 0xEABCFE12 - TARGET.EPOCALLOWDLLDATA=1 - TARGET.CAPABILITY = ALL -TCB - - # add your symbian uid here - PLUGIN_SUBDIR = /private/20022F35/import/widgetregistry/EABCFE12 - - pluginstub.sources = $${TARGET}.dll - pluginstub.path = $$PLUGIN_SUBDIR - - DEPLOYMENT += pluginstub - - qtplugins.path = $$PLUGIN_SUBDIR - qtplugins.sources += qmakepluginstubs/$${TARGET}.qtplugin - qtplugins.sources += resource/$${TARGET}.manifest - qtplugins.sources += resource/$${TARGET}.png - - for(qtplugin, qtplugins.sources):BLD_INF_RULES.prj_exports += "./$$qtplugin z:$$qtplugins.path/$$basename(qtplugin)" -} - -win32 { - # add platfrom API for windows - INCLUDEPATH += ../../../homescreensrv_plat/hswidgetmodel_api -} \ No newline at end of file diff -r 7feec50967db -r e492551a0d54 hswidgetmodel/examples/helloworldwidgetprovider/inc/helloworldwidgetprovider.h --- a/hswidgetmodel/examples/helloworldwidgetprovider/inc/helloworldwidgetprovider.h Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Example of home screen widget -* -*/ - -#ifndef HELLOWORLDWIDGETPROVIDER_H -#define HELLOWORLDWIDGETPROVIDER_H - - -#include - -class HsWidget; - -class HelloWorldWidgetProvider : public QObject, public IHsWidgetProvider -{ - Q_OBJECT - Q_INTERFACES(IHsWidgetProvider) - -public: - HelloWorldWidgetProvider(); - virtual ~HelloWorldWidgetProvider(); - -public: - QList widgets(); - HsWidget* createWidget(const HsWidgetToken& token); - -private: - HsWidgetToken mWidgetToken; -}; - -#endif // HELLOWORLDWIDGETPROVIDER_H diff -r 7feec50967db -r e492551a0d54 hswidgetmodel/examples/helloworldwidgetprovider/resource/helloworldwidgetprovider.manifest --- a/hswidgetmodel/examples/helloworldwidgetprovider/resource/helloworldwidgetprovider.manifest Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ - - - - diff -r 7feec50967db -r e492551a0d54 hswidgetmodel/examples/helloworldwidgetprovider/resource/helloworldwidgetprovider.png Binary file hswidgetmodel/examples/helloworldwidgetprovider/resource/helloworldwidgetprovider.png has changed diff -r 7feec50967db -r e492551a0d54 hswidgetmodel/examples/helloworldwidgetprovider/sis/helloworldwidgetprovider.pkg --- a/hswidgetmodel/examples/helloworldwidgetprovider/sis/helloworldwidgetprovider.pkg Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -; -; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -; All rights reserved. -; This component and the accompanying materials are made available -; under the terms of "Eclipse Public License v1.0" -; which accompanies this distribution, and is available -; at the URL "http://www.eclipse.org/legal/epl-v10.html". -; -; Initial Contributors: -; Nokia Corporation - initial contribution. -; -; Contributors: -; -; Description: -; - -; Language -&EN - -; SIS header: name, uid, version -#{"helloworldwidgetprovider"},(0xEABCFE12),1,0,0 - -; Localised Vendor name -%{"Vendor"} - -; Unique Vendor name -:"Vendor" - -; Manual PKG pre-rules from PRO files -; Default HW/platform dependencies -[0x101F7961],0,0,0,{"S60ProductID"} -[0x102032BE],0,0,0,{"S60ProductID"} -[0x102752AE],0,0,0,{"S60ProductID"} -[0x1028315F],0,0,0,{"S60ProductID"} - -"/epoc32/release/armv5/urel/helloworldwidgetprovider.dll" - "c:/sys/bin/helloworldwidgetprovider.dll" -"/epoc32/data/z/private/20022F35/import/widgetregistry/EABCFE12/helloworldwidgetprovider.qtplugin" - "c:/private/20022F35/import/widgetregistry/EABCFE12/helloworldwidgetprovider.qtplugin" -"/epoc32/data/z/private/20022F35/import/widgetregistry/EABCFE12/helloworldwidgetprovider.manifest" - "c:/private/20022F35/import/widgetregistry/EABCFE12/helloworldwidgetprovider.manifest" -"/epoc32/data/z/private/20022F35/import/widgetregistry/EABCFE12/helloworldwidgetprovider.png" - "c:/private/20022F35/import/widgetregistry/EABCFE12/helloworldwidgetprovider.png" diff -r 7feec50967db -r e492551a0d54 hswidgetmodel/examples/helloworldwidgetprovider/src/helloworldwidgetprovider.cpp --- a/hswidgetmodel/examples/helloworldwidgetprovider/src/helloworldwidgetprovider.cpp Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,167 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Example of home screen widget -* -*/ - -#include - -#include "helloworldwidgetprovider.h" -#include "helloworldwidget.h" - - -/*! - \ingroup group_helloworld_widget - \class HelloWorldWidgetProvider - \brief Example implementation for home screen widget provider. - - @page page_creating_widget_provider Creating Home Screen Widget Provider - - Widgets are exposed to the home screen through widget provider plugins. - A widget can be added to an existing provider or new one can be created. - Widget provider plugins are implemented according to - the Qt plugin model. - - See @ref page_developing_home_screen_widget for the instructions how to create widget for the home screen. - - The steps to create a widget provider are: -
    -
  1. Declare a plugin class that inherits from QObject and from the \c IHsWidgetProvider interface. - -
  2. Use the Q_INTERFACES() macro to tell Qt's meta-object system about the \c IHsWidgetProvider interface. - -
  3. Export the plugin using the Q_EXPORT_PLUGIN2() macro. - -
  4. Build the plugin using an suitable .pro file. See @ref page_deploying_widget_provider. -
- - An example (full example source code can be found from section @ref page_developing_home_screen_widget): - - -Each widget provider plugin has a manifest file that allows searching widgets from the plugin without first loading it. -The manifest file contains information on widgets inside the plugin: - -\li \c library The name of the provider plugin binary. -\li \c uri Uniquely identifies the widget. -\li \c title Widget's human-readable name. -\li \c iconuri URI of the widget's icon image file. - -Example: Manifest for a widget provider. - -@code - - - - -@endcode - - -@page page_deploying_widget_provider Deploying Home Screen Widget Provider - -Widget's binaries and manifest file(s) must be deployed to correct folders on emulator and in target. -Below are the needed .pro file for the \c helloworldwidgetprovider. - -For example: -@code -# helloworldwidgetprovider.pro - -TEMPLATE = lib - -CONFIG += plugin hb -LIBS += -lhswidgetmodel - -HEADERS += ./inc/ *.h \ - ./helloworldwidget/inc/ *.h - -SOURCES += ./src/ *.cpp \ - ./helloworldwidget/src/ *.cpp - -DEPENDPATH += ./inc \ - ./src - -symbian: { - INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE - - # get your own symbian uid - TARGET.UID3 = 0xEABCFE12 - TARGET.EPOCALLOWDLLDATA=1 - TARGET.CAPABILITY = ALL -TCB - - # add your symbian uid here - PLUGIN_SUBDIR = /private/20022F35/import/widgetregistry/EABCFE12 - - pluginstub.sources = $${TARGET}.dll - pluginstub.path = $$PLUGIN_SUBDIR - - DEPLOYMENT += pluginstub - - qtplugins.path = $$PLUGIN_SUBDIR - qtplugins.sources += qmakepluginstubs/$${TARGET}.qtplugin - qtplugins.sources += resource/$${TARGET}.manifest - qtplugins.sources += resource/$${TARGET}.png - - for(qtplugin, qtplugins.sources):BLD_INF_RULES.prj_exports += "./$$qtplugin z:$$qtplugins.path/$$basename(qtplugin)" -} - -@endcode - -For detailed information on DEPLOYMENT macro, see here. - -*/ - - -/*! - Initialize token for hello world widget. Contains necessary information about - the hello world widget that can be loaded with this provider. -*/ -HelloWorldWidgetProvider::HelloWorldWidgetProvider() -{ - mWidgetToken.mLibrary = QString("helloworldwidgetprovider.dll"); - mWidgetToken.mUri = QString("homescreen.nokia.com/widget/helloworld"); - mWidgetToken.mTitle = QString("HelloWorld"); - mWidgetToken.mIconUri = QString("helloworldwidgetprovider.png"); -} - -/*! - Destructor -*/ -HelloWorldWidgetProvider::~HelloWorldWidgetProvider() -{ - -} - -/*! - Returns list of loadable widgets' tokens. -*/ -QList HelloWorldWidgetProvider::widgets() -{ - return QList() << mWidgetToken; -} - -/*! - Create widget based on uri \a token -*/ -HsWidget* HelloWorldWidgetProvider::createWidget(const HsWidgetToken& token) -{ - HsWidget *widget = 0; - if (token.mUri == mWidgetToken.mUri) { - widget = new HelloWorldWidget(); - } - return widget; -} - -Q_EXPORT_PLUGIN2(helloworldwidgetprovider, HelloWorldWidgetProvider) diff -r 7feec50967db -r e492551a0d54 rom/homescreensrv_language.iby --- a/rom/homescreensrv_language.iby Tue Mar 23 23:17:02 2010 +0200 +++ b/rom/homescreensrv_language.iby Tue Mar 23 23:28:12 2010 +0200 @@ -17,8 +17,8 @@ #ifndef __HOMESCREENSRV_LANGUAGE_IBY__ #define __HOMESCREENSRV_LANGUAGE_IBY__ -data=\epoc32\data\z\resource\Contentstorage_texmap_pl_PL.qm resource\Contentstorage_texmap_pl_PL.qm -data=\epoc32\data\z\resource\Contentstorage_texmap_fr_FR.qm resource\Contentstorage_texmap_fr_FR.qm -data=\epoc32\data\z\resource\Contentstorage_texmap_en_GB.qm resource\Contentstorage_texmap_en_GB.qm +#include + +data=DATAZ_\resource\qt\translations\contentstorage.qm resource\qt\translations\contentstorage.qm #endif // __HOMESCREENSRV_LANGUAGE_IBY__ diff -r 7feec50967db -r e492551a0d54 sis/homescreensrv.pkg --- a/sis/homescreensrv.pkg Tue Mar 23 23:17:02 2010 +0200 +++ b/sis/homescreensrv.pkg Tue Mar 23 23:28:12 2010 +0200 @@ -111,9 +111,7 @@ ; ---- db localizations ------------------------------------------ -"/epoc32/data/z/resource/Contentstorage_texmap_pl_PL.qm" - "c:/resource/Contentstorage_texmap_pl_PL.qm" -"/epoc32/data/z/resource/Contentstorage_texmap_fr_FR.qm " - "c:/resource/Contentstorage_texmap_fr_FR.qm" -"/epoc32/data/z/resource/Contentstorage_texmap_en_GB.qm" - "c:/resource/Contentstorage_texmap_en_GB.qm" +"/epoc32/data/z/resource/qt/translations/contentstorage.qm" - "c:/resource/qt/translations/contentstorage.qm" ; ---- contentstorage -------------------------------------------- diff -r 7feec50967db -r e492551a0d54 sis/homescreensrv_ut_applib.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sis/homescreensrv_ut_applib.pkg Tue Mar 23 23:28:12 2010 +0200 @@ -0,0 +1,34 @@ +; +; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +; All rights reserved. +; This component and the accompanying materials are made available +; under the terms of "Eclipse Public License v1.0" +; which accompanies this distribution, and is available +; at the URL "http://www.eclipse.org/legal/epl-v10.html". +; +; Initial Contributors: +; Nokia Corporation - initial contribution. +; +; Contributors: +; +; Description: +; + +; Language +&EN + +; SIS header: name, uid, version +#{"hssrv ut applib"},(0xEAEAEA01),1,0,0 + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +; Supports S60 5th Edition +[0x1028315F], 0, 0, 0, {"S60ProductID"} + +;--------------- contentstorage --------------- + + diff -r 7feec50967db -r e492551a0d54 sis/homescreensrv_ut_applib_sisx.bat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sis/homescreensrv_ut_applib_sisx.bat Tue Mar 23 23:28:12 2010 +0200 @@ -0,0 +1,30 @@ +@rem +@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +@rem All rights reserved. +@rem This component and the accompanying materials are made available +@rem under the terms of "Eclipse Public License v1.0" +@rem which accompanies this distribution, and is available +@rem at the URL "http://www.eclipse.org/legal/epl-v10.html". +@rem +@rem Initial Contributors: +@rem Nokia Corporation - initial contribution. +@rem +@rem Contributors: +@rem +@rem Description: +@rem +@echo off + +if exist homescreensrv_ut_applib.sisx del homescreensrv_ut_applib.sisx + +makesis homescreensrv_ut_applib.pkg +signsis homescreensrv_ut_applib.sis homescreensrv_ut_applib.sisx rd.cer rd-key.pem + +if exist homescreensrv_ut_applib.sisx ( +echo homescreensrv_ut_applib.sisx creation SUCCEEDED +del homescreensrv_ut_applib.sis +) + +if not exist homescreensrv_ut_applib.sisx ( +echo homescreensrv_ut_applib.sisx creation FAILED +) \ No newline at end of file diff -r 7feec50967db -r e492551a0d54 sis/homescreensrv_ut_hs.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sis/homescreensrv_ut_hs.pkg Tue Mar 23 23:28:12 2010 +0200 @@ -0,0 +1,82 @@ +; +; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +; All rights reserved. +; This component and the accompanying materials are made available +; under the terms of "Eclipse Public License v1.0" +; which accompanies this distribution, and is available +; at the URL "http://www.eclipse.org/legal/epl-v10.html". +; +; Initial Contributors: +; Nokia Corporation - initial contribution. +; +; Contributors: +; +; Description: +; + +; Language +&EN + +; SIS heade name, uid, version +#{"hssrv ut hs"},(0x20022F67),1,0,0 + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +; Supports S60 5th Edition +[0x1028315F], 0, 0, 0, {"S60ProductID"} + +;--------------- appfoundation --------------- + +;servicemodel: +"/epoc32/release/armv5/urel/t_hsservicemodelexe.exe" - "c:/sys/bin/t_hsservicemodelexe.exe" +"/epoc32/data/z/private/10003a3f/import/apps/t_hsservicemodelexe_reg.rsc" - "c:/private/10003a3f/import/apps/t_hsservicemodelexe_reg.rsc" +"/epoc32/data/z/resource/apps/t_hsservicemodelexe.rsc" - "c:/resource/apps/t_hsservicemodelexe.rsc" +"/epoc32/release/armv5/urel/testserviceprovider.dll" - "c:/sys/bin/testserviceprovider.dll" +"/epoc32/data/z/hsresources/testresources/hsresources/plugins/serviceproviders/testserviceprovider.qtplugin" - "c:/hsresources/testresources/hsresources/plugins/serviceproviders/testserviceprovider.qtplugin" +"/epoc32/data/z/hsresources/testresources/hsresources/plugins/serviceproviders/test1serviceprovider.manifest" - "c:/hsresources/testresources/hsresources/plugins/serviceproviders/test1serviceprovider.manifest" +"/epoc32/data/z/hsresources/testresources/hsresources/plugins/serviceproviders/test2serviceprovider.manifest" - "c:/hsresources/testresources/hsresources/plugins/serviceproviders/test2serviceprovider.manifest" +"../appfoundation/servicemodel/tsrc/t_hsservicemodelexe/invalidservice.manifest" - "c:/hsresources/testresources/invalidservice.manifest" +"../appfoundation/servicemodel/tsrc/t_hsservicemodelexe/notwellformedservice.manifest" - "c:/hsresources/testresources/notwellformedservice.manifest" +"../appfoundation/servicemodel/tsrc/t_hsservicemodelexe/validservice.manifest" - "c:/hsresources/testresources/validservice.manifest" +"../appfoundation/servicemodel/tsrc/t_hsservicemodelexe/validservice2.manifest" - "c:/hsresources/testresources/validservice2.manifest" + +;statemodel: +"/epoc32/release/armv5/urel/t_hsstatemodelexe.exe" - "c:/sys/bin/t_hsstatemodelexe.exe" +"/epoc32/data/z/private/10003a3f/import/apps/t_hsstatemodelexe_reg.rsc" - "c:/private/10003a3f/import/apps/t_hsstatemodelexe_reg.rsc" +"/epoc32/data/z/resource/apps/t_hsstatemodelexe.rsc" - "c:/resource/apps/t_hsstatemodelexe.rsc" +"/epoc32/release/armv5/urel/teststateprovider.dll" - "c:/sys/bin/teststateprovider.dll" +"/epoc32/data/z/hsresources/testresources/plugins/stateproviders/teststateprovider.qtplugin" - "c:/hsresources/testresources/plugins/stateproviders/teststateprovider.qtplugin" +"/epoc32/data/z/hsresources/testresources/plugins/stateproviders/teststateprovider.manifest" - "c:/hsresources/testresources/plugins/stateproviders/teststateprovider.manifest" +"../appfoundation/statemodel/tsrc/t_hsstatemodelexe/invalidstate.manifest" - "c:/hsresources/testresources/invalidstate.manifest" +"../appfoundation/statemodel/tsrc/t_hsstatemodelexe/notwellformedstate.manifest" - "c:/hsresources/testresources/notwellformedstate.manifest" +"../appfoundation/statemodel/tsrc/t_hsstatemodelexe/validstate2.manifest" - "c:/hsresources/testresources/validstate2.manifest" +"../appfoundation/statemodel/tsrc/t_hsstatemodelexe/validstate.manifest" - "c:/hsresources/testresources/validstate.manifest" + +;appruntimemodel: +"/epoc32/release/armv5/urel/t_hsruntimemodelexe.exe" - "c:/sys/bin/t_hsruntimemodelexe.exe" +"/epoc32/data/z/private/10003a3f/import/apps/t_hsruntimemodelexe_reg.rsc" - "c:/private/10003a3f/import/apps/t_hsruntimemodelexe_reg.rsc" +"/epoc32/data/z/resource/apps/t_hsruntimemodelexe.rsc" - "c:/resource/apps/t_hsruntimemodelexe.rsc" +"/epoc32/release/armv5/urel/testruntimeprovider.dll" - "c:/sys/bin/testruntimeprovider.dll" +"/epoc32/data/z/hsresources/testresources/plugins/runtimeproviders/testruntimeprovider.qtplugin" - "c:/hsresources/testresources/plugins/runtimeproviders/testruntimeprovider.qtplugin" +"/epoc32/data/z/hsresources/testresources/plugins/runtimeproviders/testruntimeprovider.manifest" - "c:/hsresources/testresources/plugins/runtimeproviders/testruntimeprovider.manifest" +"../appfoundation/appruntimemodel/tsrc/t_hsruntimemodelexe/invalidruntime.manifest" - "c:/hsresources/testresources/invalidruntime.manifest" +"../appfoundation/appruntimemodel/tsrc/t_hsruntimemodelexe/notwellformedruntime.manifest" - "c:/hsresources/testresources/notwellformedruntime.manifest" +"../appfoundation/appruntimemodel/tsrc/t_hsruntimemodelexe/validruntime2.manifest" - "c:/hsresources/testresources/validruntime2.manifest" +"../appfoundation/appruntimemodel/tsrc/t_hsruntimemodelexe/validruntime.manifest" - "c:/hsresources/testresources/validruntime.manifest" + +;--------------- hswidgetmodel --------------- + +"/epoc32/release/armv5/urel/t_hswidgetmodelexe.exe" - "c:/sys/bin/t_hswidgetmodelexe.exe" +"/epoc32/data/z/private/10003a3f/import/apps/t_hswidgetmodelexe_reg.rsc" - "c:/private/10003a3f/import/apps/t_hswidgetmodelexe_reg.rsc" +"/epoc32/data/z/resource/apps/t_hswidgetmodelexe.rsc" - "c:/resource/apps/t_hswidgetmodelexe.rsc" +"/epoc32/release/armv5/urel/testwidgetprovider.dll" - "c:/sys/bin/testwidgetprovider.dll" +"/epoc32/data/z/hsresources/testresources/plugins/widgetproviders/testwidgetprovider.qtplugin" - "c:/hsresources/testresources/plugins/widgetproviders/testwidgetprovider.qtplugin" +"/epoc32/data/z/hsresources/testresources/plugins/widgetproviders/testwidgetprovider.manifest" - "c:/hsresources/testresources/plugins/widgetproviders/testwidgetprovider.manifest" +"../hswidgetmodel/tsrc/t_hswidgetmodelexe/invalidwidget.manifest" - "c:/hsresources/testresources/invalidwidget.manifest" +"../hswidgetmodel/tsrc/t_hswidgetmodelexe/notwellformedwidget.manifest" - "c:/hsresources/testresources/notwellformedwidget.manifest" +"../hswidgetmodel/tsrc/t_hswidgetmodelexe/validwidget2.manifest" - "c:/hsresources/testresources/validwidget2.manifest" +"../hswidgetmodel/tsrc/t_hswidgetmodelexe/validwidget.manifest" - "c:/hsresources/testresources/validwidget.manifest" diff -r 7feec50967db -r e492551a0d54 sis/homescreensrv_ut_hs_sisx.bat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sis/homescreensrv_ut_hs_sisx.bat Tue Mar 23 23:28:12 2010 +0200 @@ -0,0 +1,30 @@ +@rem +@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +@rem All rights reserved. +@rem This component and the accompanying materials are made available +@rem under the terms of "Eclipse Public License v1.0" +@rem which accompanies this distribution, and is available +@rem at the URL "http://www.eclipse.org/legal/epl-v10.html". +@rem +@rem Initial Contributors: +@rem Nokia Corporation - initial contribution. +@rem +@rem Contributors: +@rem +@rem Description: +@rem +@echo off + +if exist homescreensrv_ut_hs.sisx del homescreensrv_ut_hs.sisx + +makesis homescreensrv_ut_hs.pkg +signsis homescreensrv_ut_hs.sis homescreensrv_ut_hs.sisx rd.cer rd-key.pem + +if exist homescreensrv_ut_hs.sisx ( +echo homescreensrv_ut_hs.sisx creation SUCCEEDED +del homescreensrv_ut_hs.sis +) + +if not exist homescreensrv_ut_hs.sisx ( +echo homescreensrv_ut_hs.sisx creation FAILED +) \ No newline at end of file diff -r 7feec50967db -r e492551a0d54 sis/homescreensrv_ut_krakow.pkg --- a/sis/homescreensrv_ut_krakow.pkg Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ -; -; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -; All rights reserved. -; This component and the accompanying materials are made available -; under the terms of "Eclipse Public License v1.0" -; which accompanies this distribution, and is available -; at the URL "http://www.eclipse.org/legal/epl-v10.html". -; -; Initial Contributors: -; Nokia Corporation - initial contribution. -; -; Contributors: -; -; Description: -; - -; Language -&EN - -; SIS header: name, uid, version -#{"hssrv ut krakow"},(0xEAEAEA01),1,0,0 - -; Localised Vendor name -%{"Nokia"} - -; Unique Vendor name -:"Nokia" - -; Supports S60 5th Edition -[0x1028315F], 0, 0, 0, {"S60ProductID"} - -;--------------- contentstorage --------------- - - diff -r 7feec50967db -r e492551a0d54 sis/homescreensrv_ut_krakow_sisx.bat --- a/sis/homescreensrv_ut_krakow_sisx.bat Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -@rem -@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -@rem All rights reserved. -@rem This component and the accompanying materials are made available -@rem under the terms of "Eclipse Public License v1.0" -@rem which accompanies this distribution, and is available -@rem at the URL "http://www.eclipse.org/legal/epl-v10.html". -@rem -@rem Initial Contributors: -@rem Nokia Corporation - initial contribution. -@rem -@rem Contributors: -@rem -@rem Description: -@rem -@echo off - -if exist homescreensrv_ut_krakow.sisx del homescreensrv_ut_krakow.sisx - -makesis homescreensrv_ut_krakow.pkg -signsis homescreensrv_ut_krakow.sis homescreensrv_ut_krakow.sisx rd.cer rd-key.pem - -if exist homescreensrv_ut_krakow.sisx ( -echo homescreensrv_ut_krakow.sisx creation SUCCEEDED -del homescreensrv_ut_krakow.sis -) - -if not exist homescreensrv_ut_krakow.sisx ( -echo homescreensrv_ut_krakow.sisx creation FAILED -) \ No newline at end of file diff -r 7feec50967db -r e492551a0d54 sis/homescreensrv_ut_oulu.pkg --- a/sis/homescreensrv_ut_oulu.pkg Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,82 +0,0 @@ -; -; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -; All rights reserved. -; This component and the accompanying materials are made available -; under the terms of "Eclipse Public License v1.0" -; which accompanies this distribution, and is available -; at the URL "http://www.eclipse.org/legal/epl-v10.html". -; -; Initial Contributors: -; Nokia Corporation - initial contribution. -; -; Contributors: -; -; Description: -; - -; Language -&EN - -; SIS heade name, uid, version -#{"hssrv ut oulu"},(0x20022F67),1,0,0 - -; Localised Vendor name -%{"Nokia"} - -; Unique Vendor name -:"Nokia" - -; Supports S60 5th Edition -[0x1028315F], 0, 0, 0, {"S60ProductID"} - -;--------------- appfoundation --------------- - -;servicemodel: -"/epoc32/release/armv5/urel/t_hsservicemodelexe.exe" - "c:/sys/bin/t_hsservicemodelexe.exe" -"/epoc32/data/z/private/10003a3f/import/apps/t_hsservicemodelexe_reg.rsc" - "c:/private/10003a3f/import/apps/t_hsservicemodelexe_reg.rsc" -"/epoc32/data/z/resource/apps/t_hsservicemodelexe.rsc" - "c:/resource/apps/t_hsservicemodelexe.rsc" -"/epoc32/release/armv5/urel/testserviceprovider.dll" - "c:/sys/bin/testserviceprovider.dll" -"/HS_Domain/homescreensrv/appfoundation/servicemodel/tsrc/testserviceprovider/qmakepluginstubs/testserviceprovider.qtplugin" - "c:/hsresources/testresources/hsresources/plugins/serviceproviders/testserviceprovider.qtplugin" -"/HS_Domain/homescreensrv/appfoundation/servicemodel/tsrc/testserviceprovider/resource/test1serviceprovider.manifest" - "c:/hsresources/testresources/hsresources/plugins/serviceproviders/test1serviceprovider.manifest" -"/HS_Domain/homescreensrv/appfoundation/servicemodel/tsrc/testserviceprovider/resource/test2serviceprovider.manifest" - "c:/hsresources/testresources/hsresources/plugins/serviceproviders/test2serviceprovider.manifest" -"/HS_Domain/homescreensrv/appfoundation/servicemodel/tsrc/t_hsservicemodelexe/invalidservice.manifest" - "c:/hsresources/testresources/invalidservice.manifest" -"/HS_Domain/homescreensrv/appfoundation/servicemodel/tsrc/t_hsservicemodelexe/notwellformedservice.manifest" - "c:/hsresources/testresources/notwellformedservice.manifest" -"/HS_Domain/homescreensrv/appfoundation/servicemodel/tsrc/t_hsservicemodelexe/validservice.manifest" - "c:/hsresources/testresources/validservice.manifest" -"/HS_Domain/homescreensrv/appfoundation/servicemodel/tsrc/t_hsservicemodelexe/validservice2.manifest" - "c:/hsresources/testresources/validservice2.manifest" - -;statemodel: -"/epoc32/release/armv5/urel/t_hsstatemodelexe.exe" - "c:/sys/bin/t_hsstatemodelexe.exe" -"/epoc32/data/z/private/10003a3f/import/apps/t_hsstatemodelexe_reg.rsc" - "c:/private/10003a3f/import/apps/t_hsstatemodelexe_reg.rsc" -"/epoc32/data/z/resource/apps/t_hsstatemodelexe.rsc" - "c:/resource/apps/t_hsstatemodelexe.rsc" -"/epoc32/release/armv5/urel/teststateprovider.dll" - "c:/sys/bin/teststateprovider.dll" -"/HS_Domain/homescreensrv/appfoundation/statemodel/tsrc/teststateprovider/qmakepluginstubs/teststateprovider.qtplugin" - "c:/hsresources/testresources/plugins/stateproviders/teststateprovider.qtplugin" -"/HS_Domain/homescreensrv/appfoundation/statemodel/tsrc/teststateprovider/resource/teststateprovider.manifest" - "c:/hsresources/testresources/plugins/stateproviders/teststateprovider.manifest" -"/HS_Domain/homescreensrv/appfoundation/statemodel/tsrc/t_hsstatemodelexe/invalidstate.manifest" - "c:/hsresources/testresources/invalidstate.manifest" -"/HS_Domain/homescreensrv/appfoundation/statemodel/tsrc/t_hsstatemodelexe/notwellformedstate.manifest" - "c:/hsresources/testresources/notwellformedstate.manifest" -"/HS_Domain/homescreensrv/appfoundation/statemodel/tsrc/t_hsstatemodelexe/validstate2.manifest" - "c:/hsresources/testresources/validstate2.manifest" -"/HS_Domain/homescreensrv/appfoundation/statemodel/tsrc/t_hsstatemodelexe/validstate.manifest" - "c:/hsresources/testresources/validstate.manifest" - -;appruntimemodel: -"/epoc32/release/armv5/urel/t_hsruntimemodelexe.exe" - "c:/sys/bin/t_hsruntimemodelexe.exe" -"/epoc32/data/z/private/10003a3f/import/apps/t_hsruntimemodelexe_reg.rsc" - "c:/private/10003a3f/import/apps/t_hsruntimemodelexe_reg.rsc" -"/epoc32/data/z/resource/apps/t_hsruntimemodelexe.rsc" - "c:/resource/apps/t_hsruntimemodelexe.rsc" -"/epoc32/release/armv5/urel/testruntimeprovider.dll" - "c:/sys/bin/testruntimeprovider.dll" -"/HS_Domain/homescreensrv/appfoundation/appruntimemodel/tsrc/testruntimeprovider/qmakepluginstubs/testruntimeprovider.qtplugin" - "c:/hsresources/testresources/plugins/runtimeproviders/testruntimeprovider.qtplugin" -"/HS_Domain/homescreensrv/appfoundation/appruntimemodel/tsrc/testruntimeprovider/resource/testruntimeprovider.manifest" - "c:/hsresources/testresources/plugins/runtimeproviders/testruntimeprovider.manifest" -"/HS_Domain/homescreensrv/appfoundation/appruntimemodel/tsrc/t_hsruntimemodelexe/invalidruntime.manifest" - "c:/hsresources/testresources/invalidruntime.manifest" -"/HS_Domain/homescreensrv/appfoundation/appruntimemodel/tsrc/t_hsruntimemodelexe/notwellformedruntime.manifest" - "c:/hsresources/testresources/notwellformedruntime.manifest" -"/HS_Domain/homescreensrv/appfoundation/appruntimemodel/tsrc/t_hsruntimemodelexe/validruntime2.manifest" - "c:/hsresources/testresources/validruntime2.manifest" -"/HS_Domain/homescreensrv/appfoundation/appruntimemodel/tsrc/t_hsruntimemodelexe/validruntime.manifest" - "c:/hsresources/testresources/validruntime.manifest" - -;--------------- hswidgetmodel --------------- - -"/epoc32/release/armv5/urel/t_hswidgetmodelexe.exe" - "c:/sys/bin/t_hswidgetmodelexe.exe" -"/epoc32/data/z/private/10003a3f/import/apps/t_hswidgetmodelexe_reg.rsc" - "c:/private/10003a3f/import/apps/t_hswidgetmodelexe_reg.rsc" -"/epoc32/data/z/resource/apps/t_hswidgetmodelexe.rsc" - "c:/resource/apps/t_hswidgetmodelexe.rsc" -"/epoc32/release/armv5/urel/testwidgetprovider.dll" - "c:/sys/bin/testwidgetprovider.dll" -"/HS_Domain/homescreensrv/hswidgetmodel/tsrc/testwidgetprovider/qmakepluginstubs/testwidgetprovider.qtplugin" - "c:/hsresources/testresources/plugins/widgetproviders/testwidgetprovider.qtplugin" -"/HS_Domain/homescreensrv/hswidgetmodel/tsrc/testwidgetprovider/resource/testwidgetprovider.manifest" - "c:/hsresources/testresources/plugins/widgetproviders/testwidgetprovider.manifest" -"/HS_Domain/homescreensrv/hswidgetmodel/tsrc/t_hswidgetmodelexe/invalidwidget.manifest" - "c:/hsresources/testresources/invalidwidget.manifest" -"/HS_Domain/homescreensrv/hswidgetmodel/tsrc/t_hswidgetmodelexe/notwellformedwidget.manifest" - "c:/hsresources/testresources/notwellformedwidget.manifest" -"/HS_Domain/homescreensrv/hswidgetmodel/tsrc/t_hswidgetmodelexe/validwidget2.manifest" - "c:/hsresources/testresources/validwidget2.manifest" -"/HS_Domain/homescreensrv/hswidgetmodel/tsrc/t_hswidgetmodelexe/validwidget.manifest" - "c:/hsresources/testresources/validwidget.manifest" diff -r 7feec50967db -r e492551a0d54 sis/homescreensrv_ut_oulu_sisx.bat --- a/sis/homescreensrv_ut_oulu_sisx.bat Tue Mar 23 23:17:02 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -@rem -@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -@rem All rights reserved. -@rem This component and the accompanying materials are made available -@rem under the terms of "Eclipse Public License v1.0" -@rem which accompanies this distribution, and is available -@rem at the URL "http://www.eclipse.org/legal/epl-v10.html". -@rem -@rem Initial Contributors: -@rem Nokia Corporation - initial contribution. -@rem -@rem Contributors: -@rem -@rem Description: -@rem -@echo off - -if exist homescreensrv_ut_oulu.sisx del homescreensrv_ut_oulu.sisx - -makesis homescreensrv_ut_oulu.pkg -signsis homescreensrv_ut_oulu.sis homescreensrv_ut_oulu.sisx rd.cer rd-key.pem - -if exist homescreensrv_ut_oulu.sisx ( -echo homescreensrv_ut_oulu.sisx creation SUCCEEDED -del homescreensrv_ut_oulu.sis -) - -if not exist homescreensrv_ut_oulu.sisx ( -echo homescreensrv_ut_oulu.sisx creation FAILED -) \ No newline at end of file