Revision: 201036
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Fri, 17 Sep 2010 08:27:54 +0300
changeset 92 6727c5d0afc7
parent 85 35368b604b28
child 96 458d8c8d9580
Revision: 201036 Kit: 201037
homescreenapp/common.pri
homescreenapp/examples/batterywidgetplugin/batterywidgetplugin.pro
homescreenapp/examples/batterywidgetplugin/sis/batterywidgetplugin.bat
homescreenapp/examples/batterywidgetplugin/sis/batterywidgetplugin.pkg
homescreenapp/examples/contentpublishclient/contentpublishclient.pro
homescreenapp/examples/contentpublishclient/inc/contentpublishclient.h
homescreenapp/examples/contentpublishclient/resource/testwallpaper_l.png
homescreenapp/examples/contentpublishclient/resource/testwallpaper_p.png
homescreenapp/examples/contentpublishclient/sis/contentpublishclient.bat
homescreenapp/examples/contentpublishclient/sis/contentpublishclient.pkg
homescreenapp/examples/contentpublishclient/src/contentpublishclient.cpp
homescreenapp/examples/contentpublishclient/src/main.cpp
homescreenapp/examples/helloworldwidgetplugin/helloworldwidgetplugin.pro
homescreenapp/examples/helloworldwidgetplugin/rom/helloworldwidgetplugin.iby
homescreenapp/examples/helloworldwidgetplugin/sis/helloworldwidgetplugin.bat
homescreenapp/examples/helloworldwidgetplugin/sis/helloworldwidgetplugin.pkg
homescreenapp/examples/helloworldwidgetplugin/sis/helloworldwidgetplugin_winscw.pkg
homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en.qm
homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en.ts
homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_gb.qm
homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_gb.ts
homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin.pro
homescreenapp/examples/localisedhellowidgetplugin/rom/localisedhellowidgetplugin.iby
homescreenapp/examples/localisedhellowidgetplugin/rom/localisedhellowidgetpluginresources.iby
homescreenapp/examples/localisedhellowidgetplugin/sis/localisedhellowidgetplugin.bat
homescreenapp/examples/localisedhellowidgetplugin/sis/localisedhellowidgetplugin.pkg
homescreenapp/examples/localisedhellowidgetplugin/sis/localisedhellowidgetplugin_winscw.pkg
homescreenapp/examples/minibrowserwidgetplugin/minibrowserwidgetplugin.pro
homescreenapp/examples/minibrowserwidgetplugin/sis/minibrowserwidgetplugin.bat
homescreenapp/examples/minibrowserwidgetplugin/sis/minibrowserwidgetplugin.pkg
homescreenapp/examples/minibrowserwidgetplugin/sis/minibrowserwidgetplugin_winscw.pkg
homescreenapp/hsapplication/conf/base/confml/CI_homescreendb.confml
homescreenapp/hsapplication/conf/base/confml/homescreendb.confml
homescreenapp/hsapplication/conf/base/implml/homescreendb.implml
homescreenapp/hsapplication/conf/base/implml/homescreendb_templates/create.sql
homescreenapp/hsapplication/conf/base/implml/homescreendb_templates/fill.sql
homescreenapp/hsapplication/conf/base/root.confml
homescreenapp/hsapplication/conf/confml/CI_homescreendb.confml
homescreenapp/hsapplication/conf/confml/homescreendb.confml
homescreenapp/hsapplication/conf/implml/homescreendb.implml
homescreenapp/hsapplication/conf/implml/homescreendb_templates/create.sql
homescreenapp/hsapplication/conf/implml/homescreendb_templates/fill.sql
homescreenapp/hsapplication/conf/product_1/confml/data.confml
homescreenapp/hsapplication/conf/product_1/root.confml
homescreenapp/hsapplication/conf/product_1_root.confml
homescreenapp/hsapplication/conf/product_2/root.confml
homescreenapp/hsapplication/conf/product_2_root.confml
homescreenapp/hsapplication/conf/root.confml
homescreenapp/hsapplication/conf/variant_1_of_product_1/root.confml
homescreenapp/hsapplication/conf/variant_1_of_product_1_root.confml
homescreenapp/hsapplication/conf/variant_2_of_product_1/root.confml
homescreenapp/hsapplication/conf/variant_2_of_product_1_root.confml
homescreenapp/hsapplication/conf/variant_3_of_product_1/root.confml
homescreenapp/hsapplication/conf/variant_3_of_product_1_root.confml
homescreenapp/hsapplication/conf/variant_4_of_product_1/root.confml
homescreenapp/hsapplication/conf/variant_4_of_product_1_root.confml
homescreenapp/hsapplication/conf/variant_5_of_product_1/root.confml
homescreenapp/hsapplication/conf/variant_5_of_product_1_root.confml
homescreenapp/hsapplication/hsapplication_exports_to_rom.pri
homescreenapp/hsapplication/inc/hshomescreenclientserviceprovider.h
homescreenapp/hsapplication/src/hshomescreen.cpp
homescreenapp/hsapplication/src/hshomescreenclientserviceprovider.cpp
homescreenapp/hsapplication/src/hsstatemachine.cpp
homescreenapp/hsdomainmodel/bwins/hsdomainmodelu.def
homescreenapp/hsdomainmodel/eabi/hsdomainmodelu.def
homescreenapp/hsdomainmodel/hsdomainmodel.pro
homescreenapp/hsdomainmodel/hsdomainmodel.qrc
homescreenapp/hsdomainmodel/hsdomainmodel_win.qrc
homescreenapp/hsdomainmodel/inc/hspagevisual.h
homescreenapp/hsdomainmodel/inc/hsscene.h
homescreenapp/hsdomainmodel/inc/hswallpaper.h
homescreenapp/hsdomainmodel/inc/hswidgethostvisual.h
homescreenapp/hsdomainmodel/src/hsgui.cpp
homescreenapp/hsdomainmodel/src/hsidlewidget.cpp
homescreenapp/hsdomainmodel/src/hspage.cpp
homescreenapp/hsdomainmodel/src/hspagetoucharea.cpp
homescreenapp/hsdomainmodel/src/hspagevisual.cpp
homescreenapp/hsdomainmodel/src/hswallpaper.cpp
homescreenapp/hsdomainmodel/src/hswidgetcomponentregistry.cpp
homescreenapp/hsdomainmodel/src/hswidgettoucharea.cpp
homescreenapp/hshomescreenclientplugin/inc/hshomescreenclient.h
homescreenapp/hshomescreenclientplugin/src/hshomescreenclient.cpp
homescreenapp/hshomescreenclientplugin/tsrc/t_hshomescreenclientplugin/sis/gen_sisx.bat
homescreenapp/hsutils/bwins/hsutilsu.def
homescreenapp/hsutils/eabi/hsutilsu.def
homescreenapp/hsutils/inc/hsmenuevent.h
homescreenapp/hsutils/inc/hsmenueventfactory.h
homescreenapp/hsutils/src/hsmenueventfactory.cpp
homescreenapp/hsutils/src/hspageindicator.cpp
homescreenapp/inc/hsapp_defs.h
homescreenapp/rom/bld.inf
homescreenapp/rom/homescreenapp_core.iby
homescreenapp/rom/homescreenapp_resources.iby
homescreenapp/serviceproviders/hsmenuserviceprovider/bwins/hsmenuserviceprovideru.def
homescreenapp/serviceproviders/hsmenuserviceprovider/eabi/hsmenuserviceprovideru.def
homescreenapp/serviceproviders/hsmenuserviceprovider/inc/hsmenuservice.h
homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenuservice.cpp
homescreenapp/sis/homescreenapp.pkg
homescreenapp/sis/homescreenapp_sisx.bat
homescreenapp/sis/homescreenapp_ut_applib_sisx.bat
homescreenapp/sis/homescreenapp_ut_hs.pkg
homescreenapp/sis/homescreenapp_ut_hs_sisx.bat
homescreenapp/sis/rd-key.pem
homescreenapp/sis/rd.cer
homescreenapp/stateplugins/hsapplibrarystateplugin/docml.pri
homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrary.qm
homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrary.ts
homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrarystateplugin.pro
homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrarystateplugin.qrc
homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrarystateplugin_non_symbian.qrc
homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsallappsstate.h
homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsbaseviewstate.h
homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hscollectionstate.h
homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsinstalledappsstate.h
homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hslistviewitem.h
homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmainwindow.h
homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmenuview.h
homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmenuviewbuilder.h
homescreenapp/stateplugins/hsapplibrarystateplugin/resource/addcontentlabeledview.docml
homescreenapp/stateplugins/hsapplibrarystateplugin/resource/emptylabeledview.docml
homescreenapp/stateplugins/hsapplibrarystateplugin/resource/hslistviewitem.css
homescreenapp/stateplugins/hsapplibrarystateplugin/resource/hslistviewitem.widgetml
homescreenapp/stateplugins/hsapplibrarystateplugin/resource/listview.docml
homescreenapp/stateplugins/hsapplibrarystateplugin/resource/searchview.docml
homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallappsstate.cpp
homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsapplibrarystate.cpp
homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsbaseviewstate.cpp
homescreenapp/stateplugins/hsapplibrarystateplugin/src/hscollectionstate.cpp
homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsinstalledappsstate.cpp
homescreenapp/stateplugins/hsapplibrarystateplugin/src/hslistviewitem.cpp
homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmainwindow.cpp
homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuview.cpp
homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuviewbuilder.cpp
homescreenapp/stateplugins/hshomescreenstateplugin/hshomescreenstateplugin.pro
homescreenapp/stateplugins/hshomescreenstateplugin/inc/hsidlestate.h
homescreenapp/stateplugins/hshomescreenstateplugin/src/hsidlestate.cpp
homescreenapp/stateplugins/hsmenuworkerstateplugin/hsmenuworkerstateplugin.pro
homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsmenuworkerstate.h
homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsuinstallfailedstate.h
homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsuninstallitemstate.h
homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsappchecklist.docml
homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hscollectionslistdialog.docml
homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsdetailsdialog.docml
homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsuninstalldialog.docml
homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsaddappstocollectionstate.cpp
homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsmenuworkerstate.cpp
homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsuinstallfailedstate.cpp
homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsuninstallitemstate.cpp
homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsviewappdetailsstate.cpp
homescreenapp/widgetplugins/hsclockwidgetplugin/hsclockwidgetplugin.pro
homescreenapp/widgetplugins/hsclockwidgetplugin/src/hsclockwidget.cpp
homescreenapp/widgetplugins/hsshortcutwidgetplugin/hsshortcutwidgetplugin.pro
package_definition.xml
package_map.xml
screensaver/bwins/screensavermodelu.def
screensaver/common.pri
screensaver/devicedialogplugins/snsrdevicedialogplugin/inc/snsrdevicedialog.h
screensaver/devicedialogplugins/snsrdevicedialogplugin/inc/snsrdevicedialogdisplaycontrol.h
screensaver/devicedialogplugins/snsrdevicedialogplugin/snsrdevicedialogplugin.pro
screensaver/devicedialogplugins/snsrdevicedialogplugin/src/snsrdevicedialog.cpp
screensaver/devicedialogplugins/snsrdevicedialogplugin/src/snsrdevicedialogdisplaycontrol.cpp
screensaver/eabi/screensavermodelu.def
screensaver/rom/screensaver.iby
screensaver/screensaver.pro
screensaver/screensavermodel/inc/screensaver.h
screensaver/screensavermodel/src/screensaver.cpp
screensaver/screensaverplugins/snsrbigclockscreensaverplugin/inc/snsrbigclockcontainer.h
screensaver/screensaverplugins/snsrbigclockscreensaverplugin/inc/snsrbigclockscreensaver.h
screensaver/screensaverplugins/snsrbigclockscreensaverplugin/inc/snsrblankcontainer.h
screensaver/screensaverplugins/snsrbigclockscreensaverplugin/inc/snsroledanalogclockcontainer.h
screensaver/screensaverplugins/snsrbigclockscreensaverplugin/inc/snsroleddigitalclockcontainer.h
screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaveranalog.docml
screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaverdigital.docml
screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaveroledanalog.docml
screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaveroleddigital.docml
screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/inc/snsroledtimelabel.h
screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/src/snsroledtimelabel.cpp
screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/inc/snsrindicatorwidget.h
screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/resource/snsrindicatorwidget.css
screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/resource/snsrindicatorwidget_color.css
screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/src/snsrindicatorwidget.cpp
screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrswipewidget/resource/snsrswipewidget_color.css
screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsranalogclockcontainer.cpp
screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrbigclockcontainer.cpp
screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrbigclockscreensaver.cpp
screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrblankcontainer.cpp
screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrdigitalclockcontainer.cpp
screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsroledanalogclockcontainer.cpp
screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsroleddigitalclockcontainer.cpp
screensaver/snsrdisplaycontrol_s60/bwins/snsrdisplaycontrolclientu.def
screensaver/snsrdisplaycontrol_s60/eabi/snsrdisplaycontrolclientu.def
screensaver/snsrdisplaycontrol_s60/group/group.pro
screensaver/snsrdisplaycontrol_s60/group/snsrdisplaycontrolclient.mmp
screensaver/snsrdisplaycontrol_s60/group/snsrdisplaycontrolserver.mmp
screensaver/snsrdisplaycontrol_s60/inc/snsrdisplaycontrolclient.h
screensaver/snsrdisplaycontrol_s60/inc/snsrdisplaycontrolcommon.h
screensaver/snsrdisplaycontrol_s60/inc/snsrdisplaycontrolserver.h
screensaver/snsrdisplaycontrol_s60/inc/snsrdisplaycontrolsession.h
screensaver/snsrdisplaycontrol_s60/rom/snsrdisplaycontrol_s60.iby
screensaver/snsrdisplaycontrol_s60/src/snsrdisplaycontrolclient.cpp
screensaver/snsrdisplaycontrol_s60/src/snsrdisplaycontrolserver.cpp
screensaver/snsrdisplaycontrol_s60/src/snsrdisplaycontrolsession.cpp
screensaver/snsrutils/src/snsrlabel.cpp
--- a/homescreenapp/common.pri	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/common.pri	Fri Sep 17 08:27:54 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)"
 }
--- a/homescreenapp/examples/batterywidgetplugin/batterywidgetplugin.pro	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/examples/batterywidgetplugin/batterywidgetplugin.pro	Fri Sep 17 08:27:54 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    
+
 }
--- a/homescreenapp/examples/batterywidgetplugin/sis/batterywidgetplugin.bat	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/examples/batterywidgetplugin/sis/batterywidgetplugin.bat	Fri Sep 17 08:27:54 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
--- a/homescreenapp/examples/batterywidgetplugin/sis/batterywidgetplugin.pkg	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/examples/batterywidgetplugin/sis/batterywidgetplugin.pkg	Fri Sep 17 08:27:54 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"
--- a/homescreenapp/examples/contentpublishclient/contentpublishclient.pro	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/examples/contentpublishclient/contentpublishclient.pro	Fri Sep 17 08:27:54 2010 +0300
@@ -38,7 +38,8 @@
     LIBS += -lefsrv
     
     testwallpaperimages.path = /data/images
-    testwallpaperimages.sources += ./resource/*.jpg
+    testwallpaperimages.sources += ./resource/*.jpg \
+                                   ./resource/*.png
     
     DEPLOYMENT += testwallpaperimages
     
--- a/homescreenapp/examples/contentpublishclient/inc/contentpublishclient.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/examples/contentpublishclient/inc/contentpublishclient.h	Fri Sep 17 08:27:54 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;
Binary file homescreenapp/examples/contentpublishclient/resource/testwallpaper_l.png has changed
Binary file homescreenapp/examples/contentpublishclient/resource/testwallpaper_p.png has changed
--- a/homescreenapp/examples/contentpublishclient/sis/contentpublishclient.bat	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/examples/contentpublishclient/sis/contentpublishclient.bat	Fri Sep 17 08:27:54 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
--- a/homescreenapp/examples/contentpublishclient/sis/contentpublishclient.pkg	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/examples/contentpublishclient/sis/contentpublishclient.pkg	Fri Sep 17 08:27:54 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"
--- a/homescreenapp/examples/contentpublishclient/src/contentpublishclient.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/examples/contentpublishclient/src/contentpublishclient.cpp	Fri Sep 17 08:27:54 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;
+}
--- a/homescreenapp/examples/contentpublishclient/src/main.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/examples/contentpublishclient/src/main.cpp	Fri Sep 17 08:27:54 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()));
     }
     
     
--- a/homescreenapp/examples/helloworldwidgetplugin/helloworldwidgetplugin.pro	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/examples/helloworldwidgetplugin/helloworldwidgetplugin.pro	Fri Sep 17 08:27:54 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
     
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/examples/helloworldwidgetplugin/rom/helloworldwidgetplugin.iby	Fri Sep 17 08:27:54 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
--- a/homescreenapp/examples/helloworldwidgetplugin/sis/helloworldwidgetplugin.bat	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/examples/helloworldwidgetplugin/sis/helloworldwidgetplugin.bat	Fri Sep 17 08:27:54 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
--- a/homescreenapp/examples/helloworldwidgetplugin/sis/helloworldwidgetplugin.pkg	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/examples/helloworldwidgetplugin/sis/helloworldwidgetplugin.pkg	Fri Sep 17 08:27:54 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"
--- a/homescreenapp/examples/helloworldwidgetplugin/sis/helloworldwidgetplugin_winscw.pkg	Thu Sep 02 20:17:27 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"
Binary file homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en.qm has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en.ts	Fri Sep 17 08:27:54 2010 +0300
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="3.0" language="en_GB" sourcelanguage="en_GB">
+<context>
+<message numerus="no" id="txt_localisedhellowidgetplugin_button_hello_world2">
+    <comment>Text in widget&apos;s button when widget pressed</comment>        
+    <source>Hello world text</source>
+    <translation variants="no">Hello world text</translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>localisedhellowidgetplugin</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>lo</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_localisedhellowidgetplugin_dblist_hello_world_desc">
+    <comment>Hello World description in application library </comment>        
+    <source>Home screen example widget</source>
+    <translation variants="no">Home screen example widget</translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>localisedhellowidgetplugin</extra-loc-viewid>
+    <extra-loc-positionid>dblist_1_val</extra-loc-positionid>
+    <extra-loc-feature>lo</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_localisedhellowidgetplugin_dblist_hello_world_title">
+    <comment>Hello World title in application library</comment>        
+    <source>Hello world</source>
+    <translation variants="no">Hello world</translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>localisedhellowidgetplugin</extra-loc-viewid>
+    <extra-loc-positionid>dblist_1</extra-loc-positionid>
+    <extra-loc-feature>lo</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_localisedhellowidgetplugin_button_hello_world1">
+    <comment>Text in widget&apos;s button</comment>        
+    <source>Hello world</source>
+    <translation variants="no">Hello world</translation>
+    <extra-loc-layout_id></extra-loc-layout_id>    
+    <extra-loc-viewid>localisedhellowidgetplugin</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>lo</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+</context>
+</TS>
Binary file homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_gb.qm has changed
--- a/homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_gb.ts	Thu Sep 02 20:17:27 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="3.0" language="en_GB" sourcelanguage="en_GB">
-<context>
-<message numerus="no" id="txt_localisedhellowidgetplugin_button_hello_world2">
-    <comment>Text in widget&apos;s button when widget pressed</comment>        
-    <source>Hello world text</source>
-    <translation variants="no">Hello world text</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>localisedhellowidgetplugin</extra-loc-viewid>
-    <extra-loc-positionid>button</extra-loc-positionid>
-    <extra-loc-feature>lo</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_localisedhellowidgetplugin_dblist_hello_world_desc">
-    <comment>Hello World description in application library </comment>        
-    <source>Home screen example widget</source>
-    <translation variants="no">Home screen example widget</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>localisedhellowidgetplugin</extra-loc-viewid>
-    <extra-loc-positionid>dblist_1_val</extra-loc-positionid>
-    <extra-loc-feature>lo</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_localisedhellowidgetplugin_dblist_hello_world_title">
-    <comment>Hello World title in application library</comment>        
-    <source>Hello world</source>
-    <translation variants="no">Hello world</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>localisedhellowidgetplugin</extra-loc-viewid>
-    <extra-loc-positionid>dblist_1</extra-loc-positionid>
-    <extra-loc-feature>lo</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_localisedhellowidgetplugin_button_hello_world1">
-    <comment>Text in widget&apos;s button</comment>        
-    <source>Hello world</source>
-    <translation variants="no">Hello world</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid>localisedhellowidgetplugin</extra-loc-viewid>
-    <extra-loc-positionid>button</extra-loc-positionid>
-    <extra-loc-feature>lo</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-</context>
-</TS>
--- a/homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin.pro	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin.pro	Fri Sep 17 08:27:54 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
+
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/examples/localisedhellowidgetplugin/rom/localisedhellowidgetplugin.iby	Fri Sep 17 08:27:54 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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/examples/localisedhellowidgetplugin/rom/localisedhellowidgetpluginresources.iby	Fri Sep 17 08:27:54 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_caging_paths_for_iby.hrh> 
+
+data=DATAZ_\QT_TRANSLATIONS_DIR\localisedhellowidgetplugin.qm  QT_TRANSLATIONS_DIR\localisedhellowidgetplugin.qm
+
+#endif //LOCALISEDHELLOWIDGETPLUGINRESOURCES_IBY
--- a/homescreenapp/examples/localisedhellowidgetplugin/sis/localisedhellowidgetplugin.bat	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/examples/localisedhellowidgetplugin/sis/localisedhellowidgetplugin.bat	Fri Sep 17 08:27:54 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
--- a/homescreenapp/examples/localisedhellowidgetplugin/sis/localisedhellowidgetplugin.pkg	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/examples/localisedhellowidgetplugin/sis/localisedhellowidgetplugin.pkg	Fri Sep 17 08:27:54 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"  
--- a/homescreenapp/examples/localisedhellowidgetplugin/sis/localisedhellowidgetplugin_winscw.pkg	Thu Sep 02 20:17:27 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"  
-
--- a/homescreenapp/examples/minibrowserwidgetplugin/minibrowserwidgetplugin.pro	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/examples/minibrowserwidgetplugin/minibrowserwidgetplugin.pro	Fri Sep 17 08:27:54 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    
     
 }
--- a/homescreenapp/examples/minibrowserwidgetplugin/sis/minibrowserwidgetplugin.bat	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/examples/minibrowserwidgetplugin/sis/minibrowserwidgetplugin.bat	Fri Sep 17 08:27:54 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
--- a/homescreenapp/examples/minibrowserwidgetplugin/sis/minibrowserwidgetplugin.pkg	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/examples/minibrowserwidgetplugin/sis/minibrowserwidgetplugin.pkg	Fri Sep 17 08:27:54 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"
-
--- a/homescreenapp/examples/minibrowserwidgetplugin/sis/minibrowserwidgetplugin_winscw.pkg	Thu Sep 02 20:17:27 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"
--- a/homescreenapp/hsapplication/conf/base/confml/CI_homescreendb.confml	Thu Sep 02 20:17:27 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<confml:configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:confml="http://www.s60.com/xml/confml/2" xsi:schemaLocation="http://www.s60.com/xml/confml/2 http://www.s60.com/xml/confml/1#//confml2" name="HomeScreen database settings">
-  <confml:feature ref="HomeScreenDbSettings" name="HomeScreen database settings">
-    <confml:setting ref="Pages" mapKey="id" mapValue="id" name="Pages" type="sequence">
-      <confml:setting ref="id" name="ID" type="int"/>
-      <confml:setting ref="indexPosition" name="Index Position" type="int"/>
-    </confml:setting>
-    <confml:setting ref="Widgets" mapKey="id" mapValue="id" name="Widgets" type="sequence">
-      <confml:setting ref="id" name="ID" type="int"/>
-      <confml:setting ref="uri" name="URI" type="string"/>
-      <confml:setting ref="pageId" name="Page ID" type="selection">
-        <confml:option map="HomeScreenDbSettings/Pages"/>
-      </confml:setting>
-    </confml:setting>
-    <confml:setting ref="WidgetPresentations" name="Widget presentations" type="sequence">
-      <confml:setting ref="key" name="Key" type="string"/>
-      <confml:setting ref="x" name="X position" type="real"/>
-      <confml:setting ref="y" name="Y position" type="real"/>
-      <confml:setting ref="zValue" name="Z value" type="real"/>
-      <confml:setting ref="widgetId" name="Widget ID" type="selection">
-        <confml:option map="HomeScreenDbSettings/Widgets"/>
-      </confml:setting>
-    </confml:setting>
-    <confml:setting ref="WidgetPreferences" name="Widget preferences" type="sequence">
-      <confml:setting ref="key" name="Key" type="string"/>
-      <confml:setting ref="value" name="Value" type="string"/>
-      <confml:setting ref="widgetId" name="Widget ID" type="selection">
-        <confml:option map="HomeScreenDbSettings/Widgets"/>
-      </confml:setting>
-    </confml:setting>
-    <confml:setting ref="Configuration" name="Configuration" type="sequence">
-      <confml:setting ref="key" name="Key" type="string"/>
-      <confml:setting ref="value" name="Value" type="string"/>
-    </confml:setting>
-  </confml:feature>
-  <confml:data>
-    <confml:HomeScreenDbSettings>
-      <confml:Widgets><confml:id>1</confml:id><confml:uri>hsclockwidgetplugin</confml:uri><confml:pageId  map="HomeScreenDbSettings/Pages[@key='1']"></confml:pageId></confml:Widgets>
-      <confml:Widgets><confml:id>2</confml:id><confml:uri>dialerwidgetplugin</confml:uri><confml:pageId map="HomeScreenDbSettings/Pages[@key='1']"></confml:pageId></confml:Widgets>
-      <confml:Widgets><confml:id>3</confml:id><confml:uri>ftuhswidget</confml:uri><confml:pageId map="HomeScreenDbSettings/Pages[@key='1']"></confml:pageId></confml:Widgets>
-      <confml:Widgets><confml:id>4</confml:id><confml:uri>hsshortcutwidgetplugin</confml:uri><confml:pageId map="HomeScreenDbSettings/Pages[@key='2']"></confml:pageId></confml:Widgets>
-      <confml:Widgets><confml:id>5</confml:id><confml:uri>hsshortcutwidgetplugin</confml:uri><confml:pageId map="HomeScreenDbSettings/Pages[@key='2']"></confml:pageId></confml:Widgets>
-      <confml:Widgets><confml:id>6</confml:id><confml:uri>hsshortcutwidgetplugin</confml:uri><confml:pageId map="HomeScreenDbSettings/Pages[@key='2']"></confml:pageId></confml:Widgets>
-      <confml:Widgets><confml:id>7</confml:id><confml:uri>hsshortcutwidgetplugin</confml:uri><confml:pageId map="HomeScreenDbSettings/Pages[@key='2']"></confml:pageId></confml:Widgets>
-      <confml:Widgets><confml:id>8</confml:id><confml:uri>hsshortcutwidgetplugin</confml:uri><confml:pageId map="HomeScreenDbSettings/Pages[@key='2']"></confml:pageId></confml:Widgets>
-      <confml:Widgets><confml:id>9</confml:id><confml:uri>hsshortcutwidgetplugin</confml:uri><confml:pageId map="HomeScreenDbSettings/Pages[@key='2']"></confml:pageId></confml:Widgets>
-      <confml:Widgets><confml:id>10</confml:id><confml:uri>hsshortcutwidgetplugin</confml:uri><confml:pageId map="HomeScreenDbSettings/Pages[@key='2']"></confml:pageId></confml:Widgets>
-      <confml:Widgets><confml:id>11</confml:id><confml:uri>hsshortcutwidgetplugin</confml:uri><confml:pageId map="HomeScreenDbSettings/Pages[@key='3']"></confml:pageId></confml:Widgets>
-      <confml:Widgets><confml:id>12</confml:id><confml:uri>hsshortcutwidgetplugin</confml:uri><confml:pageId map="HomeScreenDbSettings/Pages[@key='3']"></confml:pageId></confml:Widgets>
-      <confml:Widgets><confml:id>13</confml:id><confml:uri>hsshortcutwidgetplugin</confml:uri><confml:pageId map="HomeScreenDbSettings/Pages[@key='3']"></confml:pageId></confml:Widgets>
-      <confml:WidgetPresentations><confml:key>portrait</confml:key><confml:x>15</confml:x><confml:y>80</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='1']"></confml:widgetId></confml:WidgetPresentations>
-      <confml:WidgetPresentations><confml:key>landscape</confml:key><confml:x>15</confml:x><confml:y>80</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='1']"></confml:widgetId></confml:WidgetPresentations>
-      <confml:WidgetPresentations><confml:key>portrait</confml:key><confml:x>136</confml:x><confml:y>276</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='2']"></confml:widgetId></confml:WidgetPresentations>
-      <confml:WidgetPresentations><confml:key>landscape</confml:key><confml:x>136</confml:x><confml:y>176</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='2']"></confml:widgetId></confml:WidgetPresentations>
-      <confml:WidgetPresentations><confml:key>portrait</confml:key><confml:x>15</confml:x><confml:y>400</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='3']"></confml:widgetId></confml:WidgetPresentations>
-      <confml:WidgetPresentations><confml:key>landscape</confml:key><confml:x>300</confml:x><confml:y>150</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='3']"></confml:widgetId></confml:WidgetPresentations>
-      <confml:WidgetPresentations><confml:key>portrait</confml:key><confml:x>15</confml:x><confml:y>80</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='4']"></confml:widgetId></confml:WidgetPresentations>
-      <confml:WidgetPresentations><confml:key>portrait</confml:key><confml:x>100</confml:x><confml:y>80</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='5']"></confml:widgetId></confml:WidgetPresentations>
-      <confml:WidgetPresentations><confml:key>portrait</confml:key><confml:x>185</confml:x><confml:y>80</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='6']"></confml:widgetId></confml:WidgetPresentations>
-      <confml:WidgetPresentations><confml:key>portrait</confml:key><confml:x>270</confml:x><confml:y>80</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='7']"></confml:widgetId></confml:WidgetPresentations>
-      <confml:WidgetPresentations><confml:key>portrait</confml:key><confml:x>15</confml:x><confml:y>185</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='8']"></confml:widgetId></confml:WidgetPresentations>
-      <confml:WidgetPresentations><confml:key>portrait</confml:key><confml:x>100</confml:x><confml:y>185</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='9']"></confml:widgetId></confml:WidgetPresentations>
-      <confml:WidgetPresentations><confml:key>portrait</confml:key><confml:x>185</confml:x><confml:y>185</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='10']"></confml:widgetId></confml:WidgetPresentations>
-      <confml:WidgetPresentations><confml:key>portrait</confml:key><confml:x>15</confml:x><confml:y>80</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='11']"></confml:widgetId></confml:WidgetPresentations>
-      <confml:WidgetPresentations><confml:key>portrait</confml:key><confml:x>100</confml:x><confml:y>80</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='12']"></confml:widgetId></confml:WidgetPresentations>
-      <confml:WidgetPresentations><confml:key>portrait</confml:key><confml:x>185</confml:x><confml:y>80</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='13']"></confml:widgetId></confml:WidgetPresentations>
-      <confml:WidgetPreferences><confml:key>clockType</confml:key><confml:value>Analog</confml:value><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='1']"></confml:widgetId></confml:WidgetPreferences>
-      <confml:WidgetPreferences><confml:key>uid</confml:key><confml:value>0x20022EF9</confml:value><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='4']"></confml:widgetId></confml:WidgetPreferences>
-      <confml:WidgetPreferences><confml:key>uid</confml:key><confml:value>0x10005901</confml:value><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='5']"></confml:widgetId></confml:WidgetPreferences>
-      <confml:WidgetPreferences><confml:key>uid</confml:key><confml:value>0x20029F80</confml:value><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='6']"></confml:widgetId></confml:WidgetPreferences>
-      <confml:WidgetPreferences><confml:key>uid</confml:key><confml:value>0x2001FE79</confml:value><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='7']"></confml:widgetId></confml:WidgetPreferences>
-      <confml:WidgetPreferences><confml:key>uid</confml:key><confml:value>0x10207C62</confml:value><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='8']"></confml:widgetId></confml:WidgetPreferences>
-      <confml:WidgetPreferences><confml:key>uid</confml:key><confml:value>0x10005951</confml:value><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='9']"></confml:widgetId></confml:WidgetPreferences>
-      <confml:WidgetPreferences><confml:key>uid</confml:key><confml:value>0x20025FD9</confml:value><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='10']"></confml:widgetId></confml:WidgetPreferences>
-      <confml:WidgetPreferences><confml:key>uid</confml:key><confml:value>0x102828D6</confml:value><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='11']"></confml:widgetId></confml:WidgetPreferences>
-      <confml:WidgetPreferences><confml:key>uid</confml:key><confml:value>0x101FB751</confml:value><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='12']"></confml:widgetId></confml:WidgetPreferences>
-      <confml:WidgetPreferences><confml:key>uid</confml:key><confml:value>0x100059EE</confml:value><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='13']"></confml:widgetId></confml:WidgetPreferences>
-      <confml:Pages><confml:id>1</confml:id><confml:indexPosition>0</confml:indexPosition></confml:Pages>
-      <confml:Pages><confml:id>2</confml:id><confml:indexPosition>1</confml:indexPosition></confml:Pages>
-      <confml:Pages><confml:id>3</confml:id><confml:indexPosition>2</confml:indexPosition></confml:Pages>
-      <confml:Configuration><confml:key>bounceEffect</confml:key><confml:value>20</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>pageChangeAnimationDuration</confml:key><confml:value>300</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>pageChangeZoneAnimationDuration</confml:key><confml:value>600</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>pageChangeZoneReverseAnimationDuration</confml:key><confml:value>200</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>pageRemovedAnimationDuration</confml:key><confml:value>1000</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>newPageAddedAnimationDuration</confml:key><confml:value>1000</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>widgetDragEffectDuration</confml:key><confml:value>250</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>widgetDropEffectDuration</confml:key><confml:value>200</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>defaultPageId</confml:key><confml:value>1</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>maximumPageCount</confml:key><confml:value>8</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>isShortcutLabelVisible</confml:key><confml:value>true</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>bounceFeedbackEffectDistance</confml:key><confml:value>30</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>pageChangeZoneWidth</confml:key><confml:value>30</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>pageIndicatorSpacing</confml:key><confml:value>8</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>maximumWidgetHeight</confml:key><confml:value>39</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>maximumWidgetWidth</confml:key><confml:value>48</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>minimumWidgetHeight</confml:key><confml:value>8.75</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>minimumWidgetWidth</confml:key><confml:value>8.75</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>pageChangePanDistance</confml:key><confml:value>120</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>pageChangeFeedbackEffect</confml:key><confml:value>Sensitive</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>widgetPickFeedbackEffect</confml:key><confml:value>ItemPick</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>widgetDropFeedbackEffect</confml:key><confml:value>ItemDrop</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>widgetRepositionFeedbackEffect</confml:key><confml:value>BounceEffect</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>widgetOverTrashbinFeedbackEffect</confml:key><confml:value>ItemMoveOver</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>widgetDropToTrashbinFeedbackEffect</confml:key><confml:value>ItemDrop</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>shortcutWidgetTapFeedbackEffect</confml:key><confml:value>BasicItem</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>widgetMoveBlockedFeedbackEffect</confml:key><confml:value>Basic</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>clockWidgetTapFeedbackEffect</confml:key><confml:value>BasicItem</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>widgetSnappingFeedbackEffect</confml:key><confml:value>ItemMoveOver</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>isSnapEnabled</confml:key><confml:value>true</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>snapTimeout</confml:key><confml:value>300</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>snapForce</confml:key><confml:value>30</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>snapGap</confml:key><confml:value>6</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>pageMargin</confml:key><confml:value>0</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>snapLineFadeInDuration</confml:key><confml:value>100</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>snapLineFadeOutDuration</confml:key><confml:value>100</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>isSnapEffectsEnabled</confml:key><confml:value>true</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>sceneType</confml:key><confml:value>PageWallpapers</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>bounceAnimationEasingCurve</confml:key><confml:value>Linear</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>pageChangeAnimationEasingCurve</confml:key><confml:value>Linear</confml:value></confml:Configuration>      
-    </confml:HomeScreenDbSettings>
-  </confml:data>
-</confml:configuration>
--- a/homescreenapp/hsapplication/conf/base/confml/homescreendb.confml	Thu Sep 02 20:17:27 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:confml="http://www.s60.com/xml/confml/2" xsi:schemaLocation="http://www.s60.com/xml/confml/2 http://www.s60.com/xml/confml/1#//confml2" name="HomeScreen database settings">
-  <feature ref="HomeScreenDbSettings" name="HomeScreen database settings">
-    <setting ref="Pages" mapKey="id" mapValue="id" name="Pages" type="sequence">
-      <setting ref="id" name="ID" type="int"/>
-      <setting ref="indexPosition" name="Index Position" type="int"/>
-    </setting>
-    <setting ref="Widgets" mapKey="id" mapValue="id" name="Widgets" type="sequence">
-      <setting ref="id" name="ID" type="int"/>
-      <setting ref="uri" name="URI" type="string"/>
-      <setting ref="pageId" name="Page ID" type="selection">
-        <option map="HomeScreenDbSettings/Pages"/>
-      </setting>
-    </setting>
-    <setting ref="WidgetPresentations" name="Widget presentations" type="sequence">
-      <setting ref="key" name="Key" type="string"/>
-      <setting ref="x" name="X position" type="real"/>
-      <setting ref="y" name="Y position" type="real"/>
-      <setting ref="zValue" name="Z value" type="real"/>
-      <setting ref="widgetId" name="Widget ID" type="selection">
-        <option map="HomeScreenDbSettings/Widgets"/>
-      </setting>
-    </setting>
-    <setting ref="WidgetPreferences" name="Widget preferences" type="sequence">
-      <setting ref="key" name="Key" type="string"/>
-      <setting ref="value" name="Value" type="string"/>
-      <setting ref="widgetId" name="Widget ID" type="selection">
-        <option map="HomeScreenDbSettings/Widgets"/>
-      </setting>
-    </setting>
-    <setting ref="Configuration" name="Configuration" type="sequence">
-      <setting ref="key" name="Key" type="string"/>
-      <setting ref="value" name="Value" type="string"/>
-    </setting>
-  </feature>
-  <data>
-    <HomeScreenDbSettings>
-      <Widgets><id>1</id><uri>hsclockwidgetplugin</uri><pageId  map="HomeScreenDbSettings/Pages[@key='1']"></pageId></Widgets>
-      <Widgets><id>2</id><uri>dialerwidgetplugin</uri><pageId map="HomeScreenDbSettings/Pages[@key='1']"></pageId></Widgets>
-      <Widgets><id>3</id><uri>ftuhswidget</uri><pageId map="HomeScreenDbSettings/Pages[@key='1']"></pageId></Widgets>
-      <Widgets><id>4</id><uri>hsshortcutwidgetplugin</uri><pageId map="HomeScreenDbSettings/Pages[@key='2']"></pageId></Widgets>
-      <Widgets><id>5</id><uri>hsshortcutwidgetplugin</uri><pageId map="HomeScreenDbSettings/Pages[@key='2']"></pageId></Widgets>
-      <Widgets><id>6</id><uri>hsshortcutwidgetplugin</uri><pageId map="HomeScreenDbSettings/Pages[@key='2']"></pageId></Widgets>
-      <Widgets><id>7</id><uri>hsshortcutwidgetplugin</uri><pageId map="HomeScreenDbSettings/Pages[@key='2']"></pageId></Widgets>
-      <Widgets><id>8</id><uri>hsshortcutwidgetplugin</uri><pageId map="HomeScreenDbSettings/Pages[@key='2']"></pageId></Widgets>
-      <Widgets><id>9</id><uri>hsshortcutwidgetplugin</uri><pageId map="HomeScreenDbSettings/Pages[@key='2']"></pageId></Widgets>
-      <Widgets><id>10</id><uri>hsshortcutwidgetplugin</uri><pageId map="HomeScreenDbSettings/Pages[@key='2']"></pageId></Widgets>
-      <Widgets><id>11</id><uri>hsshortcutwidgetplugin</uri><pageId map="HomeScreenDbSettings/Pages[@key='3']"></pageId></Widgets>
-      <Widgets><id>12</id><uri>hsshortcutwidgetplugin</uri><pageId map="HomeScreenDbSettings/Pages[@key='3']"></pageId></Widgets>
-      <Widgets><id>13</id><uri>hsshortcutwidgetplugin</uri><pageId map="HomeScreenDbSettings/Pages[@key='3']"></pageId></Widgets>
-      <WidgetPresentations><key>portrait</key><x>15</x><y>80</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='1']"></widgetId></WidgetPresentations>
-      <WidgetPresentations><key>landscape</key><x>15</x><y>80</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='1']"></widgetId></WidgetPresentations>
-      <WidgetPresentations><key>portrait</key><x>136</x><y>276</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='2']"></widgetId></WidgetPresentations>
-      <WidgetPresentations><key>landscape</key><x>136</x><y>176</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='2']"></widgetId></WidgetPresentations>
-      <WidgetPresentations><key>portrait</key><x>15</x><y>400</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='3']"></widgetId></WidgetPresentations>
-      <WidgetPresentations><key>landscape</key><x>300</x><y>150</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='3']"></widgetId></WidgetPresentations>
-      <WidgetPresentations><key>portrait</key><x>15</x><y>80</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='4']"></widgetId></WidgetPresentations>
-      <WidgetPresentations><key>portrait</key><x>100</x><y>80</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='5']"></widgetId></WidgetPresentations>
-      <WidgetPresentations><key>portrait</key><x>185</x><y>80</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='6']"></widgetId></WidgetPresentations>
-      <WidgetPresentations><key>portrait</key><x>270</x><y>80</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='7']"></widgetId></WidgetPresentations>
-      <WidgetPresentations><key>portrait</key><x>15</x><y>185</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='8']"></widgetId></WidgetPresentations>
-      <WidgetPresentations><key>portrait</key><x>100</x><y>185</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='9']"></widgetId></WidgetPresentations>
-      <WidgetPresentations><key>portrait</key><x>185</x><y>185</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='10']"></widgetId></WidgetPresentations>
-      <WidgetPresentations><key>portrait</key><x>15</x><y>80</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='11']"></widgetId></WidgetPresentations>
-      <WidgetPresentations><key>portrait</key><x>100</x><y>80</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='12']"></widgetId></WidgetPresentations>
-      <WidgetPresentations><key>portrait</key><x>185</x><y>80</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='13']"></widgetId></WidgetPresentations>
-      <WidgetPreferences><key>clockType</key><value>Analog</value><widgetId map="HomeScreenDbSettings/Widgets[@key='1']"></widgetId></WidgetPreferences>
-      <WidgetPreferences><key>uid</key><value>0x20022EF9</value><widgetId map="HomeScreenDbSettings/Widgets[@key='4']"></widgetId></WidgetPreferences>
-      <WidgetPreferences><key>uid</key><value>0x10005901</value><widgetId map="HomeScreenDbSettings/Widgets[@key='5']"></widgetId></WidgetPreferences>
-      <WidgetPreferences><key>uid</key><value>0x20029F80</value><widgetId map="HomeScreenDbSettings/Widgets[@key='6']"></widgetId></WidgetPreferences>
-      <WidgetPreferences><key>uid</key><value>0x2001FE79</value><widgetId map="HomeScreenDbSettings/Widgets[@key='7']"></widgetId></WidgetPreferences>
-      <WidgetPreferences><key>uid</key><value>0x10207C62</value><widgetId map="HomeScreenDbSettings/Widgets[@key='8']"></widgetId></WidgetPreferences>
-      <WidgetPreferences><key>uid</key><value>0x10005951</value><widgetId map="HomeScreenDbSettings/Widgets[@key='9']"></widgetId></WidgetPreferences>
-      <WidgetPreferences><key>uid</key><value>0x20025FD9</value><widgetId map="HomeScreenDbSettings/Widgets[@key='10']"></widgetId></WidgetPreferences>
-      <WidgetPreferences><key>uid</key><value>0x102828D6</value><widgetId map="HomeScreenDbSettings/Widgets[@key='11']"></widgetId></WidgetPreferences>
-      <WidgetPreferences><key>uid</key><value>0x101FB751</value><widgetId map="HomeScreenDbSettings/Widgets[@key='12']"></widgetId></WidgetPreferences>
-      <WidgetPreferences><key>uid</key><value>0x100059EE</value><widgetId map="HomeScreenDbSettings/Widgets[@key='13']"></widgetId></WidgetPreferences>
-      <Pages><id>1</id><indexPosition>0</indexPosition></Pages>
-      <Pages><id>2</id><indexPosition>1</indexPosition></Pages>
-      <Pages><id>3</id><indexPosition>2</indexPosition></Pages>
-      <Configuration><key>bounceEffect</key><value>20</value></Configuration>
-      <Configuration><key>pageChangeAnimationDuration</key><value>300</value></Configuration>
-      <Configuration><key>pageChangeZoneAnimationDuration</key><value>600</value></Configuration>
-      <Configuration><key>pageChangeZoneReverseAnimationDuration</key><value>200</value></Configuration>
-      <Configuration><key>pageRemovedAnimationDuration</key><value>1000</value></Configuration>
-      <Configuration><key>newPageAddedAnimationDuration</key><value>1000</value></Configuration>
-      <Configuration><key>widgetDragEffectDuration</key><value>250</value></Configuration>
-      <Configuration><key>widgetDropEffectDuration</key><value>200</value></Configuration>
-      <Configuration><key>defaultPageId</key><value>1</value></Configuration>
-      <Configuration><key>maximumPageCount</key><value>8</value></Configuration>
-      <Configuration><key>isShortcutLabelVisible</key><value>true</value></Configuration>
-      <Configuration><key>bounceFeedbackEffectDistance</key><value>30</value></Configuration>
-      <Configuration><key>pageChangeZoneWidth</key><value>30</value></Configuration>
-      <Configuration><key>pageIndicatorSpacing</key><value>8</value></Configuration>
-      <Configuration><key>maximumWidgetHeight</key><value>39</value></Configuration>
-      <Configuration><key>maximumWidgetWidth</key><value>48</value></Configuration>
-      <Configuration><key>minimumWidgetHeight</key><value>8.75</value></Configuration>
-      <Configuration><key>minimumWidgetWidth</key><value>8.75</value></Configuration>
-      <Configuration><key>pageChangePanDistance</key><value>120</value></Configuration>
-      <Configuration><key>pageChangeFeedbackEffect</key><value>Sensitive</value></Configuration>
-      <Configuration><key>widgetPickFeedbackEffect</key><value>ItemPick</value></Configuration>
-      <Configuration><key>widgetDropFeedbackEffect</key><value>ItemDrop</value></Configuration>
-      <Configuration><key>widgetRepositionFeedbackEffect</key><value>BounceEffect</value></Configuration>
-      <Configuration><key>widgetOverTrashbinFeedbackEffect</key><value>ItemMoveOver</value></Configuration>
-      <Configuration><key>widgetDropToTrashbinFeedbackEffect</key><value>ItemDrop</value></Configuration>
-      <Configuration><key>shortcutWidgetTapFeedbackEffect</key><value>BasicItem</value></Configuration>
-      <Configuration><key>widgetMoveBlockedFeedbackEffect</key><value>Basic</value></Configuration>
-      <Configuration><key>clockWidgetTapFeedbackEffect</key><value>BasicItem</value></Configuration>
-      <Configuration><key>widgetSnappingFeedbackEffect</key><value>ItemMoveOver</value></Configuration>
-      <Configuration><key>isSnapEnabled</key><value>true</value></Configuration>
-      <Configuration><key>snapTimeout</key><value>300</value></Configuration>
-      <Configuration><key>snapForce</key><value>30</value></Configuration>
-      <Configuration><key>snapGap</key><value>6</value></Configuration>
-      <Configuration><key>pageMargin</key><value>0</value></Configuration>
-      <Configuration><key>snapLineFadeInDuration</key><value>100</value></Configuration>
-      <Configuration><key>snapLineFadeOutDuration</key><value>100</value></Configuration>
-      <Configuration><key>isSnapEffectsEnabled</key><value>true</value></Configuration>
-      <Configuration><key>sceneType</key><value>PageWallpapers</value></Configuration>
-      <Configuration><key>bounceAnimationEasingCurve</key><value>Linear</value></Configuration>
-      <Configuration><key>pageChangeAnimationEasingCurve</key><value>Linear</value></Configuration>      
-    </HomeScreenDbSettings>
-  </data>
-</configuration>
--- a/homescreenapp/hsapplication/conf/base/implml/homescreendb.implml	Thu Sep 02 20:17:27 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<container xmlns="http://www.symbianfoundation.org/xml/implml/1">
-  <tag name="target" value="rofs2"/> 
-  <tag name="target" value="rofs3"/> 
-  
-    <!--
-    Override the setting refs so that modifying HomeScreenDbSettings
-    causes the execution of both the TemplateML and CommandML
-    implementations. Otherwise the TemplateML implementation would be
-    executed only if the settings have been changed, and the CommandML
-    implementation would be executed every time.
-    -->
-    <settingRefsOverride>
-        <settingRef value="HomeScreenDbSettings"/>
-    </settingRefsOverride>
-    
-    <!-- TemplateML implementation to create the .sql files -->
-    <templateml xmlns="http://www.s60.com/xml/templateml/1">
-    
-    <!-- just to create empty folder -->
-    <output dir="content/private/20022f35/" file="homescreen.db" encoding="UTF-8"></output>
-    
-        <output dir="private/20022f35/sql/" file="create.sql" encoding="UTF-8">
-            <template file="homescreendb_templates/create.sql"></template>
-        </output>
-        <output dir="private/20022f35/sql/" file="fill.sql" encoding="UTF-8">
-            <template file="homescreendb_templates/fill.sql"/>
-        </output>
-    </templateml>
-    
-    <!-- CommandML implementation to create the database using the .sql files -->
-    <commandml xmlns="http://www.s60.com/xml/commandml/1">
-        <command executable="sqlite3" shell="true" cwd="%CONE_OUT_ABSOLUTE%/private/20022f35/sql">
-            <argument value='%CONE_OUT_ABSOLUTE%/content/private/20022f35/homescreen.db ".read create.sql"'/>
-        </command>
-        <command executable="sqlite3" shell="true" cwd="%CONE_OUT_ABSOLUTE%/private/20022f35/sql">
-            <argument value='%CONE_OUT_ABSOLUTE%/content/private/20022f35/homescreen.db ".genfkey --exec"'/>
-        </command>
-        <command executable="sqlite3" shell="true" cwd="%CONE_OUT_ABSOLUTE%/private/20022f35/sql">
-            <argument value='%CONE_OUT_ABSOLUTE%/content/private/20022f35/homescreen.db ".read fill.sql"'/>
-        </command>
-    </commandml>
-</container>
\ No newline at end of file
--- a/homescreenapp/hsapplication/conf/base/implml/homescreendb_templates/create.sql	Thu Sep 02 20:17:27 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-DROP TABLE IF EXISTS Scene;
-CREATE TABLE Scene (
-  id INTEGER PRIMARY KEY);
-
-DROP TABLE IF EXISTS Pages;
-CREATE TABLE Pages (
-  id INTEGER PRIMARY KEY,  
-  indexPosition INTEGER);
-
-DROP TABLE IF EXISTS Widgets;
-CREATE TABLE Widgets (
-  id INTEGER PRIMARY KEY,
-  uri TEXT,  
-  pageId INTEGER);
-
-DROP TABLE IF EXISTS WidgetPresentations;
-CREATE TABLE WidgetPresentations (
-  key TEXT,
-  x REAL,
-  y REAL,
-  zValue REAL,	
-  widgetId INTEGER,
-  UNIQUE(widgetId, key) ON CONFLICT REPLACE,
-  FOREIGN KEY(widgetId) REFERENCES Widgets(id) ON DELETE CASCADE);
-
-DROP TABLE IF EXISTS WidgetPreferences;
-CREATE TABLE WidgetPreferences (
-  key TEXT,
-  value TEXT,
-  widgetId INTEGER,
-  UNIQUE(widgetId, key) ON CONFLICT REPLACE,
-  FOREIGN KEY(widgetId) REFERENCES Widgets(id) ON DELETE CASCADE);
-
-DROP TABLE IF EXISTS Configuration;
-CREATE TABLE Configuration (
-	key TEXT,
-	value TEXT,
-	UNIQUE(key) ON CONFLICT REPLACE);
-	
\ No newline at end of file
--- a/homescreenapp/hsapplication/conf/base/implml/homescreendb_templates/fill.sql	Thu Sep 02 20:17:27 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-INSERT INTO Scene (id) VALUES (1);
-
-{% for index in range(feat_tree.HomeScreenDbSettings.Pages._value|length) -%}
-    {%- set id = feat_tree.HomeScreenDbSettings.Pages.id._value[index] -%}
-    {%- set indexPosition = feat_tree.HomeScreenDbSettings.Pages.indexPosition._value[index] -%}
-    INSERT INTO Pages (id, indexPosition) VALUES ({{id}}, {{indexPosition}});
-{% endfor %}
-
-{% for index in range(feat_tree.HomeScreenDbSettings.Widgets._value|length) -%}
-    {%- set id = feat_tree.HomeScreenDbSettings.Widgets.id._value[index] -%}
-    {%- set uri = feat_tree.HomeScreenDbSettings.Widgets.uri._value[index] or '' -%}
-    {%- set pageId = feat_tree.HomeScreenDbSettings.Widgets.pageId._value[index] -%}
-    
-    INSERT INTO Widgets (id, uri, pageId) VALUES ({{id}}, '{{uri}}', {{pageId}});
-{% endfor %}
-
-{% for index in range(feat_tree.HomeScreenDbSettings.WidgetPresentations._value|length) -%}
-    {%- set key = feat_tree.HomeScreenDbSettings.WidgetPresentations.key._value[index] or '' -%}
-    {%- set x = feat_tree.HomeScreenDbSettings.WidgetPresentations.x._value[index] -%}
-    {%- set y = feat_tree.HomeScreenDbSettings.WidgetPresentations.y._value[index] -%}
-    {%- set zValue = feat_tree.HomeScreenDbSettings.WidgetPresentations.zValue._value[index] -%}
-    {%- set widgetId = feat_tree.HomeScreenDbSettings.WidgetPresentations.widgetId._value[index] -%}
-    
-    INSERT INTO WidgetPresentations (key, x, y, zValue, widgetId) VALUES ('{{key}}', {{x}}, {{y}}, {{zValue}}, {{widgetId}});
-{% endfor %}
-
-{% for index in range(feat_tree.HomeScreenDbSettings.WidgetPreferences._value|length) -%}
-    {%- set key = feat_tree.HomeScreenDbSettings.WidgetPreferences.key._value[index] or '' -%}
-    {%- set value = feat_tree.HomeScreenDbSettings.WidgetPreferences.value._value[index] -%}
-    {%- set widgetId = feat_tree.HomeScreenDbSettings.WidgetPreferences.widgetId._value[index] -%}
-    
-    INSERT INTO WidgetPreferences (key, value, widgetId) VALUES ('{{key}}', '{{value}}', {{widgetId}});
-{% endfor %}
-
-{% for index in range(feat_tree.HomeScreenDbSettings.Configuration._value|length) -%}
-    {%- set key = feat_tree.HomeScreenDbSettings.Configuration.key._value[index] or '' -%}
-    {%- set value = feat_tree.HomeScreenDbSettings.Configuration.value._value[index] -%}
-    
-    INSERT INTO Configuration (key, value) VALUES ('{{key}}', '{{value}}');
-{% endfor %}
--- a/homescreenapp/hsapplication/conf/base/root.confml	Thu Sep 02 20:17:27 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<confml:configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:confml="http://www.s60.com/xml/confml/2" xmlns:xi="http://www.w3.org/2001/XInclude" xsi:schemaLocation="http://www.s60.com/xml/confml/2 http://www.s60.com/xml/confml/1#//confml2 http://www.w3.org/2001/XInclude http://www.s60.com/xml/confml/1#//include">
-  <xi:include href="confml/homescreendb.confml"/>
-</confml:configuration>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/conf/confml/CI_homescreendb.confml	Fri Sep 17 08:27:54 2010 +0300
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<confml:configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:confml="http://www.s60.com/xml/confml/2" xsi:schemaLocation="http://www.s60.com/xml/confml/2 http://www.s60.com/xml/confml/1#//confml2" name="HomeScreen database settings">
+  <confml:feature ref="HomeScreenDbSettings" name="HomeScreen database settings">
+    <confml:setting ref="Pages" mapKey="id" mapValue="id" name="Pages" type="sequence">
+      <confml:setting ref="id" name="ID" type="int"/>
+      <confml:setting ref="indexPosition" name="Index Position" type="int"/>
+    </confml:setting>
+    <confml:setting ref="Widgets" mapKey="id" mapValue="id" name="Widgets" type="sequence">
+      <confml:setting ref="id" name="ID" type="int"/>
+      <confml:setting ref="uri" name="URI" type="string"/>
+      <confml:setting ref="pageId" name="Page ID" type="selection">
+        <confml:option map="HomeScreenDbSettings/Pages"/>
+      </confml:setting>
+    </confml:setting>
+    <confml:setting ref="WidgetPresentations" name="Widget presentations" type="sequence">
+      <confml:setting ref="key" name="Key" type="string"/>
+      <confml:setting ref="x" name="X position" type="real"/>
+      <confml:setting ref="y" name="Y position" type="real"/>
+      <confml:setting ref="zValue" name="Z value" type="real"/>
+      <confml:setting ref="widgetId" name="Widget ID" type="selection">
+        <confml:option map="HomeScreenDbSettings/Widgets"/>
+      </confml:setting>
+    </confml:setting>
+    <confml:setting ref="WidgetPreferences" name="Widget preferences" type="sequence">
+      <confml:setting ref="key" name="Key" type="string"/>
+      <confml:setting ref="value" name="Value" type="string"/>
+      <confml:setting ref="widgetId" name="Widget ID" type="selection">
+        <confml:option map="HomeScreenDbSettings/Widgets"/>
+      </confml:setting>
+    </confml:setting>
+    <confml:setting ref="Configuration" name="Configuration" type="sequence">
+      <confml:setting ref="key" name="Key" type="string"/>
+      <confml:setting ref="value" name="Value" type="string"/>
+    </confml:setting>
+  </confml:feature>
+  <confml:data>
+    <confml:HomeScreenDbSettings>
+      <confml:Widgets><confml:id>1</confml:id><confml:uri>hsclockwidgetplugin</confml:uri><confml:pageId  map="HomeScreenDbSettings/Pages[@key='1']"></confml:pageId></confml:Widgets>
+      <confml:Widgets><confml:id>2</confml:id><confml:uri>dialerwidgetplugin</confml:uri><confml:pageId map="HomeScreenDbSettings/Pages[@key='1']"></confml:pageId></confml:Widgets>
+      <confml:Widgets><confml:id>3</confml:id><confml:uri>ftuhswidget</confml:uri><confml:pageId map="HomeScreenDbSettings/Pages[@key='1']"></confml:pageId></confml:Widgets>
+      <confml:Widgets><confml:id>4</confml:id><confml:uri>hsshortcutwidgetplugin</confml:uri><confml:pageId map="HomeScreenDbSettings/Pages[@key='2']"></confml:pageId></confml:Widgets>
+      <confml:Widgets><confml:id>5</confml:id><confml:uri>hsshortcutwidgetplugin</confml:uri><confml:pageId map="HomeScreenDbSettings/Pages[@key='2']"></confml:pageId></confml:Widgets>
+      <confml:Widgets><confml:id>6</confml:id><confml:uri>hsshortcutwidgetplugin</confml:uri><confml:pageId map="HomeScreenDbSettings/Pages[@key='2']"></confml:pageId></confml:Widgets>
+      <confml:Widgets><confml:id>7</confml:id><confml:uri>hsshortcutwidgetplugin</confml:uri><confml:pageId map="HomeScreenDbSettings/Pages[@key='2']"></confml:pageId></confml:Widgets>
+      <confml:Widgets><confml:id>8</confml:id><confml:uri>hsshortcutwidgetplugin</confml:uri><confml:pageId map="HomeScreenDbSettings/Pages[@key='2']"></confml:pageId></confml:Widgets>
+      <confml:Widgets><confml:id>9</confml:id><confml:uri>hsshortcutwidgetplugin</confml:uri><confml:pageId map="HomeScreenDbSettings/Pages[@key='2']"></confml:pageId></confml:Widgets>
+      <confml:Widgets><confml:id>10</confml:id><confml:uri>hsshortcutwidgetplugin</confml:uri><confml:pageId map="HomeScreenDbSettings/Pages[@key='2']"></confml:pageId></confml:Widgets>
+      <confml:Widgets><confml:id>11</confml:id><confml:uri>hsshortcutwidgetplugin</confml:uri><confml:pageId map="HomeScreenDbSettings/Pages[@key='3']"></confml:pageId></confml:Widgets>
+      <confml:Widgets><confml:id>12</confml:id><confml:uri>hsshortcutwidgetplugin</confml:uri><confml:pageId map="HomeScreenDbSettings/Pages[@key='3']"></confml:pageId></confml:Widgets>
+      <confml:Widgets><confml:id>13</confml:id><confml:uri>hsshortcutwidgetplugin</confml:uri><confml:pageId map="HomeScreenDbSettings/Pages[@key='3']"></confml:pageId></confml:Widgets>
+      <confml:WidgetPresentations><confml:key>portrait</confml:key><confml:x>15</confml:x><confml:y>80</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='1']"></confml:widgetId></confml:WidgetPresentations>
+      <confml:WidgetPresentations><confml:key>landscape</confml:key><confml:x>15</confml:x><confml:y>80</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='1']"></confml:widgetId></confml:WidgetPresentations>
+      <confml:WidgetPresentations><confml:key>portrait</confml:key><confml:x>136</confml:x><confml:y>276</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='2']"></confml:widgetId></confml:WidgetPresentations>
+      <confml:WidgetPresentations><confml:key>landscape</confml:key><confml:x>136</confml:x><confml:y>176</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='2']"></confml:widgetId></confml:WidgetPresentations>
+      <confml:WidgetPresentations><confml:key>portrait</confml:key><confml:x>15</confml:x><confml:y>400</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='3']"></confml:widgetId></confml:WidgetPresentations>
+      <confml:WidgetPresentations><confml:key>landscape</confml:key><confml:x>300</confml:x><confml:y>150</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='3']"></confml:widgetId></confml:WidgetPresentations>
+      <confml:WidgetPresentations><confml:key>portrait</confml:key><confml:x>15</confml:x><confml:y>80</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='4']"></confml:widgetId></confml:WidgetPresentations>
+      <confml:WidgetPresentations><confml:key>portrait</confml:key><confml:x>100</confml:x><confml:y>80</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='5']"></confml:widgetId></confml:WidgetPresentations>
+      <confml:WidgetPresentations><confml:key>portrait</confml:key><confml:x>185</confml:x><confml:y>80</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='6']"></confml:widgetId></confml:WidgetPresentations>
+      <confml:WidgetPresentations><confml:key>portrait</confml:key><confml:x>270</confml:x><confml:y>80</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='7']"></confml:widgetId></confml:WidgetPresentations>
+      <confml:WidgetPresentations><confml:key>portrait</confml:key><confml:x>15</confml:x><confml:y>185</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='8']"></confml:widgetId></confml:WidgetPresentations>
+      <confml:WidgetPresentations><confml:key>portrait</confml:key><confml:x>100</confml:x><confml:y>185</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='9']"></confml:widgetId></confml:WidgetPresentations>
+      <confml:WidgetPresentations><confml:key>portrait</confml:key><confml:x>185</confml:x><confml:y>185</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='10']"></confml:widgetId></confml:WidgetPresentations>
+      <confml:WidgetPresentations><confml:key>portrait</confml:key><confml:x>15</confml:x><confml:y>80</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='11']"></confml:widgetId></confml:WidgetPresentations>
+      <confml:WidgetPresentations><confml:key>portrait</confml:key><confml:x>100</confml:x><confml:y>80</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='12']"></confml:widgetId></confml:WidgetPresentations>
+      <confml:WidgetPresentations><confml:key>portrait</confml:key><confml:x>185</confml:x><confml:y>80</confml:y><confml:zValue>0.0</confml:zValue><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='13']"></confml:widgetId></confml:WidgetPresentations>
+      <confml:WidgetPreferences><confml:key>clockType</confml:key><confml:value>Analog</confml:value><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='1']"></confml:widgetId></confml:WidgetPreferences>
+      <confml:WidgetPreferences><confml:key>uid</confml:key><confml:value>0x20022EF9</confml:value><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='4']"></confml:widgetId></confml:WidgetPreferences>
+      <confml:WidgetPreferences><confml:key>uid</confml:key><confml:value>0x10005901</confml:value><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='5']"></confml:widgetId></confml:WidgetPreferences>
+      <confml:WidgetPreferences><confml:key>uid</confml:key><confml:value>0x20029F80</confml:value><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='6']"></confml:widgetId></confml:WidgetPreferences>
+      <confml:WidgetPreferences><confml:key>uid</confml:key><confml:value>0x2001FE79</confml:value><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='7']"></confml:widgetId></confml:WidgetPreferences>
+      <confml:WidgetPreferences><confml:key>uid</confml:key><confml:value>0x10207C62</confml:value><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='8']"></confml:widgetId></confml:WidgetPreferences>
+      <confml:WidgetPreferences><confml:key>uid</confml:key><confml:value>0x10005951</confml:value><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='9']"></confml:widgetId></confml:WidgetPreferences>
+      <confml:WidgetPreferences><confml:key>uid</confml:key><confml:value>0x20025FD9</confml:value><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='10']"></confml:widgetId></confml:WidgetPreferences>
+      <confml:WidgetPreferences><confml:key>uid</confml:key><confml:value>0x102828D6</confml:value><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='11']"></confml:widgetId></confml:WidgetPreferences>
+      <confml:WidgetPreferences><confml:key>uid</confml:key><confml:value>0x101FB751</confml:value><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='12']"></confml:widgetId></confml:WidgetPreferences>
+      <confml:WidgetPreferences><confml:key>uid</confml:key><confml:value>0x100059EE</confml:value><confml:widgetId map="HomeScreenDbSettings/Widgets[@key='13']"></confml:widgetId></confml:WidgetPreferences>
+      <confml:Pages><confml:id>1</confml:id><confml:indexPosition>0</confml:indexPosition></confml:Pages>
+      <confml:Pages><confml:id>2</confml:id><confml:indexPosition>1</confml:indexPosition></confml:Pages>
+      <confml:Pages><confml:id>3</confml:id><confml:indexPosition>2</confml:indexPosition></confml:Pages>
+      <confml:Configuration><confml:key>bounceEffect</confml:key><confml:value>20</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>pageChangeAnimationDuration</confml:key><confml:value>300</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>pageChangeZoneAnimationDuration</confml:key><confml:value>600</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>pageChangeZoneReverseAnimationDuration</confml:key><confml:value>200</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>pageRemovedAnimationDuration</confml:key><confml:value>1000</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>newPageAddedAnimationDuration</confml:key><confml:value>1000</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>widgetDragEffectDuration</confml:key><confml:value>250</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>widgetDropEffectDuration</confml:key><confml:value>200</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>defaultPageId</confml:key><confml:value>1</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>maximumPageCount</confml:key><confml:value>8</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>isShortcutLabelVisible</confml:key><confml:value>true</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>bounceFeedbackEffectDistance</confml:key><confml:value>30</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>pageChangeZoneWidth</confml:key><confml:value>30</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>pageIndicatorSpacing</confml:key><confml:value>8</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>maximumWidgetHeight</confml:key><confml:value>39</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>maximumWidgetWidth</confml:key><confml:value>48</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>minimumWidgetHeight</confml:key><confml:value>8.75</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>minimumWidgetWidth</confml:key><confml:value>8.75</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>pageChangePanDistance</confml:key><confml:value>120</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>pageChangeFeedbackEffect</confml:key><confml:value>Sensitive</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>widgetPickFeedbackEffect</confml:key><confml:value>ItemPick</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>widgetDropFeedbackEffect</confml:key><confml:value>ItemDrop</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>widgetRepositionFeedbackEffect</confml:key><confml:value>BounceEffect</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>widgetOverTrashbinFeedbackEffect</confml:key><confml:value>ItemMoveOver</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>widgetDropToTrashbinFeedbackEffect</confml:key><confml:value>ItemDrop</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>shortcutWidgetTapFeedbackEffect</confml:key><confml:value>BasicItem</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>widgetMoveBlockedFeedbackEffect</confml:key><confml:value>Basic</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>clockWidgetTapFeedbackEffect</confml:key><confml:value>BasicItem</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>widgetSnappingFeedbackEffect</confml:key><confml:value>ItemMoveOver</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>isSnapEnabled</confml:key><confml:value>true</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>snapTimeout</confml:key><confml:value>300</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>snapForce</confml:key><confml:value>30</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>snapGap</confml:key><confml:value>6</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>pageMargin</confml:key><confml:value>0</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>snapLineFadeInDuration</confml:key><confml:value>100</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>snapLineFadeOutDuration</confml:key><confml:value>100</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>isSnapEffectsEnabled</confml:key><confml:value>true</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>sceneType</confml:key><confml:value>PageWallpapers</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>bounceAnimationEasingCurve</confml:key><confml:value>Linear</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>pageChangeAnimationEasingCurve</confml:key><confml:value>Linear</confml:value></confml:Configuration>      
+    </confml:HomeScreenDbSettings>
+  </confml:data>
+</confml:configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/conf/confml/homescreendb.confml	Fri Sep 17 08:27:54 2010 +0300
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:confml="http://www.s60.com/xml/confml/2" xsi:schemaLocation="http://www.s60.com/xml/confml/2 http://www.s60.com/xml/confml/1#//confml2" name="HomeScreen database settings">
+  <feature ref="HomeScreenDbSettings" name="HomeScreen database settings">
+    <setting ref="Pages" mapKey="id" mapValue="id" name="Pages" type="sequence">
+      <setting ref="id" name="ID" type="int"/>
+      <setting ref="indexPosition" name="Index Position" type="int"/>
+    </setting>
+    <setting ref="Widgets" mapKey="id" mapValue="id" name="Widgets" type="sequence">
+      <setting ref="id" name="ID" type="int"/>
+      <setting ref="uri" name="URI" type="string"/>
+      <setting ref="pageId" name="Page ID" type="selection">
+        <option map="HomeScreenDbSettings/Pages"/>
+      </setting>
+    </setting>
+    <setting ref="WidgetPresentations" name="Widget presentations" type="sequence">
+      <setting ref="key" name="Key" type="string"/>
+      <setting ref="x" name="X position" type="real"/>
+      <setting ref="y" name="Y position" type="real"/>
+      <setting ref="zValue" name="Z value" type="real"/>
+      <setting ref="widgetId" name="Widget ID" type="selection">
+        <option map="HomeScreenDbSettings/Widgets"/>
+      </setting>
+    </setting>
+    <setting ref="WidgetPreferences" name="Widget preferences" type="sequence">
+      <setting ref="key" name="Key" type="string"/>
+      <setting ref="value" name="Value" type="string"/>
+      <setting ref="widgetId" name="Widget ID" type="selection">
+        <option map="HomeScreenDbSettings/Widgets"/>
+      </setting>
+    </setting>
+    <setting ref="Configuration" name="Configuration" type="sequence">
+      <setting ref="key" name="Key" type="string"/>
+      <setting ref="value" name="Value" type="string"/>
+    </setting>
+  </feature>
+  <data>
+    <HomeScreenDbSettings>
+      <Widgets><id>1</id><uri>hsclockwidgetplugin</uri><pageId  map="HomeScreenDbSettings/Pages[@key='1']"></pageId></Widgets>
+      <Widgets><id>2</id><uri>dialerwidgetplugin</uri><pageId map="HomeScreenDbSettings/Pages[@key='1']"></pageId></Widgets>
+      <Widgets><id>3</id><uri>ftuhswidget</uri><pageId map="HomeScreenDbSettings/Pages[@key='1']"></pageId></Widgets>
+      <Widgets><id>4</id><uri>hsshortcutwidgetplugin</uri><pageId map="HomeScreenDbSettings/Pages[@key='2']"></pageId></Widgets>
+      <Widgets><id>5</id><uri>hsshortcutwidgetplugin</uri><pageId map="HomeScreenDbSettings/Pages[@key='2']"></pageId></Widgets>
+      <Widgets><id>6</id><uri>hsshortcutwidgetplugin</uri><pageId map="HomeScreenDbSettings/Pages[@key='2']"></pageId></Widgets>
+      <Widgets><id>7</id><uri>hsshortcutwidgetplugin</uri><pageId map="HomeScreenDbSettings/Pages[@key='2']"></pageId></Widgets>
+      <Widgets><id>8</id><uri>hsshortcutwidgetplugin</uri><pageId map="HomeScreenDbSettings/Pages[@key='2']"></pageId></Widgets>
+      <Widgets><id>9</id><uri>hsshortcutwidgetplugin</uri><pageId map="HomeScreenDbSettings/Pages[@key='2']"></pageId></Widgets>
+      <Widgets><id>10</id><uri>hsshortcutwidgetplugin</uri><pageId map="HomeScreenDbSettings/Pages[@key='2']"></pageId></Widgets>
+      <Widgets><id>11</id><uri>hsshortcutwidgetplugin</uri><pageId map="HomeScreenDbSettings/Pages[@key='3']"></pageId></Widgets>
+      <Widgets><id>12</id><uri>hsshortcutwidgetplugin</uri><pageId map="HomeScreenDbSettings/Pages[@key='3']"></pageId></Widgets>
+      <Widgets><id>13</id><uri>hsshortcutwidgetplugin</uri><pageId map="HomeScreenDbSettings/Pages[@key='3']"></pageId></Widgets>
+      <WidgetPresentations><key>portrait</key><x>15</x><y>80</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='1']"></widgetId></WidgetPresentations>
+      <WidgetPresentations><key>landscape</key><x>15</x><y>80</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='1']"></widgetId></WidgetPresentations>
+      <WidgetPresentations><key>portrait</key><x>136</x><y>276</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='2']"></widgetId></WidgetPresentations>
+      <WidgetPresentations><key>landscape</key><x>136</x><y>176</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='2']"></widgetId></WidgetPresentations>
+      <WidgetPresentations><key>portrait</key><x>15</x><y>400</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='3']"></widgetId></WidgetPresentations>
+      <WidgetPresentations><key>landscape</key><x>300</x><y>150</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='3']"></widgetId></WidgetPresentations>
+      <WidgetPresentations><key>portrait</key><x>15</x><y>80</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='4']"></widgetId></WidgetPresentations>
+      <WidgetPresentations><key>portrait</key><x>100</x><y>80</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='5']"></widgetId></WidgetPresentations>
+      <WidgetPresentations><key>portrait</key><x>185</x><y>80</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='6']"></widgetId></WidgetPresentations>
+      <WidgetPresentations><key>portrait</key><x>270</x><y>80</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='7']"></widgetId></WidgetPresentations>
+      <WidgetPresentations><key>portrait</key><x>15</x><y>185</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='8']"></widgetId></WidgetPresentations>
+      <WidgetPresentations><key>portrait</key><x>100</x><y>185</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='9']"></widgetId></WidgetPresentations>
+      <WidgetPresentations><key>portrait</key><x>185</x><y>185</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='10']"></widgetId></WidgetPresentations>
+      <WidgetPresentations><key>portrait</key><x>15</x><y>80</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='11']"></widgetId></WidgetPresentations>
+      <WidgetPresentations><key>portrait</key><x>100</x><y>80</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='12']"></widgetId></WidgetPresentations>
+      <WidgetPresentations><key>portrait</key><x>185</x><y>80</y><zValue>0.0</zValue><widgetId map="HomeScreenDbSettings/Widgets[@key='13']"></widgetId></WidgetPresentations>
+      <WidgetPreferences><key>clockType</key><value>Analog</value><widgetId map="HomeScreenDbSettings/Widgets[@key='1']"></widgetId></WidgetPreferences>
+      <WidgetPreferences><key>uid</key><value>0x20022EF9</value><widgetId map="HomeScreenDbSettings/Widgets[@key='4']"></widgetId></WidgetPreferences>
+      <WidgetPreferences><key>uid</key><value>0x10005901</value><widgetId map="HomeScreenDbSettings/Widgets[@key='5']"></widgetId></WidgetPreferences>
+      <WidgetPreferences><key>uid</key><value>0x20029F80</value><widgetId map="HomeScreenDbSettings/Widgets[@key='6']"></widgetId></WidgetPreferences>
+      <WidgetPreferences><key>uid</key><value>0x2001FE79</value><widgetId map="HomeScreenDbSettings/Widgets[@key='7']"></widgetId></WidgetPreferences>
+      <WidgetPreferences><key>uid</key><value>0x10207C62</value><widgetId map="HomeScreenDbSettings/Widgets[@key='8']"></widgetId></WidgetPreferences>
+      <WidgetPreferences><key>uid</key><value>0x10005951</value><widgetId map="HomeScreenDbSettings/Widgets[@key='9']"></widgetId></WidgetPreferences>
+      <WidgetPreferences><key>uid</key><value>0x20025FD9</value><widgetId map="HomeScreenDbSettings/Widgets[@key='10']"></widgetId></WidgetPreferences>
+      <WidgetPreferences><key>uid</key><value>0x102828D6</value><widgetId map="HomeScreenDbSettings/Widgets[@key='11']"></widgetId></WidgetPreferences>
+      <WidgetPreferences><key>uid</key><value>0x101FB751</value><widgetId map="HomeScreenDbSettings/Widgets[@key='12']"></widgetId></WidgetPreferences>
+      <WidgetPreferences><key>uid</key><value>0x100059EE</value><widgetId map="HomeScreenDbSettings/Widgets[@key='13']"></widgetId></WidgetPreferences>
+      <Pages><id>1</id><indexPosition>0</indexPosition></Pages>
+      <Pages><id>2</id><indexPosition>1</indexPosition></Pages>
+      <Pages><id>3</id><indexPosition>2</indexPosition></Pages>
+      <Configuration><key>bounceEffect</key><value>20</value></Configuration>
+      <Configuration><key>pageChangeAnimationDuration</key><value>300</value></Configuration>
+      <Configuration><key>pageChangeZoneAnimationDuration</key><value>600</value></Configuration>
+      <Configuration><key>pageChangeZoneReverseAnimationDuration</key><value>200</value></Configuration>
+      <Configuration><key>pageRemovedAnimationDuration</key><value>1000</value></Configuration>
+      <Configuration><key>newPageAddedAnimationDuration</key><value>1000</value></Configuration>
+      <Configuration><key>widgetDragEffectDuration</key><value>250</value></Configuration>
+      <Configuration><key>widgetDropEffectDuration</key><value>200</value></Configuration>
+      <Configuration><key>defaultPageId</key><value>1</value></Configuration>
+      <Configuration><key>maximumPageCount</key><value>8</value></Configuration>
+      <Configuration><key>isShortcutLabelVisible</key><value>true</value></Configuration>
+      <Configuration><key>bounceFeedbackEffectDistance</key><value>30</value></Configuration>
+      <Configuration><key>pageChangeZoneWidth</key><value>30</value></Configuration>
+      <Configuration><key>pageIndicatorSpacing</key><value>8</value></Configuration>
+      <Configuration><key>maximumWidgetHeight</key><value>39</value></Configuration>
+      <Configuration><key>maximumWidgetWidth</key><value>48</value></Configuration>
+      <Configuration><key>minimumWidgetHeight</key><value>8.75</value></Configuration>
+      <Configuration><key>minimumWidgetWidth</key><value>8.75</value></Configuration>
+      <Configuration><key>pageChangePanDistance</key><value>120</value></Configuration>
+      <Configuration><key>pageChangeFeedbackEffect</key><value>Sensitive</value></Configuration>
+      <Configuration><key>widgetPickFeedbackEffect</key><value>ItemPick</value></Configuration>
+      <Configuration><key>widgetDropFeedbackEffect</key><value>ItemDrop</value></Configuration>
+      <Configuration><key>widgetRepositionFeedbackEffect</key><value>BounceEffect</value></Configuration>
+      <Configuration><key>widgetOverTrashbinFeedbackEffect</key><value>ItemMoveOver</value></Configuration>
+      <Configuration><key>widgetDropToTrashbinFeedbackEffect</key><value>ItemDrop</value></Configuration>
+      <Configuration><key>shortcutWidgetTapFeedbackEffect</key><value>BasicItem</value></Configuration>
+      <Configuration><key>widgetMoveBlockedFeedbackEffect</key><value>Basic</value></Configuration>
+      <Configuration><key>clockWidgetTapFeedbackEffect</key><value>BasicItem</value></Configuration>
+      <Configuration><key>widgetSnappingFeedbackEffect</key><value>ItemMoveOver</value></Configuration>
+      <Configuration><key>isSnapEnabled</key><value>true</value></Configuration>
+      <Configuration><key>snapTimeout</key><value>300</value></Configuration>
+      <Configuration><key>snapForce</key><value>30</value></Configuration>
+      <Configuration><key>snapGap</key><value>6</value></Configuration>
+      <Configuration><key>pageMargin</key><value>0</value></Configuration>
+      <Configuration><key>snapLineFadeInDuration</key><value>100</value></Configuration>
+      <Configuration><key>snapLineFadeOutDuration</key><value>100</value></Configuration>
+      <Configuration><key>isSnapEffectsEnabled</key><value>true</value></Configuration>
+      <Configuration><key>sceneType</key><value>PageWallpapers</value></Configuration>
+      <Configuration><key>bounceAnimationEasingCurve</key><value>Linear</value></Configuration>
+      <Configuration><key>pageChangeAnimationEasingCurve</key><value>Linear</value></Configuration>      
+    </HomeScreenDbSettings>
+  </data>
+</configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/conf/implml/homescreendb.implml	Fri Sep 17 08:27:54 2010 +0300
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<container xmlns="http://www.symbianfoundation.org/xml/implml/1">
+  <tag name="target" value="rofs2"/> 
+  <tag name="target" value="rofs3"/> 
+  
+    <!--
+    Override the setting refs so that modifying HomeScreenDbSettings
+    causes the execution of both the TemplateML and CommandML
+    implementations. Otherwise the TemplateML implementation would be
+    executed only if the settings have been changed, and the CommandML
+    implementation would be executed every time.
+    -->
+    <settingRefsOverride>
+        <settingRef value="HomeScreenDbSettings"/>
+    </settingRefsOverride>
+    
+    <!-- TemplateML implementation to create the .sql files -->
+    <templateml xmlns="http://www.s60.com/xml/templateml/1">
+    
+    <!-- just to create empty folder -->
+    <output dir="content/private/20022f35/" file="homescreen.db" encoding="UTF-8"></output>
+    
+        <output dir="private/20022f35/sql/" file="create.sql" encoding="UTF-8">
+            <template file="homescreendb_templates/create.sql"></template>
+        </output>
+        <output dir="private/20022f35/sql/" file="fill.sql" encoding="UTF-8">
+            <template file="homescreendb_templates/fill.sql"/>
+        </output>
+    </templateml>
+    
+    <!-- CommandML implementation to create the database using the .sql files -->
+    <commandml xmlns="http://www.s60.com/xml/commandml/1">
+        <command executable="sqlite3" shell="true" cwd="%CONE_OUT_ABSOLUTE%/private/20022f35/sql">
+            <argument value='%CONE_OUT_ABSOLUTE%/content/private/20022f35/homescreen.db ".read create.sql"'/>
+        </command>
+        <command executable="sqlite3" shell="true" cwd="%CONE_OUT_ABSOLUTE%/private/20022f35/sql">
+            <argument value='%CONE_OUT_ABSOLUTE%/content/private/20022f35/homescreen.db ".genfkey --exec"'/>
+        </command>
+        <command executable="sqlite3" shell="true" cwd="%CONE_OUT_ABSOLUTE%/private/20022f35/sql">
+            <argument value='%CONE_OUT_ABSOLUTE%/content/private/20022f35/homescreen.db ".read fill.sql"'/>
+        </command>
+    </commandml>
+</container>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/conf/implml/homescreendb_templates/create.sql	Fri Sep 17 08:27:54 2010 +0300
@@ -0,0 +1,39 @@
+DROP TABLE IF EXISTS Scene;
+CREATE TABLE Scene (
+  id INTEGER PRIMARY KEY);
+
+DROP TABLE IF EXISTS Pages;
+CREATE TABLE Pages (
+  id INTEGER PRIMARY KEY,  
+  indexPosition INTEGER);
+
+DROP TABLE IF EXISTS Widgets;
+CREATE TABLE Widgets (
+  id INTEGER PRIMARY KEY,
+  uri TEXT,  
+  pageId INTEGER);
+
+DROP TABLE IF EXISTS WidgetPresentations;
+CREATE TABLE WidgetPresentations (
+  key TEXT,
+  x REAL,
+  y REAL,
+  zValue REAL,	
+  widgetId INTEGER,
+  UNIQUE(widgetId, key) ON CONFLICT REPLACE,
+  FOREIGN KEY(widgetId) REFERENCES Widgets(id) ON DELETE CASCADE);
+
+DROP TABLE IF EXISTS WidgetPreferences;
+CREATE TABLE WidgetPreferences (
+  key TEXT,
+  value TEXT,
+  widgetId INTEGER,
+  UNIQUE(widgetId, key) ON CONFLICT REPLACE,
+  FOREIGN KEY(widgetId) REFERENCES Widgets(id) ON DELETE CASCADE);
+
+DROP TABLE IF EXISTS Configuration;
+CREATE TABLE Configuration (
+	key TEXT,
+	value TEXT,
+	UNIQUE(key) ON CONFLICT REPLACE);
+	
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/conf/implml/homescreendb_templates/fill.sql	Fri Sep 17 08:27:54 2010 +0300
@@ -0,0 +1,40 @@
+INSERT INTO Scene (id) VALUES (1);
+
+{% for index in range(feat_tree.HomeScreenDbSettings.Pages._value|length) -%}
+    {%- set id = feat_tree.HomeScreenDbSettings.Pages.id._value[index] -%}
+    {%- set indexPosition = feat_tree.HomeScreenDbSettings.Pages.indexPosition._value[index] -%}
+    INSERT INTO Pages (id, indexPosition) VALUES ({{id}}, {{indexPosition}});
+{% endfor %}
+
+{% for index in range(feat_tree.HomeScreenDbSettings.Widgets._value|length) -%}
+    {%- set id = feat_tree.HomeScreenDbSettings.Widgets.id._value[index] -%}
+    {%- set uri = feat_tree.HomeScreenDbSettings.Widgets.uri._value[index] or '' -%}
+    {%- set pageId = feat_tree.HomeScreenDbSettings.Widgets.pageId._value[index] -%}
+    
+    INSERT INTO Widgets (id, uri, pageId) VALUES ({{id}}, '{{uri}}', {{pageId}});
+{% endfor %}
+
+{% for index in range(feat_tree.HomeScreenDbSettings.WidgetPresentations._value|length) -%}
+    {%- set key = feat_tree.HomeScreenDbSettings.WidgetPresentations.key._value[index] or '' -%}
+    {%- set x = feat_tree.HomeScreenDbSettings.WidgetPresentations.x._value[index] -%}
+    {%- set y = feat_tree.HomeScreenDbSettings.WidgetPresentations.y._value[index] -%}
+    {%- set zValue = feat_tree.HomeScreenDbSettings.WidgetPresentations.zValue._value[index] -%}
+    {%- set widgetId = feat_tree.HomeScreenDbSettings.WidgetPresentations.widgetId._value[index] -%}
+    
+    INSERT INTO WidgetPresentations (key, x, y, zValue, widgetId) VALUES ('{{key}}', {{x}}, {{y}}, {{zValue}}, {{widgetId}});
+{% endfor %}
+
+{% for index in range(feat_tree.HomeScreenDbSettings.WidgetPreferences._value|length) -%}
+    {%- set key = feat_tree.HomeScreenDbSettings.WidgetPreferences.key._value[index] or '' -%}
+    {%- set value = feat_tree.HomeScreenDbSettings.WidgetPreferences.value._value[index] -%}
+    {%- set widgetId = feat_tree.HomeScreenDbSettings.WidgetPreferences.widgetId._value[index] -%}
+    
+    INSERT INTO WidgetPreferences (key, value, widgetId) VALUES ('{{key}}', '{{value}}', {{widgetId}});
+{% endfor %}
+
+{% for index in range(feat_tree.HomeScreenDbSettings.Configuration._value|length) -%}
+    {%- set key = feat_tree.HomeScreenDbSettings.Configuration.key._value[index] or '' -%}
+    {%- set value = feat_tree.HomeScreenDbSettings.Configuration.value._value[index] -%}
+    
+    INSERT INTO Configuration (key, value) VALUES ('{{key}}', '{{value}}');
+{% endfor %}
--- a/homescreenapp/hsapplication/conf/product_1/confml/data.confml	Thu Sep 02 20:17:27 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<confml:configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:confml="http://www.s60.com/xml/confml/2" xsi:schemaLocation="http://www.s60.com/xml/confml/2 http://www.s60.com/xml/confml/1#//confml2" name="data">
-  <confml:data>
-    <confml:HomeScreenDbSettings>
-      <confml:DefaultPageId map="HomeScreenDbSettings/Pages[@key='1']"/>
-      <confml:LandscapeWallpaper></confml:LandscapeWallpaper>
-      <confml:PortraitWallpaper></confml:PortraitWallpaper>
-      <confml:Pages extensionPolicy="replace"><confml:Id>1</confml:Id><confml:PageIndex>0</confml:PageIndex></confml:Pages>
-      <confml:Pages><confml:Id>2</confml:Id><confml:PageIndex>1</confml:PageIndex></confml:Pages>
-      <confml:Pages><confml:Id>3</confml:Id><confml:PageIndex>2</confml:PageIndex></confml:Pages>
-      <confml:Widgets extensionPolicy="replace"><confml:Id>1</confml:Id><confml:Uri>hsclockwidgetplugin</confml:Uri><confml:PageId>1</confml:PageId></confml:Widgets>
-      <confml:Widgets><confml:Id>2</confml:Id><confml:Uri>hsdialerwidgetplugin</confml:Uri><confml:PageId>1</confml:PageId></confml:Widgets>
-      <confml:WidgetPreferences extensionPolicy="replace"><confml:Key>clockType</confml:Key><confml:Value>Analog</confml:Value><confml:WidgetId>1</confml:WidgetId></confml:WidgetPreferences>
-      <confml:WidgetPresentations extensionPolicy="append"><confml:Key>portrait</confml:Key><confml:XPosition>27</confml:XPosition><confml:YPosition>92</confml:YPosition><confml:Width>167.5</confml:Width><confml:Height>167.5</confml:Height><confml:ZValue>0.0</confml:ZValue><confml:WidgetId map="HomeScreenDbSettings/Widgets[@key='1']"></confml:WidgetId></confml:WidgetPresentations>
-      <confml:WidgetPresentations><confml:Key>landscape</confml:Key><confml:XPosition>10</confml:XPosition><confml:YPosition>75</confml:YPosition><confml:Width>150</confml:Width><confml:Height>150</confml:Height><confml:ZValue>0.0</confml:ZValue><confml:WidgetId map="HomeScreenDbSettings/Widgets[@key='1']"></confml:WidgetId></confml:WidgetPresentations>
-      <confml:WidgetPresentations><confml:Key>portrait</confml:Key><confml:XPosition>136</confml:XPosition><confml:YPosition>276</confml:YPosition><confml:Width>81</confml:Width><confml:Height>81</confml:Height><confml:ZValue>0.0</confml:ZValue><confml:WidgetId map="HomeScreenDbSettings/Widgets[@key='2']"></confml:WidgetId></confml:WidgetPresentations>
-      <confml:WidgetPresentations><confml:Key>landscape</confml:Key><confml:XPosition>136</confml:XPosition><confml:YPosition>176</confml:YPosition><confml:Width>81</confml:Width><confml:Height>81</confml:Height><confml:ZValue>0.0</confml:ZValue><confml:WidgetId map="HomeScreenDbSettings/Widgets[@key='2']"></confml:WidgetId></confml:WidgetPresentations>
-    </confml:HomeScreenDbSettings>
-  </confml:data>
-</confml:configuration>
\ No newline at end of file
--- a/homescreenapp/hsapplication/conf/product_1/root.confml	Thu Sep 02 20:17:27 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<confml:configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:confml="http://www.s60.com/xml/confml/2" xmlns:xi="http://www.w3.org/2001/XInclude" xsi:schemaLocation="http://www.s60.com/xml/confml/2 http://www.s60.com/xml/confml/1#//confml2 http://www.w3.org/2001/XInclude http://www.s60.com/xml/confml/1#//include">
-  <xi:include href="confml/data.confml"/>
-</confml:configuration>
\ No newline at end of file
--- a/homescreenapp/hsapplication/conf/product_1_root.confml	Thu Sep 02 20:17:27 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<confml:configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:confml="http://www.s60.com/xml/confml/2" xmlns:xi="http://www.w3.org/2001/XInclude" xsi:schemaLocation="http://www.s60.com/xml/confml/2 http://www.s60.com/xml/confml/1#//confml2 http://www.w3.org/2001/XInclude http://www.s60.com/xml/confml/1#//include">
-  <xi:include href="base/root.confml"/>
-  <xi:include href="product_1/root.confml"/>
-</confml:configuration>
\ No newline at end of file
--- a/homescreenapp/hsapplication/conf/product_2/root.confml	Thu Sep 02 20:17:27 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<confml:configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:confml="http://www.s60.com/xml/confml/2" xsi:schemaLocation="http://www.s60.com/xml/confml/2 http://www.s60.com/xml/confml/1#//confml2"/>
\ No newline at end of file
--- a/homescreenapp/hsapplication/conf/product_2_root.confml	Thu Sep 02 20:17:27 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<confml:configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:confml="http://www.s60.com/xml/confml/2" xmlns:xi="http://www.w3.org/2001/XInclude" xsi:schemaLocation="http://www.s60.com/xml/confml/2 http://www.s60.com/xml/confml/1#//confml2 http://www.w3.org/2001/XInclude http://www.s60.com/xml/confml/1#//include">
-  <xi:include href="base/root.confml"/>
-  <xi:include href="product_2/root.confml"/>
-</confml:configuration>
\ No newline at end of file
--- a/homescreenapp/hsapplication/conf/root.confml	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hsapplication/conf/root.confml	Fri Sep 17 08:27:54 2010 +0300
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <confml:configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:confml="http://www.s60.com/xml/confml/2" xmlns:xi="http://www.w3.org/2001/XInclude" xsi:schemaLocation="http://www.s60.com/xml/confml/2 http://www.s60.com/xml/confml/1#//confml2 http://www.w3.org/2001/XInclude http://www.s60.com/xml/confml/1#//include">
-  <xi:include href="base/root.confml"/>
+  <xi:include href="confml/homescreendb.confml"/>
 </confml:configuration>
\ No newline at end of file
--- a/homescreenapp/hsapplication/conf/variant_1_of_product_1/root.confml	Thu Sep 02 20:17:27 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<confml:configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:confml="http://www.s60.com/xml/confml/2" xsi:schemaLocation="http://www.s60.com/xml/confml/2 http://www.s60.com/xml/confml/1#//confml2"/>
\ No newline at end of file
--- a/homescreenapp/hsapplication/conf/variant_1_of_product_1_root.confml	Thu Sep 02 20:17:27 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<confml:configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:confml="http://www.s60.com/xml/confml/2" xmlns:xi="http://www.w3.org/2001/XInclude" xsi:schemaLocation="http://www.s60.com/xml/confml/2 http://www.s60.com/xml/confml/1#//confml2 http://www.w3.org/2001/XInclude http://www.s60.com/xml/confml/1#//include">
-  <xi:include href="base/root.confml"/>
-  <xi:include href="product_1/root.confml"/>
-  <xi:include href="variant_1_of_product_1/root.confml"/>
-</confml:configuration>
\ No newline at end of file
--- a/homescreenapp/hsapplication/conf/variant_2_of_product_1/root.confml	Thu Sep 02 20:17:27 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<confml:configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:confml="http://www.s60.com/xml/confml/2" xsi:schemaLocation="http://www.s60.com/xml/confml/2 http://www.s60.com/xml/confml/1#//confml2"/>
\ No newline at end of file
--- a/homescreenapp/hsapplication/conf/variant_2_of_product_1_root.confml	Thu Sep 02 20:17:27 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<confml:configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:confml="http://www.s60.com/xml/confml/2" xmlns:xi="http://www.w3.org/2001/XInclude" xsi:schemaLocation="http://www.s60.com/xml/confml/2 http://www.s60.com/xml/confml/1#//confml2 http://www.w3.org/2001/XInclude http://www.s60.com/xml/confml/1#//include">
-  <xi:include href="base/root.confml"/>
-  <xi:include href="product_1/root.confml"/>
-  <xi:include href="variant_2_of_product_1/root.confml"/>
-</confml:configuration>
\ No newline at end of file
--- a/homescreenapp/hsapplication/conf/variant_3_of_product_1/root.confml	Thu Sep 02 20:17:27 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<confml:configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:confml="http://www.s60.com/xml/confml/2" xsi:schemaLocation="http://www.s60.com/xml/confml/2 http://www.s60.com/xml/confml/1#//confml2"/>
\ No newline at end of file
--- a/homescreenapp/hsapplication/conf/variant_3_of_product_1_root.confml	Thu Sep 02 20:17:27 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<confml:configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:confml="http://www.s60.com/xml/confml/2" xmlns:xi="http://www.w3.org/2001/XInclude" xsi:schemaLocation="http://www.s60.com/xml/confml/2 http://www.s60.com/xml/confml/1#//confml2 http://www.w3.org/2001/XInclude http://www.s60.com/xml/confml/1#//include">
-  <xi:include href="base/root.confml"/>
-  <xi:include href="product_1/root.confml"/>
-  <xi:include href="variant_3_of_product_1/root.confml"/>
-</confml:configuration>
\ No newline at end of file
--- a/homescreenapp/hsapplication/conf/variant_4_of_product_1/root.confml	Thu Sep 02 20:17:27 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<confml:configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:confml="http://www.s60.com/xml/confml/2" xsi:schemaLocation="http://www.s60.com/xml/confml/2 http://www.s60.com/xml/confml/1#//confml2"/>
\ No newline at end of file
--- a/homescreenapp/hsapplication/conf/variant_4_of_product_1_root.confml	Thu Sep 02 20:17:27 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<confml:configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:confml="http://www.s60.com/xml/confml/2" xmlns:xi="http://www.w3.org/2001/XInclude" xsi:schemaLocation="http://www.s60.com/xml/confml/2 http://www.s60.com/xml/confml/1#//confml2 http://www.w3.org/2001/XInclude http://www.s60.com/xml/confml/1#//include">
-  <xi:include href="base/root.confml"/>
-  <xi:include href="product_1/root.confml"/>
-  <xi:include href="variant_4_of_product_1/root.confml"/>
-</confml:configuration>
\ No newline at end of file
--- a/homescreenapp/hsapplication/conf/variant_5_of_product_1/root.confml	Thu Sep 02 20:17:27 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<confml:configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:confml="http://www.s60.com/xml/confml/2" xsi:schemaLocation="http://www.s60.com/xml/confml/2 http://www.s60.com/xml/confml/1#//confml2"/>
\ No newline at end of file
--- a/homescreenapp/hsapplication/conf/variant_5_of_product_1_root.confml	Thu Sep 02 20:17:27 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<confml:configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:confml="http://www.s60.com/xml/confml/2" xmlns:xi="http://www.w3.org/2001/XInclude" xsi:schemaLocation="http://www.s60.com/xml/confml/2 http://www.s60.com/xml/confml/1#//confml2 http://www.w3.org/2001/XInclude http://www.s60.com/xml/confml/1#//include">
-  <xi:include href="base/root.confml"/>
-  <xi:include href="product_1/root.confml"/>
-  <xi:include href="variant_5_of_product_1/root.confml"/>
-</confml:configuration>
\ No newline at end of file
--- a/homescreenapp/hsapplication/hsapplication_exports_to_rom.pri	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hsapplication/hsapplication_exports_to_rom.pri	Fri Sep 17 08:27:54 2010 +0300
@@ -16,9 +16,9 @@
 
 # configuration file exports
 BLD_INF_RULES.prj_exports += \
-    "conf/base/confml/CI_homescreendb.confml                APP_LAYER_CONFML(CI_homescreendb.confml)" \
-    "conf/base/confml/homescreendb.confml                   APP_LAYER_CONFML(homescreendb.confml)" \
-    "conf/base/implml/homescreendb.implml                   APP_LAYER_CRML(homescreendb.implml)" \
-    "conf/base/implml/homescreendb_templates/create.sql     APP_LAYER_CRML(homescreendb_templates/create.sql)" \
-    "conf/base/implml/homescreendb_templates/fill.sql       APP_LAYER_CRML(homescreendb_templates/fill.sql)"
+    "conf/confml/CI_homescreendb.confml                APP_LAYER_CONFML(CI_homescreendb.confml)" \
+    "conf/confml/homescreendb.confml                   APP_LAYER_CONFML(homescreendb.confml)" \
+    "conf/implml/homescreendb.implml                   APP_LAYER_CRML(homescreendb.implml)" \
+    "conf/implml/homescreendb_templates/create.sql     APP_LAYER_CRML(homescreendb_templates/create.sql)" \
+    "conf/implml/homescreendb_templates/fill.sql       APP_LAYER_CRML(homescreendb_templates/fill.sql)"
     
\ No newline at end of file
--- a/homescreenapp/hsapplication/inc/hshomescreenclientserviceprovider.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hsapplication/inc/hshomescreenclientserviceprovider.h	Fri Sep 17 08:27:54 2010 +0300
@@ -46,6 +46,7 @@
 public slots:
     bool addWidget(const QString &uri,const QVariantHash &preferences);
     void setWallpaper(const QString &fileName);
+    void setWallpaper(const QString &portraitFileName, const QString &landscapeFileName);
     bool widgetUninstalled(const QVariantHash &widgetDescriptor);
     void onImageSet();
     void onImageSetFailed();    
--- a/homescreenapp/hsapplication/src/hshomescreen.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hsapplication/src/hshomescreen.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -135,12 +135,25 @@
 void HsHomeScreen::registerServicePlugins()
 {    
     HSTEST_FUNC_ENTRY("HS::HsHomeScreen::registerServicePlugins()");
+
+#ifdef Q_OS_SYMBIAN    
+    foreach(QFileInfo drive, QDir::drives()) {
+        QApplication::addLibraryPath(drive.absolutePath() 
+            + QLatin1String("resource/qt/plugins/homescreen"));
+    }
+#else
+    QApplication::addLibraryPath("resource/qt/plugins/homescreen");
+#endif    
     
     QServiceManager serviceManager;
     
     QStringList pluginPaths;
     
     pluginPaths << "private/20022F35";
+    
+#ifndef Q_OS_SYMBIAN
+    pluginPaths << "resource/qt/plugins/homescreen";
+#endif
 
     QFileInfoList drives = QDir::drives();
     foreach(const QString pluginPath, pluginPaths) {
@@ -205,4 +218,4 @@
 #ifndef Q_OS_SYMBIAN 
 #pragma CTC ENDSKIP
 #endif // Q_OS_SYMBIAN
-#endif //COVERAGE_MEASUREMENT
\ No newline at end of file
+#endif //COVERAGE_MEASUREMENT
--- a/homescreenapp/hsapplication/src/hshomescreenclientserviceprovider.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hsapplication/src/hshomescreenclientserviceprovider.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -96,6 +96,32 @@
 }
 
 /*!
+    Changes the active page's wallpaper based on the \a portraitFileName and \a landscapeFileName.
+*/
+void HsHomeScreenClientServiceProvider::setWallpaper(const QString &portraitFileName, const QString &landscapeFileName)
+{
+#ifndef HOMESCREEN_TEST //We can't use QtHighway at unit tests due to missing service client connection
+    mAsyncRequestIndex = setCurrentRequestAsync();
+#endif
+    if (!mWaitDialog) {
+        mWaitDialog = new HsSpinnerDialog();
+    }
+    mWaitDialog->start();
+    mShowAnimation = true;
+    if (HSCONFIGURATION_GET(sceneType) == HsConfiguration::PageWallpapers) {
+        mWallpaper = HsScene::instance()->activePage()->wallpaper();
+    } else {
+        mWallpaper = HsScene::instance()->wallpaper();
+    }
+    connect(mWallpaper, SIGNAL(imageSet()), 
+        SLOT(onImageSet()));
+    connect(mWallpaper, SIGNAL(imageSetFailed()),
+        SLOT(onImageSetFailed()));
+    
+    mWallpaper->setImages(portraitFileName, landscapeFileName);
+}
+
+/*!
     \internal
     Called when wallpaper image has been set successfully
 */
@@ -153,7 +179,7 @@
 */
 HsWidgetComponentDescriptor HsHomeScreenClientServiceProvider::widgetComponentDescriptor(const QVariantHash& widgetDescriptor)
 {
-    HsWidgetComponentDescriptor widget;
+    HsWidgetComponentDescriptor widget; 
     widget.setInstallationPath(widgetDescriptor["installationPath"].toString());
     widget.setUri(widgetDescriptor["uri"].toString());
     widget.setTitle(widgetDescriptor["title"].toString());
--- a/homescreenapp/hsapplication/src/hsstatemachine.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hsapplication/src/hsstatemachine.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -276,7 +276,8 @@
     	mPublisher = new QValueSpacePublisher(HsStatePSKeyPath);
     }
 
-    mPublisher->setValue(HsStatePSKeySubPath, EHomeScreenInactive);
+    // initialize state to invalid, actual status updates after state creation
+    mPublisher->setValue(HsStatePSKeySubPath, EHomeScreenInvalid);
 }
 
 /*!
@@ -436,18 +437,21 @@
 		createStatePublisher();
 	}
 
-	if (mHomeScreenActive && mIdleStateActive){
-    	qDebug() << "HsStateMachine::updatePSKeys: EHomeScreenIdleState";
-    	mPublisher->setValue(HsStatePSKeySubPath, EHomeScreenIdleState);
-    }
-    else{
-    	qDebug() << "HsStateMachine::updatePSKeys: EHomeScreenInactive";
-    	mPublisher->setValue(HsStatePSKeySubPath, EHomeScreenInactive);
-    }	
-    
-    if (mHomeScreenActive && !mIdleStateActive) {
+    if (mHomeScreenActive && mIdleStateActive) {
+    	qDebug() << "HsStateMachine::updatePSKeys: EHomeScreenWidgetViewForeground";
+    	mPublisher->setValue(HsStatePSKeySubPath, EHomeScreenWidgetViewForeground);
+        captureEndKey(false);
+    } else if (mHomeScreenActive && !mIdleStateActive) {
+    	qDebug() << "HsStateMachine::updatePSKeys: EHomeScreenApplicationLibraryViewForeground";
+    	mPublisher->setValue(HsStatePSKeySubPath, EHomeScreenApplicationLibraryViewForeground);
         captureEndKey(true);
+    } else if (!mHomeScreenActive && mIdleStateActive){
+        qDebug() << "HsStateMachine::updatePSKeys: EHomeScreenApplicationBackground | EHomeScreenWidgetViewActive";
+        mPublisher->setValue(HsStatePSKeySubPath, EHomeScreenApplicationBackground | EHomeScreenWidgetViewActive);
+        captureEndKey(false);
     } else {
+        qDebug() << "HsStateMachine::updatePSKeys: EHomeScreenApplicationBackground | EHomeScreenApplicationLibraryViewActive";
+        mPublisher->setValue(HsStatePSKeySubPath, EHomeScreenApplicationBackground | EHomeScreenApplicationLibraryViewActive);
         captureEndKey(false);
     }
     mSendKeyCaptured = false;
@@ -466,6 +470,8 @@
         mEndKeyCaptured = false;
         keyCapture.cancelCaptureKey(Qt::Key_No);
     }
+#else
+    Q_UNUSED(enable)
 #endif
 }
 
--- a/homescreenapp/hsdomainmodel/bwins/hsdomainmodelu.def	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hsdomainmodel/bwins/hsdomainmodelu.def	Fri Sep 17 08:27:54 2010 +0300
@@ -67,593 +67,597 @@
 	?qt_metacast@HsSceneWallpaper@@UAEPAXPBD@Z @ 66 NONAME ; void * HsSceneWallpaper::qt_metacast(char const *)
 	?metaObject@HsWallpaperLoader@@UBEPBUQMetaObject@@XZ @ 67 NONAME ; struct QMetaObject const * HsWallpaperLoader::metaObject(void) const
 	?action_finished@HsWidgetHost@@AAEXXZ @ 68 NONAME ; void HsWidgetHost::action_finished(void)
-	?visual@HsWidgetHost@@QBEPAVHsWidgetHostVisual@@XZ @ 69 NONAME ; class HsWidgetHostVisual * HsWidgetHost::visual(void) const
-	?pageChangeFeedbackEffect@HsConfiguration@@QBE?AW4InstantEffect@HbFeedback@@XZ @ 70 NONAME ; enum HbFeedback::InstantEffect HsConfiguration::pageChangeFeedbackEffect(void) const
-	??0HsWallpaperLoader@@QAE@PAVQObject@@@Z @ 71 NONAME ; HsWallpaperLoader::HsWallpaperLoader(class QObject *)
-	?trUtf8@HsShortcutService@@SA?AVQString@@PBD0H@Z @ 72 NONAME ; class QString HsShortcutService::trUtf8(char const *, char const *, int)
-	?maximumWidgetWidth@HsConfiguration@@QBEMXZ @ 73 NONAME ; float HsConfiguration::maximumWidgetWidth(void) const
-	?metaObject@HsContentService@@UBEPBUQMetaObject@@XZ @ 74 NONAME ; struct QMetaObject const * HsContentService::metaObject(void) const
-	?setScene@HsSceneWallpaper@@QAEXPAVHsScene@@@Z @ 75 NONAME ; void HsSceneWallpaper::setScene(class HsScene *)
-	?onPageMarginChanged@HsPage@@AAEXABVQString@@@Z @ 76 NONAME ; void HsPage::onPageMarginChanged(class QString const &)
-	?finished@HsWidgetHost@@IAEXXZ @ 77 NONAME ; void HsWidgetHost::finished(void)
-	?pagePanStarted@HsScene@@IAEXPAVQGestureEvent@@@Z @ 78 NONAME ; void HsScene::pagePanStarted(class QGestureEvent *)
-	?addPage@HsScene@@QAE_NPAVHsPage@@@Z @ 79 NONAME ; bool HsScene::addPage(class HsPage *)
-	?controlLayer@HsIdleWidget@@QBEPAVHbWidget@@XZ @ 80 NONAME ; class HbWidget * HsIdleWidget::controlLayer(void) const
-	?qt_metacall@HsWidgetHost@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 81 NONAME ; int HsWidgetHost::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?configuration@HsDatabase@@QAE_NAAV?$QHash@VQString@@VQVariant@@@@@Z @ 82 NONAME ; bool HsDatabase::configuration(class QHash<class QString, class QVariant> &)
-	?tr@HsContentService@@SA?AVQString@@PBD0@Z @ 83 NONAME ; class QString HsContentService::tr(char const *, char const *)
-	?mInstance@HsHostedWidgetFactory@@0PAV1@A @ 84 NONAME ; class HsHostedWidgetFactory * HsHostedWidgetFactory::mInstance
-	?setInstance@HsHostedWidgetFactory@@SAPAV1@PAV1@@Z @ 85 NONAME ; class HsHostedWidgetFactory * HsHostedWidgetFactory::setInstance(class HsHostedWidgetFactory *)
-	?staticMetaObject@HsScene@@2UQMetaObject@@B @ 86 NONAME ; struct QMetaObject const HsScene::staticMetaObject
-	?setMaximumWidgetWidth@HsConfiguration@@QAEXM@Z @ 87 NONAME ; void HsConfiguration::setMaximumWidgetWidth(float)
-	?scene@HsDatabase@@QAE_NAAVHsSceneData@@@Z @ 88 NONAME ; bool HsDatabase::scene(class HsSceneData &)
-	?resetNewWidgets@HsPage@@QAEXXZ @ 89 NONAME ; void HsPage::resetNewWidgets(void)
-	?tr@HsScene@@SA?AVQString@@PBD0@Z @ 90 NONAME ; class QString HsScene::tr(char const *, char const *)
-	?tr@HsPage@@SA?AVQString@@PBD0@Z @ 91 NONAME ; class QString HsPage::tr(char const *, char const *)
-	?emitAvailable@HsWidgetComponent@@AAEXXZ @ 92 NONAME ; void HsWidgetComponent::emitAvailable(void)
-	?getStaticMetaObject@HsDatabase@@SAABUQMetaObject@@XZ @ 93 NONAME ; struct QMetaObject const & HsDatabase::getStaticMetaObject(void)
-	?contentRect@HsPage@@QAE?AVQRectF@@XZ @ 94 NONAME ; class QRectF HsPage::contentRect(void)
-	?tr@HsPageVisual@@SA?AVQString@@PBD0@Z @ 95 NONAME ; class QString HsPageVisual::tr(char const *, char const *)
-	?setIconUri@HsWidgetComponentDescriptor@@QAEXABVQString@@@Z @ 96 NONAME ; void HsWidgetComponentDescriptor::setIconUri(class QString const &)
-	?orientationChanged@HsGui@@IAEXW4Orientation@Qt@@@Z @ 97 NONAME ; void HsGui::orientationChanged(enum Qt::Orientation)
-	?widgetAdded@HsContentService@@IAEXABVQString@@ABV?$QHash@VQString@@VQVariant@@@@@Z @ 98 NONAME ; void HsContentService::widgetAdded(class QString const &, class QHash<class QString, class QVariant> const &)
-	?staticMetaObject@HsWallpaperLoaderThread@@2UQMetaObject@@B @ 99 NONAME ; struct QMetaObject const HsWallpaperLoaderThread::staticMetaObject
-	?databaseName@HsDatabase@@QBE?AVQString@@XZ @ 100 NONAME ; class QString HsDatabase::databaseName(void) const
-	?setPageChangeAnimationEasingCurve@HsConfiguration@@QAEXW4Type@QEasingCurve@@@Z @ 101 NONAME ; void HsConfiguration::setPageChangeAnimationEasingCurve(enum QEasingCurve::Type)
-	?setPageChangeZoneAnimationDuration@HsConfiguration@@QAEXH@Z @ 102 NONAME ; void HsConfiguration::setPageChangeZoneAnimationDuration(int)
-	?qt_metacast@HsIdleWidget@@UAEPAXPBD@Z @ 103 NONAME ; void * HsIdleWidget::qt_metacast(char const *)
-	?executeCollectionAction@HsShortcutService@@QAEXHABVQString@@@Z @ 104 NONAME ; void HsShortcutService::executeCollectionAction(int, class QString const &)
-	?widgets@HsDatabase@@QAE_NABVQString@@ABV?$QHash@VQString@@VQVariant@@@@AAH@Z @ 105 NONAME ; bool HsDatabase::widgets(class QString const &, class QHash<class QString, class QVariant> const &, int &)
-	?qt_metacast@HsWallpaperLoaderThread@@UAEPAXPBD@Z @ 106 NONAME ; void * HsWallpaperLoaderThread::qt_metacast(char const *)
-	?pageCrawlingAnimation@HsGui@@QAEPAVHsPropertyAnimationWrapper@@XZ @ 107 NONAME ; class HsPropertyAnimationWrapper * HsGui::pageCrawlingAnimation(void)
-	?setSceneType@HsConfiguration@@QAEXW4SceneType@1@@Z @ 108 NONAME ; void HsConfiguration::setSceneType(enum HsConfiguration::SceneType)
-	?layoutNewWidgets@HsPage@@QAEXXZ @ 109 NONAME ; void HsPage::layoutNewWidgets(void)
-	?matchWidgetPreferences@HsDatabase@@AAE_NABV?$QHash@VQString@@VQVariant@@@@ABV?$QMultiMap@VQString@@V1@@@@Z @ 110 NONAME ; bool HsDatabase::matchWidgetPreferences(class QHash<class QString, class QVariant> const &, class QMultiMap<class QString, class QString> const &)
-	?tr@HsWidgetHostVisual@@SA?AVQString@@PBD0@Z @ 111 NONAME ; class QString HsWidgetHostVisual::tr(char const *, char const *)
-	?targetSize@HsWallpaperLoaderThread@@QBE?AVQSize@@XZ @ 112 NONAME ; class QSize HsWallpaperLoaderThread::targetSize(void) const
-	?trUtf8@HsWallpaperLoader@@SA?AVQString@@PBD0H@Z @ 113 NONAME ; class QString HsWallpaperLoader::trUtf8(char const *, char const *, int)
-	?event_remove@HsWidgetHost@@IAEXXZ @ 114 NONAME ; void HsWidgetHost::event_remove(void)
-	?startDropEffect@HsWidgetHost@@QAEXXZ @ 115 NONAME ; void HsWidgetHost::startDropEffect(void)
-	?trUtf8@HsWidgetComponentRegistry@@SA?AVQString@@PBD0@Z @ 116 NONAME ; class QString HsWidgetComponentRegistry::trUtf8(char const *, char const *)
-	?event_close@HsWidgetHost@@IAEXXZ @ 117 NONAME ; void HsWidgetHost::event_close(void)
-	??1HsWallpaperLoader@@UAE@XZ @ 118 NONAME ; HsWallpaperLoader::~HsWallpaperLoader(void)
-	?mInstance@HsBackupRestoreObserver@@0PAV1@A @ 119 NONAME ; class HsBackupRestoreObserver * HsBackupRestoreObserver::mInstance
-	?connectWidget@HsPage@@AAEXPAVHsWidgetHost@@@Z @ 120 NONAME ; void HsPage::connectWidget(class HsWidgetHost *)
-	?setShortcutLabelVisible@HsConfiguration@@QAEX_N@Z @ 121 NONAME ; void HsConfiguration::setShortcutLabelVisible(bool)
-	?sceneLayer@HsIdleWidget@@QBEPAVHbWidget@@XZ @ 122 NONAME ; class HbWidget * HsIdleWidget::sceneLayer(void) const
-	?trUtf8@HsWallpaperLoaderThread@@SA?AVQString@@PBD0@Z @ 123 NONAME ; class QString HsWallpaperLoaderThread::trUtf8(char const *, char const *)
-	?qt_metacast@HsScene@@UAEPAXPBD@Z @ 124 NONAME ; void * HsScene::qt_metacast(char const *)
-	??1HsWidgetHost@@UAE@XZ @ 125 NONAME ; HsWidgetHost::~HsWidgetHost(void)
-	?uninstallComponent@HsWidgetComponentRegistry@@QAEXABVHsWidgetComponentDescriptor@@@Z @ 126 NONAME ; void HsWidgetComponentRegistry::uninstallComponent(class HsWidgetComponentDescriptor const &)
-	?action_notifyRemove@HsWidgetHost@@AAEXXZ @ 127 NONAME ; void HsWidgetHost::action_notifyRemove(void)
-	?open@HsDatabase@@QAE_NXZ @ 128 NONAME ; bool HsDatabase::open(void)
-	?idleWidget@HsGui@@QBEPAVHsIdleWidget@@XZ @ 129 NONAME ; class HsIdleWidget * HsGui::idleWidget(void) const
-	?pageMargin@HsConfiguration@@QBEMXZ @ 130 NONAME ; float HsConfiguration::pageMargin(void) const
-	?failed@HsWallpaperLoader@@IAEXXZ @ 131 NONAME ; void HsWallpaperLoader::failed(void)
-	?setPos@HsWidgetPresentationData@@QAEXABVQPointF@@@Z @ 132 NONAME ; void HsWidgetPresentationData::setPos(class QPointF const &)
-	?isSnapEffectsEnabled@HsConfiguration@@QBE_NXZ @ 133 NONAME ; bool HsConfiguration::isSnapEffectsEnabled(void) const
-	?trUtf8@HsWallpaperLoaderThread@@SA?AVQString@@PBD0H@Z @ 134 NONAME ; class QString HsWallpaperLoaderThread::trUtf8(char const *, char const *, int)
-	?setSourcePath@HsWallpaperLoaderThread@@QAEXABVQString@@@Z @ 135 NONAME ; void HsWallpaperLoaderThread::setSourcePath(class QString const &)
-	?tr@HsGui@@SA?AVQString@@PBD0@Z @ 136 NONAME ; class QString HsGui::tr(char const *, char const *)
-	?disconnectWidget@HsPage@@AAEXPAVHsWidgetHost@@@Z @ 137 NONAME ; void HsPage::disconnectWidget(class HsWidgetHost *)
-	?setOnline@HsPage@@QAEX_N@Z @ 138 NONAME ; void HsPage::setOnline(bool)
-	?tr@HsDatabase@@SA?AVQString@@PBD0@Z @ 139 NONAME ; class QString HsDatabase::tr(char const *, char const *)
-	?onLoaderFailed@HsWallpaper@@AAEXXZ @ 140 NONAME ; void HsWallpaper::onLoaderFailed(void)
-	?trUtf8@HsScene@@SA?AVQString@@PBD0@Z @ 141 NONAME ; class QString HsScene::trUtf8(char const *, char const *)
-	?uninstallTranslator@HsWidgetComponent@@AAEXXZ @ 142 NONAME ; void HsWidgetComponent::uninstallTranslator(void)
-	?setGeometry@HsIdleWidget@@UAEXABVQRectF@@@Z @ 143 NONAME ; void HsIdleWidget::setGeometry(class QRectF const &)
-	?updateZValues@HsPage@@QAEXXZ @ 144 NONAME ; void HsPage::updateZValues(void)
-	?tr@HsShortcutService@@SA?AVQString@@PBD0H@Z @ 145 NONAME ; class QString HsShortcutService::tr(char const *, char const *, int)
-	?pos@HsWidgetPresentationData@@QBE?AVQPointF@@XZ @ 146 NONAME ; class QPointF HsWidgetPresentationData::pos(void) const
-	?getStaticMetaObject@HsBackupRestoreObserver@@SAABUQMetaObject@@XZ @ 147 NONAME ; struct QMetaObject const & HsBackupRestoreObserver::getStaticMetaObject(void)
-	?trUtf8@HsPageVisual@@SA?AVQString@@PBD0@Z @ 148 NONAME ; class QString HsPageVisual::trUtf8(char const *, char const *)
-	?action_show@HsWidgetHost@@AAEXXZ @ 149 NONAME ; void HsWidgetHost::action_show(void)
-	?pageLayer@HsIdleWidget@@QBEPAVHbWidget@@XZ @ 150 NONAME ; class HbWidget * HsIdleWidget::pageLayer(void) const
-	?setSnapGap@HsConfiguration@@QAEXM@Z @ 151 NONAME ; void HsConfiguration::setSnapGap(float)
-	?trUtf8@HsHostedWidgetFactory@@SA?AVQString@@PBD0@Z @ 152 NONAME ; class QString HsHostedWidgetFactory::trUtf8(char const *, char const *)
-	?setActiveWidget@HsScene@@QAEXPAVHsWidgetHost@@@Z @ 153 NONAME ; void HsScene::setActiveWidget(class HsWidgetHost *)
-	?transaction@HsDatabase@@QAE_NXZ @ 154 NONAME ; bool HsDatabase::transaction(void)
-	?snapForce@HsConfiguration@@QBEMXZ @ 155 NONAME ; float HsConfiguration::snapForce(void) const
-	?isOnline@HsScene@@QBE_NXZ @ 156 NONAME ; bool HsScene::isOnline(void) const
-	??0HsWidgetPresentationData@@QAE@XZ @ 157 NONAME ; HsWidgetPresentationData::HsWidgetPresentationData(void)
-	?tr@HsShortcutService@@SA?AVQString@@PBD0@Z @ 158 NONAME ; class QString HsShortcutService::tr(char const *, char const *)
-	?metaObject@HsWidgetComponent@@UBEPBUQMetaObject@@XZ @ 159 NONAME ; struct QMetaObject const * HsWidgetComponent::metaObject(void) const
-	?setConnectionName@HsDatabase@@QAEXABVQString@@@Z @ 160 NONAME ; void HsDatabase::setConnectionName(class QString const &)
-	?qt_metacall@HsGui@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 161 NONAME ; int HsGui::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?metaObject@HsWallpaper@@UBEPBUQMetaObject@@XZ @ 162 NONAME ; struct QMetaObject const * HsWallpaper::metaObject(void) const
-	?removeWidget@HsPage@@QAE_NPAVHsWidgetHost@@@Z @ 163 NONAME ; bool HsPage::removeWidget(class HsWidgetHost *)
-	?trUtf8@HsPageVisual@@SA?AVQString@@PBD0H@Z @ 164 NONAME ; class QString HsPageVisual::trUtf8(char const *, char const *, int)
-	?tr@HsWallpaperLoaderThread@@SA?AVQString@@PBD0@Z @ 165 NONAME ; class QString HsWallpaperLoaderThread::tr(char const *, char const *)
-	?qt_metacall@HsWallpaper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 166 NONAME ; int HsWallpaper::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?onWidgetUnavailable@HsPage@@AAEXXZ @ 167 NONAME ; void HsPage::onWidgetUnavailable(void)
-	?mInstance@HsDatabase@@0PAV1@A @ 168 NONAME ; class HsDatabase * HsDatabase::mInstance
-	?available@HsWidgetComponent@@IAEXXZ @ 169 NONAME ; void HsWidgetComponent::available(void)
-	?tr@HsSceneWallpaper@@SA?AVQString@@PBD0@Z @ 170 NONAME ; class QString HsSceneWallpaper::tr(char const *, char const *)
-	?trUtf8@HsPage@@SA?AVQString@@PBD0@Z @ 171 NONAME ; class QString HsPage::trUtf8(char const *, char const *)
-	?trUtf8@HsWidgetHostVisual@@SA?AVQString@@PBD0H@Z @ 172 NONAME ; class QString HsWidgetHostVisual::trUtf8(char const *, char const *, int)
-	?hideWidgets@HsPage@@QAEXXZ @ 173 NONAME ; void HsPage::hideWidgets(void)
-	?trUtf8@HsWidgetHost@@SA?AVQString@@PBD0H@Z @ 174 NONAME ; class QString HsWidgetHost::trUtf8(char const *, char const *, int)
-	?qt_metacall@HsHostedWidgetFactory@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 175 NONAME ; int HsHostedWidgetFactory::qt_metacall(enum QMetaObject::Call, int, void * *)
-	??0HsScene@@QAE@PAVQObject@@@Z @ 176 NONAME ; HsScene::HsScene(class QObject *)
-	?getStaticMetaObject@HsPageVisual@@SAABUQMetaObject@@XZ @ 177 NONAME ; struct QMetaObject const & HsPageVisual::getStaticMetaObject(void)
-	?pagePanUpdated@HsScene@@IAEXPAVQGestureEvent@@@Z @ 178 NONAME ; void HsScene::pagePanUpdated(class QGestureEvent *)
-	?showTrashBin@HsIdleWidget@@QAEXXZ @ 179 NONAME ; void HsIdleWidget::showTrashBin(void)
-	?qt_metacast@HsWidgetHost@@UAEPAXPBD@Z @ 180 NONAME ; void * HsWidgetHost::qt_metacast(char const *)
-	?trUtf8@HsWallpaperLoader@@SA?AVQString@@PBD0@Z @ 181 NONAME ; class QString HsWallpaperLoader::trUtf8(char const *, char const *)
-	?qt_metacall@HsWidgetComponentRegistry@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 182 NONAME ; int HsWidgetComponentRegistry::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?setMaximumWidgetHeight@HsConfiguration@@QAEXM@Z @ 183 NONAME ; void HsConfiguration::setMaximumWidgetHeight(float)
-	?qt_metacall@HsPageVisual@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 184 NONAME ; int HsPageVisual::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?instance@HsConfiguration@@SAPAV1@XZ @ 185 NONAME ; class HsConfiguration * HsConfiguration::instance(void)
-	?tr@HsWallpaperLoader@@SA?AVQString@@PBD0H@Z @ 186 NONAME ; class QString HsWallpaperLoader::tr(char const *, char const *, int)
-	??_EHsConfiguration@@UAE@I@Z @ 187 NONAME ; HsConfiguration::~HsConfiguration(unsigned int)
-	?metaObject@HsPage@@UBEPBUQMetaObject@@XZ @ 188 NONAME ; struct QMetaObject const * HsPage::metaObject(void) const
-	?activePageIndex@HsScene@@QBEHXZ @ 189 NONAME ; int HsScene::activePageIndex(void) const
-	?qt_metacast@HsWidgetHostVisual@@UAEPAXPBD@Z @ 190 NONAME ; void * HsWidgetHostVisual::qt_metacast(char const *)
-	?hideHorizontalSnapLine@HsIdleWidget@@QAEXXZ @ 191 NONAME ; void HsIdleWidget::hideHorizontalSnapLine(void)
-	?minimumWidgetWidth@HsConfiguration@@QBEMXZ @ 192 NONAME ; float HsConfiguration::minimumWidgetWidth(void) const
-	?setWidgetPreferences@HsDatabase@@QAE_NHABV?$QHash@VQString@@VQVariant@@@@@Z @ 193 NONAME ; bool HsDatabase::setWidgetPreferences(int, class QHash<class QString, class QVariant> const &)
-	?orientation@HsGui@@QAE?AW4Orientation@Qt@@XZ @ 194 NONAME ; enum Qt::Orientation HsGui::orientation(void)
-	?deleteWidget@HsDatabase@@QAE_NH@Z @ 195 NONAME ; bool HsDatabase::deleteWidget(int)
-	?widgetOverTrashbinFeedbackEffect@HsConfiguration@@QBE?AW4InstantEffect@HbFeedback@@XZ @ 196 NONAME ; enum HbFeedback::InstantEffect HsConfiguration::widgetOverTrashbinFeedbackEffect(void) const
-	?deleteFromDatabase@HsPage@@QAE_NXZ @ 197 NONAME ; bool HsPage::deleteFromDatabase(void)
-	?setWidgetPresentation@HsDatabase@@QAE_NABVHsWidgetPresentationData@@@Z @ 198 NONAME ; bool HsDatabase::setWidgetPresentation(class HsWidgetPresentationData const &)
-	?takeInstance@HsGui@@SAPAV1@XZ @ 199 NONAME ; class HsGui * HsGui::takeInstance(void)
-	??0HsConfiguration@@QAE@PAVQObject@@@Z @ 200 NONAME ; HsConfiguration::HsConfiguration(class QObject *)
-	?setDefaultImage@HsWallpaper@@QAEXXZ @ 201 NONAME ; void HsWallpaper::setDefaultImage(void)
-	?setupTouchArea@HsPageVisual@@AAEXXZ @ 202 NONAME ; void HsPageVisual::setupTouchArea(void)
-	?trUtf8@HsWidgetComponent@@SA?AVQString@@PBD0H@Z @ 203 NONAME ; class QString HsWidgetComponent::trUtf8(char const *, char const *, int)
-	?setWidget@HsWidgetHostVisual@@QAEXPAVQObject@@@Z @ 204 NONAME ; void HsWidgetHostVisual::setWidget(class QObject *)
-	?importFromFile@HsConfiguration@@QAE_NABVQString@@@Z @ 205 NONAME ; bool HsConfiguration::importFromFile(class QString const &)
-	?page@HsDatabase@@QAE_NAAVHsPageData@@@Z @ 206 NONAME ; bool HsDatabase::page(class HsPageData &)
-	??_EHsPage@@UAE@I@Z @ 207 NONAME ; HsPage::~HsPage(unsigned int)
-	?instance@HsHostedWidgetFactory@@SAPAV1@XZ @ 208 NONAME ; class HsHostedWidgetFactory * HsHostedWidgetFactory::instance(void)
-	?staticMetaObject@HsPage@@2UQMetaObject@@B @ 209 NONAME ; struct QMetaObject const HsPage::staticMetaObject
-	?widgetDropFeedbackEffect@HsConfiguration@@QBE?AW4InstantEffect@HbFeedback@@XZ @ 210 NONAME ; enum HbFeedback::InstantEffect HsConfiguration::widgetDropFeedbackEffect(void) const
-	?pageChangeZoneReverseAnimationDuration@HsConfiguration@@QBEHXZ @ 211 NONAME ; int HsConfiguration::pageChangeZoneReverseAnimationDuration(void) const
-	?createWidget@HsContentService@@QAE_NABV?$QHash@VQString@@VQVariant@@@@@Z @ 212 NONAME ; bool HsContentService::createWidget(class QHash<class QString, class QVariant> const &)
-	?setVersion@HsWidgetComponentDescriptor@@QAEXABVQString@@@Z @ 213 NONAME ; void HsWidgetComponentDescriptor::setVersion(class QString const &)
-	?getStaticMetaObject@HsWallpaperLoader@@SAABUQMetaObject@@XZ @ 214 NONAME ; struct QMetaObject const & HsWallpaperLoader::getStaticMetaObject(void)
-	?mInstance@HsWidgetComponentRegistry@@0PAV1@A @ 215 NONAME ; class HsWidgetComponentRegistry * HsWidgetComponentRegistry::mInstance
-	?staticMetaObject@HsWidgetHost@@2UQMetaObject@@B @ 216 NONAME ; struct QMetaObject const HsWidgetHost::staticMetaObject
-	?qt_metacast@HsPageVisual@@UAEPAXPBD@Z @ 217 NONAME ; void * HsPageVisual::qt_metacast(char const *)
-	?qt_metacall@HsShortcutService@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 218 NONAME ; int HsShortcutService::qt_metacall(enum QMetaObject::Call, int, void * *)
-	??1HsPageWallpaper@@UAE@XZ @ 219 NONAME ; HsPageWallpaper::~HsPageWallpaper(void)
-	?startDropEffect@HsWidgetHostVisual@@QAEXXZ @ 220 NONAME ; void HsWidgetHostVisual::startDropEffect(void)
-	?activeWidget@HsScene@@QBEPAVHsWidgetHost@@XZ @ 221 NONAME ; class HsWidgetHost * HsScene::activeWidget(void) const
-	?widgets@HsDatabase@@QAE_NABVQString@@AAV?$QList@VHsWidgetData@@@@@Z @ 222 NONAME ; bool HsDatabase::widgets(class QString const &, class QList<class HsWidgetData> &)
-	?rootDirectory@HsWallpaper@@IBE?AVQString@@XZ @ 223 NONAME ; class QString HsWallpaper::rootDirectory(void) const
-	?tr@HsContentService@@SA?AVQString@@PBD0H@Z @ 224 NONAME ; class QString HsContentService::tr(char const *, char const *, int)
-	??0HsDatabase@@QAE@PAVQObject@@@Z @ 225 NONAME ; HsDatabase::HsDatabase(class QObject *)
-	?eventFilter@HsWidgetHostVisual@@MAE_NPAVQObject@@PAVQEvent@@@Z @ 226 NONAME ; bool HsWidgetHostVisual::eventFilter(class QObject *, class QEvent *)
-	?tr@HsWidgetHost@@SA?AVQString@@PBD0@Z @ 227 NONAME ; class QString HsWidgetHost::tr(char const *, char const *)
-	?remove@HsWallpaper@@QAEXXZ @ 228 NONAME ; void HsWallpaper::remove(void)
-	?idleView@HsGui@@QBEPAVHbView@@XZ @ 229 NONAME ; class HbView * HsGui::idleView(void) const
-	??1HsPageVisual@@UAE@XZ @ 230 NONAME ; HsPageVisual::~HsPageVisual(void)
-	?widgetMoveBlockedFeedbackEffect@HsConfiguration@@QBE?AW4InstantEffect@HbFeedback@@XZ @ 231 NONAME ; enum HbFeedback::InstantEffect HsConfiguration::widgetMoveBlockedFeedbackEffect(void) const
-	?widgetPickFeedbackEffect@HsConfiguration@@QBE?AW4InstantEffect@HbFeedback@@XZ @ 232 NONAME ; enum HbFeedback::InstantEffect HsConfiguration::widgetPickFeedbackEffect(void) const
-	?widgetSnappingFeedbackEffect@HsConfiguration@@QBE?AW4InstantEffect@HbFeedback@@XZ @ 233 NONAME ; enum HbFeedback::InstantEffect HsConfiguration::widgetSnappingFeedbackEffect(void) const
-	?load@HsScene@@QAE_NXZ @ 234 NONAME ; bool HsScene::load(void)
-	?trUtf8@HsSceneWallpaper@@SA?AVQString@@PBD0H@Z @ 235 NONAME ; class QString HsSceneWallpaper::trUtf8(char const *, char const *, int)
-	?tr@HsConfiguration@@SA?AVQString@@PBD0@Z @ 236 NONAME ; class QString HsConfiguration::tr(char const *, char const *)
-	?widgetRepositionFeedbackEffect@HsConfiguration@@QBE?AW4InstantEffect@HbFeedback@@XZ @ 237 NONAME ; enum HbFeedback::InstantEffect HsConfiguration::widgetRepositionFeedbackEffect(void) const
-	?onError@HsWidgetHost@@AAEXXZ @ 238 NONAME ; void HsWidgetHost::onError(void)
-	?cleanup@HsWallpaperLoader@@AAEXXZ @ 239 NONAME ; void HsWallpaperLoader::cleanup(void)
-	?targets@HsWallpaperLoader@@QBE?AV?$QHash@VQString@@VQVariant@@@@XZ @ 240 NONAME ; class QHash<class QString, class QVariant> HsWallpaperLoader::targets(void) const
-	??0HsShortcutService@@AAE@PAVQStateMachine@@PAVQObject@@@Z @ 241 NONAME ; HsShortcutService::HsShortcutService(class QStateMachine *, class QObject *)
-	?hideVerticalSnapLine@HsIdleWidget@@QAEXXZ @ 242 NONAME ; void HsIdleWidget::hideVerticalSnapLine(void)
-	?setActivePage@HsIdleWidget@@QAEXH@Z @ 243 NONAME ; void HsIdleWidget::setActivePage(int)
-	?setSnapLineFadeOutDuration@HsConfiguration@@QAEXH@Z @ 244 NONAME ; void HsConfiguration::setSnapLineFadeOutDuration(int)
-	?polishEvent@HsIdleWidget@@MAEXXZ @ 245 NONAME ; void HsIdleWidget::polishEvent(void)
-	?tr@HsPageWallpaper@@SA?AVQString@@PBD0H@Z @ 246 NONAME ; class QString HsPageWallpaper::tr(char const *, char const *, int)
-	?widgetDropToTrashbinFeedbackEffect@HsConfiguration@@QBE?AW4InstantEffect@HbFeedback@@XZ @ 247 NONAME ; enum HbFeedback::InstantEffect HsConfiguration::widgetDropToTrashbinFeedbackEffect(void) const
-	?staticMetaObject@HsPageWallpaper@@2UQMetaObject@@B @ 248 NONAME ; struct QMetaObject const HsPageWallpaper::staticMetaObject
-	?onWidgetFinished@HsPage@@AAEXXZ @ 249 NONAME ; void HsPage::onWidgetFinished(void)
-	?onThreadFinished@HsWallpaperLoader@@AAEXXZ @ 250 NONAME ; void HsWallpaperLoader::onThreadFinished(void)
-	?tr@HsWidgetComponentRegistry@@SA?AVQString@@PBD0H@Z @ 251 NONAME ; class QString HsWidgetComponentRegistry::tr(char const *, char const *, int)
-	?loadControlLayer@HsIdleWidget@@AAEXXZ @ 252 NONAME ; void HsIdleWidget::loadControlLayer(void)
-	?action_initialize@HsWidgetHost@@AAEXXZ @ 253 NONAME ; void HsWidgetHost::action_initialize(void)
-	?sceneX@HsIdleWidget@@QBEMXZ @ 254 NONAME ; float HsIdleWidget::sceneX(void) const
-	?action_load@HsWidgetHost@@AAEXXZ @ 255 NONAME ; void HsWidgetHost::action_load(void)
-	?connectionName@HsDatabase@@QBE?AVQString@@XZ @ 256 NONAME ; class QString HsDatabase::connectionName(void) const
-	?snapLineFadeInDuration@HsConfiguration@@QBEHXZ @ 257 NONAME ; int HsConfiguration::snapLineFadeInDuration(void) const
-	?setMethod@HsWidgetHost@@AAE_NPBDAAVQMetaMethod@@@Z @ 258 NONAME ; bool HsWidgetHost::setMethod(char const *, class QMetaMethod &)
-	?setInstance@HsDatabase@@SAXPAV1@@Z @ 259 NONAME ; void HsDatabase::setInstance(class HsDatabase *)
-	??0HsWallpaper@@QAE@PAVQGraphicsItem@@@Z @ 260 NONAME ; HsWallpaper::HsWallpaper(class QGraphicsItem *)
-	?setSnapEffectsEnabled@HsConfiguration@@QAEX_N@Z @ 261 NONAME ; void HsConfiguration::setSnapEffectsEnabled(bool)
-	?newPageAddedAnimationDuration@HsConfiguration@@QBEHXZ @ 262 NONAME ; int HsConfiguration::newPageAddedAnimationDuration(void) const
-	?getStaticMetaObject@HsWallpaperLoaderThread@@SAABUQMetaObject@@XZ @ 263 NONAME ; struct QMetaObject const & HsWallpaperLoaderThread::getStaticMetaObject(void)
-	?commit@HsDatabase@@QAE_NXZ @ 264 NONAME ; bool HsDatabase::commit(void)
-	?trUtf8@HsDatabase@@SA?AVQString@@PBD0@Z @ 265 NONAME ; class QString HsDatabase::trUtf8(char const *, char const *)
-	?mousePressEvent@HsWidgetHostVisual@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 266 NONAME ; void HsWidgetHostVisual::mousePressEvent(class QGraphicsSceneMouseEvent *)
-	?tr@HsWidgetComponent@@SA?AVQString@@PBD0H@Z @ 267 NONAME ; class QString HsWidgetComponent::tr(char const *, char const *, int)
-	?backupRestoreStarted@HsBackupRestoreObserver@@QAEXXZ @ 268 NONAME ; void HsBackupRestoreObserver::backupRestoreStarted(void)
-	?qt_metacast@HsPageWallpaper@@UAEPAXPBD@Z @ 269 NONAME ; void * HsPageWallpaper::qt_metacast(char const *)
-	?trUtf8@HsWidgetHost@@SA?AVQString@@PBD0@Z @ 270 NONAME ; class QString HsWidgetHost::trUtf8(char const *, char const *)
-	?setDefaultPageId@HsConfiguration@@QAEXH@Z @ 271 NONAME ; void HsConfiguration::setDefaultPageId(int)
-	?metaObject@HsWidgetHostVisual@@UBEPBUQMetaObject@@XZ @ 272 NONAME ; struct QMetaObject const * HsWidgetHostVisual::metaObject(void) const
-	?installTranslator@HsWidgetComponent@@AAEXXZ @ 273 NONAME ; void HsWidgetComponent::installTranslator(void)
-	?bounceAnimationEasingCurve@HsConfiguration@@QBE?AW4Type@QEasingCurve@@XZ @ 274 NONAME ; enum QEasingCurve::Type HsConfiguration::bounceAnimationEasingCurve(void) const
-	??_EHsIdleWidget@@UAE@I@Z @ 275 NONAME ; HsIdleWidget::~HsIdleWidget(unsigned int)
-	?qt_metacall@HsWidgetComponent@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 276 NONAME ; int HsWidgetComponent::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@HsConfiguration@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 277 NONAME ; int HsConfiguration::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?cleanupIdleUi@HsGui@@QAEXXZ @ 278 NONAME ; void HsGui::cleanupIdleUi(void)
-	?setWidgetOverTrashbinFeedbackEffect@HsConfiguration@@QAEXW4InstantEffect@HbFeedback@@@Z @ 279 NONAME ; void HsConfiguration::setWidgetOverTrashbinFeedbackEffect(enum HbFeedback::InstantEffect)
-	?handleEntryAdded@HsWidgetComponentRegistry@@AAEXABVCaEntry@@ABVQString@@@Z @ 280 NONAME ; void HsWidgetComponentRegistry::handleEntryAdded(class CaEntry const &, class QString const &)
-	?setProperty@HsWidgetHost@@AAE_NPBDAAVQMetaProperty@@@Z @ 281 NONAME ; bool HsWidgetHost::setProperty(char const *, class QMetaProperty &)
-	?pagePanFinished@HsScene@@IAEXPAVQGestureEvent@@@Z @ 282 NONAME ; void HsScene::pagePanFinished(class QGestureEvent *)
-	?minimumWidgetSizeInUnits@HsConfiguration@@QBE?AVQSizeF@@XZ @ 283 NONAME ; class QSizeF HsConfiguration::minimumWidgetSizeInUnits(void) const
-	??0HsBackupRestoreObserver@@AAE@PAVQObject@@@Z @ 284 NONAME ; HsBackupRestoreObserver::HsBackupRestoreObserver(class QObject *)
-	?setClockWidgetTapFeedbackEffect@HsConfiguration@@QAEXW4InstantEffect@HbFeedback@@@Z @ 285 NONAME ; void HsConfiguration::setClockWidgetTapFeedbackEffect(enum HbFeedback::InstantEffect)
-	??1HsPage@@UAE@XZ @ 286 NONAME ; HsPage::~HsPage(void)
-	?databaseId@HsWidgetHost@@QBEHXZ @ 287 NONAME ; int HsWidgetHost::databaseId(void) const
-	?setInstallationPath@HsWidgetComponentDescriptor@@QAEXABVQString@@@Z @ 288 NONAME ; void HsWidgetComponentDescriptor::setInstallationPath(class QString const &)
-	?staticMetaObject@HsHostedWidgetFactory@@2UQMetaObject@@B @ 289 NONAME ; struct QMetaObject const HsHostedWidgetFactory::staticMetaObject
-	?setTitle@HsWidgetComponentDescriptor@@QAEXABVQString@@@Z @ 290 NONAME ; void HsWidgetComponentDescriptor::setTitle(class QString const &)
-	?qt_metacall@HsPageWallpaper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 291 NONAME ; int HsPageWallpaper::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?setWidgetSnappingFeedbackEffect@HsConfiguration@@QAEXW4InstantEffect@HbFeedback@@@Z @ 292 NONAME ; void HsConfiguration::setWidgetSnappingFeedbackEffect(enum HbFeedback::InstantEffect)
-	?setWidgetDragEffectDuration@HsConfiguration@@QAEXH@Z @ 293 NONAME ; void HsConfiguration::setWidgetDragEffectDuration(int)
-	?widgetPresentation@HsDatabase@@QAE_NAAVHsWidgetPresentationData@@@Z @ 294 NONAME ; bool HsDatabase::widgetPresentation(class HsWidgetPresentationData &)
-	?pageChangePanDistance@HsConfiguration@@QBEMXZ @ 295 NONAME ; float HsConfiguration::pageChangePanDistance(void) const
-	?mInstance@HsContentService@@0PAV1@A @ 296 NONAME ; class HsContentService * HsContentService::mInstance
-	??0HsWidgetComponent@@AAE@ABVQString@@PAVQObject@@@Z @ 297 NONAME ; HsWidgetComponent::HsWidgetComponent(class QString const &, class QObject *)
-	?startDragEffect@HsWidgetHostVisual@@QAEXXZ @ 298 NONAME ; void HsWidgetHostVisual::startDragEffect(void)
-	?insertPage@HsIdleWidget@@QAEXHPAVHsPage@@@Z @ 299 NONAME ; void HsIdleWidget::insertPage(int, class HsPage *)
-	?onOrientationChanged@HsPage@@AAEXW4Orientation@Qt@@@Z @ 300 NONAME ; void HsPage::onOrientationChanged(enum Qt::Orientation)
-	?adjustedWidgetPosition@HsPage@@QAE?AVQPointF@@ABVQRectF@@@Z @ 301 NONAME ; class QPointF HsPage::adjustedWidgetPosition(class QRectF const &)
-	?staticMetaObject@HsWallpaperLoader@@2UQMetaObject@@B @ 302 NONAME ; struct QMetaObject const HsWallpaperLoader::staticMetaObject
-	?widgetDragEffectDuration@HsConfiguration@@QBEHXZ @ 303 NONAME ; int HsConfiguration::widgetDragEffectDuration(void) const
-	?tr@HsHostedWidgetFactory@@SA?AVQString@@PBD0H@Z @ 304 NONAME ; class QString HsHostedWidgetFactory::tr(char const *, char const *, int)
-	?navigateToApplibrary@HsGui@@IAEXXZ @ 305 NONAME ; void HsGui::navigateToApplibrary(void)
-	?load@HsConfiguration@@QAE_NXZ @ 306 NONAME ; bool HsConfiguration::load(void)
-	?createInstance@HsPage@@SAPAV1@ABVHsPageData@@@Z @ 307 NONAME ; class HsPage * HsPage::createInstance(class HsPageData const &)
-	?widgetPreferences@HsDatabase@@QAE_NHAAV?$QHash@VQString@@VQVariant@@@@@Z @ 308 NONAME ; bool HsDatabase::widgetPreferences(int, class QHash<class QString, class QVariant> &)
-	?removePage@HsScene@@QAE_NPAVHsPage@@@Z @ 309 NONAME ; bool HsScene::removePage(class HsPage *)
-	?hideWidget@HsWidgetHost@@QAEXXZ @ 310 NONAME ; void HsWidgetHost::hideWidget(void)
-	?close@HsDatabase@@QAEXXZ @ 311 NONAME ; void HsDatabase::close(void)
-	?maximumPageCount@HsConfiguration@@QBEHXZ @ 312 NONAME ; int HsConfiguration::maximumPageCount(void) const
-	?action_faulted@HsWidgetHost@@AAEXXZ @ 313 NONAME ; void HsWidgetHost::action_faulted(void)
-	?setServiceXml@HsWidgetComponentDescriptor@@QAEXABVQString@@@Z @ 314 NONAME ; void HsWidgetComponentDescriptor::setServiceXml(class QString const &)
-	?getStaticMetaObject@HsWidgetHost@@SAABUQMetaObject@@XZ @ 315 NONAME ; struct QMetaObject const & HsWidgetHost::getStaticMetaObject(void)
-	??0HsWidgetData@@QAE@ABV0@@Z @ 316 NONAME ; HsWidgetData::HsWidgetData(class HsWidgetData const &)
-	?installationPath@HsWidgetComponentDescriptor@@QBE?AVQString@@XZ @ 317 NONAME ; class QString HsWidgetComponentDescriptor::installationPath(void) const
-	?showHorizontalSnapLine@HsIdleWidget@@QAEXABVQLineF@@@Z @ 318 NONAME ; void HsIdleWidget::showHorizontalSnapLine(class QLineF const &)
-	??_EHsPageVisual@@UAE@I@Z @ 319 NONAME ; HsPageVisual::~HsPageVisual(unsigned int)
-	?setWidgetDropEffectDuration@HsConfiguration@@QAEXH@Z @ 320 NONAME ; void HsConfiguration::setWidgetDropEffectDuration(int)
-	?pageRemovedAnimationDuration@HsConfiguration@@QBEHXZ @ 321 NONAME ; int HsConfiguration::pageRemovedAnimationDuration(void) const
-	?onFinished@HsWidgetHost@@AAEXXZ @ 322 NONAME ; void HsWidgetHost::onFinished(void)
-	?rollback@HsDatabase@@QAE_NXZ @ 323 NONAME ; bool HsDatabase::rollback(void)
-	?widget@HsDatabase@@QAE_NAAVHsWidgetData@@@Z @ 324 NONAME ; bool HsDatabase::widget(class HsWidgetData &)
-	?description@HsWidgetComponentDescriptor@@QBE?AVQString@@XZ @ 325 NONAME ; class QString HsWidgetComponentDescriptor::description(void) const
-	?mInstance@HsShortcutService@@0PAV1@A @ 326 NONAME ; class HsShortcutService * HsShortcutService::mInstance
-	?pageIndicator@HsIdleWidget@@QBEPAVHsPageIndicator@@XZ @ 327 NONAME ; class HsPageIndicator * HsIdleWidget::pageIndicator(void) const
-	?setShortcutWidgetTapFeedbackEffect@HsConfiguration@@QAEXW4InstantEffect@HbFeedback@@@Z @ 328 NONAME ; void HsConfiguration::setShortcutWidgetTapFeedbackEffect(enum HbFeedback::InstantEffect)
-	?wallpaperDirectory@HsPageWallpaper@@MBE?AVQString@@XZ @ 329 NONAME ; class QString HsPageWallpaper::wallpaperDirectory(void) const
-	?qt_metacast@HsWidgetComponent@@UAEPAXPBD@Z @ 330 NONAME ; void * HsWidgetComponent::qt_metacast(char const *)
-	?metaObject@HsWallpaperLoaderThread@@UBEPBUQMetaObject@@XZ @ 331 NONAME ; struct QMetaObject const * HsWallpaperLoaderThread::metaObject(void) const
-	?setTargetSize@HsWallpaperLoaderThread@@QAEXABVQSize@@@Z @ 332 NONAME ; void HsWallpaperLoaderThread::setTargetSize(class QSize const &)
-	?removePage@HsIdleWidget@@QAEXH@Z @ 333 NONAME ; void HsIdleWidget::removePage(int)
-	?tr@HsWallpaper@@SA?AVQString@@PBD0H@Z @ 334 NONAME ; class QString HsWallpaper::tr(char const *, char const *, int)
-	?defaultPageId@HsConfiguration@@QBEHXZ @ 335 NONAME ; int HsConfiguration::defaultPageId(void) const
-	?setSourcePath@HsWallpaperLoader@@QAEXABVQString@@@Z @ 336 NONAME ; void HsWallpaperLoader::setSourcePath(class QString const &)
-	?metaObject@HsGui@@UBEPBUQMetaObject@@XZ @ 337 NONAME ; struct QMetaObject const * HsGui::metaObject(void) const
-	?pageChangeAnimationEasingCurve@HsConfiguration@@QBE?AW4Type@QEasingCurve@@XZ @ 338 NONAME ; enum QEasingCurve::Type HsConfiguration::pageChangeAnimationEasingCurve(void) const
-	?wallpaper@HsPage@@QBEPAVHsWallpaper@@XZ @ 339 NONAME ; class HsWallpaper * HsPage::wallpaper(void) const
-	??0HsPageVisual@@QAE@PAVQGraphicsItem@@@Z @ 340 NONAME ; HsPageVisual::HsPageVisual(class QGraphicsItem *)
-	?trUtf8@HsWidgetComponent@@SA?AVQString@@PBD0@Z @ 341 NONAME ; class QString HsWidgetComponent::trUtf8(char const *, char const *)
-	?event_backupRestoreStarted@HsBackupRestoreObserver@@IAEXXZ @ 342 NONAME ; void HsBackupRestoreObserver::event_backupRestoreStarted(void)
-	?version@HsWidgetComponentDescriptor@@QBE?AVQString@@XZ @ 343 NONAME ; class QString HsWidgetComponentDescriptor::version(void) const
-	?action_disconnectComponent@HsWidgetHost@@AAEXXZ @ 344 NONAME ; void HsWidgetHost::action_disconnectComponent(void)
-	?scene@HsSceneWallpaper@@QBEPAVHsScene@@XZ @ 345 NONAME ; class HsScene * HsSceneWallpaper::scene(void) const
-	?widgetTapStarted@HsScene@@IAEXPAVHsWidgetHost@@@Z @ 346 NONAME ; void HsScene::widgetTapStarted(class HsWidgetHost *)
-	?mInstance@HsConfiguration@@0PAV1@A @ 347 NONAME ; class HsConfiguration * HsConfiguration::mInstance
-	?newWidgets@HsPage@@QAE?AV?$QList@PAVHsWidgetHost@@@@XZ @ 348 NONAME ; class QList<class HsWidgetHost *> HsPage::newWidgets(void)
-	??0HsHostedWidgetFactory@@AAE@PAVQObject@@@Z @ 349 NONAME ; HsHostedWidgetFactory::HsHostedWidgetFactory(class QObject *)
-	?trUtf8@HsContentService@@SA?AVQString@@PBD0@Z @ 350 NONAME ; class QString HsContentService::trUtf8(char const *, char const *)
-	?emitUpdated@HsWidgetComponent@@AAEXXZ @ 351 NONAME ; void HsWidgetComponent::emitUpdated(void)
-	?emitUninstalled@HsWidgetComponent@@AAEXXZ @ 352 NONAME ; void HsWidgetComponent::emitUninstalled(void)
-	?tr@HsConfiguration@@SA?AVQString@@PBD0H@Z @ 353 NONAME ; class QString HsConfiguration::tr(char const *, char const *, int)
-	??0HsSceneWallpaper@@QAE@PAVHsScene@@PAVQGraphicsItem@@@Z @ 354 NONAME ; HsSceneWallpaper::HsSceneWallpaper(class HsScene *, class QGraphicsItem *)
-	?createTargets@HsPageWallpaper@@MAE?AV?$QHash@VQString@@VQVariant@@@@ABVQString@@@Z @ 355 NONAME ; class QHash<class QString, class QVariant> HsPageWallpaper::createTargets(class QString const &)
-	?mInstance@HsGui@@0PAV1@A @ 356 NONAME ; class HsGui * HsGui::mInstance
-	?pageChangeZoneWidth@HsConfiguration@@QBEMXZ @ 357 NONAME ; float HsConfiguration::pageChangeZoneWidth(void) const
-	?qt_metacast@HsGui@@UAEPAXPBD@Z @ 358 NONAME ; void * HsGui::qt_metacast(char const *)
-	?setInstance@HsGui@@SAPAV1@PAV1@@Z @ 359 NONAME ; class HsGui * HsGui::setInstance(class HsGui *)
-	?tr@HsPageWallpaper@@SA?AVQString@@PBD0@Z @ 360 NONAME ; class QString HsPageWallpaper::tr(char const *, char const *)
-	?maximumWidgetSizeInPixels@HsConfiguration@@QBE?AVQSizeF@@XZ @ 361 NONAME ; class QSizeF HsConfiguration::maximumWidgetSizeInPixels(void) const
-	??_EHsBackupRestoreObserver@@UAE@I@Z @ 362 NONAME ; HsBackupRestoreObserver::~HsBackupRestoreObserver(unsigned int)
-	??1HsScene@@UAE@XZ @ 363 NONAME ; HsScene::~HsScene(void)
-	?pageWallpaperLayer@HsIdleWidget@@QBEPAVHbWidget@@XZ @ 364 NONAME ; class HbWidget * HsIdleWidget::pageWallpaperLayer(void) const
-	?deleteWidgetPresentation@HsDatabase@@QAE_NHW4Orientation@Qt@@@Z @ 365 NONAME ; bool HsDatabase::deleteWidgetPresentation(int, enum Qt::Orientation)
-	?getStaticMetaObject@HsWidgetComponent@@SAABUQMetaObject@@XZ @ 366 NONAME ; struct QMetaObject const & HsWidgetComponent::getStaticMetaObject(void)
-	?addExistingWidget@HsPage@@QAE_NPAVHsWidgetHost@@@Z @ 367 NONAME ; bool HsPage::addExistingWidget(class HsWidgetHost *)
-	?qt_metacast@HsWidgetComponentRegistry@@UAEPAXPBD@Z @ 368 NONAME ; void * HsWidgetComponentRegistry::qt_metacast(char const *)
-	?close@HsWidgetHost@@QAEXXZ @ 369 NONAME ; void HsWidgetHost::close(void)
-	?action_remove@HsWidgetHost@@AAEXXZ @ 370 NONAME ; void HsWidgetHost::action_remove(void)
-	?trUtf8@HsWallpaper@@SA?AVQString@@PBD0H@Z @ 371 NONAME ; class QString HsWallpaper::trUtf8(char const *, char const *, int)
-	?activePage@HsScene@@QBEPAVHsPage@@XZ @ 372 NONAME ; class HsPage * HsScene::activePage(void) const
-	?bounceEffect@HsConfiguration@@QBEHXZ @ 373 NONAME ; int HsConfiguration::bounceEffect(void) const
-	?setupIdleUi@HsGui@@QAEXXZ @ 374 NONAME ; void HsGui::setupIdleUi(void)
-	?pages@HsDatabase@@QAE_NAAV?$QList@VHsPageData@@@@@Z @ 375 NONAME ; bool HsDatabase::pages(class QList<class HsPageData> &)
-	?savePresentation@HsWidgetHost@@QAE_NXZ @ 376 NONAME ; bool HsWidgetHost::savePresentation(void)
-	?pageChangeAnimation@HsGui@@QAEPAVHsPropertyAnimationWrapper@@XZ @ 377 NONAME ; class HsPropertyAnimationWrapper * HsGui::pageChangeAnimation(void)
-	?takeInstance@HsScene@@SAPAV1@XZ @ 378 NONAME ; class HsScene * HsScene::takeInstance(void)
-	?rootPath@HsWidgetComponent@@QBE?AVQString@@XZ @ 379 NONAME ; class QString HsWidgetComponent::rootPath(void) const
-	?event_startAndHide@HsWidgetHost@@IAEXXZ @ 380 NONAME ; void HsWidgetHost::event_startAndHide(void)
-	?qt_metacast@HsWallpaperLoader@@UAEPAXPBD@Z @ 381 NONAME ; void * HsWallpaperLoader::qt_metacast(char const *)
-	?startDragEffect@HsWidgetHost@@QAEXXZ @ 382 NONAME ; void HsWidgetHost::startDragEffect(void)
-	??1HsDatabase@@UAE@XZ @ 383 NONAME ; HsDatabase::~HsDatabase(void)
-	??1HsWidgetComponent@@UAE@XZ @ 384 NONAME ; HsWidgetComponent::~HsWidgetComponent(void)
-	?metaObject@HsSceneWallpaper@@UBEPBUQMetaObject@@XZ @ 385 NONAME ; struct QMetaObject const * HsSceneWallpaper::metaObject(void) const
-	?createInstance@HsWidgetHost@@SAPAV1@AAVHsWidgetData@@ABV?$QHash@VQString@@VQVariant@@@@@Z @ 386 NONAME ; class HsWidgetHost * HsWidgetHost::createInstance(class HsWidgetData &, class QHash<class QString, class QVariant> const &)
-	?setupEffects@HsWidgetHostVisual@@AAEXXZ @ 387 NONAME ; void HsWidgetHostVisual::setupEffects(void)
-	?trUtf8@HsGui@@SA?AVQString@@PBD0@Z @ 388 NONAME ; class QString HsGui::trUtf8(char const *, char const *)
-	?setPage@HsPageWallpaper@@QAEXPAVHsPage@@@Z @ 389 NONAME ; void HsPageWallpaper::setPage(class HsPage *)
-	?shape@HsWidgetHostVisual@@UBE?AVQPainterPath@@XZ @ 390 NONAME ; class QPainterPath HsWidgetHostVisual::shape(void) const
-	?deletePage@HsDatabase@@QAE_NH@Z @ 391 NONAME ; bool HsDatabase::deletePage(int)
-	?savePresentation@HsWidgetHost@@QAE_NAAVHsWidgetPresentationData@@@Z @ 392 NONAME ; bool HsWidgetHost::savePresentation(class HsWidgetPresentationData &)
-	?tr@HsWallpaperLoaderThread@@SA?AVQString@@PBD0H@Z @ 393 NONAME ; class QString HsWallpaperLoaderThread::tr(char const *, char const *, int)
-	?resized@HsWidgetHostVisual@@IAEXXZ @ 394 NONAME ; void HsWidgetHostVisual::resized(void)
-	?page@HsWidgetHost@@QBEPAVHsPage@@XZ @ 395 NONAME ; class HsPage * HsWidgetHost::page(void) const
-	?qt_metacast@HsWallpaper@@UAEPAXPBD@Z @ 396 NONAME ; void * HsWallpaper::qt_metacast(char const *)
-	?staticMetaObject@HsWidgetComponent@@2UQMetaObject@@B @ 397 NONAME ; struct QMetaObject const HsWidgetComponent::staticMetaObject
-	?setRemovable@HsPage@@QAEX_N@Z @ 398 NONAME ; void HsPage::setRemovable(bool)
-	?showVerticalSnapLine@HsIdleWidget@@QAEXABVQLineF@@@Z @ 399 NONAME ; void HsIdleWidget::showVerticalSnapLine(class QLineF const &)
-	?staticMetaObject@HsIdleWidget@@2UQMetaObject@@B @ 400 NONAME ; struct QMetaObject const HsIdleWidget::staticMetaObject
-	?widgetRemoved@HsContentService@@IAEXABVQString@@ABV?$QHash@VQString@@VQVariant@@@@@Z @ 401 NONAME ; void HsContentService::widgetRemoved(class QString const &, class QHash<class QString, class QVariant> const &)
-	?widgetMoveUpdated@HsScene@@IAEXABVQPointF@@PAVHsWidgetHost@@@Z @ 402 NONAME ; void HsScene::widgetMoveUpdated(class QPointF const &, class HsWidgetHost *)
-	?qt_metacall@HsWallpaperLoaderThread@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 403 NONAME ; int HsWallpaperLoaderThread::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?loadPresentation@HsWidgetHost@@QAE_NXZ @ 404 NONAME ; bool HsWidgetHost::loadPresentation(void)
-	?setupStates@HsWidgetHost@@AAEXXZ @ 405 NONAME ; void HsWidgetHost::setupStates(void)
-	?getStaticMetaObject@HsContentService@@SAABUQMetaObject@@XZ @ 406 NONAME ; struct QMetaObject const & HsContentService::getStaticMetaObject(void)
-	?wallpaper@HsScene@@QBEPAVHsWallpaper@@XZ @ 407 NONAME ; class HsWallpaper * HsScene::wallpaper(void) const
-	?isItemShortcutWidget@HsShortcutService@@QAE_NH@Z @ 408 NONAME ; bool HsShortcutService::isItemShortcutWidget(int)
-	?setGeometry@HsPageVisual@@UAEXABVQRectF@@@Z @ 409 NONAME ; void HsPageVisual::setGeometry(class QRectF const &)
-	?tr@HsIdleWidget@@SA?AVQString@@PBD0H@Z @ 410 NONAME ; class QString HsIdleWidget::tr(char const *, char const *, int)
-	?setDatabaseName@HsDatabase@@QAEXABVQString@@@Z @ 411 NONAME ; void HsDatabase::setDatabaseName(class QString const &)
-	?updateWidget@HsDatabase@@QAE_NABVHsWidgetData@@@Z @ 412 NONAME ; bool HsDatabase::updateWidget(class HsWidgetData const &)
-	?trUtf8@HsBackupRestoreObserver@@SA?AVQString@@PBD0H@Z @ 413 NONAME ; class QString HsBackupRestoreObserver::trUtf8(char const *, char const *, int)
-	?loadPresentation@HsWidgetHost@@QAE_NW4Orientation@Qt@@@Z @ 414 NONAME ; bool HsWidgetHost::loadPresentation(enum Qt::Orientation)
-	?createWidgetForPreview@HsContentService@@QAEPAVHsWidgetHost@@ABV?$QHash@VQString@@VQVariant@@@@@Z @ 415 NONAME ; class HsWidgetHost * HsContentService::createWidgetForPreview(class QHash<class QString, class QVariant> const &)
-	?available@HsWidgetHost@@IAEXXZ @ 416 NONAME ; void HsWidgetHost::available(void)
-	?setPageChangeZoneWidth@HsConfiguration@@QAEXM@Z @ 417 NONAME ; void HsConfiguration::setPageChangeZoneWidth(float)
-	?emitAboutToUninstall@HsWidgetComponent@@AAEXXZ @ 418 NONAME ; void HsWidgetComponent::emitAboutToUninstall(void)
-	?iconUri@HsWidgetComponentDescriptor@@QBE?AVQString@@XZ @ 419 NONAME ; class QString HsWidgetComponentDescriptor::iconUri(void) const
-	?event_faulted@HsWidgetHost@@IAEXXZ @ 420 NONAME ; void HsWidgetHost::event_faulted(void)
-	?emitUnavailable@HsWidgetComponent@@AAEXXZ @ 421 NONAME ; void HsWidgetComponent::emitUnavailable(void)
-	??1HsWidgetData@@QAE@XZ @ 422 NONAME ; HsWidgetData::~HsWidgetData(void)
-	?snapTimeout@HsConfiguration@@QBEHXZ @ 423 NONAME ; int HsConfiguration::snapTimeout(void) const
-	?faulted@HsWidgetHost@@IAEXXZ @ 424 NONAME ; void HsWidgetHost::faulted(void)
-	??0HsIdleWidget@@QAE@PAVQGraphicsItem@@@Z @ 425 NONAME ; HsIdleWidget::HsIdleWidget(class QGraphicsItem *)
-	?event_unload@HsWidgetHost@@IAEXXZ @ 426 NONAME ; void HsWidgetHost::event_unload(void)
-	?handleEntryRemoved@HsWidgetComponentRegistry@@AAEXABVCaEntry@@ABVQString@@@Z @ 427 NONAME ; void HsWidgetComponentRegistry::handleEntryRemoved(class CaEntry const &, class QString const &)
-	?metaObject@HsWidgetComponentRegistry@@UBEPBUQMetaObject@@XZ @ 428 NONAME ; struct QMetaObject const * HsWidgetComponentRegistry::metaObject(void) const
-	?updated@HsWidgetComponent@@IAEXXZ @ 429 NONAME ; void HsWidgetComponent::updated(void)
-	?takeInstance@HsConfiguration@@SAPAV1@XZ @ 430 NONAME ; class HsConfiguration * HsConfiguration::takeInstance(void)
-	?pageIndex@HsPage@@QAEHXZ @ 431 NONAME ; int HsPage::pageIndex(void)
-	?setTargets@HsWallpaperLoader@@QAEXABV?$QHash@VQString@@VQVariant@@@@@Z @ 432 NONAME ; void HsWallpaperLoader::setTargets(class QHash<class QString, class QVariant> const &)
-	??1HsIdleWidget@@UAE@XZ @ 433 NONAME ; HsIdleWidget::~HsIdleWidget(void)
-	??_EHsHostedWidgetFactory@@UAE@I@Z @ 434 NONAME ; HsHostedWidgetFactory::~HsHostedWidgetFactory(unsigned int)
-	??0HsWallpaperLoaderThread@@QAE@PAVQObject@@@Z @ 435 NONAME ; HsWallpaperLoaderThread::HsWallpaperLoaderThread(class QObject *)
-	?staticMetaObject@HsGui@@2UQMetaObject@@B @ 436 NONAME ; struct QMetaObject const HsGui::staticMetaObject
-	?start@HsWallpaperLoader@@QAEXXZ @ 437 NONAME ; void HsWallpaperLoader::start(void)
-	?component@HsWidgetComponentRegistry@@QAEPAVHsWidgetComponent@@ABVQString@@@Z @ 438 NONAME ; class HsWidgetComponent * HsWidgetComponentRegistry::component(class QString const &)
-	??_EHsWidgetComponent@@UAE@I@Z @ 439 NONAME ; HsWidgetComponent::~HsWidgetComponent(unsigned int)
-	?mInstance@HsScene@@0PAV1@A @ 440 NONAME ; class HsScene * HsScene::mInstance
-	?getStaticMetaObject@HsGui@@SAABUQMetaObject@@XZ @ 441 NONAME ; struct QMetaObject const & HsGui::getStaticMetaObject(void)
-	?trUtf8@HsSceneWallpaper@@SA?AVQString@@PBD0@Z @ 442 NONAME ; class QString HsSceneWallpaper::trUtf8(char const *, char const *)
-	??_EHsWidgetHost@@UAE@I@Z @ 443 NONAME ; HsWidgetHost::~HsWidgetHost(unsigned int)
-	?minimumWidgetHeight@HsConfiguration@@QBEMXZ @ 444 NONAME ; float HsConfiguration::minimumWidgetHeight(void) const
-	?setVisualModel@HsWidgetHostVisual@@QAEXPAVHsWidgetHost@@@Z @ 445 NONAME ; void HsWidgetHostVisual::setVisualModel(class HsWidgetHost *)
-	??0HsPageWallpaper@@QAE@PAVHsPage@@PAVQGraphicsItem@@@Z @ 446 NONAME ; HsPageWallpaper::HsPageWallpaper(class HsPage *, class QGraphicsItem *)
-	?onSetPreferences@HsWidgetHost@@AAEXABVQStringList@@@Z @ 447 NONAME ; void HsWidgetHost::onSetPreferences(class QStringList const &)
-	?staticMetaObject@HsShortcutService@@2UQMetaObject@@B @ 448 NONAME ; struct QMetaObject const HsShortcutService::staticMetaObject
-	??1HsWidgetComponentDescriptor@@QAE@XZ @ 449 NONAME ; HsWidgetComponentDescriptor::~HsWidgetComponentDescriptor(void)
-	?showPageIndicator@HsIdleWidget@@QAEXXZ @ 450 NONAME ; void HsIdleWidget::showPageIndicator(void)
-	??1HsBackupRestoreObserver@@UAE@XZ @ 451 NONAME ; HsBackupRestoreObserver::~HsBackupRestoreObserver(void)
-	?insertPage@HsDatabase@@QAE_NAAVHsPageData@@@Z @ 452 NONAME ; bool HsDatabase::insertPage(class HsPageData &)
-	??_EHsWidgetComponentRegistry@@UAE@I@Z @ 453 NONAME ; HsWidgetComponentRegistry::~HsWidgetComponentRegistry(unsigned int)
-	?metaObject@HsIdleWidget@@UBEPBUQMetaObject@@XZ @ 454 NONAME ; struct QMetaObject const * HsIdleWidget::metaObject(void) const
-	?qt_metacast@HsHostedWidgetFactory@@UAEPAXPBD@Z @ 455 NONAME ; void * HsHostedWidgetFactory::qt_metacast(char const *)
-	?setUri@HsWidgetComponentDescriptor@@QAEXABVQString@@@Z @ 456 NONAME ; void HsWidgetComponentDescriptor::setUri(class QString const &)
-	??1HsWallpaperLoaderThread@@UAE@XZ @ 457 NONAME ; HsWallpaperLoaderThread::~HsWallpaperLoaderThread(void)
-	?staticMetaObject@HsWidgetComponentRegistry@@2UQMetaObject@@B @ 458 NONAME ; struct QMetaObject const HsWidgetComponentRegistry::staticMetaObject
-	??1HsWallpaper@@UAE@XZ @ 459 NONAME ; HsWallpaper::~HsWallpaper(void)
-	?qt_metacall@HsPage@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 460 NONAME ; int HsPage::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?onWidgetAvailable@HsPage@@AAEXXZ @ 461 NONAME ; void HsPage::onWidgetAvailable(void)
-	?qt_metacast@HsPage@@UAEPAXPBD@Z @ 462 NONAME ; void * HsPage::qt_metacast(char const *)
-	?result@HsWallpaperLoaderThread@@QBE_NXZ @ 463 NONAME ; bool HsWallpaperLoaderThread::result(void) const
-	?setPageIndicatorSpacing@HsConfiguration@@QAEXM@Z @ 464 NONAME ; void HsConfiguration::setPageIndicatorSpacing(float)
-	?setSnapLineFadeInDuration@HsConfiguration@@QAEXH@Z @ 465 NONAME ; void HsConfiguration::setSnapLineFadeInDuration(int)
-	??1HsGui@@UAE@XZ @ 466 NONAME ; HsGui::~HsGui(void)
-	?isValid@HsWidgetComponentDescriptor@@QAE_NXZ @ 467 NONAME ; bool HsWidgetComponentDescriptor::isValid(void)
-	?uri@HsWidgetComponentDescriptor@@QBE?AVQString@@XZ @ 468 NONAME ; class QString HsWidgetComponentDescriptor::uri(void) const
-	?setOrientation@HsGui@@QAEXW4Orientation@Qt@@@Z @ 469 NONAME ; void HsGui::setOrientation(enum Qt::Orientation)
-	?tr@HsWidgetComponentRegistry@@SA?AVQString@@PBD0@Z @ 470 NONAME ; class QString HsWidgetComponentRegistry::tr(char const *, char const *)
-	?getStaticMetaObject@HsPage@@SAABUQMetaObject@@XZ @ 471 NONAME ; struct QMetaObject const & HsPage::getStaticMetaObject(void)
-	?onWidgetFaulted@HsPage@@AAEXXZ @ 472 NONAME ; void HsPage::onWidgetFaulted(void)
-	?page@HsPageWallpaper@@QBEPAVHsPage@@XZ @ 473 NONAME ; class HsPage * HsPageWallpaper::page(void) const
-	?qt_metacast@HsBackupRestoreObserver@@UAEPAXPBD@Z @ 474 NONAME ; void * HsBackupRestoreObserver::qt_metacast(char const *)
-	?setTargetPath@HsWallpaperLoaderThread@@QAEXABVQString@@@Z @ 475 NONAME ; void HsWallpaperLoaderThread::setTargetPath(class QString const &)
-	?setSnapTimeout@HsConfiguration@@QAEXH@Z @ 476 NONAME ; void HsConfiguration::setSnapTimeout(int)
-	?createTargets@HsSceneWallpaper@@MAE?AV?$QHash@VQString@@VQVariant@@@@ABVQString@@@Z @ 477 NONAME ; class QHash<class QString, class QVariant> HsSceneWallpaper::createTargets(class QString const &)
-	?onWidgetResized@HsPage@@AAEXXZ @ 478 NONAME ; void HsPage::onWidgetResized(void)
-	?checkBUR@HsBackupRestoreObserver@@QAE_NXZ @ 479 NONAME ; bool HsBackupRestoreObserver::checkBUR(void)
-	?showWidgets@HsPage@@QAEXXZ @ 480 NONAME ; void HsPage::showWidgets(void)
-	?startWidget@HsWidgetHost@@QAEX_N@Z @ 481 NONAME ; void HsWidgetHost::startWidget(bool)
-	??_EHsShortcutService@@UAE@I@Z @ 482 NONAME ; HsShortcutService::~HsShortcutService(unsigned int)
-	?bounceFeedbackEffectDistance@HsConfiguration@@QBEMXZ @ 483 NONAME ; float HsConfiguration::bounceFeedbackEffectDistance(void) const
-	?unavailable@HsWidgetHost@@IAEXXZ @ 484 NONAME ; void HsWidgetHost::unavailable(void)
-	?qt_metacall@HsDatabase@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 485 NONAME ; int HsDatabase::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?contentRect@HsPage@@QAE?AVQRectF@@W4Orientation@Qt@@@Z @ 486 NONAME ; class QRectF HsPage::contentRect(enum Qt::Orientation)
-	?contentGeometry@HsPage@@QAE?AVQRectF@@XZ @ 487 NONAME ; class QRectF HsPage::contentGeometry(void)
-	?setHidden@HsWidgetComponentDescriptor@@QAEXABVQString@@@Z @ 488 NONAME ; void HsWidgetComponentDescriptor::setHidden(class QString const &)
-	?widgets@HsDatabase@@QAE_NHAAV?$QList@VHsWidgetData@@@@@Z @ 489 NONAME ; bool HsDatabase::widgets(int, class QList<class HsWidgetData> &)
-	??_EHsPageWallpaper@@UAE@I@Z @ 490 NONAME ; HsPageWallpaper::~HsPageWallpaper(unsigned int)
-	?databaseId@HsPage@@QBEHXZ @ 491 NONAME ; int HsPage::databaseId(void) const
-	?tr@HsWallpaperLoader@@SA?AVQString@@PBD0@Z @ 492 NONAME ; class QString HsWallpaperLoader::tr(char const *, char const *)
-	?show@HsGui@@QAEXXZ @ 493 NONAME ; void HsGui::show(void)
-	??0HsGui@@AAE@PAVQObject@@@Z @ 494 NONAME ; HsGui::HsGui(class QObject *)
-	?qt_metacall@HsBackupRestoreObserver@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 495 NONAME ; int HsBackupRestoreObserver::qt_metacall(enum QMetaObject::Call, int, void * *)
-	??_EHsWallpaperLoaderThread@@UAE@I@Z @ 496 NONAME ; HsWallpaperLoaderThread::~HsWallpaperLoaderThread(unsigned int)
-	?resolveRootPathAndTranslationFilename@HsWidgetComponent@@AAEXXZ @ 497 NONAME ; void HsWidgetComponent::resolveRootPathAndTranslationFilename(void)
-	?maximumWidgetHeight@HsConfiguration@@QBEMXZ @ 498 NONAME ; float HsConfiguration::maximumWidgetHeight(void) const
-	?isSnapEnabled@HsConfiguration@@QBE_NXZ @ 499 NONAME ; bool HsConfiguration::isSnapEnabled(void) const
-	?backupRestoreCompleted@HsBackupRestoreObserver@@QAEXXZ @ 500 NONAME ; void HsBackupRestoreObserver::backupRestoreCompleted(void)
-	?setPageRemovedAnimationDuration@HsConfiguration@@QAEXH@Z @ 501 NONAME ; void HsConfiguration::setPageRemovedAnimationDuration(int)
-	?insertWidget@HsDatabase@@QAE_NAAVHsWidgetData@@@Z @ 502 NONAME ; bool HsDatabase::insertWidget(class HsWidgetData &)
-	??1HsShortcutService@@UAE@XZ @ 503 NONAME ; HsShortcutService::~HsShortcutService(void)
-	?setupTouchArea@HsWidgetHostVisual@@AAEXXZ @ 504 NONAME ; void HsWidgetHostVisual::setupTouchArea(void)
-	?setBounceFeedbackEffectDistance@HsConfiguration@@QAEXM@Z @ 505 NONAME ; void HsConfiguration::setBounceFeedbackEffectDistance(float)
-	?onEntryChanged@HsWidgetComponentRegistry@@AAEXABVCaEntry@@W4ChangeType@@@Z @ 506 NONAME ; void HsWidgetComponentRegistry::onEntryChanged(class CaEntry const &, enum ChangeType)
-	?getPresentation@HsWidgetHost@@QAE_NAAVHsWidgetPresentationData@@@Z @ 507 NONAME ; bool HsWidgetHost::getPresentation(class HsWidgetPresentationData &)
-	?getStaticMetaObject@HsSceneWallpaper@@SAABUQMetaObject@@XZ @ 508 NONAME ; struct QMetaObject const & HsSceneWallpaper::getStaticMetaObject(void)
-	?tr@HsScene@@SA?AVQString@@PBD0H@Z @ 509 NONAME ; class QString HsScene::tr(char const *, char const *, int)
-	?uri@HsWidgetComponent@@QBE?AVQString@@XZ @ 510 NONAME ; class QString HsWidgetComponent::uri(void) const
-	?instance@HsContentService@@SAPAV1@XZ @ 511 NONAME ; class HsContentService * HsContentService::instance(void)
-	?snapGap@HsConfiguration@@QBEMXZ @ 512 NONAME ; float HsConfiguration::snapGap(void) const
-	?savePresentation@HsWidgetHost@@QAE_NW4Orientation@Qt@@@Z @ 513 NONAME ; bool HsWidgetHost::savePresentation(enum Qt::Orientation)
-	?setWidgetDropToTrashbinFeedbackEffect@HsConfiguration@@QAEXW4InstantEffect@HbFeedback@@@Z @ 514 NONAME ; void HsConfiguration::setWidgetDropToTrashbinFeedbackEffect(enum HbFeedback::InstantEffect)
-	?tr@HsIdleWidget@@SA?AVQString@@PBD0@Z @ 515 NONAME ; class QString HsIdleWidget::tr(char const *, char const *)
-	?title@HsWidgetComponentDescriptor@@QBE?AVQString@@XZ @ 516 NONAME ; class QString HsWidgetComponentDescriptor::title(void) const
-	?event_hide@HsWidgetHost@@IAEXXZ @ 517 NONAME ; void HsWidgetHost::event_hide(void)
-	?databaseId@HsScene@@QBEHXZ @ 518 NONAME ; int HsScene::databaseId(void) const
-	?setWidgetDropFeedbackEffect@HsConfiguration@@QAEXW4InstantEffect@HbFeedback@@@Z @ 519 NONAME ; void HsConfiguration::setWidgetDropFeedbackEffect(enum HbFeedback::InstantEffect)
-	??1HsWidgetComponentRegistry@@UAE@XZ @ 520 NONAME ; HsWidgetComponentRegistry::~HsWidgetComponentRegistry(void)
-	?setDescription@HsWidgetComponentDescriptor@@QAEXABVQString@@@Z @ 521 NONAME ; void HsWidgetComponentDescriptor::setDescription(class QString const &)
-	?getStaticMetaObject@HsConfiguration@@SAABUQMetaObject@@XZ @ 522 NONAME ; struct QMetaObject const & HsConfiguration::getStaticMetaObject(void)
-	?isRunning@HsWallpaperLoader@@QBE_NXZ @ 523 NONAME ; bool HsWallpaperLoader::isRunning(void) const
-	?activePageChanged@HsScene@@IAEXXZ @ 524 NONAME ; void HsScene::activePageChanged(void)
-	?staticMetaObject@HsSceneWallpaper@@2UQMetaObject@@B @ 525 NONAME ; struct QMetaObject const HsSceneWallpaper::staticMetaObject
-	?uninstalled@HsWidgetComponent@@IAEXXZ @ 526 NONAME ; void HsWidgetComponent::uninstalled(void)
-	??1HsHostedWidgetFactory@@UAE@XZ @ 527 NONAME ; HsHostedWidgetFactory::~HsHostedWidgetFactory(void)
-	?trUtf8@HsShortcutService@@SA?AVQString@@PBD0@Z @ 528 NONAME ; class QString HsShortcutService::trUtf8(char const *, char const *)
-	?setPage@HsWidgetHost@@QAE_NPAVHsPage@@@Z @ 529 NONAME ; bool HsWidgetHost::setPage(class HsPage *)
-	?metaObject@HsScene@@UBEPBUQMetaObject@@XZ @ 530 NONAME ; struct QMetaObject const * HsScene::metaObject(void) const
-	??_EHsScene@@UAE@I@Z @ 531 NONAME ; HsScene::~HsScene(unsigned int)
-	?pageTapAndHoldFinished@HsScene@@IAEXPAVQGestureEvent@@@Z @ 532 NONAME ; void HsScene::pageTapAndHoldFinished(class QGestureEvent *)
-	?remove@HsWidgetHost@@QAEXXZ @ 533 NONAME ; void HsWidgetHost::remove(void)
-	?run@HsWallpaperLoaderThread@@MAEXXZ @ 534 NONAME ; void HsWallpaperLoaderThread::run(void)
-	?maximumWidgetSizeInUnits@HsConfiguration@@QBE?AVQSizeF@@XZ @ 535 NONAME ; class QSizeF HsConfiguration::maximumWidgetSizeInUnits(void) const
-	?getStaticMetaObject@HsScene@@SAABUQMetaObject@@XZ @ 536 NONAME ; struct QMetaObject const & HsScene::getStaticMetaObject(void)
-	?finished@HsWallpaperLoader@@IAEXXZ @ 537 NONAME ; void HsWallpaperLoader::finished(void)
-	?visual@HsPage@@QBEPAVHsPageVisual@@XZ @ 538 NONAME ; class HsPageVisual * HsPage::visual(void) const
-	?snapLineFadeOutDuration@HsConfiguration@@QBEHXZ @ 539 NONAME ; int HsConfiguration::snapLineFadeOutDuration(void) const
-	?trUtf8@HsPageWallpaper@@SA?AVQString@@PBD0H@Z @ 540 NONAME ; class QString HsPageWallpaper::trUtf8(char const *, char const *, int)
-	?setNewSize@HsWidgetHostVisual@@AAEXABVQSizeF@@@Z @ 541 NONAME ; void HsWidgetHostVisual::setNewSize(class QSizeF const &)
-	?imageSet@HsWallpaper@@IAEXXZ @ 542 NONAME ; void HsWallpaper::imageSet(void)
-	?tr@HsWidgetHostVisual@@SA?AVQString@@PBD0H@Z @ 543 NONAME ; class QString HsWidgetHostVisual::tr(char const *, char const *, int)
-	?sceneType@HsConfiguration@@QBE?AW4SceneType@1@XZ @ 544 NONAME ; enum HsConfiguration::SceneType HsConfiguration::sceneType(void) const
-	?tr@HsPage@@SA?AVQString@@PBD0H@Z @ 545 NONAME ; class QString HsPage::tr(char const *, char const *, int)
-	?setNewPageAddedAnimationDuration@HsConfiguration@@QAEXH@Z @ 546 NONAME ; void HsConfiguration::setNewPageAddedAnimationDuration(int)
-	??_EHsGui@@UAE@I@Z @ 547 NONAME ; HsGui::~HsGui(unsigned int)
-	?isAvailable@HsWidgetComponent@@QBE_NXZ @ 548 NONAME ; bool HsWidgetComponent::isAvailable(void) const
-	?updateWidgetZValues@HsDatabase@@QAE_NABV?$QHash@HM@@W4Orientation@Qt@@@Z @ 549 NONAME ; bool HsDatabase::updateWidgetZValues(class QHash<int, float> const &, enum Qt::Orientation)
-	?checkConnection@HsDatabase@@ABE_NXZ @ 550 NONAME ; bool HsDatabase::checkConnection(void) const
-	?staticMetaObject@HsConfiguration@@2UQMetaObject@@B @ 551 NONAME ; struct QMetaObject const HsConfiguration::staticMetaObject
-	?takeInstance@HsDatabase@@SAPAV1@XZ @ 552 NONAME ; class HsDatabase * HsDatabase::takeInstance(void)
-	?tr@HsWallpaper@@SA?AVQString@@PBD0@Z @ 553 NONAME ; class QString HsWallpaper::tr(char const *, char const *)
-	?deleteWidgets@HsDatabase@@QAE_NABVQString@@@Z @ 554 NONAME ; bool HsDatabase::deleteWidgets(class QString const &)
-	??0HsPageData@@QAE@XZ @ 555 NONAME ; HsPageData::HsPageData(void)
-	?tr@HsSceneWallpaper@@SA?AVQString@@PBD0H@Z @ 556 NONAME ; class QString HsSceneWallpaper::tr(char const *, char const *, int)
-	?pageIndicatorSpacing@HsConfiguration@@QBEMXZ @ 557 NONAME ; float HsConfiguration::pageIndicatorSpacing(void) const
-	?getStaticMetaObject@HsShortcutService@@SAABUQMetaObject@@XZ @ 558 NONAME ; struct QMetaObject const & HsShortcutService::getStaticMetaObject(void)
-	?isRemovable@HsPage@@QBE_NXZ @ 559 NONAME ; bool HsPage::isRemovable(void) const
-	?setDatabaseId@HsPage@@QAEXH@Z @ 560 NONAME ; void HsPage::setDatabaseId(int)
-	?trUtf8@HsIdleWidget@@SA?AVQString@@PBD0@Z @ 561 NONAME ; class QString HsIdleWidget::trUtf8(char const *, char const *)
-	?pageChangeAnimationDuration@HsConfiguration@@QBEHXZ @ 562 NONAME ; int HsConfiguration::pageChangeAnimationDuration(void) const
-	?staticMetaObject@HsBackupRestoreObserver@@2UQMetaObject@@B @ 563 NONAME ; struct QMetaObject const HsBackupRestoreObserver::staticMetaObject
-	?widgetTapAndHoldFinished@HsScene@@IAEXPAVQGestureEvent@@PAVHsWidgetHost@@@Z @ 564 NONAME ; void HsScene::widgetTapAndHoldFinished(class QGestureEvent *, class HsWidgetHost *)
-	?metaObject@HsPageWallpaper@@UBEPBUQMetaObject@@XZ @ 565 NONAME ; struct QMetaObject const * HsPageWallpaper::metaObject(void) const
-	?tr@HsGui@@SA?AVQString@@PBD0H@Z @ 566 NONAME ; class QString HsGui::tr(char const *, char const *, int)
-	?updatePage@HsDatabase@@QAE_NABVHsPageData@@@Z @ 567 NONAME ; bool HsDatabase::updatePage(class HsPageData const &)
-	?action_uninitialize@HsWidgetHost@@AAEXXZ @ 568 NONAME ; void HsWidgetHost::action_uninitialize(void)
-	??_EHsWallpaperLoader@@UAE@I@Z @ 569 NONAME ; HsWallpaperLoader::~HsWallpaperLoader(unsigned int)
-	??_EHsWallpaper@@UAE@I@Z @ 570 NONAME ; HsWallpaper::~HsWallpaper(unsigned int)
-	?action_connectComponent@HsWidgetHost@@AAEXXZ @ 571 NONAME ; void HsWidgetHost::action_connectComponent(void)
-	?setImage@HsWallpaper@@QAEXABVQString@@@Z @ 572 NONAME ; void HsWallpaper::setImage(class QString const &)
-	?setPageChangeAnimationDuration@HsConfiguration@@QAEXH@Z @ 573 NONAME ; void HsConfiguration::setPageChangeAnimationDuration(int)
-	??0HsSceneData@@QAE@XZ @ 574 NONAME ; HsSceneData::HsSceneData(void)
-	?hasSignal@HsWidgetHost@@AAE_NPBD@Z @ 575 NONAME ; bool HsWidgetHost::hasSignal(char const *)
-	?getStaticMetaObject@HsWidgetHostVisual@@SAABUQMetaObject@@XZ @ 576 NONAME ; struct QMetaObject const & HsWidgetHostVisual::getStaticMetaObject(void)
-	?getStaticMetaObject@HsWallpaper@@SAABUQMetaObject@@XZ @ 577 NONAME ; struct QMetaObject const & HsWallpaper::getStaticMetaObject(void)
-	?trUtf8@HsWallpaper@@SA?AVQString@@PBD0@Z @ 578 NONAME ; class QString HsWallpaper::trUtf8(char const *, char const *)
-	??0HsWidgetHost@@QAE@HPAVQObject@@@Z @ 579 NONAME ; HsWidgetHost::HsWidgetHost(int, class QObject *)
-	?emitWidgetRemoved@HsContentService@@QAEXABVQString@@ABV?$QHash@VQString@@VQVariant@@@@@Z @ 580 NONAME ; void HsContentService::emitWidgetRemoved(class QString const &, class QHash<class QString, class QVariant> const &)
-	?pages@HsScene@@QBE?AV?$QList@PAVHsPage@@@@XZ @ 581 NONAME ; class QList<class HsPage *> HsScene::pages(void) const
-	??1HsConfiguration@@UAE@XZ @ 582 NONAME ; HsConfiguration::~HsConfiguration(void)
-	?trashBin@HsIdleWidget@@QBEPAVHsTrashBinWidget@@XZ @ 583 NONAME ; class HsTrashBinWidget * HsIdleWidget::trashBin(void) const
-	?translationFilename@HsWidgetComponentDescriptor@@QBE?AVQString@@XZ @ 584 NONAME ; class QString HsWidgetComponentDescriptor::translationFilename(void) const
-	?trUtf8@HsConfiguration@@SA?AVQString@@PBD0@Z @ 585 NONAME ; class QString HsConfiguration::trUtf8(char const *, char const *)
-	?instance@HsScene@@SAPAV1@XZ @ 586 NONAME ; class HsScene * HsScene::instance(void)
-	?eventFilter@HsScene@@MAE_NPAVQObject@@PAVQEvent@@@Z @ 587 NONAME ; bool HsScene::eventFilter(class QObject *, class QEvent *)
-	?trUtf8@HsPage@@SA?AVQString@@PBD0H@Z @ 588 NONAME ; class QString HsPage::trUtf8(char const *, char const *, int)
-	?isDefaultPage@HsPage@@QBE_NXZ @ 589 NONAME ; bool HsPage::isDefaultPage(void) const
-	??_EHsDatabase@@UAE@I@Z @ 590 NONAME ; HsDatabase::~HsDatabase(unsigned int)
-	?event_startAndShow@HsWidgetHost@@IAEXXZ @ 591 NONAME ; void HsWidgetHost::event_startAndShow(void)
-	?layoutRect@HsGui@@QBE?AVQRectF@@XZ @ 592 NONAME ; class QRectF HsGui::layoutRect(void) const
-	?trUtf8@HsContentService@@SA?AVQString@@PBD0H@Z @ 593 NONAME ; class QString HsContentService::trUtf8(char const *, char const *, int)
-	?setMinimumWidgetHeight@HsConfiguration@@QAEXM@Z @ 594 NONAME ; void HsConfiguration::setMinimumWidgetHeight(float)
-	?unavailable@HsWidgetComponent@@IAEXXZ @ 595 NONAME ; void HsWidgetComponent::unavailable(void)
-	?isShortcutLabelVisible@HsConfiguration@@QBE_NXZ @ 596 NONAME ; bool HsConfiguration::isShortcutLabelVisible(void) const
-	?setPageChangeZoneReverseAnimationDuration@HsConfiguration@@QAEXH@Z @ 597 NONAME ; void HsConfiguration::setPageChangeZoneReverseAnimationDuration(int)
-	?getStaticMetaObject@HsIdleWidget@@SAABUQMetaObject@@XZ @ 598 NONAME ; struct QMetaObject const & HsIdleWidget::getStaticMetaObject(void)
-	?qt_metacall@HsWidgetHostVisual@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 599 NONAME ; int HsWidgetHostVisual::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?tr@HsDatabase@@SA?AVQString@@PBD0H@Z @ 600 NONAME ; class QString HsDatabase::tr(char const *, char const *, int)
-	?instance@HsWidgetComponentRegistry@@SAPAV1@XZ @ 601 NONAME ; class HsWidgetComponentRegistry * HsWidgetComponentRegistry::instance(void)
-	?serviceXml@HsWidgetComponentDescriptor@@QBE?AVQString@@XZ @ 602 NONAME ; class QString HsWidgetComponentDescriptor::serviceXml(void) const
-	?qt_metacall@HsWallpaperLoader@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 603 NONAME ; int HsWallpaperLoader::qt_metacall(enum QMetaObject::Call, int, void * *)
-	??_EHsSceneWallpaper@@UAE@I@Z @ 604 NONAME ; HsSceneWallpaper::~HsSceneWallpaper(unsigned int)
-	?instance@HsDatabase@@SAPAV1@XZ @ 605 NONAME ; class HsDatabase * HsDatabase::instance(void)
-	?setTranslationFilename@HsWidgetComponentDescriptor@@QAEXABVQString@@@Z @ 606 NONAME ; void HsWidgetComponentDescriptor::setTranslationFilename(class QString const &)
-	?onLoaderFinished@HsWallpaper@@AAEXXZ @ 607 NONAME ; void HsWallpaper::onLoaderFinished(void)
-	?qt_metacall@HsIdleWidget@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 608 NONAME ; int HsIdleWidget::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?addWidget@HsContentService@@QAE_NABVQString@@ABV?$QHash@VQString@@VQVariant@@@@ABVQVariant@@@Z @ 609 NONAME ; bool HsContentService::addWidget(class QString const &, class QHash<class QString, class QVariant> const &, class QVariant const &)
-	?shortcutWidgetTapFeedbackEffect@HsConfiguration@@QBE?AW4InstantEffect@HbFeedback@@XZ @ 610 NONAME ; enum HbFeedback::InstantEffect HsConfiguration::shortcutWidgetTapFeedbackEffect(void) const
-	?widgetMoveFinished@HsScene@@IAEXABVQPointF@@PAVHsWidgetHost@@@Z @ 611 NONAME ; void HsScene::widgetMoveFinished(class QPointF const &, class HsWidgetHost *)
-	?setInstance@HsScene@@SAXPAV1@@Z @ 612 NONAME ; void HsScene::setInstance(class HsScene *)
-	?tr@HsPageVisual@@SA?AVQString@@PBD0H@Z @ 613 NONAME ; class QString HsPageVisual::tr(char const *, char const *, int)
-	??_EHsContentService@@UAE@I@Z @ 614 NONAME ; HsContentService::~HsContentService(unsigned int)
-	?trUtf8@HsDatabase@@SA?AVQString@@PBD0H@Z @ 615 NONAME ; class QString HsDatabase::trUtf8(char const *, char const *, int)
-	?action_hide@HsWidgetHost@@AAEXXZ @ 616 NONAME ; void HsWidgetHost::action_hide(void)
-	?addNewWidget@HsPage@@QAE_NPAVHsWidgetHost@@ABVQPointF@@@Z @ 617 NONAME ; bool HsPage::addNewWidget(class HsWidgetHost *, class QPointF const &)
-	?removePresentation@HsWidgetHost@@QAE_NW4Orientation@Qt@@@Z @ 618 NONAME ; bool HsWidgetHost::removePresentation(enum Qt::Orientation)
-	?staticMetaObject@HsContentService@@2UQMetaObject@@B @ 619 NONAME ; struct QMetaObject const HsContentService::staticMetaObject
-	?tr@HsWidgetHost@@SA?AVQString@@PBD0H@Z @ 620 NONAME ; class QString HsWidgetHost::tr(char const *, char const *, int)
-	?setWidgetRepositionFeedbackEffect@HsConfiguration@@QAEXW4InstantEffect@HbFeedback@@@Z @ 621 NONAME ; void HsConfiguration::setWidgetRepositionFeedbackEffect(enum HbFeedback::InstantEffect)
-	?gestureEvent@HsWidgetHostVisual@@MAEXPAVQGestureEvent@@@Z @ 622 NONAME ; void HsWidgetHostVisual::gestureEvent(class QGestureEvent *)
-	?metaObject@HsBackupRestoreObserver@@UBEPBUQMetaObject@@XZ @ 623 NONAME ; struct QMetaObject const * HsBackupRestoreObserver::metaObject(void) const
-	?instance@HsGui@@SAPAV1@XZ @ 624 NONAME ; class HsGui * HsGui::instance(void)
-	?getStaticMetaObject@HsHostedWidgetFactory@@SAABUQMetaObject@@XZ @ 625 NONAME ; struct QMetaObject const & HsHostedWidgetFactory::getStaticMetaObject(void)
-	?qt_metacall@HsScene@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 626 NONAME ; int HsScene::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?setExistingImage@HsWallpaper@@IAE_NXZ @ 627 NONAME ; bool HsWallpaper::setExistingImage(void)
-	?setPageChangeFeedbackEffect@HsConfiguration@@QAEXW4InstantEffect@HbFeedback@@@Z @ 628 NONAME ; void HsConfiguration::setPageChangeFeedbackEffect(enum HbFeedback::InstantEffect)
-	?trUtf8@HsHostedWidgetFactory@@SA?AVQString@@PBD0H@Z @ 629 NONAME ; class QString HsHostedWidgetFactory::trUtf8(char const *, char const *, int)
-	?trUtf8@HsConfiguration@@SA?AVQString@@PBD0H@Z @ 630 NONAME ; class QString HsConfiguration::trUtf8(char const *, char const *, int)
-	?minimumWidgetSizeInPixels@HsConfiguration@@QBE?AVQSizeF@@XZ @ 631 NONAME ; class QSizeF HsConfiguration::minimumWidgetSizeInPixels(void) const
-	?event_finished@HsWidgetHost@@IAEXXZ @ 632 NONAME ; void HsWidgetHost::event_finished(void)
-	?sourcePath@HsWallpaperLoaderThread@@QBE?AVQString@@XZ @ 633 NONAME ; class QString HsWallpaperLoaderThread::sourcePath(void) const
-	?widgets@HsPage@@QBE?AV?$QList@PAVHsWidgetHost@@@@XZ @ 634 NONAME ; class QList<class HsWidgetHost *> HsPage::widgets(void) const
-	?setPageMargin@HsConfiguration@@QAEXM@Z @ 635 NONAME ; void HsConfiguration::setPageMargin(float)
-	?parallaxFactor@HsIdleWidget@@QBEMXZ @ 636 NONAME ; float HsIdleWidget::parallaxFactor(void) const
-	?setOnline@HsWidgetHost@@QAEX_N@Z @ 637 NONAME ; void HsWidgetHost::setOnline(bool)
-	?setPreferencesToWidget@HsWidgetHost@@AAE_NXZ @ 638 NONAME ; bool HsWidgetHost::setPreferencesToWidget(void)
-	?setWidgetPickFeedbackEffect@HsConfiguration@@QAEXW4InstantEffect@HbFeedback@@@Z @ 639 NONAME ; void HsConfiguration::setWidgetPickFeedbackEffect(enum HbFeedback::InstantEffect)
-	?getStaticMetaObject@HsPageWallpaper@@SAABUQMetaObject@@XZ @ 640 NONAME ; struct QMetaObject const & HsPageWallpaper::getStaticMetaObject(void)
-	??0HsWidgetHostVisual@@QAE@PAVQGraphicsItem@@@Z @ 641 NONAME ; HsWidgetHostVisual::HsWidgetHostVisual(class QGraphicsItem *)
-	?trUtf8@HsIdleWidget@@SA?AVQString@@PBD0H@Z @ 642 NONAME ; class QString HsIdleWidget::trUtf8(char const *, char const *, int)
-	??0HsContentService@@QAE@PAVQObject@@@Z @ 643 NONAME ; HsContentService::HsContentService(class QObject *)
-	?trUtf8@HsWidgetComponentRegistry@@SA?AVQString@@PBD0H@Z @ 644 NONAME ; class QString HsWidgetComponentRegistry::trUtf8(char const *, char const *, int)
-	?targetPath@HsWallpaperLoaderThread@@QBE?AVQString@@XZ @ 645 NONAME ; class QString HsWallpaperLoaderThread::targetPath(void) const
-	?staticMetaObject@HsWallpaper@@2UQMetaObject@@B @ 646 NONAME ; struct QMetaObject const HsWallpaper::staticMetaObject
-	?trUtf8@HsGui@@SA?AVQString@@PBD0H@Z @ 647 NONAME ; class QString HsGui::trUtf8(char const *, char const *, int)
-	?metaObject@HsPageVisual@@UBEPBUQMetaObject@@XZ @ 648 NONAME ; struct QMetaObject const * HsPageVisual::metaObject(void) const
-	?tr@HsWidgetComponent@@SA?AVQString@@PBD0@Z @ 649 NONAME ; class QString HsWidgetComponent::tr(char const *, char const *)
-	?tr@HsHostedWidgetFactory@@SA?AVQString@@PBD0@Z @ 650 NONAME ; class QString HsHostedWidgetFactory::tr(char const *, char const *)
-	?setBounceEffect@HsConfiguration@@QAEXH@Z @ 651 NONAME ; void HsConfiguration::setBounceEffect(int)
-	??0HsPage@@QAE@PAVQObject@@@Z @ 652 NONAME ; HsPage::HsPage(class QObject *)
-	?qt_metacast@HsDatabase@@UAEPAXPBD@Z @ 653 NONAME ; void * HsDatabase::qt_metacast(char const *)
-	?registerService@HsWidgetComponentRegistry@@AAEXABVCaEntry@@ABVQString@@_N@Z @ 654 NONAME ; void HsWidgetComponentRegistry::registerService(class CaEntry const &, class QString const &, bool)
-	?trUtf8@HsBackupRestoreObserver@@SA?AVQString@@PBD0@Z @ 655 NONAME ; class QString HsBackupRestoreObserver::trUtf8(char const *, char const *)
-	?metaObject@HsWidgetHost@@UBEPBUQMetaObject@@XZ @ 656 NONAME ; struct QMetaObject const * HsWidgetHost::metaObject(void) const
-	?qt_metacast@HsConfiguration@@UAEPAXPBD@Z @ 657 NONAME ; void * HsConfiguration::qt_metacast(char const *)
+	?widget@HsWidgetHostVisual@@QAEPAVQObject@@XZ @ 69 NONAME ; class QObject * HsWidgetHostVisual::widget(void)
+	?visual@HsWidgetHost@@QBEPAVHsWidgetHostVisual@@XZ @ 70 NONAME ; class HsWidgetHostVisual * HsWidgetHost::visual(void) const
+	?pageChangeFeedbackEffect@HsConfiguration@@QBE?AW4InstantEffect@HbFeedback@@XZ @ 71 NONAME ; enum HbFeedback::InstantEffect HsConfiguration::pageChangeFeedbackEffect(void) const
+	??0HsWallpaperLoader@@QAE@PAVQObject@@@Z @ 72 NONAME ; HsWallpaperLoader::HsWallpaperLoader(class QObject *)
+	?trUtf8@HsShortcutService@@SA?AVQString@@PBD0H@Z @ 73 NONAME ; class QString HsShortcutService::trUtf8(char const *, char const *, int)
+	?maximumWidgetWidth@HsConfiguration@@QBEMXZ @ 74 NONAME ; float HsConfiguration::maximumWidgetWidth(void) const
+	?metaObject@HsContentService@@UBEPBUQMetaObject@@XZ @ 75 NONAME ; struct QMetaObject const * HsContentService::metaObject(void) const
+	?setScene@HsSceneWallpaper@@QAEXPAVHsScene@@@Z @ 76 NONAME ; void HsSceneWallpaper::setScene(class HsScene *)
+	?onPageMarginChanged@HsPage@@AAEXABVQString@@@Z @ 77 NONAME ; void HsPage::onPageMarginChanged(class QString const &)
+	?finished@HsWidgetHost@@IAEXXZ @ 78 NONAME ; void HsWidgetHost::finished(void)
+	?pagePanStarted@HsScene@@IAEXPAVQGestureEvent@@@Z @ 79 NONAME ; void HsScene::pagePanStarted(class QGestureEvent *)
+	?addPage@HsScene@@QAE_NPAVHsPage@@@Z @ 80 NONAME ; bool HsScene::addPage(class HsPage *)
+	?controlLayer@HsIdleWidget@@QBEPAVHbWidget@@XZ @ 81 NONAME ; class HbWidget * HsIdleWidget::controlLayer(void) const
+	?qt_metacall@HsWidgetHost@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 82 NONAME ; int HsWidgetHost::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?configuration@HsDatabase@@QAE_NAAV?$QHash@VQString@@VQVariant@@@@@Z @ 83 NONAME ; bool HsDatabase::configuration(class QHash<class QString, class QVariant> &)
+	?tr@HsContentService@@SA?AVQString@@PBD0@Z @ 84 NONAME ; class QString HsContentService::tr(char const *, char const *)
+	?mInstance@HsHostedWidgetFactory@@0PAV1@A @ 85 NONAME ; class HsHostedWidgetFactory * HsHostedWidgetFactory::mInstance
+	?setInstance@HsHostedWidgetFactory@@SAPAV1@PAV1@@Z @ 86 NONAME ; class HsHostedWidgetFactory * HsHostedWidgetFactory::setInstance(class HsHostedWidgetFactory *)
+	?staticMetaObject@HsScene@@2UQMetaObject@@B @ 87 NONAME ; struct QMetaObject const HsScene::staticMetaObject
+	?setMaximumWidgetWidth@HsConfiguration@@QAEXM@Z @ 88 NONAME ; void HsConfiguration::setMaximumWidgetWidth(float)
+	?scene@HsDatabase@@QAE_NAAVHsSceneData@@@Z @ 89 NONAME ; bool HsDatabase::scene(class HsSceneData &)
+	?resetNewWidgets@HsPage@@QAEXXZ @ 90 NONAME ; void HsPage::resetNewWidgets(void)
+	?tr@HsScene@@SA?AVQString@@PBD0@Z @ 91 NONAME ; class QString HsScene::tr(char const *, char const *)
+	?tr@HsPage@@SA?AVQString@@PBD0@Z @ 92 NONAME ; class QString HsPage::tr(char const *, char const *)
+	?emitAvailable@HsWidgetComponent@@AAEXXZ @ 93 NONAME ; void HsWidgetComponent::emitAvailable(void)
+	?getStaticMetaObject@HsDatabase@@SAABUQMetaObject@@XZ @ 94 NONAME ; struct QMetaObject const & HsDatabase::getStaticMetaObject(void)
+	?contentRect@HsPage@@QAE?AVQRectF@@XZ @ 95 NONAME ; class QRectF HsPage::contentRect(void)
+	?tr@HsPageVisual@@SA?AVQString@@PBD0@Z @ 96 NONAME ; class QString HsPageVisual::tr(char const *, char const *)
+	?setIconUri@HsWidgetComponentDescriptor@@QAEXABVQString@@@Z @ 97 NONAME ; void HsWidgetComponentDescriptor::setIconUri(class QString const &)
+	?orientationChanged@HsGui@@IAEXW4Orientation@Qt@@@Z @ 98 NONAME ; void HsGui::orientationChanged(enum Qt::Orientation)
+	?widgetAdded@HsContentService@@IAEXABVQString@@ABV?$QHash@VQString@@VQVariant@@@@@Z @ 99 NONAME ; void HsContentService::widgetAdded(class QString const &, class QHash<class QString, class QVariant> const &)
+	?staticMetaObject@HsWallpaperLoaderThread@@2UQMetaObject@@B @ 100 NONAME ; struct QMetaObject const HsWallpaperLoaderThread::staticMetaObject
+	?databaseName@HsDatabase@@QBE?AVQString@@XZ @ 101 NONAME ; class QString HsDatabase::databaseName(void) const
+	?setPageChangeAnimationEasingCurve@HsConfiguration@@QAEXW4Type@QEasingCurve@@@Z @ 102 NONAME ; void HsConfiguration::setPageChangeAnimationEasingCurve(enum QEasingCurve::Type)
+	?setPageChangeZoneAnimationDuration@HsConfiguration@@QAEXH@Z @ 103 NONAME ; void HsConfiguration::setPageChangeZoneAnimationDuration(int)
+	?qt_metacast@HsIdleWidget@@UAEPAXPBD@Z @ 104 NONAME ; void * HsIdleWidget::qt_metacast(char const *)
+	?executeCollectionAction@HsShortcutService@@QAEXHABVQString@@@Z @ 105 NONAME ; void HsShortcutService::executeCollectionAction(int, class QString const &)
+	?widgets@HsDatabase@@QAE_NABVQString@@ABV?$QHash@VQString@@VQVariant@@@@AAH@Z @ 106 NONAME ; bool HsDatabase::widgets(class QString const &, class QHash<class QString, class QVariant> const &, int &)
+	?qt_metacast@HsWallpaperLoaderThread@@UAEPAXPBD@Z @ 107 NONAME ; void * HsWallpaperLoaderThread::qt_metacast(char const *)
+	?pageCrawlingAnimation@HsGui@@QAEPAVHsPropertyAnimationWrapper@@XZ @ 108 NONAME ; class HsPropertyAnimationWrapper * HsGui::pageCrawlingAnimation(void)
+	?setSceneType@HsConfiguration@@QAEXW4SceneType@1@@Z @ 109 NONAME ; void HsConfiguration::setSceneType(enum HsConfiguration::SceneType)
+	?layoutNewWidgets@HsPage@@QAEXXZ @ 110 NONAME ; void HsPage::layoutNewWidgets(void)
+	?matchWidgetPreferences@HsDatabase@@AAE_NABV?$QHash@VQString@@VQVariant@@@@ABV?$QMultiMap@VQString@@V1@@@@Z @ 111 NONAME ; bool HsDatabase::matchWidgetPreferences(class QHash<class QString, class QVariant> const &, class QMultiMap<class QString, class QString> const &)
+	?tr@HsWidgetHostVisual@@SA?AVQString@@PBD0@Z @ 112 NONAME ; class QString HsWidgetHostVisual::tr(char const *, char const *)
+	?targetSize@HsWallpaperLoaderThread@@QBE?AVQSize@@XZ @ 113 NONAME ; class QSize HsWallpaperLoaderThread::targetSize(void) const
+	?trUtf8@HsWallpaperLoader@@SA?AVQString@@PBD0H@Z @ 114 NONAME ; class QString HsWallpaperLoader::trUtf8(char const *, char const *, int)
+	?event_remove@HsWidgetHost@@IAEXXZ @ 115 NONAME ; void HsWidgetHost::event_remove(void)
+	?startDropEffect@HsWidgetHost@@QAEXXZ @ 116 NONAME ; void HsWidgetHost::startDropEffect(void)
+	?trUtf8@HsWidgetComponentRegistry@@SA?AVQString@@PBD0@Z @ 117 NONAME ; class QString HsWidgetComponentRegistry::trUtf8(char const *, char const *)
+	?event_close@HsWidgetHost@@IAEXXZ @ 118 NONAME ; void HsWidgetHost::event_close(void)
+	??1HsWallpaperLoader@@UAE@XZ @ 119 NONAME ; HsWallpaperLoader::~HsWallpaperLoader(void)
+	?mInstance@HsBackupRestoreObserver@@0PAV1@A @ 120 NONAME ; class HsBackupRestoreObserver * HsBackupRestoreObserver::mInstance
+	?connectWidget@HsPage@@AAEXPAVHsWidgetHost@@@Z @ 121 NONAME ; void HsPage::connectWidget(class HsWidgetHost *)
+	?setShortcutLabelVisible@HsConfiguration@@QAEX_N@Z @ 122 NONAME ; void HsConfiguration::setShortcutLabelVisible(bool)
+	?sceneLayer@HsIdleWidget@@QBEPAVHbWidget@@XZ @ 123 NONAME ; class HbWidget * HsIdleWidget::sceneLayer(void) const
+	?trUtf8@HsWallpaperLoaderThread@@SA?AVQString@@PBD0@Z @ 124 NONAME ; class QString HsWallpaperLoaderThread::trUtf8(char const *, char const *)
+	?qt_metacast@HsScene@@UAEPAXPBD@Z @ 125 NONAME ; void * HsScene::qt_metacast(char const *)
+	??1HsWidgetHost@@UAE@XZ @ 126 NONAME ; HsWidgetHost::~HsWidgetHost(void)
+	?uninstallComponent@HsWidgetComponentRegistry@@QAEXABVHsWidgetComponentDescriptor@@@Z @ 127 NONAME ; void HsWidgetComponentRegistry::uninstallComponent(class HsWidgetComponentDescriptor const &)
+	?action_notifyRemove@HsWidgetHost@@AAEXXZ @ 128 NONAME ; void HsWidgetHost::action_notifyRemove(void)
+	?open@HsDatabase@@QAE_NXZ @ 129 NONAME ; bool HsDatabase::open(void)
+	?idleWidget@HsGui@@QBEPAVHsIdleWidget@@XZ @ 130 NONAME ; class HsIdleWidget * HsGui::idleWidget(void) const
+	?pageMargin@HsConfiguration@@QBEMXZ @ 131 NONAME ; float HsConfiguration::pageMargin(void) const
+	?failed@HsWallpaperLoader@@IAEXXZ @ 132 NONAME ; void HsWallpaperLoader::failed(void)
+	?setPos@HsWidgetPresentationData@@QAEXABVQPointF@@@Z @ 133 NONAME ; void HsWidgetPresentationData::setPos(class QPointF const &)
+	?isSnapEffectsEnabled@HsConfiguration@@QBE_NXZ @ 134 NONAME ; bool HsConfiguration::isSnapEffectsEnabled(void) const
+	?trUtf8@HsWallpaperLoaderThread@@SA?AVQString@@PBD0H@Z @ 135 NONAME ; class QString HsWallpaperLoaderThread::trUtf8(char const *, char const *, int)
+	?setSourcePath@HsWallpaperLoaderThread@@QAEXABVQString@@@Z @ 136 NONAME ; void HsWallpaperLoaderThread::setSourcePath(class QString const &)
+	?tr@HsGui@@SA?AVQString@@PBD0@Z @ 137 NONAME ; class QString HsGui::tr(char const *, char const *)
+	?disconnectWidget@HsPage@@AAEXPAVHsWidgetHost@@@Z @ 138 NONAME ; void HsPage::disconnectWidget(class HsWidgetHost *)
+	?setOnline@HsPage@@QAEX_N@Z @ 139 NONAME ; void HsPage::setOnline(bool)
+	?tr@HsDatabase@@SA?AVQString@@PBD0@Z @ 140 NONAME ; class QString HsDatabase::tr(char const *, char const *)
+	?onLoaderFailed@HsWallpaper@@AAEXXZ @ 141 NONAME ; void HsWallpaper::onLoaderFailed(void)
+	?trUtf8@HsScene@@SA?AVQString@@PBD0@Z @ 142 NONAME ; class QString HsScene::trUtf8(char const *, char const *)
+	?uninstallTranslator@HsWidgetComponent@@AAEXXZ @ 143 NONAME ; void HsWidgetComponent::uninstallTranslator(void)
+	?setGeometry@HsIdleWidget@@UAEXABVQRectF@@@Z @ 144 NONAME ; void HsIdleWidget::setGeometry(class QRectF const &)
+	?updateZValues@HsPage@@QAEXXZ @ 145 NONAME ; void HsPage::updateZValues(void)
+	?tr@HsShortcutService@@SA?AVQString@@PBD0H@Z @ 146 NONAME ; class QString HsShortcutService::tr(char const *, char const *, int)
+	?pos@HsWidgetPresentationData@@QBE?AVQPointF@@XZ @ 147 NONAME ; class QPointF HsWidgetPresentationData::pos(void) const
+	?getStaticMetaObject@HsBackupRestoreObserver@@SAABUQMetaObject@@XZ @ 148 NONAME ; struct QMetaObject const & HsBackupRestoreObserver::getStaticMetaObject(void)
+	?trUtf8@HsPageVisual@@SA?AVQString@@PBD0@Z @ 149 NONAME ; class QString HsPageVisual::trUtf8(char const *, char const *)
+	?action_show@HsWidgetHost@@AAEXXZ @ 150 NONAME ; void HsWidgetHost::action_show(void)
+	?pageLayer@HsIdleWidget@@QBEPAVHbWidget@@XZ @ 151 NONAME ; class HbWidget * HsIdleWidget::pageLayer(void) const
+	?setSnapGap@HsConfiguration@@QAEXM@Z @ 152 NONAME ; void HsConfiguration::setSnapGap(float)
+	?trUtf8@HsHostedWidgetFactory@@SA?AVQString@@PBD0@Z @ 153 NONAME ; class QString HsHostedWidgetFactory::trUtf8(char const *, char const *)
+	?setActiveWidget@HsScene@@QAEXPAVHsWidgetHost@@@Z @ 154 NONAME ; void HsScene::setActiveWidget(class HsWidgetHost *)
+	?transaction@HsDatabase@@QAE_NXZ @ 155 NONAME ; bool HsDatabase::transaction(void)
+	?snapForce@HsConfiguration@@QBEMXZ @ 156 NONAME ; float HsConfiguration::snapForce(void) const
+	?isOnline@HsScene@@QBE_NXZ @ 157 NONAME ; bool HsScene::isOnline(void) const
+	??0HsWidgetPresentationData@@QAE@XZ @ 158 NONAME ; HsWidgetPresentationData::HsWidgetPresentationData(void)
+	?tr@HsShortcutService@@SA?AVQString@@PBD0@Z @ 159 NONAME ; class QString HsShortcutService::tr(char const *, char const *)
+	?metaObject@HsWidgetComponent@@UBEPBUQMetaObject@@XZ @ 160 NONAME ; struct QMetaObject const * HsWidgetComponent::metaObject(void) const
+	?setConnectionName@HsDatabase@@QAEXABVQString@@@Z @ 161 NONAME ; void HsDatabase::setConnectionName(class QString const &)
+	?qt_metacall@HsGui@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 162 NONAME ; int HsGui::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?metaObject@HsWallpaper@@UBEPBUQMetaObject@@XZ @ 163 NONAME ; struct QMetaObject const * HsWallpaper::metaObject(void) const
+	?removeWidget@HsPage@@QAE_NPAVHsWidgetHost@@@Z @ 164 NONAME ; bool HsPage::removeWidget(class HsWidgetHost *)
+	?trUtf8@HsPageVisual@@SA?AVQString@@PBD0H@Z @ 165 NONAME ; class QString HsPageVisual::trUtf8(char const *, char const *, int)
+	?tr@HsWallpaperLoaderThread@@SA?AVQString@@PBD0@Z @ 166 NONAME ; class QString HsWallpaperLoaderThread::tr(char const *, char const *)
+	?qt_metacall@HsWallpaper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 167 NONAME ; int HsWallpaper::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?onWidgetUnavailable@HsPage@@AAEXXZ @ 168 NONAME ; void HsPage::onWidgetUnavailable(void)
+	?mInstance@HsDatabase@@0PAV1@A @ 169 NONAME ; class HsDatabase * HsDatabase::mInstance
+	?available@HsWidgetComponent@@IAEXXZ @ 170 NONAME ; void HsWidgetComponent::available(void)
+	?tr@HsSceneWallpaper@@SA?AVQString@@PBD0@Z @ 171 NONAME ; class QString HsSceneWallpaper::tr(char const *, char const *)
+	?trUtf8@HsPage@@SA?AVQString@@PBD0@Z @ 172 NONAME ; class QString HsPage::trUtf8(char const *, char const *)
+	?trUtf8@HsWidgetHostVisual@@SA?AVQString@@PBD0H@Z @ 173 NONAME ; class QString HsWidgetHostVisual::trUtf8(char const *, char const *, int)
+	?hideWidgets@HsPage@@QAEXXZ @ 174 NONAME ; void HsPage::hideWidgets(void)
+	?trUtf8@HsWidgetHost@@SA?AVQString@@PBD0H@Z @ 175 NONAME ; class QString HsWidgetHost::trUtf8(char const *, char const *, int)
+	?qt_metacall@HsHostedWidgetFactory@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 176 NONAME ; int HsHostedWidgetFactory::qt_metacall(enum QMetaObject::Call, int, void * *)
+	??0HsScene@@QAE@PAVQObject@@@Z @ 177 NONAME ; HsScene::HsScene(class QObject *)
+	?getStaticMetaObject@HsPageVisual@@SAABUQMetaObject@@XZ @ 178 NONAME ; struct QMetaObject const & HsPageVisual::getStaticMetaObject(void)
+	?pagePanUpdated@HsScene@@IAEXPAVQGestureEvent@@@Z @ 179 NONAME ; void HsScene::pagePanUpdated(class QGestureEvent *)
+	?showTrashBin@HsIdleWidget@@QAEXXZ @ 180 NONAME ; void HsIdleWidget::showTrashBin(void)
+	?qt_metacast@HsWidgetHost@@UAEPAXPBD@Z @ 181 NONAME ; void * HsWidgetHost::qt_metacast(char const *)
+	?trUtf8@HsWallpaperLoader@@SA?AVQString@@PBD0@Z @ 182 NONAME ; class QString HsWallpaperLoader::trUtf8(char const *, char const *)
+	?qt_metacall@HsWidgetComponentRegistry@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 183 NONAME ; int HsWidgetComponentRegistry::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?setMaximumWidgetHeight@HsConfiguration@@QAEXM@Z @ 184 NONAME ; void HsConfiguration::setMaximumWidgetHeight(float)
+	?qt_metacall@HsPageVisual@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 185 NONAME ; int HsPageVisual::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?instance@HsConfiguration@@SAPAV1@XZ @ 186 NONAME ; class HsConfiguration * HsConfiguration::instance(void)
+	?tr@HsWallpaperLoader@@SA?AVQString@@PBD0H@Z @ 187 NONAME ; class QString HsWallpaperLoader::tr(char const *, char const *, int)
+	??_EHsConfiguration@@UAE@I@Z @ 188 NONAME ; HsConfiguration::~HsConfiguration(unsigned int)
+	?metaObject@HsPage@@UBEPBUQMetaObject@@XZ @ 189 NONAME ; struct QMetaObject const * HsPage::metaObject(void) const
+	?activePageIndex@HsScene@@QBEHXZ @ 190 NONAME ; int HsScene::activePageIndex(void) const
+	?qt_metacast@HsWidgetHostVisual@@UAEPAXPBD@Z @ 191 NONAME ; void * HsWidgetHostVisual::qt_metacast(char const *)
+	?hideHorizontalSnapLine@HsIdleWidget@@QAEXXZ @ 192 NONAME ; void HsIdleWidget::hideHorizontalSnapLine(void)
+	?minimumWidgetWidth@HsConfiguration@@QBEMXZ @ 193 NONAME ; float HsConfiguration::minimumWidgetWidth(void) const
+	?setWidgetPreferences@HsDatabase@@QAE_NHABV?$QHash@VQString@@VQVariant@@@@@Z @ 194 NONAME ; bool HsDatabase::setWidgetPreferences(int, class QHash<class QString, class QVariant> const &)
+	?orientation@HsGui@@QAE?AW4Orientation@Qt@@XZ @ 195 NONAME ; enum Qt::Orientation HsGui::orientation(void)
+	?deleteWidget@HsDatabase@@QAE_NH@Z @ 196 NONAME ; bool HsDatabase::deleteWidget(int)
+	?widgetOverTrashbinFeedbackEffect@HsConfiguration@@QBE?AW4InstantEffect@HbFeedback@@XZ @ 197 NONAME ; enum HbFeedback::InstantEffect HsConfiguration::widgetOverTrashbinFeedbackEffect(void) const
+	?deleteFromDatabase@HsPage@@QAE_NXZ @ 198 NONAME ; bool HsPage::deleteFromDatabase(void)
+	?setWidgetPresentation@HsDatabase@@QAE_NABVHsWidgetPresentationData@@@Z @ 199 NONAME ; bool HsDatabase::setWidgetPresentation(class HsWidgetPresentationData const &)
+	?takeInstance@HsGui@@SAPAV1@XZ @ 200 NONAME ; class HsGui * HsGui::takeInstance(void)
+	??0HsConfiguration@@QAE@PAVQObject@@@Z @ 201 NONAME ; HsConfiguration::HsConfiguration(class QObject *)
+	?setDefaultImage@HsWallpaper@@QAEXXZ @ 202 NONAME ; void HsWallpaper::setDefaultImage(void)
+	?setupTouchArea@HsPageVisual@@AAEXXZ @ 203 NONAME ; void HsPageVisual::setupTouchArea(void)
+	?trUtf8@HsWidgetComponent@@SA?AVQString@@PBD0H@Z @ 204 NONAME ; class QString HsWidgetComponent::trUtf8(char const *, char const *, int)
+	?setWidget@HsWidgetHostVisual@@QAEXPAVQObject@@@Z @ 205 NONAME ; void HsWidgetHostVisual::setWidget(class QObject *)
+	?importFromFile@HsConfiguration@@QAE_NABVQString@@@Z @ 206 NONAME ; bool HsConfiguration::importFromFile(class QString const &)
+	?page@HsDatabase@@QAE_NAAVHsPageData@@@Z @ 207 NONAME ; bool HsDatabase::page(class HsPageData &)
+	??_EHsPage@@UAE@I@Z @ 208 NONAME ; HsPage::~HsPage(unsigned int)
+	?instance@HsHostedWidgetFactory@@SAPAV1@XZ @ 209 NONAME ; class HsHostedWidgetFactory * HsHostedWidgetFactory::instance(void)
+	?staticMetaObject@HsPage@@2UQMetaObject@@B @ 210 NONAME ; struct QMetaObject const HsPage::staticMetaObject
+	?widgetDropFeedbackEffect@HsConfiguration@@QBE?AW4InstantEffect@HbFeedback@@XZ @ 211 NONAME ; enum HbFeedback::InstantEffect HsConfiguration::widgetDropFeedbackEffect(void) const
+	?pageChangeZoneReverseAnimationDuration@HsConfiguration@@QBEHXZ @ 212 NONAME ; int HsConfiguration::pageChangeZoneReverseAnimationDuration(void) const
+	?createWidget@HsContentService@@QAE_NABV?$QHash@VQString@@VQVariant@@@@@Z @ 213 NONAME ; bool HsContentService::createWidget(class QHash<class QString, class QVariant> const &)
+	?setVersion@HsWidgetComponentDescriptor@@QAEXABVQString@@@Z @ 214 NONAME ; void HsWidgetComponentDescriptor::setVersion(class QString const &)
+	?getStaticMetaObject@HsWallpaperLoader@@SAABUQMetaObject@@XZ @ 215 NONAME ; struct QMetaObject const & HsWallpaperLoader::getStaticMetaObject(void)
+	?mInstance@HsWidgetComponentRegistry@@0PAV1@A @ 216 NONAME ; class HsWidgetComponentRegistry * HsWidgetComponentRegistry::mInstance
+	?staticMetaObject@HsWidgetHost@@2UQMetaObject@@B @ 217 NONAME ; struct QMetaObject const HsWidgetHost::staticMetaObject
+	?qt_metacast@HsPageVisual@@UAEPAXPBD@Z @ 218 NONAME ; void * HsPageVisual::qt_metacast(char const *)
+	?qt_metacall@HsShortcutService@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 219 NONAME ; int HsShortcutService::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?setImages@HsWallpaper@@QAEXABVQString@@0@Z @ 220 NONAME ; void HsWallpaper::setImages(class QString const &, class QString const &)
+	??1HsPageWallpaper@@UAE@XZ @ 221 NONAME ; HsPageWallpaper::~HsPageWallpaper(void)
+	?startDropEffect@HsWidgetHostVisual@@QAEXXZ @ 222 NONAME ; void HsWidgetHostVisual::startDropEffect(void)
+	?activeWidget@HsScene@@QBEPAVHsWidgetHost@@XZ @ 223 NONAME ; class HsWidgetHost * HsScene::activeWidget(void) const
+	?widgets@HsDatabase@@QAE_NABVQString@@AAV?$QList@VHsWidgetData@@@@@Z @ 224 NONAME ; bool HsDatabase::widgets(class QString const &, class QList<class HsWidgetData> &)
+	?rootDirectory@HsWallpaper@@IBE?AVQString@@XZ @ 225 NONAME ; class QString HsWallpaper::rootDirectory(void) const
+	?tr@HsContentService@@SA?AVQString@@PBD0H@Z @ 226 NONAME ; class QString HsContentService::tr(char const *, char const *, int)
+	??0HsDatabase@@QAE@PAVQObject@@@Z @ 227 NONAME ; HsDatabase::HsDatabase(class QObject *)
+	?eventFilter@HsWidgetHostVisual@@MAE_NPAVQObject@@PAVQEvent@@@Z @ 228 NONAME ; bool HsWidgetHostVisual::eventFilter(class QObject *, class QEvent *)
+	?tr@HsWidgetHost@@SA?AVQString@@PBD0@Z @ 229 NONAME ; class QString HsWidgetHost::tr(char const *, char const *)
+	?remove@HsWallpaper@@QAEXXZ @ 230 NONAME ; void HsWallpaper::remove(void)
+	?idleView@HsGui@@QBEPAVHbView@@XZ @ 231 NONAME ; class HbView * HsGui::idleView(void) const
+	??1HsPageVisual@@UAE@XZ @ 232 NONAME ; HsPageVisual::~HsPageVisual(void)
+	?widgetMoveBlockedFeedbackEffect@HsConfiguration@@QBE?AW4InstantEffect@HbFeedback@@XZ @ 233 NONAME ; enum HbFeedback::InstantEffect HsConfiguration::widgetMoveBlockedFeedbackEffect(void) const
+	?widgetPickFeedbackEffect@HsConfiguration@@QBE?AW4InstantEffect@HbFeedback@@XZ @ 234 NONAME ; enum HbFeedback::InstantEffect HsConfiguration::widgetPickFeedbackEffect(void) const
+	?widgetSnappingFeedbackEffect@HsConfiguration@@QBE?AW4InstantEffect@HbFeedback@@XZ @ 235 NONAME ; enum HbFeedback::InstantEffect HsConfiguration::widgetSnappingFeedbackEffect(void) const
+	?load@HsScene@@QAE_NXZ @ 236 NONAME ; bool HsScene::load(void)
+	?trUtf8@HsSceneWallpaper@@SA?AVQString@@PBD0H@Z @ 237 NONAME ; class QString HsSceneWallpaper::trUtf8(char const *, char const *, int)
+	?tr@HsConfiguration@@SA?AVQString@@PBD0@Z @ 238 NONAME ; class QString HsConfiguration::tr(char const *, char const *)
+	?widgetRepositionFeedbackEffect@HsConfiguration@@QBE?AW4InstantEffect@HbFeedback@@XZ @ 239 NONAME ; enum HbFeedback::InstantEffect HsConfiguration::widgetRepositionFeedbackEffect(void) const
+	?onError@HsWidgetHost@@AAEXXZ @ 240 NONAME ; void HsWidgetHost::onError(void)
+	?cleanup@HsWallpaperLoader@@AAEXXZ @ 241 NONAME ; void HsWallpaperLoader::cleanup(void)
+	?targets@HsWallpaperLoader@@QBE?AV?$QHash@VQString@@VQVariant@@@@XZ @ 242 NONAME ; class QHash<class QString, class QVariant> HsWallpaperLoader::targets(void) const
+	??0HsShortcutService@@AAE@PAVQStateMachine@@PAVQObject@@@Z @ 243 NONAME ; HsShortcutService::HsShortcutService(class QStateMachine *, class QObject *)
+	?hideVerticalSnapLine@HsIdleWidget@@QAEXXZ @ 244 NONAME ; void HsIdleWidget::hideVerticalSnapLine(void)
+	?setActivePage@HsIdleWidget@@QAEXH@Z @ 245 NONAME ; void HsIdleWidget::setActivePage(int)
+	?setSnapLineFadeOutDuration@HsConfiguration@@QAEXH@Z @ 246 NONAME ; void HsConfiguration::setSnapLineFadeOutDuration(int)
+	?polishEvent@HsIdleWidget@@MAEXXZ @ 247 NONAME ; void HsIdleWidget::polishEvent(void)
+	?tr@HsPageWallpaper@@SA?AVQString@@PBD0H@Z @ 248 NONAME ; class QString HsPageWallpaper::tr(char const *, char const *, int)
+	?widgetDropToTrashbinFeedbackEffect@HsConfiguration@@QBE?AW4InstantEffect@HbFeedback@@XZ @ 249 NONAME ; enum HbFeedback::InstantEffect HsConfiguration::widgetDropToTrashbinFeedbackEffect(void) const
+	?staticMetaObject@HsPageWallpaper@@2UQMetaObject@@B @ 250 NONAME ; struct QMetaObject const HsPageWallpaper::staticMetaObject
+	?onWidgetFinished@HsPage@@AAEXXZ @ 251 NONAME ; void HsPage::onWidgetFinished(void)
+	?onThreadFinished@HsWallpaperLoader@@AAEXXZ @ 252 NONAME ; void HsWallpaperLoader::onThreadFinished(void)
+	?tr@HsWidgetComponentRegistry@@SA?AVQString@@PBD0H@Z @ 253 NONAME ; class QString HsWidgetComponentRegistry::tr(char const *, char const *, int)
+	?loadControlLayer@HsIdleWidget@@AAEXXZ @ 254 NONAME ; void HsIdleWidget::loadControlLayer(void)
+	?action_initialize@HsWidgetHost@@AAEXXZ @ 255 NONAME ; void HsWidgetHost::action_initialize(void)
+	?sceneX@HsIdleWidget@@QBEMXZ @ 256 NONAME ; float HsIdleWidget::sceneX(void) const
+	?action_load@HsWidgetHost@@AAEXXZ @ 257 NONAME ; void HsWidgetHost::action_load(void)
+	?connectionName@HsDatabase@@QBE?AVQString@@XZ @ 258 NONAME ; class QString HsDatabase::connectionName(void) const
+	?snapLineFadeInDuration@HsConfiguration@@QBEHXZ @ 259 NONAME ; int HsConfiguration::snapLineFadeInDuration(void) const
+	?setMethod@HsWidgetHost@@AAE_NPBDAAVQMetaMethod@@@Z @ 260 NONAME ; bool HsWidgetHost::setMethod(char const *, class QMetaMethod &)
+	?setInstance@HsDatabase@@SAXPAV1@@Z @ 261 NONAME ; void HsDatabase::setInstance(class HsDatabase *)
+	??0HsWallpaper@@QAE@PAVQGraphicsItem@@@Z @ 262 NONAME ; HsWallpaper::HsWallpaper(class QGraphicsItem *)
+	?setSnapEffectsEnabled@HsConfiguration@@QAEX_N@Z @ 263 NONAME ; void HsConfiguration::setSnapEffectsEnabled(bool)
+	?newPageAddedAnimationDuration@HsConfiguration@@QBEHXZ @ 264 NONAME ; int HsConfiguration::newPageAddedAnimationDuration(void) const
+	?getStaticMetaObject@HsWallpaperLoaderThread@@SAABUQMetaObject@@XZ @ 265 NONAME ; struct QMetaObject const & HsWallpaperLoaderThread::getStaticMetaObject(void)
+	?commit@HsDatabase@@QAE_NXZ @ 266 NONAME ; bool HsDatabase::commit(void)
+	?trUtf8@HsDatabase@@SA?AVQString@@PBD0@Z @ 267 NONAME ; class QString HsDatabase::trUtf8(char const *, char const *)
+	?mousePressEvent@HsWidgetHostVisual@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 268 NONAME ; void HsWidgetHostVisual::mousePressEvent(class QGraphicsSceneMouseEvent *)
+	?tr@HsWidgetComponent@@SA?AVQString@@PBD0H@Z @ 269 NONAME ; class QString HsWidgetComponent::tr(char const *, char const *, int)
+	?backupRestoreStarted@HsBackupRestoreObserver@@QAEXXZ @ 270 NONAME ; void HsBackupRestoreObserver::backupRestoreStarted(void)
+	?qt_metacast@HsPageWallpaper@@UAEPAXPBD@Z @ 271 NONAME ; void * HsPageWallpaper::qt_metacast(char const *)
+	?trUtf8@HsWidgetHost@@SA?AVQString@@PBD0@Z @ 272 NONAME ; class QString HsWidgetHost::trUtf8(char const *, char const *)
+	?setDefaultPageId@HsConfiguration@@QAEXH@Z @ 273 NONAME ; void HsConfiguration::setDefaultPageId(int)
+	?metaObject@HsWidgetHostVisual@@UBEPBUQMetaObject@@XZ @ 274 NONAME ; struct QMetaObject const * HsWidgetHostVisual::metaObject(void) const
+	?installTranslator@HsWidgetComponent@@AAEXXZ @ 275 NONAME ; void HsWidgetComponent::installTranslator(void)
+	?bounceAnimationEasingCurve@HsConfiguration@@QBE?AW4Type@QEasingCurve@@XZ @ 276 NONAME ; enum QEasingCurve::Type HsConfiguration::bounceAnimationEasingCurve(void) const
+	??_EHsIdleWidget@@UAE@I@Z @ 277 NONAME ; HsIdleWidget::~HsIdleWidget(unsigned int)
+	?qt_metacall@HsWidgetComponent@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 278 NONAME ; int HsWidgetComponent::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacall@HsConfiguration@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 279 NONAME ; int HsConfiguration::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?cleanupIdleUi@HsGui@@QAEXXZ @ 280 NONAME ; void HsGui::cleanupIdleUi(void)
+	?setWidgetOverTrashbinFeedbackEffect@HsConfiguration@@QAEXW4InstantEffect@HbFeedback@@@Z @ 281 NONAME ; void HsConfiguration::setWidgetOverTrashbinFeedbackEffect(enum HbFeedback::InstantEffect)
+	?handleEntryAdded@HsWidgetComponentRegistry@@AAEXABVCaEntry@@ABVQString@@@Z @ 282 NONAME ; void HsWidgetComponentRegistry::handleEntryAdded(class CaEntry const &, class QString const &)
+	?setProperty@HsWidgetHost@@AAE_NPBDAAVQMetaProperty@@@Z @ 283 NONAME ; bool HsWidgetHost::setProperty(char const *, class QMetaProperty &)
+	?pagePanFinished@HsScene@@IAEXPAVQGestureEvent@@@Z @ 284 NONAME ; void HsScene::pagePanFinished(class QGestureEvent *)
+	?minimumWidgetSizeInUnits@HsConfiguration@@QBE?AVQSizeF@@XZ @ 285 NONAME ; class QSizeF HsConfiguration::minimumWidgetSizeInUnits(void) const
+	??0HsBackupRestoreObserver@@AAE@PAVQObject@@@Z @ 286 NONAME ; HsBackupRestoreObserver::HsBackupRestoreObserver(class QObject *)
+	?setClockWidgetTapFeedbackEffect@HsConfiguration@@QAEXW4InstantEffect@HbFeedback@@@Z @ 287 NONAME ; void HsConfiguration::setClockWidgetTapFeedbackEffect(enum HbFeedback::InstantEffect)
+	??1HsPage@@UAE@XZ @ 288 NONAME ; HsPage::~HsPage(void)
+	?databaseId@HsWidgetHost@@QBEHXZ @ 289 NONAME ; int HsWidgetHost::databaseId(void) const
+	?setInstallationPath@HsWidgetComponentDescriptor@@QAEXABVQString@@@Z @ 290 NONAME ; void HsWidgetComponentDescriptor::setInstallationPath(class QString const &)
+	?staticMetaObject@HsHostedWidgetFactory@@2UQMetaObject@@B @ 291 NONAME ; struct QMetaObject const HsHostedWidgetFactory::staticMetaObject
+	?setTitle@HsWidgetComponentDescriptor@@QAEXABVQString@@@Z @ 292 NONAME ; void HsWidgetComponentDescriptor::setTitle(class QString const &)
+	?qt_metacall@HsPageWallpaper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 293 NONAME ; int HsPageWallpaper::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?setWidgetSnappingFeedbackEffect@HsConfiguration@@QAEXW4InstantEffect@HbFeedback@@@Z @ 294 NONAME ; void HsConfiguration::setWidgetSnappingFeedbackEffect(enum HbFeedback::InstantEffect)
+	?setWidgetDragEffectDuration@HsConfiguration@@QAEXH@Z @ 295 NONAME ; void HsConfiguration::setWidgetDragEffectDuration(int)
+	?widgetPresentation@HsDatabase@@QAE_NAAVHsWidgetPresentationData@@@Z @ 296 NONAME ; bool HsDatabase::widgetPresentation(class HsWidgetPresentationData &)
+	?pageChangePanDistance@HsConfiguration@@QBEMXZ @ 297 NONAME ; float HsConfiguration::pageChangePanDistance(void) const
+	?mInstance@HsContentService@@0PAV1@A @ 298 NONAME ; class HsContentService * HsContentService::mInstance
+	??0HsWidgetComponent@@AAE@ABVQString@@PAVQObject@@@Z @ 299 NONAME ; HsWidgetComponent::HsWidgetComponent(class QString const &, class QObject *)
+	?startDragEffect@HsWidgetHostVisual@@QAEXXZ @ 300 NONAME ; void HsWidgetHostVisual::startDragEffect(void)
+	?insertPage@HsIdleWidget@@QAEXHPAVHsPage@@@Z @ 301 NONAME ; void HsIdleWidget::insertPage(int, class HsPage *)
+	?onOrientationChanged@HsPage@@AAEXW4Orientation@Qt@@@Z @ 302 NONAME ; void HsPage::onOrientationChanged(enum Qt::Orientation)
+	?adjustedWidgetPosition@HsPage@@QAE?AVQPointF@@ABVQRectF@@@Z @ 303 NONAME ; class QPointF HsPage::adjustedWidgetPosition(class QRectF const &)
+	?staticMetaObject@HsWallpaperLoader@@2UQMetaObject@@B @ 304 NONAME ; struct QMetaObject const HsWallpaperLoader::staticMetaObject
+	?widgetTapStarted@HsScene@@IAEXVQPointF@@PAVHsWidgetHost@@@Z @ 305 NONAME ; void HsScene::widgetTapStarted(class QPointF, class HsWidgetHost *)
+	?widgetDragEffectDuration@HsConfiguration@@QBEHXZ @ 306 NONAME ; int HsConfiguration::widgetDragEffectDuration(void) const
+	?tr@HsHostedWidgetFactory@@SA?AVQString@@PBD0H@Z @ 307 NONAME ; class QString HsHostedWidgetFactory::tr(char const *, char const *, int)
+	?navigateToApplibrary@HsGui@@IAEXXZ @ 308 NONAME ; void HsGui::navigateToApplibrary(void)
+	?load@HsConfiguration@@QAE_NXZ @ 309 NONAME ; bool HsConfiguration::load(void)
+	?createInstance@HsPage@@SAPAV1@ABVHsPageData@@@Z @ 310 NONAME ; class HsPage * HsPage::createInstance(class HsPageData const &)
+	?widgetPreferences@HsDatabase@@QAE_NHAAV?$QHash@VQString@@VQVariant@@@@@Z @ 311 NONAME ; bool HsDatabase::widgetPreferences(int, class QHash<class QString, class QVariant> &)
+	?removePage@HsScene@@QAE_NPAVHsPage@@@Z @ 312 NONAME ; bool HsScene::removePage(class HsPage *)
+	?hideWidget@HsWidgetHost@@QAEXXZ @ 313 NONAME ; void HsWidgetHost::hideWidget(void)
+	?close@HsDatabase@@QAEXXZ @ 314 NONAME ; void HsDatabase::close(void)
+	?maximumPageCount@HsConfiguration@@QBEHXZ @ 315 NONAME ; int HsConfiguration::maximumPageCount(void) const
+	?action_faulted@HsWidgetHost@@AAEXXZ @ 316 NONAME ; void HsWidgetHost::action_faulted(void)
+	?setServiceXml@HsWidgetComponentDescriptor@@QAEXABVQString@@@Z @ 317 NONAME ; void HsWidgetComponentDescriptor::setServiceXml(class QString const &)
+	?getStaticMetaObject@HsWidgetHost@@SAABUQMetaObject@@XZ @ 318 NONAME ; struct QMetaObject const & HsWidgetHost::getStaticMetaObject(void)
+	??0HsWidgetData@@QAE@ABV0@@Z @ 319 NONAME ; HsWidgetData::HsWidgetData(class HsWidgetData const &)
+	?installationPath@HsWidgetComponentDescriptor@@QBE?AVQString@@XZ @ 320 NONAME ; class QString HsWidgetComponentDescriptor::installationPath(void) const
+	?showHorizontalSnapLine@HsIdleWidget@@QAEXABVQLineF@@@Z @ 321 NONAME ; void HsIdleWidget::showHorizontalSnapLine(class QLineF const &)
+	??_EHsPageVisual@@UAE@I@Z @ 322 NONAME ; HsPageVisual::~HsPageVisual(unsigned int)
+	?setWidgetDropEffectDuration@HsConfiguration@@QAEXH@Z @ 323 NONAME ; void HsConfiguration::setWidgetDropEffectDuration(int)
+	?pageRemovedAnimationDuration@HsConfiguration@@QBEHXZ @ 324 NONAME ; int HsConfiguration::pageRemovedAnimationDuration(void) const
+	?onFinished@HsWidgetHost@@AAEXXZ @ 325 NONAME ; void HsWidgetHost::onFinished(void)
+	?rollback@HsDatabase@@QAE_NXZ @ 326 NONAME ; bool HsDatabase::rollback(void)
+	?widget@HsDatabase@@QAE_NAAVHsWidgetData@@@Z @ 327 NONAME ; bool HsDatabase::widget(class HsWidgetData &)
+	?description@HsWidgetComponentDescriptor@@QBE?AVQString@@XZ @ 328 NONAME ; class QString HsWidgetComponentDescriptor::description(void) const
+	?mInstance@HsShortcutService@@0PAV1@A @ 329 NONAME ; class HsShortcutService * HsShortcutService::mInstance
+	?pageIndicator@HsIdleWidget@@QBEPAVHsPageIndicator@@XZ @ 330 NONAME ; class HsPageIndicator * HsIdleWidget::pageIndicator(void) const
+	?setShortcutWidgetTapFeedbackEffect@HsConfiguration@@QAEXW4InstantEffect@HbFeedback@@@Z @ 331 NONAME ; void HsConfiguration::setShortcutWidgetTapFeedbackEffect(enum HbFeedback::InstantEffect)
+	?wallpaperDirectory@HsPageWallpaper@@MBE?AVQString@@XZ @ 332 NONAME ; class QString HsPageWallpaper::wallpaperDirectory(void) const
+	?qt_metacast@HsWidgetComponent@@UAEPAXPBD@Z @ 333 NONAME ; void * HsWidgetComponent::qt_metacast(char const *)
+	?metaObject@HsWallpaperLoaderThread@@UBEPBUQMetaObject@@XZ @ 334 NONAME ; struct QMetaObject const * HsWallpaperLoaderThread::metaObject(void) const
+	?setTargetSize@HsWallpaperLoaderThread@@QAEXABVQSize@@@Z @ 335 NONAME ; void HsWallpaperLoaderThread::setTargetSize(class QSize const &)
+	?removePage@HsIdleWidget@@QAEXH@Z @ 336 NONAME ; void HsIdleWidget::removePage(int)
+	?tr@HsWallpaper@@SA?AVQString@@PBD0H@Z @ 337 NONAME ; class QString HsWallpaper::tr(char const *, char const *, int)
+	?defaultPageId@HsConfiguration@@QBEHXZ @ 338 NONAME ; int HsConfiguration::defaultPageId(void) const
+	?setSourcePath@HsWallpaperLoader@@QAEXABVQString@@@Z @ 339 NONAME ; void HsWallpaperLoader::setSourcePath(class QString const &)
+	?metaObject@HsGui@@UBEPBUQMetaObject@@XZ @ 340 NONAME ; struct QMetaObject const * HsGui::metaObject(void) const
+	?pageChangeAnimationEasingCurve@HsConfiguration@@QBE?AW4Type@QEasingCurve@@XZ @ 341 NONAME ; enum QEasingCurve::Type HsConfiguration::pageChangeAnimationEasingCurve(void) const
+	?wallpaper@HsPage@@QBEPAVHsWallpaper@@XZ @ 342 NONAME ; class HsWallpaper * HsPage::wallpaper(void) const
+	??0HsPageVisual@@QAE@PAVQGraphicsItem@@@Z @ 343 NONAME ; HsPageVisual::HsPageVisual(class QGraphicsItem *)
+	?trUtf8@HsWidgetComponent@@SA?AVQString@@PBD0@Z @ 344 NONAME ; class QString HsWidgetComponent::trUtf8(char const *, char const *)
+	?event_backupRestoreStarted@HsBackupRestoreObserver@@IAEXXZ @ 345 NONAME ; void HsBackupRestoreObserver::event_backupRestoreStarted(void)
+	?version@HsWidgetComponentDescriptor@@QBE?AVQString@@XZ @ 346 NONAME ; class QString HsWidgetComponentDescriptor::version(void) const
+	?action_disconnectComponent@HsWidgetHost@@AAEXXZ @ 347 NONAME ; void HsWidgetHost::action_disconnectComponent(void)
+	?scene@HsSceneWallpaper@@QBEPAVHsScene@@XZ @ 348 NONAME ; class HsScene * HsSceneWallpaper::scene(void) const
+	?mInstance@HsConfiguration@@0PAV1@A @ 349 NONAME ; class HsConfiguration * HsConfiguration::mInstance
+	?newWidgets@HsPage@@QAE?AV?$QList@PAVHsWidgetHost@@@@XZ @ 350 NONAME ; class QList<class HsWidgetHost *> HsPage::newWidgets(void)
+	??0HsHostedWidgetFactory@@AAE@PAVQObject@@@Z @ 351 NONAME ; HsHostedWidgetFactory::HsHostedWidgetFactory(class QObject *)
+	?trUtf8@HsContentService@@SA?AVQString@@PBD0@Z @ 352 NONAME ; class QString HsContentService::trUtf8(char const *, char const *)
+	?emitUpdated@HsWidgetComponent@@AAEXXZ @ 353 NONAME ; void HsWidgetComponent::emitUpdated(void)
+	?emitUninstalled@HsWidgetComponent@@AAEXXZ @ 354 NONAME ; void HsWidgetComponent::emitUninstalled(void)
+	?tr@HsConfiguration@@SA?AVQString@@PBD0H@Z @ 355 NONAME ; class QString HsConfiguration::tr(char const *, char const *, int)
+	??0HsSceneWallpaper@@QAE@PAVHsScene@@PAVQGraphicsItem@@@Z @ 356 NONAME ; HsSceneWallpaper::HsSceneWallpaper(class HsScene *, class QGraphicsItem *)
+	?createTargets@HsPageWallpaper@@MAE?AV?$QHash@VQString@@VQVariant@@@@ABVQString@@@Z @ 357 NONAME ; class QHash<class QString, class QVariant> HsPageWallpaper::createTargets(class QString const &)
+	?mInstance@HsGui@@0PAV1@A @ 358 NONAME ; class HsGui * HsGui::mInstance
+	?pageChangeZoneWidth@HsConfiguration@@QBEMXZ @ 359 NONAME ; float HsConfiguration::pageChangeZoneWidth(void) const
+	?qt_metacast@HsGui@@UAEPAXPBD@Z @ 360 NONAME ; void * HsGui::qt_metacast(char const *)
+	?setInstance@HsGui@@SAPAV1@PAV1@@Z @ 361 NONAME ; class HsGui * HsGui::setInstance(class HsGui *)
+	?tr@HsPageWallpaper@@SA?AVQString@@PBD0@Z @ 362 NONAME ; class QString HsPageWallpaper::tr(char const *, char const *)
+	?maximumWidgetSizeInPixels@HsConfiguration@@QBE?AVQSizeF@@XZ @ 363 NONAME ; class QSizeF HsConfiguration::maximumWidgetSizeInPixels(void) const
+	??_EHsBackupRestoreObserver@@UAE@I@Z @ 364 NONAME ; HsBackupRestoreObserver::~HsBackupRestoreObserver(unsigned int)
+	??1HsScene@@UAE@XZ @ 365 NONAME ; HsScene::~HsScene(void)
+	?pageWallpaperLayer@HsIdleWidget@@QBEPAVHbWidget@@XZ @ 366 NONAME ; class HbWidget * HsIdleWidget::pageWallpaperLayer(void) const
+	?deleteWidgetPresentation@HsDatabase@@QAE_NHW4Orientation@Qt@@@Z @ 367 NONAME ; bool HsDatabase::deleteWidgetPresentation(int, enum Qt::Orientation)
+	?getStaticMetaObject@HsWidgetComponent@@SAABUQMetaObject@@XZ @ 368 NONAME ; struct QMetaObject const & HsWidgetComponent::getStaticMetaObject(void)
+	?addExistingWidget@HsPage@@QAE_NPAVHsWidgetHost@@@Z @ 369 NONAME ; bool HsPage::addExistingWidget(class HsWidgetHost *)
+	?qt_metacast@HsWidgetComponentRegistry@@UAEPAXPBD@Z @ 370 NONAME ; void * HsWidgetComponentRegistry::qt_metacast(char const *)
+	?close@HsWidgetHost@@QAEXXZ @ 371 NONAME ; void HsWidgetHost::close(void)
+	?action_remove@HsWidgetHost@@AAEXXZ @ 372 NONAME ; void HsWidgetHost::action_remove(void)
+	?trUtf8@HsWallpaper@@SA?AVQString@@PBD0H@Z @ 373 NONAME ; class QString HsWallpaper::trUtf8(char const *, char const *, int)
+	?activePage@HsScene@@QBEPAVHsPage@@XZ @ 374 NONAME ; class HsPage * HsScene::activePage(void) const
+	?bounceEffect@HsConfiguration@@QBEHXZ @ 375 NONAME ; int HsConfiguration::bounceEffect(void) const
+	?setupIdleUi@HsGui@@QAEXXZ @ 376 NONAME ; void HsGui::setupIdleUi(void)
+	?pages@HsDatabase@@QAE_NAAV?$QList@VHsPageData@@@@@Z @ 377 NONAME ; bool HsDatabase::pages(class QList<class HsPageData> &)
+	?savePresentation@HsWidgetHost@@QAE_NXZ @ 378 NONAME ; bool HsWidgetHost::savePresentation(void)
+	?pageChangeAnimation@HsGui@@QAEPAVHsPropertyAnimationWrapper@@XZ @ 379 NONAME ; class HsPropertyAnimationWrapper * HsGui::pageChangeAnimation(void)
+	?takeInstance@HsScene@@SAPAV1@XZ @ 380 NONAME ; class HsScene * HsScene::takeInstance(void)
+	?rootPath@HsWidgetComponent@@QBE?AVQString@@XZ @ 381 NONAME ; class QString HsWidgetComponent::rootPath(void) const
+	?event_startAndHide@HsWidgetHost@@IAEXXZ @ 382 NONAME ; void HsWidgetHost::event_startAndHide(void)
+	?qt_metacast@HsWallpaperLoader@@UAEPAXPBD@Z @ 383 NONAME ; void * HsWallpaperLoader::qt_metacast(char const *)
+	?startDragEffect@HsWidgetHost@@QAEXXZ @ 384 NONAME ; void HsWidgetHost::startDragEffect(void)
+	??1HsDatabase@@UAE@XZ @ 385 NONAME ; HsDatabase::~HsDatabase(void)
+	??1HsWidgetComponent@@UAE@XZ @ 386 NONAME ; HsWidgetComponent::~HsWidgetComponent(void)
+	?metaObject@HsSceneWallpaper@@UBEPBUQMetaObject@@XZ @ 387 NONAME ; struct QMetaObject const * HsSceneWallpaper::metaObject(void) const
+	?createInstance@HsWidgetHost@@SAPAV1@AAVHsWidgetData@@ABV?$QHash@VQString@@VQVariant@@@@@Z @ 388 NONAME ; class HsWidgetHost * HsWidgetHost::createInstance(class HsWidgetData &, class QHash<class QString, class QVariant> const &)
+	?setupEffects@HsWidgetHostVisual@@AAEXXZ @ 389 NONAME ; void HsWidgetHostVisual::setupEffects(void)
+	?trUtf8@HsGui@@SA?AVQString@@PBD0@Z @ 390 NONAME ; class QString HsGui::trUtf8(char const *, char const *)
+	?setPage@HsPageWallpaper@@QAEXPAVHsPage@@@Z @ 391 NONAME ; void HsPageWallpaper::setPage(class HsPage *)
+	?shape@HsWidgetHostVisual@@UBE?AVQPainterPath@@XZ @ 392 NONAME ; class QPainterPath HsWidgetHostVisual::shape(void) const
+	?deletePage@HsDatabase@@QAE_NH@Z @ 393 NONAME ; bool HsDatabase::deletePage(int)
+	?savePresentation@HsWidgetHost@@QAE_NAAVHsWidgetPresentationData@@@Z @ 394 NONAME ; bool HsWidgetHost::savePresentation(class HsWidgetPresentationData &)
+	?tr@HsWallpaperLoaderThread@@SA?AVQString@@PBD0H@Z @ 395 NONAME ; class QString HsWallpaperLoaderThread::tr(char const *, char const *, int)
+	?resized@HsWidgetHostVisual@@IAEXXZ @ 396 NONAME ; void HsWidgetHostVisual::resized(void)
+	?page@HsWidgetHost@@QBEPAVHsPage@@XZ @ 397 NONAME ; class HsPage * HsWidgetHost::page(void) const
+	?qt_metacast@HsWallpaper@@UAEPAXPBD@Z @ 398 NONAME ; void * HsWallpaper::qt_metacast(char const *)
+	?staticMetaObject@HsWidgetComponent@@2UQMetaObject@@B @ 399 NONAME ; struct QMetaObject const HsWidgetComponent::staticMetaObject
+	?setRemovable@HsPage@@QAEX_N@Z @ 400 NONAME ; void HsPage::setRemovable(bool)
+	?showVerticalSnapLine@HsIdleWidget@@QAEXABVQLineF@@@Z @ 401 NONAME ; void HsIdleWidget::showVerticalSnapLine(class QLineF const &)
+	?staticMetaObject@HsIdleWidget@@2UQMetaObject@@B @ 402 NONAME ; struct QMetaObject const HsIdleWidget::staticMetaObject
+	?widgetRemoved@HsContentService@@IAEXABVQString@@ABV?$QHash@VQString@@VQVariant@@@@@Z @ 403 NONAME ; void HsContentService::widgetRemoved(class QString const &, class QHash<class QString, class QVariant> const &)
+	?widgetMoveUpdated@HsScene@@IAEXABVQPointF@@PAVHsWidgetHost@@@Z @ 404 NONAME ; void HsScene::widgetMoveUpdated(class QPointF const &, class HsWidgetHost *)
+	?qt_metacall@HsWallpaperLoaderThread@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 405 NONAME ; int HsWallpaperLoaderThread::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?loadPresentation@HsWidgetHost@@QAE_NXZ @ 406 NONAME ; bool HsWidgetHost::loadPresentation(void)
+	?setupStates@HsWidgetHost@@AAEXXZ @ 407 NONAME ; void HsWidgetHost::setupStates(void)
+	?getStaticMetaObject@HsContentService@@SAABUQMetaObject@@XZ @ 408 NONAME ; struct QMetaObject const & HsContentService::getStaticMetaObject(void)
+	?wallpaper@HsScene@@QBEPAVHsWallpaper@@XZ @ 409 NONAME ; class HsWallpaper * HsScene::wallpaper(void) const
+	?isItemShortcutWidget@HsShortcutService@@QAE_NH@Z @ 410 NONAME ; bool HsShortcutService::isItemShortcutWidget(int)
+	?setGeometry@HsPageVisual@@UAEXABVQRectF@@@Z @ 411 NONAME ; void HsPageVisual::setGeometry(class QRectF const &)
+	?tr@HsIdleWidget@@SA?AVQString@@PBD0H@Z @ 412 NONAME ; class QString HsIdleWidget::tr(char const *, char const *, int)
+	?setDatabaseName@HsDatabase@@QAEXABVQString@@@Z @ 413 NONAME ; void HsDatabase::setDatabaseName(class QString const &)
+	?updateWidget@HsDatabase@@QAE_NABVHsWidgetData@@@Z @ 414 NONAME ; bool HsDatabase::updateWidget(class HsWidgetData const &)
+	?trUtf8@HsBackupRestoreObserver@@SA?AVQString@@PBD0H@Z @ 415 NONAME ; class QString HsBackupRestoreObserver::trUtf8(char const *, char const *, int)
+	?loadPresentation@HsWidgetHost@@QAE_NW4Orientation@Qt@@@Z @ 416 NONAME ; bool HsWidgetHost::loadPresentation(enum Qt::Orientation)
+	?createWidgetForPreview@HsContentService@@QAEPAVHsWidgetHost@@ABV?$QHash@VQString@@VQVariant@@@@@Z @ 417 NONAME ; class HsWidgetHost * HsContentService::createWidgetForPreview(class QHash<class QString, class QVariant> const &)
+	?available@HsWidgetHost@@IAEXXZ @ 418 NONAME ; void HsWidgetHost::available(void)
+	?setPageChangeZoneWidth@HsConfiguration@@QAEXM@Z @ 419 NONAME ; void HsConfiguration::setPageChangeZoneWidth(float)
+	?emitAboutToUninstall@HsWidgetComponent@@AAEXXZ @ 420 NONAME ; void HsWidgetComponent::emitAboutToUninstall(void)
+	?iconUri@HsWidgetComponentDescriptor@@QBE?AVQString@@XZ @ 421 NONAME ; class QString HsWidgetComponentDescriptor::iconUri(void) const
+	?event_faulted@HsWidgetHost@@IAEXXZ @ 422 NONAME ; void HsWidgetHost::event_faulted(void)
+	?emitUnavailable@HsWidgetComponent@@AAEXXZ @ 423 NONAME ; void HsWidgetComponent::emitUnavailable(void)
+	??1HsWidgetData@@QAE@XZ @ 424 NONAME ; HsWidgetData::~HsWidgetData(void)
+	?snapTimeout@HsConfiguration@@QBEHXZ @ 425 NONAME ; int HsConfiguration::snapTimeout(void) const
+	?faulted@HsWidgetHost@@IAEXXZ @ 426 NONAME ; void HsWidgetHost::faulted(void)
+	??0HsIdleWidget@@QAE@PAVQGraphicsItem@@@Z @ 427 NONAME ; HsIdleWidget::HsIdleWidget(class QGraphicsItem *)
+	?event_unload@HsWidgetHost@@IAEXXZ @ 428 NONAME ; void HsWidgetHost::event_unload(void)
+	?handleEntryRemoved@HsWidgetComponentRegistry@@AAEXABVCaEntry@@ABVQString@@@Z @ 429 NONAME ; void HsWidgetComponentRegistry::handleEntryRemoved(class CaEntry const &, class QString const &)
+	?metaObject@HsWidgetComponentRegistry@@UBEPBUQMetaObject@@XZ @ 430 NONAME ; struct QMetaObject const * HsWidgetComponentRegistry::metaObject(void) const
+	?updated@HsWidgetComponent@@IAEXXZ @ 431 NONAME ; void HsWidgetComponent::updated(void)
+	?takeInstance@HsConfiguration@@SAPAV1@XZ @ 432 NONAME ; class HsConfiguration * HsConfiguration::takeInstance(void)
+	?pageIndex@HsPage@@QAEHXZ @ 433 NONAME ; int HsPage::pageIndex(void)
+	?setTargets@HsWallpaperLoader@@QAEXABV?$QHash@VQString@@VQVariant@@@@@Z @ 434 NONAME ; void HsWallpaperLoader::setTargets(class QHash<class QString, class QVariant> const &)
+	??1HsIdleWidget@@UAE@XZ @ 435 NONAME ; HsIdleWidget::~HsIdleWidget(void)
+	??_EHsHostedWidgetFactory@@UAE@I@Z @ 436 NONAME ; HsHostedWidgetFactory::~HsHostedWidgetFactory(unsigned int)
+	??0HsWallpaperLoaderThread@@QAE@PAVQObject@@@Z @ 437 NONAME ; HsWallpaperLoaderThread::HsWallpaperLoaderThread(class QObject *)
+	?staticMetaObject@HsGui@@2UQMetaObject@@B @ 438 NONAME ; struct QMetaObject const HsGui::staticMetaObject
+	?start@HsWallpaperLoader@@QAEXXZ @ 439 NONAME ; void HsWallpaperLoader::start(void)
+	?component@HsWidgetComponentRegistry@@QAEPAVHsWidgetComponent@@ABVQString@@@Z @ 440 NONAME ; class HsWidgetComponent * HsWidgetComponentRegistry::component(class QString const &)
+	??_EHsWidgetComponent@@UAE@I@Z @ 441 NONAME ; HsWidgetComponent::~HsWidgetComponent(unsigned int)
+	?mInstance@HsScene@@0PAV1@A @ 442 NONAME ; class HsScene * HsScene::mInstance
+	?getStaticMetaObject@HsGui@@SAABUQMetaObject@@XZ @ 443 NONAME ; struct QMetaObject const & HsGui::getStaticMetaObject(void)
+	?trUtf8@HsSceneWallpaper@@SA?AVQString@@PBD0@Z @ 444 NONAME ; class QString HsSceneWallpaper::trUtf8(char const *, char const *)
+	??_EHsWidgetHost@@UAE@I@Z @ 445 NONAME ; HsWidgetHost::~HsWidgetHost(unsigned int)
+	?minimumWidgetHeight@HsConfiguration@@QBEMXZ @ 446 NONAME ; float HsConfiguration::minimumWidgetHeight(void) const
+	?setVisualModel@HsWidgetHostVisual@@QAEXPAVHsWidgetHost@@@Z @ 447 NONAME ; void HsWidgetHostVisual::setVisualModel(class HsWidgetHost *)
+	??0HsPageWallpaper@@QAE@PAVHsPage@@PAVQGraphicsItem@@@Z @ 448 NONAME ; HsPageWallpaper::HsPageWallpaper(class HsPage *, class QGraphicsItem *)
+	?onSetPreferences@HsWidgetHost@@AAEXABVQStringList@@@Z @ 449 NONAME ; void HsWidgetHost::onSetPreferences(class QStringList const &)
+	?staticMetaObject@HsShortcutService@@2UQMetaObject@@B @ 450 NONAME ; struct QMetaObject const HsShortcutService::staticMetaObject
+	??1HsWidgetComponentDescriptor@@QAE@XZ @ 451 NONAME ; HsWidgetComponentDescriptor::~HsWidgetComponentDescriptor(void)
+	?showPageIndicator@HsIdleWidget@@QAEXXZ @ 452 NONAME ; void HsIdleWidget::showPageIndicator(void)
+	??1HsBackupRestoreObserver@@UAE@XZ @ 453 NONAME ; HsBackupRestoreObserver::~HsBackupRestoreObserver(void)
+	?insertPage@HsDatabase@@QAE_NAAVHsPageData@@@Z @ 454 NONAME ; bool HsDatabase::insertPage(class HsPageData &)
+	??_EHsWidgetComponentRegistry@@UAE@I@Z @ 455 NONAME ; HsWidgetComponentRegistry::~HsWidgetComponentRegistry(unsigned int)
+	?metaObject@HsIdleWidget@@UBEPBUQMetaObject@@XZ @ 456 NONAME ; struct QMetaObject const * HsIdleWidget::metaObject(void) const
+	?qt_metacast@HsHostedWidgetFactory@@UAEPAXPBD@Z @ 457 NONAME ; void * HsHostedWidgetFactory::qt_metacast(char const *)
+	?setUri@HsWidgetComponentDescriptor@@QAEXABVQString@@@Z @ 458 NONAME ; void HsWidgetComponentDescriptor::setUri(class QString const &)
+	??1HsWallpaperLoaderThread@@UAE@XZ @ 459 NONAME ; HsWallpaperLoaderThread::~HsWallpaperLoaderThread(void)
+	?staticMetaObject@HsWidgetComponentRegistry@@2UQMetaObject@@B @ 460 NONAME ; struct QMetaObject const HsWidgetComponentRegistry::staticMetaObject
+	??1HsWallpaper@@UAE@XZ @ 461 NONAME ; HsWallpaper::~HsWallpaper(void)
+	?qt_metacall@HsPage@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 462 NONAME ; int HsPage::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?onWidgetAvailable@HsPage@@AAEXXZ @ 463 NONAME ; void HsPage::onWidgetAvailable(void)
+	?qt_metacast@HsPage@@UAEPAXPBD@Z @ 464 NONAME ; void * HsPage::qt_metacast(char const *)
+	?result@HsWallpaperLoaderThread@@QBE_NXZ @ 465 NONAME ; bool HsWallpaperLoaderThread::result(void) const
+	?setPageIndicatorSpacing@HsConfiguration@@QAEXM@Z @ 466 NONAME ; void HsConfiguration::setPageIndicatorSpacing(float)
+	?setSnapLineFadeInDuration@HsConfiguration@@QAEXH@Z @ 467 NONAME ; void HsConfiguration::setSnapLineFadeInDuration(int)
+	??1HsGui@@UAE@XZ @ 468 NONAME ; HsGui::~HsGui(void)
+	?isValid@HsWidgetComponentDescriptor@@QAE_NXZ @ 469 NONAME ; bool HsWidgetComponentDescriptor::isValid(void)
+	?uri@HsWidgetComponentDescriptor@@QBE?AVQString@@XZ @ 470 NONAME ; class QString HsWidgetComponentDescriptor::uri(void) const
+	?setOrientation@HsGui@@QAEXW4Orientation@Qt@@@Z @ 471 NONAME ; void HsGui::setOrientation(enum Qt::Orientation)
+	?tr@HsWidgetComponentRegistry@@SA?AVQString@@PBD0@Z @ 472 NONAME ; class QString HsWidgetComponentRegistry::tr(char const *, char const *)
+	?getStaticMetaObject@HsPage@@SAABUQMetaObject@@XZ @ 473 NONAME ; struct QMetaObject const & HsPage::getStaticMetaObject(void)
+	?onWidgetFaulted@HsPage@@AAEXXZ @ 474 NONAME ; void HsPage::onWidgetFaulted(void)
+	?page@HsPageWallpaper@@QBEPAVHsPage@@XZ @ 475 NONAME ; class HsPage * HsPageWallpaper::page(void) const
+	?qt_metacast@HsBackupRestoreObserver@@UAEPAXPBD@Z @ 476 NONAME ; void * HsBackupRestoreObserver::qt_metacast(char const *)
+	?setTargetPath@HsWallpaperLoaderThread@@QAEXABVQString@@@Z @ 477 NONAME ; void HsWallpaperLoaderThread::setTargetPath(class QString const &)
+	?setSnapTimeout@HsConfiguration@@QAEXH@Z @ 478 NONAME ; void HsConfiguration::setSnapTimeout(int)
+	?createTargets@HsSceneWallpaper@@MAE?AV?$QHash@VQString@@VQVariant@@@@ABVQString@@@Z @ 479 NONAME ; class QHash<class QString, class QVariant> HsSceneWallpaper::createTargets(class QString const &)
+	?onWidgetResized@HsPage@@AAEXXZ @ 480 NONAME ; void HsPage::onWidgetResized(void)
+	?checkBUR@HsBackupRestoreObserver@@QAE_NXZ @ 481 NONAME ; bool HsBackupRestoreObserver::checkBUR(void)
+	?showWidgets@HsPage@@QAEXXZ @ 482 NONAME ; void HsPage::showWidgets(void)
+	?startWidget@HsWidgetHost@@QAEX_N@Z @ 483 NONAME ; void HsWidgetHost::startWidget(bool)
+	??_EHsShortcutService@@UAE@I@Z @ 484 NONAME ; HsShortcutService::~HsShortcutService(unsigned int)
+	?bounceFeedbackEffectDistance@HsConfiguration@@QBEMXZ @ 485 NONAME ; float HsConfiguration::bounceFeedbackEffectDistance(void) const
+	?unavailable@HsWidgetHost@@IAEXXZ @ 486 NONAME ; void HsWidgetHost::unavailable(void)
+	?qt_metacall@HsDatabase@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 487 NONAME ; int HsDatabase::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?contentRect@HsPage@@QAE?AVQRectF@@W4Orientation@Qt@@@Z @ 488 NONAME ; class QRectF HsPage::contentRect(enum Qt::Orientation)
+	?contentGeometry@HsPage@@QAE?AVQRectF@@XZ @ 489 NONAME ; class QRectF HsPage::contentGeometry(void)
+	?setHidden@HsWidgetComponentDescriptor@@QAEXABVQString@@@Z @ 490 NONAME ; void HsWidgetComponentDescriptor::setHidden(class QString const &)
+	?widgets@HsDatabase@@QAE_NHAAV?$QList@VHsWidgetData@@@@@Z @ 491 NONAME ; bool HsDatabase::widgets(int, class QList<class HsWidgetData> &)
+	??_EHsPageWallpaper@@UAE@I@Z @ 492 NONAME ; HsPageWallpaper::~HsPageWallpaper(unsigned int)
+	?databaseId@HsPage@@QBEHXZ @ 493 NONAME ; int HsPage::databaseId(void) const
+	?tr@HsWallpaperLoader@@SA?AVQString@@PBD0@Z @ 494 NONAME ; class QString HsWallpaperLoader::tr(char const *, char const *)
+	?show@HsGui@@QAEXXZ @ 495 NONAME ; void HsGui::show(void)
+	??0HsGui@@AAE@PAVQObject@@@Z @ 496 NONAME ; HsGui::HsGui(class QObject *)
+	?qt_metacall@HsBackupRestoreObserver@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 497 NONAME ; int HsBackupRestoreObserver::qt_metacall(enum QMetaObject::Call, int, void * *)
+	??_EHsWallpaperLoaderThread@@UAE@I@Z @ 498 NONAME ; HsWallpaperLoaderThread::~HsWallpaperLoaderThread(unsigned int)
+	?resolveRootPathAndTranslationFilename@HsWidgetComponent@@AAEXXZ @ 499 NONAME ; void HsWidgetComponent::resolveRootPathAndTranslationFilename(void)
+	?maximumWidgetHeight@HsConfiguration@@QBEMXZ @ 500 NONAME ; float HsConfiguration::maximumWidgetHeight(void) const
+	?isSnapEnabled@HsConfiguration@@QBE_NXZ @ 501 NONAME ; bool HsConfiguration::isSnapEnabled(void) const
+	?backupRestoreCompleted@HsBackupRestoreObserver@@QAEXXZ @ 502 NONAME ; void HsBackupRestoreObserver::backupRestoreCompleted(void)
+	?setPageRemovedAnimationDuration@HsConfiguration@@QAEXH@Z @ 503 NONAME ; void HsConfiguration::setPageRemovedAnimationDuration(int)
+	?insertWidget@HsDatabase@@QAE_NAAVHsWidgetData@@@Z @ 504 NONAME ; bool HsDatabase::insertWidget(class HsWidgetData &)
+	??1HsShortcutService@@UAE@XZ @ 505 NONAME ; HsShortcutService::~HsShortcutService(void)
+	?setupTouchArea@HsWidgetHostVisual@@AAEXXZ @ 506 NONAME ; void HsWidgetHostVisual::setupTouchArea(void)
+	?setBounceFeedbackEffectDistance@HsConfiguration@@QAEXM@Z @ 507 NONAME ; void HsConfiguration::setBounceFeedbackEffectDistance(float)
+	?onEntryChanged@HsWidgetComponentRegistry@@AAEXABVCaEntry@@W4ChangeType@@@Z @ 508 NONAME ; void HsWidgetComponentRegistry::onEntryChanged(class CaEntry const &, enum ChangeType)
+	?getPresentation@HsWidgetHost@@QAE_NAAVHsWidgetPresentationData@@@Z @ 509 NONAME ; bool HsWidgetHost::getPresentation(class HsWidgetPresentationData &)
+	?getStaticMetaObject@HsSceneWallpaper@@SAABUQMetaObject@@XZ @ 510 NONAME ; struct QMetaObject const & HsSceneWallpaper::getStaticMetaObject(void)
+	?tr@HsScene@@SA?AVQString@@PBD0H@Z @ 511 NONAME ; class QString HsScene::tr(char const *, char const *, int)
+	?uri@HsWidgetComponent@@QBE?AVQString@@XZ @ 512 NONAME ; class QString HsWidgetComponent::uri(void) const
+	?instance@HsContentService@@SAPAV1@XZ @ 513 NONAME ; class HsContentService * HsContentService::instance(void)
+	?snapGap@HsConfiguration@@QBEMXZ @ 514 NONAME ; float HsConfiguration::snapGap(void) const
+	?savePresentation@HsWidgetHost@@QAE_NW4Orientation@Qt@@@Z @ 515 NONAME ; bool HsWidgetHost::savePresentation(enum Qt::Orientation)
+	?setWidgetDropToTrashbinFeedbackEffect@HsConfiguration@@QAEXW4InstantEffect@HbFeedback@@@Z @ 516 NONAME ; void HsConfiguration::setWidgetDropToTrashbinFeedbackEffect(enum HbFeedback::InstantEffect)
+	?tr@HsIdleWidget@@SA?AVQString@@PBD0@Z @ 517 NONAME ; class QString HsIdleWidget::tr(char const *, char const *)
+	?title@HsWidgetComponentDescriptor@@QBE?AVQString@@XZ @ 518 NONAME ; class QString HsWidgetComponentDescriptor::title(void) const
+	?event_hide@HsWidgetHost@@IAEXXZ @ 519 NONAME ; void HsWidgetHost::event_hide(void)
+	?databaseId@HsScene@@QBEHXZ @ 520 NONAME ; int HsScene::databaseId(void) const
+	?setWidgetDropFeedbackEffect@HsConfiguration@@QAEXW4InstantEffect@HbFeedback@@@Z @ 521 NONAME ; void HsConfiguration::setWidgetDropFeedbackEffect(enum HbFeedback::InstantEffect)
+	??1HsWidgetComponentRegistry@@UAE@XZ @ 522 NONAME ; HsWidgetComponentRegistry::~HsWidgetComponentRegistry(void)
+	?setDescription@HsWidgetComponentDescriptor@@QAEXABVQString@@@Z @ 523 NONAME ; void HsWidgetComponentDescriptor::setDescription(class QString const &)
+	?getStaticMetaObject@HsConfiguration@@SAABUQMetaObject@@XZ @ 524 NONAME ; struct QMetaObject const & HsConfiguration::getStaticMetaObject(void)
+	?isRunning@HsWallpaperLoader@@QBE_NXZ @ 525 NONAME ; bool HsWallpaperLoader::isRunning(void) const
+	?activePageChanged@HsScene@@IAEXXZ @ 526 NONAME ; void HsScene::activePageChanged(void)
+	?staticMetaObject@HsSceneWallpaper@@2UQMetaObject@@B @ 527 NONAME ; struct QMetaObject const HsSceneWallpaper::staticMetaObject
+	?uninstalled@HsWidgetComponent@@IAEXXZ @ 528 NONAME ; void HsWidgetComponent::uninstalled(void)
+	??1HsHostedWidgetFactory@@UAE@XZ @ 529 NONAME ; HsHostedWidgetFactory::~HsHostedWidgetFactory(void)
+	?trUtf8@HsShortcutService@@SA?AVQString@@PBD0@Z @ 530 NONAME ; class QString HsShortcutService::trUtf8(char const *, char const *)
+	?setPage@HsWidgetHost@@QAE_NPAVHsPage@@@Z @ 531 NONAME ; bool HsWidgetHost::setPage(class HsPage *)
+	?metaObject@HsScene@@UBEPBUQMetaObject@@XZ @ 532 NONAME ; struct QMetaObject const * HsScene::metaObject(void) const
+	??_EHsScene@@UAE@I@Z @ 533 NONAME ; HsScene::~HsScene(unsigned int)
+	?pageTapAndHoldFinished@HsScene@@IAEXPAVQGestureEvent@@@Z @ 534 NONAME ; void HsScene::pageTapAndHoldFinished(class QGestureEvent *)
+	?remove@HsWidgetHost@@QAEXXZ @ 535 NONAME ; void HsWidgetHost::remove(void)
+	?run@HsWallpaperLoaderThread@@MAEXXZ @ 536 NONAME ; void HsWallpaperLoaderThread::run(void)
+	?maximumWidgetSizeInUnits@HsConfiguration@@QBE?AVQSizeF@@XZ @ 537 NONAME ; class QSizeF HsConfiguration::maximumWidgetSizeInUnits(void) const
+	?getStaticMetaObject@HsScene@@SAABUQMetaObject@@XZ @ 538 NONAME ; struct QMetaObject const & HsScene::getStaticMetaObject(void)
+	?finished@HsWallpaperLoader@@IAEXXZ @ 539 NONAME ; void HsWallpaperLoader::finished(void)
+	?visual@HsPage@@QBEPAVHsPageVisual@@XZ @ 540 NONAME ; class HsPageVisual * HsPage::visual(void) const
+	?snapLineFadeOutDuration@HsConfiguration@@QBEHXZ @ 541 NONAME ; int HsConfiguration::snapLineFadeOutDuration(void) const
+	?trUtf8@HsPageWallpaper@@SA?AVQString@@PBD0H@Z @ 542 NONAME ; class QString HsPageWallpaper::trUtf8(char const *, char const *, int)
+	?setNewSize@HsWidgetHostVisual@@AAEXABVQSizeF@@@Z @ 543 NONAME ; void HsWidgetHostVisual::setNewSize(class QSizeF const &)
+	?imageSet@HsWallpaper@@IAEXXZ @ 544 NONAME ; void HsWallpaper::imageSet(void)
+	?tr@HsWidgetHostVisual@@SA?AVQString@@PBD0H@Z @ 545 NONAME ; class QString HsWidgetHostVisual::tr(char const *, char const *, int)
+	?sceneType@HsConfiguration@@QBE?AW4SceneType@1@XZ @ 546 NONAME ; enum HsConfiguration::SceneType HsConfiguration::sceneType(void) const
+	?tr@HsPage@@SA?AVQString@@PBD0H@Z @ 547 NONAME ; class QString HsPage::tr(char const *, char const *, int)
+	?setNewPageAddedAnimationDuration@HsConfiguration@@QAEXH@Z @ 548 NONAME ; void HsConfiguration::setNewPageAddedAnimationDuration(int)
+	??_EHsGui@@UAE@I@Z @ 549 NONAME ; HsGui::~HsGui(unsigned int)
+	?isAvailable@HsWidgetComponent@@QBE_NXZ @ 550 NONAME ; bool HsWidgetComponent::isAvailable(void) const
+	?updateWidgetZValues@HsDatabase@@QAE_NABV?$QHash@HM@@W4Orientation@Qt@@@Z @ 551 NONAME ; bool HsDatabase::updateWidgetZValues(class QHash<int, float> const &, enum Qt::Orientation)
+	?checkConnection@HsDatabase@@ABE_NXZ @ 552 NONAME ; bool HsDatabase::checkConnection(void) const
+	?staticMetaObject@HsConfiguration@@2UQMetaObject@@B @ 553 NONAME ; struct QMetaObject const HsConfiguration::staticMetaObject
+	?takeInstance@HsDatabase@@SAPAV1@XZ @ 554 NONAME ; class HsDatabase * HsDatabase::takeInstance(void)
+	?tr@HsWallpaper@@SA?AVQString@@PBD0@Z @ 555 NONAME ; class QString HsWallpaper::tr(char const *, char const *)
+	?deleteWidgets@HsDatabase@@QAE_NABVQString@@@Z @ 556 NONAME ; bool HsDatabase::deleteWidgets(class QString const &)
+	??0HsPageData@@QAE@XZ @ 557 NONAME ; HsPageData::HsPageData(void)
+	?tr@HsSceneWallpaper@@SA?AVQString@@PBD0H@Z @ 558 NONAME ; class QString HsSceneWallpaper::tr(char const *, char const *, int)
+	?pageIndicatorSpacing@HsConfiguration@@QBEMXZ @ 559 NONAME ; float HsConfiguration::pageIndicatorSpacing(void) const
+	?getStaticMetaObject@HsShortcutService@@SAABUQMetaObject@@XZ @ 560 NONAME ; struct QMetaObject const & HsShortcutService::getStaticMetaObject(void)
+	?isRemovable@HsPage@@QBE_NXZ @ 561 NONAME ; bool HsPage::isRemovable(void) const
+	?setDatabaseId@HsPage@@QAEXH@Z @ 562 NONAME ; void HsPage::setDatabaseId(int)
+	?trUtf8@HsIdleWidget@@SA?AVQString@@PBD0@Z @ 563 NONAME ; class QString HsIdleWidget::trUtf8(char const *, char const *)
+	?pageChangeAnimationDuration@HsConfiguration@@QBEHXZ @ 564 NONAME ; int HsConfiguration::pageChangeAnimationDuration(void) const
+	?staticMetaObject@HsBackupRestoreObserver@@2UQMetaObject@@B @ 565 NONAME ; struct QMetaObject const HsBackupRestoreObserver::staticMetaObject
+	?widgetTapAndHoldFinished@HsScene@@IAEXPAVQGestureEvent@@PAVHsWidgetHost@@@Z @ 566 NONAME ; void HsScene::widgetTapAndHoldFinished(class QGestureEvent *, class HsWidgetHost *)
+	?metaObject@HsPageWallpaper@@UBEPBUQMetaObject@@XZ @ 567 NONAME ; struct QMetaObject const * HsPageWallpaper::metaObject(void) const
+	?tr@HsGui@@SA?AVQString@@PBD0H@Z @ 568 NONAME ; class QString HsGui::tr(char const *, char const *, int)
+	?updatePage@HsDatabase@@QAE_NABVHsPageData@@@Z @ 569 NONAME ; bool HsDatabase::updatePage(class HsPageData const &)
+	?action_uninitialize@HsWidgetHost@@AAEXXZ @ 570 NONAME ; void HsWidgetHost::action_uninitialize(void)
+	??_EHsWallpaperLoader@@UAE@I@Z @ 571 NONAME ; HsWallpaperLoader::~HsWallpaperLoader(unsigned int)
+	??_EHsWallpaper@@UAE@I@Z @ 572 NONAME ; HsWallpaper::~HsWallpaper(unsigned int)
+	?action_connectComponent@HsWidgetHost@@AAEXXZ @ 573 NONAME ; void HsWidgetHost::action_connectComponent(void)
+	?setImage@HsWallpaper@@QAEXABVQString@@@Z @ 574 NONAME ; void HsWallpaper::setImage(class QString const &)
+	?setPageChangeAnimationDuration@HsConfiguration@@QAEXH@Z @ 575 NONAME ; void HsConfiguration::setPageChangeAnimationDuration(int)
+	??0HsSceneData@@QAE@XZ @ 576 NONAME ; HsSceneData::HsSceneData(void)
+	?hasSignal@HsWidgetHost@@AAE_NPBD@Z @ 577 NONAME ; bool HsWidgetHost::hasSignal(char const *)
+	?getStaticMetaObject@HsWidgetHostVisual@@SAABUQMetaObject@@XZ @ 578 NONAME ; struct QMetaObject const & HsWidgetHostVisual::getStaticMetaObject(void)
+	?getStaticMetaObject@HsWallpaper@@SAABUQMetaObject@@XZ @ 579 NONAME ; struct QMetaObject const & HsWallpaper::getStaticMetaObject(void)
+	?trUtf8@HsWallpaper@@SA?AVQString@@PBD0@Z @ 580 NONAME ; class QString HsWallpaper::trUtf8(char const *, char const *)
+	??0HsWidgetHost@@QAE@HPAVQObject@@@Z @ 581 NONAME ; HsWidgetHost::HsWidgetHost(int, class QObject *)
+	?emitWidgetRemoved@HsContentService@@QAEXABVQString@@ABV?$QHash@VQString@@VQVariant@@@@@Z @ 582 NONAME ; void HsContentService::emitWidgetRemoved(class QString const &, class QHash<class QString, class QVariant> const &)
+	?pages@HsScene@@QBE?AV?$QList@PAVHsPage@@@@XZ @ 583 NONAME ; class QList<class HsPage *> HsScene::pages(void) const
+	??1HsConfiguration@@UAE@XZ @ 584 NONAME ; HsConfiguration::~HsConfiguration(void)
+	?trashBin@HsIdleWidget@@QBEPAVHsTrashBinWidget@@XZ @ 585 NONAME ; class HsTrashBinWidget * HsIdleWidget::trashBin(void) const
+	?translationFilename@HsWidgetComponentDescriptor@@QBE?AVQString@@XZ @ 586 NONAME ; class QString HsWidgetComponentDescriptor::translationFilename(void) const
+	?trUtf8@HsConfiguration@@SA?AVQString@@PBD0@Z @ 587 NONAME ; class QString HsConfiguration::trUtf8(char const *, char const *)
+	?instance@HsScene@@SAPAV1@XZ @ 588 NONAME ; class HsScene * HsScene::instance(void)
+	?eventFilter@HsScene@@MAE_NPAVQObject@@PAVQEvent@@@Z @ 589 NONAME ; bool HsScene::eventFilter(class QObject *, class QEvent *)
+	?trUtf8@HsPage@@SA?AVQString@@PBD0H@Z @ 590 NONAME ; class QString HsPage::trUtf8(char const *, char const *, int)
+	?isDefaultPage@HsPage@@QBE_NXZ @ 591 NONAME ; bool HsPage::isDefaultPage(void) const
+	??_EHsDatabase@@UAE@I@Z @ 592 NONAME ; HsDatabase::~HsDatabase(unsigned int)
+	?event_startAndShow@HsWidgetHost@@IAEXXZ @ 593 NONAME ; void HsWidgetHost::event_startAndShow(void)
+	?layoutRect@HsGui@@QBE?AVQRectF@@XZ @ 594 NONAME ; class QRectF HsGui::layoutRect(void) const
+	?trUtf8@HsContentService@@SA?AVQString@@PBD0H@Z @ 595 NONAME ; class QString HsContentService::trUtf8(char const *, char const *, int)
+	?setMinimumWidgetHeight@HsConfiguration@@QAEXM@Z @ 596 NONAME ; void HsConfiguration::setMinimumWidgetHeight(float)
+	?pageTapFinished@HsScene@@IAEXPAVQGestureEvent@@@Z @ 597 NONAME ; void HsScene::pageTapFinished(class QGestureEvent *)
+	?unavailable@HsWidgetComponent@@IAEXXZ @ 598 NONAME ; void HsWidgetComponent::unavailable(void)
+	?isShortcutLabelVisible@HsConfiguration@@QBE_NXZ @ 599 NONAME ; bool HsConfiguration::isShortcutLabelVisible(void) const
+	?setPageChangeZoneReverseAnimationDuration@HsConfiguration@@QAEXH@Z @ 600 NONAME ; void HsConfiguration::setPageChangeZoneReverseAnimationDuration(int)
+	?getStaticMetaObject@HsIdleWidget@@SAABUQMetaObject@@XZ @ 601 NONAME ; struct QMetaObject const & HsIdleWidget::getStaticMetaObject(void)
+	?qt_metacall@HsWidgetHostVisual@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 602 NONAME ; int HsWidgetHostVisual::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?tr@HsDatabase@@SA?AVQString@@PBD0H@Z @ 603 NONAME ; class QString HsDatabase::tr(char const *, char const *, int)
+	?instance@HsWidgetComponentRegistry@@SAPAV1@XZ @ 604 NONAME ; class HsWidgetComponentRegistry * HsWidgetComponentRegistry::instance(void)
+	?serviceXml@HsWidgetComponentDescriptor@@QBE?AVQString@@XZ @ 605 NONAME ; class QString HsWidgetComponentDescriptor::serviceXml(void) const
+	?qt_metacall@HsWallpaperLoader@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 606 NONAME ; int HsWallpaperLoader::qt_metacall(enum QMetaObject::Call, int, void * *)
+	??_EHsSceneWallpaper@@UAE@I@Z @ 607 NONAME ; HsSceneWallpaper::~HsSceneWallpaper(unsigned int)
+	?instance@HsDatabase@@SAPAV1@XZ @ 608 NONAME ; class HsDatabase * HsDatabase::instance(void)
+	?setTranslationFilename@HsWidgetComponentDescriptor@@QAEXABVQString@@@Z @ 609 NONAME ; void HsWidgetComponentDescriptor::setTranslationFilename(class QString const &)
+	?onLoaderFinished@HsWallpaper@@AAEXXZ @ 610 NONAME ; void HsWallpaper::onLoaderFinished(void)
+	?qt_metacall@HsIdleWidget@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 611 NONAME ; int HsIdleWidget::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?addWidget@HsContentService@@QAE_NABVQString@@ABV?$QHash@VQString@@VQVariant@@@@ABVQVariant@@@Z @ 612 NONAME ; bool HsContentService::addWidget(class QString const &, class QHash<class QString, class QVariant> const &, class QVariant const &)
+	?shortcutWidgetTapFeedbackEffect@HsConfiguration@@QBE?AW4InstantEffect@HbFeedback@@XZ @ 613 NONAME ; enum HbFeedback::InstantEffect HsConfiguration::shortcutWidgetTapFeedbackEffect(void) const
+	?widgetMoveFinished@HsScene@@IAEXABVQPointF@@PAVHsWidgetHost@@@Z @ 614 NONAME ; void HsScene::widgetMoveFinished(class QPointF const &, class HsWidgetHost *)
+	?setInstance@HsScene@@SAXPAV1@@Z @ 615 NONAME ; void HsScene::setInstance(class HsScene *)
+	?tr@HsPageVisual@@SA?AVQString@@PBD0H@Z @ 616 NONAME ; class QString HsPageVisual::tr(char const *, char const *, int)
+	??_EHsContentService@@UAE@I@Z @ 617 NONAME ; HsContentService::~HsContentService(unsigned int)
+	?trUtf8@HsDatabase@@SA?AVQString@@PBD0H@Z @ 618 NONAME ; class QString HsDatabase::trUtf8(char const *, char const *, int)
+	?action_hide@HsWidgetHost@@AAEXXZ @ 619 NONAME ; void HsWidgetHost::action_hide(void)
+	?addNewWidget@HsPage@@QAE_NPAVHsWidgetHost@@ABVQPointF@@@Z @ 620 NONAME ; bool HsPage::addNewWidget(class HsWidgetHost *, class QPointF const &)
+	?removePresentation@HsWidgetHost@@QAE_NW4Orientation@Qt@@@Z @ 621 NONAME ; bool HsWidgetHost::removePresentation(enum Qt::Orientation)
+	?staticMetaObject@HsContentService@@2UQMetaObject@@B @ 622 NONAME ; struct QMetaObject const HsContentService::staticMetaObject
+	?tr@HsWidgetHost@@SA?AVQString@@PBD0H@Z @ 623 NONAME ; class QString HsWidgetHost::tr(char const *, char const *, int)
+	?setWidgetRepositionFeedbackEffect@HsConfiguration@@QAEXW4InstantEffect@HbFeedback@@@Z @ 624 NONAME ; void HsConfiguration::setWidgetRepositionFeedbackEffect(enum HbFeedback::InstantEffect)
+	?gestureEvent@HsWidgetHostVisual@@MAEXPAVQGestureEvent@@@Z @ 625 NONAME ; void HsWidgetHostVisual::gestureEvent(class QGestureEvent *)
+	?metaObject@HsBackupRestoreObserver@@UBEPBUQMetaObject@@XZ @ 626 NONAME ; struct QMetaObject const * HsBackupRestoreObserver::metaObject(void) const
+	?instance@HsGui@@SAPAV1@XZ @ 627 NONAME ; class HsGui * HsGui::instance(void)
+	?getStaticMetaObject@HsHostedWidgetFactory@@SAABUQMetaObject@@XZ @ 628 NONAME ; struct QMetaObject const & HsHostedWidgetFactory::getStaticMetaObject(void)
+	?pageIndex@HsPageVisual@@QBEHXZ @ 629 NONAME ; int HsPageVisual::pageIndex(void) const
+	?qt_metacall@HsScene@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 630 NONAME ; int HsScene::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?setExistingImage@HsWallpaper@@IAE_NXZ @ 631 NONAME ; bool HsWallpaper::setExistingImage(void)
+	?setPageChangeFeedbackEffect@HsConfiguration@@QAEXW4InstantEffect@HbFeedback@@@Z @ 632 NONAME ; void HsConfiguration::setPageChangeFeedbackEffect(enum HbFeedback::InstantEffect)
+	?trUtf8@HsHostedWidgetFactory@@SA?AVQString@@PBD0H@Z @ 633 NONAME ; class QString HsHostedWidgetFactory::trUtf8(char const *, char const *, int)
+	?trUtf8@HsConfiguration@@SA?AVQString@@PBD0H@Z @ 634 NONAME ; class QString HsConfiguration::trUtf8(char const *, char const *, int)
+	?minimumWidgetSizeInPixels@HsConfiguration@@QBE?AVQSizeF@@XZ @ 635 NONAME ; class QSizeF HsConfiguration::minimumWidgetSizeInPixels(void) const
+	?event_finished@HsWidgetHost@@IAEXXZ @ 636 NONAME ; void HsWidgetHost::event_finished(void)
+	?sourcePath@HsWallpaperLoaderThread@@QBE?AVQString@@XZ @ 637 NONAME ; class QString HsWallpaperLoaderThread::sourcePath(void) const
+	?widgets@HsPage@@QBE?AV?$QList@PAVHsWidgetHost@@@@XZ @ 638 NONAME ; class QList<class HsWidgetHost *> HsPage::widgets(void) const
+	?setPageMargin@HsConfiguration@@QAEXM@Z @ 639 NONAME ; void HsConfiguration::setPageMargin(float)
+	?parallaxFactor@HsIdleWidget@@QBEMXZ @ 640 NONAME ; float HsIdleWidget::parallaxFactor(void) const
+	?setOnline@HsWidgetHost@@QAEX_N@Z @ 641 NONAME ; void HsWidgetHost::setOnline(bool)
+	?setPreferencesToWidget@HsWidgetHost@@AAE_NXZ @ 642 NONAME ; bool HsWidgetHost::setPreferencesToWidget(void)
+	?setWidgetPickFeedbackEffect@HsConfiguration@@QAEXW4InstantEffect@HbFeedback@@@Z @ 643 NONAME ; void HsConfiguration::setWidgetPickFeedbackEffect(enum HbFeedback::InstantEffect)
+	?getStaticMetaObject@HsPageWallpaper@@SAABUQMetaObject@@XZ @ 644 NONAME ; struct QMetaObject const & HsPageWallpaper::getStaticMetaObject(void)
+	??0HsWidgetHostVisual@@QAE@PAVQGraphicsItem@@@Z @ 645 NONAME ; HsWidgetHostVisual::HsWidgetHostVisual(class QGraphicsItem *)
+	?trUtf8@HsIdleWidget@@SA?AVQString@@PBD0H@Z @ 646 NONAME ; class QString HsIdleWidget::trUtf8(char const *, char const *, int)
+	??0HsContentService@@QAE@PAVQObject@@@Z @ 647 NONAME ; HsContentService::HsContentService(class QObject *)
+	?trUtf8@HsWidgetComponentRegistry@@SA?AVQString@@PBD0H@Z @ 648 NONAME ; class QString HsWidgetComponentRegistry::trUtf8(char const *, char const *, int)
+	?targetPath@HsWallpaperLoaderThread@@QBE?AVQString@@XZ @ 649 NONAME ; class QString HsWallpaperLoaderThread::targetPath(void) const
+	?staticMetaObject@HsWallpaper@@2UQMetaObject@@B @ 650 NONAME ; struct QMetaObject const HsWallpaper::staticMetaObject
+	?trUtf8@HsGui@@SA?AVQString@@PBD0H@Z @ 651 NONAME ; class QString HsGui::trUtf8(char const *, char const *, int)
+	?metaObject@HsPageVisual@@UBEPBUQMetaObject@@XZ @ 652 NONAME ; struct QMetaObject const * HsPageVisual::metaObject(void) const
+	?tr@HsWidgetComponent@@SA?AVQString@@PBD0@Z @ 653 NONAME ; class QString HsWidgetComponent::tr(char const *, char const *)
+	?tr@HsHostedWidgetFactory@@SA?AVQString@@PBD0@Z @ 654 NONAME ; class QString HsHostedWidgetFactory::tr(char const *, char const *)
+	?setBounceEffect@HsConfiguration@@QAEXH@Z @ 655 NONAME ; void HsConfiguration::setBounceEffect(int)
+	??0HsPage@@QAE@PAVQObject@@@Z @ 656 NONAME ; HsPage::HsPage(class QObject *)
+	?qt_metacast@HsDatabase@@UAEPAXPBD@Z @ 657 NONAME ; void * HsDatabase::qt_metacast(char const *)
+	?registerService@HsWidgetComponentRegistry@@AAEXABVCaEntry@@ABVQString@@_N@Z @ 658 NONAME ; void HsWidgetComponentRegistry::registerService(class CaEntry const &, class QString const &, bool)
+	?trUtf8@HsBackupRestoreObserver@@SA?AVQString@@PBD0@Z @ 659 NONAME ; class QString HsBackupRestoreObserver::trUtf8(char const *, char const *)
+	?metaObject@HsWidgetHost@@UBEPBUQMetaObject@@XZ @ 660 NONAME ; struct QMetaObject const * HsWidgetHost::metaObject(void) const
+	?qt_metacast@HsConfiguration@@UAEPAXPBD@Z @ 661 NONAME ; void * HsConfiguration::qt_metacast(char const *)
 
--- a/homescreenapp/hsdomainmodel/eabi/hsdomainmodelu.def	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hsdomainmodel/eabi/hsdomainmodelu.def	Fri Sep 17 08:27:54 2010 +0300
@@ -55,502 +55,505 @@
 	_ZN11HsWallpaper6removeEv @ 54 NONAME
 	_ZN11HsWallpaper8imageSetEv @ 55 NONAME
 	_ZN11HsWallpaper8setImageERK7QString @ 56 NONAME
-	_ZN11HsWallpaperC2EP13QGraphicsItem @ 57 NONAME
-	_ZN11HsWallpaperD0Ev @ 58 NONAME
-	_ZN11HsWallpaperD1Ev @ 59 NONAME
-	_ZN11HsWallpaperD2Ev @ 60 NONAME
-	_ZN12HsIdleWidget10insertPageEiP6HsPage @ 61 NONAME
-	_ZN12HsIdleWidget10removePageEi @ 62 NONAME
-	_ZN12HsIdleWidget11polishEventEv @ 63 NONAME
-	_ZN12HsIdleWidget11qt_metacallEN11QMetaObject4CallEiPPv @ 64 NONAME
-	_ZN12HsIdleWidget11qt_metacastEPKc @ 65 NONAME
-	_ZN12HsIdleWidget11setGeometryERK6QRectF @ 66 NONAME
-	_ZN12HsIdleWidget12showTrashBinEv @ 67 NONAME
-	_ZN12HsIdleWidget13setActivePageEi @ 68 NONAME
-	_ZN12HsIdleWidget16loadControlLayerEv @ 69 NONAME
-	_ZN12HsIdleWidget16staticMetaObjectE @ 70 NONAME DATA 16
-	_ZN12HsIdleWidget17showPageIndicatorEv @ 71 NONAME
-	_ZN12HsIdleWidget19getStaticMetaObjectEv @ 72 NONAME
-	_ZN12HsIdleWidget20hideVerticalSnapLineEv @ 73 NONAME
-	_ZN12HsIdleWidget20showVerticalSnapLineERK6QLineF @ 74 NONAME
-	_ZN12HsIdleWidget22hideHorizontalSnapLineEv @ 75 NONAME
-	_ZN12HsIdleWidget22showHorizontalSnapLineERK6QLineF @ 76 NONAME
-	_ZN12HsIdleWidget9setSceneXEf @ 77 NONAME
-	_ZN12HsIdleWidgetC1EP13QGraphicsItem @ 78 NONAME
-	_ZN12HsIdleWidgetC2EP13QGraphicsItem @ 79 NONAME
-	_ZN12HsIdleWidgetD0Ev @ 80 NONAME
-	_ZN12HsIdleWidgetD1Ev @ 81 NONAME
-	_ZN12HsIdleWidgetD2Ev @ 82 NONAME
-	_ZN12HsPageVisual11qt_metacallEN11QMetaObject4CallEiPPv @ 83 NONAME
-	_ZN12HsPageVisual11qt_metacastEPKc @ 84 NONAME
-	_ZN12HsPageVisual11setGeometryERK6QRectF @ 85 NONAME
-	_ZN12HsPageVisual14setupTouchAreaEv @ 86 NONAME
-	_ZN12HsPageVisual16staticMetaObjectE @ 87 NONAME DATA 16
-	_ZN12HsPageVisual19getStaticMetaObjectEv @ 88 NONAME
-	_ZN12HsPageVisualC1EP13QGraphicsItem @ 89 NONAME
-	_ZN12HsPageVisualC2EP13QGraphicsItem @ 90 NONAME
-	_ZN12HsPageVisualD0Ev @ 91 NONAME
-	_ZN12HsPageVisualD1Ev @ 92 NONAME
-	_ZN12HsPageVisualD2Ev @ 93 NONAME
-	_ZN12HsWidgetHost10event_hideEv @ 94 NONAME
-	_ZN12HsWidgetHost10event_showEv @ 95 NONAME
-	_ZN12HsWidgetHost10hideWidgetEv @ 96 NONAME
-	_ZN12HsWidgetHost10onFinishedEv @ 97 NONAME
-	_ZN12HsWidgetHost10showWidgetEv @ 98 NONAME
-	_ZN12HsWidgetHost11action_hideEv @ 99 NONAME
-	_ZN12HsWidgetHost11action_loadEv @ 100 NONAME
-	_ZN12HsWidgetHost11action_showEv @ 101 NONAME
-	_ZN12HsWidgetHost11event_closeEv @ 102 NONAME
-	_ZN12HsWidgetHost11qt_metacallEN11QMetaObject4CallEiPPv @ 103 NONAME
-	_ZN12HsWidgetHost11qt_metacastEPKc @ 104 NONAME
-	_ZN12HsWidgetHost11setPropertyEPKcR13QMetaProperty @ 105 NONAME
-	_ZN12HsWidgetHost11setupStatesEv @ 106 NONAME
-	_ZN12HsWidgetHost11startWidgetEb @ 107 NONAME
-	_ZN12HsWidgetHost11unavailableEv @ 108 NONAME
-	_ZN12HsWidgetHost12event_removeEv @ 109 NONAME
-	_ZN12HsWidgetHost12event_unloadEv @ 110 NONAME
-	_ZN12HsWidgetHost13action_removeEv @ 111 NONAME
-	_ZN12HsWidgetHost13action_unloadEv @ 112 NONAME
-	_ZN12HsWidgetHost13event_faultedEv @ 113 NONAME
-	_ZN12HsWidgetHost14action_faultedEv @ 114 NONAME
-	_ZN12HsWidgetHost14createInstanceER12HsWidgetDataRK5QHashI7QString8QVariantE @ 115 NONAME
-	_ZN12HsWidgetHost14event_finishedEv @ 116 NONAME
-	_ZN12HsWidgetHost15action_finishedEv @ 117 NONAME
-	_ZN12HsWidgetHost15getPresentationER24HsWidgetPresentationData @ 118 NONAME
-	_ZN12HsWidgetHost15startDragEffectEv @ 119 NONAME
-	_ZN12HsWidgetHost15startDropEffectEv @ 120 NONAME
-	_ZN12HsWidgetHost16loadPresentationEN2Qt11OrientationE @ 121 NONAME
-	_ZN12HsWidgetHost16loadPresentationEv @ 122 NONAME
-	_ZN12HsWidgetHost16onSetPreferencesERK11QStringList @ 123 NONAME
-	_ZN12HsWidgetHost16savePresentationEN2Qt11OrientationE @ 124 NONAME
-	_ZN12HsWidgetHost16savePresentationER24HsWidgetPresentationData @ 125 NONAME
-	_ZN12HsWidgetHost16savePresentationEv @ 126 NONAME
-	_ZN12HsWidgetHost16staticMetaObjectE @ 127 NONAME DATA 16
-	_ZN12HsWidgetHost17action_initializeEv @ 128 NONAME
-	_ZN12HsWidgetHost18event_startAndHideEv @ 129 NONAME
-	_ZN12HsWidgetHost18event_startAndShowEv @ 130 NONAME
-	_ZN12HsWidgetHost18removePresentationEN2Qt11OrientationE @ 131 NONAME
-	_ZN12HsWidgetHost19action_notifyRemoveEv @ 132 NONAME
-	_ZN12HsWidgetHost19action_uninitializeEv @ 133 NONAME
-	_ZN12HsWidgetHost19getStaticMetaObjectEv @ 134 NONAME
-	_ZN12HsWidgetHost22setPreferencesToWidgetEv @ 135 NONAME
-	_ZN12HsWidgetHost23action_connectComponentEv @ 136 NONAME
-	_ZN12HsWidgetHost26action_disconnectComponentEv @ 137 NONAME
-	_ZN12HsWidgetHost5closeEv @ 138 NONAME
-	_ZN12HsWidgetHost6removeEv @ 139 NONAME
-	_ZN12HsWidgetHost7faultedEv @ 140 NONAME
-	_ZN12HsWidgetHost7onErrorEv @ 141 NONAME
-	_ZN12HsWidgetHost7setPageEP6HsPage @ 142 NONAME
-	_ZN12HsWidgetHost8finishedEv @ 143 NONAME
-	_ZN12HsWidgetHost9availableEv @ 144 NONAME
-	_ZN12HsWidgetHost9hasSignalEPKc @ 145 NONAME
-	_ZN12HsWidgetHost9setMethodEPKcR11QMetaMethod @ 146 NONAME
-	_ZN12HsWidgetHost9setOnlineEb @ 147 NONAME
-	_ZN12HsWidgetHostC1EiP7QObject @ 148 NONAME
-	_ZN12HsWidgetHostC2EiP7QObject @ 149 NONAME
-	_ZN12HsWidgetHostD0Ev @ 150 NONAME
-	_ZN12HsWidgetHostD1Ev @ 151 NONAME
-	_ZN12HsWidgetHostD2Ev @ 152 NONAME
-	_ZN15HsConfiguration11qt_metacallEN11QMetaObject4CallEiPPv @ 153 NONAME
-	_ZN15HsConfiguration11qt_metacastEPKc @ 154 NONAME
-	_ZN15HsConfiguration11setInstanceEPS_ @ 155 NONAME
-	_ZN15HsConfiguration12exportToFileERK7QString @ 156 NONAME
-	_ZN15HsConfiguration12takeInstanceEv @ 157 NONAME
-	_ZN15HsConfiguration14importFromFileERK7QString @ 158 NONAME
-	_ZN15HsConfiguration15propertyChangedERK7QString @ 159 NONAME
-	_ZN15HsConfiguration16staticMetaObjectE @ 160 NONAME DATA 16
-	_ZN15HsConfiguration19getStaticMetaObjectEv @ 161 NONAME
-	_ZN15HsConfiguration4loadEv @ 162 NONAME
-	_ZN15HsConfiguration8instanceEv @ 163 NONAME
-	_ZN15HsConfiguration9mInstanceE @ 164 NONAME DATA 4
-	_ZN15HsConfigurationC1EP7QObject @ 165 NONAME
-	_ZN15HsConfigurationC2EP7QObject @ 166 NONAME
-	_ZN15HsConfigurationD0Ev @ 167 NONAME
-	_ZN15HsConfigurationD1Ev @ 168 NONAME
-	_ZN15HsConfigurationD2Ev @ 169 NONAME
-	_ZN15HsPageWallpaper11qt_metacallEN11QMetaObject4CallEiPPv @ 170 NONAME
-	_ZN15HsPageWallpaper11qt_metacastEPKc @ 171 NONAME
-	_ZN15HsPageWallpaper13createTargetsERK7QString @ 172 NONAME
-	_ZN15HsPageWallpaper16staticMetaObjectE @ 173 NONAME DATA 16
-	_ZN15HsPageWallpaper19getStaticMetaObjectEv @ 174 NONAME
-	_ZN15HsPageWallpaper7setPageEP6HsPage @ 175 NONAME
-	_ZN15HsPageWallpaperC1EP6HsPageP13QGraphicsItem @ 176 NONAME
-	_ZN15HsPageWallpaperC2EP6HsPageP13QGraphicsItem @ 177 NONAME
-	_ZN15HsPageWallpaperD0Ev @ 178 NONAME
-	_ZN15HsPageWallpaperD1Ev @ 179 NONAME
-	_ZN15HsPageWallpaperD2Ev @ 180 NONAME
-	_ZN16HsContentService11qt_metacallEN11QMetaObject4CallEiPPv @ 181 NONAME
-	_ZN16HsContentService11qt_metacastEPKc @ 182 NONAME
-	_ZN16HsContentService11widgetAddedERK7QStringRK5QHashIS0_8QVariantE @ 183 NONAME
-	_ZN16HsContentService12createWidgetERK5QHashI7QString8QVariantE @ 184 NONAME
-	_ZN16HsContentService13widgetRemovedERK7QStringRK5QHashIS0_8QVariantE @ 185 NONAME
-	_ZN16HsContentService16staticMetaObjectE @ 186 NONAME DATA 16
-	_ZN16HsContentService17emitWidgetRemovedERK7QStringRK5QHashIS0_8QVariantE @ 187 NONAME
-	_ZN16HsContentService18widgetStartFaultedEv @ 188 NONAME
-	_ZN16HsContentService19getStaticMetaObjectEv @ 189 NONAME
-	_ZN16HsContentService22createWidgetForPreviewERK5QHashI7QString8QVariantE @ 190 NONAME
-	_ZN16HsContentService7widgetsERK7QStringRK5QHashIS0_8QVariantERi @ 191 NONAME
-	_ZN16HsContentService8instanceEv @ 192 NONAME
-	_ZN16HsContentService9addWidgetERK7QStringRK5QHashIS0_8QVariantERKS4_ @ 193 NONAME
-	_ZN16HsContentService9mInstanceE @ 194 NONAME DATA 4
-	_ZN16HsContentServiceC1EP7QObject @ 195 NONAME
-	_ZN16HsContentServiceC2EP7QObject @ 196 NONAME
-	_ZN16HsContentServiceD0Ev @ 197 NONAME
-	_ZN16HsContentServiceD1Ev @ 198 NONAME
-	_ZN16HsContentServiceD2Ev @ 199 NONAME
-	_ZN16HsSceneWallpaper11qt_metacallEN11QMetaObject4CallEiPPv @ 200 NONAME
-	_ZN16HsSceneWallpaper11qt_metacastEPKc @ 201 NONAME
-	_ZN16HsSceneWallpaper13createTargetsERK7QString @ 202 NONAME
-	_ZN16HsSceneWallpaper16staticMetaObjectE @ 203 NONAME DATA 16
-	_ZN16HsSceneWallpaper19getStaticMetaObjectEv @ 204 NONAME
-	_ZN16HsSceneWallpaper8setSceneEP7HsScene @ 205 NONAME
-	_ZN16HsSceneWallpaperC1EP7HsSceneP13QGraphicsItem @ 206 NONAME
-	_ZN16HsSceneWallpaperC2EP7HsSceneP13QGraphicsItem @ 207 NONAME
-	_ZN16HsSceneWallpaperD0Ev @ 208 NONAME
-	_ZN16HsSceneWallpaperD1Ev @ 209 NONAME
-	_ZN16HsSceneWallpaperD2Ev @ 210 NONAME
-	_ZN17HsShortcutService11qt_metacallEN11QMetaObject4CallEiPPv @ 211 NONAME
-	_ZN17HsShortcutService11qt_metacastEPKc @ 212 NONAME
-	_ZN17HsShortcutService16staticMetaObjectE @ 213 NONAME DATA 16
-	_ZN17HsShortcutService19getStaticMetaObjectEv @ 214 NONAME
-	_ZN17HsShortcutService20isItemShortcutWidgetEi @ 215 NONAME
-	_ZN17HsShortcutService23executeCollectionActionEiRK7QString @ 216 NONAME
-	_ZN17HsShortcutService8instanceEP13QStateMachine @ 217 NONAME
-	_ZN17HsShortcutService9mInstanceE @ 218 NONAME DATA 4
-	_ZN17HsShortcutServiceC1EP13QStateMachineP7QObject @ 219 NONAME
-	_ZN17HsShortcutServiceC2EP13QStateMachineP7QObject @ 220 NONAME
-	_ZN17HsShortcutServiceD0Ev @ 221 NONAME
-	_ZN17HsShortcutServiceD1Ev @ 222 NONAME
-	_ZN17HsShortcutServiceD2Ev @ 223 NONAME
-	_ZN17HsWallpaperLoader11qt_metacallEN11QMetaObject4CallEiPPv @ 224 NONAME
-	_ZN17HsWallpaperLoader11qt_metacastEPKc @ 225 NONAME
-	_ZN17HsWallpaperLoader16onThreadFinishedEv @ 226 NONAME
-	_ZN17HsWallpaperLoader16staticMetaObjectE @ 227 NONAME DATA 16
-	_ZN17HsWallpaperLoader19getStaticMetaObjectEv @ 228 NONAME
-	_ZN17HsWallpaperLoader5startEv @ 229 NONAME
-	_ZN17HsWallpaperLoader6cancelEv @ 230 NONAME
-	_ZN17HsWallpaperLoader6failedEv @ 231 NONAME
-	_ZN17HsWallpaperLoader7cleanupEv @ 232 NONAME
-	_ZN17HsWallpaperLoader8finishedEv @ 233 NONAME
-	_ZN17HsWallpaperLoaderC1EP7QObject @ 234 NONAME
-	_ZN17HsWallpaperLoaderC2EP7QObject @ 235 NONAME
-	_ZN17HsWallpaperLoaderD0Ev @ 236 NONAME
-	_ZN17HsWallpaperLoaderD1Ev @ 237 NONAME
-	_ZN17HsWallpaperLoaderD2Ev @ 238 NONAME
-	_ZN17HsWidgetComponent11emitUpdatedEv @ 239 NONAME
-	_ZN17HsWidgetComponent11qt_metacallEN11QMetaObject4CallEiPPv @ 240 NONAME
-	_ZN17HsWidgetComponent11qt_metacastEPKc @ 241 NONAME
-	_ZN17HsWidgetComponent11unavailableEv @ 242 NONAME
-	_ZN17HsWidgetComponent11uninstalledEv @ 243 NONAME
-	_ZN17HsWidgetComponent13emitAvailableEv @ 244 NONAME
-	_ZN17HsWidgetComponent15emitUnavailableEv @ 245 NONAME
-	_ZN17HsWidgetComponent15emitUninstalledEv @ 246 NONAME
-	_ZN17HsWidgetComponent16aboutToUninstallEv @ 247 NONAME
-	_ZN17HsWidgetComponent16staticMetaObjectE @ 248 NONAME DATA 16
-	_ZN17HsWidgetComponent17installTranslatorEv @ 249 NONAME
-	_ZN17HsWidgetComponent19getStaticMetaObjectEv @ 250 NONAME
-	_ZN17HsWidgetComponent19uninstallTranslatorEv @ 251 NONAME
-	_ZN17HsWidgetComponent20emitAboutToUninstallEv @ 252 NONAME
-	_ZN17HsWidgetComponent37resolveRootPathAndTranslationFilenameEv @ 253 NONAME
-	_ZN17HsWidgetComponent7updatedEv @ 254 NONAME
-	_ZN17HsWidgetComponent9availableEv @ 255 NONAME
-	_ZN17HsWidgetComponentC1ERK7QStringP7QObject @ 256 NONAME
-	_ZN17HsWidgetComponentC2ERK7QStringP7QObject @ 257 NONAME
-	_ZN17HsWidgetComponentD0Ev @ 258 NONAME
-	_ZN17HsWidgetComponentD1Ev @ 259 NONAME
-	_ZN17HsWidgetComponentD2Ev @ 260 NONAME
-	_ZN18HsWidgetHostVisual10setNewSizeERK6QSizeF @ 261 NONAME
-	_ZN18HsWidgetHostVisual11eventFilterEP7QObjectP6QEvent @ 262 NONAME
-	_ZN18HsWidgetHostVisual11qt_metacallEN11QMetaObject4CallEiPPv @ 263 NONAME
-	_ZN18HsWidgetHostVisual11qt_metacastEPKc @ 264 NONAME
-	_ZN18HsWidgetHostVisual12gestureEventEP13QGestureEvent @ 265 NONAME
-	_ZN18HsWidgetHostVisual12setupEffectsEv @ 266 NONAME
-	_ZN18HsWidgetHostVisual14setVisualModelEP12HsWidgetHost @ 267 NONAME
-	_ZN18HsWidgetHostVisual14setupTouchAreaEv @ 268 NONAME
-	_ZN18HsWidgetHostVisual15startDragEffectEv @ 269 NONAME
-	_ZN18HsWidgetHostVisual15startDropEffectEv @ 270 NONAME
-	_ZN18HsWidgetHostVisual16staticMetaObjectE @ 271 NONAME DATA 16
-	_ZN18HsWidgetHostVisual19getStaticMetaObjectEv @ 272 NONAME
-	_ZN18HsWidgetHostVisual7resizedEv @ 273 NONAME
-	_ZN18HsWidgetHostVisual9setWidgetEP7QObject @ 274 NONAME
-	_ZN18HsWidgetHostVisualC1EP13QGraphicsItem @ 275 NONAME
-	_ZN18HsWidgetHostVisualC2EP13QGraphicsItem @ 276 NONAME
-	_ZN18HsWidgetHostVisualD0Ev @ 277 NONAME
-	_ZN18HsWidgetHostVisualD1Ev @ 278 NONAME
-	_ZN18HsWidgetHostVisualD2Ev @ 279 NONAME
-	_ZN21HsHostedWidgetFactory11qt_metacallEN11QMetaObject4CallEiPPv @ 280 NONAME
-	_ZN21HsHostedWidgetFactory11qt_metacastEPKc @ 281 NONAME
-	_ZN21HsHostedWidgetFactory11setInstanceEPS_ @ 282 NONAME
-	_ZN21HsHostedWidgetFactory12createWidgetERK7QString @ 283 NONAME
-	_ZN21HsHostedWidgetFactory12takeInstanceEv @ 284 NONAME
-	_ZN21HsHostedWidgetFactory16staticMetaObjectE @ 285 NONAME DATA 16
-	_ZN21HsHostedWidgetFactory19getStaticMetaObjectEv @ 286 NONAME
-	_ZN21HsHostedWidgetFactory8instanceEv @ 287 NONAME
-	_ZN21HsHostedWidgetFactory9mInstanceE @ 288 NONAME DATA 4
-	_ZN21HsHostedWidgetFactoryC1EP7QObject @ 289 NONAME
-	_ZN21HsHostedWidgetFactoryC2EP7QObject @ 290 NONAME
-	_ZN21HsHostedWidgetFactoryD0Ev @ 291 NONAME
-	_ZN21HsHostedWidgetFactoryD1Ev @ 292 NONAME
-	_ZN21HsHostedWidgetFactoryD2Ev @ 293 NONAME
-	_ZN23HsBackupRestoreObserver11qt_metacallEN11QMetaObject4CallEiPPv @ 294 NONAME
-	_ZN23HsBackupRestoreObserver11qt_metacastEPKc @ 295 NONAME
-	_ZN23HsBackupRestoreObserver11readyForBUREv @ 296 NONAME
-	_ZN23HsBackupRestoreObserver16staticMetaObjectE @ 297 NONAME DATA 16
-	_ZN23HsBackupRestoreObserver19getStaticMetaObjectEv @ 298 NONAME
-	_ZN23HsBackupRestoreObserver20backupRestoreStartedEv @ 299 NONAME
-	_ZN23HsBackupRestoreObserver22backupRestoreCompletedEv @ 300 NONAME
-	_ZN23HsBackupRestoreObserver26event_backupRestoreStartedEv @ 301 NONAME
-	_ZN23HsBackupRestoreObserver28event_backupRestoreCompletedEv @ 302 NONAME
-	_ZN23HsBackupRestoreObserver8checkBUREv @ 303 NONAME
-	_ZN23HsBackupRestoreObserver8instanceEv @ 304 NONAME
-	_ZN23HsBackupRestoreObserver9mInstanceE @ 305 NONAME DATA 4
-	_ZN23HsBackupRestoreObserverC1EP7QObject @ 306 NONAME
-	_ZN23HsBackupRestoreObserverC2EP7QObject @ 307 NONAME
-	_ZN23HsBackupRestoreObserverD0Ev @ 308 NONAME
-	_ZN23HsBackupRestoreObserverD1Ev @ 309 NONAME
-	_ZN23HsBackupRestoreObserverD2Ev @ 310 NONAME
-	_ZN23HsWallpaperLoaderThread11qt_metacallEN11QMetaObject4CallEiPPv @ 311 NONAME
-	_ZN23HsWallpaperLoaderThread11qt_metacastEPKc @ 312 NONAME
-	_ZN23HsWallpaperLoaderThread16staticMetaObjectE @ 313 NONAME DATA 16
-	_ZN23HsWallpaperLoaderThread19getStaticMetaObjectEv @ 314 NONAME
-	_ZN23HsWallpaperLoaderThread3runEv @ 315 NONAME
-	_ZN23HsWallpaperLoaderThreadC1EP7QObject @ 316 NONAME
-	_ZN23HsWallpaperLoaderThreadC2EP7QObject @ 317 NONAME
-	_ZN23HsWallpaperLoaderThreadD0Ev @ 318 NONAME
-	_ZN23HsWallpaperLoaderThreadD1Ev @ 319 NONAME
-	_ZN23HsWallpaperLoaderThreadD2Ev @ 320 NONAME
-	_ZN25HsWidgetComponentRegistry11qt_metacallEN11QMetaObject4CallEiPPv @ 321 NONAME
-	_ZN25HsWidgetComponentRegistry11qt_metacastEPKc @ 322 NONAME
-	_ZN25HsWidgetComponentRegistry14onEntryChangedERK7CaEntry10ChangeType @ 323 NONAME
-	_ZN25HsWidgetComponentRegistry15registerServiceERK7CaEntryRK7QStringb @ 324 NONAME
-	_ZN25HsWidgetComponentRegistry16handleEntryAddedERK7CaEntryRK7QString @ 325 NONAME
-	_ZN25HsWidgetComponentRegistry16staticMetaObjectE @ 326 NONAME DATA 16
-	_ZN25HsWidgetComponentRegistry18handleEntryRemovedERK7CaEntryRK7QString @ 327 NONAME
-	_ZN25HsWidgetComponentRegistry18handleEntryUpdatedERK7CaEntryRK7QString @ 328 NONAME
-	_ZN25HsWidgetComponentRegistry18uninstallComponentERK27HsWidgetComponentDescriptor @ 329 NONAME
-	_ZN25HsWidgetComponentRegistry19getStaticMetaObjectEv @ 330 NONAME
-	_ZN25HsWidgetComponentRegistry8instanceEv @ 331 NONAME
-	_ZN25HsWidgetComponentRegistry9componentERK7QString @ 332 NONAME
-	_ZN25HsWidgetComponentRegistry9mInstanceE @ 333 NONAME DATA 4
-	_ZN25HsWidgetComponentRegistryC1EP7QObject @ 334 NONAME
-	_ZN25HsWidgetComponentRegistryC2EP7QObject @ 335 NONAME
-	_ZN25HsWidgetComponentRegistryD0Ev @ 336 NONAME
-	_ZN25HsWidgetComponentRegistryD1Ev @ 337 NONAME
-	_ZN25HsWidgetComponentRegistryD2Ev @ 338 NONAME
-	_ZN27HsWidgetComponentDescriptor7isValidEv @ 339 NONAME
-	_ZN5HsGui11orientationEv @ 340 NONAME
-	_ZN5HsGui11qt_metacallEN11QMetaObject4CallEiPPv @ 341 NONAME
-	_ZN5HsGui11qt_metacastEPKc @ 342 NONAME
-	_ZN5HsGui11setInstanceEPS_ @ 343 NONAME
-	_ZN5HsGui11setupIdleUiEv @ 344 NONAME
-	_ZN5HsGui12takeInstanceEv @ 345 NONAME
-	_ZN5HsGui13cleanupIdleUiEv @ 346 NONAME
-	_ZN5HsGui14setOrientationEN2Qt11OrientationE @ 347 NONAME
-	_ZN5HsGui16staticMetaObjectE @ 348 NONAME DATA 16
-	_ZN5HsGui18orientationChangedEN2Qt11OrientationE @ 349 NONAME
-	_ZN5HsGui19getStaticMetaObjectEv @ 350 NONAME
-	_ZN5HsGui19pageChangeAnimationEv @ 351 NONAME
-	_ZN5HsGui20navigateToApplibraryEv @ 352 NONAME
-	_ZN5HsGui21pageCrawlingAnimationEv @ 353 NONAME
-	_ZN5HsGui4showEv @ 354 NONAME
-	_ZN5HsGui8instanceEv @ 355 NONAME
-	_ZN5HsGui9mInstanceE @ 356 NONAME DATA 4
-	_ZN5HsGuiC1EP7QObject @ 357 NONAME
-	_ZN5HsGuiC2EP7QObject @ 358 NONAME
-	_ZN5HsGuiD0Ev @ 359 NONAME
-	_ZN5HsGuiD1Ev @ 360 NONAME
-	_ZN5HsGuiD2Ev @ 361 NONAME
-	_ZN6HsPage10newWidgetsEv @ 362 NONAME
-	_ZN6HsPage11contentRectEN2Qt11OrientationE @ 363 NONAME
-	_ZN6HsPage11contentRectEv @ 364 NONAME
-	_ZN6HsPage11hideWidgetsEv @ 365 NONAME
-	_ZN6HsPage11qt_metacallEN11QMetaObject4CallEiPPv @ 366 NONAME
-	_ZN6HsPage11qt_metacastEPKc @ 367 NONAME
-	_ZN6HsPage11showWidgetsEv @ 368 NONAME
-	_ZN6HsPage12addNewWidgetEP12HsWidgetHostRK7QPointF @ 369 NONAME
-	_ZN6HsPage12removeWidgetEP12HsWidgetHost @ 370 NONAME
-	_ZN6HsPage12setRemovableEb @ 371 NONAME
-	_ZN6HsPage13connectWidgetEP12HsWidgetHost @ 372 NONAME
-	_ZN6HsPage13setDatabaseIdEi @ 373 NONAME
-	_ZN6HsPage13updateZValuesEv @ 374 NONAME
-	_ZN6HsPage14createInstanceERK10HsPageData @ 375 NONAME
-	_ZN6HsPage15contentGeometryEN2Qt11OrientationE @ 376 NONAME
-	_ZN6HsPage15contentGeometryEv @ 377 NONAME
-	_ZN6HsPage15onWidgetFaultedEv @ 378 NONAME
-	_ZN6HsPage15onWidgetResizedEv @ 379 NONAME
-	_ZN6HsPage15resetNewWidgetsEv @ 380 NONAME
-	_ZN6HsPage16disconnectWidgetEP12HsWidgetHost @ 381 NONAME
-	_ZN6HsPage16layoutNewWidgetsEv @ 382 NONAME
-	_ZN6HsPage16onWidgetFinishedEv @ 383 NONAME
-	_ZN6HsPage16staticMetaObjectE @ 384 NONAME DATA 16
-	_ZN6HsPage17addExistingWidgetEP12HsWidgetHost @ 385 NONAME
-	_ZN6HsPage17onWidgetAvailableEv @ 386 NONAME
-	_ZN6HsPage18deleteFromDatabaseEv @ 387 NONAME
-	_ZN6HsPage19getStaticMetaObjectEv @ 388 NONAME
-	_ZN6HsPage19onPageMarginChangedERK7QString @ 389 NONAME
-	_ZN6HsPage19onWidgetUnavailableEv @ 390 NONAME
-	_ZN6HsPage20onOrientationChangedEN2Qt11OrientationE @ 391 NONAME
-	_ZN6HsPage22adjustedWidgetPositionERK6QRectF @ 392 NONAME
-	_ZN6HsPage4loadEv @ 393 NONAME
-	_ZN6HsPage9pageIndexEv @ 394 NONAME
-	_ZN6HsPage9setOnlineEb @ 395 NONAME
-	_ZN6HsPageC1EP7QObject @ 396 NONAME
-	_ZN6HsPageC2EP7QObject @ 397 NONAME
-	_ZN6HsPageD0Ev @ 398 NONAME
-	_ZN6HsPageD1Ev @ 399 NONAME
-	_ZN6HsPageD2Ev @ 400 NONAME
-	_ZN7HsScene10removePageEP6HsPage @ 401 NONAME
-	_ZN7HsScene11eventFilterEP7QObjectP6QEvent @ 402 NONAME
-	_ZN7HsScene11qt_metacallEN11QMetaObject4CallEiPPv @ 403 NONAME
-	_ZN7HsScene11qt_metacastEPKc @ 404 NONAME
-	_ZN7HsScene11setInstanceEPS_ @ 405 NONAME
-	_ZN7HsScene12takeInstanceEv @ 406 NONAME
-	_ZN7HsScene13setActivePageEP6HsPage @ 407 NONAME
-	_ZN7HsScene14pagePanStartedEP13QGestureEvent @ 408 NONAME
-	_ZN7HsScene14pagePanUpdatedEP13QGestureEvent @ 409 NONAME
-	_ZN7HsScene15pagePanFinishedEP13QGestureEvent @ 410 NONAME
-	_ZN7HsScene15setActiveWidgetEP12HsWidgetHost @ 411 NONAME
-	_ZN7HsScene16staticMetaObjectE @ 412 NONAME DATA 16
-	_ZN7HsScene16widgetTapStartedEP12HsWidgetHost @ 413 NONAME
-	_ZN7HsScene17activePageChangedEv @ 414 NONAME
-	_ZN7HsScene17widgetMoveUpdatedERK7QPointFP12HsWidgetHost @ 415 NONAME
-	_ZN7HsScene18setActivePageIndexEi @ 416 NONAME
-	_ZN7HsScene18widgetMoveFinishedERK7QPointFP12HsWidgetHost @ 417 NONAME
-	_ZN7HsScene19getStaticMetaObjectEv @ 418 NONAME
-	_ZN7HsScene22pageTapAndHoldFinishedEP13QGestureEvent @ 419 NONAME
-	_ZN7HsScene24widgetTapAndHoldFinishedEP13QGestureEventP12HsWidgetHost @ 420 NONAME
-	_ZN7HsScene4loadEv @ 421 NONAME
-	_ZN7HsScene7addPageEP6HsPage @ 422 NONAME
-	_ZN7HsScene8instanceEv @ 423 NONAME
-	_ZN7HsScene9mInstanceE @ 424 NONAME DATA 4
-	_ZN7HsScene9setOnlineEb @ 425 NONAME
-	_ZN7HsSceneC1EP7QObject @ 426 NONAME
-	_ZN7HsSceneC2EP7QObject @ 427 NONAME
-	_ZN7HsSceneD0Ev @ 428 NONAME
-	_ZN7HsSceneD1Ev @ 429 NONAME
-	_ZN7HsSceneD2Ev @ 430 NONAME
-	_ZNK10HsDatabase10metaObjectEv @ 431 NONAME
-	_ZNK10HsDatabase12databaseNameEv @ 432 NONAME
-	_ZNK10HsDatabase14connectionNameEv @ 433 NONAME
-	_ZNK10HsDatabase15checkConnectionEv @ 434 NONAME
-	_ZNK11HsWallpaper10metaObjectEv @ 435 NONAME
-	_ZNK11HsWallpaper13rootDirectoryEv @ 436 NONAME
-	_ZNK12HsIdleWidget10metaObjectEv @ 437 NONAME
-	_ZNK12HsIdleWidget14parallaxFactorEv @ 438 NONAME
-	_ZNK12HsIdleWidget6sceneXEv @ 439 NONAME
-	_ZNK12HsPageVisual10metaObjectEv @ 440 NONAME
-	_ZNK12HsWidgetHost10databaseIdEv @ 441 NONAME
-	_ZNK12HsWidgetHost10metaObjectEv @ 442 NONAME
-	_ZNK12HsWidgetHost4pageEv @ 443 NONAME
-	_ZNK12HsWidgetHost6visualEv @ 444 NONAME
-	_ZNK15HsConfiguration10metaObjectEv @ 445 NONAME
-	_ZNK15HsConfiguration24maximumWidgetSizeInUnitsEv @ 446 NONAME
-	_ZNK15HsConfiguration24minimumWidgetSizeInUnitsEv @ 447 NONAME
-	_ZNK15HsConfiguration25maximumWidgetSizeInPixelsEv @ 448 NONAME
-	_ZNK15HsConfiguration25minimumWidgetSizeInPixelsEv @ 449 NONAME
-	_ZNK15HsPageWallpaper10metaObjectEv @ 450 NONAME
-	_ZNK15HsPageWallpaper18wallpaperDirectoryEv @ 451 NONAME
-	_ZNK16HsContentService10metaObjectEv @ 452 NONAME
-	_ZNK16HsSceneWallpaper10metaObjectEv @ 453 NONAME
-	_ZNK16HsSceneWallpaper18wallpaperDirectoryEv @ 454 NONAME
-	_ZNK17HsShortcutService10metaObjectEv @ 455 NONAME
-	_ZNK17HsWallpaperLoader10metaObjectEv @ 456 NONAME
-	_ZNK17HsWidgetComponent10metaObjectEv @ 457 NONAME
-	_ZNK17HsWidgetComponent11isAvailableEv @ 458 NONAME
-	_ZNK17HsWidgetComponent3uriEv @ 459 NONAME
-	_ZNK17HsWidgetComponent8rootPathEv @ 460 NONAME
-	_ZNK18HsWidgetHostVisual10metaObjectEv @ 461 NONAME
-	_ZNK18HsWidgetHostVisual11visualModelEv @ 462 NONAME
-	_ZNK18HsWidgetHostVisual5shapeEv @ 463 NONAME
-	_ZNK21HsHostedWidgetFactory10metaObjectEv @ 464 NONAME
-	_ZNK23HsBackupRestoreObserver10metaObjectEv @ 465 NONAME
-	_ZNK23HsWallpaperLoaderThread10metaObjectEv @ 466 NONAME
-	_ZNK25HsWidgetComponentRegistry10metaObjectEv @ 467 NONAME
-	_ZNK5HsGui10idleWidgetEv @ 468 NONAME
-	_ZNK5HsGui10layoutRectEv @ 469 NONAME
-	_ZNK5HsGui10metaObjectEv @ 470 NONAME
-	_ZNK5HsGui8idleViewEv @ 471 NONAME
-	_ZNK6HsPage10databaseIdEv @ 472 NONAME
-	_ZNK6HsPage10metaObjectEv @ 473 NONAME
-	_ZNK6HsPage11isRemovableEv @ 474 NONAME
-	_ZNK6HsPage12isActivePageEv @ 475 NONAME
-	_ZNK6HsPage13isDefaultPageEv @ 476 NONAME
-	_ZNK6HsPage6visualEv @ 477 NONAME
-	_ZNK6HsPage7widgetsEv @ 478 NONAME
-	_ZNK6HsPage9wallpaperEv @ 479 NONAME
-	_ZNK7HsScene10activePageEv @ 480 NONAME
-	_ZNK7HsScene10databaseIdEv @ 481 NONAME
-	_ZNK7HsScene10metaObjectEv @ 482 NONAME
-	_ZNK7HsScene12activeWidgetEv @ 483 NONAME
-	_ZNK7HsScene15activePageIndexEv @ 484 NONAME
-	_ZNK7HsScene5pagesEv @ 485 NONAME
-	_ZNK7HsScene8isOnlineEv @ 486 NONAME
-	_ZNK7HsScene9wallpaperEv @ 487 NONAME
-	_ZTI10HsDatabase @ 488 NONAME
-	_ZTI11HsWallpaper @ 489 NONAME
-	_ZTI12HsIdleWidget @ 490 NONAME
-	_ZTI12HsPageVisual @ 491 NONAME
-	_ZTI12HsWidgetHost @ 492 NONAME
-	_ZTI15HsConfiguration @ 493 NONAME
-	_ZTI15HsPageWallpaper @ 494 NONAME
-	_ZTI16HsContentService @ 495 NONAME
-	_ZTI16HsSceneWallpaper @ 496 NONAME
-	_ZTI17HsShortcutService @ 497 NONAME
-	_ZTI17HsWallpaperLoader @ 498 NONAME
-	_ZTI17HsWidgetComponent @ 499 NONAME
-	_ZTI18HsWidgetHostVisual @ 500 NONAME
-	_ZTI21HsHostedWidgetFactory @ 501 NONAME
-	_ZTI23HsBackupRestoreObserver @ 502 NONAME
-	_ZTI23HsWallpaperLoaderThread @ 503 NONAME
-	_ZTI25HsWidgetComponentRegistry @ 504 NONAME
-	_ZTI5HsGui @ 505 NONAME
-	_ZTI6HsPage @ 506 NONAME
-	_ZTI7HsScene @ 507 NONAME
-	_ZTV10HsDatabase @ 508 NONAME
-	_ZTV11HsWallpaper @ 509 NONAME
-	_ZTV12HsIdleWidget @ 510 NONAME
-	_ZTV12HsPageVisual @ 511 NONAME
-	_ZTV12HsWidgetHost @ 512 NONAME
-	_ZTV15HsConfiguration @ 513 NONAME
-	_ZTV15HsPageWallpaper @ 514 NONAME
-	_ZTV16HsContentService @ 515 NONAME
-	_ZTV16HsSceneWallpaper @ 516 NONAME
-	_ZTV17HsShortcutService @ 517 NONAME
-	_ZTV17HsWallpaperLoader @ 518 NONAME
-	_ZTV17HsWidgetComponent @ 519 NONAME
-	_ZTV18HsWidgetHostVisual @ 520 NONAME
-	_ZTV21HsHostedWidgetFactory @ 521 NONAME
-	_ZTV23HsBackupRestoreObserver @ 522 NONAME
-	_ZTV23HsWallpaperLoaderThread @ 523 NONAME
-	_ZTV25HsWidgetComponentRegistry @ 524 NONAME
-	_ZTV5HsGui @ 525 NONAME
-	_ZTV6HsPage @ 526 NONAME
-	_ZTV7HsScene @ 527 NONAME
-	_ZThn16_N11HsWallpaperD0Ev @ 528 NONAME
-	_ZThn16_N11HsWallpaperD1Ev @ 529 NONAME
-	_ZThn16_N12HsIdleWidget11setGeometryERK6QRectF @ 530 NONAME
-	_ZThn16_N12HsIdleWidgetD0Ev @ 531 NONAME
-	_ZThn16_N12HsIdleWidgetD1Ev @ 532 NONAME
-	_ZThn16_N12HsPageVisual11setGeometryERK6QRectF @ 533 NONAME
-	_ZThn16_N12HsPageVisualD0Ev @ 534 NONAME
-	_ZThn16_N12HsPageVisualD1Ev @ 535 NONAME
-	_ZThn16_N15HsPageWallpaperD0Ev @ 536 NONAME
-	_ZThn16_N15HsPageWallpaperD1Ev @ 537 NONAME
-	_ZThn16_N16HsSceneWallpaperD0Ev @ 538 NONAME
-	_ZThn16_N16HsSceneWallpaperD1Ev @ 539 NONAME
-	_ZThn16_N18HsWidgetHostVisualD0Ev @ 540 NONAME
-	_ZThn16_N18HsWidgetHostVisualD1Ev @ 541 NONAME
-	_ZThn8_N11HsWallpaperD0Ev @ 542 NONAME
-	_ZThn8_N11HsWallpaperD1Ev @ 543 NONAME
-	_ZThn8_N12HsIdleWidgetD0Ev @ 544 NONAME
-	_ZThn8_N12HsIdleWidgetD1Ev @ 545 NONAME
-	_ZThn8_N12HsPageVisualD0Ev @ 546 NONAME
-	_ZThn8_N12HsPageVisualD1Ev @ 547 NONAME
-	_ZThn8_N15HsPageWallpaperD0Ev @ 548 NONAME
-	_ZThn8_N15HsPageWallpaperD1Ev @ 549 NONAME
-	_ZThn8_N16HsSceneWallpaperD0Ev @ 550 NONAME
-	_ZThn8_N16HsSceneWallpaperD1Ev @ 551 NONAME
-	_ZThn8_N18HsWidgetHostVisualD0Ev @ 552 NONAME
-	_ZThn8_N18HsWidgetHostVisualD1Ev @ 553 NONAME
-	_ZThn8_NK18HsWidgetHostVisual5shapeEv @ 554 NONAME
+	_ZN11HsWallpaper9setImagesERK7QStringS2_ @ 57 NONAME
+	_ZN11HsWallpaperC2EP13QGraphicsItem @ 58 NONAME
+	_ZN11HsWallpaperD0Ev @ 59 NONAME
+	_ZN11HsWallpaperD1Ev @ 60 NONAME
+	_ZN11HsWallpaperD2Ev @ 61 NONAME
+	_ZN12HsIdleWidget10insertPageEiP6HsPage @ 62 NONAME
+	_ZN12HsIdleWidget10removePageEi @ 63 NONAME
+	_ZN12HsIdleWidget11polishEventEv @ 64 NONAME
+	_ZN12HsIdleWidget11qt_metacallEN11QMetaObject4CallEiPPv @ 65 NONAME
+	_ZN12HsIdleWidget11qt_metacastEPKc @ 66 NONAME
+	_ZN12HsIdleWidget11setGeometryERK6QRectF @ 67 NONAME
+	_ZN12HsIdleWidget12showTrashBinEv @ 68 NONAME
+	_ZN12HsIdleWidget13setActivePageEi @ 69 NONAME
+	_ZN12HsIdleWidget16loadControlLayerEv @ 70 NONAME
+	_ZN12HsIdleWidget16staticMetaObjectE @ 71 NONAME DATA 16
+	_ZN12HsIdleWidget17showPageIndicatorEv @ 72 NONAME
+	_ZN12HsIdleWidget19getStaticMetaObjectEv @ 73 NONAME
+	_ZN12HsIdleWidget20hideVerticalSnapLineEv @ 74 NONAME
+	_ZN12HsIdleWidget20showVerticalSnapLineERK6QLineF @ 75 NONAME
+	_ZN12HsIdleWidget22hideHorizontalSnapLineEv @ 76 NONAME
+	_ZN12HsIdleWidget22showHorizontalSnapLineERK6QLineF @ 77 NONAME
+	_ZN12HsIdleWidget9setSceneXEf @ 78 NONAME
+	_ZN12HsIdleWidgetC1EP13QGraphicsItem @ 79 NONAME
+	_ZN12HsIdleWidgetC2EP13QGraphicsItem @ 80 NONAME
+	_ZN12HsIdleWidgetD0Ev @ 81 NONAME
+	_ZN12HsIdleWidgetD1Ev @ 82 NONAME
+	_ZN12HsIdleWidgetD2Ev @ 83 NONAME
+	_ZN12HsPageVisual11qt_metacallEN11QMetaObject4CallEiPPv @ 84 NONAME
+	_ZN12HsPageVisual11qt_metacastEPKc @ 85 NONAME
+	_ZN12HsPageVisual11setGeometryERK6QRectF @ 86 NONAME
+	_ZN12HsPageVisual14setupTouchAreaEv @ 87 NONAME
+	_ZN12HsPageVisual16staticMetaObjectE @ 88 NONAME DATA 16
+	_ZN12HsPageVisual19getStaticMetaObjectEv @ 89 NONAME
+	_ZN12HsPageVisualC1EP13QGraphicsItem @ 90 NONAME
+	_ZN12HsPageVisualC2EP13QGraphicsItem @ 91 NONAME
+	_ZN12HsPageVisualD0Ev @ 92 NONAME
+	_ZN12HsPageVisualD1Ev @ 93 NONAME
+	_ZN12HsPageVisualD2Ev @ 94 NONAME
+	_ZN12HsWidgetHost10event_hideEv @ 95 NONAME
+	_ZN12HsWidgetHost10event_showEv @ 96 NONAME
+	_ZN12HsWidgetHost10hideWidgetEv @ 97 NONAME
+	_ZN12HsWidgetHost10onFinishedEv @ 98 NONAME
+	_ZN12HsWidgetHost10showWidgetEv @ 99 NONAME
+	_ZN12HsWidgetHost11action_hideEv @ 100 NONAME
+	_ZN12HsWidgetHost11action_loadEv @ 101 NONAME
+	_ZN12HsWidgetHost11action_showEv @ 102 NONAME
+	_ZN12HsWidgetHost11event_closeEv @ 103 NONAME
+	_ZN12HsWidgetHost11qt_metacallEN11QMetaObject4CallEiPPv @ 104 NONAME
+	_ZN12HsWidgetHost11qt_metacastEPKc @ 105 NONAME
+	_ZN12HsWidgetHost11setPropertyEPKcR13QMetaProperty @ 106 NONAME
+	_ZN12HsWidgetHost11setupStatesEv @ 107 NONAME
+	_ZN12HsWidgetHost11startWidgetEb @ 108 NONAME
+	_ZN12HsWidgetHost11unavailableEv @ 109 NONAME
+	_ZN12HsWidgetHost12event_removeEv @ 110 NONAME
+	_ZN12HsWidgetHost12event_unloadEv @ 111 NONAME
+	_ZN12HsWidgetHost13action_removeEv @ 112 NONAME
+	_ZN12HsWidgetHost13action_unloadEv @ 113 NONAME
+	_ZN12HsWidgetHost13event_faultedEv @ 114 NONAME
+	_ZN12HsWidgetHost14action_faultedEv @ 115 NONAME
+	_ZN12HsWidgetHost14createInstanceER12HsWidgetDataRK5QHashI7QString8QVariantE @ 116 NONAME
+	_ZN12HsWidgetHost14event_finishedEv @ 117 NONAME
+	_ZN12HsWidgetHost15action_finishedEv @ 118 NONAME
+	_ZN12HsWidgetHost15getPresentationER24HsWidgetPresentationData @ 119 NONAME
+	_ZN12HsWidgetHost15startDragEffectEv @ 120 NONAME
+	_ZN12HsWidgetHost15startDropEffectEv @ 121 NONAME
+	_ZN12HsWidgetHost16loadPresentationEN2Qt11OrientationE @ 122 NONAME
+	_ZN12HsWidgetHost16loadPresentationEv @ 123 NONAME
+	_ZN12HsWidgetHost16onSetPreferencesERK11QStringList @ 124 NONAME
+	_ZN12HsWidgetHost16savePresentationEN2Qt11OrientationE @ 125 NONAME
+	_ZN12HsWidgetHost16savePresentationER24HsWidgetPresentationData @ 126 NONAME
+	_ZN12HsWidgetHost16savePresentationEv @ 127 NONAME
+	_ZN12HsWidgetHost16staticMetaObjectE @ 128 NONAME DATA 16
+	_ZN12HsWidgetHost17action_initializeEv @ 129 NONAME
+	_ZN12HsWidgetHost18event_startAndHideEv @ 130 NONAME
+	_ZN12HsWidgetHost18event_startAndShowEv @ 131 NONAME
+	_ZN12HsWidgetHost18removePresentationEN2Qt11OrientationE @ 132 NONAME
+	_ZN12HsWidgetHost19action_notifyRemoveEv @ 133 NONAME
+	_ZN12HsWidgetHost19action_uninitializeEv @ 134 NONAME
+	_ZN12HsWidgetHost19getStaticMetaObjectEv @ 135 NONAME
+	_ZN12HsWidgetHost22setPreferencesToWidgetEv @ 136 NONAME
+	_ZN12HsWidgetHost23action_connectComponentEv @ 137 NONAME
+	_ZN12HsWidgetHost26action_disconnectComponentEv @ 138 NONAME
+	_ZN12HsWidgetHost5closeEv @ 139 NONAME
+	_ZN12HsWidgetHost6removeEv @ 140 NONAME
+	_ZN12HsWidgetHost7faultedEv @ 141 NONAME
+	_ZN12HsWidgetHost7onErrorEv @ 142 NONAME
+	_ZN12HsWidgetHost7setPageEP6HsPage @ 143 NONAME
+	_ZN12HsWidgetHost8finishedEv @ 144 NONAME
+	_ZN12HsWidgetHost9availableEv @ 145 NONAME
+	_ZN12HsWidgetHost9hasSignalEPKc @ 146 NONAME
+	_ZN12HsWidgetHost9setMethodEPKcR11QMetaMethod @ 147 NONAME
+	_ZN12HsWidgetHost9setOnlineEb @ 148 NONAME
+	_ZN12HsWidgetHostC1EiP7QObject @ 149 NONAME
+	_ZN12HsWidgetHostC2EiP7QObject @ 150 NONAME
+	_ZN12HsWidgetHostD0Ev @ 151 NONAME
+	_ZN12HsWidgetHostD1Ev @ 152 NONAME
+	_ZN12HsWidgetHostD2Ev @ 153 NONAME
+	_ZN15HsConfiguration11qt_metacallEN11QMetaObject4CallEiPPv @ 154 NONAME
+	_ZN15HsConfiguration11qt_metacastEPKc @ 155 NONAME
+	_ZN15HsConfiguration11setInstanceEPS_ @ 156 NONAME
+	_ZN15HsConfiguration12exportToFileERK7QString @ 157 NONAME
+	_ZN15HsConfiguration12takeInstanceEv @ 158 NONAME
+	_ZN15HsConfiguration14importFromFileERK7QString @ 159 NONAME
+	_ZN15HsConfiguration15propertyChangedERK7QString @ 160 NONAME
+	_ZN15HsConfiguration16staticMetaObjectE @ 161 NONAME DATA 16
+	_ZN15HsConfiguration19getStaticMetaObjectEv @ 162 NONAME
+	_ZN15HsConfiguration4loadEv @ 163 NONAME
+	_ZN15HsConfiguration8instanceEv @ 164 NONAME
+	_ZN15HsConfiguration9mInstanceE @ 165 NONAME DATA 4
+	_ZN15HsConfigurationC1EP7QObject @ 166 NONAME
+	_ZN15HsConfigurationC2EP7QObject @ 167 NONAME
+	_ZN15HsConfigurationD0Ev @ 168 NONAME
+	_ZN15HsConfigurationD1Ev @ 169 NONAME
+	_ZN15HsConfigurationD2Ev @ 170 NONAME
+	_ZN15HsPageWallpaper11qt_metacallEN11QMetaObject4CallEiPPv @ 171 NONAME
+	_ZN15HsPageWallpaper11qt_metacastEPKc @ 172 NONAME
+	_ZN15HsPageWallpaper13createTargetsERK7QString @ 173 NONAME
+	_ZN15HsPageWallpaper16staticMetaObjectE @ 174 NONAME DATA 16
+	_ZN15HsPageWallpaper19getStaticMetaObjectEv @ 175 NONAME
+	_ZN15HsPageWallpaper7setPageEP6HsPage @ 176 NONAME
+	_ZN15HsPageWallpaperC1EP6HsPageP13QGraphicsItem @ 177 NONAME
+	_ZN15HsPageWallpaperC2EP6HsPageP13QGraphicsItem @ 178 NONAME
+	_ZN15HsPageWallpaperD0Ev @ 179 NONAME
+	_ZN15HsPageWallpaperD1Ev @ 180 NONAME
+	_ZN15HsPageWallpaperD2Ev @ 181 NONAME
+	_ZN16HsContentService11qt_metacallEN11QMetaObject4CallEiPPv @ 182 NONAME
+	_ZN16HsContentService11qt_metacastEPKc @ 183 NONAME
+	_ZN16HsContentService11widgetAddedERK7QStringRK5QHashIS0_8QVariantE @ 184 NONAME
+	_ZN16HsContentService12createWidgetERK5QHashI7QString8QVariantE @ 185 NONAME
+	_ZN16HsContentService13widgetRemovedERK7QStringRK5QHashIS0_8QVariantE @ 186 NONAME
+	_ZN16HsContentService16staticMetaObjectE @ 187 NONAME DATA 16
+	_ZN16HsContentService17emitWidgetRemovedERK7QStringRK5QHashIS0_8QVariantE @ 188 NONAME
+	_ZN16HsContentService18widgetStartFaultedEv @ 189 NONAME
+	_ZN16HsContentService19getStaticMetaObjectEv @ 190 NONAME
+	_ZN16HsContentService22createWidgetForPreviewERK5QHashI7QString8QVariantE @ 191 NONAME
+	_ZN16HsContentService7widgetsERK7QStringRK5QHashIS0_8QVariantERi @ 192 NONAME
+	_ZN16HsContentService8instanceEv @ 193 NONAME
+	_ZN16HsContentService9addWidgetERK7QStringRK5QHashIS0_8QVariantERKS4_ @ 194 NONAME
+	_ZN16HsContentService9mInstanceE @ 195 NONAME DATA 4
+	_ZN16HsContentServiceC1EP7QObject @ 196 NONAME
+	_ZN16HsContentServiceC2EP7QObject @ 197 NONAME
+	_ZN16HsContentServiceD0Ev @ 198 NONAME
+	_ZN16HsContentServiceD1Ev @ 199 NONAME
+	_ZN16HsContentServiceD2Ev @ 200 NONAME
+	_ZN16HsSceneWallpaper11qt_metacallEN11QMetaObject4CallEiPPv @ 201 NONAME
+	_ZN16HsSceneWallpaper11qt_metacastEPKc @ 202 NONAME
+	_ZN16HsSceneWallpaper13createTargetsERK7QString @ 203 NONAME
+	_ZN16HsSceneWallpaper16staticMetaObjectE @ 204 NONAME DATA 16
+	_ZN16HsSceneWallpaper19getStaticMetaObjectEv @ 205 NONAME
+	_ZN16HsSceneWallpaper8setSceneEP7HsScene @ 206 NONAME
+	_ZN16HsSceneWallpaperC1EP7HsSceneP13QGraphicsItem @ 207 NONAME
+	_ZN16HsSceneWallpaperC2EP7HsSceneP13QGraphicsItem @ 208 NONAME
+	_ZN16HsSceneWallpaperD0Ev @ 209 NONAME
+	_ZN16HsSceneWallpaperD1Ev @ 210 NONAME
+	_ZN16HsSceneWallpaperD2Ev @ 211 NONAME
+	_ZN17HsShortcutService11qt_metacallEN11QMetaObject4CallEiPPv @ 212 NONAME
+	_ZN17HsShortcutService11qt_metacastEPKc @ 213 NONAME
+	_ZN17HsShortcutService16staticMetaObjectE @ 214 NONAME DATA 16
+	_ZN17HsShortcutService19getStaticMetaObjectEv @ 215 NONAME
+	_ZN17HsShortcutService20isItemShortcutWidgetEi @ 216 NONAME
+	_ZN17HsShortcutService23executeCollectionActionEiRK7QString @ 217 NONAME
+	_ZN17HsShortcutService8instanceEP13QStateMachine @ 218 NONAME
+	_ZN17HsShortcutService9mInstanceE @ 219 NONAME DATA 4
+	_ZN17HsShortcutServiceC1EP13QStateMachineP7QObject @ 220 NONAME
+	_ZN17HsShortcutServiceC2EP13QStateMachineP7QObject @ 221 NONAME
+	_ZN17HsShortcutServiceD0Ev @ 222 NONAME
+	_ZN17HsShortcutServiceD1Ev @ 223 NONAME
+	_ZN17HsShortcutServiceD2Ev @ 224 NONAME
+	_ZN17HsWallpaperLoader11qt_metacallEN11QMetaObject4CallEiPPv @ 225 NONAME
+	_ZN17HsWallpaperLoader11qt_metacastEPKc @ 226 NONAME
+	_ZN17HsWallpaperLoader16onThreadFinishedEv @ 227 NONAME
+	_ZN17HsWallpaperLoader16staticMetaObjectE @ 228 NONAME DATA 16
+	_ZN17HsWallpaperLoader19getStaticMetaObjectEv @ 229 NONAME
+	_ZN17HsWallpaperLoader5startEv @ 230 NONAME
+	_ZN17HsWallpaperLoader6cancelEv @ 231 NONAME
+	_ZN17HsWallpaperLoader6failedEv @ 232 NONAME
+	_ZN17HsWallpaperLoader7cleanupEv @ 233 NONAME
+	_ZN17HsWallpaperLoader8finishedEv @ 234 NONAME
+	_ZN17HsWallpaperLoaderC1EP7QObject @ 235 NONAME
+	_ZN17HsWallpaperLoaderC2EP7QObject @ 236 NONAME
+	_ZN17HsWallpaperLoaderD0Ev @ 237 NONAME
+	_ZN17HsWallpaperLoaderD1Ev @ 238 NONAME
+	_ZN17HsWallpaperLoaderD2Ev @ 239 NONAME
+	_ZN17HsWidgetComponent11emitUpdatedEv @ 240 NONAME
+	_ZN17HsWidgetComponent11qt_metacallEN11QMetaObject4CallEiPPv @ 241 NONAME
+	_ZN17HsWidgetComponent11qt_metacastEPKc @ 242 NONAME
+	_ZN17HsWidgetComponent11unavailableEv @ 243 NONAME
+	_ZN17HsWidgetComponent11uninstalledEv @ 244 NONAME
+	_ZN17HsWidgetComponent13emitAvailableEv @ 245 NONAME
+	_ZN17HsWidgetComponent15emitUnavailableEv @ 246 NONAME
+	_ZN17HsWidgetComponent15emitUninstalledEv @ 247 NONAME
+	_ZN17HsWidgetComponent16aboutToUninstallEv @ 248 NONAME
+	_ZN17HsWidgetComponent16staticMetaObjectE @ 249 NONAME DATA 16
+	_ZN17HsWidgetComponent17installTranslatorEv @ 250 NONAME
+	_ZN17HsWidgetComponent19getStaticMetaObjectEv @ 251 NONAME
+	_ZN17HsWidgetComponent19uninstallTranslatorEv @ 252 NONAME
+	_ZN17HsWidgetComponent20emitAboutToUninstallEv @ 253 NONAME
+	_ZN17HsWidgetComponent37resolveRootPathAndTranslationFilenameEv @ 254 NONAME
+	_ZN17HsWidgetComponent7updatedEv @ 255 NONAME
+	_ZN17HsWidgetComponent9availableEv @ 256 NONAME
+	_ZN17HsWidgetComponentC1ERK7QStringP7QObject @ 257 NONAME
+	_ZN17HsWidgetComponentC2ERK7QStringP7QObject @ 258 NONAME
+	_ZN17HsWidgetComponentD0Ev @ 259 NONAME
+	_ZN17HsWidgetComponentD1Ev @ 260 NONAME
+	_ZN17HsWidgetComponentD2Ev @ 261 NONAME
+	_ZN18HsWidgetHostVisual10setNewSizeERK6QSizeF @ 262 NONAME
+	_ZN18HsWidgetHostVisual11eventFilterEP7QObjectP6QEvent @ 263 NONAME
+	_ZN18HsWidgetHostVisual11qt_metacallEN11QMetaObject4CallEiPPv @ 264 NONAME
+	_ZN18HsWidgetHostVisual11qt_metacastEPKc @ 265 NONAME
+	_ZN18HsWidgetHostVisual12gestureEventEP13QGestureEvent @ 266 NONAME
+	_ZN18HsWidgetHostVisual12setupEffectsEv @ 267 NONAME
+	_ZN18HsWidgetHostVisual14setVisualModelEP12HsWidgetHost @ 268 NONAME
+	_ZN18HsWidgetHostVisual14setupTouchAreaEv @ 269 NONAME
+	_ZN18HsWidgetHostVisual15startDragEffectEv @ 270 NONAME
+	_ZN18HsWidgetHostVisual15startDropEffectEv @ 271 NONAME
+	_ZN18HsWidgetHostVisual16staticMetaObjectE @ 272 NONAME DATA 16
+	_ZN18HsWidgetHostVisual19getStaticMetaObjectEv @ 273 NONAME
+	_ZN18HsWidgetHostVisual7resizedEv @ 274 NONAME
+	_ZN18HsWidgetHostVisual9setWidgetEP7QObject @ 275 NONAME
+	_ZN18HsWidgetHostVisualC1EP13QGraphicsItem @ 276 NONAME
+	_ZN18HsWidgetHostVisualC2EP13QGraphicsItem @ 277 NONAME
+	_ZN18HsWidgetHostVisualD0Ev @ 278 NONAME
+	_ZN18HsWidgetHostVisualD1Ev @ 279 NONAME
+	_ZN18HsWidgetHostVisualD2Ev @ 280 NONAME
+	_ZN21HsHostedWidgetFactory11qt_metacallEN11QMetaObject4CallEiPPv @ 281 NONAME
+	_ZN21HsHostedWidgetFactory11qt_metacastEPKc @ 282 NONAME
+	_ZN21HsHostedWidgetFactory11setInstanceEPS_ @ 283 NONAME
+	_ZN21HsHostedWidgetFactory12createWidgetERK7QString @ 284 NONAME
+	_ZN21HsHostedWidgetFactory12takeInstanceEv @ 285 NONAME
+	_ZN21HsHostedWidgetFactory16staticMetaObjectE @ 286 NONAME DATA 16
+	_ZN21HsHostedWidgetFactory19getStaticMetaObjectEv @ 287 NONAME
+	_ZN21HsHostedWidgetFactory8instanceEv @ 288 NONAME
+	_ZN21HsHostedWidgetFactory9mInstanceE @ 289 NONAME DATA 4
+	_ZN21HsHostedWidgetFactoryC1EP7QObject @ 290 NONAME
+	_ZN21HsHostedWidgetFactoryC2EP7QObject @ 291 NONAME
+	_ZN21HsHostedWidgetFactoryD0Ev @ 292 NONAME
+	_ZN21HsHostedWidgetFactoryD1Ev @ 293 NONAME
+	_ZN21HsHostedWidgetFactoryD2Ev @ 294 NONAME
+	_ZN23HsBackupRestoreObserver11qt_metacallEN11QMetaObject4CallEiPPv @ 295 NONAME
+	_ZN23HsBackupRestoreObserver11qt_metacastEPKc @ 296 NONAME
+	_ZN23HsBackupRestoreObserver11readyForBUREv @ 297 NONAME
+	_ZN23HsBackupRestoreObserver16staticMetaObjectE @ 298 NONAME DATA 16
+	_ZN23HsBackupRestoreObserver19getStaticMetaObjectEv @ 299 NONAME
+	_ZN23HsBackupRestoreObserver20backupRestoreStartedEv @ 300 NONAME
+	_ZN23HsBackupRestoreObserver22backupRestoreCompletedEv @ 301 NONAME
+	_ZN23HsBackupRestoreObserver26event_backupRestoreStartedEv @ 302 NONAME
+	_ZN23HsBackupRestoreObserver28event_backupRestoreCompletedEv @ 303 NONAME
+	_ZN23HsBackupRestoreObserver8checkBUREv @ 304 NONAME
+	_ZN23HsBackupRestoreObserver8instanceEv @ 305 NONAME
+	_ZN23HsBackupRestoreObserver9mInstanceE @ 306 NONAME DATA 4
+	_ZN23HsBackupRestoreObserverC1EP7QObject @ 307 NONAME
+	_ZN23HsBackupRestoreObserverC2EP7QObject @ 308 NONAME
+	_ZN23HsBackupRestoreObserverD0Ev @ 309 NONAME
+	_ZN23HsBackupRestoreObserverD1Ev @ 310 NONAME
+	_ZN23HsBackupRestoreObserverD2Ev @ 311 NONAME
+	_ZN23HsWallpaperLoaderThread11qt_metacallEN11QMetaObject4CallEiPPv @ 312 NONAME
+	_ZN23HsWallpaperLoaderThread11qt_metacastEPKc @ 313 NONAME
+	_ZN23HsWallpaperLoaderThread16staticMetaObjectE @ 314 NONAME DATA 16
+	_ZN23HsWallpaperLoaderThread19getStaticMetaObjectEv @ 315 NONAME
+	_ZN23HsWallpaperLoaderThread3runEv @ 316 NONAME
+	_ZN23HsWallpaperLoaderThreadC1EP7QObject @ 317 NONAME
+	_ZN23HsWallpaperLoaderThreadC2EP7QObject @ 318 NONAME
+	_ZN23HsWallpaperLoaderThreadD0Ev @ 319 NONAME
+	_ZN23HsWallpaperLoaderThreadD1Ev @ 320 NONAME
+	_ZN23HsWallpaperLoaderThreadD2Ev @ 321 NONAME
+	_ZN25HsWidgetComponentRegistry11qt_metacallEN11QMetaObject4CallEiPPv @ 322 NONAME
+	_ZN25HsWidgetComponentRegistry11qt_metacastEPKc @ 323 NONAME
+	_ZN25HsWidgetComponentRegistry14onEntryChangedERK7CaEntry10ChangeType @ 324 NONAME
+	_ZN25HsWidgetComponentRegistry15registerServiceERK7CaEntryRK7QStringb @ 325 NONAME
+	_ZN25HsWidgetComponentRegistry16handleEntryAddedERK7CaEntryRK7QString @ 326 NONAME
+	_ZN25HsWidgetComponentRegistry16staticMetaObjectE @ 327 NONAME DATA 16
+	_ZN25HsWidgetComponentRegistry18handleEntryRemovedERK7CaEntryRK7QString @ 328 NONAME
+	_ZN25HsWidgetComponentRegistry18handleEntryUpdatedERK7CaEntryRK7QString @ 329 NONAME
+	_ZN25HsWidgetComponentRegistry18uninstallComponentERK27HsWidgetComponentDescriptor @ 330 NONAME
+	_ZN25HsWidgetComponentRegistry19getStaticMetaObjectEv @ 331 NONAME
+	_ZN25HsWidgetComponentRegistry8instanceEv @ 332 NONAME
+	_ZN25HsWidgetComponentRegistry9componentERK7QString @ 333 NONAME
+	_ZN25HsWidgetComponentRegistry9mInstanceE @ 334 NONAME DATA 4
+	_ZN25HsWidgetComponentRegistryC1EP7QObject @ 335 NONAME
+	_ZN25HsWidgetComponentRegistryC2EP7QObject @ 336 NONAME
+	_ZN25HsWidgetComponentRegistryD0Ev @ 337 NONAME
+	_ZN25HsWidgetComponentRegistryD1Ev @ 338 NONAME
+	_ZN25HsWidgetComponentRegistryD2Ev @ 339 NONAME
+	_ZN27HsWidgetComponentDescriptor7isValidEv @ 340 NONAME
+	_ZN5HsGui11orientationEv @ 341 NONAME
+	_ZN5HsGui11qt_metacallEN11QMetaObject4CallEiPPv @ 342 NONAME
+	_ZN5HsGui11qt_metacastEPKc @ 343 NONAME
+	_ZN5HsGui11setInstanceEPS_ @ 344 NONAME
+	_ZN5HsGui11setupIdleUiEv @ 345 NONAME
+	_ZN5HsGui12takeInstanceEv @ 346 NONAME
+	_ZN5HsGui13cleanupIdleUiEv @ 347 NONAME
+	_ZN5HsGui14setOrientationEN2Qt11OrientationE @ 348 NONAME
+	_ZN5HsGui16staticMetaObjectE @ 349 NONAME DATA 16
+	_ZN5HsGui18orientationChangedEN2Qt11OrientationE @ 350 NONAME
+	_ZN5HsGui19getStaticMetaObjectEv @ 351 NONAME
+	_ZN5HsGui19pageChangeAnimationEv @ 352 NONAME
+	_ZN5HsGui20navigateToApplibraryEv @ 353 NONAME
+	_ZN5HsGui21pageCrawlingAnimationEv @ 354 NONAME
+	_ZN5HsGui4showEv @ 355 NONAME
+	_ZN5HsGui8instanceEv @ 356 NONAME
+	_ZN5HsGui9mInstanceE @ 357 NONAME DATA 4
+	_ZN5HsGuiC1EP7QObject @ 358 NONAME
+	_ZN5HsGuiC2EP7QObject @ 359 NONAME
+	_ZN5HsGuiD0Ev @ 360 NONAME
+	_ZN5HsGuiD1Ev @ 361 NONAME
+	_ZN5HsGuiD2Ev @ 362 NONAME
+	_ZN6HsPage10newWidgetsEv @ 363 NONAME
+	_ZN6HsPage11contentRectEN2Qt11OrientationE @ 364 NONAME
+	_ZN6HsPage11contentRectEv @ 365 NONAME
+	_ZN6HsPage11hideWidgetsEv @ 366 NONAME
+	_ZN6HsPage11qt_metacallEN11QMetaObject4CallEiPPv @ 367 NONAME
+	_ZN6HsPage11qt_metacastEPKc @ 368 NONAME
+	_ZN6HsPage11showWidgetsEv @ 369 NONAME
+	_ZN6HsPage12addNewWidgetEP12HsWidgetHostRK7QPointF @ 370 NONAME
+	_ZN6HsPage12removeWidgetEP12HsWidgetHost @ 371 NONAME
+	_ZN6HsPage12setRemovableEb @ 372 NONAME
+	_ZN6HsPage13connectWidgetEP12HsWidgetHost @ 373 NONAME
+	_ZN6HsPage13setDatabaseIdEi @ 374 NONAME
+	_ZN6HsPage13updateZValuesEv @ 375 NONAME
+	_ZN6HsPage14createInstanceERK10HsPageData @ 376 NONAME
+	_ZN6HsPage15contentGeometryEN2Qt11OrientationE @ 377 NONAME
+	_ZN6HsPage15contentGeometryEv @ 378 NONAME
+	_ZN6HsPage15onWidgetFaultedEv @ 379 NONAME
+	_ZN6HsPage15onWidgetResizedEv @ 380 NONAME
+	_ZN6HsPage15resetNewWidgetsEv @ 381 NONAME
+	_ZN6HsPage16disconnectWidgetEP12HsWidgetHost @ 382 NONAME
+	_ZN6HsPage16layoutNewWidgetsEv @ 383 NONAME
+	_ZN6HsPage16onWidgetFinishedEv @ 384 NONAME
+	_ZN6HsPage16staticMetaObjectE @ 385 NONAME DATA 16
+	_ZN6HsPage17addExistingWidgetEP12HsWidgetHost @ 386 NONAME
+	_ZN6HsPage17onWidgetAvailableEv @ 387 NONAME
+	_ZN6HsPage18deleteFromDatabaseEv @ 388 NONAME
+	_ZN6HsPage19getStaticMetaObjectEv @ 389 NONAME
+	_ZN6HsPage19onPageMarginChangedERK7QString @ 390 NONAME
+	_ZN6HsPage19onWidgetUnavailableEv @ 391 NONAME
+	_ZN6HsPage20onOrientationChangedEN2Qt11OrientationE @ 392 NONAME
+	_ZN6HsPage22adjustedWidgetPositionERK6QRectF @ 393 NONAME
+	_ZN6HsPage4loadEv @ 394 NONAME
+	_ZN6HsPage9pageIndexEv @ 395 NONAME
+	_ZN6HsPage9setOnlineEb @ 396 NONAME
+	_ZN6HsPageC1EP7QObject @ 397 NONAME
+	_ZN6HsPageC2EP7QObject @ 398 NONAME
+	_ZN6HsPageD0Ev @ 399 NONAME
+	_ZN6HsPageD1Ev @ 400 NONAME
+	_ZN6HsPageD2Ev @ 401 NONAME
+	_ZN7HsScene10removePageEP6HsPage @ 402 NONAME
+	_ZN7HsScene11eventFilterEP7QObjectP6QEvent @ 403 NONAME
+	_ZN7HsScene11qt_metacallEN11QMetaObject4CallEiPPv @ 404 NONAME
+	_ZN7HsScene11qt_metacastEPKc @ 405 NONAME
+	_ZN7HsScene11setInstanceEPS_ @ 406 NONAME
+	_ZN7HsScene12takeInstanceEv @ 407 NONAME
+	_ZN7HsScene13setActivePageEP6HsPage @ 408 NONAME
+	_ZN7HsScene14pagePanStartedEP13QGestureEvent @ 409 NONAME
+	_ZN7HsScene14pagePanUpdatedEP13QGestureEvent @ 410 NONAME
+	_ZN7HsScene15pagePanFinishedEP13QGestureEvent @ 411 NONAME
+	_ZN7HsScene15pageTapFinishedEP13QGestureEvent @ 412 NONAME
+	_ZN7HsScene15setActiveWidgetEP12HsWidgetHost @ 413 NONAME
+	_ZN7HsScene16staticMetaObjectE @ 414 NONAME DATA 16
+	_ZN7HsScene16widgetTapStartedE7QPointFP12HsWidgetHost @ 415 NONAME
+	_ZN7HsScene17activePageChangedEv @ 416 NONAME
+	_ZN7HsScene17widgetMoveUpdatedERK7QPointFP12HsWidgetHost @ 417 NONAME
+	_ZN7HsScene18setActivePageIndexEi @ 418 NONAME
+	_ZN7HsScene18widgetMoveFinishedERK7QPointFP12HsWidgetHost @ 419 NONAME
+	_ZN7HsScene19getStaticMetaObjectEv @ 420 NONAME
+	_ZN7HsScene22pageTapAndHoldFinishedEP13QGestureEvent @ 421 NONAME
+	_ZN7HsScene24widgetTapAndHoldFinishedEP13QGestureEventP12HsWidgetHost @ 422 NONAME
+	_ZN7HsScene4loadEv @ 423 NONAME
+	_ZN7HsScene7addPageEP6HsPage @ 424 NONAME
+	_ZN7HsScene8instanceEv @ 425 NONAME
+	_ZN7HsScene9mInstanceE @ 426 NONAME DATA 4
+	_ZN7HsScene9setOnlineEb @ 427 NONAME
+	_ZN7HsSceneC1EP7QObject @ 428 NONAME
+	_ZN7HsSceneC2EP7QObject @ 429 NONAME
+	_ZN7HsSceneD0Ev @ 430 NONAME
+	_ZN7HsSceneD1Ev @ 431 NONAME
+	_ZN7HsSceneD2Ev @ 432 NONAME
+	_ZNK10HsDatabase10metaObjectEv @ 433 NONAME
+	_ZNK10HsDatabase12databaseNameEv @ 434 NONAME
+	_ZNK10HsDatabase14connectionNameEv @ 435 NONAME
+	_ZNK10HsDatabase15checkConnectionEv @ 436 NONAME
+	_ZNK11HsWallpaper10metaObjectEv @ 437 NONAME
+	_ZNK11HsWallpaper13rootDirectoryEv @ 438 NONAME
+	_ZNK12HsIdleWidget10metaObjectEv @ 439 NONAME
+	_ZNK12HsIdleWidget14parallaxFactorEv @ 440 NONAME
+	_ZNK12HsIdleWidget6sceneXEv @ 441 NONAME
+	_ZNK12HsPageVisual10metaObjectEv @ 442 NONAME
+	_ZNK12HsPageVisual9pageIndexEv @ 443 NONAME
+	_ZNK12HsWidgetHost10databaseIdEv @ 444 NONAME
+	_ZNK12HsWidgetHost10metaObjectEv @ 445 NONAME
+	_ZNK12HsWidgetHost4pageEv @ 446 NONAME
+	_ZNK12HsWidgetHost6visualEv @ 447 NONAME
+	_ZNK15HsConfiguration10metaObjectEv @ 448 NONAME
+	_ZNK15HsConfiguration24maximumWidgetSizeInUnitsEv @ 449 NONAME
+	_ZNK15HsConfiguration24minimumWidgetSizeInUnitsEv @ 450 NONAME
+	_ZNK15HsConfiguration25maximumWidgetSizeInPixelsEv @ 451 NONAME
+	_ZNK15HsConfiguration25minimumWidgetSizeInPixelsEv @ 452 NONAME
+	_ZNK15HsPageWallpaper10metaObjectEv @ 453 NONAME
+	_ZNK15HsPageWallpaper18wallpaperDirectoryEv @ 454 NONAME
+	_ZNK16HsContentService10metaObjectEv @ 455 NONAME
+	_ZNK16HsSceneWallpaper10metaObjectEv @ 456 NONAME
+	_ZNK16HsSceneWallpaper18wallpaperDirectoryEv @ 457 NONAME
+	_ZNK17HsShortcutService10metaObjectEv @ 458 NONAME
+	_ZNK17HsWallpaperLoader10metaObjectEv @ 459 NONAME
+	_ZNK17HsWidgetComponent10metaObjectEv @ 460 NONAME
+	_ZNK17HsWidgetComponent11isAvailableEv @ 461 NONAME
+	_ZNK17HsWidgetComponent3uriEv @ 462 NONAME
+	_ZNK17HsWidgetComponent8rootPathEv @ 463 NONAME
+	_ZNK18HsWidgetHostVisual10metaObjectEv @ 464 NONAME
+	_ZNK18HsWidgetHostVisual11visualModelEv @ 465 NONAME
+	_ZNK18HsWidgetHostVisual5shapeEv @ 466 NONAME
+	_ZNK21HsHostedWidgetFactory10metaObjectEv @ 467 NONAME
+	_ZNK23HsBackupRestoreObserver10metaObjectEv @ 468 NONAME
+	_ZNK23HsWallpaperLoaderThread10metaObjectEv @ 469 NONAME
+	_ZNK25HsWidgetComponentRegistry10metaObjectEv @ 470 NONAME
+	_ZNK5HsGui10idleWidgetEv @ 471 NONAME
+	_ZNK5HsGui10layoutRectEv @ 472 NONAME
+	_ZNK5HsGui10metaObjectEv @ 473 NONAME
+	_ZNK5HsGui8idleViewEv @ 474 NONAME
+	_ZNK6HsPage10databaseIdEv @ 475 NONAME
+	_ZNK6HsPage10metaObjectEv @ 476 NONAME
+	_ZNK6HsPage11isRemovableEv @ 477 NONAME
+	_ZNK6HsPage12isActivePageEv @ 478 NONAME
+	_ZNK6HsPage13isDefaultPageEv @ 479 NONAME
+	_ZNK6HsPage6visualEv @ 480 NONAME
+	_ZNK6HsPage7widgetsEv @ 481 NONAME
+	_ZNK6HsPage9wallpaperEv @ 482 NONAME
+	_ZNK7HsScene10activePageEv @ 483 NONAME
+	_ZNK7HsScene10databaseIdEv @ 484 NONAME
+	_ZNK7HsScene10metaObjectEv @ 485 NONAME
+	_ZNK7HsScene12activeWidgetEv @ 486 NONAME
+	_ZNK7HsScene15activePageIndexEv @ 487 NONAME
+	_ZNK7HsScene5pagesEv @ 488 NONAME
+	_ZNK7HsScene8isOnlineEv @ 489 NONAME
+	_ZNK7HsScene9wallpaperEv @ 490 NONAME
+	_ZTI10HsDatabase @ 491 NONAME
+	_ZTI11HsWallpaper @ 492 NONAME
+	_ZTI12HsIdleWidget @ 493 NONAME
+	_ZTI12HsPageVisual @ 494 NONAME
+	_ZTI12HsWidgetHost @ 495 NONAME
+	_ZTI15HsConfiguration @ 496 NONAME
+	_ZTI15HsPageWallpaper @ 497 NONAME
+	_ZTI16HsContentService @ 498 NONAME
+	_ZTI16HsSceneWallpaper @ 499 NONAME
+	_ZTI17HsShortcutService @ 500 NONAME
+	_ZTI17HsWallpaperLoader @ 501 NONAME
+	_ZTI17HsWidgetComponent @ 502 NONAME
+	_ZTI18HsWidgetHostVisual @ 503 NONAME
+	_ZTI21HsHostedWidgetFactory @ 504 NONAME
+	_ZTI23HsBackupRestoreObserver @ 505 NONAME
+	_ZTI23HsWallpaperLoaderThread @ 506 NONAME
+	_ZTI25HsWidgetComponentRegistry @ 507 NONAME
+	_ZTI5HsGui @ 508 NONAME
+	_ZTI6HsPage @ 509 NONAME
+	_ZTI7HsScene @ 510 NONAME
+	_ZTV10HsDatabase @ 511 NONAME
+	_ZTV11HsWallpaper @ 512 NONAME
+	_ZTV12HsIdleWidget @ 513 NONAME
+	_ZTV12HsPageVisual @ 514 NONAME
+	_ZTV12HsWidgetHost @ 515 NONAME
+	_ZTV15HsConfiguration @ 516 NONAME
+	_ZTV15HsPageWallpaper @ 517 NONAME
+	_ZTV16HsContentService @ 518 NONAME
+	_ZTV16HsSceneWallpaper @ 519 NONAME
+	_ZTV17HsShortcutService @ 520 NONAME
+	_ZTV17HsWallpaperLoader @ 521 NONAME
+	_ZTV17HsWidgetComponent @ 522 NONAME
+	_ZTV18HsWidgetHostVisual @ 523 NONAME
+	_ZTV21HsHostedWidgetFactory @ 524 NONAME
+	_ZTV23HsBackupRestoreObserver @ 525 NONAME
+	_ZTV23HsWallpaperLoaderThread @ 526 NONAME
+	_ZTV25HsWidgetComponentRegistry @ 527 NONAME
+	_ZTV5HsGui @ 528 NONAME
+	_ZTV6HsPage @ 529 NONAME
+	_ZTV7HsScene @ 530 NONAME
+	_ZThn16_N11HsWallpaperD0Ev @ 531 NONAME
+	_ZThn16_N11HsWallpaperD1Ev @ 532 NONAME
+	_ZThn16_N12HsIdleWidget11setGeometryERK6QRectF @ 533 NONAME
+	_ZThn16_N12HsIdleWidgetD0Ev @ 534 NONAME
+	_ZThn16_N12HsIdleWidgetD1Ev @ 535 NONAME
+	_ZThn16_N12HsPageVisual11setGeometryERK6QRectF @ 536 NONAME
+	_ZThn16_N12HsPageVisualD0Ev @ 537 NONAME
+	_ZThn16_N12HsPageVisualD1Ev @ 538 NONAME
+	_ZThn16_N15HsPageWallpaperD0Ev @ 539 NONAME
+	_ZThn16_N15HsPageWallpaperD1Ev @ 540 NONAME
+	_ZThn16_N16HsSceneWallpaperD0Ev @ 541 NONAME
+	_ZThn16_N16HsSceneWallpaperD1Ev @ 542 NONAME
+	_ZThn16_N18HsWidgetHostVisualD0Ev @ 543 NONAME
+	_ZThn16_N18HsWidgetHostVisualD1Ev @ 544 NONAME
+	_ZThn8_N11HsWallpaperD0Ev @ 545 NONAME
+	_ZThn8_N11HsWallpaperD1Ev @ 546 NONAME
+	_ZThn8_N12HsIdleWidgetD0Ev @ 547 NONAME
+	_ZThn8_N12HsIdleWidgetD1Ev @ 548 NONAME
+	_ZThn8_N12HsPageVisualD0Ev @ 549 NONAME
+	_ZThn8_N12HsPageVisualD1Ev @ 550 NONAME
+	_ZThn8_N15HsPageWallpaperD0Ev @ 551 NONAME
+	_ZThn8_N15HsPageWallpaperD1Ev @ 552 NONAME
+	_ZThn8_N16HsSceneWallpaperD0Ev @ 553 NONAME
+	_ZThn8_N16HsSceneWallpaperD1Ev @ 554 NONAME
+	_ZThn8_N18HsWidgetHostVisualD0Ev @ 555 NONAME
+	_ZThn8_N18HsWidgetHostVisualD1Ev @ 556 NONAME
+	_ZThn8_NK18HsWidgetHostVisual5shapeEv @ 557 NONAME
 
--- a/homescreenapp/hsdomainmodel/hsdomainmodel.pro	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hsdomainmodel/hsdomainmodel.pro	Fri Sep 17 08:27:54 2010 +0300
@@ -40,13 +40,17 @@
                ../hsutils/inc \
                ../hsapplication/inc
 
-RESOURCES += hsdomainmodel.qrc
+
+
 
 symbian: {
+    DOCML+=resource/controllayer.docml
+    RESOURCES += hsdomainmodel.qrc
     TARGET.UID3 = 0x20022F38
     LIBS += -lxqsettingsmanager -labclient
 }
 !symbian:{
+    RESOURCES += hsdomainmodel_win.qrc
     QT += network 
 }
 
--- a/homescreenapp/hsdomainmodel/hsdomainmodel.qrc	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hsdomainmodel/hsdomainmodel.qrc	Fri Sep 17 08:27:54 2010 +0300
@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/" >           
-        <file alias="controllayer.docml">resource/controllayer.docml</file>
+        <file alias="controllayer.docml">resource/controllayer.docml.bin</file>
     </qresource>    
 </RCC>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsdomainmodel/hsdomainmodel_win.qrc	Fri Sep 17 08:27:54 2010 +0300
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/" >           
+        <file alias="controllayer.docml">resource/controllayer.docml</file>
+    </qresource>    
+</RCC>
--- a/homescreenapp/hsdomainmodel/inc/hspagevisual.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hsdomainmodel/inc/hspagevisual.h	Fri Sep 17 08:27:54 2010 +0300
@@ -31,12 +31,14 @@
 class HSDOMAINMODEL_EXPORT HsPageVisual : public HbWidget
 {
     Q_OBJECT
-   
+    Q_PROPERTY(int pageIndex READ pageIndex)
 
 public:
     HsPageVisual(QGraphicsItem *parent = 0);
     ~HsPageVisual();
    
+    int pageIndex() const;
+
     void setGeometry(const QRectF &rect);
 
 private:
--- a/homescreenapp/hsdomainmodel/inc/hsscene.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hsdomainmodel/inc/hsscene.h	Fri Sep 17 08:27:54 2010 +0300
@@ -75,11 +75,12 @@
     //static Qt::Orientation orientation();
 
 signals:
+    void pageTapFinished(QGestureEvent *event);
     void pageTapAndHoldFinished(QGestureEvent *event);
     void pagePanStarted(QGestureEvent *event);
     void pagePanUpdated(QGestureEvent *event);
     void pagePanFinished(QGestureEvent *event);    
-    void widgetTapStarted(HsWidgetHost *widget);
+    void widgetTapStarted(QPointF, HsWidgetHost *widget);
     void widgetTapAndHoldFinished(QGestureEvent *event, HsWidgetHost *widget);
     void widgetMoveUpdated(const QPointF &scenePos, HsWidgetHost *widget);
     void widgetMoveFinished(const QPointF &scenePos, HsWidgetHost *widget);
--- a/homescreenapp/hsdomainmodel/inc/hswallpaper.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hsdomainmodel/inc/hswallpaper.h	Fri Sep 17 08:27:54 2010 +0300
@@ -41,6 +41,7 @@
 
 public slots:
     void setImage(const QString &path);
+    void setImages(const QString &portraitFileName, const QString &landscapeFileName);
     void setDefaultImage();
     void remove();
 
--- a/homescreenapp/hsdomainmodel/inc/hswidgethostvisual.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hsdomainmodel/inc/hswidgethostvisual.h	Fri Sep 17 08:27:54 2010 +0300
@@ -45,6 +45,7 @@
     
     QPainterPath shape() const;
     void setWidget(QObject *widget);
+    QObject *widget() { return mWidget; }
     void setVisualModel(HsWidgetHost *model);
     HsWidgetHost *visualModel() const;
 signals:
--- a/homescreenapp/hsdomainmodel/src/hsgui.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hsdomainmodel/src/hsgui.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -108,7 +108,7 @@
         mImpl->mIdleView->setNavigationAction(mImpl->mNavigationAction);
     }
     bool animate  = !mImpl->mWindow->isObscured();
-    mImpl->mWindow->setCurrentView(mImpl->mIdleView, animate);    
+    mImpl->mWindow->setCurrentView(mImpl->mIdleView, animate, Hb::ViewSwitchCachedFullScreen);    
 }
 
 void HsGui::cleanupIdleUi()
--- a/homescreenapp/hsdomainmodel/src/hsidlewidget.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hsdomainmodel/src/hsidlewidget.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -141,33 +141,18 @@
 
 /*!
     Layouts the ui layers according to the given \a rect.
-    If given \a rect has different size than a fullscreen view, rect
-    is lifted up by statuspane height. Normally HsIdleWidget position is 0,0 
-    relative to it's parent container (HbView). This functionality tackles
-    problem caused by HbStackedLayout which sets top most rect for all items 
-    (views) in a stack (not considering fullscreen mode).
 */
 void HsIdleWidget::setGeometry(const QRectF &rect)
 {
     
-    int n = HsScene::instance()->pages().count();
-    QRectF layoutRect(HsGui::instance()->layoutRect());
-    if (layoutRect == rect || (layoutRect.height() == rect.width() && layoutRect.width() == rect.height())) {
-        mControlLayer->resize(rect.size());
-        mPageLayer->resize(n * rect.width(), rect.height());
-        if (HSCONFIGURATION_GET(sceneType) == HsConfiguration::PageWallpapers) {
-            mPageWallpaperLayer->resize(n * rect.width(), rect.height());
-        }
-        mSceneLayer->resize(2 * rect.width() + HSCONFIGURATION_GET(bounceEffect), rect.height());
-        HbWidget::setGeometry(rect);
-    } else {
-        QRectF sceneRect = mapToScene(rect).boundingRect();
-        // HbView is a container item for widget, thus 0,0 is relative to view's position.
-        // Lift rect by offset. Fullscreen view is in 0,0 position in scene coordinates otherwise
-        // it's e.g 0,68 (statuspane being at 0,0 and view at 0,68)
-        sceneRect.setTop(-sceneRect.top());
-        HbWidget::setGeometry(sceneRect);
+    int n = HsScene::instance()->pages().count();    
+    mControlLayer->resize(rect.size());
+    mPageLayer->resize(n * rect.width(), rect.height());
+    if (HSCONFIGURATION_GET(sceneType) == HsConfiguration::PageWallpapers) {
+        mPageWallpaperLayer->resize(n * rect.width(), rect.height());
     }
+    mSceneLayer->resize(2 * rect.width() + HSCONFIGURATION_GET(bounceEffect), rect.height());
+    HbWidget::setGeometry(rect);
 }
 
 /*!
--- a/homescreenapp/hsdomainmodel/src/hspage.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hsdomainmodel/src/hspage.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -666,28 +666,31 @@
     HsWidgetPresentationData presentation;
     presentation.orientation = orientation;
     
+    HsPageVisual *pageVisual = visual();
     HsWidgetHostVisual *visual(0);
 #ifdef HSWIDGETORGANIZER_ALGORITHM
     QList<HsWidgetHost*> newWidgets;
 #endif //HSWIDGETORGANIZER_ALGORITHM    
     foreach (HsWidgetHost *widget, mWidgets) {
         visual = widget->visual();
-        if (!widget->getPresentation(presentation)) {
+        if ( pageVisual->isAncestorOf(visual)) {
+            if (!widget->getPresentation(presentation)) {
 #ifndef HSWIDGETORGANIZER_ALGORITHM
-            QList<QRectF> geometries = converter->convert(
-                from, QList<QRectF>() << visual->geometry(), to);
-            visual->setGeometry(geometries.first());
-            widget->savePresentation();
+                QList<QRectF> geometries = converter->convert(
+                    from, QList<QRectF>() << visual->geometry(), to);
+                visual->setGeometry(geometries.first());
+                widget->savePresentation();
 #else //HSWIDGETORGANIZER_ALGORITHM
-            newWidgets << widget;
+                newWidgets << widget;
 #endif //HSWIDGETORGANIZER_ALGORITHM
-        } else {
-            QRectF adjustWidgetPosition;
-            adjustWidgetPosition = visual->geometry();
-            adjustWidgetPosition.moveTopLeft(presentation.pos());
-            visual->setPos(adjustedWidgetPosition(adjustWidgetPosition));
-            visual->setZValue(presentation.zValue);
-            widget->savePresentation(); //Needed to follow pageMargin dynamic change
+            } else {
+                QRectF adjustWidgetPosition;
+                adjustWidgetPosition = visual->geometry();
+                adjustWidgetPosition.moveTopLeft(presentation.pos());
+                visual->setPos(adjustedWidgetPosition(adjustWidgetPosition));
+                visual->setZValue(presentation.zValue);
+                widget->savePresentation(); //Needed to follow pageMargin dynamic change
+            }
         }
     }
     
--- a/homescreenapp/hsdomainmodel/src/hspagetoucharea.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hsdomainmodel/src/hspagetoucharea.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -23,6 +23,7 @@
 HsPageTouchArea::HsPageTouchArea(QGraphicsItem *parent)
   : HbTouchArea(parent)
 {
+    grabGesture(Qt::TapGesture);
     grabGesture(Qt::TapAndHoldGesture);
     grabGesture(Qt::PanGesture);
 }
@@ -35,6 +36,18 @@
 {
     HsScene *scene = HsScene::instance();
     
+    // Tap gesture.
+    QGesture *tapGesture = event->gesture(Qt::TapGesture);
+    if (tapGesture) {
+        switch (tapGesture->state()) {
+            case Qt::GestureFinished:
+                emit scene->pageTapFinished(event);
+                break;
+            default:
+                break;
+        }
+    } 
+    
     // Tap-and-hold gesture.
     QGesture *gesture = event->gesture(Qt::TapAndHoldGesture);
     if (gesture) {
@@ -45,7 +58,6 @@
             default:
                 break;
         }
-        return;
     } 
 
     // Pan gesture.
@@ -65,6 +77,5 @@
             default:
                 break;
         }
-        return;
     }
 }
--- a/homescreenapp/hsdomainmodel/src/hspagevisual.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hsdomainmodel/src/hspagevisual.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -17,7 +17,8 @@
 
 #include "hspagevisual.h"
 #include "hspagetoucharea.h"
-
+#include "hsscene.h"
+#include "hspage.h"
 
 
 /*!
@@ -51,6 +52,17 @@
 {
 }
 
+int HsPageVisual::pageIndex() const
+{
+    QList<HsPage *> pages = HsScene::instance()->pages();
+    for (int i = 0; i < pages.count(); ++i) {
+        if (pages.at(i)->visual() == this) {
+            return i;
+        }
+    }
+    return -1;
+}
+
 void HsPageVisual::setGeometry(const QRectF &rect)
 {
     if (mTouchArea) {
--- a/homescreenapp/hsdomainmodel/src/hswallpaper.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hsdomainmodel/src/hswallpaper.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -93,6 +93,44 @@
 /*!
 
 */
+void HsWallpaper::setImages(const QString &portraitFileName, const QString &landscapeFileName)
+{
+    if (portraitFileName.isEmpty() || 
+        landscapeFileName.isEmpty()) {
+        emit imageSetFailed();
+        return;
+    }
+    
+    // Qt doesn't support writing GIFs, so let's save those 
+    // and everything else but JPGs as PNGs
+    QString suffix("png");
+    if (QFileInfo(portraitFileName).suffix().toUpper() == "JPG" ) {
+        suffix = "jpg";
+    }
+    QString portraitTargetFileName = wallpaperDirectory()
+        + QString("%1_portrait.").arg(mId) + suffix;
+    QString landscapeTargetFileName = wallpaperDirectory()
+        + QString("%1_landscape.").arg(mId) + suffix;
+    
+    if (mIsDefaultImage) {
+        mIsDefaultImage = false;
+    } else {
+        QFile::remove(mPortraitImagePath);
+        QFile::remove(mLandscapeImagePath);
+    }
+    
+    QFile::copy(portraitFileName, portraitTargetFileName);
+    QFile::copy(landscapeFileName, landscapeTargetFileName);
+    QFile::remove(portraitFileName);
+    QFile::remove(landscapeFileName);
+
+    setExistingImage();
+    emit imageSet();
+}
+
+/*!
+
+*/
 void HsWallpaper::setDefaultImage()
 {
     if (mIsDefaultImage) {
--- a/homescreenapp/hsdomainmodel/src/hswidgetcomponentregistry.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hsdomainmodel/src/hswidgetcomponentregistry.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -185,7 +185,10 @@
             mServiceManager.removeService(uri);
         }
         QCoreApplication::addLibraryPath(path);
-        mServiceManager.addService(service);
+        QCoreApplication::addLibraryPath(
+            path[0] + QLatin1String(":/resource/qt/plugins/homescreen"));
+
+        mServiceManager.addService(service);        
     }    
 }
 
--- a/homescreenapp/hsdomainmodel/src/hswidgettoucharea.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hsdomainmodel/src/hswidgettoucharea.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -43,9 +43,21 @@
     HsScene *scene = HsScene::instance();
     switch (event->type()) {
         case QEvent::TouchBegin:
+            {
+            QTouchEvent *touchEvent = static_cast<QTouchEvent *>(event);
+            QPointF scenePos;
+            if (touchEvent && !touchEvent->touchPoints().isEmpty() ) {
+                scenePos = static_cast<QTouchEvent *>(event)->touchPoints().first().scenePos();
+                }
+            emit scene->widgetTapStarted(scenePos, mWidgetHostVisual->visualModel());
+            break;        
+            }
         case QEvent::GraphicsSceneMousePress:
-            emit scene->widgetTapStarted(mWidgetHostVisual->visualModel());
+            {
+            QPointF scenePos = static_cast<QGraphicsSceneMouseEvent *>(event)->lastScenePos();
+            emit scene->widgetTapStarted(scenePos, mWidgetHostVisual->visualModel());
             break;        
+            }
         case QEvent::TouchEnd:
             {
                 ungrabGesture(Qt::PanGesture);
--- a/homescreenapp/hshomescreenclientplugin/inc/hshomescreenclient.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hshomescreenclientplugin/inc/hshomescreenclient.h	Fri Sep 17 08:27:54 2010 +0300
@@ -38,11 +38,13 @@
 public slots:
     bool addWidget(const QString &uri, const QVariantHash &preferences);
     bool setWallpaper(const QString &fileName);
+    bool setWallpaper(const QString &portraitFileName, const QString &landscapeFileName);
 private slots:
     void onRequestCompleted(const QVariant &result);
     void onRequestError(int error);
     void doAddWidget(const QString &uri, const QVariantHash &preferences);
     void doSetWallpaper(const QString &fileName);
+    void doSetWallpaper2(const QString &portraitFileName, const QString &landscapeFileName);
 signals:
     void requestFinished();
 private:
--- a/homescreenapp/hshomescreenclientplugin/src/hshomescreenclient.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hshomescreenclientplugin/src/hshomescreenclient.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -84,6 +84,24 @@
    
     return mRequestResult;
 }
+
+/*!
+
+*/
+bool HsHomescreenClient::setWallpaper(const QString &portraitFileName, const QString &landscapeFileName)
+{
+    QEventLoop eventLoop;
+    connect(this, SIGNAL(requestFinished()), &eventLoop, SLOT(quit()));
+    QMetaObject::invokeMethod(
+            this, 
+            "doSetWallpaper2", 
+            Qt::QueuedConnection,
+            Q_ARG(QString,portraitFileName),
+            Q_ARG(QString,landscapeFileName));
+    eventLoop.exec();
+   
+    return mRequestResult;
+}
     
 /*!
    Called when request is completed.
@@ -158,6 +176,29 @@
     mRequestResult = false;
     if (!mAsyncRequest->send()) {
        emit requestFinished();
-    }
+    }    
+}
+
+void HsHomescreenClient::doSetWallpaper2(const QString &portraitFileName, const QString &landscapeFileName)
+{
+    delete mAsyncRequest;
+    mAsyncRequest = 0;
+    mAsyncRequest = new XQServiceRequest(INTERFACE_NAME,
+                        "setWallpaper(QString,QString)", false);
+    XQRequestInfo requestInfo = mAsyncRequest->info();
+    requestInfo.setBackground(true);
+    mAsyncRequest->setInfo(requestInfo);
     
+    *mAsyncRequest << portraitFileName;
+    *mAsyncRequest << landscapeFileName;
+    
+    connect(mAsyncRequest, SIGNAL(requestCompleted(QVariant)), 
+            SLOT(onRequestCompleted(QVariant)));
+    connect(mAsyncRequest, SIGNAL(requestError(int)),
+            SLOT(onRequestError(int)));
+       
+    mRequestResult = false;
+    if (!mAsyncRequest->send()) {
+       emit requestFinished();
+    }
 }
--- a/homescreenapp/hshomescreenclientplugin/tsrc/t_hshomescreenclientplugin/sis/gen_sisx.bat	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hshomescreenclientplugin/tsrc/t_hshomescreenclientplugin/sis/gen_sisx.bat	Fri Sep 17 08:27:54 2010 +0300
@@ -18,7 +18,7 @@
 if exist t_hshomescreenclientplugin.sisx del t_hshomescreenclientplugin.sisx
 
 makesis t_hshomescreenclientplugin.pkg
-signsis t_hshomescreenclientplugin.sis t_hshomescreenclientplugin.sisx ../../../../sis/rd.cer ../../../../sis/rd-key.pem
+signsis t_hshomescreenclientplugin.sis t_hshomescreenclientplugin.sisx ../../../../internal/sis/rd.cer ../../../../internal/sis/rd-key.pem
 
 if exist t_hshomescreenclientplugin.sisx (
 echo t_hshomescreenclientplugin.sisx creation SUCCEEDED
--- a/homescreenapp/hsutils/bwins/hsutilsu.def	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hsutils/bwins/hsutilsu.def	Fri Sep 17 08:27:54 2010 +0300
@@ -115,163 +115,164 @@
 	?convert@HsWidgetOrganizer@@UAE?AV?$QList@VQRectF@@@@ABVQRectF@@ABV2@1ABVQPointF@@@Z @ 114 NONAME ; class QList<class QRectF> HsWidgetOrganizer::convert(class QRectF const &, class QList<class QRectF> const &, class QList<class QRectF> const &, class QPointF const &)
 	?tr@HsPropertyAnimationWrapper@@SA?AVQString@@PBD0@Z @ 115 NONAME ; class QString HsPropertyAnimationWrapper::tr(char const *, char const *)
 	?onStatusChanged@HsTitleResolver@@AAEXW4HsDeviceInfoStatus@HsDeviceInfoListener@@@Z @ 116 NONAME ; void HsTitleResolver::onStatusChanged(enum HsDeviceInfoListener::HsDeviceInfoStatus)
-	?createVerticalLine@HsSnapToLines@@AAEXXZ @ 117 NONAME ; void HsSnapToLines::createVerticalLine(void)
-	?trUtf8@XQAIWGetImageClient@@SA?AVQString@@PBD0H@Z @ 118 NONAME ; class QString XQAIWGetImageClient::trUtf8(char const *, char const *, int)
-	?actionOnFadeInAnimationStop@HsSnapLine@@AAEXXZ @ 119 NONAME ; void HsSnapLine::actionOnFadeInAnimationStop(void)
-	?qt_metacast@HsTrashBinWidget@@UAEPAXPBD@Z @ 120 NONAME ; void * HsTrashBinWidget::qt_metacast(char const *)
-	?createNewCollectionEvent@HsMenuEventFactory@@SAPAVQEvent@@XZ @ 121 NONAME ; class QEvent * HsMenuEventFactory::createNewCollectionEvent(void)
-	?createOpenHomeScreenEvent@HsMenuEventFactory@@SAPAVQEvent@@XZ @ 122 NONAME ; class QEvent * HsMenuEventFactory::createOpenHomeScreenEvent(void)
-	?checkInactiveRectPositionToVerticalLine@HsSnapToLines@@AAEXXZ @ 123 NONAME ; void HsSnapToLines::checkInactiveRectPositionToVerticalLine(void)
-	?findImages@XQAIWGetImageClient@@AAEXABVQString@@ABVQStringList@@AAV3@@Z @ 124 NONAME ; void XQAIWGetImageClient::findImages(class QString const &, class QStringList const &, class QStringList &)
-	??_EHsMenuDialogFactory@@UAE@I@Z @ 125 NONAME ; HsMenuDialogFactory::~HsMenuDialogFactory(unsigned int)
-	??1HsWidgetPositioningOnWidgetAdd@@UAE@XZ @ 126 NONAME ; HsWidgetPositioningOnWidgetAdd::~HsWidgetPositioningOnWidgetAdd(void)
-	?createInstallationLogEvent@HsMenuEventFactory@@SAPAVQEvent@@XZ @ 127 NONAME ; class QEvent * HsMenuEventFactory::createInstallationLogEvent(void)
-	?extendVerticalLine@HsSnapToLines@@AAEXXZ @ 128 NONAME ; void HsSnapToLines::extendVerticalLine(void)
-	?stop@HsSpinnerDialog@@QAEXXZ @ 129 NONAME ; void HsSpinnerDialog::stop(void)
-	?stop@HsPropertyAnimationWrapper@@QAEXXZ @ 130 NONAME ; void HsPropertyAnimationWrapper::stop(void)
-	?tr@HsSpinnerDialog@@SA?AVQString@@PBD0H@Z @ 131 NONAME ; class QString HsSpinnerDialog::tr(char const *, char const *, int)
-	?getStaticMetaObject@HsSnapLine@@SAABUQMetaObject@@XZ @ 132 NONAME ; struct QMetaObject const & HsSnapLine::getStaticMetaObject(void)
-	?handleError@HsImageFetcherClient@@AAEXHABVQString@@@Z @ 133 NONAME ; void HsImageFetcherClient::handleError(int, class QString const &)
-	?searchHeightSpace@HsWidgetOrganizer@@AAE_NH@Z @ 134 NONAME ; bool HsWidgetOrganizer::searchHeightSpace(int)
-	?tr@HsTitleResolver@@SA?AVQString@@PBD0H@Z @ 135 NONAME ; class QString HsTitleResolver::tr(char const *, char const *, int)
-	?setPropertyName@HsPropertyAnimationWrapper@@QAEXABVQByteArray@@@Z @ 136 NONAME ; void HsPropertyAnimationWrapper::setPropertyName(class QByteArray const &)
-	?checkInactiveRectBetterFitForVerticalSnapping@HsSnapToLines@@AAEXMM@Z @ 137 NONAME ; void HsSnapToLines::checkInactiveRectBetterFitForVerticalSnapping(float, float)
-	?onDialogClosed@HsMessageBoxWrapper@@AAEXH@Z @ 138 NONAME ; void HsMessageBoxWrapper::onDialogClosed(int)
-	?createRenameCollectionEvent@HsMenuEventFactory@@SAPAVQEvent@@H@Z @ 139 NONAME ; class QEvent * HsMenuEventFactory::createRenameCollectionEvent(int)
-	?tr@HsTrashBinWidget@@SA?AVQString@@PBD0@Z @ 140 NONAME ; class QString HsTrashBinWidget::tr(char const *, char const *)
-	?getStaticMetaObject@XQAIWGetImageClient@@SAABUQMetaObject@@XZ @ 141 NONAME ; struct QMetaObject const & XQAIWGetImageClient::getStaticMetaObject(void)
-	?getStaticMetaObject@HsTrashBinWidget@@SAABUQMetaObject@@XZ @ 142 NONAME ; struct QMetaObject const & HsTrashBinWidget::getStaticMetaObject(void)
-	?removeItem@HsPageIndicator@@QAEXH@Z @ 143 NONAME ; void HsPageIndicator::removeItem(int)
-	?mInstance@HsWidgetPositioningOnOrientationChange@@0PAV1@A @ 144 NONAME ; class HsWidgetPositioningOnOrientationChange * HsWidgetPositioningOnOrientationChange::mInstance
-	?staticMetaObject@HsSpinnerDialog@@2UQMetaObject@@B @ 145 NONAME ; struct QMetaObject const HsSpinnerDialog::staticMetaObject
-	?setDuration@HsPropertyAnimationWrapper@@QAEXH@Z @ 146 NONAME ; void HsPropertyAnimationWrapper::setDuration(int)
-	??_EXQAIWGetImageClient@@UAE@I@Z @ 147 NONAME ; XQAIWGetImageClient::~XQAIWGetImageClient(unsigned int)
-	??0HsImageFetcherClient@@QAE@PAVQObject@@@Z @ 148 NONAME ; HsImageFetcherClient::HsImageFetcherClient(class QObject *)
-	??_EHsMessageBoxWrapper@@UAE@I@Z @ 149 NONAME ; HsMessageBoxWrapper::~HsMessageBoxWrapper(unsigned int)
-	?tr@HsTrashBinWidget@@SA?AVQString@@PBD0H@Z @ 150 NONAME ; class QString HsTrashBinWidget::tr(char const *, char const *, int)
-	?setTargetObject@HsPropertyAnimationWrapper@@QAEXPAVQObject@@@Z @ 151 NONAME ; void HsPropertyAnimationWrapper::setTargetObject(class QObject *)
-	??0HsTrashBinWidget@@QAE@PAVQGraphicsItem@@@Z @ 152 NONAME ; HsTrashBinWidget::HsTrashBinWidget(class QGraphicsItem *)
-	?compareLeftSideOfMovingRectForSnapping@HsSnapToLines@@AAEXXZ @ 153 NONAME ; void HsSnapToLines::compareLeftSideOfMovingRectForSnapping(void)
-	?fetch@HsImageFetcherClient@@QAEXXZ @ 154 NONAME ; void HsImageFetcherClient::fetch(void)
-	?instance@HsWidgetPositioningOnWidgetMove@@SAPAV1@XZ @ 155 NONAME ; class HsWidgetPositioningOnWidgetMove * HsWidgetPositioningOnWidgetMove::instance(void)
-	?staticMetaObject@HsMessageBoxWrapper@@2UQMetaObject@@B @ 156 NONAME ; struct QMetaObject const HsMessageBoxWrapper::staticMetaObject
-	?qt_metacast@HsImageFetcherClient@@UAEPAXPBD@Z @ 157 NONAME ; void * HsImageFetcherClient::qt_metacast(char const *)
-	?trUtf8@HsImageFetcherClient@@SA?AVQString@@PBD0@Z @ 158 NONAME ; class QString HsImageFetcherClient::trUtf8(char const *, char const *)
-	?fetchCompleted@HsImageFetcherClient@@IAEXABVQString@@@Z @ 159 NONAME ; void HsImageFetcherClient::fetchCompleted(class QString const &)
-	?start@HsSpinnerDialog@@QAEXXZ @ 160 NONAME ; void HsSpinnerDialog::start(void)
-	?isFadeOutAnimationRunning@HsSnapLine@@ABE_NXZ @ 161 NONAME ; bool HsSnapLine::isFadeOutAnimationRunning(void) const
-	?trUtf8@HsPropertyAnimationWrapper@@SA?AVQString@@PBD0@Z @ 162 NONAME ; class QString HsPropertyAnimationWrapper::trUtf8(char const *, char const *)
-	?createSnappableRectangles@HsSnapToLines@@AAEXABV?$QList@VQRectF@@@@@Z @ 163 NONAME ; void HsSnapToLines::createSnappableRectangles(class QList<class QRectF> const &)
-	?staticMetaObject@HsImageGridWidget@@2UQMetaObject@@B @ 164 NONAME ; struct QMetaObject const HsImageGridWidget::staticMetaObject
-	??_EHsTitleResolver@@UAE@I@Z @ 165 NONAME ; HsTitleResolver::~HsTitleResolver(unsigned int)
-	?setForward@HsPropertyAnimationWrapper@@QAEXXZ @ 166 NONAME ; void HsPropertyAnimationWrapper::setForward(void)
-	?convert@HsAnchorPointInCenter@@UAE?AV?$QList@VQRectF@@@@ABVQRectF@@ABV2@1ABVQPointF@@@Z @ 167 NONAME ; class QList<class QRectF> HsAnchorPointInCenter::convert(class QRectF const &, class QList<class QRectF> const &, class QList<class QRectF> const &, class QPointF const &)
-	??1HsSnapToLines@@UAE@XZ @ 168 NONAME ; HsSnapToLines::~HsSnapToLines(void)
-	?staticMetaObject@HsTrashBinWidget@@2UQMetaObject@@B @ 169 NONAME ; struct QMetaObject const HsTrashBinWidget::staticMetaObject
-	?title@HsTitleResolver@@QAE?AVQString@@XZ @ 170 NONAME ; class QString HsTitleResolver::title(void)
-	??_EHsWidgetPositioningOnWidgetAdd@@UAE@I@Z @ 171 NONAME ; HsWidgetPositioningOnWidgetAdd::~HsWidgetPositioningOnWidgetAdd(unsigned int)
-	??_EHsMenuEventTransition@@UAE@I@Z @ 172 NONAME ; HsMenuEventTransition::~HsMenuEventTransition(unsigned int)
-	?tr@HsSnapLine@@SA?AVQString@@PBD0@Z @ 173 NONAME ; class QString HsSnapLine::tr(char const *, char const *)
-	?setPagePresentation@HsSnapToLines@@UAEXABVQRectF@@ABV?$QList@VQRectF@@@@0@Z @ 174 NONAME ; void HsSnapToLines::setPagePresentation(class QRectF const &, class QList<class QRectF> const &, class QRectF const &)
-	?trUtf8@HsTrashBinWidget@@SA?AVQString@@PBD0H@Z @ 175 NONAME ; class QString HsTrashBinWidget::trUtf8(char const *, char const *, int)
-	?trUtf8@HsImageFetcherClient@@SA?AVQString@@PBD0H@Z @ 176 NONAME ; class QString HsImageFetcherClient::trUtf8(char const *, char const *, int)
-	??_EHsMenuEvent@@UAE@I@Z @ 177 NONAME ; HsMenuEvent::~HsMenuEvent(unsigned int)
-	??1HsTrashBinWidget@@UAE@XZ @ 178 NONAME ; HsTrashBinWidget::~HsTrashBinWidget(void)
-	?compareTopOfMovingRectForSnapping@HsSnapToLines@@AAEXXZ @ 179 NONAME ; void HsSnapToLines::compareTopOfMovingRectForSnapping(void)
-	??_EHsSnapToLines@@UAE@I@Z @ 180 NONAME ; HsSnapToLines::~HsSnapToLines(unsigned int)
-	?itemCount@HsPageIndicator@@QBEHXZ @ 181 NONAME ; int HsPageIndicator::itemCount(void) const
-	?checkInactiveRectLieLeftOrRightOfMovingRect@HsSnapToLines@@AAEXXZ @ 182 NONAME ; void HsSnapToLines::checkInactiveRectLieLeftOrRightOfMovingRect(void)
-	??1HsImageFetcherClient@@UAE@XZ @ 183 NONAME ; HsImageFetcherClient::~HsImageFetcherClient(void)
-	?createAddAppsFromApplicationsViewEvent@HsMenuEventFactory@@SAPAVQEvent@@W4HsSortAttribute@Hs@@H@Z @ 184 NONAME ; class QEvent * HsMenuEventFactory::createAddAppsFromApplicationsViewEvent(enum Hs::HsSortAttribute, int)
-	??1HsWidgetPositioningOnOrientationChange@@UAE@XZ @ 185 NONAME ; HsWidgetPositioningOnOrientationChange::~HsWidgetPositioningOnOrientationChange(void)
-	?metaObject@HsImageGridWidget@@UBEPBUQMetaObject@@XZ @ 186 NONAME ; struct QMetaObject const * HsImageGridWidget::metaObject(void) const
-	?checkInactiveRectVerticalEdgesInRange@HsSnapToLines@@AAEXM@Z @ 187 NONAME ; void HsSnapToLines::checkInactiveRectVerticalEdgesInRange(float)
-	?imageSelectionCancelled@XQAIWGetImageClient@@AAEXXZ @ 188 NONAME ; void XQAIWGetImageClient::imageSelectionCancelled(void)
-	?gridItemActivated@HsImageGridWidget@@AAEXABVQModelIndex@@@Z @ 189 NONAME ; void HsImageGridWidget::gridItemActivated(class QModelIndex const &)
-	?markReservedAnchors@HsWidgetOrganizer@@AAE_NXZ @ 190 NONAME ; bool HsWidgetOrganizer::markReservedAnchors(void)
-	?createRemoveAppFromCollectionEvent@HsMenuEventFactory@@SAPAVQEvent@@HH@Z @ 191 NONAME ; class QEvent * HsMenuEventFactory::createRemoveAppFromCollectionEvent(int, int)
-	??1HsWidgetPositioningOnWidgetMove@@UAE@XZ @ 192 NONAME ; HsWidgetPositioningOnWidgetMove::~HsWidgetPositioningOnWidgetMove(void)
-	?trUtf8@HsPageIndicator@@SA?AVQString@@PBD0H@Z @ 193 NONAME ; class QString HsPageIndicator::trUtf8(char const *, char const *, int)
-	??0HsSpinnerDialog@@QAE@PAVQGraphicsItem@@@Z @ 194 NONAME ; HsSpinnerDialog::HsSpinnerDialog(class QGraphicsItem *)
-	?createOpenCollectionEvent@HsMenuEventFactory@@SAPAVQEvent@@HABVQString@@@Z @ 195 NONAME ; class QEvent * HsMenuEventFactory::createOpenCollectionEvent(int, class QString const &)
-	?initialize@HsPageIndicator@@QAEXHH@Z @ 196 NONAME ; void HsPageIndicator::initialize(int, int)
-	??1HsPageIndicator@@UAE@XZ @ 197 NONAME ; HsPageIndicator::~HsPageIndicator(void)
-	?instance@HsWidgetPositioningOnOrientationChange@@SAPAV1@XZ @ 198 NONAME ; class HsWidgetPositioningOnOrientationChange * HsWidgetPositioningOnOrientationChange::instance(void)
-	?createAddToHomeScreenEvent@HsMenuEventFactory@@SAPAVQEvent@@HW4HsMenuMode@Hs@@VQVariant@@@Z @ 199 NONAME ; class QEvent * HsMenuEventFactory::createAddToHomeScreenEvent(int, enum Hs::HsMenuMode, class QVariant)
-	?getFadeInDuration@HsSnapLine@@AAEHXZ @ 200 NONAME ; int HsSnapLine::getFadeInDuration(void)
-	?getAnchorPoint@HsWidgetOrganizer@@AAE_NABVQSizeF@@@Z @ 201 NONAME ; bool HsWidgetOrganizer::getAnchorPoint(class QSizeF const &)
-	?fetchCompleted@XQAIWGetImageClient@@IAEXABVQString@@@Z @ 202 NONAME ; void XQAIWGetImageClient::fetchCompleted(class QString const &)
-	?requestCompleted@XQAIWGetImageClient@@AAEXABVQVariant@@@Z @ 203 NONAME ; void XQAIWGetImageClient::requestCompleted(class QVariant const &)
-	?initAnchors@HsWidgetOrganizer@@AAE_NABVQSizeF@@@Z @ 204 NONAME ; bool HsWidgetOrganizer::initAnchors(class QSizeF const &)
-	?accepted@HsMessageBoxWrapper@@IAEXXZ @ 205 NONAME ; void HsMessageBoxWrapper::accepted(void)
-	?getStaticMetaObject@HsMessageBoxWrapper@@SAABUQMetaObject@@XZ @ 206 NONAME ; struct QMetaObject const & HsMessageBoxWrapper::getStaticMetaObject(void)
-	?qt_metacast@XQAIWGetImageClient@@UAEPAXPBD@Z @ 207 NONAME ; void * XQAIWGetImageClient::qt_metacast(char const *)
-	??_EHsImageGridWidget@@UAE@I@Z @ 208 NONAME ; HsImageGridWidget::~HsImageGridWidget(unsigned int)
-	?hideLine@HsSnapLine@@QAEXXZ @ 209 NONAME ; void HsSnapLine::hideLine(void)
-	?metaObject@HsPageIndicator@@UBEPBUQMetaObject@@XZ @ 210 NONAME ; struct QMetaObject const * HsPageIndicator::metaObject(void) const
-	?imageSelected@XQAIWGetImageClient@@AAEXABVQString@@@Z @ 211 NONAME ; void XQAIWGetImageClient::imageSelected(class QString const &)
-	?setActiveItemIndex@HsPageIndicator@@QAEXH@Z @ 212 NONAME ; void HsPageIndicator::setActiveItemIndex(int)
-	?trUtf8@HsImageGridWidget@@SA?AVQString@@PBD0H@Z @ 213 NONAME ; class QString HsImageGridWidget::trUtf8(char const *, char const *, int)
-	?getStaticMetaObject@HsImageFetcherClient@@SAABUQMetaObject@@XZ @ 214 NONAME ; struct QMetaObject const & HsImageFetcherClient::getStaticMetaObject(void)
-	?createOpenInstalledViewEvent@HsMenuEventFactory@@SAPAVQEvent@@XZ @ 215 NONAME ; class QEvent * HsMenuEventFactory::createOpenInstalledViewEvent(void)
-	??0HsSnapLine@@QAE@PAVQGraphicsItem@@@Z @ 216 NONAME ; HsSnapLine::HsSnapLine(class QGraphicsItem *)
-	?startFadeOutAnimation@HsSnapLine@@AAEXXZ @ 217 NONAME ; void HsSnapLine::startFadeOutAnimation(void)
-	?imageSelected@HsImageGridWidget@@IAEXABVQString@@@Z @ 218 NONAME ; void HsImageGridWidget::imageSelected(class QString const &)
-	?getStaticMetaObject@HsTitleResolver@@SAABUQMetaObject@@XZ @ 219 NONAME ; struct QMetaObject const & HsTitleResolver::getStaticMetaObject(void)
-	?trUtf8@XQAIWGetImageClient@@SA?AVQString@@PBD0@Z @ 220 NONAME ; class QString XQAIWGetImageClient::trUtf8(char const *, char const *)
-	?stopFadeInAnimation@HsSnapLine@@AAEXXZ @ 221 NONAME ; void HsSnapLine::stopFadeInAnimation(void)
-	?create@HsMenuDialogFactory@@UBEPAVHbMessageBox@@ABVQString@@W4Options@1@@Z @ 222 NONAME ; class HbMessageBox * HsMenuDialogFactory::create(class QString const &, enum HsMenuDialogFactory::Options) const
-	?lenghtInAnchorPoints@HsWidgetOrganizer@@AAEHVQVariant@@@Z @ 223 NONAME ; int HsWidgetOrganizer::lenghtInAnchorPoints(class QVariant)
-	?createArrangeCollectionEvent@HsMenuEventFactory@@SAPAVQEvent@@HH@Z @ 224 NONAME ; class QEvent * HsMenuEventFactory::createArrangeCollectionEvent(int, int)
-	?deactivate@HsTrashBinWidget@@QAEXXZ @ 225 NONAME ; void HsTrashBinWidget::deactivate(void)
-	?qt_metacast@HsImageGridWidget@@UAEPAXPBD@Z @ 226 NONAME ; void * HsImageGridWidget::qt_metacast(char const *)
-	?isForward@HsPropertyAnimationWrapper@@QBE_NXZ @ 227 NONAME ; bool HsPropertyAnimationWrapper::isForward(void) const
-	?tr@HsPageIndicator@@SA?AVQString@@PBD0H@Z @ 228 NONAME ; class QString HsPageIndicator::tr(char const *, char const *, int)
-	?eventTest@HsMenuEventTransition@@MAE_NPAVQEvent@@@Z @ 229 NONAME ; bool HsMenuEventTransition::eventTest(class QEvent *)
-	?qt_metacall@HsImageGridWidget@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 230 NONAME ; int HsImageGridWidget::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?showLine@HsSnapLine@@QAEXABVQLineF@@@Z @ 231 NONAME ; void HsSnapLine::showLine(class QLineF const &)
-	?tr@HsMessageBoxWrapper@@SA?AVQString@@PBD0H@Z @ 232 NONAME ; class QString HsMessageBoxWrapper::tr(char const *, char const *, int)
-	?qt_metacall@XQAIWGetImageClient@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 233 NONAME ; int XQAIWGetImageClient::qt_metacall(enum QMetaObject::Call, int, void * *)
-	??0XQAIWGetImageClient@@QAE@XZ @ 234 NONAME ; XQAIWGetImageClient::XQAIWGetImageClient(void)
-	?handleOk@HsImageFetcherClient@@AAEXABVQVariant@@@Z @ 235 NONAME ; void HsImageFetcherClient::handleOk(class QVariant const &)
-	??0HsMenuEventTransition@@QAE@W4OperationType@HsMenuEvent@@PAVQState@@1@Z @ 236 NONAME ; HsMenuEventTransition::HsMenuEventTransition(enum HsMenuEvent::OperationType, class QState *, class QState *)
-	?fetchFailed@XQAIWGetImageClient@@IAEXHABVQString@@@Z @ 237 NONAME ; void XQAIWGetImageClient::fetchFailed(int, class QString const &)
-	??0HsTitleResolver@@QAE@PAVQObject@@@Z @ 238 NONAME ; HsTitleResolver::HsTitleResolver(class QObject *)
-	?setConfiguration@HsSnapLine@@QAEXABV?$QHash@VQString@@VQVariant@@@@@Z @ 239 NONAME ; void HsSnapLine::setConfiguration(class QHash<class QString, class QVariant> const &)
-	??_EHsPageIndicator@@UAE@I@Z @ 240 NONAME ; HsPageIndicator::~HsPageIndicator(unsigned int)
-	?stopFadeOutAnimation@HsSnapLine@@AAEXXZ @ 241 NONAME ; void HsSnapLine::stopFadeOutAnimation(void)
-	??_EHsWidgetPositioningOnOrientationChange@@UAE@I@Z @ 242 NONAME ; HsWidgetPositioningOnOrientationChange::~HsWidgetPositioningOnOrientationChange(unsigned int)
-	?setUpActions@HsMenuDialogFactory@@ABEXPAVHbMessageBox@@ABVQStringList@@@Z @ 243 NONAME ; void HsMenuDialogFactory::setUpActions(class HbMessageBox *, class QStringList const &) const
-	?compareRightSideOfMovingRectForSnapping@HsSnapToLines@@AAEXXZ @ 244 NONAME ; void HsSnapToLines::compareRightSideOfMovingRectForSnapping(void)
-	?isRunning@HsPropertyAnimationWrapper@@QAE_NXZ @ 245 NONAME ; bool HsPropertyAnimationWrapper::isRunning(void)
-	?mInstance@HsWidgetPositioningOnWidgetMove@@0PAV1@A @ 246 NONAME ; class HsWidgetPositioningOnWidgetMove * HsWidgetPositioningOnWidgetMove::mInstance
-	?tr@XQAIWGetImageClient@@SA?AVQString@@PBD0@Z @ 247 NONAME ; class QString XQAIWGetImageClient::tr(char const *, char const *)
-	?getAnchorCoordinates@HsWidgetOrganizer@@AAE?AVQPointF@@H@Z @ 248 NONAME ; class QPointF HsWidgetOrganizer::getAnchorCoordinates(int)
-	?finished@HsPropertyAnimationWrapper@@IAEXXZ @ 249 NONAME ; void HsPropertyAnimationWrapper::finished(void)
-	?addItem@HsPageIndicator@@QAEXH@Z @ 250 NONAME ; void HsPageIndicator::addItem(int)
-	??0HsPageIndicator@@QAE@MPAVQGraphicsItem@@@Z @ 251 NONAME ; HsPageIndicator::HsPageIndicator(float, class QGraphicsItem *)
-	?rejected@HsMessageBoxWrapper@@IAEXXZ @ 252 NONAME ; void HsMessageBoxWrapper::rejected(void)
-	?tr@XQAIWGetImageClient@@SA?AVQString@@PBD0H@Z @ 253 NONAME ; class QString XQAIWGetImageClient::tr(char const *, char const *, int)
-	?trUtf8@HsPropertyAnimationWrapper@@SA?AVQString@@PBD0H@Z @ 254 NONAME ; class QString HsPropertyAnimationWrapper::trUtf8(char const *, char const *, int)
-	?qt_metacall@HsSpinnerDialog@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 255 NONAME ; int HsSpinnerDialog::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?mInstance@HsWidgetPositioningOnWidgetAdd@@0PAV1@A @ 256 NONAME ; class HsWidgetPositioningOnWidgetAdd * HsWidgetPositioningOnWidgetAdd::mInstance
-	??1HsMessageBoxWrapper@@UAE@XZ @ 257 NONAME ; HsMessageBoxWrapper::~HsMessageBoxWrapper(void)
-	?setInstance@HsWidgetPositioningOnWidgetAdd@@SAXPAV1@@Z @ 258 NONAME ; void HsWidgetPositioningOnWidgetAdd::setInstance(class HsWidgetPositioningOnWidgetAdd *)
-	?qt_metacast@HsTitleResolver@@UAEPAXPBD@Z @ 259 NONAME ; void * HsTitleResolver::qt_metacast(char const *)
-	??_EHsWidgetPositioningOnWidgetMove@@UAE@I@Z @ 260 NONAME ; HsWidgetPositioningOnWidgetMove::~HsWidgetPositioningOnWidgetMove(unsigned int)
-	?extendHorizontalLine@HsSnapToLines@@AAEXXZ @ 261 NONAME ; void HsSnapToLines::extendHorizontalLine(void)
-	?qt_metacall@HsTrashBinWidget@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 262 NONAME ; int HsTrashBinWidget::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?searchWidthSpace@HsWidgetOrganizer@@AAE_NABVQSizeF@@@Z @ 263 NONAME ; bool HsWidgetOrganizer::searchWidthSpace(class QSizeF const &)
-	??1HsImageGridWidget@@UAE@XZ @ 264 NONAME ; HsImageGridWidget::~HsImageGridWidget(void)
-	??_EHsAnchorPointInCenter@@UAE@I@Z @ 265 NONAME ; HsAnchorPointInCenter::~HsAnchorPointInCenter(unsigned int)
-	?getStaticMetaObject@HsSpinnerDialog@@SAABUQMetaObject@@XZ @ 266 NONAME ; struct QMetaObject const & HsSpinnerDialog::getStaticMetaObject(void)
-	?staticMetaObject@HsTitleResolver@@2UQMetaObject@@B @ 267 NONAME ; struct QMetaObject const HsTitleResolver::staticMetaObject
-	?checkInactiveRectHorizontalEdgesInRange@HsSnapToLines@@AAEXM@Z @ 268 NONAME ; void HsSnapToLines::checkInactiveRectHorizontalEdgesInRange(float)
-	??0HsPropertyAnimationWrapper@@QAE@PAVQObject@@@Z @ 269 NONAME ; HsPropertyAnimationWrapper::HsPropertyAnimationWrapper(class QObject *)
-	?createHorizontalLine@HsSnapToLines@@AAEXXZ @ 270 NONAME ; void HsSnapToLines::createHorizontalLine(void)
-	?tr@HsSnapLine@@SA?AVQString@@PBD0H@Z @ 271 NONAME ; class QString HsSnapLine::tr(char const *, char const *, int)
-	?qt_metacall@HsImageFetcherClient@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 272 NONAME ; int HsImageFetcherClient::qt_metacall(enum QMetaObject::Call, int, void * *)
-	??_EHsSpinnerDialog@@UAE@I@Z @ 273 NONAME ; HsSpinnerDialog::~HsSpinnerDialog(unsigned int)
-	??0HsImageGridWidget@@QAE@ABVQStringList@@PAVQGraphicsItem@@@Z @ 274 NONAME ; HsImageGridWidget::HsImageGridWidget(class QStringList const &, class QGraphicsItem *)
-	?tr@HsImageGridWidget@@SA?AVQString@@PBD0H@Z @ 275 NONAME ; class QString HsImageGridWidget::tr(char const *, char const *, int)
+	?createUninstallFailedEvent@HsMenuEventFactory@@SAPAVQEvent@@H@Z @ 117 NONAME ; class QEvent * HsMenuEventFactory::createUninstallFailedEvent(int)
+	?createVerticalLine@HsSnapToLines@@AAEXXZ @ 118 NONAME ; void HsSnapToLines::createVerticalLine(void)
+	?trUtf8@XQAIWGetImageClient@@SA?AVQString@@PBD0H@Z @ 119 NONAME ; class QString XQAIWGetImageClient::trUtf8(char const *, char const *, int)
+	?actionOnFadeInAnimationStop@HsSnapLine@@AAEXXZ @ 120 NONAME ; void HsSnapLine::actionOnFadeInAnimationStop(void)
+	?qt_metacast@HsTrashBinWidget@@UAEPAXPBD@Z @ 121 NONAME ; void * HsTrashBinWidget::qt_metacast(char const *)
+	?createNewCollectionEvent@HsMenuEventFactory@@SAPAVQEvent@@XZ @ 122 NONAME ; class QEvent * HsMenuEventFactory::createNewCollectionEvent(void)
+	?createOpenHomeScreenEvent@HsMenuEventFactory@@SAPAVQEvent@@XZ @ 123 NONAME ; class QEvent * HsMenuEventFactory::createOpenHomeScreenEvent(void)
+	?checkInactiveRectPositionToVerticalLine@HsSnapToLines@@AAEXXZ @ 124 NONAME ; void HsSnapToLines::checkInactiveRectPositionToVerticalLine(void)
+	?findImages@XQAIWGetImageClient@@AAEXABVQString@@ABVQStringList@@AAV3@@Z @ 125 NONAME ; void XQAIWGetImageClient::findImages(class QString const &, class QStringList const &, class QStringList &)
+	??_EHsMenuDialogFactory@@UAE@I@Z @ 126 NONAME ; HsMenuDialogFactory::~HsMenuDialogFactory(unsigned int)
+	??1HsWidgetPositioningOnWidgetAdd@@UAE@XZ @ 127 NONAME ; HsWidgetPositioningOnWidgetAdd::~HsWidgetPositioningOnWidgetAdd(void)
+	?createInstallationLogEvent@HsMenuEventFactory@@SAPAVQEvent@@XZ @ 128 NONAME ; class QEvent * HsMenuEventFactory::createInstallationLogEvent(void)
+	?extendVerticalLine@HsSnapToLines@@AAEXXZ @ 129 NONAME ; void HsSnapToLines::extendVerticalLine(void)
+	?stop@HsSpinnerDialog@@QAEXXZ @ 130 NONAME ; void HsSpinnerDialog::stop(void)
+	?stop@HsPropertyAnimationWrapper@@QAEXXZ @ 131 NONAME ; void HsPropertyAnimationWrapper::stop(void)
+	?tr@HsSpinnerDialog@@SA?AVQString@@PBD0H@Z @ 132 NONAME ; class QString HsSpinnerDialog::tr(char const *, char const *, int)
+	?getStaticMetaObject@HsSnapLine@@SAABUQMetaObject@@XZ @ 133 NONAME ; struct QMetaObject const & HsSnapLine::getStaticMetaObject(void)
+	?handleError@HsImageFetcherClient@@AAEXHABVQString@@@Z @ 134 NONAME ; void HsImageFetcherClient::handleError(int, class QString const &)
+	?searchHeightSpace@HsWidgetOrganizer@@AAE_NH@Z @ 135 NONAME ; bool HsWidgetOrganizer::searchHeightSpace(int)
+	?tr@HsTitleResolver@@SA?AVQString@@PBD0H@Z @ 136 NONAME ; class QString HsTitleResolver::tr(char const *, char const *, int)
+	?setPropertyName@HsPropertyAnimationWrapper@@QAEXABVQByteArray@@@Z @ 137 NONAME ; void HsPropertyAnimationWrapper::setPropertyName(class QByteArray const &)
+	?checkInactiveRectBetterFitForVerticalSnapping@HsSnapToLines@@AAEXMM@Z @ 138 NONAME ; void HsSnapToLines::checkInactiveRectBetterFitForVerticalSnapping(float, float)
+	?onDialogClosed@HsMessageBoxWrapper@@AAEXH@Z @ 139 NONAME ; void HsMessageBoxWrapper::onDialogClosed(int)
+	?createRenameCollectionEvent@HsMenuEventFactory@@SAPAVQEvent@@H@Z @ 140 NONAME ; class QEvent * HsMenuEventFactory::createRenameCollectionEvent(int)
+	?tr@HsTrashBinWidget@@SA?AVQString@@PBD0@Z @ 141 NONAME ; class QString HsTrashBinWidget::tr(char const *, char const *)
+	?getStaticMetaObject@XQAIWGetImageClient@@SAABUQMetaObject@@XZ @ 142 NONAME ; struct QMetaObject const & XQAIWGetImageClient::getStaticMetaObject(void)
+	?getStaticMetaObject@HsTrashBinWidget@@SAABUQMetaObject@@XZ @ 143 NONAME ; struct QMetaObject const & HsTrashBinWidget::getStaticMetaObject(void)
+	?removeItem@HsPageIndicator@@QAEXH@Z @ 144 NONAME ; void HsPageIndicator::removeItem(int)
+	?mInstance@HsWidgetPositioningOnOrientationChange@@0PAV1@A @ 145 NONAME ; class HsWidgetPositioningOnOrientationChange * HsWidgetPositioningOnOrientationChange::mInstance
+	?staticMetaObject@HsSpinnerDialog@@2UQMetaObject@@B @ 146 NONAME ; struct QMetaObject const HsSpinnerDialog::staticMetaObject
+	?setDuration@HsPropertyAnimationWrapper@@QAEXH@Z @ 147 NONAME ; void HsPropertyAnimationWrapper::setDuration(int)
+	??_EXQAIWGetImageClient@@UAE@I@Z @ 148 NONAME ; XQAIWGetImageClient::~XQAIWGetImageClient(unsigned int)
+	??0HsImageFetcherClient@@QAE@PAVQObject@@@Z @ 149 NONAME ; HsImageFetcherClient::HsImageFetcherClient(class QObject *)
+	??_EHsMessageBoxWrapper@@UAE@I@Z @ 150 NONAME ; HsMessageBoxWrapper::~HsMessageBoxWrapper(unsigned int)
+	?tr@HsTrashBinWidget@@SA?AVQString@@PBD0H@Z @ 151 NONAME ; class QString HsTrashBinWidget::tr(char const *, char const *, int)
+	?setTargetObject@HsPropertyAnimationWrapper@@QAEXPAVQObject@@@Z @ 152 NONAME ; void HsPropertyAnimationWrapper::setTargetObject(class QObject *)
+	??0HsTrashBinWidget@@QAE@PAVQGraphicsItem@@@Z @ 153 NONAME ; HsTrashBinWidget::HsTrashBinWidget(class QGraphicsItem *)
+	?compareLeftSideOfMovingRectForSnapping@HsSnapToLines@@AAEXXZ @ 154 NONAME ; void HsSnapToLines::compareLeftSideOfMovingRectForSnapping(void)
+	?fetch@HsImageFetcherClient@@QAEXXZ @ 155 NONAME ; void HsImageFetcherClient::fetch(void)
+	?instance@HsWidgetPositioningOnWidgetMove@@SAPAV1@XZ @ 156 NONAME ; class HsWidgetPositioningOnWidgetMove * HsWidgetPositioningOnWidgetMove::instance(void)
+	?staticMetaObject@HsMessageBoxWrapper@@2UQMetaObject@@B @ 157 NONAME ; struct QMetaObject const HsMessageBoxWrapper::staticMetaObject
+	?qt_metacast@HsImageFetcherClient@@UAEPAXPBD@Z @ 158 NONAME ; void * HsImageFetcherClient::qt_metacast(char const *)
+	?trUtf8@HsImageFetcherClient@@SA?AVQString@@PBD0@Z @ 159 NONAME ; class QString HsImageFetcherClient::trUtf8(char const *, char const *)
+	?fetchCompleted@HsImageFetcherClient@@IAEXABVQString@@@Z @ 160 NONAME ; void HsImageFetcherClient::fetchCompleted(class QString const &)
+	?start@HsSpinnerDialog@@QAEXXZ @ 161 NONAME ; void HsSpinnerDialog::start(void)
+	?isFadeOutAnimationRunning@HsSnapLine@@ABE_NXZ @ 162 NONAME ; bool HsSnapLine::isFadeOutAnimationRunning(void) const
+	?trUtf8@HsPropertyAnimationWrapper@@SA?AVQString@@PBD0@Z @ 163 NONAME ; class QString HsPropertyAnimationWrapper::trUtf8(char const *, char const *)
+	?createSnappableRectangles@HsSnapToLines@@AAEXABV?$QList@VQRectF@@@@@Z @ 164 NONAME ; void HsSnapToLines::createSnappableRectangles(class QList<class QRectF> const &)
+	?staticMetaObject@HsImageGridWidget@@2UQMetaObject@@B @ 165 NONAME ; struct QMetaObject const HsImageGridWidget::staticMetaObject
+	??_EHsTitleResolver@@UAE@I@Z @ 166 NONAME ; HsTitleResolver::~HsTitleResolver(unsigned int)
+	?setForward@HsPropertyAnimationWrapper@@QAEXXZ @ 167 NONAME ; void HsPropertyAnimationWrapper::setForward(void)
+	?convert@HsAnchorPointInCenter@@UAE?AV?$QList@VQRectF@@@@ABVQRectF@@ABV2@1ABVQPointF@@@Z @ 168 NONAME ; class QList<class QRectF> HsAnchorPointInCenter::convert(class QRectF const &, class QList<class QRectF> const &, class QList<class QRectF> const &, class QPointF const &)
+	??1HsSnapToLines@@UAE@XZ @ 169 NONAME ; HsSnapToLines::~HsSnapToLines(void)
+	?staticMetaObject@HsTrashBinWidget@@2UQMetaObject@@B @ 170 NONAME ; struct QMetaObject const HsTrashBinWidget::staticMetaObject
+	?title@HsTitleResolver@@QAE?AVQString@@XZ @ 171 NONAME ; class QString HsTitleResolver::title(void)
+	??_EHsWidgetPositioningOnWidgetAdd@@UAE@I@Z @ 172 NONAME ; HsWidgetPositioningOnWidgetAdd::~HsWidgetPositioningOnWidgetAdd(unsigned int)
+	??_EHsMenuEventTransition@@UAE@I@Z @ 173 NONAME ; HsMenuEventTransition::~HsMenuEventTransition(unsigned int)
+	?tr@HsSnapLine@@SA?AVQString@@PBD0@Z @ 174 NONAME ; class QString HsSnapLine::tr(char const *, char const *)
+	?setPagePresentation@HsSnapToLines@@UAEXABVQRectF@@ABV?$QList@VQRectF@@@@0@Z @ 175 NONAME ; void HsSnapToLines::setPagePresentation(class QRectF const &, class QList<class QRectF> const &, class QRectF const &)
+	?trUtf8@HsTrashBinWidget@@SA?AVQString@@PBD0H@Z @ 176 NONAME ; class QString HsTrashBinWidget::trUtf8(char const *, char const *, int)
+	?trUtf8@HsImageFetcherClient@@SA?AVQString@@PBD0H@Z @ 177 NONAME ; class QString HsImageFetcherClient::trUtf8(char const *, char const *, int)
+	??_EHsMenuEvent@@UAE@I@Z @ 178 NONAME ; HsMenuEvent::~HsMenuEvent(unsigned int)
+	??1HsTrashBinWidget@@UAE@XZ @ 179 NONAME ; HsTrashBinWidget::~HsTrashBinWidget(void)
+	?compareTopOfMovingRectForSnapping@HsSnapToLines@@AAEXXZ @ 180 NONAME ; void HsSnapToLines::compareTopOfMovingRectForSnapping(void)
+	??_EHsSnapToLines@@UAE@I@Z @ 181 NONAME ; HsSnapToLines::~HsSnapToLines(unsigned int)
+	?itemCount@HsPageIndicator@@QBEHXZ @ 182 NONAME ; int HsPageIndicator::itemCount(void) const
+	?checkInactiveRectLieLeftOrRightOfMovingRect@HsSnapToLines@@AAEXXZ @ 183 NONAME ; void HsSnapToLines::checkInactiveRectLieLeftOrRightOfMovingRect(void)
+	??1HsImageFetcherClient@@UAE@XZ @ 184 NONAME ; HsImageFetcherClient::~HsImageFetcherClient(void)
+	?createAddAppsFromApplicationsViewEvent@HsMenuEventFactory@@SAPAVQEvent@@W4HsSortAttribute@Hs@@H@Z @ 185 NONAME ; class QEvent * HsMenuEventFactory::createAddAppsFromApplicationsViewEvent(enum Hs::HsSortAttribute, int)
+	??1HsWidgetPositioningOnOrientationChange@@UAE@XZ @ 186 NONAME ; HsWidgetPositioningOnOrientationChange::~HsWidgetPositioningOnOrientationChange(void)
+	?metaObject@HsImageGridWidget@@UBEPBUQMetaObject@@XZ @ 187 NONAME ; struct QMetaObject const * HsImageGridWidget::metaObject(void) const
+	?checkInactiveRectVerticalEdgesInRange@HsSnapToLines@@AAEXM@Z @ 188 NONAME ; void HsSnapToLines::checkInactiveRectVerticalEdgesInRange(float)
+	?imageSelectionCancelled@XQAIWGetImageClient@@AAEXXZ @ 189 NONAME ; void XQAIWGetImageClient::imageSelectionCancelled(void)
+	?gridItemActivated@HsImageGridWidget@@AAEXABVQModelIndex@@@Z @ 190 NONAME ; void HsImageGridWidget::gridItemActivated(class QModelIndex const &)
+	?markReservedAnchors@HsWidgetOrganizer@@AAE_NXZ @ 191 NONAME ; bool HsWidgetOrganizer::markReservedAnchors(void)
+	?createRemoveAppFromCollectionEvent@HsMenuEventFactory@@SAPAVQEvent@@HH@Z @ 192 NONAME ; class QEvent * HsMenuEventFactory::createRemoveAppFromCollectionEvent(int, int)
+	??1HsWidgetPositioningOnWidgetMove@@UAE@XZ @ 193 NONAME ; HsWidgetPositioningOnWidgetMove::~HsWidgetPositioningOnWidgetMove(void)
+	?trUtf8@HsPageIndicator@@SA?AVQString@@PBD0H@Z @ 194 NONAME ; class QString HsPageIndicator::trUtf8(char const *, char const *, int)
+	??0HsSpinnerDialog@@QAE@PAVQGraphicsItem@@@Z @ 195 NONAME ; HsSpinnerDialog::HsSpinnerDialog(class QGraphicsItem *)
+	?createOpenCollectionEvent@HsMenuEventFactory@@SAPAVQEvent@@HABVQString@@@Z @ 196 NONAME ; class QEvent * HsMenuEventFactory::createOpenCollectionEvent(int, class QString const &)
+	?initialize@HsPageIndicator@@QAEXHH@Z @ 197 NONAME ; void HsPageIndicator::initialize(int, int)
+	??1HsPageIndicator@@UAE@XZ @ 198 NONAME ; HsPageIndicator::~HsPageIndicator(void)
+	?instance@HsWidgetPositioningOnOrientationChange@@SAPAV1@XZ @ 199 NONAME ; class HsWidgetPositioningOnOrientationChange * HsWidgetPositioningOnOrientationChange::instance(void)
+	?createAddToHomeScreenEvent@HsMenuEventFactory@@SAPAVQEvent@@HW4HsMenuMode@Hs@@VQVariant@@@Z @ 200 NONAME ; class QEvent * HsMenuEventFactory::createAddToHomeScreenEvent(int, enum Hs::HsMenuMode, class QVariant)
+	?getFadeInDuration@HsSnapLine@@AAEHXZ @ 201 NONAME ; int HsSnapLine::getFadeInDuration(void)
+	?getAnchorPoint@HsWidgetOrganizer@@AAE_NABVQSizeF@@@Z @ 202 NONAME ; bool HsWidgetOrganizer::getAnchorPoint(class QSizeF const &)
+	?fetchCompleted@XQAIWGetImageClient@@IAEXABVQString@@@Z @ 203 NONAME ; void XQAIWGetImageClient::fetchCompleted(class QString const &)
+	?requestCompleted@XQAIWGetImageClient@@AAEXABVQVariant@@@Z @ 204 NONAME ; void XQAIWGetImageClient::requestCompleted(class QVariant const &)
+	?initAnchors@HsWidgetOrganizer@@AAE_NABVQSizeF@@@Z @ 205 NONAME ; bool HsWidgetOrganizer::initAnchors(class QSizeF const &)
+	?accepted@HsMessageBoxWrapper@@IAEXXZ @ 206 NONAME ; void HsMessageBoxWrapper::accepted(void)
+	?getStaticMetaObject@HsMessageBoxWrapper@@SAABUQMetaObject@@XZ @ 207 NONAME ; struct QMetaObject const & HsMessageBoxWrapper::getStaticMetaObject(void)
+	?qt_metacast@XQAIWGetImageClient@@UAEPAXPBD@Z @ 208 NONAME ; void * XQAIWGetImageClient::qt_metacast(char const *)
+	??_EHsImageGridWidget@@UAE@I@Z @ 209 NONAME ; HsImageGridWidget::~HsImageGridWidget(unsigned int)
+	?hideLine@HsSnapLine@@QAEXXZ @ 210 NONAME ; void HsSnapLine::hideLine(void)
+	?metaObject@HsPageIndicator@@UBEPBUQMetaObject@@XZ @ 211 NONAME ; struct QMetaObject const * HsPageIndicator::metaObject(void) const
+	?imageSelected@XQAIWGetImageClient@@AAEXABVQString@@@Z @ 212 NONAME ; void XQAIWGetImageClient::imageSelected(class QString const &)
+	?setActiveItemIndex@HsPageIndicator@@QAEXH@Z @ 213 NONAME ; void HsPageIndicator::setActiveItemIndex(int)
+	?trUtf8@HsImageGridWidget@@SA?AVQString@@PBD0H@Z @ 214 NONAME ; class QString HsImageGridWidget::trUtf8(char const *, char const *, int)
+	?getStaticMetaObject@HsImageFetcherClient@@SAABUQMetaObject@@XZ @ 215 NONAME ; struct QMetaObject const & HsImageFetcherClient::getStaticMetaObject(void)
+	?createOpenInstalledViewEvent@HsMenuEventFactory@@SAPAVQEvent@@XZ @ 216 NONAME ; class QEvent * HsMenuEventFactory::createOpenInstalledViewEvent(void)
+	??0HsSnapLine@@QAE@PAVQGraphicsItem@@@Z @ 217 NONAME ; HsSnapLine::HsSnapLine(class QGraphicsItem *)
+	?startFadeOutAnimation@HsSnapLine@@AAEXXZ @ 218 NONAME ; void HsSnapLine::startFadeOutAnimation(void)
+	?imageSelected@HsImageGridWidget@@IAEXABVQString@@@Z @ 219 NONAME ; void HsImageGridWidget::imageSelected(class QString const &)
+	?getStaticMetaObject@HsTitleResolver@@SAABUQMetaObject@@XZ @ 220 NONAME ; struct QMetaObject const & HsTitleResolver::getStaticMetaObject(void)
+	?trUtf8@XQAIWGetImageClient@@SA?AVQString@@PBD0@Z @ 221 NONAME ; class QString XQAIWGetImageClient::trUtf8(char const *, char const *)
+	?stopFadeInAnimation@HsSnapLine@@AAEXXZ @ 222 NONAME ; void HsSnapLine::stopFadeInAnimation(void)
+	?create@HsMenuDialogFactory@@UBEPAVHbMessageBox@@ABVQString@@W4Options@1@@Z @ 223 NONAME ; class HbMessageBox * HsMenuDialogFactory::create(class QString const &, enum HsMenuDialogFactory::Options) const
+	?lenghtInAnchorPoints@HsWidgetOrganizer@@AAEHVQVariant@@@Z @ 224 NONAME ; int HsWidgetOrganizer::lenghtInAnchorPoints(class QVariant)
+	?createArrangeCollectionEvent@HsMenuEventFactory@@SAPAVQEvent@@HH@Z @ 225 NONAME ; class QEvent * HsMenuEventFactory::createArrangeCollectionEvent(int, int)
+	?deactivate@HsTrashBinWidget@@QAEXXZ @ 226 NONAME ; void HsTrashBinWidget::deactivate(void)
+	?qt_metacast@HsImageGridWidget@@UAEPAXPBD@Z @ 227 NONAME ; void * HsImageGridWidget::qt_metacast(char const *)
+	?isForward@HsPropertyAnimationWrapper@@QBE_NXZ @ 228 NONAME ; bool HsPropertyAnimationWrapper::isForward(void) const
+	?tr@HsPageIndicator@@SA?AVQString@@PBD0H@Z @ 229 NONAME ; class QString HsPageIndicator::tr(char const *, char const *, int)
+	?eventTest@HsMenuEventTransition@@MAE_NPAVQEvent@@@Z @ 230 NONAME ; bool HsMenuEventTransition::eventTest(class QEvent *)
+	?qt_metacall@HsImageGridWidget@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 231 NONAME ; int HsImageGridWidget::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?showLine@HsSnapLine@@QAEXABVQLineF@@@Z @ 232 NONAME ; void HsSnapLine::showLine(class QLineF const &)
+	?tr@HsMessageBoxWrapper@@SA?AVQString@@PBD0H@Z @ 233 NONAME ; class QString HsMessageBoxWrapper::tr(char const *, char const *, int)
+	?qt_metacall@XQAIWGetImageClient@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 234 NONAME ; int XQAIWGetImageClient::qt_metacall(enum QMetaObject::Call, int, void * *)
+	??0XQAIWGetImageClient@@QAE@XZ @ 235 NONAME ; XQAIWGetImageClient::XQAIWGetImageClient(void)
+	?handleOk@HsImageFetcherClient@@AAEXABVQVariant@@@Z @ 236 NONAME ; void HsImageFetcherClient::handleOk(class QVariant const &)
+	??0HsMenuEventTransition@@QAE@W4OperationType@HsMenuEvent@@PAVQState@@1@Z @ 237 NONAME ; HsMenuEventTransition::HsMenuEventTransition(enum HsMenuEvent::OperationType, class QState *, class QState *)
+	?fetchFailed@XQAIWGetImageClient@@IAEXHABVQString@@@Z @ 238 NONAME ; void XQAIWGetImageClient::fetchFailed(int, class QString const &)
+	??0HsTitleResolver@@QAE@PAVQObject@@@Z @ 239 NONAME ; HsTitleResolver::HsTitleResolver(class QObject *)
+	?setConfiguration@HsSnapLine@@QAEXABV?$QHash@VQString@@VQVariant@@@@@Z @ 240 NONAME ; void HsSnapLine::setConfiguration(class QHash<class QString, class QVariant> const &)
+	??_EHsPageIndicator@@UAE@I@Z @ 241 NONAME ; HsPageIndicator::~HsPageIndicator(unsigned int)
+	?stopFadeOutAnimation@HsSnapLine@@AAEXXZ @ 242 NONAME ; void HsSnapLine::stopFadeOutAnimation(void)
+	??_EHsWidgetPositioningOnOrientationChange@@UAE@I@Z @ 243 NONAME ; HsWidgetPositioningOnOrientationChange::~HsWidgetPositioningOnOrientationChange(unsigned int)
+	?setUpActions@HsMenuDialogFactory@@ABEXPAVHbMessageBox@@ABVQStringList@@@Z @ 244 NONAME ; void HsMenuDialogFactory::setUpActions(class HbMessageBox *, class QStringList const &) const
+	?compareRightSideOfMovingRectForSnapping@HsSnapToLines@@AAEXXZ @ 245 NONAME ; void HsSnapToLines::compareRightSideOfMovingRectForSnapping(void)
+	?isRunning@HsPropertyAnimationWrapper@@QAE_NXZ @ 246 NONAME ; bool HsPropertyAnimationWrapper::isRunning(void)
+	?mInstance@HsWidgetPositioningOnWidgetMove@@0PAV1@A @ 247 NONAME ; class HsWidgetPositioningOnWidgetMove * HsWidgetPositioningOnWidgetMove::mInstance
+	?tr@XQAIWGetImageClient@@SA?AVQString@@PBD0@Z @ 248 NONAME ; class QString XQAIWGetImageClient::tr(char const *, char const *)
+	?getAnchorCoordinates@HsWidgetOrganizer@@AAE?AVQPointF@@H@Z @ 249 NONAME ; class QPointF HsWidgetOrganizer::getAnchorCoordinates(int)
+	?finished@HsPropertyAnimationWrapper@@IAEXXZ @ 250 NONAME ; void HsPropertyAnimationWrapper::finished(void)
+	?addItem@HsPageIndicator@@QAEXH@Z @ 251 NONAME ; void HsPageIndicator::addItem(int)
+	??0HsPageIndicator@@QAE@MPAVQGraphicsItem@@@Z @ 252 NONAME ; HsPageIndicator::HsPageIndicator(float, class QGraphicsItem *)
+	?rejected@HsMessageBoxWrapper@@IAEXXZ @ 253 NONAME ; void HsMessageBoxWrapper::rejected(void)
+	?tr@XQAIWGetImageClient@@SA?AVQString@@PBD0H@Z @ 254 NONAME ; class QString XQAIWGetImageClient::tr(char const *, char const *, int)
+	?trUtf8@HsPropertyAnimationWrapper@@SA?AVQString@@PBD0H@Z @ 255 NONAME ; class QString HsPropertyAnimationWrapper::trUtf8(char const *, char const *, int)
+	?qt_metacall@HsSpinnerDialog@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 256 NONAME ; int HsSpinnerDialog::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?mInstance@HsWidgetPositioningOnWidgetAdd@@0PAV1@A @ 257 NONAME ; class HsWidgetPositioningOnWidgetAdd * HsWidgetPositioningOnWidgetAdd::mInstance
+	??1HsMessageBoxWrapper@@UAE@XZ @ 258 NONAME ; HsMessageBoxWrapper::~HsMessageBoxWrapper(void)
+	?setInstance@HsWidgetPositioningOnWidgetAdd@@SAXPAV1@@Z @ 259 NONAME ; void HsWidgetPositioningOnWidgetAdd::setInstance(class HsWidgetPositioningOnWidgetAdd *)
+	?qt_metacast@HsTitleResolver@@UAEPAXPBD@Z @ 260 NONAME ; void * HsTitleResolver::qt_metacast(char const *)
+	??_EHsWidgetPositioningOnWidgetMove@@UAE@I@Z @ 261 NONAME ; HsWidgetPositioningOnWidgetMove::~HsWidgetPositioningOnWidgetMove(unsigned int)
+	?extendHorizontalLine@HsSnapToLines@@AAEXXZ @ 262 NONAME ; void HsSnapToLines::extendHorizontalLine(void)
+	?qt_metacall@HsTrashBinWidget@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 263 NONAME ; int HsTrashBinWidget::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?searchWidthSpace@HsWidgetOrganizer@@AAE_NABVQSizeF@@@Z @ 264 NONAME ; bool HsWidgetOrganizer::searchWidthSpace(class QSizeF const &)
+	??1HsImageGridWidget@@UAE@XZ @ 265 NONAME ; HsImageGridWidget::~HsImageGridWidget(void)
+	??_EHsAnchorPointInCenter@@UAE@I@Z @ 266 NONAME ; HsAnchorPointInCenter::~HsAnchorPointInCenter(unsigned int)
+	?getStaticMetaObject@HsSpinnerDialog@@SAABUQMetaObject@@XZ @ 267 NONAME ; struct QMetaObject const & HsSpinnerDialog::getStaticMetaObject(void)
+	?staticMetaObject@HsTitleResolver@@2UQMetaObject@@B @ 268 NONAME ; struct QMetaObject const HsTitleResolver::staticMetaObject
+	?checkInactiveRectHorizontalEdgesInRange@HsSnapToLines@@AAEXM@Z @ 269 NONAME ; void HsSnapToLines::checkInactiveRectHorizontalEdgesInRange(float)
+	??0HsPropertyAnimationWrapper@@QAE@PAVQObject@@@Z @ 270 NONAME ; HsPropertyAnimationWrapper::HsPropertyAnimationWrapper(class QObject *)
+	?createHorizontalLine@HsSnapToLines@@AAEXXZ @ 271 NONAME ; void HsSnapToLines::createHorizontalLine(void)
+	?tr@HsSnapLine@@SA?AVQString@@PBD0H@Z @ 272 NONAME ; class QString HsSnapLine::tr(char const *, char const *, int)
+	?qt_metacall@HsImageFetcherClient@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 273 NONAME ; int HsImageFetcherClient::qt_metacall(enum QMetaObject::Call, int, void * *)
+	??_EHsSpinnerDialog@@UAE@I@Z @ 274 NONAME ; HsSpinnerDialog::~HsSpinnerDialog(unsigned int)
+	??0HsImageGridWidget@@QAE@ABVQStringList@@PAVQGraphicsItem@@@Z @ 275 NONAME ; HsImageGridWidget::HsImageGridWidget(class QStringList const &, class QGraphicsItem *)
+	?tr@HsImageGridWidget@@SA?AVQString@@PBD0H@Z @ 276 NONAME ; class QString HsImageGridWidget::tr(char const *, char const *, int)
 
--- a/homescreenapp/hsutils/eabi/hsutilsu.def	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hsutils/eabi/hsutilsu.def	Fri Sep 17 08:27:54 2010 +0300
@@ -127,176 +127,177 @@
 	_ZN18HsMenuEventFactory26createAppSettingsViewEventEi @ 126 NONAME
 	_ZN18HsMenuEventFactory26createInstallationLogEventEv @ 127 NONAME
 	_ZN18HsMenuEventFactory26createPreviewHSWidgetEventEiRK7QStringS2_S2_ @ 128 NONAME
-	_ZN18HsMenuEventFactory27createDeleteCollectionEventEi @ 129 NONAME
-	_ZN18HsMenuEventFactory27createRenameCollectionEventEi @ 130 NONAME
-	_ZN18HsMenuEventFactory28createArrangeCollectionEventEii @ 131 NONAME
-	_ZN18HsMenuEventFactory28createCollectionDeletedEventEv @ 132 NONAME
-	_ZN18HsMenuEventFactory28createOpenInstalledViewEventEv @ 133 NONAME
-	_ZN18HsMenuEventFactory31createUninstallApplicationEventEi @ 134 NONAME
-	_ZN18HsMenuEventFactory32createArrangeAllCollectionsEventEi @ 135 NONAME
-	_ZN18HsMenuEventFactory34createRemoveAppFromCollectionEventEii @ 136 NONAME
-	_ZN18HsMenuEventFactory36createAddAppsFromCollectionViewEventEii @ 137 NONAME
-	_ZN18HsMenuEventFactory38createAddAppsFromApplicationsViewEventEN2Hs15HsSortAttributeEi @ 138 NONAME
-	_ZN18HsMenuEventFactory39createOpenCollectionFromAppLibraryEventEiRK7QString @ 139 NONAME
-	_ZN19HsMenuDialogFactoryD0Ev @ 140 NONAME
-	_ZN19HsMenuDialogFactoryD1Ev @ 141 NONAME
-	_ZN19HsMenuDialogFactoryD2Ev @ 142 NONAME
-	_ZN19HsMessageBoxWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 143 NONAME
-	_ZN19HsMessageBoxWrapper11qt_metacastEPKc @ 144 NONAME
-	_ZN19HsMessageBoxWrapper12setQueryTextERK7QString @ 145 NONAME
-	_ZN19HsMessageBoxWrapper14onDialogClosedEi @ 146 NONAME
-	_ZN19HsMessageBoxWrapper16staticMetaObjectE @ 147 NONAME DATA 16
-	_ZN19HsMessageBoxWrapper19getStaticMetaObjectEv @ 148 NONAME
-	_ZN19HsMessageBoxWrapper4showEv @ 149 NONAME
-	_ZN19HsMessageBoxWrapper5closeEv @ 150 NONAME
-	_ZN19HsMessageBoxWrapper8acceptedEv @ 151 NONAME
-	_ZN19HsMessageBoxWrapper8rejectedEv @ 152 NONAME
-	_ZN19HsMessageBoxWrapper9setHeaderERK7QString @ 153 NONAME
-	_ZN19HsMessageBoxWrapperC1EP7QObject @ 154 NONAME
-	_ZN19HsMessageBoxWrapperC2EP7QObject @ 155 NONAME
-	_ZN19HsMessageBoxWrapperD0Ev @ 156 NONAME
-	_ZN19HsMessageBoxWrapperD1Ev @ 157 NONAME
-	_ZN19HsMessageBoxWrapperD2Ev @ 158 NONAME
-	_ZN19XQAIWGetImageClient10findImagesERK7QStringRK11QStringListRS3_ @ 159 NONAME
-	_ZN19XQAIWGetImageClient11fetchFailedEiRK7QString @ 160 NONAME
-	_ZN19XQAIWGetImageClient11qt_metacallEN11QMetaObject4CallEiPPv @ 161 NONAME
-	_ZN19XQAIWGetImageClient11qt_metacastEPKc @ 162 NONAME
-	_ZN19XQAIWGetImageClient13imageSelectedERK7QString @ 163 NONAME
-	_ZN19XQAIWGetImageClient14fetchCompletedERK7QString @ 164 NONAME
-	_ZN19XQAIWGetImageClient16requestCompletedERK8QVariant @ 165 NONAME
-	_ZN19XQAIWGetImageClient16staticMetaObjectE @ 166 NONAME DATA 16
-	_ZN19XQAIWGetImageClient19getStaticMetaObjectEv @ 167 NONAME
-	_ZN19XQAIWGetImageClient23imageSelectionCancelledEv @ 168 NONAME
-	_ZN19XQAIWGetImageClient5fetchEv @ 169 NONAME
-	_ZN19XQAIWGetImageClientC1Ev @ 170 NONAME
-	_ZN19XQAIWGetImageClientC2Ev @ 171 NONAME
-	_ZN19XQAIWGetImageClientD0Ev @ 172 NONAME
-	_ZN19XQAIWGetImageClientD1Ev @ 173 NONAME
-	_ZN19XQAIWGetImageClientD2Ev @ 174 NONAME
-	_ZN20HsImageFetcherClient11fetchFailedEiRK7QString @ 175 NONAME
-	_ZN20HsImageFetcherClient11handleErrorEiRK7QString @ 176 NONAME
-	_ZN20HsImageFetcherClient11qt_metacallEN11QMetaObject4CallEiPPv @ 177 NONAME
-	_ZN20HsImageFetcherClient11qt_metacastEPKc @ 178 NONAME
-	_ZN20HsImageFetcherClient14fetchCompletedERK7QString @ 179 NONAME
-	_ZN20HsImageFetcherClient16staticMetaObjectE @ 180 NONAME DATA 16
-	_ZN20HsImageFetcherClient19getStaticMetaObjectEv @ 181 NONAME
-	_ZN20HsImageFetcherClient5fetchEv @ 182 NONAME
-	_ZN20HsImageFetcherClient8handleOkERK8QVariant @ 183 NONAME
-	_ZN20HsImageFetcherClientC1EP7QObject @ 184 NONAME
-	_ZN20HsImageFetcherClientC2EP7QObject @ 185 NONAME
-	_ZN20HsImageFetcherClientD0Ev @ 186 NONAME
-	_ZN20HsImageFetcherClientD1Ev @ 187 NONAME
-	_ZN20HsImageFetcherClientD2Ev @ 188 NONAME
-	_ZN21HsAnchorPointInCenter7convertERK6QRectFRK5QListIS0_ES6_RK7QPointF @ 189 NONAME
-	_ZN21HsMenuEventTransition9eventTestEP6QEvent @ 190 NONAME
-	_ZN21HsMenuEventTransitionC1EN11HsMenuEvent13OperationTypeEP6QStateS3_ @ 191 NONAME
-	_ZN21HsMenuEventTransitionC2EN11HsMenuEvent13OperationTypeEP6QStateS3_ @ 192 NONAME
-	_ZN26HsAnchorPointInBottomRight7convertERK6QRectFRK5QListIS0_ES6_RK7QPointF @ 193 NONAME
-	_ZN26HsPropertyAnimationWrapper10setForwardEv @ 194 NONAME
-	_ZN26HsPropertyAnimationWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 195 NONAME
-	_ZN26HsPropertyAnimationWrapper11qt_metacastEPKc @ 196 NONAME
-	_ZN26HsPropertyAnimationWrapper11setBackwardEv @ 197 NONAME
-	_ZN26HsPropertyAnimationWrapper11setDurationEi @ 198 NONAME
-	_ZN26HsPropertyAnimationWrapper11setEndValueERK8QVariant @ 199 NONAME
-	_ZN26HsPropertyAnimationWrapper14setEasingCurveERK12QEasingCurve @ 200 NONAME
-	_ZN26HsPropertyAnimationWrapper15setPropertyNameERK10QByteArray @ 201 NONAME
-	_ZN26HsPropertyAnimationWrapper15setTargetObjectEP7QObject @ 202 NONAME
-	_ZN26HsPropertyAnimationWrapper16staticMetaObjectE @ 203 NONAME DATA 16
-	_ZN26HsPropertyAnimationWrapper19getStaticMetaObjectEv @ 204 NONAME
-	_ZN26HsPropertyAnimationWrapper4stopEv @ 205 NONAME
-	_ZN26HsPropertyAnimationWrapper5startEv @ 206 NONAME
-	_ZN26HsPropertyAnimationWrapper8finishedEv @ 207 NONAME
-	_ZN26HsPropertyAnimationWrapper9isRunningEv @ 208 NONAME
-	_ZN26HsPropertyAnimationWrapperC1EP7QObject @ 209 NONAME
-	_ZN26HsPropertyAnimationWrapperC2EP7QObject @ 210 NONAME
-	_ZN26HsPropertyAnimationWrapperD0Ev @ 211 NONAME
-	_ZN26HsPropertyAnimationWrapperD1Ev @ 212 NONAME
-	_ZN26HsPropertyAnimationWrapperD2Ev @ 213 NONAME
-	_ZN30HsWidgetPositioningOnWidgetAdd11setInstanceEPS_ @ 214 NONAME
-	_ZN30HsWidgetPositioningOnWidgetAdd8instanceEv @ 215 NONAME
-	_ZN30HsWidgetPositioningOnWidgetAdd9mInstanceE @ 216 NONAME DATA 4
-	_ZN31HsWidgetPositioningOnWidgetMove11setInstanceEPS_ @ 217 NONAME
-	_ZN31HsWidgetPositioningOnWidgetMove8instanceEv @ 218 NONAME
-	_ZN31HsWidgetPositioningOnWidgetMove9mInstanceE @ 219 NONAME DATA 4
-	_ZN38HsWidgetPositioningOnOrientationChange11setInstanceEPS_ @ 220 NONAME
-	_ZN38HsWidgetPositioningOnOrientationChange8instanceEv @ 221 NONAME
-	_ZN38HsWidgetPositioningOnOrientationChange9mInstanceE @ 222 NONAME DATA 4
-	_ZN46HsAdvancedWidgetPositioningOnOrientationChange7convertERK6QRectFRK5QListIS0_ES2_ @ 223 NONAME
-	_ZNK10HsSnapLine10metaObjectEv @ 224 NONAME
-	_ZNK10HsSnapLine24isFadeInAnimationRunningEv @ 225 NONAME
-	_ZNK10HsSnapLine25isFadeOutAnimationRunningEv @ 226 NONAME
-	_ZNK11HsMenuEvent4dataEv @ 227 NONAME
-	_ZNK11HsMenuEvent9operationEv @ 228 NONAME
-	_ZNK15HsPageIndicator10metaObjectEv @ 229 NONAME
-	_ZNK15HsPageIndicator15activeItemIndexEv @ 230 NONAME
-	_ZNK15HsPageIndicator18isAnimationRunningEv @ 231 NONAME
-	_ZNK15HsPageIndicator9itemCountEv @ 232 NONAME
-	_ZNK15HsSpinnerDialog10metaObjectEv @ 233 NONAME
-	_ZNK15HsTitleResolver10metaObjectEv @ 234 NONAME
-	_ZNK16HsTrashBinWidget10metaObjectEv @ 235 NONAME
-	_ZNK17HsImageGridWidget10metaObjectEv @ 236 NONAME
-	_ZNK19HsMenuDialogFactory12setUpActionsEP12HbMessageBoxRK11QStringList @ 237 NONAME
-	_ZNK19HsMenuDialogFactory6createERK7QStringNS_7OptionsE @ 238 NONAME
-	_ZNK19HsMessageBoxWrapper10metaObjectEv @ 239 NONAME
-	_ZNK19XQAIWGetImageClient10metaObjectEv @ 240 NONAME
-	_ZNK20HsImageFetcherClient10metaObjectEv @ 241 NONAME
-	_ZNK26HsPropertyAnimationWrapper10metaObjectEv @ 242 NONAME
-	_ZNK26HsPropertyAnimationWrapper9isForwardEv @ 243 NONAME
-	_ZTI10HsSnapLine @ 244 NONAME
-	_ZTI11HsMenuEvent @ 245 NONAME
-	_ZTI13HsSnapToLines @ 246 NONAME
-	_ZTI15HsPageIndicator @ 247 NONAME
-	_ZTI15HsSpinnerDialog @ 248 NONAME
-	_ZTI15HsTitleResolver @ 249 NONAME
-	_ZTI16HsTrashBinWidget @ 250 NONAME
-	_ZTI17HsImageGridWidget @ 251 NONAME
-	_ZTI17HsWidgetOrganizer @ 252 NONAME
-	_ZTI19HsMenuDialogFactory @ 253 NONAME
-	_ZTI19HsMessageBoxWrapper @ 254 NONAME
-	_ZTI19XQAIWGetImageClient @ 255 NONAME
-	_ZTI20HsImageFetcherClient @ 256 NONAME
-	_ZTI21HsAnchorPointInCenter @ 257 NONAME
-	_ZTI21HsMenuEventTransition @ 258 NONAME
-	_ZTI26HsAnchorPointInBottomRight @ 259 NONAME
-	_ZTI26HsPropertyAnimationWrapper @ 260 NONAME
-	_ZTI30HsWidgetPositioningOnWidgetAdd @ 261 NONAME
-	_ZTI31HsWidgetPositioningOnWidgetMove @ 262 NONAME
-	_ZTI38HsWidgetPositioningOnOrientationChange @ 263 NONAME
-	_ZTI46HsAdvancedWidgetPositioningOnOrientationChange @ 264 NONAME
-	_ZTV10HsSnapLine @ 265 NONAME
-	_ZTV11HsMenuEvent @ 266 NONAME
-	_ZTV13HsSnapToLines @ 267 NONAME
-	_ZTV15HsPageIndicator @ 268 NONAME
-	_ZTV15HsSpinnerDialog @ 269 NONAME
-	_ZTV15HsTitleResolver @ 270 NONAME
-	_ZTV16HsTrashBinWidget @ 271 NONAME
-	_ZTV17HsImageGridWidget @ 272 NONAME
-	_ZTV17HsWidgetOrganizer @ 273 NONAME
-	_ZTV19HsMenuDialogFactory @ 274 NONAME
-	_ZTV19HsMessageBoxWrapper @ 275 NONAME
-	_ZTV19XQAIWGetImageClient @ 276 NONAME
-	_ZTV20HsImageFetcherClient @ 277 NONAME
-	_ZTV21HsAnchorPointInCenter @ 278 NONAME
-	_ZTV21HsMenuEventTransition @ 279 NONAME
-	_ZTV26HsAnchorPointInBottomRight @ 280 NONAME
-	_ZTV26HsPropertyAnimationWrapper @ 281 NONAME
-	_ZTV46HsAdvancedWidgetPositioningOnOrientationChange @ 282 NONAME
-	_ZThn16_N15HsPageIndicatorD0Ev @ 283 NONAME
-	_ZThn16_N15HsPageIndicatorD1Ev @ 284 NONAME
-	_ZThn16_N15HsSpinnerDialogD0Ev @ 285 NONAME
-	_ZThn16_N15HsSpinnerDialogD1Ev @ 286 NONAME
-	_ZThn16_N16HsTrashBinWidgetD0Ev @ 287 NONAME
-	_ZThn16_N16HsTrashBinWidgetD1Ev @ 288 NONAME
-	_ZThn16_N17HsImageGridWidgetD0Ev @ 289 NONAME
-	_ZThn16_N17HsImageGridWidgetD1Ev @ 290 NONAME
-	_ZThn8_N10HsSnapLineD0Ev @ 291 NONAME
-	_ZThn8_N10HsSnapLineD1Ev @ 292 NONAME
-	_ZThn8_N15HsPageIndicatorD0Ev @ 293 NONAME
-	_ZThn8_N15HsPageIndicatorD1Ev @ 294 NONAME
-	_ZThn8_N15HsSpinnerDialogD0Ev @ 295 NONAME
-	_ZThn8_N15HsSpinnerDialogD1Ev @ 296 NONAME
-	_ZThn8_N16HsTrashBinWidgetD0Ev @ 297 NONAME
-	_ZThn8_N16HsTrashBinWidgetD1Ev @ 298 NONAME
-	_ZThn8_N17HsImageGridWidgetD0Ev @ 299 NONAME
-	_ZThn8_N17HsImageGridWidgetD1Ev @ 300 NONAME
+	_ZN18HsMenuEventFactory26createUninstallFailedEventEi @ 129 NONAME
+	_ZN18HsMenuEventFactory27createDeleteCollectionEventEi @ 130 NONAME
+	_ZN18HsMenuEventFactory27createRenameCollectionEventEi @ 131 NONAME
+	_ZN18HsMenuEventFactory28createArrangeCollectionEventEii @ 132 NONAME
+	_ZN18HsMenuEventFactory28createCollectionDeletedEventEv @ 133 NONAME
+	_ZN18HsMenuEventFactory28createOpenInstalledViewEventEv @ 134 NONAME
+	_ZN18HsMenuEventFactory31createUninstallApplicationEventEi @ 135 NONAME
+	_ZN18HsMenuEventFactory32createArrangeAllCollectionsEventEi @ 136 NONAME
+	_ZN18HsMenuEventFactory34createRemoveAppFromCollectionEventEii @ 137 NONAME
+	_ZN18HsMenuEventFactory36createAddAppsFromCollectionViewEventEii @ 138 NONAME
+	_ZN18HsMenuEventFactory38createAddAppsFromApplicationsViewEventEN2Hs15HsSortAttributeEi @ 139 NONAME
+	_ZN18HsMenuEventFactory39createOpenCollectionFromAppLibraryEventEiRK7QString @ 140 NONAME
+	_ZN19HsMenuDialogFactoryD0Ev @ 141 NONAME
+	_ZN19HsMenuDialogFactoryD1Ev @ 142 NONAME
+	_ZN19HsMenuDialogFactoryD2Ev @ 143 NONAME
+	_ZN19HsMessageBoxWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 144 NONAME
+	_ZN19HsMessageBoxWrapper11qt_metacastEPKc @ 145 NONAME
+	_ZN19HsMessageBoxWrapper12setQueryTextERK7QString @ 146 NONAME
+	_ZN19HsMessageBoxWrapper14onDialogClosedEi @ 147 NONAME
+	_ZN19HsMessageBoxWrapper16staticMetaObjectE @ 148 NONAME DATA 16
+	_ZN19HsMessageBoxWrapper19getStaticMetaObjectEv @ 149 NONAME
+	_ZN19HsMessageBoxWrapper4showEv @ 150 NONAME
+	_ZN19HsMessageBoxWrapper5closeEv @ 151 NONAME
+	_ZN19HsMessageBoxWrapper8acceptedEv @ 152 NONAME
+	_ZN19HsMessageBoxWrapper8rejectedEv @ 153 NONAME
+	_ZN19HsMessageBoxWrapper9setHeaderERK7QString @ 154 NONAME
+	_ZN19HsMessageBoxWrapperC1EP7QObject @ 155 NONAME
+	_ZN19HsMessageBoxWrapperC2EP7QObject @ 156 NONAME
+	_ZN19HsMessageBoxWrapperD0Ev @ 157 NONAME
+	_ZN19HsMessageBoxWrapperD1Ev @ 158 NONAME
+	_ZN19HsMessageBoxWrapperD2Ev @ 159 NONAME
+	_ZN19XQAIWGetImageClient10findImagesERK7QStringRK11QStringListRS3_ @ 160 NONAME
+	_ZN19XQAIWGetImageClient11fetchFailedEiRK7QString @ 161 NONAME
+	_ZN19XQAIWGetImageClient11qt_metacallEN11QMetaObject4CallEiPPv @ 162 NONAME
+	_ZN19XQAIWGetImageClient11qt_metacastEPKc @ 163 NONAME
+	_ZN19XQAIWGetImageClient13imageSelectedERK7QString @ 164 NONAME
+	_ZN19XQAIWGetImageClient14fetchCompletedERK7QString @ 165 NONAME
+	_ZN19XQAIWGetImageClient16requestCompletedERK8QVariant @ 166 NONAME
+	_ZN19XQAIWGetImageClient16staticMetaObjectE @ 167 NONAME DATA 16
+	_ZN19XQAIWGetImageClient19getStaticMetaObjectEv @ 168 NONAME
+	_ZN19XQAIWGetImageClient23imageSelectionCancelledEv @ 169 NONAME
+	_ZN19XQAIWGetImageClient5fetchEv @ 170 NONAME
+	_ZN19XQAIWGetImageClientC1Ev @ 171 NONAME
+	_ZN19XQAIWGetImageClientC2Ev @ 172 NONAME
+	_ZN19XQAIWGetImageClientD0Ev @ 173 NONAME
+	_ZN19XQAIWGetImageClientD1Ev @ 174 NONAME
+	_ZN19XQAIWGetImageClientD2Ev @ 175 NONAME
+	_ZN20HsImageFetcherClient11fetchFailedEiRK7QString @ 176 NONAME
+	_ZN20HsImageFetcherClient11handleErrorEiRK7QString @ 177 NONAME
+	_ZN20HsImageFetcherClient11qt_metacallEN11QMetaObject4CallEiPPv @ 178 NONAME
+	_ZN20HsImageFetcherClient11qt_metacastEPKc @ 179 NONAME
+	_ZN20HsImageFetcherClient14fetchCompletedERK7QString @ 180 NONAME
+	_ZN20HsImageFetcherClient16staticMetaObjectE @ 181 NONAME DATA 16
+	_ZN20HsImageFetcherClient19getStaticMetaObjectEv @ 182 NONAME
+	_ZN20HsImageFetcherClient5fetchEv @ 183 NONAME
+	_ZN20HsImageFetcherClient8handleOkERK8QVariant @ 184 NONAME
+	_ZN20HsImageFetcherClientC1EP7QObject @ 185 NONAME
+	_ZN20HsImageFetcherClientC2EP7QObject @ 186 NONAME
+	_ZN20HsImageFetcherClientD0Ev @ 187 NONAME
+	_ZN20HsImageFetcherClientD1Ev @ 188 NONAME
+	_ZN20HsImageFetcherClientD2Ev @ 189 NONAME
+	_ZN21HsAnchorPointInCenter7convertERK6QRectFRK5QListIS0_ES6_RK7QPointF @ 190 NONAME
+	_ZN21HsMenuEventTransition9eventTestEP6QEvent @ 191 NONAME
+	_ZN21HsMenuEventTransitionC1EN11HsMenuEvent13OperationTypeEP6QStateS3_ @ 192 NONAME
+	_ZN21HsMenuEventTransitionC2EN11HsMenuEvent13OperationTypeEP6QStateS3_ @ 193 NONAME
+	_ZN26HsAnchorPointInBottomRight7convertERK6QRectFRK5QListIS0_ES6_RK7QPointF @ 194 NONAME
+	_ZN26HsPropertyAnimationWrapper10setForwardEv @ 195 NONAME
+	_ZN26HsPropertyAnimationWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 196 NONAME
+	_ZN26HsPropertyAnimationWrapper11qt_metacastEPKc @ 197 NONAME
+	_ZN26HsPropertyAnimationWrapper11setBackwardEv @ 198 NONAME
+	_ZN26HsPropertyAnimationWrapper11setDurationEi @ 199 NONAME
+	_ZN26HsPropertyAnimationWrapper11setEndValueERK8QVariant @ 200 NONAME
+	_ZN26HsPropertyAnimationWrapper14setEasingCurveERK12QEasingCurve @ 201 NONAME
+	_ZN26HsPropertyAnimationWrapper15setPropertyNameERK10QByteArray @ 202 NONAME
+	_ZN26HsPropertyAnimationWrapper15setTargetObjectEP7QObject @ 203 NONAME
+	_ZN26HsPropertyAnimationWrapper16staticMetaObjectE @ 204 NONAME DATA 16
+	_ZN26HsPropertyAnimationWrapper19getStaticMetaObjectEv @ 205 NONAME
+	_ZN26HsPropertyAnimationWrapper4stopEv @ 206 NONAME
+	_ZN26HsPropertyAnimationWrapper5startEv @ 207 NONAME
+	_ZN26HsPropertyAnimationWrapper8finishedEv @ 208 NONAME
+	_ZN26HsPropertyAnimationWrapper9isRunningEv @ 209 NONAME
+	_ZN26HsPropertyAnimationWrapperC1EP7QObject @ 210 NONAME
+	_ZN26HsPropertyAnimationWrapperC2EP7QObject @ 211 NONAME
+	_ZN26HsPropertyAnimationWrapperD0Ev @ 212 NONAME
+	_ZN26HsPropertyAnimationWrapperD1Ev @ 213 NONAME
+	_ZN26HsPropertyAnimationWrapperD2Ev @ 214 NONAME
+	_ZN30HsWidgetPositioningOnWidgetAdd11setInstanceEPS_ @ 215 NONAME
+	_ZN30HsWidgetPositioningOnWidgetAdd8instanceEv @ 216 NONAME
+	_ZN30HsWidgetPositioningOnWidgetAdd9mInstanceE @ 217 NONAME DATA 4
+	_ZN31HsWidgetPositioningOnWidgetMove11setInstanceEPS_ @ 218 NONAME
+	_ZN31HsWidgetPositioningOnWidgetMove8instanceEv @ 219 NONAME
+	_ZN31HsWidgetPositioningOnWidgetMove9mInstanceE @ 220 NONAME DATA 4
+	_ZN38HsWidgetPositioningOnOrientationChange11setInstanceEPS_ @ 221 NONAME
+	_ZN38HsWidgetPositioningOnOrientationChange8instanceEv @ 222 NONAME
+	_ZN38HsWidgetPositioningOnOrientationChange9mInstanceE @ 223 NONAME DATA 4
+	_ZN46HsAdvancedWidgetPositioningOnOrientationChange7convertERK6QRectFRK5QListIS0_ES2_ @ 224 NONAME
+	_ZNK10HsSnapLine10metaObjectEv @ 225 NONAME
+	_ZNK10HsSnapLine24isFadeInAnimationRunningEv @ 226 NONAME
+	_ZNK10HsSnapLine25isFadeOutAnimationRunningEv @ 227 NONAME
+	_ZNK11HsMenuEvent4dataEv @ 228 NONAME
+	_ZNK11HsMenuEvent9operationEv @ 229 NONAME
+	_ZNK15HsPageIndicator10metaObjectEv @ 230 NONAME
+	_ZNK15HsPageIndicator15activeItemIndexEv @ 231 NONAME
+	_ZNK15HsPageIndicator18isAnimationRunningEv @ 232 NONAME
+	_ZNK15HsPageIndicator9itemCountEv @ 233 NONAME
+	_ZNK15HsSpinnerDialog10metaObjectEv @ 234 NONAME
+	_ZNK15HsTitleResolver10metaObjectEv @ 235 NONAME
+	_ZNK16HsTrashBinWidget10metaObjectEv @ 236 NONAME
+	_ZNK17HsImageGridWidget10metaObjectEv @ 237 NONAME
+	_ZNK19HsMenuDialogFactory12setUpActionsEP12HbMessageBoxRK11QStringList @ 238 NONAME
+	_ZNK19HsMenuDialogFactory6createERK7QStringNS_7OptionsE @ 239 NONAME
+	_ZNK19HsMessageBoxWrapper10metaObjectEv @ 240 NONAME
+	_ZNK19XQAIWGetImageClient10metaObjectEv @ 241 NONAME
+	_ZNK20HsImageFetcherClient10metaObjectEv @ 242 NONAME
+	_ZNK26HsPropertyAnimationWrapper10metaObjectEv @ 243 NONAME
+	_ZNK26HsPropertyAnimationWrapper9isForwardEv @ 244 NONAME
+	_ZTI10HsSnapLine @ 245 NONAME
+	_ZTI11HsMenuEvent @ 246 NONAME
+	_ZTI13HsSnapToLines @ 247 NONAME
+	_ZTI15HsPageIndicator @ 248 NONAME
+	_ZTI15HsSpinnerDialog @ 249 NONAME
+	_ZTI15HsTitleResolver @ 250 NONAME
+	_ZTI16HsTrashBinWidget @ 251 NONAME
+	_ZTI17HsImageGridWidget @ 252 NONAME
+	_ZTI17HsWidgetOrganizer @ 253 NONAME
+	_ZTI19HsMenuDialogFactory @ 254 NONAME
+	_ZTI19HsMessageBoxWrapper @ 255 NONAME
+	_ZTI19XQAIWGetImageClient @ 256 NONAME
+	_ZTI20HsImageFetcherClient @ 257 NONAME
+	_ZTI21HsAnchorPointInCenter @ 258 NONAME
+	_ZTI21HsMenuEventTransition @ 259 NONAME
+	_ZTI26HsAnchorPointInBottomRight @ 260 NONAME
+	_ZTI26HsPropertyAnimationWrapper @ 261 NONAME
+	_ZTI30HsWidgetPositioningOnWidgetAdd @ 262 NONAME
+	_ZTI31HsWidgetPositioningOnWidgetMove @ 263 NONAME
+	_ZTI38HsWidgetPositioningOnOrientationChange @ 264 NONAME
+	_ZTI46HsAdvancedWidgetPositioningOnOrientationChange @ 265 NONAME
+	_ZTV10HsSnapLine @ 266 NONAME
+	_ZTV11HsMenuEvent @ 267 NONAME
+	_ZTV13HsSnapToLines @ 268 NONAME
+	_ZTV15HsPageIndicator @ 269 NONAME
+	_ZTV15HsSpinnerDialog @ 270 NONAME
+	_ZTV15HsTitleResolver @ 271 NONAME
+	_ZTV16HsTrashBinWidget @ 272 NONAME
+	_ZTV17HsImageGridWidget @ 273 NONAME
+	_ZTV17HsWidgetOrganizer @ 274 NONAME
+	_ZTV19HsMenuDialogFactory @ 275 NONAME
+	_ZTV19HsMessageBoxWrapper @ 276 NONAME
+	_ZTV19XQAIWGetImageClient @ 277 NONAME
+	_ZTV20HsImageFetcherClient @ 278 NONAME
+	_ZTV21HsAnchorPointInCenter @ 279 NONAME
+	_ZTV21HsMenuEventTransition @ 280 NONAME
+	_ZTV26HsAnchorPointInBottomRight @ 281 NONAME
+	_ZTV26HsPropertyAnimationWrapper @ 282 NONAME
+	_ZTV46HsAdvancedWidgetPositioningOnOrientationChange @ 283 NONAME
+	_ZThn16_N15HsPageIndicatorD0Ev @ 284 NONAME
+	_ZThn16_N15HsPageIndicatorD1Ev @ 285 NONAME
+	_ZThn16_N15HsSpinnerDialogD0Ev @ 286 NONAME
+	_ZThn16_N15HsSpinnerDialogD1Ev @ 287 NONAME
+	_ZThn16_N16HsTrashBinWidgetD0Ev @ 288 NONAME
+	_ZThn16_N16HsTrashBinWidgetD1Ev @ 289 NONAME
+	_ZThn16_N17HsImageGridWidgetD0Ev @ 290 NONAME
+	_ZThn16_N17HsImageGridWidgetD1Ev @ 291 NONAME
+	_ZThn8_N10HsSnapLineD0Ev @ 292 NONAME
+	_ZThn8_N10HsSnapLineD1Ev @ 293 NONAME
+	_ZThn8_N15HsPageIndicatorD0Ev @ 294 NONAME
+	_ZThn8_N15HsPageIndicatorD1Ev @ 295 NONAME
+	_ZThn8_N15HsSpinnerDialogD0Ev @ 296 NONAME
+	_ZThn8_N15HsSpinnerDialogD1Ev @ 297 NONAME
+	_ZThn8_N16HsTrashBinWidgetD0Ev @ 298 NONAME
+	_ZThn8_N16HsTrashBinWidgetD1Ev @ 299 NONAME
+	_ZThn8_N17HsImageGridWidgetD0Ev @ 300 NONAME
+	_ZThn8_N17HsImageGridWidgetD1Ev @ 301 NONAME
 
--- a/homescreenapp/hsutils/inc/hsmenuevent.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hsutils/inc/hsmenuevent.h	Fri Sep 17 08:27:54 2010 +0300
@@ -52,6 +52,7 @@
         ShowAppSettings,
         ShowAppDetails,
         ShowInstallationLog,
+        UninstallationFailed,
         Unknown
     };
 
--- a/homescreenapp/hsutils/inc/hsmenueventfactory.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hsutils/inc/hsmenueventfactory.h	Fri Sep 17 08:27:54 2010 +0300
@@ -90,6 +90,8 @@
     static QEvent *createAppDetailsViewEvent(int entryId);
     
     static QEvent *createInstallationLogEvent();
+    
+    static QEvent *createUninstallFailedEvent(int error);
 
     static QEvent *createUnknownEvent();
 
--- a/homescreenapp/hsutils/src/hsmenueventfactory.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hsutils/src/hsmenueventfactory.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -336,6 +336,18 @@
 }
 
 /*!
+    Creates an HsMenuEvent::createUninstallationFailedEvent event.
+	\param error Uninstallation error.
+    \return Event for uninstall failed.
+*/
+QEvent *HsMenuEventFactory::createUninstallFailedEvent(int error)
+{
+    QVariantMap params;
+    params.insert(Hs::uninstallError, error);
+    return new HsMenuEvent(HsMenuEvent::UninstallationFailed, params);
+}
+
+/*!
     Creates an HsMenuEvent::Unknown event.
 
     \return Unknown event.
--- a/homescreenapp/hsutils/src/hspageindicator.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hsutils/src/hspageindicator.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -136,7 +136,10 @@
 */
 bool HsPageIndicator::isAnimationRunning() const
 {
-    return mItems.at(mActiveItemIndex)->isAnimationRunning();
+    if (0 <= mActiveItemIndex && mActiveItemIndex <= itemCount()){
+        return mItems.at(mActiveItemIndex)->isAnimationRunning();
+    }
+    return false;
 }
 
 /*!
--- a/homescreenapp/inc/hsapp_defs.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/inc/hsapp_defs.h	Fri Sep 17 08:27:54 2010 +0300
@@ -44,6 +44,7 @@
     const char menuModeType[] = "menu_mode_type";
     const char swTypeKey[] = "apptype";
     const char javaSwType[] = "java";
+    const char uninstallError[] = "uninstall_error";
     static const char *const HS_CWRT_APP_TYPE="cwrt";
     static const char *const HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE=
         "wrtwidgetuiplugin";
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/rom/bld.inf	Fri Sep 17 08:27:54 2010 +0300
@@ -0,0 +1,35 @@
+/*
+* ==============================================================================
+*  Name        : bld.inf
+*  Part of     :
+*  Description : This is a top level bld file to generate all libraries.
+*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2 of the License, or (at your option) any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the
+* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+* Boston, MA 02111-1307, USA.
+*
+* Description : This is a top level bld file to export the data and ROM files
+*
+*/
+
+
+#include <platform_paths.hrh>
+
+PRJ_EXPORTS
+
+homescreenapp_core.iby CORE_APP_LAYER_IBY_EXPORT_PATH(homescreenapp_core.iby)
+homescreenapp_resources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(homescreenapp_resources.iby)
+
--- a/homescreenapp/rom/homescreenapp_core.iby	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/rom/homescreenapp_core.iby	Fri Sep 17 08:27:54 2010 +0300
@@ -11,15 +11,13 @@
 *
 * Contributors:
 *
-* Description:
+* Description: homescreen core iby file
 *
 */
 #ifndef __HOMESCREENAPP_CORE_IBY__
 #define __HOMESCREENAPP_CORE_IBY__
 
-
 // ---- hsapplication --------------------------------------------
-
 file=ABI_DIR\BUILD_DIR\hsapplicationlauncher.exe                PROGRAMS_DIR\hsapplicationlauncher.exe
 file=ABI_DIR\BUILD_DIR\hsapplication.exe                        PROGRAMS_DIR\hsapplication.exe
 data=ZPRIVATE\10003a3f\import\apps\hsapplication_reg.rsc        private\10003a3f\import\apps\hsapplication_reg.rsc
@@ -45,22 +43,20 @@
 data=\epoc32\data\z\resource\apps\hswidgetuninstaller.rsc resource\apps\hswidgetuninstaller.rsc
 
 // ---- hsutils --------------------------------------------
-
 file=ABI_DIR\BUILD_DIR\hsutils.dll  SHARED_LIB_DIR\hsutils.dll
 
 // ---- hsdomainmodel --------------------------------------------
+file=ABI_DIR\BUILD_DIR\hsdomainmodel.dll  SHARED_LIB_DIR\hsdomainmodel.dll
 
-file=ABI_DIR\BUILD_DIR\hsdomainmodel.dll  SHARED_LIB_DIR\hsdomainmodel.dll
+// ---- Client plugins --------------------------------------------
 
 // -------- hshomescreenclientplugin
 file=ABI_DIR\BUILD_DIR\hshomescreenclientplugin.dll                        SHARED_LIB_DIR\hshomescreenclientplugin.dll
 data=\epoc32\data\z\resource\qt\plugins\hshomescreenclientplugin.qtplugin  resource\qt\plugins\hshomescreenclientplugin.qtplugin
-data=ZPRIVATE\20022f35\hshomescreenclientplugin.xml                        private\20022f35\hshomescreenclientplugin.xml
 
-
-
-
-
+// -------- hsmenuclientplugin
+file=ABI_DIR\BUILD_DIR\hsmenuclientplugin.dll                           SHARED_LIB_DIR\hsmenuclientplugin.dll
+data=\epoc32\data\z\resource\qt\plugins\hsmenuclientplugin.qtplugin     resource\qt\plugins\hsmenuclientplugin.qtplugin
 
 // ---- serviceproviders --------------------------------------------
 
@@ -71,41 +67,28 @@
 
 // -------- hsapplibrarystateplugin
 file=ABI_DIR\BUILD_DIR\hsapplibrarystateplugin.dll                            SHARED_LIB_DIR\hsapplibrarystateplugin.dll
-data=ZPRIVATE\20022f35\plugins\stateplugins\hsapplibrarystateplugin.qtplugin  private\20022f35\plugins\stateplugins\hsapplibrarystateplugin.qtplugin
-data=ZPRIVATE\20022f35\plugins\stateplugins\hsapplibrarystateplugin.xml       private\20022f35\plugins\stateplugins\hsapplibrarystateplugin.xml
+data=DATAZ_\RESOURCE_FILES_DIR\qt\plugins\homescreen\hsapplibrarystateplugin.qtplugin  RESOURCE_FILES_DIR\qt\plugins\homescreen\hsapplibrarystateplugin.qtplugin
 
 // -------- hshomescreenstateplugin
 file=ABI_DIR\BUILD_DIR\hshomescreenstateplugin.dll                            SHARED_LIB_DIR\hshomescreenstateplugin.dll
-data=ZPRIVATE\20022f35\plugins\stateplugins\hshomescreenstateplugin.qtplugin  private\20022f35\plugins\stateplugins\hshomescreenstateplugin.qtplugin
-data=ZPRIVATE\20022f35\plugins\stateplugins\hshomescreenstateplugin.xml       private\20022f35\plugins\stateplugins\hshomescreenstateplugin.xml
+data=DATAZ_\RESOURCE_FILES_DIR\qt\plugins\homescreen\hshomescreenstateplugin.qtplugin  RESOURCE_FILES_DIR\qt\plugins\homescreen\hshomescreenstateplugin.qtplugin
 
 // -------- hsmenuworkerstateplugin
 file=ABI_DIR\BUILD_DIR\hsmenuworkerstateplugin.dll                            SHARED_LIB_DIR\hsmenuworkerstateplugin.dll
-data=ZPRIVATE\20022f35\plugins\stateplugins\hsmenuworkerstateplugin.qtplugin  private\20022f35\plugins\stateplugins\hsmenuworkerstateplugin.qtplugin
-data=ZPRIVATE\20022f35\plugins\stateplugins\hsmenuworkerstateplugin.xml       private\20022f35\plugins\stateplugins\hsmenuworkerstateplugin.xml
+data=DATAZ_\RESOURCE_FILES_DIR\qt\plugins\homescreen\hsmenuworkerstateplugin.qtplugin  RESOURCE_FILES_DIR\qt\plugins\homescreen\hsmenuworkerstateplugin.qtplugin
 
 // ---- widgetplugins --------------------------------------------
 
 // -------- hsshortcutwidgetplugin
 file=ABI_DIR\BUILD_DIR\hsshortcutwidgetplugin.dll                                      SHARED_LIB_DIR\hsshortcutwidgetplugin.dll
-data=ZPRIVATE\20022F35\import\widgetregistry\20022F46\hsshortcutwidgetplugin.qtplugin  private\20022f35\import\widgetregistry\20022F46\hsshortcutwidgetplugin.qtplugin
+data=DATAZ_\RESOURCE_FILES_DIR\qt\plugins\homescreen\hsshortcutwidgetplugin.qtplugin  RESOURCE_FILES_DIR\qt\plugins\homescreen\hsshortcutwidgetplugin.qtplugin
 data=ZPRIVATE\20022F35\import\widgetregistry\20022F46\hsshortcutwidgetplugin.manifest  private\20022f35\import\widgetregistry\20022F46\hsshortcutwidgetplugin.manifest
-data=ZPRIVATE\20022F35\import\widgetregistry\20022F46\hsshortcutwidgetplugin.xml       private\20022f35\import\widgetregistry\20022F46\hsshortcutwidgetplugin.xml
 
 // -------- hsclockwidgetplugin
 file=ABI_DIR\BUILD_DIR\hsclockwidgetplugin.dll                                         SHARED_LIB_DIR\hsclockwidgetplugin.dll
-data=ZPRIVATE\20022f35\import\widgetregistry\20022F6C\hsclockwidgetplugin.qtplugin     private\20022f35\import\widgetregistry\20022F6C\hsclockwidgetplugin.qtplugin
+data=DATAZ_\RESOURCE_FILES_DIR\qt\plugins\homescreen\hsclockwidgetplugin.qtplugin  RESOURCE_FILES_DIR\qt\plugins\homescreen\hsclockwidgetplugin.qtplugin
 data=ZPRIVATE\20022f35\import\widgetregistry\20022F6C\hsclockwidgetplugin.manifest     private\20022f35\import\widgetregistry\20022F6C\hsclockwidgetplugin.manifest
 data=ZPRIVATE\20022f35\import\widgetregistry\20022F6C\tclock.png                       private\20022f35\import\widgetregistry\20022F6C\tclock.png
 data=ZPRIVATE\20022f35\import\widgetregistry\20022F6C\qtg_graf_hswidget_preview_clock.svg  private\20022f35\import\widgetregistry\20022F6C\qtg_graf_hswidget_preview_clock.svg
-data=ZPRIVATE\20022f35\import\widgetregistry\20022F6C\hsclockwidgetplugin.xml          private\20022f35\import\widgetregistry\20022F6C\hsclockwidgetplugin.xml
-
-// ---- IMenuClient --------------------------------------------
-
-// -------- hsmenuclientplugin
-file=ABI_DIR\BUILD_DIR\hsmenuclientplugin.dll                           SHARED_LIB_DIR\hsmenuclientplugin.dll
-data=\epoc32\data\z\resource\qt\plugins\hsmenuclientplugin.qtplugin     resource\qt\plugins\hsmenuclientplugin.qtplugin
-data=ZPRIVATE\20022f35\hsmenuclientplugin.xml                           private\20022f35\hsmenuclientplugin.xml
-
 
 #endif //__HOMESCREENAPP_CORE_IBY__
--- a/homescreenapp/rom/homescreenapp_resources.iby	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/rom/homescreenapp_resources.iby	Fri Sep 17 08:27:54 2010 +0300
@@ -11,11 +11,11 @@
 *
 * Contributors:
 *
-* Description:
+* Description: homescreen resources iby file
 *
 */
-#ifndef __HOMESCREENAPP_RESOURCE_IBY__
-#define __HOMESCREENAPP_RESOURCE_IBY__
+#ifndef __HOMESCREENAPP_RESOURCES_IBY__
+#define __HOMESCREENAPP_RESOURCES_IBY__
 
 #include <data_caging_paths_for_iby.hrh> 
 
@@ -25,5 +25,8 @@
 // -------- hsapplibrarystateplugin
 data=DATAZ_\QT_TRANSLATIONS_DIR\hsapplibrary.qm     QT_TRANSLATIONS_DIR\hsapplibrary.qm
 
-data=\epoc32\data\z\resource\apps\hsapplication.rsc       resource\apps\hsapplication.rsc
-#endif //__HOMESCREENAPP_LANGUAGE_IBY__
+data=\epoc32\data\z\resource\apps\hsapplication.rsc resource\apps\hsapplication.rsc
+
+data=ZPRIVATE\20022f35\backup_registration.xml      private\20022f35\backup_registration.xml
+
+#endif //__HOMESCREENAPP_RESOURCES_IBY__
--- a/homescreenapp/serviceproviders/hsmenuserviceprovider/bwins/hsmenuserviceprovideru.def	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/bwins/hsmenuserviceprovideru.def	Fri Sep 17 08:27:54 2010 +0300
@@ -25,12 +25,12 @@
 	?organizeCollection@HsMenuService@@SA_NHAAV?$QList@H@@@Z @ 24 NONAME ; bool HsMenuService::organizeCollection(int, class QList<int> &)
 	?getInstalledModel@HsMenuService@@SAPAVHsMenuItemModel@@W4HsSortAttribute@Hs@@@Z @ 25 NONAME ; class HsMenuItemModel * HsMenuService::getInstalledModel(enum Hs::HsSortAttribute)
 	?metaObject@HsMenuItemModel@@UBEPBUQMetaObject@@XZ @ 26 NONAME ; struct QMetaObject const * HsMenuItemModel::metaObject(void) const
-	?executeAction@HsMenuService@@SAHHABVQString@@@Z @ 27 NONAME ; int HsMenuService::executeAction(int, class QString const &)
-	?tr@HsMenuEntryRemovedHandler@@SA?AVQString@@PBD0@Z @ 28 NONAME ; class QString HsMenuEntryRemovedHandler::tr(char const *, char const *)
-	?createCollection@HsMenuService@@SAHABVQString@@@Z @ 29 NONAME ; int HsMenuService::createCollection(class QString const &)
-	?data@HsMenuItemModel@@UBE?AVQVariant@@ABVQModelIndex@@H@Z @ 30 NONAME ; class QVariant HsMenuItemModel::data(class QModelIndex const &, int) const
-	?launchSoftwareUpdate@HsMenuService@@SAHXZ @ 31 NONAME ; int HsMenuService::launchSoftwareUpdate(void)
-	?getStaticMetaObject@HsMenuItemModel@@SAABUQMetaObject@@XZ @ 32 NONAME ; struct QMetaObject const & HsMenuItemModel::getStaticMetaObject(void)
+	?tr@HsMenuEntryRemovedHandler@@SA?AVQString@@PBD0@Z @ 27 NONAME ; class QString HsMenuEntryRemovedHandler::tr(char const *, char const *)
+	?createCollection@HsMenuService@@SAHABVQString@@@Z @ 28 NONAME ; int HsMenuService::createCollection(class QString const &)
+	?data@HsMenuItemModel@@UBE?AVQVariant@@ABVQModelIndex@@H@Z @ 29 NONAME ; class QVariant HsMenuItemModel::data(class QModelIndex const &, int) const
+	?launchSoftwareUpdate@HsMenuService@@SAHXZ @ 30 NONAME ; int HsMenuService::launchSoftwareUpdate(void)
+	?getStaticMetaObject@HsMenuItemModel@@SAABUQMetaObject@@XZ @ 31 NONAME ; struct QMetaObject const & HsMenuItemModel::getStaticMetaObject(void)
+	?executeAction@HsMenuService@@SAHHABVQString@@PAVQObject@@PBD@Z @ 32 NONAME ; int HsMenuService::executeAction(int, class QString const &, class QObject *, char const *)
 	?touch@HsMenuService@@SAXABV?$QList@H@@@Z @ 33 NONAME ; void HsMenuService::touch(class QList<int> const &)
 	?getSecondLine@HsMenuCollectionsItemModel@@ABE?AVQString@@PBVCaEntry@@@Z @ 34 NONAME ; class QString HsMenuCollectionsItemModel::getSecondLine(class CaEntry const *) const
 	?sortOrder@HsMenuServiceUtils@@SA?AW4SortOrder@Qt@@W4HsSortAttribute@Hs@@@Z @ 35 NONAME ; enum Qt::SortOrder HsMenuServiceUtils::sortOrder(enum Hs::HsSortAttribute)
--- a/homescreenapp/serviceproviders/hsmenuserviceprovider/eabi/hsmenuserviceprovideru.def	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/eabi/hsmenuserviceprovideru.def	Fri Sep 17 08:27:54 2010 +0300
@@ -1,5 +1,5 @@
 EXPORTS
-	_ZN13HsMenuService13executeActionEiRK7QString @ 1 NONAME
+	_ZN13HsMenuService13executeActionEiRK7QStringP7QObjectPKc @ 1 NONAME
 	_ZN13HsMenuService16allCollectionsIdEv @ 2 NONAME
 	_ZN13HsMenuService16createCollectionERK7QString @ 3 NONAME
 	_ZN13HsMenuService16removeCollectionEi @ 4 NONAME
--- a/homescreenapp/serviceproviders/hsmenuserviceprovider/inc/hsmenuservice.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/inc/hsmenuservice.h	Fri Sep 17 08:27:54 2010 +0300
@@ -48,8 +48,10 @@
             const QString &collectionType = Hs::collectionTypeName);
     static QStringList getCollectionNames();
     static QString getName(int entryId);
-    static int executeAction(int entryId, const QString &actionName =
-                                  Hs::openActionIdentifier);
+    static int executeAction(int entryId,
+            const QString &actionName = Hs::openActionIdentifier, 
+            QObject* receiver = NULL,
+            const char* member = NULL);
     static bool launchTaskSwitcher();
 
     static int createCollection(const QString &name);
--- a/homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenuservice.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenuservice.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -182,11 +182,13 @@
  \param actionName string with action name
  \retval int error code, 0 if no error
  */
-int HsMenuService::executeAction(int entryId, const QString &actionName)
+int HsMenuService::executeAction(int entryId, const QString &actionName, 
+        QObject* receiver, const char* member)
 {
     qDebug() << "HsMenuService::executeAction entryId:" << entryId
              << "actionName:" << actionName;
-    return CaService::instance()->executeCommand(entryId, actionName);
+    return CaService::instance()->executeCommand(
+            entryId, actionName, receiver, member);
 }
 
 /*!
@@ -380,12 +382,7 @@
 void HsMenuService::touch(int entryId)
 {
     QSharedPointer<CaEntry> entry = CaService::instance()->getEntry(entryId);
-    if (entry->flags() & RemovableEntryFlag &&
-        (entry->flags() & UsedEntryFlag) == 0 &&
-        entry->role() == ItemEntryRole &&
-        entry->entryTypeName() != QString(Hs::packageTypeName)) {
-            CaService::instance()->touch(* entry);
-    }
+    CaService::instance()->touch(* entry);
 }
 
 /*!
--- a/homescreenapp/sis/homescreenapp.pkg	Thu Sep 02 20:17:27 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +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
-#{"homescreenapp"},(0x20022F47),1,0,0
-
-; Localised Vendor name
-%{"Nokia"}
-
-; Unique Vendor name
-:"Nokia"
-
-; Supports S60 5th Edition
-[0x1028315F], 0, 0, 0, {"S60ProductID"}
-
-
-; ---- hsapplication --------------------------------------------
-
-"/epoc32/release/armv5/urel/hsapplication.exe" - "c:/sys/bin/hsapplication.exe"
-"/epoc32/data/z/private/10003a3f/import/apps/hsapplication_reg.rsc" - "c:/private/10003a3f/import/apps/hsapplication_reg.rsc"
-"/epoc32/data/z/resource/apps/hsapplication.rsc" - "c:/resource/apps/hsapplication.rsc"
-"/epoc32/data/z/resource/apps/hsapplication.mif" - "c:/resource/apps/hsapplication.mif"
-"/epoc32/data/z/private/20022F35/homescreen.db"  - "c:/private/20022f35/homescreen.db"
-"/epoc32/data/z/private/20022f35/wallpapers/1_portrait.png" - "c:/private/20022f35/wallpapers/1_portrait.png"
-"/epoc32/data/z/private/20022f35/wallpapers/1_landscape.png" - "c:/private/20022f35/wallpapers/1_landscape.png"
-"/epoc32/data/z/private/20022f35/wallpapers/2_portrait.png" - "c:/private/20022f35/wallpapers/2_portrait.png"
-"/epoc32/data/z/private/20022f35/wallpapers/2_landscape.png" - "c:/private/20022f35/wallpapers/2_landscape.png"
-"/epoc32/data/z/private/20022f35/wallpapers/3_portrait.png" - "c:/private/20022f35/wallpapers/3_portrait.png"
-"/epoc32/data/z/private/20022f35/wallpapers/3_landscape.png" - "c:/private/20022f35/wallpapers/3_landscape.png"
-"/epoc32/data/z/private/20022f35/wallpapers/d_portrait.png" - "c:/private/20022f35/wallpapers/d_portrait.png"
-"/epoc32/data/z/private/20022f35/wallpapers/d_landscape.png" - "c:/private/20022f35/wallpapers/d_landscape.png"
-"/epoc32/data/z/data/images/kqtihswallpapers/bg_1.png" - "c:/data/images/kqtihswallpapers/bg_1.png"
-"/epoc32/data/z/data/images/kqtihswallpapers/bg_2.png" - "c:/data/images/kqtihswallpapers/bg_2.png"
-"/epoc32/data/z/data/images/kqtihswallpapers/bg_3.png" - "c:/data/images/kqtihswallpapers/bg_3.png"
-"/epoc32/data/z/data/images/kqtihswallpapers/bg_4.png" - "c:/data/images/kqtihswallpapers/bg_4.png"
-"/epoc32/data/z/resource/homescreen.qm" - "c:/resource/homescreen.qm"
-
-; ---- hsutils --------------------------------------------
-
-"/epoc32/release/armv5/urel/hsutils.dll" - "c:/sys/bin/hsutils.dll"
-
-; ---- hsdomainmodel --------------------------------------------
-
-"/epoc32/release/armv5/urel/hsdomainmodel.dll" - "c:/sys/bin/hsdomainmodel.dll"
-
-; ---- serviceproviders --------------------------------------------
-
-; -------- hsmenuserviceprovider
-"/epoc32/release/armv5/urel/hsmenuserviceprovider.dll" - "c:/sys/bin/hsmenuserviceprovider.dll"
-
-; ---- stateplugins --------------------------------------------
-
-; -------- hsapplibrarystateplugin
-"/epoc32/release/armv5/urel/hsapplibrarystateplugin.dll" - "c:/sys/bin/hsapplibrarystateplugin.dll"
-"/epoc32/data/z/hsresources/plugins/stateplugins/hsapplibrarystateplugin.qtplugin" - "c:/hsresources/plugins/stateplugins/hsapplibrarystateplugin.qtplugin"
-"/epoc32/data/z/hsresources/plugins/stateplugins/hsapplibrarystateplugin.xml" - "c:/hsresources/plugins/stateplugins/hsapplibrarystateplugin.xml"
-"/epoc32/data/z/resource/qt/translations/hsapplibrary.qm" - "c:/resource/qt/translations/hsapplibrary.qm"
-
-; -------- hshomescreenstateplugin
-"/epoc32/release/armv5/urel/hshomescreenstateplugin.dll" - "c:/sys/bin/hshomescreenstateplugin.dll"
-"/epoc32/data/z/hsresources/plugins/stateplugins/hshomescreenstateplugin.qtplugin" - "c:/hsresources/plugins/stateplugins/hshomescreenstateplugin.qtplugin"
-"/epoc32/data/z/hsresources/plugins/stateplugins/hshomescreenstateplugin.xml" - "c:/hsresources/plugins/stateplugins/hshomescreenstateplugin.xml"
-
-; -------- hsmenuworkerstateplugin
-"/epoc32/release/armv5/urel/hsmenuworkerstateplugin.dll"     - "c:/sys/bin/hsmenuworkerstateplugin.dll"
-"/epoc32/data/z/hsresources/plugins/stateplugins/hsmenuworkerstateplugin.qtplugin" - "c:/hsresources/plugins/stateplugins/hsmenuworkerstateplugin.qtplugin"
-"/epoc32/data/z/hsresources/plugins/stateplugins/hsmenuworkerstateplugin.xml"  - "c:/hsresources/plugins/stateplugins/hsmenuworkerstateplugin.xml"
-
-; ---- widgetplugins --------------------------------------------
-
-; -------- hsshortcutwidgetplugin
-"/epoc32/release/armv5/urel/hsshortcutwidgetplugin.dll"  - "c:/sys/bin/hsshortcutwidgetplugin.dll"
-"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F46/hsshortcutwidgetplugin.qtplugin" - "c:/private/20022F35/import/widgetregistry/20022F46/hsshortcutwidgetplugin.qtplugin"
-"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F46/hsshortcutwidgetplugin.manifest"  - "c:/private/20022F35/import/widgetregistry/20022F46/hsshortcutwidgetplugin.manifest"
-
-; -------- hsclockwidgetplugin
-"/epoc32/release/armv5/urel/hsclockwidgetplugin.dll"  - "c:/sys/bin/hsclockwidgetplugin.dll"
-"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F43/hsclockwidgetplugin.qtplugin" - "c:/private/20022F35/import/widgetregistry/20022F43/hsclockwidgetplugin.qtplugin"
-"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F43/hsclockwidgetplugin.manifest"  - "c:/private/20022F35/import/widgetregistry/20022F43/hsclockwidgetplugin.manifest"
-"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F43/clock.png"  - "c:/private/20022F35/import/widgetregistry/20022F43/clock.png"
--- a/homescreenapp/sis/homescreenapp_sisx.bat	Thu Sep 02 20:17:27 2010 +0300
+++ /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 homescreenapp.sisx del homescreenapp.sisx
-
-makesis homescreenapp.pkg
-signsis homescreenapp.sis homescreenapp.sisx rd.cer rd-key.pem
-
-if exist homescreenapp.sisx (
-echo homescreenapp.sisx creation SUCCEEDED
-del homescreenapp.sis
-)
-
-if not exist homescreenapp.sisx (
-echo homescreenapp.sisx creation FAILED
-)
\ No newline at end of file
--- a/homescreenapp/sis/homescreenapp_ut_applib_sisx.bat	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/sis/homescreenapp_ut_applib_sisx.bat	Fri Sep 17 08:27:54 2010 +0300
@@ -18,7 +18,7 @@
 if exist homescreenapp_ut_applib.sisx del homescreenapp_ut_applib.sisx
 
 makesis homescreenapp_ut_applib.pkg
-signsis homescreenapp_ut_applib.sis homescreenapp_ut_applib.sisx rd.cer rd-key.pem
+signsis homescreenapp_ut_applib.sis homescreenapp_ut_applib.sisx ../internal/sis/rd.cer ../internal/sis/rd-key.pem
 
 if exist homescreenapp_ut_applib.sisx (
 echo homescreenapp_ut_applib.sisx creation SUCCEEDED
--- a/homescreenapp/sis/homescreenapp_ut_hs.pkg	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/sis/homescreenapp_ut_hs.pkg	Fri Sep 17 08:27:54 2010 +0300
@@ -37,6 +37,11 @@
 "/epoc32/data/z/private/20022f5f/hsresources/plugins/stateplugins/mockstateplugins.qtplugin"     - "c:/private/20022f5f/hsresources/plugins/stateplugins/mockstateplugins.qtplugin"
 "/epoc32/data/z/private/20022f5f/hsresources/plugins/stateplugins/mockstateplugins.xml"          - "c:/private/20022f5f/hsresources/plugins/stateplugins/mockstateplugins.xml"
 
+;--------------- hsapplicationlauncher ---------------
+"/epoc32/release/armv5/urel/t_hsapplicationlauncher.exe"                         - "c:/sys/bin/t_hsapplicationlauncher.exe"
+"/epoc32/data/z/private/10003a3f/import/apps/t_hsapplicationlauncher_reg.rsc"    - "c:/private/10003a3f/import/apps/t_hsapplicationlauncher_reg.rsc"
+"/epoc32/data/z/resource/apps/t_hsapplicationlauncher.rsc"                       - "c:/resource/apps/t_hsapplicationlauncher.rsc"
+
 ;--------------- hsutils ---------------
 "/epoc32/release/armv5/urel/t_hsutils.exe"                         - "c:/sys/bin/t_hsutils.exe"
 "/epoc32/data/z/private/10003a3f/import/apps/t_hsutils_reg.rsc"    - "c:/private/10003a3f/import/apps/t_hsutils_reg.rsc"
--- a/homescreenapp/sis/homescreenapp_ut_hs_sisx.bat	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/sis/homescreenapp_ut_hs_sisx.bat	Fri Sep 17 08:27:54 2010 +0300
@@ -18,7 +18,7 @@
 if exist homescreenapp_ut_hs.sisx del homescreenapp_ut_hs.sisx
 
 makesis homescreenapp_ut_hs.pkg
-signsis homescreenapp_ut_hs.sis homescreenapp_ut_hs.sisx rd.cer rd-key.pem
+signsis homescreenapp_ut_hs.sis homescreenapp_ut_hs.sisx ../internal/sis/rd.cer ../internal/sis/rd-key.pem
 
 if exist homescreenapp_ut_hs.sisx (
 echo homescreenapp_ut_hs.sisx creation SUCCEEDED
--- a/homescreenapp/sis/rd-key.pem	Thu Sep 02 20:17:27 2010 +0300
+++ /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-----
--- a/homescreenapp/sis/rd.cer	Thu Sep 02 20:17:27 2010 +0300
+++ /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-----
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/docml.pri	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/docml.pri	Fri Sep 17 08:27:54 2010 +0300
@@ -16,7 +16,6 @@
 
 symbian {
 docmlFiles+= \
-    resource/addcontentlabeledview.docml \
     resource/common_objects.docml \
     resource/emptylabeledview.docml \
     resource/labeledlistview.docml \
Binary file homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrary.qm has changed
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrary.ts	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrary.ts	Fri Sep 17 08:27:54 2010 +0300
@@ -42,26 +42,6 @@
     <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_applib_opt_sub_ascending">
-    <comment>Options list item. Sorts by name, starting from the beginning of the alphabets</comment>        
-    <source>Ascending</source>
-    <translation variants="no">Ascending</translation>
-    <extra-loc-layout_id>qtl_menu_sec_add</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_01, applib_03, applib_05, applib_07, applib_09</extra-loc-viewid>
-    <extra-loc-positionid>opt_3_sub</extra-loc-positionid>
-    <extra-loc-feature>applib</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_applib_opt_sub_oldest_on_top">
-    <comment>Sorting submenu item in Downloaded collection</comment>        
-    <source>Oldest on top</source>
-    <translation variants="no">Oldest on top</translation>
-    <extra-loc-layout_id>qtl_menu_sec_add</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_05</extra-loc-viewid>
-    <extra-loc-positionid>opt_3_sub</extra-loc-positionid>
-    <extra-loc-feature>applib</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_common_button_cancel">
     <comment>Button. Note! Use this text ID only if there are max. two buttons in the dialog. Allows the user to cancel the action or process.</comment>        
     <source>Cancel</source>
@@ -95,56 +75,16 @@
     <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_common_opt_help">
-    <comment>Options list item. Note! Only use this text ID if there are no icons. Opens a help dialog.</comment>        
-    <source>Help</source>
-    <translation variants="no">Help</translation>
-    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>common</extra-loc-viewid>
-    <extra-loc-positionid>opt</extra-loc-positionid>
-    <extra-loc-feature>common</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_applib_opt_sub_latest_on_top">
-    <comment>Sorting submenu item in Downloaded view</comment>        
-    <source>Latest on top</source>
-    <translation variants="no">Latest on top</translation>
-    <extra-loc-layout_id>qtl_menu_sec_add</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_05</extra-loc-viewid>
-    <extra-loc-positionid>opt_3_sub</extra-loc-positionid>
-    <extra-loc-feature>applib</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_applib_dialog_installed">
     <comment>Shown in text entry of installed app in installation log dialog</comment>        
     <source>Installed</source>
     <translation variants="no">Installed</translation>
-    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-layout_id>qtl_list_popup_pri</extra-loc-layout_id>    
     <extra-loc-viewid>applib_20</extra-loc-viewid>
     <extra-loc-positionid>dialog</extra-loc-positionid>
     <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_common_menu_pause">
-    <comment>Item specific menu item. Note! Only use this text ID if there are no icons. Pauses the ongoing action, such as playing an audio or video clip or presentation.</comment>        
-    <source>Pause</source>
-    <translation variants="no">Pause</translation>
-    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>common</extra-loc-viewid>
-    <extra-loc-positionid>menu</extra-loc-positionid>
-    <extra-loc-feature>common</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_applib_opt_sub_descending">
-    <comment>Sub-menu item. Sorts by name, starting from the end of the alphabets</comment>        
-    <source>Descending</source>
-    <translation variants="no">Descending</translation>
-    <extra-loc-layout_id>qtl_menu_sec_add</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_01, applib_03, applib_05, applib_07, applib_09</extra-loc-viewid>
-    <extra-loc-positionid>opt_3_sub</extra-loc-positionid>
-    <extra-loc-feature>applib</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_applib_grid_ovi_store">
     <comment>Text shown when operator store is defined and toolbar extension is used to show both stores.</comment>        
     <source>Ovi Store</source>
@@ -189,7 +129,7 @@
     <comment>Name label shown in application details dialog</comment>        
     <source>Name:</source>
     <translation variants="no">Name:</translation>
-    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-layout_id>qtl_list_popup_pri</extra-loc-layout_id>    
     <extra-loc-viewid>applib_17</extra-loc-viewid>
     <extra-loc-positionid>dialog</extra-loc-positionid>
     <extra-loc-feature>applib</extra-loc-feature>
@@ -199,7 +139,7 @@
     <comment>Size field in app details dialog. App size shown in megabytes, shown after Size-label.</comment>        
     <source>%L1 MB</source>
     <translation variants="no">%L1 MB</translation>
-    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-layout_id>qtl_list_popup_pri</extra-loc-layout_id>    
     <extra-loc-viewid>applib_17</extra-loc-viewid>
     <extra-loc-positionid>dialog</extra-loc-positionid>
     <extra-loc-feature>applib</extra-loc-feature>
@@ -219,22 +159,12 @@
     <comment>Shown after &quot;Memory in use&quot; header in Application details dialog</comment>        
     <source>%1: Mass storage</source>
     <translation variants="no">%1: Mass storage</translation>
-    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-layout_id>qtl_list_popup_pri</extra-loc-layout_id>    
     <extra-loc-viewid>applib_17</extra-loc-viewid>
     <extra-loc-positionid>dialog</extra-loc-positionid>
     <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_applib_opt_sub_installation_time">
-    <comment>Sub-menu item. Sorts by installation time in the Downloaded collection (latest first, default sort)</comment>        
-    <source>Installation time</source>
-    <translation variants="no">Installation time</translation>
-    <extra-loc-layout_id>qtl_menu_sec_add</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_05</extra-loc-viewid>
-    <extra-loc-positionid>opt_3_sub</extra-loc-positionid>
-    <extra-loc-feature>applib</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_applib_info_delete_1_all_its_shortcuts_and">
     <comment>Confirmation note displayed if the user tries to delete an application that actually includes more than one application, which has shortcuts. %1 is the application name.</comment>        
     <source>Delete %1, all it&apos;s shortcuts and associated data?</source>
@@ -245,6 +175,16 @@
     <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
+<message numerus="no" id="txt_applib_menu_sort_by_oldest_on_top">
+    <comment>Option for sorting the list by their installation time. Oldest installations are shown on top of the list.</comment>        
+    <source>Sort by oldest on top</source>
+    <translation variants="no">Sort by oldest on top</translation>
+    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_07, applib_05</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>applib</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
 <message numerus="no" id="txt_applib_dblist_uninstalling_1">
     <comment>List text shown on application item when the app is being uninstalled. %1 is the app name</comment>        
     <source>Uninstalling %1</source>
@@ -285,16 +225,6 @@
     <extra-loc-feature>common</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_common_menu_cancel_download">
-    <comment>Item specific menu item. Note! Only use this text ID if there are no icons. Cancels the ongoing download.</comment>        
-    <source>Cancel download</source>
-    <translation variants="no">Cancel download</translation>
-    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>common</extra-loc-viewid>
-    <extra-loc-positionid>menu</extra-loc-positionid>
-    <extra-loc-feature>common</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_applib_title_arrange">
     <comment>Heading for the Arrange dialog</comment>        
     <source>Arrange</source>
@@ -315,26 +245,6 @@
     <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_applib_opt_sort_by">
-    <comment>Options list item. Opens sublist for sorting criteria</comment>        
-    <source>Sort by</source>
-    <translation variants="no">Sort by</translation>
-    <extra-loc-layout_id>qtl_menu_pri_add</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_01, applib_03, applib_05, applib_07, applib_09</extra-loc-viewid>
-    <extra-loc-positionid>opt_3</extra-loc-positionid>
-    <extra-loc-feature>applib</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_applib_opt_sort_by_sub_oldest_on_top">
-    <comment>Sub-menu item. Sorts by installation time, oldest first.</comment>        
-    <source>Oldest on top</source>
-    <translation variants="no">Oldest on top</translation>
-    <extra-loc-layout_id>qtl_menu_sec_add</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_05</extra-loc-viewid>
-    <extra-loc-positionid>opt_3_sub</extra-loc-positionid>
-    <extra-loc-feature>applib</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_applib_opt_task_switcher">
     <comment>Options menu item. Opens the Task Switcher application. (Same command in Home Screen Options menu.)</comment>        
     <source>Task Switcher</source>
@@ -355,16 +265,6 @@
     <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_applib_menu_cancel_installing">
-    <comment>Item specific menu item for an item showing the dowload progress. Cancels the ongoing installing progress</comment>        
-    <source>Cancel installing</source>
-    <translation variants="no">Cancel installing</translation>
-    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_05</extra-loc-viewid>
-    <extra-loc-positionid>menu</extra-loc-positionid>
-    <extra-loc-feature>applib</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_applib_opt_add_to_collection">
     <comment>Options list item. Allows the user to add one or more applications into a virtual collection. Involves several steps, indicated by the ... at the end of the command.</comment>        
     <source>Add to collection...</source>
@@ -405,16 +305,6 @@
     <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_applib_dialog_1_must_be_closed_before_deletin">
-    <comment>Confirmation note displayed if the user tries to delete a java application that is active at the time.</comment>        
-    <source>%1 must be closed before deleting. Close now? </source>
-    <translation variants="no">%1 must be closed before deleting. Close now? </translation>
-    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_28</extra-loc-viewid>
-    <extra-loc-positionid>info</extra-loc-positionid>
-    <extra-loc-feature>applib</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_applib_dialog_entry_collectionl1">
     <comment>Default entry text when naming a new collection, where %L1 is the next available number differentiating between otherwise similar collection names.</comment>        
     <source>Collection(%L1)</source>
@@ -425,6 +315,16 @@
     <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
+<message numerus="no" id="txt_applib_menu_sort_by_ascending">
+    <comment>Option for sorting the list by name in ascending order</comment>        
+    <source>Sort by ascending</source>
+    <translation variants="no">Sort by ascending</translation>
+    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_01</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>applib</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
 <message numerus="no" id="txt_common_button_ok">
     <comment>Button. Note! Use this text ID only if there are max. two buttons in the dialog. When this button is pressed, the focused item or operation will be selected or accepted.</comment>        
     <source>OK</source>
@@ -435,12 +335,22 @@
     <extra-loc-feature>common</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_applib_menu_resume">
-    <comment>Item specific menu item for an item showing the dowload progress. Resumes the download progress (toggles between the Pause command in the item menu)</comment>        
-    <source>Resume</source>
-    <translation variants="no">Resume</translation>
-    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_05</extra-loc-viewid>
+<message numerus="no" id="txt_applib_info_installer_is_currently_busy">
+    <comment>Dialog shown when uninstallation of an application cannot be started because another uninstallation is going on</comment>        
+    <source>Installer is currently busy</source>
+    <translation variants="no">Installer is currently busy</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_08</extra-loc-viewid>
+    <extra-loc-positionid>info</extra-loc-positionid>
+    <extra-loc-feature>applib</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_applib_menu_sort_by_descending">
+    <comment>Option for sorting the list by name in descending order</comment>        
+    <source>Sort by descending</source>
+    <translation variants="no">Sort by descending</translation>
+    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_01</extra-loc-viewid>
     <extra-loc-positionid>menu</extra-loc-positionid>
     <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
@@ -455,26 +365,6 @@
     <extra-loc-feature>common</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_applib_opt_sub_custom">
-    <comment>Sub-menu item. Sorts by default order or user&apos;s own order when user has organised the list</comment>        
-    <source>Custom</source>
-    <translation variants="no">Custom</translation>
-    <extra-loc-layout_id>qtl_menu_sec_add</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_03, applib_09</extra-loc-viewid>
-    <extra-loc-positionid>opt_3_sub</extra-loc-positionid>
-    <extra-loc-feature>applib</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_applib_opt_sort_by_sub_latest_on_top">
-    <comment>Sub-menu item. Sorts by installation time, latest first (default sort).</comment>        
-    <source>Latest on top</source>
-    <translation variants="no">Latest on top</translation>
-    <extra-loc-layout_id>qtl_menu_sec_add</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_05</extra-loc-viewid>
-    <extra-loc-positionid>opt_3_sub</extra-loc-positionid>
-    <extra-loc-feature>applib</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_applib_dialog_delete_1">
     <comment>Confirmation note for deleting a collection that has no shortcuts on Home Screen.</comment>        
     <source>Delete %1?</source>
@@ -487,24 +377,14 @@
 </message>
 <message numerus="no" id="txt_applib_info_launching_the_application_failed">
     <comment>If lauching an application fails, thie note is shown. %1 is error code.</comment>        
-    <source>Launching the application failed (error code %1)</source>
-    <translation variants="no">Launching the application failed (error code %1)</translation>
+    <source>Launching the application failed (error code %L1)</source>
+    <translation variants="no">Launching the application failed (error code %L1)</translation>
     <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
     <extra-loc-viewid>applib_31</extra-loc-viewid>
     <extra-loc-positionid>info</extra-loc-positionid>
     <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_applib_dialog_format">
-    <comment>Format label of application details dialog. Format can be for example Symbian, Java or Widget</comment>        
-    <source>Format:</source>
-    <translation variants="no">Format:</translation>
-    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_17</extra-loc-viewid>
-    <extra-loc-positionid>dialog</extra-loc-positionid>
-    <extra-loc-feature>applib</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_applib_dialog_deletes_1_also_from_home_screen">
     <comment>Confirmation note for deleting a collection, operation also deletes possible shortcuts on Home Screen.</comment>        
     <source>Deletes %1 also from Home Screen. Continue?</source>
@@ -515,21 +395,11 @@
     <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_common_button_delete">
-    <comment>Delete button</comment>        
-    <source>Delete</source>
-    <translation variants="no">Delete</translation>
-    <extra-loc-layout_id>qtl_dialog_softkey_2</extra-loc-layout_id>    
-    <extra-loc-viewid>common</extra-loc-viewid>
-    <extra-loc-positionid>button</extra-loc-positionid>
-    <extra-loc-feature>common</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_applib_dialog_l1_kb">
-    <comment>Size field in app details dialog. App size shown in kilobytes, shown after Size-label.</comment>        
-    <source>%L1 KB</source>
-    <translation variants="no">%L1 KB</translation>
-    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+<message numerus="no" id="txt_applib_dialog_format">
+    <comment>Format label of application details dialog. Format can be for example Symbian, Java or Widget</comment>        
+    <source>Format:</source>
+    <translation variants="no">Format:</translation>
+    <extra-loc-layout_id>qtl_list_popup_pri</extra-loc-layout_id>    
     <extra-loc-viewid>applib_17</extra-loc-viewid>
     <extra-loc-positionid>dialog</extra-loc-positionid>
     <extra-loc-feature>applib</extra-loc-feature>
@@ -539,7 +409,17 @@
     <comment>Description label of application details dialog. Free-form description of the purpose of the application.</comment>        
     <source>Description:</source>
     <translation variants="no">Description:</translation>
-    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-layout_id>qtl_list_popup_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_17</extra-loc-viewid>
+    <extra-loc-positionid>dialog</extra-loc-positionid>
+    <extra-loc-feature>applib</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_applib_dialog_l1_kb">
+    <comment>Size field in app details dialog. App size shown in kilobytes, shown after Size-label.</comment>        
+    <source>%L1 KB</source>
+    <translation variants="no">%L1 KB</translation>
+    <extra-loc-layout_id>qtl_list_popup_pri</extra-loc-layout_id>    
     <extra-loc-viewid>applib_17</extra-loc-viewid>
     <extra-loc-positionid>dialog</extra-loc-positionid>
     <extra-loc-feature>applib</extra-loc-feature>
@@ -599,7 +479,7 @@
     <comment>Shown in text entry of removed app in installation log dialog</comment>        
     <source>Removed</source>
     <translation variants="no">Removed</translation>
-    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-layout_id>qtl_list_popup_pri</extra-loc-layout_id>    
     <extra-loc-viewid>applib_20</extra-loc-viewid>
     <extra-loc-positionid>dialog</extra-loc-positionid>
     <extra-loc-feature>applib</extra-loc-feature>
@@ -615,16 +495,6 @@
     <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_common_menu_install">
-    <comment>Item specific menu item. Note! Only use this text ID if there are no icons. Allows the user to install a file or files.</comment>        
-    <source>Install</source>
-    <translation variants="no">Install</translation>
-    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>common</extra-loc-viewid>
-    <extra-loc-positionid>menu</extra-loc-positionid>
-    <extra-loc-feature>common</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_applib_opt_arrange">
     <comment>Options menu item. Allows user to move items in the view (no hierarchy, no folders)</comment>        
     <source>Arrange</source>
@@ -635,11 +505,21 @@
     <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
+<message numerus="no" id="txt_applib_menu_sort_by_latest_on_top">
+    <comment>Option for sorting the list by their installation time. New installations are shown on top of the list.</comment>        
+    <source>Sort by latest on top</source>
+    <translation variants="no">Sort by latest on top</translation>
+    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_07, applib_05</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>applib</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
 <message numerus="no" id="txt_applib_dialog_1_memory_card">
     <comment>Shown after &quot;Memory in use&quot; header in Application details dialog if the app is installed in memory card without name</comment>        
     <source>%1: Memory card</source>
     <translation variants="no">%1: Memory card</translation>
-    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-layout_id>qtl_list_popup_pri</extra-loc-layout_id>    
     <extra-loc-viewid>applib_17</extra-loc-viewid>
     <extra-loc-positionid>dialog</extra-loc-positionid>
     <extra-loc-feature>applib</extra-loc-feature>
@@ -649,12 +529,22 @@
     <comment>Supplier label of application details dialog</comment>        
     <source>Supplier:</source>
     <translation variants="no">Supplier:</translation>
-    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-layout_id>qtl_list_popup_pri</extra-loc-layout_id>    
     <extra-loc-viewid>applib_17</extra-loc-viewid>
     <extra-loc-positionid>dialog</extra-loc-positionid>
     <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
+<message numerus="no" id="txt_applib_title_select_item">
+    <comment>When AppLibrary is opened by selecting &quot;Add&quot; in Homescreen, AppLibrary&apos;s title is Select item:</comment>        
+    <source>Select item:</source>
+    <translation variants="no">Select item:</translation>
+    <extra-loc-layout_id>qtl_titlebar</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_11</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>applib</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
 <message numerus="no" id="txt_applib_menu_add_to_collection">
     <comment>Item specific menu item. Allows the user to add the application/widget to a (virtual) collection. Does not move the item but replicates it in virtual collection.</comment>        
     <source>Add to collection</source>
@@ -679,7 +569,17 @@
     <comment>Size label on application details dialog. Size of the app is shown after this label.</comment>        
     <source>Size:</source>
     <translation variants="no">Size:</translation>
-    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-layout_id>qtl_list_popup_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_17</extra-loc-viewid>
+    <extra-loc-positionid>dialog</extra-loc-positionid>
+    <extra-loc-feature>applib</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_applib_dialog_1_device_memory">
+    <comment>Shown after &quot;Memory in use&quot; header in Application details dialog</comment>        
+    <source>%1: Device memory</source>
+    <translation variants="no">%1: Device memory</translation>
+    <extra-loc-layout_id>qtl_list_popup_pri</extra-loc-layout_id>    
     <extra-loc-viewid>applib_17</extra-loc-viewid>
     <extra-loc-positionid>dialog</extra-loc-positionid>
     <extra-loc-feature>applib</extra-loc-feature>
@@ -689,17 +589,7 @@
     <comment>Shown after &quot;Memory in use&quot; header in Application details dialog. %1 is the drive letter and %2 is the user-given</comment>        
     <source>%1: %2</source>
     <translation variants="no">%1: %2</translation>
-    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_17</extra-loc-viewid>
-    <extra-loc-positionid>dialog</extra-loc-positionid>
-    <extra-loc-feature>applib</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_applib_dialog_1_device_memory">
-    <comment>Shown after &quot;Memory in use&quot; header in Application details dialog</comment>        
-    <source>%1: Device memory</source>
-    <translation variants="no">%1: Device memory</translation>
-    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-layout_id>qtl_list_popup_pri</extra-loc-layout_id>    
     <extra-loc-viewid>applib_17</extra-loc-viewid>
     <extra-loc-positionid>dialog</extra-loc-positionid>
     <extra-loc-feature>applib</extra-loc-feature>
@@ -725,16 +615,6 @@
     <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_applib_menu_send_to_friend">
-    <comment>Item specific menu item. Allows the user to send the download URL of the application/widget. User is prompted for the method used for sending (SMS, email, bluetooth, etc)</comment>        
-    <source>Send to friend</source>
-    <translation variants="no">Send to friend</translation>
-    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_01, applib_05, applib_09</extra-loc-viewid>
-    <extra-loc-positionid>menu</extra-loc-positionid>
-    <extra-loc-feature>applib</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_applib_formlabel_no_content">
     <comment>Text for empty Collection</comment>        
     <source>No content</source>
@@ -789,19 +669,19 @@
     <comment>Memory in use label in application details dialog</comment>        
     <source>Memory in use:</source>
     <translation variants="no">Memory in use:</translation>
-    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-layout_id>qtl_list_popup_pri</extra-loc-layout_id>    
     <extra-loc-viewid>applib_17</extra-loc-viewid>
     <extra-loc-positionid>dialog</extra-loc-positionid>
     <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_applib_dialog_partially_installed">
-    <comment>Shown in text entry of partially installed app in installation log dialog</comment>        
-    <source>Partially installed</source>
-    <translation variants="no">Partially installed</translation>
-    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_20</extra-loc-viewid>
-    <extra-loc-positionid>dialog</extra-loc-positionid>
+<message numerus="no" id="txt_applib_menu_add_to_home_screen">
+    <comment>Item specific menu item for an app/widget. adds application/widget to Homescreen</comment>        
+    <source>Add to Home Screen</source>
+    <translation variants="no">Add to Home Screen</translation>
+    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_01, applib_03, applib_05, applib_09</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
     <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
@@ -815,13 +695,13 @@
     <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_applib_menu_add_to_home_screen">
-    <comment>Item specific menu item for an app/widget. adds application/widget to Homescreen</comment>        
-    <source>Add to Home Screen</source>
-    <translation variants="no">Add to Home Screen</translation>
-    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_01, applib_03, applib_05, applib_09</extra-loc-viewid>
-    <extra-loc-positionid>menu</extra-loc-positionid>
+<message numerus="no" id="txt_applib_subtitle_installed">
+    <comment>GroupBox widget, shows the label for the Installed applications view.</comment>        
+    <source>Installed</source>
+    <translation variants="no">Installed</translation>
+    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_07</extra-loc-viewid>
+    <extra-loc-positionid>subtitle</extra-loc-positionid>
     <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
@@ -835,23 +715,13 @@
     <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_applib_subtitle_installed">
-    <comment>GroupBox widget, shows the label for the Installed applications view.</comment>        
-    <source>Installed</source>
-    <translation variants="no">Installed</translation>
-    <extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_07</extra-loc-viewid>
-    <extra-loc-positionid>subtitle</extra-loc-positionid>
-    <extra-loc-feature>applib</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_applib_dialog_protection_domain">
-    <comment>Protection domain label shown in application details dialog. The value of this field is retrieved from the value, not from platform. The value can be one of the following: Operator, Manufacturer, Trusted 3rd party, Untrusted 3rd party.</comment>        
-    <source>Protection domain:</source>
-    <translation variants="no">Protection domain:</translation>
-    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_17</extra-loc-viewid>
-    <extra-loc-positionid>dialog</extra-loc-positionid>
+<message numerus="no" id="txt_applib_dialog_entry_collection">
+    <comment>Default entry text in InputDialog when naming a new collection and no other collections with the same name exist.</comment>        
+    <source>Collection</source>
+    <translation variants="no">Collection</translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_15</extra-loc-viewid>
+    <extra-loc-positionid>dialog_1_entry</extra-loc-positionid>
     <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
@@ -865,13 +735,13 @@
     <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_applib_dialog_entry_collection">
-    <comment>Default entry text in InputDialog when naming a new collection and no other collections with the same name exist.</comment>        
-    <source>Collection</source>
-    <translation variants="no">Collection</translation>
-    <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_15</extra-loc-viewid>
-    <extra-loc-positionid>dialog_1_entry</extra-loc-positionid>
+<message numerus="no" id="txt_applib_dialog_protection_domain">
+    <comment>Protection domain label shown in application details dialog. The value of this field is retrieved from the value, not from platform. The value can be one of the following: Operator, Manufacturer, Trusted 3rd party, Untrusted 3rd party.</comment>        
+    <source>Protection domain:</source>
+    <translation variants="no">Protection domain:</translation>
+    <extra-loc-layout_id>qtl_list_popup_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_17</extra-loc-viewid>
+    <extra-loc-positionid>dialog</extra-loc-positionid>
     <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
@@ -879,7 +749,7 @@
     <comment>Version label shown in application details dialog</comment>        
     <source>Version:</source>
     <translation variants="no">Version:</translation>
-    <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
+    <extra-loc-layout_id>qtl_list_popup_pri</extra-loc-layout_id>    
     <extra-loc-viewid>applib_17</extra-loc-viewid>
     <extra-loc-positionid>dialog</extra-loc-positionid>
     <extra-loc-feature>applib</extra-loc-feature>
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrarystateplugin.pro	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrarystateplugin.pro	Fri Sep 17 08:27:54 2010 +0300
@@ -12,7 +12,7 @@
 CONFIG += plugin hb mobility
 MOBILITY = serviceframework
 
-PLUGIN_SUBDIR = /private/20022F35/plugins/stateplugins
+PLUGIN_SUBDIR = /resource/qt/plugins/homescreen
 include(../../common.pri)
 include(docml.pri)
 
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrarystateplugin.qrc	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrarystateplugin.qrc	Fri Sep 17 08:27:54 2010 +0300
@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/xml">
-        <file alias="addcontentlabeledview.docml">resource/addcontentlabeledview.docml.bin</file>
         <file alias="common_objects.docml">resource/common_objects.docml.bin</file>
         <file alias="emptylabeledview.docml">resource/emptylabeledview.docml.bin</file>
         <file alias="labeledlistview.docml">resource/labeledlistview.docml.bin</file>
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrarystateplugin_non_symbian.qrc	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrarystateplugin_non_symbian.qrc	Fri Sep 17 08:27:54 2010 +0300
@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/xml">
-        <file alias="addcontentlabeledview.docml">resource/addcontentlabeledview.docml</file>
         <file alias="common_objects.docml">resource/common_objects.docml</file>
         <file alias="emptylabeledview.docml">resource/emptylabeledview.docml</file>
         <file alias="labeledlistview.docml">resource/labeledlistview.docml</file>
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsallappsstate.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsallappsstate.h	Fri Sep 17 08:27:54 2010 +0300
@@ -65,6 +65,8 @@
 private:
     HsAddModeProxyModel *mAddModeProxyModel;
     Hs::HsSortAttribute mSortAttribute;
+    HbAction *mAscendingMenuAction; //not own
+    HbAction *mDescendingMenuAction; //not own
 };
 
 #endif // HSALLAPPSSTATE_H
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsbaseviewstate.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsbaseviewstate.h	Fri Sep 17 08:27:54 2010 +0300
@@ -73,7 +73,7 @@
     virtual void addToHomeScreen(const int entryId);
     virtual void contextMenuAction(HbAction *action);
     virtual void addActivated(const QModelIndex &index);
-    virtual void addLongPressed(HbAbstractViewItem *item,
+    virtual void addModeShowContextMenu(HbAbstractViewItem *item,
                                         const QPointF &coords);
     
 protected:
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hscollectionstate.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hscollectionstate.h	Fri Sep 17 08:27:54 2010 +0300
@@ -44,10 +44,10 @@
                       HsMainWindow &mainWindow,
                       QState *parent = 0);
     ~HsCollectionState();
+
 protected:
     void onEntry(QEvent *event);
-signals:
-    void sortOrderChanged(Hs::HsSortAttribute sortAttribute);
+
 private slots:
     void addAppsAction();
     void addCollectionShortcutToHomeScreenAction();
@@ -76,6 +76,8 @@
     Hs::HsSortAttribute mSortAttribute;
     int mCollectionId;
     QString mCollectionType;
+    HbAction *mLatestOnTopMenuAction; //not own
+    HbAction *mOldestOnTopMenuAction; //not own
 };
 
 #endif // HSCOLLECTIONSTATE_H
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsinstalledappsstate.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsinstalledappsstate.h	Fri Sep 17 08:27:54 2010 +0300
@@ -55,6 +55,7 @@
     void setEmptyLabelVisibility(bool visibility);
     void latestOnTopMenuAction();
     void oldestOnTopMenuAction();
+    void launchDetails(const QModelIndex &index);
     
 private:
 
@@ -62,6 +63,8 @@
     void setMenuOptions();
     void setContextMenuOptions(HbAbstractViewItem *item, EntryFlags flags);
     Hs::HsSortAttribute mSortAttribute;
+    HbAction *mLatestOnTopMenuAction; //not own
+    HbAction *mOldestOnTopMenuAction; //not own
 };
 
 #endif // HSINSTALLEDAPPSSTATE_H
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hslistviewitem.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hslistviewitem.h	Fri Sep 17 08:27:54 2010 +0300
@@ -27,12 +27,17 @@
 // It should be remove when fix from orbit will be in official platfrom.
 class HsProgressBar: public HbProgressBar {
 public:
-    HsProgressBar(QGraphicsItem *parent=0):HbProgressBar(parent) {}
-    
+    HsProgressBar(QGraphicsItem *parent=0):HbProgressBar(parent),mTargetValue(0),mTimerId(0) {}
+    void setTargetProgressValue(int value);
+
 protected:
     void paint ( QPainter * painter, 
             const QStyleOptionGraphicsItem * option, 
             QWidget * widget = 0 );
+    void timerEvent(QTimerEvent *event);
+private:
+    int mTargetValue;
+    int mTimerId;
 };
 
 HS_STATES_TEST_CLASS(MenuStatesTest)
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmainwindow.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmainwindow.h	Fri Sep 17 08:27:54 2010 +0300
@@ -25,15 +25,17 @@
 HS_STATES_TEST_CLASS(MenuStatesTest)
 
 class HbView;
+class HsMenuModeWrapper;
 
 class HsMainWindow
 {
 public:
-    HsMainWindow();
+    HsMainWindow(HsMenuModeWrapper* wrapper = 0);
     virtual ~HsMainWindow();
 
     virtual void setCurrentView(HbView *view);
-
+private:
+    HsMenuModeWrapper* mMenuMode;
 };
 
 #endif // HS_MAIN_WINDOW_H
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmenuview.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmenuview.h	Fri Sep 17 08:27:54 2010 +0300
@@ -56,7 +56,6 @@
     HbView *view() const;
 
     HbListView *listView() const;
-    HbPushButton *contentButton() const;
 
     void activate();
     void inactivate();
@@ -100,7 +99,6 @@
     HbView *mView; // once this is constructed it is not NULL
     HbListView *mListView; // may be NULL in some contexts
     HbGroupBox *mViewLabel; // may be NULL in some contexts
-    HbPushButton *mAddContentButton; // may be NULL in some contexts
 
     QScopedPointer<HsSearchView> mHsSearchView;
     HS_STATES_TEST_FRIEND_CLASS(MenuStatesTest)
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmenuviewbuilder.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmenuviewbuilder.h	Fri Sep 17 08:27:54 2010 +0300
@@ -37,7 +37,6 @@
 class HbView;
 class HbWidget;
 class HbToolBarExtension;
-class HbPushButton;
 
 enum HsStateContext {
     HsAllAppsContext = 0,
@@ -49,7 +48,6 @@
 
 enum HsOperationalContext {
     HsItemViewContext = 0,
-    HsButtonContext,
     HsEmptyLabelContext,
     InvalidOperationalContext
 };
@@ -79,8 +77,6 @@
 
     // optional widgets accessors
     HbGroupBox *currentViewLabel();
-    HbPushButton *currentAddContentButton();
-
 
     void setStateContext(HsStateContext stateContext);
     void setOperationalContext(HsOperationalContext operationalContext);
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/resource/addcontentlabeledview.docml	Thu Sep 02 20:17:27 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.1">
-    <widget name="view" type="HbView">
-        <widget name="container" role="HbView:widget" type="HbWidget">
-            <widget name="label" type="HbGroupBox">
-                <string name="heading" value="."/>
-                <bool name="marqueeHeading" value="TRUE"/>
-                <fontspec name="fontSpec" role="Title" textheight="0"/>
-            </widget>
-            <widget name="buttonContainer" type="HbWidget">
-                <widget name="addContentButton" type="HbPushButton">
-                    <string locid="txt_applib_button_add_to_collection" name="text"/>
-                    <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
-                </widget>
-                <layout orientation="Horizontal" spacing="0.0un" type="linear">
-                    <stretchitem stretchfactor="1"/>
-                    <linearitem itemname="addContentButton" stretchfactor="5"/>
-                    <stretchitem stretchfactor="1"/>
-                </layout>
-            </widget>
-            <layout orientation="Vertical" spacing="0.0un" type="linear">
-                <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
-                <linearitem itemname="label"/>
-                <stretchitem stretchfactor="1"/>
-                <linearitem itemname="buttonContainer"/>
-                <stretchitem stretchfactor="5"/>
-            </layout>
-        </widget>
-        <string locid="txt_applib_title_applications" name="title"/>
-    </widget>
-    <metadata activeUIState="Common ui state" display="NHD-3.2-inch_portrait" unit="un">
-        <uistate name="Common ui state" sections="#common"/>
-    </metadata>
-</hbdocument>
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/resource/emptylabeledview.docml	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/resource/emptylabeledview.docml	Fri Sep 17 08:27:54 2010 +0300
@@ -1,35 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.1">
-        <widget name="view" type="HbView">
-            <widget name="container" role="HbView:widget" type="HbWidget">
-                <widget name="label" type="HbGroupBox">
-                    <string name="heading" value="."/>
-                    <bool name="marqueeHeading" value="TRUE"/>
-                    <fontspec name="fontSpec" role="Title" textheight="0"/>
+<hbdocument version="1.2">
+    <widget name="view" type="HbView">
+        <widget name="container" role="HbView:widget" type="HbWidget">
+            <widget name="label" type="HbGroupBox">
+                <bool name="marqueeHeading" value="TRUE"/>
+                <string name="heading" value="."/>
+                <fontspec name="fontSpec" role="Title" textheight="0"/>
+            </widget>
+            <widget name="emptyViewLabelContainer" type="HbWidget">
+                <widget name="emptyViewLabel" type="HbLabel">
+                    <enums name="alignment" value="AlignHCenter"/>
+                    <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Minimum" verticalStretch="0"/>
+                    <enums name="elideMode" value="ElideMiddle"/>
+                    <bool name="visible" value="TRUE"/>
+                    <string locid="txt_applib_formlabel_no_content" name="plainText"/>
+                    <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-primary)"/>
                 </widget>
-                <widget name="emptyViewLabelContainer" type="HbWidget">
-                    <widget name="emptyViewLabel" type="HbLabel">
-                        <enums name="alignment" value="AlignHCenter"/>
-                        <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Minimum" verticalStretch="0"/>
-                        <enums name="elideMode" value="ElideMiddle"/>
-                        <bool name="visible" value="TRUE"/>
-                        <string locid="txt_applib_formlabel_no_content" name="plainText"/>
-                        <fontspec name="fontSpec" role="Title" textheight="4un"/>
-                    </widget>
-                    <layout orientation="Horizontal" spacing="0.0un" type="linear">
-                        <stretchitem stretchfactor="1"/>
-                        <linearitem itemname="emptyViewLabel"/>
-                        <stretchitem stretchfactor="1"/>
-                    </layout>
-                </widget>
-                <layout orientation="Vertical" spacing="0.0un" type="linear">
-                    <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
-                    <linearitem itemname="label"/>
+                <layout orientation="Horizontal" spacing="0.0un" type="linear">
                     <stretchitem stretchfactor="1"/>
-                    <linearitem itemname="emptyViewLabelContainer"/>
-                    <stretchitem stretchfactor="5"/>
+                    <linearitem itemname="emptyViewLabel"/>
+                    <stretchitem stretchfactor="1"/>
                 </layout>
             </widget>
-            <string locid="txt_applib_title_applications" name="title"/>
+            <layout orientation="Vertical" spacing="0.0un" type="linear">
+                <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
+                <linearitem itemname="label"/>
+                <stretchitem stretchfactor="1"/>
+                <linearitem itemname="emptyViewLabelContainer"/>
+                <stretchitem stretchfactor="5"/>
+            </layout>
         </widget>
+        <string locid="txt_applib_title_applications" name="title"/>
+    </widget>
+    <metadata activeUIState="Common ui state" display="NHD-3.2-inch_portrait" unit="un">
+        <uistate name="Common ui state" sections="#common"/>
+    </metadata>
 </hbdocument>
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/resource/hslistviewitem.css	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/resource/hslistviewitem.css	Fri Sep 17 08:27:54 2010 +0300
@@ -1,6 +1,10 @@
 
 HsListViewItem[layoutName="default"][progress] {
-	layout:applib_progress;
+    layout:layout-1_applib_progress;
+}
+
+HsListViewItem[layoutName="default"][progress][stretchingStyle="StretchLandscape"]:landscape {
+    layout:layout-4_applib_progress;
 }
 
 HsListViewItem::progress {
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/resource/hslistviewitem.widgetml	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/resource/hslistviewitem.widgetml	Fri Sep 17 08:27:54 2010 +0300
@@ -1,31 +1,56 @@
 <hbwidget version="0.1" type="listviewitem">
-  <layout name="applib_progress" type="mesh">
-
-    <meshitem src="icon-1" srcEdge="LEFT" dst="" dstEdge="LEFT"  spacing="-var(hb-param-margin-gene-left)" />
-    <meshitem src="icon-1" srcEdge="TOP" dst="" dstEdge="TOP" spacing="-var(hb-param-margin-gene-top)"/>
-    <meshitem src="icon-1" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM"  spacing="var(hb-param-margin-gene-bottom)" />
-    <meshitem src="icon-1" srcEdge="RIGHT" dst="text-1" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)"/>
-
-    <meshitem src="selection-icon" srcEdge="LEFT" dst="icon-1" dstEdge="LEFT" spacing="-var(hb-param-margin-gene-middle-horizontal)"/>
-    <meshitem src="selection-icon" srcEdge="TOP" dst="icon-1" dstEdge="TOP" spacing="-var(hb-param-margin-gene-middle-vertical)"/>
-    <meshitem src="selection-icon" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacer="spacer1" />
-    <meshitem src="selection-icon" srcEdge="TOP" dst="" dstEdge="TOP" spacer="spacer2" />
-
-    <meshitem src="text-1" srcEdge="BOTTOM" dst="icon-1" dstEdge="CENTERV" spacing="expr((1/2)*var(hb-param-margin-gene-middle-vertical))"/>
-    <meshitem src="text-1" srcEdge="RIGHT" dst="icon-2" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)"/>
 
-    <meshitem src="progress" srcEdge="LEFT" dst="text-1" dstEdge="LEFT" />
-    <meshitem src="progress" srcEdge="TOP" dst="icon-1" dstEdge="CENTERV" spacing="-expr((1/2)*var(hb-param-margin-gene-middle-vertical))"/>
-    <meshitem src="progress" srcEdge="RIGHT" dst="text-3" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" />
-
-    <meshitem src="icon-2" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-right)"/>
-    <meshitem src="icon-2" srcEdge="CENTERV" dst="text-1" dstEdge="CENTERV" />
+    <layout name="layout-1_applib_progress" type="mesh">
+      <meshitem src="selection-icon" srcEdge="LEFT" dst="" dstEdge="LEFT" spacing="-var(hb-param-margin-gene-left)" />
+      <meshitem src="selection-icon" srcEdge="CENTERV" dst="text-1" dstEdge="CENTERV" />
+      
+      <meshitem src="icon-1" srcEdge="LEFT" dst="selection-icon" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-left)" />
+      <meshitem src="icon-1" srcEdge="TOP" dst="text-1" dstEdge="TOP" />
+      
+      <meshitem src="text-1" srcEdge="LEFT" dst="icon-1" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-middle-horizontal)" />
+      <meshitem src="text-1" srcEdge="TOP" dst="" dstEdge="TOP" spacing="-var(hb-param-margin-gene-top)"/>
+      <meshitem src="text-1" srcEdge="RIGHT" dst="icon-2" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" />
+      <meshitem src="text-1" srcEdge="BOTTOM" dst="progress" dstEdge="TOP" spacing="var(hb-param-margin-gene-middle-vertical)" />
+      
+      <meshitem src="progress" srcEdge="LEFT" dst="text-1" dstEdge="LEFT" />
+      <meshitem src="progress" srcEdge="RIGHT" dst="text-3" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" />
+      <meshitem src="progress" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacing="var(hb-param-margin-gene-bottom)" />
+      
+      <meshitem src="icon-2" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-right)" />
+      <meshitem src="icon-2" srcEdge="CENTERV" dst="text-1" dstEdge="CENTERV" />
+      
+      <meshitem src="text-3" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-right)" />
+      <meshitem src="text-3" srcEdge="BOTTOM" dst="progress" dstEdge="BOTTOM" spacing="0.0un" />
+      
+      <meshitem src="multiselection-toucharea" srcEdge="CENTERH" dst="selection-icon" dstEdge="CENTERH" />
+      <meshitem src="multiselection-toucharea" srcEdge="TOP" dst="" dstEdge="TOP" />
+      <meshitem src="multiselection-toucharea" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+    </layout>
+    
+    <layout name="layout-4_applib_progress" type="mesh">
+      <meshitem src="selection-icon" srcEdge="LEFT" dst="" dstEdge="LEFT" spacing="-var(hb-param-margin-gene-left)" />
+      <meshitem src="selection-icon" srcEdge="CENTERV" dst="icon-1" dstEdge="CENTERV" />
 
-    <meshitem src="text-3" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-right)" />
-    <meshitem src="text-3" srcEdge="BOTTOM" dst="text-2" dstEdge="BOTTOM" spacing="0.0un" />
+      <meshitem src="icon-1" srcEdge="LEFT" dst="selection-icon" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-left)" />
+      <meshitem src="icon-1" srcEdge="TOP" dst="" dstEdge="TOP" spacing="-var(hb-param-margin-gene-top)"/>
+      <meshitem src="icon-1" srcEdge="RIGHT" dst="text-1" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" />
+      <meshitem src="icon-1" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacing="var(hb-param-margin-gene-bottom)" />
 
-    <meshitem src="multiselection-toucharea" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="multiselection-toucharea" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="multiselection-toucharea" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-  </layout>
+      <meshitem src="text-1" srcEdge="RIGHT" dst="icon-2" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" />
+      <meshitem src="text-1" srcEdge="CENTERV" dst="icon-1" dstEdge="CENTERV" />
+      
+      <meshitem src="icon-2" srcEdge="RIGHT" dst="progress" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)"/>
+      <meshitem src="icon-2" srcEdge="CENTERV" dst="icon-1" dstEdge="CENTERV" />
+      
+      <meshitem src="progress" srcEdge="RIGHT" dst="text-3" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)"/>
+      <meshitem src="progress" srcEdge="CENTERV" dst="icon-1" dstEdge="CENTERV" />
+      
+      <meshitem src="text-3" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-right)"/>
+      <meshitem src="text-3" srcEdge="CENTERV" dst="icon-1" dstEdge="CENTERV" />
+      
+      <meshitem src="multiselection-toucharea" srcEdge="CENTERH" dst="selection-icon" dstEdge="CENTERH" />
+      <meshitem src="multiselection-toucharea" srcEdge="TOP" dst="" dstEdge="TOP" />
+      <meshitem src="multiselection-toucharea" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+    </layout>
+        
 </hbwidget>
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/resource/listview.docml	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/resource/listview.docml	Fri Sep 17 08:27:54 2010 +0300
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.1">
+<hbdocument version="1.2">
     <widget name="view" type="HbView">
         <widget name="container" role="HbView:widget" type="HbWidget">
             <widget name="listView" type="HbListView">
-           </widget>
+            </widget>
             <layout orientation="Vertical" spacing="0.0un" type="linear">
                 <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
                 <linearitem itemname="listView"/>
@@ -12,4 +12,3 @@
         <string locid="txt_applib_title_applications" name="title"/>
     </widget>
 </hbdocument>
-
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/resource/searchview.docml	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/resource/searchview.docml	Fri Sep 17 08:27:54 2010 +0300
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.1">
+<hbdocument version="1.2">
     <widget name="view" type="HbView">
         <widget name="container" role="HbView:widget" type="HbWidget">
             <widget name="label" type="HbGroupBox">
@@ -15,7 +15,7 @@
                     <enums name="elideMode" value="ElideMiddle"/>
                     <bool name="visible" value="TRUE"/>
                     <string locid="txt_applib_formlabel_no_search_results" name="plainText"/>
-                    <fontspec name="fontSpec" role="Title" textheight="var(hb-param-text-height-primary)"/>
+                    <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-primary)"/>
                 </widget>
                 <layout orientation="Horizontal" spacing="0.0un" type="linear">
                     <stretchitem stretchfactor="1"/>
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallappsstate.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallappsstate.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -66,7 +66,9 @@
                                QState *parent) :
     HsBaseViewState(mainWindow, menuMode, parent),
     mAddModeProxyModel(0),
-    mSortAttribute(Hs::AscendingNameHsSortAttribute)
+    mSortAttribute(Hs::AscendingNameHsSortAttribute),
+    mAscendingMenuAction(0),
+    mDescendingMenuAction(0)
 {
     initialize(menuViewBuilder, HsAllAppsContext);
     construct();
@@ -117,37 +119,21 @@
     mViewOptions->addAction(hbTrId("txt_applib_opt_check_software_updates"),
                            static_cast<HsBaseViewState*>(this), SLOT(checkSoftwareUpdates()));
 
-    HbMenu *const sortMenu = mViewOptions->addMenu(hbTrId(
-                                 "txt_applib_opt_sort_by"));
-    //Grouped options are exclusive by default.
-    QActionGroup *sortGroup = new QActionGroup(this);
+    mAscendingMenuAction =
+        mViewOptions->addAction(hbTrId("txt_applib_menu_sort_by_ascending"),
+                            this, SLOT(ascendingMenuAction()));
 
-    sortGroup->addAction(
-        sortMenu->addAction(hbTrId("txt_applib_opt_sub_ascending"),
-                            this, SLOT(ascendingMenuAction())));
-    sortGroup->addAction(
-        sortMenu->addAction(hbTrId("txt_applib_opt_sub_descending"),
-                            this, SLOT(descendingMenuAction())));
+    mDescendingMenuAction =
+        mViewOptions->addAction(hbTrId("txt_applib_menu_sort_by_descending"),
+                            this, SLOT(descendingMenuAction()));
 
     mViewOptions->addAction(hbTrId("txt_applib_opt_view_installed_applications"),
                            this, SLOT(openInstalledView()));
 
-    foreach(QAction *action, sortMenu->actions()) {
-        action->setCheckable(true);
-    }
-    int currentSortingPosition(-1);
-    switch (mSortAttribute) {
-    case Hs::AscendingNameHsSortAttribute:
-        currentSortingPosition = 0;
-        break;
-    case Hs::DescendingNameHsSortAttribute:
-        currentSortingPosition = 1;
-        break;
-    default:
-        break;
-    }
-    if (currentSortingPosition >= 0) {
-        sortGroup->actions().at(currentSortingPosition)->setChecked(true);
+    if (mSortAttribute == Hs::AscendingNameHsSortAttribute) {
+        mAscendingMenuAction->setVisible(false);
+    } else {
+        mDescendingMenuAction->setVisible(false);
     }
 
     HSMENUTEST_FUNC_EXIT("HsAllAppsState::setMenuOptions");
@@ -299,6 +285,8 @@
     HSMENUTEST_FUNC_ENTRY("HsAllAppsState::ascendingMenuAction");
     mSortAttribute = Hs::AscendingNameHsSortAttribute;
     mModel->setSort(mSortAttribute);
+    mAscendingMenuAction->setVisible(false);
+    mDescendingMenuAction->setVisible(true);
     HSMENUTEST_FUNC_EXIT("HsAllAppsState::ascendingMenuAction");
 }
 
@@ -310,6 +298,8 @@
     HSMENUTEST_FUNC_ENTRY("HsAllAppsState::descendingMenuAction");
     mSortAttribute = Hs::DescendingNameHsSortAttribute;
     mModel->setSort(mSortAttribute);
+    mAscendingMenuAction->setVisible(true);
+    mDescendingMenuAction->setVisible(false);
     HSMENUTEST_FUNC_EXIT("HsAllAppsState::descendingMenuAction");
 
 }
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsapplibrarystate.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsapplibrarystate.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -89,7 +89,8 @@
  */
 HsAppLibraryState::HsAppLibraryState(QState *parent) :
     QState(parent), mAllAppsState(0),
-    mHistoryTransaction(0), mAllCollectionsState(0), mCollectionState(0)
+    mHistoryTransaction(0), mAllCollectionsState(0), mCollectionState(0), 
+    mMenuMode(),mMainWindow(&mMenuMode)
 {
     construct();
 }
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsbaseviewstate.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsbaseviewstate.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -88,7 +88,8 @@
 void HsBaseViewState::initialize(HsMenuViewBuilder &menuViewBuilder,
     HsStateContext stateContext)
 {
-    mMenuView.reset(new HsMenuView(menuViewBuilder, stateContext, mMainWindow));
+    mMenuView.reset(new HsMenuView(
+            menuViewBuilder, stateContext, mMainWindow));
     mMenuView->view()->setNavigationAction(mBackKeyAction);
     mMenuView->view()->setMenu(mViewOptions);
 
@@ -104,17 +105,17 @@
 void HsBaseViewState::createApplicationLaunchFailMessage(int errorCode,
     int itemId)
 {
-    QString message;
-    message.append(
-        HbParameterLengthLimiter("txt_applib_info_launching_the_application_failed").arg(
-            errorCode));
+    QString message(HbParameterLengthLimiter(
+            "txt_applib_info_launching_the_application_failed").arg(
+                    errorCode));
 
     // create and show message box
     mApplicationLaunchFailMessage = HsMenuDialogFactory().create(
             message, HsMenuDialogFactory::Close);
 
     QScopedPointer<HsMenuEntryRemovedHandler> entryObserver(
-        new HsMenuEntryRemovedHandler(itemId, mApplicationLaunchFailMessage.data(), SLOT(close())));
+            new HsMenuEntryRemovedHandler(itemId, 
+                    mApplicationLaunchFailMessage.data(), SLOT(close())));
 
     entryObserver.take()->setParent(mApplicationLaunchFailMessage.data());
 
@@ -163,7 +164,7 @@
             SLOT(addActivated(QModelIndex)));
     connect(mMenuView.data(),
             SIGNAL(longPressed(HbAbstractViewItem *, QPointF)),
-            SLOT(addLongPressed(HbAbstractViewItem *, QPointF)));
+            SLOT(addModeShowContextMenu(HbAbstractViewItem *, QPointF)));
 }
 
 /*!
@@ -244,7 +245,8 @@
  Slot connected to List widget in normal mode.
  \param index Model index of the activated item.
  */
-void HsBaseViewState::showContextMenu(HbAbstractViewItem *item, const QPointF &coords)
+void HsBaseViewState::showContextMenu(
+        HbAbstractViewItem *item, const QPointF &coords)
 {
     HSMENUTEST_FUNC_ENTRY("HsBaseViewState::showContextMenu");
 
@@ -398,12 +400,26 @@
  \param item View item.
  \param coords Press point coordinates.
  */
-void HsBaseViewState::addLongPressed(HbAbstractViewItem *item,
+void HsBaseViewState::addModeShowContextMenu(HbAbstractViewItem *item,
                                     const QPointF &coords)
 {
     Q_UNUSED(coords);
     HSMENUTEST_FUNC_ENTRY("HsAllAppsState::addLongPressed");
-    addActivated(item->modelIndex());
+    EntryFlags flags = item->modelIndex().data(
+            CaItemModel::FlagsRole).value<EntryFlags> ();
+
+    if (!(flags & UninstallEntryFlag)) {
+        mContextMenu = new HbMenu;
+
+        HbAction *addToHomeScreenAction = mContextMenu->addAction(
+            hbTrId("txt_applib_menu_add_to_home_screen"));
+        addToHomeScreenAction->setData(Hs::AddToHomeScreenContextAction);
+
+        mContextModelIndex = item->modelIndex();
+        mContextMenu->setPreferredPos(coords);
+        mContextMenu->setAttribute(Qt::WA_DeleteOnClose);
+        mContextMenu->open(this, SLOT(contextMenuAction(HbAction*)));
+    }
     HSMENUTEST_FUNC_EXIT("HsAllAppsState::addLongPressed");
 }
 
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hscollectionstate.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hscollectionstate.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -88,7 +88,9 @@
                                      QState *parent) :
     HsBaseViewState(mainWindow, menuMode, parent),
     mSortAttribute(Hs::LatestOnTopHsSortAttribute),
-    mCollectionId(-1)
+    mCollectionId(-1),
+    mLatestOnTopMenuAction(0),
+    mOldestOnTopMenuAction(0)
 {
     initialize(menuViewBuilder, HsCollectionContext);
     construct();
@@ -153,7 +155,7 @@
     handleEmptyChange(mModel->rowCount() == 0);
 
     makeConnect();
-    
+
     mMenuView->viewLabel()->setHeading(
         mModel->root().data(CaItemModel::CollectionTitleRole).toString());
 
@@ -201,28 +203,25 @@
             this,
             SLOT(deleteAction()));
     }
-    if (mCollectionType == Hs::collectionDownloadedTypeName && 
+    if (mCollectionType == Hs::collectionDownloadedTypeName &&
             mModel->rowCount() > 0) {
-        HbMenu *sortMenu = mViewOptions->addMenu(
-                               hbTrId("txt_applib_opt_sort_by"));
-        //Grouped options are exclusive by default.
-        QActionGroup *sortGroup = new QActionGroup(this);
-        sortGroup->addAction(
-            sortMenu->addAction(
-                hbTrId("txt_applib_opt_sub_latest_on_top"),
-                this,
-                SLOT(latestOnTopMenuAction())));
-        sortGroup->addAction(
-            sortMenu->addAction(
-                hbTrId("txt_applib_opt_sub_oldest_on_top"),
-                this,
-                SLOT(oldestOnTopMenuAction())));
-        foreach(QAction *action, sortMenu->actions()) {
-            action->setCheckable(true);
+        mLatestOnTopMenuAction = mViewOptions->addAction(
+                hbTrId("txt_applib_menu_sort_by_latest_on_top"),
+                this, SLOT(latestOnTopMenuAction()));
+        mOldestOnTopMenuAction = mViewOptions->addAction(
+                hbTrId("txt_applib_menu_sort_by_oldest_on_top"),
+                this, SLOT(oldestOnTopMenuAction()));
+
+        if(mSortAttribute == Hs::LatestOnTopHsSortAttribute)
+        {
+            mLatestOnTopMenuAction->setVisible(false);
+        } else {
+            mOldestOnTopMenuAction->setVisible(false);
         }
-        static const int defaultSortingPosition = 0;
-        sortGroup->actions().at(defaultSortingPosition)->setChecked(true);
+
     }
+
+
     mMenuView->view()->setMenu(mViewOptions);
     HSMENUTEST_FUNC_EXIT("HsAllCollectionsState::setMenuOptions");
 }
@@ -299,15 +298,26 @@
  \param action action taken in context menu
  */
 void HsCollectionState::contextMenuAction(HbAction *action)
-{
-    HsBaseViewState::contextMenuAction(action);
-    Hs::HsContextAction command =
-            static_cast<Hs::HsContextAction>(action->data().toInt());
-    if (command == Hs::RemoveFromCollectionContextAction ) {
-        const int itemId = mContextModelIndex.data(CaItemModel::IdRole).toInt();
+	{
+    Hs::HsContextAction command = static_cast<Hs::HsContextAction> (action->data().toInt());
+
+    if (command == Hs::RemoveFromCollectionContextAction) {
+        const int itemId = mContextModelIndex.data(
+            CaItemModel::IdRole).toInt();
         machine()->postEvent(
-            HsMenuEventFactory::createRemoveAppFromCollectionEvent(
-                itemId, mCollectionId));
+            HsMenuEventFactory::createRemoveAppFromCollectionEvent(itemId,
+            mCollectionId));
+        HsMenuService::touch(itemId);
+    } else if (
+        command == Hs::AddToCollectionFromCollectionViewContextAction) {
+        const int itemId = mContextModelIndex.data(
+            CaItemModel::IdRole).toInt();
+        machine()->postEvent(
+            HsMenuEventFactory::createAddAppsFromCollectionViewEvent(
+            mCollectionId, itemId));
+        HsMenuService::touch(itemId);
+    } else {
+        HsBaseViewState::contextMenuAction(action);
     }
 }
 
@@ -317,32 +327,19 @@
  */
 void HsCollectionState::handleEmptyChange(bool empty)
 {
-
-    EntryFlags flags =
-        mModel->root().data(CaItemModel::FlagsRole).value<
-        EntryFlags> ();
+    EntryFlags flags = mModel->root().data(
+            CaItemModel::FlagsRole).value<EntryFlags> ();
 
     if (empty){
-        if (flags & RemovableEntryFlag){
-            mMenuView->reset(HsButtonContext);
-            connect(mMenuView->contentButton(),
-                    SIGNAL(clicked()), this, SLOT(addAppsAction()),
-                    Qt::UniqueConnection);
-        } else {
-            mMenuView->reset(HsEmptyLabelContext);
-        }
-
+        mMenuView->reset(HsEmptyLabelContext);
     } else {
         mMenuView->reset(HsItemViewContext);
         mMenuView->setModel(mModel);
         mMenuView->listView()->scrollTo(
             mModel->index(0), HbAbstractItemView::PositionAtTop);
     }
-	
     mMenuView->disableSearch(empty);
-    
     mMenuView->activate();
-
     setMenuOptions();
 }
 
@@ -457,7 +454,7 @@
                                                 "txt_common_menu_details"));
         appDetailsAction->setData(Hs::AppDetailsContextAction);
     }
-    
+
     addToHomeScreenAction->setVisible(
         !HsAppLibStateUtils::isCWRTWidgetOnHomeScreen(entry.data()));
 }
@@ -470,7 +467,8 @@
 {
     mSortAttribute = Hs::LatestOnTopHsSortAttribute;
     mModel->setSort(mSortAttribute);
-    emit sortOrderChanged(mSortAttribute);
+    mLatestOnTopMenuAction->setVisible(false);
+    mOldestOnTopMenuAction->setVisible(true);
 }
 
 /*!
@@ -481,7 +479,8 @@
 {
     mSortAttribute = Hs::OldestOnTopHsSortAttribute;
     mModel->setSort(mSortAttribute);
-    emit sortOrderChanged(mSortAttribute);
+    mLatestOnTopMenuAction->setVisible(true);
+    mOldestOnTopMenuAction->setVisible(false);
 }
 
 /*!
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsinstalledappsstate.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsinstalledappsstate.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -52,7 +52,9 @@
         HsMainWindow &mainWindow,
         QState *parent):
     HsBaseViewState(mainWindow, parent),
-            mSortAttribute(Hs::OldestOnTopHsSortAttribute)
+    mSortAttribute(Hs::OldestOnTopHsSortAttribute),
+    mLatestOnTopMenuAction(0),
+    mOldestOnTopMenuAction(0)
 {
     initialize(menuViewBuilder, HsInstalledAppsContext);
     construct();
@@ -88,30 +90,21 @@
     mViewOptions->addAction(hbTrId("txt_applib_opt_installation_log"),
                         this, SLOT(openInstallationLog()));
     if (mModel->rowCount() > 0) {
-        HbMenu *sortMenu = mViewOptions->addMenu(
-                               hbTrId("txt_applib_opt_sort_by"));
-        //Grouped options are exclusive by default.
-        QActionGroup *sortGroup = new QActionGroup(this);
-        sortGroup->addAction(
-            sortMenu->addAction(
-                hbTrId("txt_applib_opt_sort_by_sub_latest_on_top"),
-                this,
-                SLOT(latestOnTopMenuAction())));
-        sortGroup->addAction(
-            sortMenu->addAction(
-                hbTrId("txt_applib_opt_sort_by_sub_oldest_on_top"),
-                this,
-                SLOT(oldestOnTopMenuAction())));
-        foreach(QAction *action, sortMenu->actions()) {
-            action->setCheckable(true);
-        }
-        static const int defaultSortingPosition = 0;
+
+        mLatestOnTopMenuAction = mViewOptions->addAction(
+            hbTrId("txt_applib_menu_sort_by_latest_on_top"),
+            this, SLOT(latestOnTopMenuAction()));
+        mOldestOnTopMenuAction = mViewOptions->addAction(
+            hbTrId("txt_applib_menu_sort_by_oldest_on_top"),
+            this, SLOT(oldestOnTopMenuAction()));
+
+        // as we geting already reversed list from query
+        // we set it to OldestOnTopHsSortAttribute
         if(mSortAttribute == Hs::LatestOnTopHsSortAttribute)
-            {
-            sortGroup->actions().at(defaultSortingPosition + 1)->setChecked(true);
-            }
-        else {
-            sortGroup->actions().at(defaultSortingPosition)->setChecked(true);
+        {
+            mOldestOnTopMenuAction->setVisible(false);
+        } else {
+            mLatestOnTopMenuAction->setVisible(false);
         }
     }
     mMenuView->view()->setMenu(mViewOptions);
@@ -182,6 +175,10 @@
     connect(mMenuView.data(),
             SIGNAL(longPressed(HbAbstractViewItem *, QPointF)),
             SLOT(showContextMenu(HbAbstractViewItem *, QPointF)));
+    
+    connect(mMenuView.data(),
+                SIGNAL(activated(QModelIndex)),
+                SLOT(launchDetails(QModelIndex)));
 
     connect(mModel, SIGNAL(empty(bool)),this,
             SLOT(setEmptyLabelVisibility(bool)));
@@ -200,6 +197,10 @@
 
     disconnect(mModel, SIGNAL(empty(bool)),this,
                SLOT(setEmptyLabelVisibility(bool)));
+    
+    disconnect(mMenuView.data(),
+                SIGNAL(activated(QModelIndex)), this,
+                SLOT(launchDetails(QModelIndex)));
 
     disconnect(mMenuView.data(),
             SIGNAL(longPressed(HbAbstractViewItem *, QPointF)), this,
@@ -236,6 +237,24 @@
         HsMenuEventFactory::createInstallationLogEvent());
 }
 
+#ifdef COVERAGE_MEASUREMENT
+#pragma CTC SKIP
+#endif //COVERAGE_MEASUREMENT
+
+// calls tested factory method
+
+/*!
+ Launches detail for app under index
+ */
+void HsInstalledAppsState::launchDetails(const QModelIndex &index)
+{
+	machine()->postEvent(HsMenuEventFactory::createAppDetailsViewEvent(
+			index.data(CaItemModel::IdRole).toInt()));	
+}
+
+#ifdef COVERAGE_MEASUREMENT
+#pragma CTC ENDSKIP
+#endif //COVERAGE_MEASUREMENT
 /*!
   A Slot called when an action for sorting (latest
   on top) is invoked for Installed.
@@ -246,6 +265,8 @@
     // we set it to OldestOnTopHsSortAttribute
     mSortAttribute = Hs::OldestOnTopHsSortAttribute;
     mModel->setSort(mSortAttribute);
+    mLatestOnTopMenuAction->setVisible(false);
+    mOldestOnTopMenuAction->setVisible(true);
 }
 
 /*!
@@ -258,4 +279,6 @@
     // we set it to LatestOnTopHsSortAttribute
     mSortAttribute = Hs::LatestOnTopHsSortAttribute;
     mModel->setSort(mSortAttribute);
+    mLatestOnTopMenuAction->setVisible(true);
+    mOldestOnTopMenuAction->setVisible(false);
 }
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hslistviewitem.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hslistviewitem.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -18,6 +18,8 @@
 #include <hbnamespace.h>
 #include <HbAbstractItemView>
 #include <HbStyleLoader>
+#include <HbTextItem>
+#include <HbParameterLengthLimiter>
 #include <QPainter>
 #include <caitemmodel.h>
 #include "hsmenuitemmodel.h"
@@ -28,6 +30,7 @@
 // TODO: this is only temporary class for show progress bar.
 // It should be remove when fix from orbit will be in official platfrom.
 // Remove it from header too.
+// It is only about paint method.
 
 #ifdef COVERAGE_MEASUREMENT
 #pragma CTC SKIP
@@ -61,10 +64,32 @@
 #endif //COVERAGE_MEASUREMENT
 
 
+void HsProgressBar::setTargetProgressValue(int value) {
+    mTargetValue = value;
+    if (value > progressValue() && value <= maximum()) {
+        if (!mTimerId) {
+            mTimerId = startTimer(10);
+        }
+    } else {
+        setProgressValue(value);
+    }
+}
+
+void HsProgressBar::timerEvent(QTimerEvent *event)
+ {
+     if (mTargetValue == progressValue()) {
+         killTimer(mTimerId);
+         mTimerId = 0;
+     } else {
+         setProgressValue(progressValue()+1);
+     }
+ }
+
 HsListViewItem::HsListViewItem(QGraphicsItem* parent) : 
     HbListViewItem(parent), progress(0), isProgress(false)
 {   
     setGraphicsSize(LargeIcon);
+    setStretchingStyle(StretchLandscape);
     if (this == prototype()) {
         HbStyleLoader::registerFilePath(":/layout/hslistviewitem.css");        
     }
@@ -86,18 +111,31 @@
         CaItemModel::FlagsRole).value<EntryFlags> ();
     isProgress = false;
     if (flags & UninstallEntryFlag) {
+        int progresVal = modelIndex().data(
+                CaItemModel::UninstalRole).toInt();
         isProgress = true;
         if (!progress) {
             progress = new HsProgressBar(this);
             HbStyle::setItemName(progress, "progress"); 
             progress->setRange(0, 100);
             HbEffect::disable(progress);  
+            progress->setProgressValue(progresVal);
             repolish();
+            connect(progress, SIGNAL(valueChanged(int)), SLOT(updatePixmapCache()));
         }
-        int progresVal = modelIndex().data(
-                CaItemModel::UninstalRole).toInt();
-        progress->setProgressValue(progresVal);
+        progress->setTargetProgressValue(progresVal);
+        // TODO, consider moving this logic to model
+        foreach (QGraphicsItem * item, this->childItems()) {
+               if (HbStyle::itemName(item) == "text-1") {
+                   HbTextItem* text = (HbTextItem*)item;
+                   text->setText(
+                           HbParameterLengthLimiter("txt_applib_dblist_uninstalling_1")
+                           .arg(text->text()));
+                   break;
+               } 
+           }
     } else if (progress) {       
+        disconnect(progress, SIGNAL(valueChanged()));
         delete progress;
         progress = 0;
         repolish();
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmainwindow.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmainwindow.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -20,7 +20,7 @@
 #include <HbInstance>
 #include "hsmainwindow.h"
 #include "hsmenuview.h"
-
+#include "hsmenumodewrapper.h"
 
 /*!
  Constructor
@@ -36,7 +36,7 @@
  */
 
 
-HsMainWindow::HsMainWindow() 
+HsMainWindow::HsMainWindow(HsMenuModeWrapper* wrapper):mMenuMode(wrapper) 
 {
 }
 
@@ -56,9 +56,16 @@
     HbMainWindow *const hbW(
         HbInstance::instance()->allMainWindows().value(0));
     
+    if (mMenuMode && mMenuMode->getHsMenuMode() == Hs::AddHsMenuMode) {
+        view->setTitle(hbTrId("txt_applib_title_select_item"));
+    } else {
+        view->setTitle(hbTrId("txt_applib_title_applications"));
+    }
+        
     if (!hbW->views().contains(view)) {
         hbW->addView(view);
     }
+    
     bool animate  = !hbW->isObscured();       
-    hbW->setCurrentView(view, animate);
+    hbW->setCurrentView(view, animate, Hb::ViewSwitchCachedFullScreen);
 }
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuview.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuview.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -24,7 +24,6 @@
 #include <HbMainWindow>
 #include <HbInstance>
 #include <HbSearchPanel>
-#include <HbPushButton>
 #include <HbToolBar>
 #include <HbView>
 #include <HbToolBarExtension>
@@ -188,15 +187,6 @@
 }
 
 /*!
-\return Collection button
- if available in the context or NULL otherwise.
- */
-HbPushButton *HsMenuView::contentButton() const
-{
-    return mAddContentButton;
-}
-
-/*!
  Makes search panel visible.
  Equivalent to \a setSearchPanelVisible(true)
  */
@@ -344,7 +334,6 @@
     mView = mBuilder.currentView();
     mListView = mBuilder.currentListView();
     mViewLabel = mBuilder.currentViewLabel();
-    mAddContentButton = mBuilder.currentAddContentButton();
 }
 
 
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuviewbuilder.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuviewbuilder.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -21,7 +21,6 @@
 #include <HbAction>
 #include <HbGroupBox>
 #include <HbListView>
-#include <HbPushButton>
 #include <HbToolBar>
 #include <HbView>
 #include <HbWidget>
@@ -35,14 +34,12 @@
 
 static const char* DOCUMENT_BASE_NAME_MAP
         [InvalidStateContext][InvalidOperationalContext] =
-    /*HsItemViewContext,    HsButtonContext,    HsEmptyLabelContext*/
+                            /*HsItemViewContext,    HsEmptyLabelContext*/
 {
-/*HsAllAppsContext*/        {"listview", "listview", "listview"},
-/*HsAllCollectionsContext*/ {"listview", "listview", "listview"},
-/*HsInstalledAppsContext*/  {"labeledlistview", "labeledlistview",
-        "emptylabeledview"},
-/*HsCollectionContext*/     {"labeledlistview", "addcontentlabeledview",
-        "emptylabeledview"}
+/*HsAllAppsContext*/        {"listview",             "listview"},
+/*HsAllCollectionsContext*/ {"listview",             "listview"},
+/*HsInstalledAppsContext*/  {"labeledlistview",     "emptylabeledview"},
+/*HsCollectionContext*/     {"labeledlistview",     "emptylabeledview"}
 };
 
 static const QString DOCUMENT_NAME_PREFIX(QLatin1String(":/xml/"));
@@ -52,7 +49,6 @@
 static const QString VIEW_NAME(QLatin1String("view"));
 static const QString LIST_VIEW_NAME(QLatin1String("listView"));
 static const QString VIEW_LABEL_NAME(QLatin1String("label"));
-static const QString ADD_CONTENT_BUTTON_NAME(QLatin1String("addContentButton"));
 
 /*!
     \class HsMenuViewBuilder
@@ -116,22 +112,6 @@
 }
 
 /*!
- \return Pointer to the 'Add content' button resulting from last
- \a build call. It is
- guaranteed to be not NULL if the \a build was called for the context
- related to view including label.
- The pointer is valid until the HsMenuViewBuilder instance is destroyed.
- Memory ownership is not changed.
- */
-HbPushButton *HsMenuViewBuilder::currentAddContentButton()
-{
-    HbPushButton *pushButton =
-            qobject_cast<HbPushButton *>(currentLoader()->findWidget(
-                        ADD_CONTENT_BUTTON_NAME));
-    return pushButton;
-}
-
-/*!
  \return Pointer to All Applications Action. Guaranteed to be not NULL.
  The pointer is valid until the HsMenuViewBuilder instance is destroyed.
  Memory ownership is not changed.
--- a/homescreenapp/stateplugins/hshomescreenstateplugin/hshomescreenstateplugin.pro	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hshomescreenstateplugin/hshomescreenstateplugin.pro	Fri Sep 17 08:27:54 2010 +0300
@@ -31,7 +31,7 @@
 CONFIG += plugin hb mobility
 MOBILITY = serviceframework systeminfo
 
-PLUGIN_SUBDIR = /private/20022F35/plugins/stateplugins
+PLUGIN_SUBDIR = /resource/qt/plugins/homescreen
 
 include(../../common.pri)
 
--- a/homescreenapp/stateplugins/hshomescreenstateplugin/inc/hsidlestate.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hshomescreenstateplugin/inc/hsidlestate.h	Fri Sep 17 08:27:54 2010 +0300
@@ -108,11 +108,12 @@
     void action_moveWidget_reparentToControlLayer();
     void action_moveWidget_startWidgetDragEffect();
     void action_moveWidget_connectGestureHandlers();
+    void action_moveWidget_connectOrientationChangeEventHandler();
     void action_moveWidget_setWidgetSnap();
-
     void action_moveWidget_reparentToPage();
     void action_moveWidget_startWidgetDropEffect();
     void action_moveWidget_disconnectGestureHandlers();
+    void action_moveWidget_disconnectOrientationChangeEventHandler();
     void action_moveWidget_preventZoneAnimation();
     void action_moveWidget_deleteWidgetSnap();
     void action_moveScene_connectGestureHandlers();
@@ -131,7 +132,7 @@
     void onPagePanStarted(QGestureEvent *event);
     void onPagePanUpdated(QGestureEvent *event);
     void onPagePanFinished(QGestureEvent *event);
-    void onWidgetTapStarted(HsWidgetHost *widget);
+    void onWidgetTapStarted(QPointF point, HsWidgetHost *widget);
     void onWidgetTapAndHoldFinished(QGestureEvent *event, HsWidgetHost *widget);
     void onWidgetMoveUpdated(const QPointF &scenePos, HsWidgetHost *widget);
     void onWidgetMoveFinished(const QPointF &scenePos, HsWidgetHost *widget);
@@ -143,8 +144,13 @@
     void pageChangeAnimationFinished();
     void onVerticalSnapLineTimerTimeout();
     void onHorizontalSnapLineTimerTimeout();
-    void onActivePageChanged();
-   
+    void updateSnapAlgorithmParameters();
+    
+    void closeVirtualKeyboard();
+
+private:
+    bool isEditor(const QPointF &point, HsWidgetHost *widget);
+    
 private:
     HbAction *mNavigationAction;
     
--- a/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsidlestate.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsidlestate.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -20,17 +20,21 @@
 #include <QPropertyAnimation>
 #include <QApplication>
 #include <QVariantHash>
+#include <QInputContext>
 
 #include <HbMainWindow>
 #include <HbView>
 #include <HbMenu>
 #include <HbAction>
 #include <HbMessageBox>
+#include <HbInstance>
 #include <HbLabel>
 #include <HbInstantFeedback>
 #include <HbContinuousFeedback>
 #include <HbPanGesture>
 #include <HbTapAndHoldGesture>
+#include <HbVkbHostBridge>
+#include <HbInputFocusObject>
 
 #ifdef Q_OS_SYMBIAN
 #include <XQSettingsManager>
@@ -292,11 +296,13 @@
     ENTRY_ACTION(state_moveWidget, action_moveWidget_reparentToControlLayer)
     ENTRY_ACTION(state_moveWidget, action_moveWidget_startWidgetDragEffect)
     ENTRY_ACTION(state_moveWidget, action_moveWidget_connectGestureHandlers)
+    ENTRY_ACTION(state_moveWidget, action_moveWidget_connectOrientationChangeEventHandler)
     ENTRY_ACTION(state_moveWidget, action_moveWidget_setWidgetSnap)
 
     EXIT_ACTION(state_moveWidget, action_moveWidget_reparentToPage)
     EXIT_ACTION(state_moveWidget, action_moveWidget_startWidgetDropEffect)
     EXIT_ACTION(state_moveWidget, action_moveWidget_disconnectGestureHandlers)
+    EXIT_ACTION(state_moveWidget, action_moveWidget_disconnectOrientationChangeEventHandler)
     EXIT_ACTION(state_moveWidget, action_moveWidget_preventZoneAnimation)
     EXIT_ACTION(state_moveWidget, action_moveWidget_deleteWidgetSnap)
 
@@ -329,6 +335,7 @@
 */
 void HsIdleState::startPageChangeAnimation(int targetPageIndex, int duration)
 {
+    hbInstance->allMainWindows().first()->setInteractive(false);
     HsPropertyAnimationWrapper *animation = HsGui::instance()->pageChangeAnimation();
     if (animation->isRunning()) {
         animation->stop();
@@ -605,12 +612,16 @@
     emit event_waitInput();
 }
 
-void HsIdleState::onWidgetTapStarted(HsWidgetHost *widget)
+void HsIdleState::onWidgetTapStarted(QPointF point, HsWidgetHost *widget)
 {
     HsScene *scene = HsScene::instance();
     scene->setActiveWidget(widget);
     HsPage *page = scene->activePage();
     QMetaObject::invokeMethod(page, "updateZValues", Qt::QueuedConnection);
+    HbVkbHost::HbVkbStatus status = HbVkbHostBridge::instance()->keypadStatus();
+    if ( status == HbVkbHost::HbVkbStatusOpened && !isEditor(point, widget) ) {
+        closeVirtualKeyboard();
+    }
 }
  
 void HsIdleState::onWidgetTapAndHoldFinished(QGestureEvent *event, HsWidgetHost *widget)
@@ -872,6 +883,15 @@
     HsScene *scene = HsScene::instance();
 
     connect(scene, 
+        SIGNAL(pageTapFinished(QGestureEvent*)), 
+        SLOT(closeVirtualKeyboard()),
+        Qt::UniqueConnection);
+    connect(scene, 
+        SIGNAL(pagePanStarted(QGestureEvent*)), 
+        SLOT(closeVirtualKeyboard()),
+        Qt::UniqueConnection);
+
+    connect(scene, 
         SIGNAL(pageTapAndHoldFinished(QGestureEvent*)), 
         SLOT(onPageTapAndHoldFinished(QGestureEvent*)),
         Qt::UniqueConnection);
@@ -882,8 +902,8 @@
         Qt::UniqueConnection);
 
     connect(scene, 
-        SIGNAL(widgetTapStarted(HsWidgetHost*)), 
-        SLOT(onWidgetTapStarted(HsWidgetHost*)),
+        SIGNAL(widgetTapStarted(QPointF, HsWidgetHost*)), 
+        SLOT(onWidgetTapStarted(QPointF, HsWidgetHost*)),
         Qt::UniqueConnection);
     
     connect(scene, 
@@ -929,6 +949,8 @@
     mAllowZoneAnimation = true;
 }
 
+/*!
+*/
 void HsIdleState::action_moveWidget_connectGestureHandlers()
 {
     HsScene *scene = HsScene::instance();
@@ -945,6 +967,17 @@
 }
 
 /*!
+    Connects the SIGNAL for changing the orientation for moveWidget state 
+    to update the snapping algorithm accordingly.
+*/
+void HsIdleState::action_moveWidget_connectOrientationChangeEventHandler()
+{
+    connect(HsGui::instance(),
+        SIGNAL(orientationChanged(Qt::Orientation)),
+        SLOT(updateSnapAlgorithmParameters()));
+}
+
+/*!
     Initializes the presentation to the snapping algorithm
     Connects the SIGNAL for changing the presentation on active page changed
     Connects the timer for showing the snap lines
@@ -962,7 +995,7 @@
         updatePagePresentationToWidgetSnap();
 
         connect(HsScene::instance(), SIGNAL(activePageChanged()),
-            SLOT(onActivePageChanged()));
+            SLOT(updateSnapAlgorithmParameters()));
 
         if (HSCONFIGURATION_GET(isSnapEffectsEnabled)) {
             mVerticalSnapLineTimer.setInterval(HSCONFIGURATION_GET(snapTimeout));
@@ -1065,6 +1098,9 @@
     }
 }
 
+/*!
+    Disconnects gesture handlers
+*/
 void HsIdleState::action_moveWidget_disconnectGestureHandlers()
 {
     HsScene *scene = HsScene::instance();
@@ -1072,6 +1108,17 @@
 }
 
 /*!
+    Disconnects orientation change on moveWidget state
+*/
+void HsIdleState::action_moveWidget_disconnectOrientationChangeEventHandler()
+{
+    disconnect(HsGui::instance(),
+        SIGNAL(orientationChanged(Qt::Orientation)),
+        this, SLOT(updateSnapAlgorithmParameters()));
+
+}
+
+/*!
     Resets the snap position
     Disconnect the Active Page Changed SIGNAL
     Disconnects the timers to show snap lines
@@ -1082,7 +1129,7 @@
         resetSnapPosition();
 
         disconnect(HsScene::instance(), SIGNAL(activePageChanged()),
-                    this, SLOT(onActivePageChanged()));
+                    this, SLOT(updateSnapAlgorithmParameters()));
 
         if (HSCONFIGURATION_GET(isSnapEffectsEnabled)) {
             disconnect(&mVerticalSnapLineTimer, SIGNAL(timeout()),
@@ -1323,6 +1370,7 @@
  */
 void HsIdleState::pageChangeAnimationFinished()
 {
+    hbInstance->allMainWindows().first()->setInteractive(true);
     updateZoneAnimation();
 }
 
@@ -1422,10 +1470,45 @@
 /*!
     Handles updating the Snap algorithm with page presentation on page change
 */
-void HsIdleState::onActivePageChanged()
+void HsIdleState::updateSnapAlgorithmParameters()
 {
     updatePagePresentationToWidgetSnap();
     resetSnapPosition();
 }
 
+/*!
+    Closes virtual keyboard
+*/
+void HsIdleState::closeVirtualKeyboard()
+{
+    HbVkbHost::HbVkbStatus status = HbVkbHostBridge::instance()->keypadStatus();
+    if (status == HbVkbHost::HbVkbStatusOpened ) {
+        QInputContext *ic = qApp->inputContext();
+        if (ic) {
+            QEvent *event = new QEvent(QEvent::CloseSoftwareInputPanel);
+            ic->filterEvent(event);
+            delete event;
+        }
+    }
+}
 
+/*!
+    Returns true if \a widget has editor field under \a point.
+*/
+bool HsIdleState::isEditor(const QPointF &point, HsWidgetHost *widget)
+{
+    bool isWidgetEditor = false;
+    QList<QGraphicsItem *> items;
+    if ( widget->visual()->scene() ) {
+        items = widget->visual()->scene()->items(point);
+        }
+    int count = items.count();
+    for (int i=0; i<count && !isWidgetEditor; i++ ) {
+        QGraphicsItem *item = items.at(i);
+        if (item->isWidget()) {
+            isWidgetEditor = HbInputFocusObject::isEditor(item->toGraphicsObject()) && 
+                qobject_cast<QGraphicsWidget *>(widget->visual()->widget())->isAncestorOf(item);
+        }
+    }
+    return isWidgetEditor;
+}
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/hsmenuworkerstateplugin.pro	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/hsmenuworkerstateplugin.pro	Fri Sep 17 08:27:54 2010 +0300
@@ -18,7 +18,7 @@
 CONFIG += plugin hb mobility
 MOBILITY = serviceframework
 
-PLUGIN_SUBDIR = /private/20022F35/plugins/stateplugins
+PLUGIN_SUBDIR = /resource/qt/plugins/homescreen
 
 include(../../common.pri)
 include(docml.pri)
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsmenuworkerstate.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsmenuworkerstate.h	Fri Sep 17 08:27:54 2010 +0300
@@ -47,11 +47,8 @@
     void construct();
 
     template<class T>
-    T *createChildState(HsMenuEvent::OperationType operation);
-
-private:
-
-    QState *mInitialState;
+    T *createChildState(HsMenuEvent::OperationType operation, 
+            QState* parentState, QState* initialState);
 
 };
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsuinstallfailedstate.h	Fri Sep 17 08:27:54 2010 +0300
@@ -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 HSUINSTALLFAILEDSTATE_H_
+#define HSUINSTALLFAILEDSTATE_H_
+
+
+// System includes
+#include <QState>
+
+#include "hsmenustates_global.h"
+
+HS_STATES_TEST_CLASS(MenuStatesTest)
+
+class HbMessageBox;
+
+class HsUninstallFailedState: public QState
+{
+    Q_OBJECT
+
+    HS_STATES_TEST_FRIEND_CLASS(MenuStatesTest)
+
+public:
+
+    HsUninstallFailedState(QState *parent = 0);
+
+    virtual ~HsUninstallFailedState();
+
+protected:
+
+    void onEntry(QEvent *event);
+    void onExit(QEvent *event);
+
+private slots:
+
+    void stateExited();
+    void cleanUp();
+    
+signals:
+
+    void exit();
+
+private:
+
+    void construct();
+
+private:
+
+    HbMessageBox *mBox;
+};
+
+#endif /* HSUINSTALLFAILEDSTATE_H_ */
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsuninstallitemstate.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsuninstallitemstate.h	Fri Sep 17 08:27:54 2010 +0300
@@ -57,6 +57,10 @@
     void uninstallMessageFinished(HbAction* finishedAction);
 
     void cleanUp();
+    
+public slots:
+
+    void uninstallFailed(int error);
 
 signals:
 
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsappchecklist.docml	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsappchecklist.docml	Fri Sep 17 08:27:54 2010 +0300
@@ -20,6 +20,7 @@
         <widget name="listView" role="HbDialog:contentWidget" type="HbListView">
             <widget name="listViewItemPrototype" role="HbAbstractView:prototype" type="HbListViewItem">
                 <enums name="graphicsSize" value="LargeIcon"/>
+                <enums name="stretchingStyle" value="StretchLandscape"/>
             </widget>
             <enums name="selectionMode" value="MultiSelection"/>
             <real name="z" value="1"/>
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hscollectionslistdialog.docml	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hscollectionslistdialog.docml	Fri Sep 17 08:27:54 2010 +0300
@@ -17,6 +17,7 @@
         <widget name="listView" role="HbDialog:contentWidget" type="HbListView">
             <widget name="qtl_list_pri" role="HbAbstractView:prototype" type="HbListViewItem">
                 <enums name="graphicsSize" value="LargeIcon"/>
+                <enums name="stretchingStyle" value="StretchLandscape"/>
             </widget>
             <enums name="selectionMode" value="SingleSelection"/>
             <real name="z" value="1"/>
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsdetailsdialog.docml	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsdetailsdialog.docml	Fri Sep 17 08:27:54 2010 +0300
@@ -9,7 +9,6 @@
         <enums name="dismissPolicy" value="NoDismiss"/>
         <widget name="qtl_dialog_pri_heading" role="HbDialog:headingWidget" type="HbLabel">
             <enums name="alignment" value="AlignLeft|AlignLeading"/>
-            <contentsmargins bottom="var(hb-param-margin-gene-popup)" left="var(hb-param-margin-gene-popup)" right="var(hb-param-margin-gene-popup)" top="var(hb-param-margin-gene-popup)"/>
             <string locid="txt_applib_title_details" name="plainText" value="Details"/>
             <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-primary)"/>
         </widget>
@@ -91,9 +90,10 @@
     </widget>
     <section name="detailsDialogForJavaApplication">
         <widget name="details_dialog" type="HbDialog">
+            <contentsmargins bottom="var(hb-param-margin-view-bottom)" left="var(hb-param-margin-view-left)" right="var(hb-param-margin-view-right)" top="var(hb-param-margin-view-top)"/>
+            <enums name="dismissPolicy" value="NoDismiss"/>
             <widget name="qtl_dialog_pri_heading" role="HbDialog:headingWidget" type="HbLabel">
                 <enums name="alignment" value="AlignLeft|AlignLeading"/>
-                <contentsmargins bottom="var(hb-param-margin-gene-popup)" left="var(hb-param-margin-gene-popup)" right="var(hb-param-margin-gene-popup)" top="var(hb-param-margin-gene-popup)"/>
                 <string locid="txt_applib_title_details" name="plainText" value="Details"/>
                 <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-primary)"/>
             </widget>
@@ -194,14 +194,6 @@
                 </widget>
             </widget>
             <ref object="qtl_dialog_softkey_left" role="HbWidget:addAction"/>
-            <ref object="qtl_dialog_softkey_left" role="HbWidget:addAction"/>
-            <ref object="qtl_dialog_softkey_left" role="HbWidget:addAction"/>
-            <contentsmargins bottom="var(hb-param-margin-view-bottom)" left="var(hb-param-margin-view-left)" right="var(hb-param-margin-view-right)" top="var(hb-param-margin-view-top)"/>
-            <enums name="dismissPolicy" value="NoDismiss"/>
-            <ref object="qtl_dialog_softkey_left" role="HbWidget:addAction"/>
-            <ref object="qtl_dialog_softkey_left" role="HbWidget:addAction"/>
-            <ref object="qtl_dialog_softkey_left" role="HbWidget:addAction"/>
-            <ref object="qtl_dialog_softkey_left" role="HbWidget:addAction"/>
         </widget>
     </section>
     <metadata activeUIState="Java dialog" display="NHD-3.2-inch_portrait" unit="un">
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsuninstalldialog.docml	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsuninstalldialog.docml	Fri Sep 17 08:27:54 2010 +0300
@@ -40,6 +40,7 @@
                     <enums name="textWrapping" value="TextWordWrap"/>
                     <bool name="visible" value="TRUE"/>
                     <string locid="txt_applib_info_following_applications_will_be_rem" name="plainText"/>
+                    <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
                 </widget>
                 <widget name="delete_message_label" type="HbLabel">
                     <enums name="textWrapping" value="TextWordWrap"/>
@@ -92,6 +93,7 @@
                         <enums name="textWrapping" value="TextWordWrap"/>
                         <bool name="visible" value="TRUE"/>
                         <string locid="txt_applib_info_following_applications_will_be_rem" name="plainText"/>
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
                     </widget>
                     <widget name="delete_message_label" type="HbLabel">
                         <enums name="textWrapping" value="TextWordWrap"/>
@@ -147,6 +149,7 @@
                         <enums name="textWrapping" value="TextWordWrap"/>
                         <bool name="visible" value="TRUE"/>
                         <string locid="txt_applib_info_following_applications_will_be_rem" name="plainText"/>
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
                     </widget>
                     <widget name="list_view_label" type="HbLabel">
                         <bool name="visible" value="TRUE"/>
@@ -201,6 +204,7 @@
                         <enums name="textWrapping" value="TextWordWrap"/>
                         <bool name="visible" value="FALSE"/>
                         <string locid="txt_applib_info_following_applications_will_be_rem" name="plainText"/>
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
                     </widget>
                     <widget name="delete_message_label" type="HbLabel">
                         <enums name="textWrapping" value="TextWordWrap"/>
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsaddappstocollectionstate.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsaddappstocollectionstate.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -599,10 +599,15 @@
     QStandardItemModel *model = new QStandardItemModel(this);
     QList<QStandardItem *> items;
     for (int row = 0; row < caModel->rowCount(); row++) {
+        int itemId = caModel->data(caModel->index(row, 0),
+                               CaItemModel::IdRole).toInt();
+        // do not add actual collection to model
+        if(itemId == mCollectionId)
+        	{
+            continue;
+        	}
         uint flags = caModel->data(caModel->index(row, 0),
                 CaItemModel::FlagsRole).value<EntryFlags> ();
-        int itemId = caModel->data(caModel->index(row, 0),
-                                   CaItemModel::IdRole).toInt();
         if ((flags & RemovableEntryFlag) && (itemId != collectionId)) {
             QStandardItem *standardItem = new QStandardItem();
             standardItem->setData(caModel->data(caModel->index(row, 0),
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsmenuworkerstate.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsmenuworkerstate.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -29,6 +29,7 @@
 #include "hsviewappsettingsstate.h"
 #include "hsviewappdetailsstate.h"
 #include "hsinstallationlogstate.h"
+#include "hsuinstallfailedstate.h"
 
 /*!
  \class HsMenuWorkerState
@@ -47,7 +48,7 @@
  \param parent Parent state. 
  */
 HsMenuWorkerState::HsMenuWorkerState(QState *parent) :
-    QState(parent), mInitialState(0)
+    QState(parent)
 {
     construct();
 }
@@ -67,20 +68,39 @@
 {
     HSMENUTEST_FUNC_ENTRY("HsMenuWorkerState::construct");
     setObjectName("homescreen.nokia.com/state/MenuWorkerState");
+    
+    QState *menuWorkerParallelState = new QState(
+            QState::ParallelStates, this);
+    setInitialState(menuWorkerParallelState);
+    
+    QState *menuWorkerCommonState = new QState(menuWorkerParallelState);
+    QState *menuWorkerFailedMessageState = new QState(menuWorkerParallelState);
+    
 
-    mInitialState = new QState(this);
-    setInitialState(mInitialState);
+    QState *initialCommonState = new QState(menuWorkerCommonState);
+    menuWorkerCommonState->setInitialState(initialCommonState);
+    QState *initialFailedMessageState = new QState(menuWorkerFailedMessageState);
+    menuWorkerFailedMessageState->setInitialState(initialFailedMessageState);
 
     // use templated creation method - less boilerplate code
-    createChildState<HsAddToHomeScreenState> (HsMenuEvent::AddToHomeScreen);
+    createChildState<HsAddToHomeScreenState> (
+            HsMenuEvent::AddToHomeScreen, 
+            menuWorkerCommonState, initialCommonState);
     createChildState<HsDeleteCollectionState> (
-        HsMenuEvent::DeleteCollection);
+            HsMenuEvent::DeleteCollection,
+            menuWorkerCommonState, initialCommonState);
     createChildState<HsDeleteCollectionItemState> (
-        HsMenuEvent::RemoveAppFromCollection);
+            HsMenuEvent::RemoveAppFromCollection,
+            menuWorkerCommonState, initialCommonState);
     createChildState<HsUninstallItemState> (
-        HsMenuEvent::UninstallApplication);
-    createChildState<HsArrangeState> (HsMenuEvent::ArrangeCollection);
-    createChildState<HsArrangeState> (HsMenuEvent::ArrangeAllCollections);
+            HsMenuEvent::UninstallApplication, 
+            menuWorkerCommonState, initialCommonState);
+    createChildState<HsArrangeState> (
+            HsMenuEvent::ArrangeCollection, 
+            menuWorkerCommonState, initialCommonState);
+    createChildState<HsArrangeState> (
+            HsMenuEvent::ArrangeAllCollections, 
+            menuWorkerCommonState, initialCommonState);
 
     
     // create a new child state based on the template
@@ -89,15 +109,15 @@
     // an event with specified operation type
     HsMenuEventTransition *renameCollectionTransition =
         new HsMenuEventTransition(HsMenuEvent::RenameCollection,
-                                  mInitialState, newChildState);
-    mInitialState->addTransition(renameCollectionTransition);
+                                  initialCommonState, newChildState);
+    initialCommonState->addTransition(renameCollectionTransition);
 
     HsMenuEventTransition *createCollectionTransition =
         new HsMenuEventTransition(HsMenuEvent::CreateCollection,
-                                  mInitialState, newChildState);
-    mInitialState->addTransition(createCollectionTransition);
+                                  initialCommonState, newChildState);
+    initialCommonState->addTransition(createCollectionTransition);
     // set a transition to the initial state after child processing finished
-    newChildState->addTransition(newChildState, SIGNAL(exit()), mInitialState);
+    newChildState->addTransition(newChildState, SIGNAL(exit()), initialCommonState);
     connect(this, SIGNAL(reset()), newChildState, SIGNAL(exit()));
     
     HsAddAppsToCollectionState *addAppsToCollectionState =
@@ -106,18 +126,29 @@
     // an event with specified operation type
     HsMenuEventTransition *addAppsToCollectionTransition =
         new HsMenuEventTransition(HsMenuEvent::AddAppsToCollection,
-                                  mInitialState, addAppsToCollectionState);
-    mInitialState->addTransition(addAppsToCollectionTransition);
+                                  initialCommonState, addAppsToCollectionState);
+    initialCommonState->addTransition(addAppsToCollectionTransition);
     // set a transition to the initial state after child processing finished
     addAppsToCollectionState->addTransition(addAppsToCollectionState,
-                                            SIGNAL(finished()), mInitialState);
+                                            SIGNAL(finished()), initialCommonState);
     connect(this, SIGNAL(reset()), addAppsToCollectionState, SIGNAL(finished()));
     
     
-    createChildState<HsPreviewHSWidgetState> (HsMenuEvent::PreviewHSWidget);
-    createChildState<HsViewAppSettingsState> (HsMenuEvent::ShowAppSettings);
-    createChildState<HsViewAppDetailsState> (HsMenuEvent::ShowAppDetails);
-    createChildState<HsInstallationLogState> (HsMenuEvent::ShowInstallationLog);
+    createChildState<HsPreviewHSWidgetState> (
+            HsMenuEvent::PreviewHSWidget, 
+            menuWorkerCommonState, initialCommonState);
+    createChildState<HsViewAppSettingsState> (
+            HsMenuEvent::ShowAppSettings, 
+            menuWorkerCommonState, initialCommonState);
+    createChildState<HsViewAppDetailsState> (
+            HsMenuEvent::ShowAppDetails, 
+            menuWorkerCommonState, initialCommonState);
+    createChildState<HsInstallationLogState> (
+            HsMenuEvent::ShowInstallationLog,
+            menuWorkerCommonState, initialCommonState);
+    createChildState<HsUninstallFailedState> (
+            HsMenuEvent::UninstallationFailed, 
+            menuWorkerFailedMessageState, initialFailedMessageState);
 
     HSMENUTEST_FUNC_EXIT("HsMenuWorkerState::construct");
 }
@@ -126,24 +157,33 @@
  Template method for constructing child states.
  \param operation Operation type triggering transition to the
  newely created state.
+ \param parentState Parent state for new state.
+ \param initialState Initial state.
  \return newely created state.
  */
 template<class T>
 T *HsMenuWorkerState::createChildState(
-    HsMenuEvent::OperationType operation)
+    HsMenuEvent::OperationType operation,
+    QState* parentState,
+    QState* initialState)
 {
     HSMENUTEST_FUNC_ENTRY("HsMenuWorkerState::createChildState");
+    
     // create a new child state based on the template
-    T *newChildState = new T(this);
+    T *newChildState = new T(parentState);
+    
     // create a transition to the new child state which will be triggered by
     // an event with specified operation type
     HsMenuEventTransition *newChildStateTransition =
-        new HsMenuEventTransition(operation, mInitialState, newChildState);
-    mInitialState->addTransition(newChildStateTransition);
+        new HsMenuEventTransition(operation, initialState, newChildState);
+    initialState->addTransition(newChildStateTransition);
+    
     // set a transition to the initial state after child processing finished
-    newChildState->addTransition(newChildState, SIGNAL(exit()), mInitialState);
+    newChildState->addTransition(newChildState, SIGNAL(exit()), initialState);
     connect(this, SIGNAL(reset()), newChildState, SIGNAL(exit()));
+    
     HSMENUTEST_FUNC_EXIT("HsMenuWorkerState::createChildState");
 
     return newChildState;
 }
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsuinstallfailedstate.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -0,0 +1,112 @@
+/*
+ * 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: Menu delete collection item state
+ *
+ */
+
+#include <HbMessageBox>
+#include "hsuinstallfailedstate.h"
+#include "hsmenuevent.h"
+#include "hsapp_defs.h"
+
+const int installerBusyError = 4;
+
+/*!
+ Constructor.
+ /param parent Parent state.
+ */
+HsUninstallFailedState::HsUninstallFailedState(QState *parent) :
+    QState(parent), mBox(0)
+{
+    construct();
+}
+
+/*!
+ Destructor
+ */
+HsUninstallFailedState::~HsUninstallFailedState()
+{
+    cleanUp(); // in case of throw
+}
+
+/*!
+ Construction
+ */
+void HsUninstallFailedState::construct()
+{
+    setObjectName("/HsUninstallFailedState");
+    if (this->parent()) {
+        setObjectName(this->parent()->objectName() + objectName());
+    }
+    
+    connect(this, SIGNAL(exited()), SLOT(cleanUp()));
+}
+
+
+/*!
+ Sets entry event.
+ \param event entry event.
+ */
+void HsUninstallFailedState::onEntry(QEvent *event)
+{
+
+    
+    QState::onEntry(event);
+    HsMenuEvent *menuEvent = static_cast<HsMenuEvent *>(event);
+    QVariantMap data = menuEvent->data();
+    int error = data.value(Hs::uninstallError).toInt();
+    if (error == installerBusyError) {
+        // Installer is in use
+        mBox = new HbMessageBox(HbMessageBox::MessageTypeInformation);
+        mBox->setText(hbTrId("txt_applib_info_installer_is_currently_busy"));
+    } else {
+        // other errors
+        mBox = new HbMessageBox(HbMessageBox::MessageTypeWarning);
+        mBox->setText(hbTrId("txt_applib_info_uninstallation_failed"));
+    }
+
+    mBox->setAttribute(Qt::WA_DeleteOnClose);
+    mBox->setStandardButtons(HbMessageBox::Close);
+    mBox->open(this, SLOT(stateExited()));
+}
+
+/*!
+ Invoked on exiting state
+ */
+void HsUninstallFailedState::onExit(QEvent *event)
+{
+    QState::onExit(event);
+}
+
+/*!
+ State exited.
+ */
+void HsUninstallFailedState::stateExited()
+{
+    mBox = NULL;
+    emit exit();
+}
+
+/*!
+ Slot launched after state has exited and in destructor.
+ \retval void
+ */
+void HsUninstallFailedState::cleanUp()
+{
+    // Close popups if App key was pressed
+    if (mBox) {
+        mBox->close();
+        mBox = NULL;
+    }
+}
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsuninstallitemstate.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsuninstallitemstate.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -27,6 +27,7 @@
 #include <QScopedPointer>
 #include <QStandardItemModel>
 #include <QStandardItem>
+#include <QStateMachine>
 #include <casoftwareregistry.h>
 #include <caquery.h>
 #include <canotifier.h>
@@ -35,6 +36,8 @@
 #include "hsmenuevent.h"
 #include "hsmenudialogfactory.h"
 #include "hsmenuentryremovedhandler.h"
+#include "hsmenueventfactory.h"
+
 /*!
  \class HsUninstallItemState
  \ingroup group_hsworkerstateplugin
@@ -111,7 +114,9 @@
 void HsUninstallItemState::uninstallMessageFinished(HbAction* finishedAction)
 {
     if (static_cast<QAction*>(finishedAction) == mConfirmAction) {
-        HsMenuService::executeAction(mItemId, Hs::removeActionIdentifier);
+
+        HsMenuService::executeAction(mItemId, Hs::removeActionIdentifier, 
+                this, SLOT(uninstallFailed(int)));
     }
     mConfirmAction = NULL;
     mUninstallMessage = NULL;
@@ -187,6 +192,23 @@
     mItemId = 0;
 }
 
+#ifdef COVERAGE_MEASUREMENT
+#pragma CTC SKIP
+#endif //COVERAGE_MEASUREMENT (only returns HbMainWindow)
+/*!
+ Slot invoked when unninstallation failed.
+ \param error Uninstallation error.
+ \retval void
+ */
+void HsUninstallItemState::uninstallFailed(int error)
+{
+    machine()->postEvent(
+            HsMenuEventFactory::createUninstallFailedEvent(error));
+}
+#ifdef COVERAGE_MEASUREMENT
+#pragma CTC ENDSKIP
+#endif //COVERAGE_MEASUREMENT
+
 /*!
  Method create uninstall confirmation message.
  \retval void
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsviewappdetailsstate.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsviewappdetailsstate.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -81,21 +81,25 @@
     const int entryId = data.value(Hs::itemIdKey).toInt();
     QSharedPointer<const CaEntry> entry
         = CaService::instance()->getEntry(entryId);
+    if (!entry) {
+        stateExited();
+        return;
+    }
     const int componentId = entry->attribute(
         Hs::componentIdAttributeName).toInt();
-    
+
     QSharedPointer<CaSoftwareRegistry> scr = CaSoftwareRegistry::create();
     CaSoftwareRegistry::DetailMap detailMap = scr->entryDetails(componentId);
 
     QString appType = entry->attribute(Hs::swTypeKey);
 
-    
+
     //TODO: Should we display something In that case?
     if (detailMap.size() < 1){
         stateExited();
         return;
     }
-    
+
     HbDocumentLoader loader;
     bool loadStatusOk = false;
     loader.load(HS_DETAILS_DIALOG_LAYOUT, &loadStatusOk);
@@ -115,7 +119,7 @@
         mDialog->setTimeout(HbPopup::NoTimeout);
         mDialog->setAttribute(Qt::WA_DeleteOnClose, true);
         mDialog->actions()[0]->setParent(mDialog);
-        
+
         setFieldPresentation(CaSoftwareRegistry::componentNameKey(),
             detailMap, loader);
         setFieldPresentation(CaSoftwareRegistry::componentVersionKey(),
@@ -135,12 +139,12 @@
             setFieldPresentation(CaSoftwareRegistry::componentProtectionDomainKey(),
                 detailMap, loader);
         }
-        
+
         QScopedPointer<HsMenuEntryRemovedHandler> entryObserver(
             new HsMenuEntryRemovedHandler(entryId, this, SIGNAL(exit())));
-        
+
         entryObserver.take()->setParent(mDialog);
-        
+
         mDialog->open(this, SLOT(stateExited()));
     } else {
         stateExited();
--- a/homescreenapp/widgetplugins/hsclockwidgetplugin/hsclockwidgetplugin.pro	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/widgetplugins/hsclockwidgetplugin/hsclockwidgetplugin.pro	Fri Sep 17 08:27:54 2010 +0300
@@ -22,7 +22,9 @@
 
 LIBS += -lhsdomainmodel
 
-PLUGIN_SUBDIR = /private/20022F35/import/widgetregistry/20022F6C
+WIDGET_SUBDIR = /private/20022F35/import/widgetregistry/20022F6C
+PLUGIN_SUBDIR = /resource/qt/plugins/homescreen
+
 include(../../common.pri)
 
 DEPENDPATH += ./inc \
@@ -43,6 +45,6 @@
 
 RESOURCES = hsclockwidgetplugin.qrc
 
-exportResources(./resource/*.manifest, $$PLUGIN_SUBDIR)
-exportResources(./resource/*.png, $$PLUGIN_SUBDIR)
-exportResources(./resource/*.svg, $$PLUGIN_SUBDIR)
+exportResources(./resource/*.manifest, $$WIDGET_SUBDIR)
+exportResources(./resource/*.png, $$WIDGET_SUBDIR)
+exportResources(./resource/*.svg, $$WIDGET_SUBDIR)
--- a/homescreenapp/widgetplugins/hsclockwidgetplugin/src/hsclockwidget.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/widgetplugins/hsclockwidgetplugin/src/hsclockwidget.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -35,8 +35,6 @@
     const char DIGITAL[] = "digital";
     const char TIME12[] = "TIME12";
     const char TIME24[] = "TIME24";
-
-    const int clockUpdateInterval = 1000; // msec
 }
 
 #ifdef Q_OS_SYMBIAN
--- a/homescreenapp/widgetplugins/hsshortcutwidgetplugin/hsshortcutwidgetplugin.pro	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/widgetplugins/hsshortcutwidgetplugin/hsshortcutwidgetplugin.pro	Fri Sep 17 08:27:54 2010 +0300
@@ -20,7 +20,8 @@
 
 HB += hbfeedback
 
-PLUGIN_SUBDIR = /private/20022F35/import/widgetregistry/20022F46
+WIDGET_SUBDIR = /private/20022F35/import/widgetregistry/20022F46
+PLUGIN_SUBDIR = /resource/qt/plugins/homescreen
 
 include(../../common.pri)
 
@@ -42,4 +43,4 @@
     TARGET.UID3 = 0x20022F46
 }
 
-exportResources(./resource/*.manifest, $$PLUGIN_SUBDIR)
+exportResources(./resource/*.manifest, $$WIDGET_SUBDIR)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_definition.xml	Fri Sep 17 08:27:54 2010 +0300
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="homescreen" name="Home Screen Apps" levels="support task ss hs">
+    <collection id="homescreen_test" name="Home Screen Test" level="support">
+    <component id="homescreen_tsrc_build" name="Home Screen Test Build" filter="s60,test,unit_test">
+      <unit bldFile="tsrc" qt:proFile="tsrc.pro" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
+     </component>
+    </collection>
+  <collection id="homescreenapp" name="Home Screen Application" level="hs">
+	<component id="hsutils" name="Home Screen Utils" introduced="^4" filter="s60">
+      <unit bldFile="homescreenapp/hsutils" qt:proFile="hsutils.pro" qt:qmakeArgs="-r -config rom"/>
+     </component>
+	<component id="hsdomainmodel" name="HS Domain Model" introduced="^4" filter="s60">
+      <unit bldFile="homescreenapp/hsdomainmodel" qt:proFile="hsdomainmodel.pro" qt:qmakeArgs="-r -config rom"/>
+     </component>
+	<component id="hs_serviceproviders" name="HS Service Providers" introduced="^4" class="plugin" filter="s60">
+      <unit bldFile="homescreenapp/serviceproviders" qt:proFile="serviceproviders.pro" qt:qmakeArgs="-r -config rom"/>
+     </component>
+	<component id="hs_stateplugins" name="HS State Plugins" introduced="^4" class="plugin" filter="s60">
+      <unit bldFile="homescreenapp/stateplugins" qt:proFile="stateplugins.pro" qt:qmakeArgs="-r -config rom"/>
+     </component>
+	<component id="hs_widgetplugins" name="HS Widget Plugins" introduced="^4" class="plugin" filter="s60">
+      <unit bldFile="homescreenapp/widgetplugins" qt:proFile="widgetplugins.pro" qt:qmakeArgs="-r -config rom"/>
+     </component>
+	<component id="hsapplication" name="Home Screen Application" introduced="^4" filter="s60">
+      <unit bldFile="homescreenapp/hsapplication" qt:proFile="hsapplication.pro" qt:qmakeArgs="-r -config rom"/>
+     </component>
+	<component id="hsmenuclientplugin" name="Home Screen Menu Client Plugin" introduced="^4" class="plugin" filter="s60">
+      <unit bldFile="homescreenapp/hsmenuclientplugin" qt:proFile="hsmenuclientplugin.pro" qt:qmakeArgs="-r -config rom"/>
+     </component>
+	<component id="hshomescreenclientplugin" name="HS Menu Client Plugin" introduced="^4" class="plugin" filter="s60">
+      <unit bldFile="homescreenapp/hshomescreenclientplugin" qt:proFile="hshomescreenclientplugin.pro" qt:qmakeArgs="-r -config rom"/>
+     </component>
+	<component id="hswidgetuninstaller" name="HS Widget Uninstaller" introduced="^4" filter="s60">
+      <unit bldFile="homescreenapp/hswidgetuninstaller" qt:proFile="hswidgetuninstaller.pro" qt:qmakeArgs="-r -config rom"/>
+     </component>
+	<component id="hsapplicationlauncher" name="HS Application Launcher" introduced="^4" class="plugin" filter="s60">
+      <unit bldFile="homescreenapp/hsapplicationlauncher" qt:proFile="hsapplicationlauncher.pro" qt:qmakeArgs="-r -config rom"/>
+     </component>
+	<component id="homescreenapp_rom" name="Home Screen App ROM" introduced="^4" filter="s60">
+      <unit bldFile="homescreenapp/rom"/>
+     </component>
+    </collection>
+  <collection id="screensaver" name="Screen Saver" level="ss">
+	<!-- break collection into components, or move down a dir and make it a component -->
+    <component id="screensaver_build" name="Screen Saver Build" filter="s60">
+      <unit bldFile="screensaver" qt:proFile="screensaver.pro" qt:qmakeArgs="-r -config rom"/>
+     </component>
+    </collection>
+ </package>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_map.xml	Fri Sep 17 08:27:54 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="app"/>
--- a/screensaver/bwins/screensavermodelu.def	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/bwins/screensavermodelu.def	Fri Sep 17 08:27:54 2010 +0300
@@ -54,5 +54,5 @@
 	?handleDeactivatedIndicator@Screensaver@@QAEXPAVHbIndicatorInterface@@@Z @ 53 NONAME ; void Screensaver::handleDeactivatedIndicator(class HbIndicatorInterface *)
 	?onHandleActiveIndicators@Screensaver@@MAEXABV?$QList@PAVHbIndicatorInterface@@@@@Z @ 54 NONAME ; void Screensaver::onHandleActiveIndicators(class QList<class HbIndicatorInterface *> const &)
 	?handleActiveIndicators@Screensaver@@QAEXABV?$QList@PAVHbIndicatorInterface@@@@@Z @ 55 NONAME ; void Screensaver::handleActiveIndicators(class QList<class HbIndicatorInterface *> const &)
-	?screenPowerModeRequested@Screensaver@@IAEXW4ScreenPowerMode@1@@Z @ 56 NONAME ; void Screensaver::screenPowerModeRequested(enum Screensaver::ScreenPowerMode)
+	?activeAreaMoved@Screensaver@@IAEXXZ @ 56 NONAME ; void Screensaver::activeAreaMoved(void)
 
--- a/screensaver/common.pri	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/common.pri	Fri Sep 17 08:27:54 2010 +0300
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2009 - 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"
--- a/screensaver/devicedialogplugins/snsrdevicedialogplugin/inc/snsrdevicedialog.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/devicedialogplugins/snsrdevicedialogplugin/inc/snsrdevicedialog.h	Fri Sep 17 08:27:54 2010 +0300
@@ -27,10 +27,10 @@
 #include "snsrtest_global.h"
 
 class Screensaver;
-class SnsrUserActivityServiceInterface;
 class QGraphicsLinearLayout;
-class XQSettingsManager;
 class HbIndicatorInterface;
+class SnsrDeviceDialogDisplayControl;
+class QTimer;
 
 SCREENSAVER_TEST_CLASS(T_SnsrDeviceDialogPlugin)
 
@@ -54,8 +54,6 @@
     };
     
     static const char *dataKeyUnlock;
-    static const char *dataKeySwitchLights;
-    static const char *dataKeySwitchLowPower;
 
 public: // methods
 
@@ -76,25 +74,30 @@
 
     void changeView(QGraphicsWidget *widget);
     void screensaverFaulted();
-    void changeLayout(Qt::Orientation);
+    void handleOrientationChange(Qt::Orientation);
+    void changeLayout();
+    void updateDisplayMode();
+    void updateDisplayModeDeferred();
     void requestUnlock();
-    void requestScreenMode(Screensaver::ScreenPowerMode mode);
     // slots for signals emitted by HbIndicatorPluginManager
     void indicatorsActivated(const QList<HbIndicatorInterface*> &activatedIndicators);
     void indicatorActivated(HbIndicatorInterface *activatedIndicator);
-    void indicatorRemoved(HbIndicatorInterface *indicatorRemoved);
+    void indicatorDeactivated(HbIndicatorInterface *deactivatedIndicator);
 
 private:
 
     void showEvent(QShowEvent *event);
     void hideEvent(QHideEvent *event);
     void closeEvent(QCloseEvent *event);
+    bool event(QEvent *event);
 
 private:
 
     Screensaver *mScreensaver;
     QGraphicsLinearLayout *mLayout;
-    XQSettingsManager *m_setManager;
+    SnsrDeviceDialogDisplayControl *mDisplayControl;
+    QTimer *mDisplayModeTimer;
+    bool mHasFocus;
     
     SCREENSAVER_TEST_FRIEND_CLASS(T_SnsrDeviceDialogPlugin)
 };
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/screensaver/devicedialogplugins/snsrdevicedialogplugin/inc/snsrdevicedialogdisplaycontrol.h	Fri Sep 17 08:27:54 2010 +0300
@@ -0,0 +1,49 @@
+/*
+* 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: Platform agnostic Qt wrapper class for controlling display
+*              power save mode. The power save mode gets actually activated
+*              only on Symbian environment; in other environments the provided
+*              functions do nothing.
+*              The use of Symbian display power save API has been wrapped with
+*              client-server pair because HbDeviceDialogs don't have enough
+*              capabilities to call that API directly.
+*/
+
+#ifndef SNSRDEVICEDIALOGDISPLAYCONTROL_H
+#define SNSRDEVICEDIALOGDISPLAYCONTROL_H
+
+#ifdef Q_OS_SYMBIAN
+#include "snsrdisplaycontrolclient.h"
+#endif
+
+class SnsrDeviceDialogDisplayControl
+{
+
+public:
+
+    SnsrDeviceDialogDisplayControl();
+    ~SnsrDeviceDialogDisplayControl();
+
+    void setDisplayFullPower();
+    void setDisplayLowPower( int startRow, int endRow );
+    void setDisplayOff();
+
+private:
+    
+#ifdef Q_OS_SYMBIAN
+    RSnsrDisplayControlClient mDisplayClient;
+#endif
+};
+
+#endif // SNSRDEVICEDIALOGDISPLAYCONTROL_H
--- a/screensaver/devicedialogplugins/snsrdevicedialogplugin/snsrdevicedialogplugin.pro	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/devicedialogplugins/snsrdevicedialogplugin/snsrdevicedialogplugin.pro	Fri Sep 17 08:27:54 2010 +0300
@@ -25,6 +25,8 @@
 LIBS += -lscreensavermodel
 
 symbian: {
+    LIBS += -lsnsrdisplaycontrolclient
+
     TARGET.UID3 = 0x2002704E
     TARGET.CAPABILITY = CAP_ECOM_PLUGIN
     
--- a/screensaver/devicedialogplugins/snsrdevicedialogplugin/src/snsrdevicedialog.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/devicedialogplugins/snsrdevicedialogplugin/src/snsrdevicedialog.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -22,6 +22,7 @@
 #include <QServiceManager>
 #include <QServiceFilter>
 #include <QServiceInterfaceDescriptor>
+#include <QTimer>
 #include <XQSettingsManager>
 #include <HbMainWindow>
 #include <HbIndicatorInterface>
@@ -29,6 +30,7 @@
 #include <screensaver.h>
 #include <screensaverdomaincrkeys.h>
 #include "snsrdevicedialog.h"
+#include "snsrdevicedialogdisplaycontrol.h"
 
 const char *gBigClockInterfaceName = "com.nokia.screensaver.ISnsrBigClockScreensaver";
 
@@ -41,8 +43,6 @@
 extern const char *lViewType;
 
 const char *SnsrDeviceDialog::dataKeyUnlock = "unlock";
-const char *SnsrDeviceDialog::dataKeySwitchLights = "switch_lights";
-const char *SnsrDeviceDialog::dataKeySwitchLowPower = "switch_low_power";
 
 QTM_USE_NAMESPACE
 
@@ -52,10 +52,12 @@
     \param parent Parent.
  */
 SnsrDeviceDialog::SnsrDeviceDialog(const QVariantMap &parameters, QGraphicsItem *parent) :
-        HbPopup(parent), 
-        mScreensaver(0), 
-        mLayout(0), 
-        m_setManager(0)
+        HbPopup(parent),
+        mScreensaver(0),
+        mLayout(0),
+        mDisplayControl(0),
+        mDisplayModeTimer(0),
+        mHasFocus(false)
 {
     qDebug("SnsrDeviceDialog::SnsrDeviceDialog()");
 
@@ -81,8 +83,8 @@
         SLOT(screensaverFaulted()));
     connect( mScreensaver, SIGNAL(unlockRequested()),
         SLOT(requestUnlock()) );
-    connect( mScreensaver, SIGNAL(screenPowerModeRequested(Screensaver::ScreenPowerMode)),
-        SLOT(requestScreenMode(Screensaver::ScreenPowerMode)) );
+    connect( mScreensaver, SIGNAL(activeAreaMoved()),
+        SLOT(updateDisplayMode()) );
     
     mScreensaver->initialize();
 
@@ -94,6 +96,11 @@
     mainWindow()->setAutomaticOrientationEffectEnabled(false);
 
     setDeviceDialogParameters( parameters );
+    
+    mDisplayControl = new SnsrDeviceDialogDisplayControl();
+    
+    mDisplayModeTimer = new QTimer(this);
+    connect( mDisplayModeTimer, SIGNAL(timeout()), SLOT(updateDisplayMode()) );
 }
 
 /*!
@@ -104,6 +111,13 @@
     qDebug("SnsrDeviceDialog::~SnsrDeviceDialog()");
     QServiceManager serviceManager;
     serviceManager.removeService(gBigClockInterfaceName);
+
+    // We should get the FocusOut event when closing, but deactivate the
+    // power save also here in case we haven't got the event for some reason.
+    if ( mDisplayControl ) {
+        mDisplayControl->setDisplayFullPower();
+        delete mDisplayControl;
+    }
 }
 
 /*!
@@ -134,14 +148,11 @@
         int startupView = 0; 
         XQCentralRepositorySettingsKey settingsKey(
                  KCRUidScreensaverSettings.iUid, KScreensaverStartupView ); // TUid as same repository used in control panel via Symbian APIs 
-        m_setManager = new XQSettingsManager(this);
-        if (m_setManager) {
-            startupView = m_setManager->readItemValue(settingsKey, XQSettingsManager::TypeInt).toInt();
-            error = m_setManager->error();
-            if (error == XQSettingsManager::NoError) {
-                viewType = startupView;
-            }
-            delete m_setManager;
+        XQSettingsManager settingsManager;
+        startupView = settingsManager.readItemValue(settingsKey, XQSettingsManager::TypeInt).toInt();
+        error = settingsManager.error();
+        if (error == XQSettingsManager::NoError) {
+            viewType = startupView;
         }
     }
 
@@ -204,11 +215,11 @@
     // showEvent is called for HbDeviceDialogManager showDeviceDialog()
     // and for HbPopup itemChange(), both events are set to QEvent::Show type
     disconnect(mainWindow(), SIGNAL(orientationChanged(Qt::Orientation)),
-        this, SLOT(changeLayout(Qt::Orientation)));
+        this, SLOT(handleOrientationChange(Qt::Orientation)));
     connect(mainWindow(), SIGNAL(orientationChanged(Qt::Orientation)),
-        this, SLOT(changeLayout(Qt::Orientation)));
+        this, SLOT(handleOrientationChange(Qt::Orientation)));
 
-    changeLayout(mainWindow()->orientation());
+    changeLayout();
 }
 
 #ifdef COVERAGE_MEASUREMENT
@@ -242,11 +253,32 @@
     HbPopup::closeEvent(event);
 
     disconnect(mainWindow(), SIGNAL(orientationChanged(Qt::Orientation)), 
-        this, SLOT(changeLayout(Qt::Orientation)));
+        this, SLOT(handleOrientationChange(Qt::Orientation)));
     mScreensaver->close();
 }
 
 /*!
+    Handle focus in/out events and just pass through the rest of the events
+ */
+bool SnsrDeviceDialog::event(QEvent *event)
+{
+    if ( event->type() == QEvent::FocusOut ) {
+        mHasFocus = false;
+        // Some other dialog came on top of us (or dialog was closed).
+        // Set screen to full power.
+        mDisplayModeTimer->stop();
+        mDisplayControl->setDisplayFullPower();
+    }
+    else if ( event->type() == QEvent::FocusIn ) {
+        mHasFocus = true;
+        // We became (again) the top-most dialog. Switch screen to
+        // applicable power mode.
+        updateDisplayModeDeferred();
+    }
+    return HbPopup::event(event);
+}
+
+/*!
     Replaces layout's item.
     \param widget New item to be added to layout.
  */
@@ -263,15 +295,20 @@
         mLayout->removeAt(0);
     }
     if (widget) {
-        widget->show();
         mLayout->addItem(widget);
-
+        
+        // Update layout and display mode immediately if view is
+        // changed while Screensaver is visible. This is the case when
+        // mode changes from standby to active or vice versa. In case of the
+        // initial view setting, Screensaver is not yet visible, and the update
+        // will happen later on Show/FocusIn events.
         if ( isVisible() ) {
-           changeLayout( mainWindow()->orientation() );
+           changeLayout();
+           updateDisplayMode();
         }
+        
+        widget->show();
     }
-    
-
 }
 
 /*!
@@ -284,13 +321,21 @@
 }
 
 /*!
-    Resize device dialog.
+    Handle orientation change event
     \param orientation New orientation value.
  */
-void SnsrDeviceDialog::changeLayout(Qt::Orientation orientation)
+void SnsrDeviceDialog::handleOrientationChange(Qt::Orientation orientation)
 {
     Q_UNUSED(orientation)
-    
+    changeLayout();
+    updateDisplayMode();
+}
+
+/*!
+    Resize device dialog.
+ */
+void SnsrDeviceDialog::changeLayout()
+{
     QRectF rect = mainWindow()->layoutRect();
     setMinimumSize( rect.size() );
     setPreferredPos( QPointF(0,0) );
@@ -301,6 +346,49 @@
 }
 
 /*!
+    Update power mode of the display device
+ */
+void SnsrDeviceDialog::updateDisplayMode()
+{
+    // Cancel any pending deferred update order
+    mDisplayModeTimer->stop();
+    
+    // Check desidred display power mode from screensaver but only when
+    // we are the top-most device dialog. If some other dialog is on top of us, 
+    // then always default to full power mode.
+    Screensaver::ScreenPowerMode mode( Screensaver::ScreenModeFullPower );
+    if ( mHasFocus ) {
+        mode = mScreensaver->currentPowerMode();
+    }
+    
+    switch ( mode ) {
+        case Screensaver::ScreenModeOff: {
+            mDisplayControl->setDisplayOff();
+            break;
+        }
+        case Screensaver::ScreenModeLowPower: {
+            int firstRow(-1);
+            int lastRow(-1);
+            mScreensaver->getActiveScreenRows(&firstRow, &lastRow);
+            mDisplayControl->setDisplayLowPower(firstRow, lastRow);
+            break;
+        }
+        case Screensaver::ScreenModeFullPower: {
+            mDisplayControl->setDisplayFullPower();
+            break;
+        }
+    }
+}
+
+/*!
+    Update power mode of the display device after a short delay
+ */
+void SnsrDeviceDialog::updateDisplayModeDeferred()
+{
+    mDisplayModeTimer->start(200); // milliseconds
+}
+
+/*!
     Send unlock signal to autolock.
  */
 void SnsrDeviceDialog::requestUnlock()
@@ -311,36 +399,6 @@
 }
 
 /*!
-    Send low power mode on/off request to autolock.
- */
-void SnsrDeviceDialog::requestScreenMode(Screensaver::ScreenPowerMode mode)
-{
-    /* TEMPORARY FIX for the "black screen jam" bug. To be re-enabled when proper fix is found.
-    QVariantMap data;
-    QVariantList rowLimits;
-    if ( mode == Screensaver::ScreenModeOff ) {
-        data.insert(dataKeySwitchLights, 0);
-        data.insert(dataKeySwitchLowPower, rowLimits); // empty list means "low power off"
-    }
-    else if ( mode == Screensaver::ScreenModeLowPower ) {
-        //data.insert(dataKeySwitchLights, 0);
-        int firstRow;
-        int lastRow;
-        mScreensaver->getActiveScreenRows(&firstRow, &lastRow);
-        rowLimits.append( firstRow );
-        rowLimits.append( lastRow );
-        data.insert(dataKeySwitchLowPower, rowLimits);
-    }
-    else if ( mode == Screensaver::ScreenModeFullPower ) {
-        data.insert(dataKeySwitchLights, 30);
-        data.insert(dataKeySwitchLowPower, rowLimits); // empty list means "low power off"
-    }
-    
-    emit deviceDialogData(data);
-    */
-}
-
-/*!
     Called when the dialog is created if they are any currently
     activate universal indicators present.
  */
@@ -363,10 +421,10 @@
 /*!
     Called when some universal indicator is deactivated.
  */
-void SnsrDeviceDialog::indicatorRemoved(
-        HbIndicatorInterface *indicatorRemoved)
+void SnsrDeviceDialog::indicatorDeactivated(
+        HbIndicatorInterface *deactivatedIndicator)
 {
-    mScreensaver->handleDeactivatedIndicator(indicatorRemoved);
+    mScreensaver->handleDeactivatedIndicator(deactivatedIndicator);
 }
 
 // end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/screensaver/devicedialogplugins/snsrdevicedialogplugin/src/snsrdevicedialogdisplaycontrol.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -0,0 +1,85 @@
+/*
+* 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: Platform agnostic Qt wrapper class for controlling display
+*              power save mode. The power save mode gets actually activated
+*              only on Symbian environment; in other environments the provided
+*              functions do nothing.
+*              The use of Symbian display power save API has been wrapped with
+*              client-server pair because HbDeviceDialogs don't have enough
+*              capabilities to call that API directly.
+*/
+
+#include <qglobal.h>
+#include <qdebug.h>
+#include "snsrdevicedialogdisplaycontrol.h"
+
+/*!
+    Constructor
+ */
+SnsrDeviceDialogDisplayControl::SnsrDeviceDialogDisplayControl()
+{
+#ifdef Q_OS_SYMBIAN
+    int error = mDisplayClient.Open();
+    if ( error ) {
+        qWarning() << QString("Opening Display Control Client failed, error code %1").arg(error);
+    }
+#endif
+}
+
+/*!
+    Destructor
+ */
+SnsrDeviceDialogDisplayControl::~SnsrDeviceDialogDisplayControl()
+{
+#ifdef Q_OS_SYMBIAN
+    mDisplayClient.Close();
+#endif
+}
+
+/*!
+    Set display to full power mode (the normal mode).
+*/
+void SnsrDeviceDialogDisplayControl::setDisplayFullPower()
+{
+#ifdef Q_OS_SYMBIAN
+    mDisplayClient.SetDisplayFullPower();
+#endif
+}
+
+/*!
+    Set display to low-power/partial mode. The area outside of set active area
+    is left completely black.
+    \param  startRow    The first active screen row in the native orientation of the display device.
+    \param  endRow      The last active screen row in the native orientation of the display device. 
+ */
+void SnsrDeviceDialogDisplayControl::setDisplayLowPower( int startRow, int endRow )
+{
+#ifdef Q_OS_SYMBIAN
+    mDisplayClient.SetDisplayLowPower( startRow, endRow );
+#else
+    Q_UNUSED( startRow );
+    Q_UNUSED( endRow );
+#endif
+}
+
+/*!
+    Set display device off.
+*/
+void SnsrDeviceDialogDisplayControl::setDisplayOff()
+{
+#ifdef Q_OS_SYMBIAN
+    mDisplayClient.SetDisplayOff();
+#endif
+}
+
--- a/screensaver/eabi/screensavermodelu.def	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/eabi/screensavermodelu.def	Fri Sep 17 08:27:54 2010 +0300
@@ -53,5 +53,5 @@
 	_ZN11Screensaver26handleDeactivatedIndicatorEP20HbIndicatorInterface @ 52 NONAME
 	_ZN11Screensaver26onHandleActivatedIndicatorEP20HbIndicatorInterface @ 53 NONAME
 	_ZN11Screensaver28onHandleDeactivatedIndicatorEP20HbIndicatorInterface @ 54 NONAME
-	_ZN11Screensaver24screenPowerModeRequestedENS_15ScreenPowerModeE @ 55 NONAME
+	_ZN11Screensaver15activeAreaMovedEv @ 55 NONAME
 
--- a/screensaver/rom/screensaver.iby	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/rom/screensaver.iby	Fri Sep 17 08:27:54 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009 - 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"
@@ -37,11 +37,4 @@
 
 file=ABI_DIR\BUILD_DIR\snsrutils.dll    SHARED_LIB_DIR\snsrutils.dll
 
-// ---- themes patch --------------------------------------------
-data=\epoc32\data\z\resource\hb\themes\icons\sfblacktheme\scalable\oled-clock-background.svg      resource\hb\themes\icons\sfblacktheme\scalable\oled-clock-background.svg
-data=\epoc32\data\z\resource\hb\themes\icons\sfblacktheme\scalable\oled-clock-date-frame.svg      resource\hb\themes\icons\sfblacktheme\scalable\oled-clock-date-frame.svg
-data=\epoc32\data\z\resource\hb\themes\icons\sfblacktheme\scalable\oled-clock-hour-hand.svg       resource\hb\themes\icons\sfblacktheme\scalable\oled-clock-hour-hand.svg
-data=\epoc32\data\z\resource\hb\themes\icons\sfblacktheme\scalable\oled-clock-minute-hand.svg     resource\hb\themes\icons\sfblacktheme\scalable\oled-clock-minute-hand.svg
-data=\epoc32\data\z\resource\hb\themes\icons\sfblacktheme\scalable\drawing.svg      resource\hb\themes\icons\sfblacktheme\scalable\drawing.svg
-
 #endif //__SCREENSAVERAPP_IBY__
--- a/screensaver/screensaver.pro	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/screensaver.pro	Fri Sep 17 08:27:54 2010 +0300
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2009 - 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"
@@ -23,4 +23,7 @@
 
 CONFIG += ordered
 
-symbian:include(screensaver_exports_to_rom.pri)
+symbian: {
+    include(screensaver_exports_to_rom.pri)
+    SUBDIRS += snsrdisplaycontrol_s60/group
+}
--- a/screensaver/screensavermodel/inc/screensaver.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/screensavermodel/inc/screensaver.h	Fri Sep 17 08:27:54 2010 +0300
@@ -54,6 +54,7 @@
     virtual ~Screensaver();
 
     ScreensaverState currentState();
+    virtual Screensaver::ScreenPowerMode currentPowerMode() = 0;
     virtual void getActiveScreenRows(int *firstActiveRow, int *lastActiveRow) = 0;
     virtual void updateLayout() = 0;
 
@@ -90,7 +91,7 @@
     void faulted();
     void viewChanged(QGraphicsWidget *widget);
     void unlockRequested();
-    void screenPowerModeRequested(Screensaver::ScreenPowerMode mode);
+    void activeAreaMoved();
 
 private:
 
--- a/screensaver/screensavermodel/src/screensaver.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/screensavermodel/src/screensaver.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009 - 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"
@@ -114,10 +114,9 @@
  */
 
 /*!
-    \fn void Screensaver::screenPowerModeRequested(ScreenPowerMode mode)
+    \fn void Screensaver::activeAreaMoved()
 
-    This signal is emitted when screensaver wants to switch the power
-    mode of the screen, or update the visible area in power save mode.
+    This signal is emitted when active area of power-save mode screensaver has moved.
  */
 
 /*!
@@ -130,6 +129,13 @@
 }
 
 /*!
+    \fn virtual Screensaver::ScreenPowerMode currentPowerMode() = 0
+
+    Inherited screensavers must implement this function to return the
+    display power mode to be used in the current state.
+ */
+
+/*!
     \fn virtual void getActiveScreenRows(int *firstActiveRow, int *lastActiveRow) = 0
 
     Inherited screensavers must implement this function to return the rows where 
--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/inc/snsrbigclockcontainer.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/inc/snsrbigclockcontainer.h	Fri Sep 17 08:27:54 2010 +0300
@@ -22,6 +22,7 @@
 
 #include "snsrtest_global.h"
 #include "snsrdocumentloader.h"
+#include "screensaver.h"
 
 SCREENSAVER_TEST_CLASS(T_SnsrBigClockScreensaverPlugin)
 
@@ -47,6 +48,7 @@
 public:
     
     void setIndicatorModel(SnsrIndicatorModel &model);
+    virtual Screensaver::ScreenPowerMode displayPowerMode();
     virtual void getActiveScreenRows(int *firstActiveRow, int *lastActiveRow);
     virtual bool isOrientationLocked();
     virtual int updateIntervalInMilliseconds() = 0;
--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/inc/snsrbigclockscreensaver.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/inc/snsrbigclockscreensaver.h	Fri Sep 17 08:27:54 2010 +0300
@@ -61,12 +61,13 @@
     virtual void onHandleActiveIndicators(const QList<HbIndicatorInterface*> &activeIndicators);
     virtual void onHandleActivatedIndicator(HbIndicatorInterface *activatedIndicator);
     virtual void onHandleDeactivatedIndicator(HbIndicatorInterface *deactivatedIndicator);
+    virtual Screensaver::ScreenPowerMode currentPowerMode();
     virtual void getActiveScreenRows(int *firstActiveRow, int *lastActiveRow);
     virtual void updateLayout();
 
 private slots:
 
-    void updateActiveAreaForLowPower();
+    void updateTime();
 
 private:
 
--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/inc/snsrblankcontainer.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/inc/snsrblankcontainer.h	Fri Sep 17 08:27:54 2010 +0300
@@ -37,6 +37,7 @@
 
 public: // from base classes
 
+    virtual Screensaver::ScreenPowerMode displayPowerMode();
     virtual int updateIntervalInMilliseconds();
 
 protected: // from base classes
--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/inc/snsroledanalogclockcontainer.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/inc/snsroledanalogclockcontainer.h	Fri Sep 17 08:27:54 2010 +0300
@@ -42,6 +42,7 @@
 public: // from base classes
 
     virtual int updateIntervalInMilliseconds();
+    virtual Screensaver::ScreenPowerMode displayPowerMode();
     virtual void getActiveScreenRows(int *firstActiveRow, int *lastActiveRow);
     virtual bool isOrientationLocked();
 
--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/inc/snsroleddigitalclockcontainer.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/inc/snsroleddigitalclockcontainer.h	Fri Sep 17 08:27:54 2010 +0300
@@ -43,6 +43,7 @@
 public: // from base classes
 
     virtual int updateIntervalInMilliseconds();
+    virtual Screensaver::ScreenPowerMode displayPowerMode();
     virtual void getActiveScreenRows(int *firstActiveRow, int *lastActiveRow);
     virtual bool isOrientationLocked();
     
--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaveranalog.docml	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaveranalog.docml	Fri Sep 17 08:27:54 2010 +0300
@@ -9,8 +9,8 @@
                 <sizehint height="32.8un" type="PREFERRED" width="32.8un"/>
             </widget>
             <widget name="indicatorWidget" type="SnsrIndicatorWidget">
-                <sizehint height="2.5un" type="PREFERRED"/>
-                <sizehint width="2.5un" type="MINIMUM"/>
+                <sizehint height="2.4un" type="PREFERRED"/>
+                <sizehint width="2.4un" type="MINIMUM"/>
                 <sizepolicy horizontalPolicy="Expanding" verticalPolicy="Preferred"/>
                 <real name="z" value="2"/>
             </widget>
--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaverdigital.docml	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaverdigital.docml	Fri Sep 17 08:27:54 2010 +0300
@@ -21,8 +21,8 @@
                 <string name="alignment" value="AlignVCenter|AlignHCenter"/>
              </widget>
              <widget name="indicatorWidget" type="SnsrIndicatorWidget">
-                <sizehint type="MINIMUM" width="2.5un"/>
-                <sizehint height="2.5un" type="PREFERRED"/>
+                <sizehint type="MINIMUM" width="2.4un"/>
+                <sizehint height="2.4un" type="PREFERRED"/>
                 <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
                 <real name="z" value="3"/>
               </widget>
--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaveroledanalog.docml	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaveroledanalog.docml	Fri Sep 17 08:27:54 2010 +0300
@@ -5,14 +5,14 @@
             <sizehint height="var(hb-param-screen-height)" type="PREFERRED" width="var(hb-param-screen-width)"/>
             <contentsmargins bottom="var(hb-param-margin-gene-bottom)" left="var(hb-param-margin-gene-left)" right="var(hb-param-margin-gene-right)" top="var(hb-param-margin-gene-top)"/>
             <widget name="clockContainer" type="HbWidget">
-                <sizehint height="expr( 32.8un + 2.5un + var(hb-param-text-height-tiny) + var(hb-param-margin-gene-top) + var(hb-param-margin-gene-bottom) + var(hb-param-margin-gene-bottom) + var(hb-param-margin-gene-top) )" type="PREFERRED" width="45un"/>
+                <sizehint height="expr( 32.8un + 2.4un + var(hb-param-text-height-tiny) + var(hb-param-margin-gene-top) + var(hb-param-margin-gene-bottom) + var(hb-param-margin-gene-bottom) + var(hb-param-margin-gene-top) )" type="PREFERRED" width="45un"/>
                 <widget name="oledAnalogClockWidget" type="SnsrOledClockWidget">
                     <real name="z" value="1"/>
                     <sizehint height="32.8un" type="PREFERRED" width="32.8un"/>
                 </widget>
                 <widget name="indicatorWidget" type="SnsrIndicatorWidget">
-                    <sizehint height="2.5un" type="PREFERRED"/>
-                    <sizehint width="2.5un" type="MINIMUM"/>
+                    <sizehint height="2.4un" type="PREFERRED"/>
+                    <sizehint width="2.4un" type="MINIMUM"/>
                     <sizepolicy horizontalPolicy="Expanding" verticalPolicy="Preferred"/>
                     <real name="z" value="2"/>
                 </widget>
--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaveroleddigital.docml	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaveroleddigital.docml	Fri Sep 17 08:27:54 2010 +0300
@@ -5,7 +5,7 @@
             <sizehint height="var(hb-param-screen-height)" type="PREFERRED" width="var(hb-param-screen-width)"/>
             <contentsmargins bottom="var(hb-param-margin-gene-bottom)" left="var(hb-param-margin-gene-left)" right="var(hb-param-margin-gene-right)" top="var(hb-param-margin-gene-top)"/>
             <widget name="clockContainer" type="HbWidget">
-                <sizehint height="expr(var(hb-param-text-height-primary)+(0.5un)+(14.7un)+var(hb-param-margin-gene-top)+(2.5un)+var(hb-param-margin-gene-bottom)+var(hb-param-text-height-tiny) + var(hb-param-margin-gene-bottom) + var(hb-param-margin-gene-top) )" type="PREFERRED" width="45un"/>
+                <sizehint height="expr(var(hb-param-text-height-primary)+(0.5un)+(14.7un)+var(hb-param-margin-gene-top)+(2.4un)+var(hb-param-margin-gene-bottom)+var(hb-param-text-height-tiny) + var(hb-param-margin-gene-bottom) + var(hb-param-margin-gene-top) )" type="PREFERRED" width="45un"/>
                 <real name="z" value="1"/>
                 <widget name="amPmLabel" type="SnsrLabel">
                     <sizehint type="MINIMUM" width="1.0un"/>
@@ -24,8 +24,8 @@
                     <string name="alignment" value="AlignVCenter|AlignHCenter"/>
                 </widget>
                 <widget name="indicatorWidget" type="SnsrIndicatorWidget">
-                    <sizehint type="MINIMUM" width="2.5un"/>
-                    <sizehint height="2.5un" type="PREFERRED"/>
+                    <sizehint type="MINIMUM" width="2.4un"/>
+                    <sizehint height="2.4un" type="PREFERRED"/>
                     <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
                     <real name="z" value="3"/>
                 </widget>
--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/inc/snsroledtimelabel.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/inc/snsroledtimelabel.h	Fri Sep 17 08:27:54 2010 +0300
@@ -36,14 +36,6 @@
     
     virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
 
-protected:
-    
-    virtual void changeEvent(QEvent *event);
-
-private:
-
-    void setThemedTextColor();
-    
 private:
         
     Q_DISABLE_COPY(SnsrOledTimeLabel)
--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/src/snsroledtimelabel.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/src/snsroledtimelabel.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -18,11 +18,9 @@
 #include "snsroledtimelabel.h"
 
 #include <hbevent.h>
-#include <hbcolorscheme.h>
 #include <QPainter>
 
 
-const QString snsrForegroundColorRole("snsrforeground");
 
 /*!
     \class SnsrOledTimeLabel
@@ -38,7 +36,7 @@
 SnsrOledTimeLabel::SnsrOledTimeLabel(QGraphicsItem *parent)
     : HbTextItem(parent)
 {
-    setThemedTextColor();
+    setTextColor(Qt::white);
     
     setMinimumLines( 1 );
     setMaximumLines( 1 );
@@ -112,30 +110,3 @@
 
 }
 
-/*!
-    \reimp
- */
-void SnsrOledTimeLabel::changeEvent(QEvent * event)
-{
-    if (event->type() == HbEvent::ThemeChanged) {
-        setThemedTextColor();
-    }
-    return HbTextItem::changeEvent(event);
-}
-
-
-/*!
-    Sets the time label's color to follow the theme.
- */
-void SnsrOledTimeLabel::setThemedTextColor()
-{
-    QColor textColor(HbColorScheme::color(snsrForegroundColorRole));
-    if (textColor.isValid()) {
-        setTextColor(textColor);
-    } else {
-        // fallback mechanism when color definition is missing in default theme
-        setTextColor(Qt::white);
-    }
-}
-
-
--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/inc/snsrindicatorwidget.h	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/inc/snsrindicatorwidget.h	Fri Sep 17 08:27:54 2010 +0300
@@ -49,7 +49,9 @@
     
     IndicatorLayoutType layoutType() const;
     void setLayoutType(IndicatorLayoutType type);
-        
+
+    void setPowerSaveModeColor(bool savemode);
+
 public slots:
     
     void showIndicators(const QList<SnsrIndicatorInfo> &indicators);
@@ -64,6 +66,7 @@
 
     QList<HbIconItem*> mIcons;   
     IndicatorLayoutType mLayoutType;
+    bool mPowerSaveModeColor;
 
     Q_DISABLE_COPY(SnsrIndicatorWidget)
     SCREENSAVER_TEST_FRIEND_CLASS(T_SnsrIndicatorWidget)
--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/resource/snsrindicatorwidget.css	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/resource/snsrindicatorwidget.css	Fri Sep 17 08:27:54 2010 +0300
@@ -3,31 +3,31 @@
 }
 
 SnsrIndicatorWidget::icon1 {
-    fixed-width: 2.5un;
-    fixed-height: 2.5un;   
+    fixed-width: 2.4un;
+    fixed-height: 2.4un;   
 }
 
 SnsrIndicatorWidget::icon2 {
-    fixed-width: 2.5un;
-    fixed-height: 2.5un;    
+    fixed-width: 2.4un;
+    fixed-height: 2.4un;    
 }
 
 SnsrIndicatorWidget::icon3 {
-    fixed-width: 2.5un;
-    fixed-height: 2.5un;  
+    fixed-width: 2.4un;
+    fixed-height: 2.4un;  
 }
 
 SnsrIndicatorWidget::icon4 {
-    fixed-width: 2.5un;
-    fixed-height: 2.5un;   
+    fixed-width: 2.4un;
+    fixed-height: 2.4un;   
 }
 
 SnsrIndicatorWidget::icon5 {
-    fixed-width: 2.5un;
-    fixed-height: 2.5un;   
+    fixed-width: 2.4un;
+    fixed-height: 2.4un;   
 }
 
 SnsrIndicatorWidget::icon6 {
-    fixed-width: 2.5un;
-    fixed-height: 2.5un;  
+    fixed-width: 2.4un;
+    fixed-height: 2.4un;  
 }
\ No newline at end of file
--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/resource/snsrindicatorwidget_color.css	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/resource/snsrindicatorwidget_color.css	Fri Sep 17 08:27:54 2010 +0300
@@ -1,29 +1,29 @@
 SnsrIndicatorWidget::icon1 
 {
-    color:var(snsrforeground);
+    color:var(qtc_screensaver);
 }
 
 SnsrIndicatorWidget::icon2 
 {
-    color:var(snsrforeground);
+    color:var(qtc_screensaver);
 }
 
 SnsrIndicatorWidget::icon3 
 {
-    color:var(snsrforeground);
+    color:var(qtc_screensaver);
 }
 
 SnsrIndicatorWidget::icon4 
 {
-    color:var(snsrforeground);
+    color:var(qtc_screensaver);
 }
 
 SnsrIndicatorWidget::icon5 
 {
-    color:var(qtc_snsr_foreground);
+    color:var(qtc_screensaver);
 }
 
 SnsrIndicatorWidget::icon6
 {
-    color:var(qtc_snsr_foreground);
+    color:var(qtc_screensaver);
 }
\ No newline at end of file
--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/src/snsrindicatorwidget.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/src/snsrindicatorwidget.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -43,7 +43,7 @@
     \param parent Parent object.
  */
 SnsrIndicatorWidget::SnsrIndicatorWidget(QGraphicsItem* parent):
-    HbWidget(parent), mLayoutType(IndicatorsCentered)
+    HbWidget(parent), mLayoutType(IndicatorsCentered), mPowerSaveModeColor(false)
 {
     HbStyleLoader::registerFilePath(gIndicatorCssFilePath);
     HbStyleLoader::registerFilePath(gIndicatorWidgetMLFilePath);
@@ -98,6 +98,16 @@
 } 
 
 /*!
+    Set powersave mode status. If save mode is true then we use
+    by default Qt::white as color. Otherwise we use themed color.
+ */
+void SnsrIndicatorWidget::setPowerSaveModeColor(bool savemode)
+{
+    mPowerSaveModeColor = savemode;
+}
+
+
+/*!
     This is called whenever indicators' status changes: parameter list
     tells which indicators should be shown at the given moment. All
     previously shown indicators should be hidden and show only these
@@ -115,10 +125,15 @@
     // TODO: after wk18 color is lost after icon name is set again - bug or what?
     // workaround: ask color from theme and set it again here
     // If this must be left here, then change back-up color to white?
-    QColor iconColor = HbColorScheme::color("snsrforeground"); // TODO: final variable name?
+    QColor iconColor = HbColorScheme::color("qtc_screensaver");
     if (iconColor.spec() == QColor::Invalid ) {
-        iconColor = Qt::magenta;
+        iconColor = Qt::white;
     }
+
+    if ( mPowerSaveModeColor ) {        
+        iconColor = Qt::white;
+    }
+    
     // update icon paths for items that are gonna be shown
     for (int i=0; i < indicatorAmount && i < mIcons.size(); ++i) {
         mIcons.at(i)->setIconName(indicators.at(i).iconPath);
--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrswipewidget/resource/snsrswipewidget_color.css	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrswipewidget/resource/snsrswipewidget_color.css	Fri Sep 17 08:27:54 2010 +0300
@@ -1,10 +1,10 @@
 SnsrSwipeWidget::slideLabel 
 {
-    color:var(snsrforeground);
+    color:var(qtc_screensaver);
 }
 
 SnsrSwipeWidget::slideIcon 
 {
-    color:var(snsrforeground);
+    color:var(qtc_screensaver);
 }
 
--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsranalogclockcontainer.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsranalogclockcontainer.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -87,24 +87,25 @@
     mAnalogClockWidget->tick();
 
     // date
-    if (mCurrentOrientation == Qt::Vertical) {
-        mDateLabel->setPlainText(
-            HbExtendedLocale().format(QDate::currentDate(), gDateFormatVerticalStr)
-        );
-    } else {
-        mDateLabel->setPlainText(
-            HbExtendedLocale().format(QDate::currentDate(), gDateFormatHorizontalStr)
-        );
-    }
+    const char *dateFormat = (mCurrentOrientation == Qt::Vertical) ?
+        gDateFormatVerticalStr : gDateFormatHorizontalStr;
+    QString dateText = HbExtendedLocale().format( QDate::currentDate(), dateFormat );
+    mDateLabel->setPlainText( dateText );
     
     SCREENSAVER_TEST_FUNC_EXIT("SnsrAnalogClockContainer::update")
 }
 
+/*!
+    @copydoc SnsrBigClockContainer::updateIntervalInMilliseconds()
+ */
 int SnsrAnalogClockContainer::updateIntervalInMilliseconds()
 {
     return 1000;
 }
 
+/*!
+    @copydoc SnsrBigClockContainer::loadWidgets()
+ */
 void SnsrAnalogClockContainer::loadWidgets()
 {
     bool ok(true);
@@ -144,8 +145,9 @@
             Q_ASSERT_X(ok, gAnalogLayoutDocml, "Invalid section in DocML file.");
         }
 
+        mIndicatorWidget->setLayoutType(SnsrIndicatorWidget::IndicatorsCentered);
+        mIndicatorWidget->setPowerSaveModeColor(false);
         initIndicatorWidget();
-        mIndicatorWidget->setLayoutType(SnsrIndicatorWidget::IndicatorsCentered);
         
         mBackgroundContainerLayout->addItem(mMainView);
 
--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrbigclockcontainer.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrbigclockcontainer.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -36,7 +36,8 @@
     \brief Base class. Container used for drawing background and for preparing layout.
  */
 
-const QString snsrBackgroundColorRole("snsrbackground");
+
+
 const int gStep(5);
 
 
@@ -117,6 +118,16 @@
 }
 
 /*!
+    @copydoc Screensaver::currentPowerMode()
+ */
+Screensaver::ScreenPowerMode SnsrBigClockContainer::displayPowerMode()
+{
+    // The default implementation returns full power mode. Inherited classes
+    // must override this if low power or display off mode are required.
+    return Screensaver::ScreenModeFullPower;
+}
+
+/*!
     @copydoc Screensaver::getActiveScreenRows()
  */
 void SnsrBigClockContainer::getActiveScreenRows(int *firstActiveRow, int *lastActiveRow)
@@ -318,13 +329,7 @@
  */
 void SnsrBigClockContainer::setBackgroundColor()
 {
-    QColor backgroundColor = HbColorScheme::color(snsrBackgroundColorRole);
-    if (backgroundColor.isValid()) {
-        mBackgroundColor = backgroundColor;
-    }
-    else {
-        mBackgroundColor = Qt::black;
-    }
+    mBackgroundColor = Qt::black;
 }
 
 /*!
--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrbigclockscreensaver.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrbigclockscreensaver.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -88,8 +88,6 @@
 
     removeCurrentContainer();
 
-    emit screenPowerModeRequested( Screensaver::ScreenModeFullPower );
-    
     SnsrBigClockContainer* newContainer( 0 );
     if (clockFormat() == ClockFormatAnalog) {
         newContainer = new SnsrAnalogClockContainer();
@@ -222,6 +220,21 @@
 }
 
 /*!
+    @copydoc Screensaver::currentPowerMode
+ */
+Screensaver::ScreenPowerMode SnsrBigClockScreensaver::currentPowerMode()
+{
+    Screensaver::ScreenPowerMode mode( Screensaver::ScreenModeFullPower );
+    if ( mCurrentContainer ) {
+        mode = mCurrentContainer->displayPowerMode();
+    }
+    else {
+        qWarning() << "No current container when current power mode queried.";
+    }
+    return mode;
+}
+
+/*!
     @copydoc Screensaver::getActiveScreenRows
  */
 void SnsrBigClockScreensaver::getActiveScreenRows(int *firstActiveRow, int *lastActiveRow)
@@ -254,12 +267,18 @@
 }
 
 /*!
-    Update the area visible in the power save screen mode. Power save mode gets
-    also activated on call if not already active.
+    Update clock time when timer is triggered
  */
-void SnsrBigClockScreensaver::updateActiveAreaForLowPower()
+void SnsrBigClockScreensaver::updateTime()
 {
-    emit screenPowerModeRequested( Screensaver::ScreenModeLowPower );
+    if ( mCurrentContainer ) {
+        mCurrentContainer->update();
+        
+        // Move the active area of display device if current container uses the power save mode.
+        if ( mCurrentContainer->displayPowerMode() == Screensaver::ScreenModeLowPower ) {
+            emit activeAreaMoved();
+        }
+    }
 }
 
 /*!
@@ -289,7 +308,7 @@
     if ( mCurrentContainer ) {
         disconnect(
             &mTimer, SIGNAL(timeout()),
-            mCurrentContainer, SLOT(update())
+            this, SLOT(updateTime())
             );
         disconnect( 
             mCurrentContainer, SIGNAL(unlockRequested()), 
@@ -310,10 +329,9 @@
 {
     mCurrentContainer = newContainer;
     mCurrentContainer->setParent(this);
-    connect( &mTimer, SIGNAL(timeout()), mCurrentContainer, SLOT(update()) );
+    connect( &mTimer, SIGNAL(timeout()), SLOT(updateTime()) );
     connect( mCurrentContainer, SIGNAL(unlockRequested()), SIGNAL(unlockRequested()) );
-    connect( mCurrentContainer, SIGNAL(activeAreaMoved()), SLOT(updateActiveAreaForLowPower()) );
-
+    
     mCurrentContainer->setIndicatorModel(*mIndicatorModel);
 
     int updateInterval = mCurrentContainer->updateIntervalInMilliseconds(); 
@@ -322,7 +340,6 @@
         mTimer.start(updateInterval);
     }
     
-    
     emit viewChanged(mCurrentContainer);
 }
 
--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrblankcontainer.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrblankcontainer.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -38,17 +38,34 @@
 {
 }
 
+/*!
+    @copydoc SnsrBigClockContainer::update()
+ */
 void SnsrBlankContainer::update()
 {
     // nothing to do
 }
 
+/*!
+    @copydoc SnsrBigClockContainer::displayPowerMode()
+ */
+Screensaver::ScreenPowerMode SnsrBlankContainer::displayPowerMode()
+{
+    return Screensaver::ScreenModeOff;
+}
+
+/*!
+    @copydoc SnsrBigClockContainer::updateIntervalInMilliseconds()
+ */
 int SnsrBlankContainer::updateIntervalInMilliseconds()
 {
     // don't start timer
     return -1;
 }
 
+/*!
+    @copydoc SnsrBigClockContainer::loadWidgets()
+ */
 void SnsrBlankContainer::loadWidgets()
 {
     // nothing to do as we have no visual components
--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrdigitalclockcontainer.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrdigitalclockcontainer.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -104,26 +104,25 @@
         );
 
     // date
-    if (mCurrentOrientation == Qt::Vertical) {
-        mDateLabel->setPlainText(
-            HbExtendedLocale().format(
-                QDate::currentDate(), gDateFormatVerticalStr)
-            );
-    } else {
-        mDateLabel->setPlainText(
-            HbExtendedLocale().format(
-                QDate::currentDate(), gDateFormatHorizontalStr)
-            );
-    }
+    const char *dateFormat = (mCurrentOrientation == Qt::Vertical) ?
+        gDateFormatVerticalStr : gDateFormatHorizontalStr;
+    QString dateText = HbExtendedLocale().format( QDate::currentDate(), dateFormat );
+    mDateLabel->setPlainText( dateText );
 
     SCREENSAVER_TEST_FUNC_EXIT("SnsrDigitalClockContainer::update")
 }
 
+/*!
+    @copydoc SnsrBigClockContainer::updateIntervalInMilliseconds()
+ */
 int SnsrDigitalClockContainer::updateIntervalInMilliseconds()
 {
     return 1000;
 }
 
+/*!
+    @copydoc SnsrBigClockContainer::loadWidgets()
+ */
 void SnsrDigitalClockContainer::loadWidgets()
 {
     // reset widget pointers, any previous widgets are already deleted by now
@@ -167,6 +166,7 @@
         }
 
         mIndicatorWidget->setLayoutType(SnsrIndicatorWidget::IndicatorsCentered);
+        mIndicatorWidget->setPowerSaveModeColor(false);
         initIndicatorWidget();
         
         mBackgroundContainerLayout->addItem(mMainView);
--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsroledanalogclockcontainer.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsroledanalogclockcontainer.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -95,8 +95,6 @@
             mDestPosition = randomPosition( containerRect );
             mInitialize = true;
         }
-        // the active area of power save mode needs to be updated when clock container is moved
-        emit activeAreaMoved();
     }
 }
 
@@ -111,15 +109,10 @@
     mOledClockWidget->tick();
     
     // date
-    if (mCurrentOrientation == Qt::Vertical) {
-        mDateLabel->setPlainText(
-            HbExtendedLocale().format(QDate::currentDate(), gDateFormatVerticalStr)
-        );
-    } else {
-        mDateLabel->setPlainText(
-            HbExtendedLocale().format(QDate::currentDate(), gDateFormatHorizontalStr)
-        );
-    }
+    const char *dateFormat = (mCurrentOrientation == Qt::Vertical) ?
+        gDateFormatVerticalStr : gDateFormatHorizontalStr;
+    QString dateText = HbExtendedLocale().format( QDate::currentDate(), dateFormat );
+    mDateLabel->setPlainText( dateText );
     
     // position
     updatePosition();
@@ -133,6 +126,14 @@
 }
 
 /*!
+    @copydoc Screensaver::DisplayPowerMode()
+ */
+Screensaver::ScreenPowerMode SnsrOledAnalogClockContainer::displayPowerMode()
+{
+    return Screensaver::ScreenModeLowPower;
+}
+
+/*!
     @copydoc SnsrBigClockContainer::getActiveScreenRows()
  */
 void SnsrOledAnalogClockContainer::getActiveScreenRows(int *firstActiveRow, int *lastActiveRow)
@@ -171,6 +172,7 @@
     mOledClockWidget = 0;
     mDateLabel = 0;
     mIndicatorWidget = 0;
+    mInitialize = false;
     
     // load widgets from docml
     qDebug() << gOledAnalogLayoutDocml;
@@ -200,8 +202,12 @@
         }
 
         mIndicatorWidget->setLayoutType(SnsrIndicatorWidget::IndicatorsCentered);
+        mIndicatorWidget->setPowerSaveModeColor(true);
         initIndicatorWidget();
-        
+
+        // powersave mode color
+        mDateLabel->setTextColor(Qt::white);
+
         mBackgroundContainerLayout->addItem(mMainView);
     }
 }
--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsroleddigitalclockcontainer.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsroleddigitalclockcontainer.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -105,8 +105,6 @@
             mDestPosition = randomPosition( containerRect );
             mInitialize = true;
         }
-        // the active area of power save mode needs to be updated when clock container is moved
-        emit activeAreaMoved();
     }
 }
 
@@ -128,17 +126,10 @@
         );
 
     // date
-    if (mCurrentOrientation == Qt::Vertical) {
-        mDateLabel->setPlainText(
-            HbExtendedLocale().format(
-                QDate::currentDate(), gDateFormatVerticalStr)
-            );
-    } else {
-        mDateLabel->setPlainText(
-            HbExtendedLocale().format(
-                QDate::currentDate(), gDateFormatHorizontalStr)
-            );
-    }
+    const char *dateFormat = (mCurrentOrientation == Qt::Vertical) ?
+        gDateFormatVerticalStr : gDateFormatHorizontalStr;
+    QString dateText = HbExtendedLocale().format( QDate::currentDate(), dateFormat );
+    mDateLabel->setPlainText( dateText );
 
     updatePosition();
 
@@ -151,6 +142,14 @@
 }
 
 /*!
+    @copydoc Screensaver::DisplayPowerMode()
+ */
+Screensaver::ScreenPowerMode SnsrOledDigitalClockContainer::displayPowerMode()
+{
+    return Screensaver::ScreenModeLowPower;
+}
+
+/*!
     @copydoc SnsrBigClockContainer::getActiveScreenRows()
  */
 void SnsrOledDigitalClockContainer::getActiveScreenRows(int *firstActiveRow, int *lastActiveRow)
@@ -188,6 +187,7 @@
     mTimeLabel = 0;
     mAmPmLabel = 0;
     mIndicatorWidget = 0;
+    mInitialize = false;
     
     // load widgets from docml
     bool ok(false);
@@ -222,8 +222,13 @@
         }
 
         mIndicatorWidget->setLayoutType(SnsrIndicatorWidget::IndicatorsCentered);
+        mIndicatorWidget->setPowerSaveModeColor(true);
         initIndicatorWidget();
-               
+
+        // powersave mode color
+        mDateLabel->setTextColor(Qt::white);
+        mAmPmLabel->setTextColor(Qt::white);
+
         mBackgroundContainerLayout->addItem(mMainView);
     }
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/screensaver/snsrdisplaycontrol_s60/bwins/snsrdisplaycontrolclientu.def	Fri Sep 17 08:27:54 2010 +0300
@@ -0,0 +1,9 @@
+EXPORTS
+	?SetDisplayFullPower@RSnsrDisplayControlClient@@QAEXXZ @ 1 NONAME ; void RSnsrDisplayControlClient::SetDisplayFullPower(void)
+	?SetDisplayLowPower@RSnsrDisplayControlClient@@QAEXHH@Z @ 2 NONAME ; void RSnsrDisplayControlClient::SetDisplayLowPower(int, int)
+	??0RSnsrDisplayControlClient@@QAE@XZ @ 3 NONAME ; RSnsrDisplayControlClient::RSnsrDisplayControlClient(void)
+	?Version@RSnsrDisplayControlClient@@QBE?AVTVersion@@XZ @ 4 NONAME ; class TVersion RSnsrDisplayControlClient::Version(void) const
+	?SetDisplayOff@RSnsrDisplayControlClient@@QAEXXZ @ 5 NONAME ; void RSnsrDisplayControlClient::SetDisplayOff(void)
+	?Close@RSnsrDisplayControlClient@@QAEXXZ @ 6 NONAME ; void RSnsrDisplayControlClient::Close(void)
+	?Open@RSnsrDisplayControlClient@@QAEHXZ @ 7 NONAME ; int RSnsrDisplayControlClient::Open(void)
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/screensaver/snsrdisplaycontrol_s60/eabi/snsrdisplaycontrolclientu.def	Fri Sep 17 08:27:54 2010 +0300
@@ -0,0 +1,10 @@
+EXPORTS
+	_ZN25RSnsrDisplayControlClient13SetDisplayOffEv @ 1 NONAME
+	_ZN25RSnsrDisplayControlClient18SetDisplayLowPowerEii @ 2 NONAME
+	_ZN25RSnsrDisplayControlClient19SetDisplayFullPowerEv @ 3 NONAME
+	_ZN25RSnsrDisplayControlClient4OpenEv @ 4 NONAME
+	_ZN25RSnsrDisplayControlClient5CloseEv @ 5 NONAME
+	_ZN25RSnsrDisplayControlClientC1Ev @ 6 NONAME
+	_ZN25RSnsrDisplayControlClientC2Ev @ 7 NONAME
+	_ZNK25RSnsrDisplayControlClient7VersionEv @ 8 NONAME
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/screensaver/snsrdisplaycontrol_s60/group/group.pro	Fri Sep 17 08:27:54 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: Project file of Symbian client-server pair to contorl display power save mode.
+#              These are pure Symbian components and should be excluded from build on any
+#              other platform.
+#
+
+TEMPLATE = subdirs
+
+BLD_INF_RULES.prj_exports += \
+     "../inc/snsrdisplaycontrolclient.h           |../../inc/snsrdisplaycontrolclient.h" \
+     "../rom/snsrdisplaycontrol_s60.iby           CORE_APP_LAYER_IBY_EXPORT_PATH(snsrdisplaycontrol_s60.iby)"
+
+BLD_INF_RULES.prj_mmpfiles += "snsrdisplaycontrolclient.mmp"
+BLD_INF_RULES.prj_mmpfiles += "snsrdisplaycontrolserver.mmp"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/screensaver/snsrdisplaycontrol_s60/group/snsrdisplaycontrolclient.mmp	Fri Sep 17 08:27:54 2010 +0300
@@ -0,0 +1,34 @@
+/*
+* 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:  Container for blank screen.
+*
+*/
+
+#include <platform_paths.hrh>
+
+TARGET          snsrdisplaycontrolclient.dll
+TARGETTYPE      DLL
+UID             0x1000008D 0x20031DFF
+SECUREID        0x20031DFF
+VENDORID        VID_DEFAULT
+
+CAPABILITY      CAP_CLIENT_DLL
+
+USERINCLUDE     ../inc
+APP_LAYER_SYSTEMINCLUDE
+
+SOURCEPATH      ../src
+SOURCE          snsrdisplaycontrolclient.cpp 
+
+LIBRARY         euser.lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/screensaver/snsrdisplaycontrol_s60/group/snsrdisplaycontrolserver.mmp	Fri Sep 17 08:27:54 2010 +0300
@@ -0,0 +1,38 @@
+/*
+* 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:  Container for blank screen.
+*
+*/
+
+#include <platform_paths.hrh>
+
+TARGET          snsrdisplaycontrolserver.exe
+TARGETTYPE      EXE
+UID             0x1000008E 0x20031E00
+SECUREID        0x20031E00
+VENDORID        VID_DEFAULT
+
+CAPABILITY      CAP_APPLICATION 
+
+USERINCLUDE     ../inc
+APP_LAYER_SYSTEMINCLUDE
+
+SOURCEPATH      ../src
+SOURCE          snsrdisplaycontrolserver.cpp 
+SOURCE          snsrdisplaycontrolsession.cpp
+
+LIBRARY         euser.lib
+LIBRARY         power_save_display_mode.lib
+LIBRARY         hal.lib
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/screensaver/snsrdisplaycontrol_s60/inc/snsrdisplaycontrolclient.h	Fri Sep 17 08:27:54 2010 +0300
@@ -0,0 +1,70 @@
+/*
+ * 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 :
+ *
+ */
+
+#ifndef SNSRDISPLAYCONTROLCLIENT_H
+#define SNSRDISPLAYCONTROLCLIENT_H
+
+// INCLUDES
+#include <e32base.h>
+
+//FORWARD DECLARATIONS
+
+// CLASS DECLARATION
+/**
+ * Client-side interface to Screensaver Display Control Server
+ *
+ * 
+ *
+ */
+class RSnsrDisplayControlClient: public RSessionBase
+    {
+public:
+
+    /**
+     * Construct the object.
+     */
+    IMPORT_C RSnsrDisplayControlClient();
+
+    /**
+     * Open session
+     */
+    IMPORT_C TInt Open();
+    
+    /**
+     * Closes session
+     */
+    IMPORT_C void Close();
+
+    /**
+     * Return version information
+     */
+    IMPORT_C TVersion Version() const;
+
+    IMPORT_C void SetDisplayFullPower();
+    
+    IMPORT_C void SetDisplayLowPower( TInt aStartRow, TInt aEndRow );
+    
+    IMPORT_C void SetDisplayOff();
+    
+private:
+
+    TInt iError;
+    
+    };
+
+#endif // SNSRDISPLAYCONTROLCLIENT_H
+// End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/screensaver/snsrdisplaycontrol_s60/inc/snsrdisplaycontrolcommon.h	Fri Sep 17 08:27:54 2010 +0300
@@ -0,0 +1,38 @@
+/*
+* 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: Common constants for client and server sides of
+*              Screensaver Display Control.
+*
+*/
+
+#ifndef SNSRDISPLAYCONTROLCOMMON_H
+#define SNSRDISPLAYCONTROLCOMMON_H
+
+#include <e32def.h>
+
+
+_LIT( KSnsrDispCtrlSrvName, "SnsrDisplayControlServer" ); 
+
+enum TSnsrDispCtrlSrvCmd
+    {
+    ESnsrDispCtrlSrvDisplayOff = 0,
+    ESnsrDispCtrlSrvDisplayLowPower,
+    ESnsrDispCtrlSrvDisplayFullPower
+    };
+
+const TInt KSnsrDispCtrlSrvVerMajor = 1;
+const TInt KSnsrDispCtrlSrvVerMinor = 0;
+const TInt KSnsrDispCtrlSrvVerBuild = 0;
+
+#endif /* SNSRDISPLAYCONTROLCOMMON_H */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/screensaver/snsrdisplaycontrol_s60/inc/snsrdisplaycontrolserver.h	Fri Sep 17 08:27:54 2010 +0300
@@ -0,0 +1,49 @@
+/*
+* 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: Header of Screensaver Display Control Server
+*
+*/
+
+#ifndef C_CSNSRDISPLAYCONTROLSERVER_H
+#define C_CSNSRDISPLAYCONTROLSERVER_H
+
+#include <e32base.h>
+
+/**
+ *  Screensaver Display Control Server
+ *  A server to act as capability proxy to allow controlling display power save
+ *  mode from dialog plugin running in HbDeviceDialogServer process. That process
+ *  has no WriteDeviceDialog capability and can't call CPowerSaveDisplayMode
+ *  platform API directly.
+ */
+class CSnsrDisplayControlServer : public CServer2
+    {
+public:
+
+    static CSnsrDisplayControlServer* NewLC();
+    virtual ~CSnsrDisplayControlServer();
+
+private: // from CServer2
+    CSession2* NewSessionL( const TVersion& aVersion, const RMessage2& aMessage ) const;
+    
+private:
+
+    CSnsrDisplayControlServer();
+    void ConstructL();
+
+private: // data
+
+    };
+
+#endif // C_CSNSRDISPLAYCONTROLSERVER_H
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/screensaver/snsrdisplaycontrol_s60/inc/snsrdisplaycontrolsession.h	Fri Sep 17 08:27:54 2010 +0300
@@ -0,0 +1,51 @@
+/*
+* 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: Header for server side session object of
+*              Screensaver Display Control Server 
+*
+*/
+
+#ifndef C_CSNSRDISPLAYCONTROLSESSION_H
+#define C_CSNSRDISPLAYCONTROLSESSION_H
+
+#include <e32base.h>
+
+class CPowerSaveDisplayMode;
+
+
+/**
+ *  Server side session object for Screensaver Display Control Server
+ */
+class CSnsrDisplayControlSession : public CSession2
+    {
+public:
+
+    IMPORT_C static CSnsrDisplayControlSession* NewL();
+    virtual ~CSnsrDisplayControlSession();
+
+public: // from CSession2
+    void ServiceL( const RMessage2& aMessage );
+    
+private:
+
+    CSnsrDisplayControlSession();
+    void ConstructL();
+
+private: // data
+
+    CPowerSaveDisplayMode* iPowerSave;
+    HBufC16* iPowerSavePixelBuffer;
+    };
+
+#endif // C_CSNSRDISPLAYCONTROLSESSION_H
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/screensaver/snsrdisplaycontrol_s60/rom/snsrdisplaycontrol_s60.iby	Fri Sep 17 08:27:54 2010 +0300
@@ -0,0 +1,24 @@
+/*
+* 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:
+*
+*/
+
+#ifndef __SNSRDISPLAYCONTROL_S60_IBY__
+#define __SNSRDISPLAYCONTROL_S60_IBY__
+
+file=ABI_DIR\BUILD_DIR\snsrdisplaycontrolclient.dll     SHARED_LIB_DIR\snsrdisplaycontrolclient.dll
+file=ABI_DIR\BUILD_DIR\snsrdisplaycontrolserver.exe     PROGRAMS_DIR\snsrdisplaycontrolserver.exe
+
+#endif //__SNSRDISPLAYCONTROL_S60_IBY__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/screensaver/snsrdisplaycontrol_s60/src/snsrdisplaycontrolclient.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -0,0 +1,178 @@
+/*
+ * 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:
+ *
+ */
+
+#include "snsrdisplaycontrolclient.h"
+#include "snsrdisplaycontrolcommon.h"
+
+// =========== CONSTANTS ===========
+
+
+// ======== LOCAL FUNCTIONS ========
+
+// -----------------------------------------------------------------------------
+// CreateServerProcess
+// Static function to create the server process.
+// -----------------------------------------------------------------------------
+//
+static TInt CreateServerProcess()
+    {
+    TInt err( KErrNone );
+    RProcess server;
+    err = server.Create( KSnsrDispCtrlSrvName, KNullDesC, EOwnerThread );
+    if ( !err )
+        {
+        TRequestStatus status;
+        server.Rendezvous( status );
+        if ( status != KRequestPending )
+            {
+            server.Kill( 0 ); // Abort startup.
+            }
+        else
+            {
+            server.Resume(); // Logon OK - start the server.
+            }
+        User::WaitForRequest( status ); // Wait for start or death.
+        // We can't use the 'exit reason' if the server panicked as this
+        // is the panic 'reason' and may be '0' which cannot be distinguished
+        // from KErrNone.
+        err = ( server.ExitType() == EExitPanic ) ? KErrGeneral
+                : status.Int();
+        server.Close();
+        }
+    return err;
+    }
+
+// -----------------------------------------------------------------------------
+// StartServer
+// Static function to start the server.
+// -----------------------------------------------------------------------------
+//
+static TInt StartServer()
+    {
+    TInt result;
+
+    TFindServer findServer( KSnsrDispCtrlSrvName );
+    TFullName name;
+
+    result = findServer.Next( name );
+    if ( result != KErrNone )
+        {
+        // Server not running
+        result = CreateServerProcess();
+        }
+    return result;
+    }
+
+
+
+// ======== MEMBER FUNCTIONS ========
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+EXPORT_C RSnsrDisplayControlClient::RSnsrDisplayControlClient() :
+    RSessionBase(), iError( KErrNotReady )
+    {
+    }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+EXPORT_C TInt RSnsrDisplayControlClient::Open()
+    {
+    iError = StartServer();
+    
+    if ( !iError )
+        {
+        iError = CreateSession( KSnsrDispCtrlSrvName, Version() );
+        }
+    
+    if ( !iError )
+        {
+        iError = ShareAuto();
+        }
+    
+    return iError;
+    }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+EXPORT_C void RSnsrDisplayControlClient::Close()
+    {
+    RSessionBase::Close();
+    }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+EXPORT_C TVersion RSnsrDisplayControlClient::Version() const
+    {
+    return TVersion( KSnsrDispCtrlSrvVerMajor, 
+                     KSnsrDispCtrlSrvVerMinor, 
+                     KSnsrDispCtrlSrvVerBuild );
+    }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+EXPORT_C void RSnsrDisplayControlClient::SetDisplayFullPower()
+    {
+    if ( !iError )
+        {
+        TRequestStatus status( KRequestPending );
+        SendReceive( ESnsrDispCtrlSrvDisplayFullPower, TIpcArgs(), status );
+        User::WaitForRequest( status );
+        }
+    }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+EXPORT_C void RSnsrDisplayControlClient::SetDisplayLowPower( TInt aStartRow, TInt aEndRow )
+    {
+    if ( !iError )
+        {
+        TRequestStatus status( KRequestPending );
+        TIpcArgs args( aStartRow, aEndRow );
+        
+        SendReceive( ESnsrDispCtrlSrvDisplayLowPower, args, status );
+        
+        User::WaitForRequest( status );
+        }
+    }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+EXPORT_C void RSnsrDisplayControlClient::SetDisplayOff()
+    {
+    if ( !iError )
+        {
+        TRequestStatus status( KRequestPending );
+        SendReceive( ESnsrDispCtrlSrvDisplayOff, TIpcArgs(), status );
+        User::WaitForRequest( status );
+        }
+    }
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/screensaver/snsrdisplaycontrol_s60/src/snsrdisplaycontrolserver.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -0,0 +1,158 @@
+/*
+* 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: Implementation of Screensaver Display Control Server
+*
+*/
+
+
+#include "snsrdisplaycontrolserver.h"
+#include "snsrdisplaycontrolsession.h"
+#include "snsrdisplaycontrolcommon.h"
+
+// =========== CONSTANTS =========== 
+
+
+// ======== LOCAL FUNCTIONS ========
+ 
+// ----------------------------------------------------------------------------
+// Initialize and run the server
+// ----------------------------------------------------------------------------
+//
+static void RunTheServerL()
+    {
+    // First create and install the active scheduler
+    CActiveScheduler* scheduler = new (ELeave) CActiveScheduler;
+    CleanupStack::PushL( scheduler );
+    CActiveScheduler::Install( scheduler );
+
+    TInt err = User::RenameThread( KSnsrDispCtrlSrvName );
+    User::LeaveIfError( err );
+    
+    // Create the server
+    CSnsrDisplayControlServer* server = CSnsrDisplayControlServer::NewLC();
+    server->StartL( KSnsrDispCtrlSrvName );
+    
+    // Signal the client the startup is complete
+    RProcess::Rendezvous(KErrNone);
+
+    // Enter the wait loop
+    CActiveScheduler::Start();
+
+    // Exited cleanup scheduler and server
+    CleanupStack::PopAndDestroy( server );
+    CleanupStack::PopAndDestroy( scheduler );
+    }
+
+// ----------------------------------------------------------------------------
+// Main entry-point for the server thread/process
+// ----------------------------------------------------------------------------
+//
+static TInt RunTheServer()
+    {
+    CTrapCleanup* cleanup = CTrapCleanup::New();
+    TInt r = KErrNoMemory;
+    if (cleanup)
+        {
+        TRAP( r, RunTheServerL() );
+        delete cleanup;
+        }
+    
+    return (r);
+    }
+
+
+// ======== MEMBER FUNCTIONS ========
+
+// ---------------------------------------------------------------------------
+// Constructor
+// ---------------------------------------------------------------------------
+//
+CSnsrDisplayControlServer::CSnsrDisplayControlServer() :
+    CServer2( EPriorityStandard, CServer2::TServerType( EIpcSession_Sharable ) )
+    {
+    }
+
+// ---------------------------------------------------------------------------
+// Second phase constructor
+// ---------------------------------------------------------------------------
+//
+void CSnsrDisplayControlServer::ConstructL()
+    {
+    }
+
+// ---------------------------------------------------------------------------
+// Factory method
+// ---------------------------------------------------------------------------
+//
+CSnsrDisplayControlServer* CSnsrDisplayControlServer::NewLC()
+    {
+    CSnsrDisplayControlServer* self =  new (ELeave) CSnsrDisplayControlServer();
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    return self;
+    }
+
+// ---------------------------------------------------------------------------
+// Destructor
+// ---------------------------------------------------------------------------
+//
+CSnsrDisplayControlServer::~CSnsrDisplayControlServer()
+    {
+    }
+
+// ---------------------------------------------------------------------------
+// Create server side session object
+// ---------------------------------------------------------------------------
+//
+CSession2* CSnsrDisplayControlServer::NewSessionL( const TVersion& aVersion,
+        const RMessage2& aMessage ) const
+    {
+    TVersion version( KSnsrDispCtrlSrvVerMajor, 
+                      KSnsrDispCtrlSrvVerMinor, 
+                      KSnsrDispCtrlSrvVerBuild );
+    if ( !User::QueryVersionSupported( version, aVersion ) )
+        {
+        User::Leave( KErrNotSupported );
+        }
+    
+    // Allow connections only from HbDeviceDialogAppServer. Essentially, we are a
+    // capability proxy which grants access to API normally needing WriteDeviceData
+    // capability to a process which doesn't have it. Use access control
+    // of our own to prevent maluse. This module is not part of SDK or even platform API
+    // and only supposed to be used internally by Screensaver, so preventing access
+    // from other processes should not be a problem.
+    static _LIT_SECURITY_POLICY_S0(hbDeviceDialogSidPolicy, 0x20022FC5);
+    TBool passed = hbDeviceDialogSidPolicy().CheckPolicy(aMessage);
+    if ( !passed )
+        {
+        User::Leave( KErrPermissionDenied );
+        }
+
+    CSession2* session;
+    session = CSnsrDisplayControlSession::NewL();
+    session->SetServer( this );
+    return session;
+    }
+
+
+// ======== GLOBAL FUNCTIONS ========
+
+// ----------------------------------------------------------------------------
+// Process entry point 
+// ----------------------------------------------------------------------------
+TInt E32Main()
+    {
+    return RunTheServer();
+    }
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/screensaver/snsrdisplaycontrol_s60/src/snsrdisplaycontrolsession.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -0,0 +1,129 @@
+/*
+* 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: Implementation for server side session object of
+*              Screensaver Display Control Server
+*
+*/
+
+#include <power_save_display_mode.h>
+#include <hal.h>
+
+#include "snsrdisplaycontrolsession.h"
+#include "snsrdisplaycontrolcommon.h"
+
+
+// ======== LOCAL FUNCTIONS ========
+
+
+// ======== MEMBER FUNCTIONS ========
+
+
+// ---------------------------------------------------------------------------
+// CSnsrDisplayControlSession
+// ---------------------------------------------------------------------------
+//
+CSnsrDisplayControlSession::CSnsrDisplayControlSession() : 
+    CSession2()
+    {
+    }
+
+
+// ---------------------------------------------------------------------------
+// ConstructL
+// ---------------------------------------------------------------------------
+//
+void CSnsrDisplayControlSession::ConstructL()
+    {
+    iPowerSave = CPowerSaveDisplayMode::NewL();
+    
+    // Create pixel buffer that can hold the full screen picture of our 
+    // display device.
+    TInt x = 0;
+    TInt y = 0;
+    HAL::Get(HALData::EDisplayXPixels, x);
+    HAL::Get(HALData::EDisplayYPixels, y);
+    iPowerSavePixelBuffer = HBufC::NewL(x*y);
+    iPowerSavePixelBuffer->Des().FillZ();
+    }
+
+
+// ---------------------------------------------------------------------------
+// NewL
+// ---------------------------------------------------------------------------
+//
+EXPORT_C CSnsrDisplayControlSession* CSnsrDisplayControlSession::NewL()
+    {
+    CSnsrDisplayControlSession* self = new (ELeave) CSnsrDisplayControlSession();
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    CleanupStack::Pop( self );
+    return self;
+    }
+
+
+// ---------------------------------------------------------------------------
+// ~CSnsrDisplayControlSession
+// ---------------------------------------------------------------------------
+//
+CSnsrDisplayControlSession::~CSnsrDisplayControlSession()
+    {
+    delete iPowerSave;
+    delete iPowerSavePixelBuffer;
+    }
+
+// ---------------------------------------------------------------------------
+// ServiceL
+// ---------------------------------------------------------------------------
+//
+void CSnsrDisplayControlSession::ServiceL( const RMessage2& aMessage )
+    {
+    TInt func = aMessage.Function();
+    
+    TInt err( KErrNone );
+    
+    switch ( func )
+        {
+        case ESnsrDispCtrlSrvDisplayOff:
+            {
+            // off
+            // TODO
+            break;
+            }
+        case ESnsrDispCtrlSrvDisplayLowPower:
+            {
+            // low power
+            TInt startRow = aMessage.Int0();
+            TInt endRow = aMessage.Int1();
+            // TODO: for now, we pass a zero-filled pixel buffer to power save API.
+            // This works fine with our reference hardware but some types of displays
+            // might require passing the actual screen contents in this buffer.
+            TUint16* ptr = const_cast<TUint16*>( iPowerSavePixelBuffer->Ptr() );
+            err = iPowerSave->Set(startRow, endRow, ptr);
+            break;
+            }
+        case ESnsrDispCtrlSrvDisplayFullPower:
+            {
+            // full power
+            err = iPowerSave->Exit();
+            break;
+            }
+        default:
+            {
+            err = KErrNotSupported;
+            }
+        }
+    
+    aMessage.Complete(err);
+    }
+
--- a/screensaver/snsrutils/src/snsrlabel.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/screensaver/snsrutils/src/snsrlabel.cpp	Fri Sep 17 08:27:54 2010 +0300
@@ -20,7 +20,7 @@
 #include <hbevent.h>
 #include <hbcolorscheme.h>
 
-const QString snsrForegroundColorRole("snsrforeground");
+const QString snsrForegroundColorRole("qtc_screensaver");
 
 /*!
     \class SnsrLabel