# HG changeset patch # User hgs # Date 1284372203 -10800 # Node ID e4f038c420f77b986832507293afaa64e6f38b02 # Parent 7dd137878ff826e0fee0e408352e5f45e973bd17 201036 diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/common.pri --- a/homescreenapp/common.pri Wed Aug 18 10:33:57 2010 +0300 +++ b/homescreenapp/common.pri Mon Sep 13 13:03:23 2010 +0300 @@ -78,14 +78,13 @@ plugin: !isEmpty(PLUGIN_SUBDIR): DESTDIR = $$OUTPUT_DIR/$$PLUGIN_SUBDIR -!symbian: plugin { # copy manifiers +!symbian: plugin { # copy service xml manifest.path = $$DESTDIR - manifest.files = ./resource/*.manifest ./resource/*.xml + manifest.files = ./resource/*.xml manifest.CONFIG += no_build INSTALLS += manifest PRE_TARGETDEPS += install_manifest - } symbian: plugin { # copy qtstub and manifest @@ -97,12 +96,9 @@ qtplugins.path = $$PLUGIN_SUBDIR qtplugins.sources += qmakepluginstubs/$${TARGET}.qtplugin - - hs_public_plugin { - contains(MOBILITY, serviceframework):BLD_INF_RULES.prj_exports += "resource/$${TARGET}.xml z:/private/20022F35/$${TARGET}.xml" - } else { - contains(MOBILITY, serviceframework):BLD_INF_RULES.prj_exports += "resource/$${TARGET}.xml z:$$qtplugins.path/$${TARGET}.xml" - } + + CONFIG += qtservice + QTSERVICE.DESCRIPTOR = ./resource/$${TARGET}.xml for(qtplugin, qtplugins.sources):BLD_INF_RULES.prj_exports += "./$$qtplugin z:$$qtplugins.path/$$basename(qtplugin)" } diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/batterywidgetplugin/batterywidgetplugin.pro --- a/homescreenapp/examples/batterywidgetplugin/batterywidgetplugin.pro Wed Aug 18 10:33:57 2010 +0300 +++ b/homescreenapp/examples/batterywidgetplugin/batterywidgetplugin.pro Mon Sep 13 13:03:23 2010 +0300 @@ -25,37 +25,50 @@ symbian: { - DESTDIR = /private/20022F35/import/widgetregistry/20022F7A + WIDGET_DIR = /private/20022F35/import/widgetregistry/20022F7A INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE TARGET.UID3 = 0x20022F7A TARGET.EPOCALLOWDLLDATA=1 TARGET.CAPABILITY = ALL -TCB - plugins.path = $${DESTDIR} + plugins.path = /resource/qt/plugins/homescreen plugins.sources = $${TARGET}.dll - widgetResources.path = $${DESTDIR} - widgetResources.sources += resource/$${TARGET}.xml + CONFIG += qtservice + QTSERVICE.DESCRIPTOR = resource/$${TARGET}.xml + + widgetResources.path = $${WIDGET_DIR} widgetResources.sources += resource/$${TARGET}.manifest + widgetResources.sources += resource/$${TARGET}.xml widgetResources.sources += resource/$${TARGET}.png widgetResources.sources += resource/batterywidget_bg.png DEPLOYMENT += plugins \ widgetResources -} else { +} + +win32: { + CONFIG(debug, debug|release) { - SUBDIRPART = debug + TARGET_DIR = debug } else { - SUBDIRPART = release - } + TARGET_DIR = release + } + + HOMESCREEN_DIR = $$PWD/../../../../bin/$${TARGET_DIR} - PLUGIN_SUBDIR = /private/20022F35/import/widgetregistry/20022F7A - - DESTDIR = $$PWD/../../../../bin/$${SUBDIRPART}/$${PLUGIN_SUBDIR} + PLUGIN_DIR = $${HOMESCREEN_DIR}/resource/qt/plugins/homescreen + WIDGET_DIR = $${HOMESCREEN_DIR}/private/20022F35/import/widgetregistry/20022F7A + + DESTDIR = $${PLUGIN_DIR} - manifest.path = $${DESTDIR} - manifest.files = ./resource/*.manifest ./resource/*.xml ./resource/*.png ./resource/*.svg + widgetResources.path = $${WIDGET_DIR} + widgetResources.files = ./resource/*.manifest \ + ./resource/*.xml \ + ./resource/*.png \ + ./resource/*.svg - INSTALLS += manifest + INSTALLS += widgetResources + } diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/batterywidgetplugin/sis/batterywidgetplugin.bat --- a/homescreenapp/examples/batterywidgetplugin/sis/batterywidgetplugin.bat Wed Aug 18 10:33:57 2010 +0300 +++ b/homescreenapp/examples/batterywidgetplugin/sis/batterywidgetplugin.bat Mon Sep 13 13:03:23 2010 +0300 @@ -19,7 +19,7 @@ if exist batterywidgetplugin.sisx del batterywidgetplugin.sisx makesis batterywidgetplugin.pkg -signsis batterywidgetplugin.sis batterywidgetplugin.sisx ../../../sis/rd.cer ../../../sis/rd-key.pem +signsis batterywidgetplugin.sis batterywidgetplugin.sisx ../../../internal/sis/rd.cer ../../../internal/sis/rd-key.pem if exist batterywidgetplugin.sisx ( echo batterywidgetplugin.sisx creation SUCCEEDED diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/batterywidgetplugin/sis/batterywidgetplugin.pkg --- a/homescreenapp/examples/batterywidgetplugin/sis/batterywidgetplugin.pkg Wed Aug 18 10:33:57 2010 +0300 +++ b/homescreenapp/examples/batterywidgetplugin/sis/batterywidgetplugin.pkg Mon Sep 13 13:03:23 2010 +0300 @@ -33,10 +33,10 @@ [0x102752AE],0,0,0,{"S60ProductID"} [0x1028315F],0,0,0,{"S60ProductID"} -"../resource/batterywidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F7A/batterywidgetplugin.manifest",FM,"application/hs-widget-uninstall+xml",RR,RW -"/epoc32/release/armv5/urel/batterywidgetplugin.dll" - "!:/sys/bin/batterywidgetplugin.dll" -"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F7A/batterywidgetplugin.qtplugin" - "!:/private/20022F35/import/widgetregistry/20022F7A/batterywidgetplugin.qtplugin" -"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F7A/batterywidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F7A/batterywidgetplugin.manifest" -"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F7A/batterywidgetplugin.xml" - "!:/private/20022F35/import/widgetregistry/20022F7A/batterywidgetplugin.xml" -"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F7A/batterywidgetplugin.png" - "!:/private/20022F35/import/widgetregistry/20022F7A/batterywidgetplugin.png" -"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F7A/batterywidget_bg.png" - "!:/private/20022F35/import/widgetregistry/20022F7A/batterywidget_bg.png" +"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F7A/batterywidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F7A/batterywidgetplugin.manifest",FM,"application/hs-widget-uninstall+xml",RR,RW + +"/epoc32/release/armv5/urel/batterywidgetplugin.dll" - "!:/sys/bin/batterywidgetplugin.dll" +"/epoc32/data/z/resource/qt/plugins/homescreen/batterywidgetplugin.qtplugin" - "!:/resource/qt/plugins/homescreen/batterywidgetplugin.qtplugin" +"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F7A/batterywidgetplugin.xml" - "!:/private/20022F35/import/widgetregistry/20022F7A/batterywidgetplugin.xml" +"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F7A/batterywidgetplugin.png" - "!:/private/20022F35/import/widgetregistry/20022F7A/batterywidgetplugin.png" +"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F7A/batterywidget_bg.png" - "!:/private/20022F35/import/widgetregistry/20022F7A/batterywidget_bg.png" diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/contentpublishclient/contentpublishclient.pro --- a/homescreenapp/examples/contentpublishclient/contentpublishclient.pro Wed Aug 18 10:33:57 2010 +0300 +++ b/homescreenapp/examples/contentpublishclient/contentpublishclient.pro Mon Sep 13 13:03:23 2010 +0300 @@ -38,7 +38,8 @@ LIBS += -lefsrv testwallpaperimages.path = /data/images - testwallpaperimages.sources += ./resource/*.jpg + testwallpaperimages.sources += ./resource/*.jpg \ + ./resource/*.png DEPLOYMENT += testwallpaperimages diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/contentpublishclient/inc/contentpublishclient.h --- a/homescreenapp/examples/contentpublishclient/inc/contentpublishclient.h Wed Aug 18 10:33:57 2010 +0300 +++ b/homescreenapp/examples/contentpublishclient/inc/contentpublishclient.h Mon Sep 13 13:03:23 2010 +0300 @@ -35,10 +35,12 @@ void addClockWidget(); void setWallpaper1(); void setWallpaper2(); + void setWallpaper3(); protected: bool addWidget(QString widgetUri); bool setWallpaper(QString fileName); + bool setWallpaper(const QString &portraitFileName, const QString &landscapeFileName); private: QObject* mService; diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/contentpublishclient/resource/testwallpaper_l.png Binary file homescreenapp/examples/contentpublishclient/resource/testwallpaper_l.png has changed diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/contentpublishclient/resource/testwallpaper_p.png Binary file homescreenapp/examples/contentpublishclient/resource/testwallpaper_p.png has changed diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/contentpublishclient/sis/contentpublishclient.bat --- a/homescreenapp/examples/contentpublishclient/sis/contentpublishclient.bat Wed Aug 18 10:33:57 2010 +0300 +++ b/homescreenapp/examples/contentpublishclient/sis/contentpublishclient.bat Mon Sep 13 13:03:23 2010 +0300 @@ -18,7 +18,7 @@ if exist contentpublishclient.sisx del contentpublishclient.sisx makesis contentpublishclient.pkg -signsis contentpublishclient.sis contentpublishclient.sisx ../../../sis/rd.cer ../../../sis/rd-key.pem +signsis contentpublishclient.sis contentpublishclient.sisx ../../../internal/sis/rd.cer ../../../internal/sis/rd-key.pem if exist contentpublishclient.sisx ( echo contentpublishclient.sisx creation SUCCEEDED diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/contentpublishclient/sis/contentpublishclient.pkg --- a/homescreenapp/examples/contentpublishclient/sis/contentpublishclient.pkg Wed Aug 18 10:33:57 2010 +0300 +++ b/homescreenapp/examples/contentpublishclient/sis/contentpublishclient.pkg Mon Sep 13 13:03:23 2010 +0300 @@ -38,3 +38,5 @@ "/epoc32/data/z/resource/apps/contentpublishclient.rsc" - "c:/resource/apps/contentpublishclient.rsc" "/epoc32/data/z/data/images/testwallpaper.jpg" - "c:/data/images/testwallpaper.jpg" "/epoc32/data/z/data/images/testwallpaper2.jpg" - "c:/data/images/testwallpaper2.jpg" +"/epoc32/data/z/data/images/testwallpaper_p.png" - "c:/data/images/testwallpaper_p.png" +"/epoc32/data/z/data/images/testwallpaper_l.png" - "c:/data/images/testwallpaper_l.png" diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/contentpublishclient/src/contentpublishclient.cpp --- a/homescreenapp/examples/contentpublishclient/src/contentpublishclient.cpp Wed Aug 18 10:33:57 2010 +0300 +++ b/homescreenapp/examples/contentpublishclient/src/contentpublishclient.cpp Mon Sep 13 13:03:23 2010 +0300 @@ -154,6 +154,16 @@ } /*! + +*/ +void ContentPublishClient::setWallpaper3() +{ + QString portraitWallpaper = "c:/data/images/testwallpaper_p.png"; + QString landscapeWallpaper = "c:/data/images/testwallpaper_l.png"; + setWallpaper(portraitWallpaper, landscapeWallpaper); +} + +/*! Changes home screen wallpaper to \a wallpaper image. Note. load function needs to be called before this, it creates mService object. @@ -186,3 +196,30 @@ } // End of snippet 2 + +bool ContentPublishClient::setWallpaper(const QString &portraitFileName, const QString &landscapeFileName) +{ + QByteArray signature = QMetaObject::normalizedSignature("setWallpaper(QString,QString)"); + int methodIndex = mService->metaObject()->indexOfMethod(signature); + if (methodIndex<0) { + return false; + } + QMetaMethod method = mService->metaObject()->method(methodIndex); + bool retVal(false); + + bool ret = method.invoke( mService, + Qt::DirectConnection, + Q_RETURN_ARG(bool, retVal), + Q_ARG(QString,portraitFileName), + Q_ARG(QString,landscapeFileName)); + + if(!ret){ + // invokeMethod returned error + return false; + } + if(!retVal){ + // setWallpaper returned error + return false; + } + return true; +} diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/contentpublishclient/src/main.cpp --- a/homescreenapp/examples/contentpublishclient/src/main.cpp Wed Aug 18 10:33:57 2010 +0300 +++ b/homescreenapp/examples/contentpublishclient/src/main.cpp Mon Sep 13 13:03:23 2010 +0300 @@ -48,20 +48,23 @@ HbPushButton* button1 = new HbPushButton(buttonString); layout->addItem(button1); - contentPublishClient.connect(button1, SIGNAL(pressed()), SLOT(addHelloworldWidget())); + contentPublishClient.connect(button1, SIGNAL(clicked()), SLOT(addHelloworldWidget())); if (clientOk) { HbPushButton* button2 = new HbPushButton("Add Clock widget"); HbPushButton* button3 = new HbPushButton("Set wallpaper1"); HbPushButton* button4 = new HbPushButton("Set wallpaper2"); + HbPushButton* button5 = new HbPushButton("Set wallpaper3"); layout->addItem(button2); layout->addItem(button3); layout->addItem(button4); + layout->addItem(button5); - contentPublishClient.connect(button2, SIGNAL(pressed()), SLOT(addClockWidget())); - contentPublishClient.connect(button3, SIGNAL(pressed()), SLOT(setWallpaper1())); - contentPublishClient.connect(button4, SIGNAL(pressed()), SLOT(setWallpaper2())); + contentPublishClient.connect(button2, SIGNAL(clicked()), SLOT(addClockWidget())); + contentPublishClient.connect(button3, SIGNAL(clicked()), SLOT(setWallpaper1())); + contentPublishClient.connect(button4, SIGNAL(clicked()), SLOT(setWallpaper2())); + contentPublishClient.connect(button5, SIGNAL(clicked()), SLOT(setWallpaper3())); } diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/helloworldwidgetplugin/helloworldwidgetplugin.pro --- a/homescreenapp/examples/helloworldwidgetplugin/helloworldwidgetplugin.pro Wed Aug 18 10:33:57 2010 +0300 +++ b/homescreenapp/examples/helloworldwidgetplugin/helloworldwidgetplugin.pro Mon Sep 13 13:03:23 2010 +0300 @@ -11,7 +11,7 @@ # # Contributors: # -# Description: Example of home screen widget +# Description: Example home screen widget # TEMPLATE = lib @@ -25,41 +25,53 @@ symbian: { - DESTDIR = /private/20022F35/import/widgetregistry/20022F7E + WIDGET_DIR = /private/20022F35/import/widgetregistry/20022F7E INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE TARGET.UID3 = 0x20022F7E TARGET.EPOCALLOWDLLDATA=1 TARGET.CAPABILITY = ALL -TCB - plugins.path = $${DESTDIR} + plugins.path = /resource/qt/plugins/homescreen plugins.sources = $${TARGET}.dll + + CONFIG += qtservice + QTSERVICE.DESCRIPTOR = resource/$${TARGET}.xml - widgetResources.path = $${DESTDIR} - widgetResources.sources += resource/$${TARGET}.xml + widgetResources.path = $${WIDGET_DIR} widgetResources.sources += resource/$${TARGET}.manifest + widgetResources.sources += resource/$${TARGET}.xml widgetResources.sources += resource/$${TARGET}preview.png widgetResources.sources += resource/$${TARGET}.svg DEPLOYMENT += plugins \ widgetResources + + BLD_INF_RULES.prj_exports += \ + "./rom/helloworldwidgetplugin.iby CORE_APP_LAYER_IBY_EXPORT_PATH(helloworldwidgetplugin.iby)" } win32: { CONFIG(debug, debug|release) { - SUBDIRPART = debug + TARGET_DIR = debug } else { - SUBDIRPART = release - } + TARGET_DIR = release + } - PLUGIN_SUBDIR = /private/20022F35/import/widgetregistry/20022F7E + HOMESCREEN_DIR = $$PWD/../../../../bin/$${TARGET_DIR} - DESTDIR = $$PWD/../../../../bin/$${SUBDIRPART}/$${PLUGIN_SUBDIR} - - manifest.path = $${DESTDIR} - manifest.files = ./resource/*.manifest ./resource/*.xml ./resource/*.png ./resource/*.svg + PLUGIN_DIR = $${HOMESCREEN_DIR}/resource/qt/plugins/homescreen + WIDGET_DIR = $${HOMESCREEN_DIR}/private/20022F35/import/widgetregistry/20022F7E + + DESTDIR = $${PLUGIN_DIR} - INSTALLS += manifest + widgetResources.path = $${WIDGET_DIR} + widgetResources.files = ./resource/*.manifest \ + ./resource/*.xml \ + ./resource/*.png \ + ./resource/*.svg + + INSTALLS += widgetResources } diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/helloworldwidgetplugin/rom/helloworldwidgetplugin.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/helloworldwidgetplugin/rom/helloworldwidgetplugin.iby Mon Sep 13 13:03:23 2010 +0300 @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2010 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: + * The iby file for helloworldwidgetplugin component + * + */ + +#ifndef HELLOWORLDWIDGETPLUGIN_IBY +#define HELLOWORLDWIDGETPLUGIN_IBY + + +file=ABI_DIR\BUILD_DIR\helloworldwidgetplugin.dll SHARED_LIB_DIR\helloworldwidgetplugin.dll +data=ZRESOURCE\qt\plugins\homescreen\helloworldwidgetplugin.qtplugin resource\qt\plugins\homescreen\helloworldwidgetplugin.qtplugin +data=ZPRIVATE\20022F35\import\widgetregistry\20022F7E\helloworldwidgetplugin.manifest private\20022f35\import\widgetregistry\20022F7E\helloworldwidgetplugin.manifest +data=ZPRIVATE\20022F35\import\widgetregistry\20022F7E\helloworldwidgetplugin.xml private\20022f35\import\widgetregistry\20022F7E\helloworldwidgetplugin.xml +data=ZPRIVATE\20022F35\import\widgetregistry\20022F7E\helloworldwidgetplugin.svg private\20022f35\import\widgetregistry\20022F7E\helloworldwidgetplugin.svg +data=ZPRIVATE\20022F35\import\widgetregistry\20022F7E\helloworldwidgetpluginpreview.png private\20022f35\import\widgetregistry\20022F7E\helloworldwidgetpluginpreview.png + +#endif // HELLOWORLDWIDGETPLUGIN_IBY diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/helloworldwidgetplugin/sis/helloworldwidgetplugin.bat --- a/homescreenapp/examples/helloworldwidgetplugin/sis/helloworldwidgetplugin.bat Wed Aug 18 10:33:57 2010 +0300 +++ b/homescreenapp/examples/helloworldwidgetplugin/sis/helloworldwidgetplugin.bat Mon Sep 13 13:03:23 2010 +0300 @@ -18,7 +18,7 @@ if exist helloworldwidgetplugin.sisx del helloworldwidgetplugin.sisx makesis helloworldwidgetplugin.pkg -signsis helloworldwidgetplugin.sis helloworldwidgetplugin.sisx ../../../sis/rd.cer ../../../sis/rd-key.pem +signsis helloworldwidgetplugin.sis helloworldwidgetplugin.sisx ../../../internal/sis/rd.cer ../../../internal/sis/rd-key.pem if exist helloworldwidgetplugin.sisx ( echo helloworldwidgetplugin.sisx creation SUCCEEDED diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/helloworldwidgetplugin/sis/helloworldwidgetplugin.pkg --- a/homescreenapp/examples/helloworldwidgetplugin/sis/helloworldwidgetplugin.pkg Wed Aug 18 10:33:57 2010 +0300 +++ b/homescreenapp/examples/helloworldwidgetplugin/sis/helloworldwidgetplugin.pkg Mon Sep 13 13:03:23 2010 +0300 @@ -33,13 +33,10 @@ [0x102752AE],0,0,0,{"S60ProductID"} [0x1028315F],0,0,0,{"S60ProductID"} +"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F7E/helloworldwidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F7E/helloworldwidgetplugin.manifest",FM,"application/hs-widget-uninstall+xml",RR,RW -"../resource/helloworldwidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F7E/helloworldwidgetplugin.manifest",FM,"application/hs-widget-uninstall+xml",RR,RW - -"/epoc32/release/armv5/urel/helloworldwidgetplugin.dll" - "!:/sys/bin/helloworldwidgetplugin.dll" -"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F7E/helloworldwidgetplugin.qtplugin" - "!:/private/20022F35/import/widgetregistry/20022F7E/helloworldwidgetplugin.qtplugin" -"../resource/helloworldwidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F7E/helloworldwidgetplugin.manifest" -"../resource/helloworldwidgetplugin.xml" - "!:/private/20022F35/import/widgetregistry/20022F7E/helloworldwidgetplugin.xml" -"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F7E/helloworldwidgetplugin.svg" - "!:/private/20022F35/import/widgetregistry/20022F7E/helloworldwidgetplugin.svg" -"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F7E/helloworldwidgetpluginpreview.png" - "!:/private/20022F35/import/widgetregistry/20022F7E/helloworldwidgetpluginpreview.png" - +"/epoc32/release/armv5/urel/helloworldwidgetplugin.dll" - "!:/sys/bin/helloworldwidgetplugin.dll" +"/epoc32/data/z/resource/qt/plugins/homescreen/helloworldwidgetplugin.qtplugin" - "!:/resource/qt/plugins/homescreen/helloworldwidgetplugin.qtplugin" +"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F7E/helloworldwidgetplugin.xml" - "!:/private/20022F35/import/widgetregistry/20022F7E/helloworldwidgetplugin.xml" +"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F7E/helloworldwidgetplugin.svg" - "!:/private/20022F35/import/widgetregistry/20022F7E/helloworldwidgetplugin.svg" +"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F7E/helloworldwidgetpluginpreview.png" - "!:/private/20022F35/import/widgetregistry/20022F7E/helloworldwidgetpluginpreview.png" diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/helloworldwidgetplugin/sis/helloworldwidgetplugin_winscw.pkg --- a/homescreenapp/examples/helloworldwidgetplugin/sis/helloworldwidgetplugin_winscw.pkg Wed Aug 18 10:33:57 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,44 +0,0 @@ -; -; Copyright (c) 2010 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 -#{"helloworldwidgetplugin"},(0x20022F7E),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"} - - -"../resource/helloworldwidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F7E/helloworldwidgetplugin.manifest",FM,"application/hs-widget-uninstall+xml",RR,RW - -"/epoc32/release/winscw/udeb/helloworldwidgetplugin.dll" - "!:/sys/bin/helloworldwidgetplugin.dll" -"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F7E/helloworldwidgetplugin.qtplugin" - "!:/private/20022F35/import/widgetregistry/20022F7E/helloworldwidgetplugin.qtplugin" -"../resource/helloworldwidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F7E/helloworldwidgetplugin.manifest" -"../resource/helloworldwidgetplugin.xml" - "!:/private/20022F35/import/widgetregistry/20022F7E/helloworldwidgetplugin.xml" -"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F7E/helloworldwidgetplugin.svg" - "!:/private/20022F35/import/widgetregistry/20022F7E/helloworldwidgetplugin.svg" -"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F7E/helloworldwidgetpluginpreview.png" - "!:/private/20022F35/import/widgetregistry/20022F7E/helloworldwidgetpluginpreview.png" diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en.qm Binary file homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en.qm has changed diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en.ts Mon Sep 13 13:03:23 2010 +0300 @@ -0,0 +1,46 @@ + + + + + + Text in widget's button when widget pressed + Hello world text + Hello world text + + localisedhellowidgetplugin + button + lo + False + + + Hello World description in application library + Home screen example widget + Home screen example widget + + localisedhellowidgetplugin + dblist_1_val + lo + False + + + Hello World title in application library + Hello world + Hello world + + localisedhellowidgetplugin + dblist_1 + lo + False + + + Text in widget's button + Hello world + Hello world + + localisedhellowidgetplugin + button + lo + False + + + diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_US.qm Binary file homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_US.qm has changed diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_US.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_US.ts Mon Sep 13 13:03:23 2010 +0300 @@ -0,0 +1,46 @@ + + + + + + Text in widget's button when widget pressed + Hello world text + Hi dude text + + localisedhellowidgetplugin + button + lo + False + + + Hello World description in application library + Home screen example widget + Home screen example widget + + localisedhellowidgetplugin + dblist_1_val + lo + False + + + Hello World title in application library + Hello world + Hi dude + + localisedhellowidgetplugin + dblist_1 + lo + False + + + Text in widget's button + Hello world + Hi dude + + localisedhellowidgetplugin + button + lo + False + + + diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_gb.qm Binary file homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_gb.qm has changed diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_gb.ts --- a/homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_gb.ts Wed Aug 18 10:33:57 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ - - - - - - Text in widget's button when widget pressed - Hello world text - Hello world text - - localisedhellowidgetplugin - button - lo - False - - - Hello World description in application library - Home screen example widget - Home screen example widget - - localisedhellowidgetplugin - dblist_1_val - lo - False - - - Hello World title in application library - Hello world - Hello world - - localisedhellowidgetplugin - dblist_1 - lo - False - - - Text in widget's button - Hello world - Hello world - - localisedhellowidgetplugin - button - lo - False - - - diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_us.qm Binary file homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_us.qm has changed diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_us.ts --- a/homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_us.ts Wed Aug 18 10:33:57 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ - - - - - - Text in widget's button when widget pressed - Hello world text - Hi dude text - - localisedhellowidgetplugin - button - lo - False - - - Hello World description in application library - Home screen example widget - Home screen example widget - - localisedhellowidgetplugin - dblist_1_val - lo - False - - - Hello World title in application library - Hello world - Hi dude - - localisedhellowidgetplugin - dblist_1 - lo - False - - - Text in widget's button - Hello world - Hi dude - - localisedhellowidgetplugin - button - lo - False - - - diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin.pro --- a/homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin.pro Wed Aug 18 10:33:57 2010 +0300 +++ b/homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin.pro Mon Sep 13 13:03:23 2010 +0300 @@ -11,7 +11,7 @@ # # Contributors: # -# Description: Example of home screen widget +# Description: Example home screen widget # TEMPLATE = lib @@ -24,48 +24,62 @@ INCLUDEPATH += ./inc symbian: { - + + WIDGET_DIR = /private/20022F35/import/widgetregistry/20022F80 INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE TARGET.UID3 = 0x20022F80 TARGET.EPOCALLOWDLLDATA=1 TARGET.CAPABILITY = ALL -TCB - - DESTDIR = /private/20022F35/import/widgetregistry/20022F80 - - plugins.path = $${DESTDIR} + + plugins.path = /resource/qt/plugins/homescreen plugins.sources = $${TARGET}.dll - widgetResources.path = $${DESTDIR} - widgetResources.sources += resource/$${TARGET}.xml + CONFIG += qtservice + QTSERVICE.DESCRIPTOR = resource/$${TARGET}.xml + + widgetResources.path = $${WIDGET_DIR} widgetResources.sources += resource/$${TARGET}.manifest + widgetResources.sources += resource/$${TARGET}.xml widgetResources.sources += resource/$${TARGET}.png - localisedFiles.path = /resource/qt/translations - localisedFiles.sources += ./locales/*.qm + widgetTranslations.path = /resource/qt/translations + widgetTranslations.sources += ./locales/*.qm DEPLOYMENT += plugins \ widgetResources \ - localisedFiles + widgetTranslations + + BLD_INF_RULES.prj_exports += \ + "./rom/localisedhellowidgetplugin.iby CORE_APP_LAYER_IBY_EXPORT_PATH(localisedhellowidgetplugin.iby)" \ + "./rom/localisedhellowidgetpluginresources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(localisedhellowidgetpluginresources.iby)" } win32: { CONFIG(debug, debug|release) { - SUBDIRPART = debug + TARGET_DIR = debug } else { - SUBDIRPART = release - } - - PLUGIN_SUBDIR = /private/20022F35/import/widgetregistry/20022F80 + TARGET_DIR = release + } + + HOMESCREEN_DIR = $$PWD/../../../../bin/$${TARGET_DIR} + + PLUGIN_DIR = $${HOMESCREEN_DIR}/resource/qt/plugins/homescreen + WIDGET_DIR = $${HOMESCREEN_DIR}/private/20022F35/import/widgetregistry/20022F80 + TRANSLATIONS_DIR = $${HOMESCREEN_DIR}/resource/qt/translations + + DESTDIR = $${PLUGIN_DIR} - DESTDIR = $$PWD/../../../../bin/$${SUBDIRPART}/$${PLUGIN_SUBDIR} - - manifest.path = $${DESTDIR} - manifest.files = ./resource/*.manifest ./resource/*.xml ./resource/*.png + widgetResources.path = $${WIDGET_DIR} + widgetResources.files = ./resource/*.manifest \ + ./resource/*.xml \ + ./resource/*.png - widgetLocalisation.path = $$PWD/../../../../bin/$${SUBDIRPART}/resource/qt/translations - widgetLocalisation.files += ./locales/*.qm + widgetTranslations.path = $${TRANSLATIONS_DIR} + widgetTranslations.files += ./locales/*.qm - INSTALLS += manifest widgetLocalisation + INSTALLS += widgetResources \ + widgetTranslations + } diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/localisedhellowidgetplugin/rom/localisedhellowidgetplugin.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/localisedhellowidgetplugin/rom/localisedhellowidgetplugin.iby Mon Sep 13 13:03:23 2010 +0300 @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2010 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: + * The iby file for localisedhellowidgetplugin component + * + */ + +#ifndef LOCALISEDHELLOWIDGETPLUGIN_IBY +#define LOCALISEDHELLOWIDGETPLUGIN_IBY + + +file=ABI_DIR\BUILD_DIR\localisedhellowidgetplugin.dll SHARED_LIB_DIR\localisedhellowidgetplugin.dll +data=ZRESOURCE\qt\plugins\homescreen\localisedhellowidgetplugin.qtplugin resource\qt\plugins\homescreen\localisedhellowidgetplugin.qtplugin +data=ZPRIVATE\20022F35\import\widgetregistry\20022F80\localisedhellowidgetplugin.manifest private\20022f35\import\widgetregistry\20022F80\localisedhellowidgetplugin.manifest +data=ZPRIVATE\20022F35\import\widgetregistry\20022F80\localisedhellowidgetplugin.xml private\20022f35\import\widgetregistry\20022F80\localisedhellowidgetplugin.xml +data=ZPRIVATE\20022F35\import\widgetregistry\20022F80\localisedhellowidgetplugin.svg private\20022f35\import\widgetregistry\20022F80\localisedhellowidgetplugin.svg +data=ZPRIVATE\20022F35\import\widgetregistry\20022F80\localisedhellowidgetpluginpreview.png private\20022f35\import\widgetregistry\20022F80\localisedhellowidgetpluginpreview.png + +#endif // LOCALISEDHELLOWIDGETPLUGIN_IBY diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/localisedhellowidgetplugin/rom/localisedhellowidgetpluginresources.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/localisedhellowidgetplugin/rom/localisedhellowidgetpluginresources.iby Mon Sep 13 13:03:23 2010 +0300 @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2010 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: + * The iby file for localisedhellowidgetplugin resources + * + */ + +#ifndef LOCALISEDHELLOWIDGETPLUGINRESOURCES_IBY +#define LOCALISEDHELLOWIDGETPLUGINRESOURCES_IBY + +#include + +data=DATAZ_\QT_TRANSLATIONS_DIR\localisedhellowidgetplugin.qm QT_TRANSLATIONS_DIR\localisedhellowidgetplugin.qm + +#endif //LOCALISEDHELLOWIDGETPLUGINRESOURCES_IBY diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/localisedhellowidgetplugin/sis/localisedhellowidgetplugin.bat --- a/homescreenapp/examples/localisedhellowidgetplugin/sis/localisedhellowidgetplugin.bat Wed Aug 18 10:33:57 2010 +0300 +++ b/homescreenapp/examples/localisedhellowidgetplugin/sis/localisedhellowidgetplugin.bat Mon Sep 13 13:03:23 2010 +0300 @@ -18,7 +18,7 @@ if exist localisedhellowidgetplugin.sisx del localisedhellowidgetplugin.sisx makesis localisedhellowidgetplugin.pkg -signsis localisedhellowidgetplugin.sis localisedhellowidgetplugin.sisx ../../../sis/rd.cer ../../../sis/rd-key.pem +signsis localisedhellowidgetplugin.sis localisedhellowidgetplugin.sisx ../../../internal/sis/rd.cer ../../../internal/sis/rd-key.pem if exist localisedhellowidgetplugin.sisx ( echo localisedhellowidgetplugin.sisx creation SUCCEEDED diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/localisedhellowidgetplugin/sis/localisedhellowidgetplugin.pkg --- a/homescreenapp/examples/localisedhellowidgetplugin/sis/localisedhellowidgetplugin.pkg Wed Aug 18 10:33:57 2010 +0300 +++ b/homescreenapp/examples/localisedhellowidgetplugin/sis/localisedhellowidgetplugin.pkg Mon Sep 13 13:03:23 2010 +0300 @@ -33,16 +33,13 @@ [0x102752AE],0,0,0,{"S60ProductID"} [0x1028315F],0,0,0,{"S60ProductID"} -"../resource/localisedhellowidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.manifest",FM,"application/hs-widget-uninstall+xml",RR,RW +"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.manifest",FM,"application/hs-widget-uninstall+xml",RR,RW -"/epoc32/release/armv5/urel/localisedhellowidgetplugin.dll" - "!:/sys/bin/localisedhellowidgetplugin.dll" -"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.qtplugin" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.qtplugin" -"../resource/localisedhellowidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.manifest" -"../resource/localisedhellowidgetplugin.xml" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.xml" -"../resource/localisedhellowidgetplugin.png" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.png" - -"/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin.qm" - "!:/resource/qt/translations/localisedhellowidgetplugin.qm" -"/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin_fi.qm" - "!:/resource/qt/translations/localisedhellowidgetplugin_fi.qm" -"/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin_en_us.qm" - "!:/resource/qt/translations/localisedhellowidgetplugin_en_us.qm" -"/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin_en_gb.qm" - "!:/resource/qt/translations/localisedhellowidgetplugin_en_gb.qm" - +"/epoc32/release/armv5/urel/localisedhellowidgetplugin.dll" - "!:/sys/bin/localisedhellowidgetplugin.dll" +"/epoc32/data/z/resource/qt/plugins/homescreen/localisedhellowidgetplugin.qtplugin" - "!:/resource/qt/plugins/homescreen/localisedhellowidgetplugin.qtplugin" +"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.xml" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.xml" +"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.png" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.png" +"/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin.qm" - "!:/resource/qt/translations/localisedhellowidgetplugin.qm" +"/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin_fi.qm" - "!:/resource/qt/translations/localisedhellowidgetplugin_fi.qm" +"/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin_en_us.qm" - "!:/resource/qt/translations/localisedhellowidgetplugin_en_us.qm" +"/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin_en_gb.qm" - "!:/resource/qt/translations/localisedhellowidgetplugin_en_gb.qm" diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/localisedhellowidgetplugin/sis/localisedhellowidgetplugin_winscw.pkg --- a/homescreenapp/examples/localisedhellowidgetplugin/sis/localisedhellowidgetplugin_winscw.pkg Wed Aug 18 10:33:57 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -; -; Copyright (c) 2010 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 -#{"localisedhellowidgetplugin"},(0x20022F80),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"} - -"../resource/localisedhellowidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.manifest",FM,"application/hs-widget-uninstall+xml",RR,RW - -"/epoc32/release/winscw/udeb/localisedhellowidgetplugin.dll" - "!:/sys/bin/localisedhellowidgetplugin.dll" -"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.qtplugin" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.qtplugin" -"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.manifest" -"../resource/localisedhellowidgetplugin.xml" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.xml" -"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.png" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.png" - -"/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin.qm" - "!:/resource/qt/translations/localisedhellowidgetplugin.qm" -"/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin_fi.qm" - "!:/resource/qt/translations/localisedhellowidgetplugin_fi.qm" -"/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin_en_us.qm" - "!:/resource/qt/translations/localisedhellowidgetplugin_en_us.qm" -"/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin_en_gb.qm" - "!:/resource/qt/translations/localisedhellowidgetplugin_en_gb.qm" - diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/minibrowserwidgetplugin/minibrowserwidgetplugin.pro --- a/homescreenapp/examples/minibrowserwidgetplugin/minibrowserwidgetplugin.pro Wed Aug 18 10:33:57 2010 +0300 +++ b/homescreenapp/examples/minibrowserwidgetplugin/minibrowserwidgetplugin.pro Mon Sep 13 13:03:23 2010 +0300 @@ -27,19 +27,22 @@ symbian: { - DESTDIR = /private/20022F35/import/widgetregistry/20022F6F + WIDGET_DIR = /private/20022F35/import/widgetregistry/20022F6F INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE TARGET.UID3 = 0x20022F6F TARGET.EPOCALLOWDLLDATA=1 TARGET.CAPABILITY = ALL -TCB - plugins.path = $${DESTDIR} + plugins.path = /resource/qt/plugins/homescreen plugins.sources = $${TARGET}.dll - widgetResources.path = $${DESTDIR} - widgetResources.sources += resource/$${TARGET}.xml + CONFIG += qtservice + QTSERVICE.DESCRIPTOR = resource/$${TARGET}.xml + + widgetResources.path = $${WIDGET_DIR} widgetResources.sources += resource/$${TARGET}.manifest + widgetResources.sources += resource/$${TARGET}.xml widgetResources.sources += resource/$${TARGET}preview.png widgetResources.sources += resource/$${TARGET}.svg @@ -50,18 +53,24 @@ win32: { CONFIG(debug, debug|release) { - SUBDIRPART = debug + TARGET_DIR = debug } else { - SUBDIRPART = release - } + TARGET_DIR = release + } - PLUGIN_SUBDIR = /private/20022F35/import/widgetregistry/20022F6F + HOMESCREEN_DIR = $$PWD/../../../../bin/$${TARGET_DIR} - DESTDIR = $$PWD/../../../../bin/$${SUBDIRPART}/$${PLUGIN_SUBDIR} + PLUGIN_DIR = $${HOMESCREEN_DIR}/resource/qt/plugins/homescreen + WIDGET_DIR = $${HOMESCREEN_DIR}/private/20022F35/import/widgetregistry/20022F6F + + DESTDIR = $${PLUGIN_DIR} - manifest.path = $${DESTDIR} - manifest.files = ./resource/*.manifest ./resource/*.xml ./resource/*.png ./resource/*.svg + widgetResources.path = $${WIDGET_DIR} + widgetResources.files = ./resource/*.manifest \ + ./resource/*.xml \ + ./resource/*.png \ + ./resource/*.svg - INSTALLS += manifest + INSTALLS += widgetResources } diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/minibrowserwidgetplugin/sis/minibrowserwidgetplugin.bat --- a/homescreenapp/examples/minibrowserwidgetplugin/sis/minibrowserwidgetplugin.bat Wed Aug 18 10:33:57 2010 +0300 +++ b/homescreenapp/examples/minibrowserwidgetplugin/sis/minibrowserwidgetplugin.bat Mon Sep 13 13:03:23 2010 +0300 @@ -18,7 +18,7 @@ if exist minibrowserwidgetplugin.sisx del minibrowserwidgetplugin.sisx makesis minibrowserwidgetplugin.pkg -signsis minibrowserwidgetplugin.sis minibrowserwidgetplugin.sisx ../../../sis/rd.cer ../../../sis/rd-key.pem +signsis minibrowserwidgetplugin.sis minibrowserwidgetplugin.sisx ../../../internal/sis/rd.cer ../../../internal/sis/rd-key.pem if exist minibrowserwidgetplugin.sisx ( echo minibrowserwidgetplugin.sisx creation SUCCEEDED diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/minibrowserwidgetplugin/sis/minibrowserwidgetplugin.pkg --- a/homescreenapp/examples/minibrowserwidgetplugin/sis/minibrowserwidgetplugin.pkg Wed Aug 18 10:33:57 2010 +0300 +++ b/homescreenapp/examples/minibrowserwidgetplugin/sis/minibrowserwidgetplugin.pkg Mon Sep 13 13:03:23 2010 +0300 @@ -33,13 +33,10 @@ [0x102752AE],0,0,0,{"S60ProductID"} [0x1028315F],0,0,0,{"S60ProductID"} - -"../resource/minibrowserwidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.manifest",FM,"application/hs-widget-uninstall+xml",RR,RW +"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.manifest",FM,"application/hs-widget-uninstall+xml",RR,RW "/epoc32/release/armv5/urel/minibrowserwidgetplugin.dll" - "!:/sys/bin/minibrowserwidgetplugin.dll" -"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.qtplugin" - "!:/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.qtplugin" -"../resource/minibrowserwidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.manifest" -"../resource/minibrowserwidgetplugin.xml" - "!:/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.xml" +"/epoc32/data/z/resource/qt/plugins/homescreen/minibrowserwidgetplugin.qtplugin" - "!:/resource/qt/plugins/homescreen/minibrowserwidgetplugin.qtplugin" +"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.xml" - "!:/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.xml" "/epoc32/data/z/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.svg" - "!:/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.svg" "/epoc32/data/z/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetpluginpreview.png" - "!:/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetpluginpreview.png" - diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/examples/minibrowserwidgetplugin/sis/minibrowserwidgetplugin_winscw.pkg --- a/homescreenapp/examples/minibrowserwidgetplugin/sis/minibrowserwidgetplugin_winscw.pkg Wed Aug 18 10:33:57 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,44 +0,0 @@ -; -; Copyright (c) 2010 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 -#{"minibrowserwidgetplugin"},(0x20022F6F),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"} - - -"../resource/minibrowserwidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.manifest",FM,"application/hs-widget-uninstall+xml",RR,RW - -"/epoc32/release/winscw/udeb/minibrowserwidgetplugin.dll" - "!:/sys/bin/minibrowserwidgetplugin.dll" -"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.qtplugin" - "!:/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.qtplugin" -"../resource/minibrowserwidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.manifest" -"../resource/minibrowserwidgetplugin.xml" - "!:/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.xml" -"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.svg" - "!:/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.svg" -"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetpluginpreview.png" - "!:/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetpluginpreview.png" diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/hsapplication/conf/base/confml/CI_homescreendb.confml --- a/homescreenapp/hsapplication/conf/base/confml/CI_homescreendb.confml Wed Aug 18 10:33:57 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1hsclockwidgetplugin - 2dialerwidgetplugin - 3ftuhswidget - 4hsshortcutwidgetplugin - 5hsshortcutwidgetplugin - 6hsshortcutwidgetplugin - 7hsshortcutwidgetplugin - 8hsshortcutwidgetplugin - 9hsshortcutwidgetplugin - 10hsshortcutwidgetplugin - 11hsshortcutwidgetplugin - 12hsshortcutwidgetplugin - 13hsshortcutwidgetplugin - portrait15800.0 - landscape15800.0 - portrait1362760.0 - landscape1361760.0 - portrait154000.0 - landscape3001500.0 - portrait15800.0 - portrait100800.0 - portrait185800.0 - portrait270800.0 - portrait151850.0 - portrait1001850.0 - portrait1851850.0 - portrait15800.0 - portrait100800.0 - portrait185800.0 - clockTypeAnalog - uid0x20022EF9 - uid0x10005901 - uid0x20029F80 - uid0x2001FE79 - uid0x10207C62 - uid0x10005951 - uid0x20025FD9 - uid0x102828D6 - uid0x101FB751 - uid0x100059EE - 10 - 21 - 32 - bounceEffect20 - pageChangeAnimationDuration300 - pageChangeZoneAnimationDuration600 - pageChangeZoneReverseAnimationDuration200 - pageRemovedAnimationDuration1000 - newPageAddedAnimationDuration1000 - widgetDragEffectDuration250 - widgetDropEffectDuration200 - defaultPageId1 - maximumPageCount8 - isShortcutLabelVisibletrue - bounceFeedbackEffectDistance30 - pageChangeZoneWidth30 - pageIndicatorSpacing8 - maximumWidgetHeight39 - maximumWidgetWidth48 - minimumWidgetHeight8.75 - minimumWidgetWidth8.75 - pageChangePanDistance120 - pageChangeFeedbackEffectSensitive - widgetPickFeedbackEffectItemPick - widgetDropFeedbackEffectItemDrop - widgetRepositionFeedbackEffectBounceEffect - widgetOverTrashbinFeedbackEffectItemMoveOver - widgetDropToTrashbinFeedbackEffectItemDrop - shortcutWidgetTapFeedbackEffectBasicItem - widgetMoveBlockedFeedbackEffectBasic - clockWidgetTapFeedbackEffectBasicItem - widgetSnappingFeedbackEffectItemMoveOver - isSnapEnabledtrue - snapTimeout300 - snapForce30 - snapGap6 - pageMargin0 - snapLineFadeInDuration100 - snapLineFadeOutDuration100 - isSnapEffectsEnabledtrue - sceneTypePageWallpapers - bounceAnimationEasingCurveLinear - pageChangeAnimationEasingCurveLinear - - - diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/hsapplication/conf/base/confml/homescreendb.confml --- a/homescreenapp/hsapplication/conf/base/confml/homescreendb.confml Wed Aug 18 10:33:57 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1hsclockwidgetplugin - 2dialerwidgetplugin - 3ftuhswidget - 4hsshortcutwidgetplugin - 5hsshortcutwidgetplugin - 6hsshortcutwidgetplugin - 7hsshortcutwidgetplugin - 8hsshortcutwidgetplugin - 9hsshortcutwidgetplugin - 10hsshortcutwidgetplugin - 11hsshortcutwidgetplugin - 12hsshortcutwidgetplugin - 13hsshortcutwidgetplugin - portrait15800.0 - landscape15800.0 - portrait1362760.0 - landscape1361760.0 - portrait154000.0 - landscape3001500.0 - portrait15800.0 - portrait100800.0 - portrait185800.0 - portrait270800.0 - portrait151850.0 - portrait1001850.0 - portrait1851850.0 - portrait15800.0 - portrait100800.0 - portrait185800.0 - clockTypeAnalog - uid0x20022EF9 - uid0x10005901 - uid0x20029F80 - uid0x2001FE79 - uid0x10207C62 - uid0x10005951 - uid0x20025FD9 - uid0x102828D6 - uid0x101FB751 - uid0x100059EE - 10 - 21 - 32 - bounceEffect20 - pageChangeAnimationDuration300 - pageChangeZoneAnimationDuration600 - pageChangeZoneReverseAnimationDuration200 - pageRemovedAnimationDuration1000 - newPageAddedAnimationDuration1000 - widgetDragEffectDuration250 - widgetDropEffectDuration200 - defaultPageId1 - maximumPageCount8 - isShortcutLabelVisibletrue - bounceFeedbackEffectDistance30 - pageChangeZoneWidth30 - pageIndicatorSpacing8 - maximumWidgetHeight39 - maximumWidgetWidth48 - minimumWidgetHeight8.75 - minimumWidgetWidth8.75 - pageChangePanDistance120 - pageChangeFeedbackEffectSensitive - widgetPickFeedbackEffectItemPick - widgetDropFeedbackEffectItemDrop - widgetRepositionFeedbackEffectBounceEffect - widgetOverTrashbinFeedbackEffectItemMoveOver - widgetDropToTrashbinFeedbackEffectItemDrop - shortcutWidgetTapFeedbackEffectBasicItem - widgetMoveBlockedFeedbackEffectBasic - clockWidgetTapFeedbackEffectBasicItem - widgetSnappingFeedbackEffectItemMoveOver - isSnapEnabledtrue - snapTimeout300 - snapForce30 - snapGap6 - pageMargin0 - snapLineFadeInDuration100 - snapLineFadeOutDuration100 - isSnapEffectsEnabledtrue - sceneTypePageWallpapers - bounceAnimationEasingCurveLinear - pageChangeAnimationEasingCurveLinear - - - diff -r 7dd137878ff8 -r e4f038c420f7 homescreenapp/hsapplication/conf/base/implml/homescreendb.implml --- a/homescreenapp/hsapplication/conf/base/implml/homescreendb.implml Wed Aug 18 10:33:57 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - -