FCL/sf/app/homescreen: changeset 77:4b195f3bea29

--- a/homescreen.pro	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreen.pro	Wed Aug 18 09:40:07 2010 +0300
@@ -16,7 +16,9 @@
 
 TEMPLATE = subdirs
 
-SUBDIRS  =  homescreenapp
+SUBDIRS  += homescreenapp \
+			homescreen_plat
+			
 symbian:SUBDIRS += screensaver
 
 CONFIG += ordered

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreen_plat/homescreen_plat.pro	Wed Aug 18 09:40:07 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:
+#
+
+TEMPLATE = subdirs
+BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include <platform_paths.hrh>"
+
+include(homescreenclient_api/homescreenclient_api.pri)
+
+for(filename,PLATFORM_HEADERS){
+    BLD_INF_RULES.prj_exports *= "$$filename APP_LAYER_PLATFORM_EXPORT_PATH($$basename(filename))"
+  }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreen_plat/homescreenclient_api/homescreenclient_api.metaxml	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<api id="8e80718e406ef05ada051bc688cb2d5f" dataversion="2.0">
+  <name>homescreenclient_api</name>
+  <description>Home screen API to create widgets, change wallpaper</description>
+  <type>c++</type>
+  <collection>homescreenapp</collection>
+  <libs/>
+  <release category="platform" sinceversion=""/>
+  <attributes>
+    <htmldocprovided>no</htmldocprovided>
+    <adaptation>no</adaptation>
+  </attributes>
+</api>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreen_plat/homescreenclient_api/homescreenclient_api.pri	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,18 @@
+#
+# 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_HEADERS += \
+                      homescreenclient_api/hsmenuclient.h
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreen_plat/homescreenclient_api/hsmenuclient.h	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,72 @@
+/*
+ * 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: hsmenuclient.h
+ *
+ */
+
+#ifndef HSMENUCLIENT_H
+#define HSMENUCLIENT_H
+
+#include <QObject>
+#include <QVariant>
+#include <qservicemanager.h>
+
+QTM_USE_NAMESPACE
+
+//mandatory keys
+const QString hsItemName("item:name");
+// or for localized name
+const QString hsItemLocName("item:locname");
+
+const QString hsitemLaunchUri("item:launchuri");
+const QString hsitemPublisherId("item:publisherId");
+
+//not mandatory
+const QString hsItemWidgetUri("widget:uri");
+const QString hsItemDescription("item:description");
+// or for localized name
+const QString hsItemLocDescription("item:locdescription");
+
+//for icon - not mandatory
+const QString hsIconFileName("icon:filename");//to display specific icon from file
+const QString hsIconName("icon:name");// HbIcon
+const QString hsIconApplicationId("icon:applicationid"); // icon from associated application
+
+
+class HsMenuClientPrivate;
+
+class HsMenuClient : public QObject
+{
+    Q_OBJECT
+
+public:
+    HsMenuClient(QObject *parent = 0);
+    ~HsMenuClient();
+public slots:
+   bool add(const QVariantMap &entryPreference = QVariantMap());
+   bool remove(const QVariantMap &queryPreference = QVariantMap()) const;
+   
+   QList<QVariantMap > getList(const QVariantMap &queryPreference = QVariantMap());
+  
+private:
+   Q_DISABLE_COPY(HsMenuClient)
+    /**
+     * Pointer to a private implementation.
+     */
+   HsMenuClientPrivate * const m_d;
+};
+
+
+
+#endif // HSMENUCLIENT_H

--- a/homescreenapp/common.pri	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/common.pri	Wed Aug 18 09:40:07 2010 +0300
@@ -1,4 +1,4 @@
-#
+
 # Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
@@ -33,7 +33,7 @@
     SUBDIRPART = release
 }
 
-win32: OUTPUT_DIR = $$PWD/../../bin/$$SUBDIRPART
+!symbian: OUTPUT_DIR = $$PWD/../../bin/$$SUBDIRPART
 symbian: OUTPUT_DIR = $$PWD/bin
 
 SOURCE_DIR = $$PWD/inc
@@ -45,6 +45,7 @@
     MOC_DIR = $$OUTPUT_DIR/tmp/$$TARGET/moc
     RCC_DIR = $$OUTPUT_DIR/tmp/$$TARGET/rcc
     UI_DIR = $$OUTPUT_DIR/tmp/$$TARGET/ui
+    CONFIG -= app_bundle
 } else { # test part is NOT DONE
     QT *= testlib
     CONFIG += console
@@ -68,19 +69,16 @@
     INCLUDEPATH += $$MOC_DIR
     TARGET.CAPABILITY = ALL -TCB
     TARGET.EPOCALLOWDLLDATA=1
-}
-
-win32 {
+} else {
     # add platfrom API for windows
     INCLUDEPATH += \                
-                $$PWD/../../homescreensrv/homescreensrv_plat/contentstorage_api \
-                $$PWD/../../homescreensrv/homescreensrv_plat/hswidgetmodel_api \               
+                $$PWD/../../homescreensrv/homescreensrv_plat/contentstorage_api \                
                 $$PWD/../../homescreensrv/homescreensrv_plat/homescreen_information_api/inc
 }
 
 plugin: !isEmpty(PLUGIN_SUBDIR): DESTDIR = $$OUTPUT_DIR/$$PLUGIN_SUBDIR
 
-win32: plugin { # copy manifiers
+!symbian: plugin { # copy manifiers
     manifest.path = $$DESTDIR
     manifest.files = ./resource/*.manifest ./resource/*.xml
     manifest.CONFIG += no_build
@@ -99,10 +97,6 @@
 
     qtplugins.path = $$PLUGIN_SUBDIR
     qtplugins.sources += qmakepluginstubs/$${TARGET}.qtplugin
-
-    message(Remove "contains(MOBILITY, serviceframework)" after the QtSF refactorig is done!)
-        
-    !contains(MOBILITY, serviceframework):qtplugins.sources += resource/$${TARGET}.manifest
     
     hs_public_plugin {
       contains(MOBILITY, serviceframework):BLD_INF_RULES.prj_exports += "resource/$${TARGET}.xml z:/private/20022F35/$${TARGET}.xml"
@@ -120,8 +114,7 @@
         for(entry, entries) : BLD_INF_RULES.prj_exports += "./$$entry z:/$$replace(2, ^/,)/$$basename(entry)"
     }
     export ( BLD_INF_RULES.prj_exports)
-}
-win32 {
+} else {
     name = $$replace(1, [/\\\\\.\*], _)
     eval ($${name}.path = $${OUTPUT_DIR}/$${2})
     eval ($${name}.files = $$1)
@@ -138,10 +131,11 @@
 }
 }
 
-!exists($${EPOCROOT}epoc32/include/platform/mw/XQSettingsManager) {
-	DEFINES += NO_QT_EXTENSIONS
+symbian {
+    DEFINES += QT_EXTENSIONS
 }
 
+
 # support for NFT
 nft:DEFINES += NFT

--- a/homescreenapp/examples/batterywidgetplugin/resource/batterywidgetplugin.xml	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/examples/batterywidgetplugin/resource/batterywidgetplugin.xml	Wed Aug 18 09:40:07 2010 +0300
@@ -8,7 +8,5 @@
         <version>1.0</version>
         <description>Example of home screen widget</description>
         <capabilities></capabilities>
-        <customproperty key="iconuri">batterywidgetplugin.png</customproperty>
-        <customproperty key="title">Battery</customproperty>
     </interface>
 </service>

--- a/homescreenapp/examples/batterywidgetplugin/sis/batterywidgetplugin.bat	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/examples/batterywidgetplugin/sis/batterywidgetplugin.bat	Wed Aug 18 09:40:07 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 ../../../sis/rd.cer ../../../sis/rd-key.pem
 
 if exist batterywidgetplugin.sisx (
 echo batterywidgetplugin.sisx creation SUCCEEDED

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/examples/minibrowserwidgetplugin/inc/minibrowserwidget.h	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,77 @@
+/*
+* 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:  Example of home screen widget
+*
+*/
+
+#ifndef MINIBROWSERWIDGET_H
+#define MINIBROWSERWIDGET_H
+
+#include <HbWidget>
+class HbLineEdit;
+class QGraphicsWebView;
+class HbIconItem;
+class HbPushButton;
+
+class MiniBrowserWidget : public HbWidget
+{
+    Q_OBJECT
+// Start of snippet 1
+    Q_PROPERTY(bool isOnline READ isOnline WRITE setOnline)
+// End of snippet 1
+// Start of snippet 2
+    Q_PROPERTY(QString url READ url WRITE setUrl)
+// End of snippet 2
+    
+public:
+    MiniBrowserWidget(QGraphicsItem *parent = 0, Qt::WindowFlags flags = 0);
+    ~MiniBrowserWidget();
+    
+public:
+    bool isOnline();
+    void setOnline(bool online);
+    QString url() const;
+    void setUrl(const QString& url);
+    
+public slots:
+    void onInitialize();
+    void onShow();
+    void onHide();
+
+public slots:
+    void pressGoButton();
+    void pressStopButton();
+    void loadFinished(bool ok);
+    void loadProgress(int progress);
+    void loadStarted();
+
+// Start of snippet 3
+signals:
+    void setPreferences(const QStringList &names);
+// End of snippet 3
+
+private:
+    Q_DISABLE_COPY(MiniBrowserWidget)
+    
+    HbPushButton *mGoButton;
+    HbPushButton *mStopButton;
+    HbLineEdit *mEditor;
+    QGraphicsWebView *mWeb;
+    HbIconItem *mSpinnerAnimationWidget;
+    bool mOnline;    
+    QString mUrl;
+    
+};
+
+#endif // MINIBROWSERWIDGET_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/examples/minibrowserwidgetplugin/inc/minibrowserwidgetplugin.h	Wed Aug 18 09:40:07 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:  Example of home screen widget
+*
+*/
+
+#ifndef MINIBROWSERWIDGETPLUGIN_H
+#define MINIBROWSERWIDGETPLUGIN_H
+
+#include <QObject>
+#include <qserviceplugininterface.h>
+
+QTM_USE_NAMESPACE
+// Start of snippet 1
+class MiniBrowserWidgetPlugin : public QObject, public QServicePluginInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(QtMobility::QServicePluginInterface)
+
+public:
+    QObject *createInstance(const QServiceInterfaceDescriptor &descriptor,
+                            QServiceContext *context,
+                            QAbstractSecuritySession *session);
+};
+// End of snippet 1
+
+#endif // HELLOWORLDWIDGETPLUGIN_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/examples/minibrowserwidgetplugin/minibrowserwidgetplugin.pro	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,67 @@
+#
+# 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: Example of home screen widget
+#
+
+TEMPLATE = lib
+CONFIG += plugin mobility hb
+MOBILITY = serviceframework
+
+QT      += webkit
+
+HEADERS += ./inc/*.h
+SOURCES += ./src/*.cpp
+
+INCLUDEPATH += ./inc               
+
+symbian: {
+
+    DESTDIR = /private/20022F35/import/widgetregistry/20022F6F
+    INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
+
+    TARGET.UID3 = 0x20022F6F
+    TARGET.EPOCALLOWDLLDATA=1
+    TARGET.CAPABILITY = ALL -TCB
+    
+    plugins.path = $${DESTDIR}
+    plugins.sources = $${TARGET}.dll 
+    
+    widgetResources.path = $${DESTDIR}
+    widgetResources.sources += resource/$${TARGET}.xml    
+    widgetResources.sources += resource/$${TARGET}.manifest
+    widgetResources.sources += resource/$${TARGET}preview.png
+    widgetResources.sources += resource/$${TARGET}.svg
+        
+    DEPLOYMENT += plugins \
+                  widgetResources
+}
+
+win32: {
+
+    CONFIG(debug, debug|release) {
+      SUBDIRPART = debug
+    } else {
+      SUBDIRPART = release
+    }    
+    
+    PLUGIN_SUBDIR = /private/20022F35/import/widgetregistry/20022F6F
+    
+    DESTDIR = $$PWD/../../../../bin/$${SUBDIRPART}/$${PLUGIN_SUBDIR}
+
+    manifest.path = $${DESTDIR}
+    manifest.files = ./resource/*.manifest ./resource/*.xml ./resource/*.png ./resource/*.svg
+    
+    INSTALLS += manifest    
+    
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/examples/minibrowserwidgetplugin/resource/minibrowserwidgetplugin.manifest	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<hswidgetmanifest>
+    <uri>minibrowserwidgetplugin</uri>
+    <title>Mini browser</title>
+    <description>Home screen example widget</description>
+    <icon>minibrowserwidgetplugin.svg</icon>
+    <previewimage>minibrowserwidgetpluginpreview.png</previewimage>
+    <hidden>false</hidden>
+    <servicexml>minibrowserwidgetplugin.xml</servicexml>
+</hswidgetmanifest>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/examples/minibrowserwidgetplugin/resource/minibrowserwidgetplugin.svg	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,1566 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd" [
+	<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
+	<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
+	<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
+	<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
+	<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
+	<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
+	<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
+	<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
+]>
+<svg version="1.1" baseProfile="tiny" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="88px" height="88px"
+	 viewBox="0 0 88 88" xml:space="preserve">
+<switch>
+	<foreignObject requiredExtensions="&ns_ai;" x="0" y="0" width="1" height="1">
+		<i:pgfRef  xlink:href="#adobe_illustrator_pgf">
+		</i:pgfRef>
+	</foreignObject>
+	<g i:extraneous="self">
+		<rect x="0.25" y="0.25" fill="none" width="87.5" height="87.5"/>
+		<g>
+			
+				<image width="75" height="75" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEsAAABLCAYAAAA4TnrqAAAACXBIWXMAAAsSAAALEgHS3X78AAAA
+GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAATRJREFUeNrs3EsOgzAMRVGCuiPv
+fwneU0VHqKpUJ9j5+b5ZJx0cnpMgAeWYI3LMGb3/KCDZ0QpQdrDzIOYUWmUPzQILLLDAAouABdba
+h1IBa3OcSCxhDEFywUqD9BQrHVQLVkqkFqzUUDVY6aGsWEAZsYAyYgHFjbR/s2iVEQsoxtC/WbSK
+Zvk3i1bRLP9m0ar/4ZEjKxRjWAF15ZUdoHaBZ71iNwQLLLDmjoBFs8ACCyySHkvBollgLYulMNAs
+sEbthHcsRpFmgTVkBL+xGEWa5VeG0/sPaRat+iTDY5Ia3SzGsaJZuzTM9aLvvGZp72at2i4dMYYr
+goWtt7u9bxi6MbW8ySoZoVqxZgPrdsx5+va9ZIHywBqFNuTQ7P3FENkRKQorAm6aW6+eX5OUlWB+
+5S3AAP7hH3db+S5HAAAAAElFTkSuQmCC" transform="matrix(1 0 0 1 8 8)">
+			</image>
+			
+				<image width="58" height="41" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADoAAAApCAYAAABk+TodAAAACXBIWXMAAAsSAAALEgHS3X78AAAA
+GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAALdJREFUeNrs2UsOgCAMBFCmJ+/R
+jRsSDYkRqPYzPYD02SEBRVsvbfa1vAacwrb3gWC46f4QGPeqZyQBPhqQEDn0IDHy4kJyZMdKAWSP
+bgmotCJFKKGEEkoooUYnozIT5cmI0IDXNClyTWN0U8X2DlVONPg0zyrzuVOSQktEdzio0r8komJ1
+Jbpp9muG34a6E+oVq7sn6hGrFtH1BlarPeoFPL0e/m7gq+fDW0NWLw+OJmGaikOAAQAEaxk/SH/M
+kwAAAABJRU5ErkJggg==" transform="matrix(1 0 0 1 10 40)">
+			</image>
+			
+				<image width="58" height="58" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADoAAAA6CAYAAADhu0ooAAAACXBIWXMAAAsSAAALEgHS3X78AAAA
+GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAehJREFUeNrsm98rBFEUx+dM8y94
+kmVta/1MiU2S+BtEQpIHSnnx5h8gL1JEJGlDIn8DSdImRdau3daw5c+wY69tM2Z3tpmduTNzz51v
+zTzt1v30OWfunToDAsVE1xTFzO/jKwC01gJugjkJDV6CowkNXga0ExhYgbQKDCwBWoEFFiFrgQVW
+Ic0CA+uQRmEBA6QRWBELZE2lyzKknlVRQBY9SYC1ZLVmRcx9ibp09aSJPNhEbVQrT+TBJnqjXIGW
+qpUfozz0J1dGoW/1mwujksBH5QqSks/7oMhK1zeKDNQ36veob9TjPYr/wPC8XgeS4D91kR3qya1z
++Qt1/b5s1BdKtxDMD6TEZgMUt5ciKR+lS9K+JKMs39etoMookYrQanI7BGVGSVoXM6ispnbC8HcE
+VAeR1dRuBCr2aCmRhSQKq297bdVBSVrmE0zDpvc7oPztpVIY3lfTB11QdXvRJjz3xJzVzGG3+akU
+8ifyZsPSZejAoJfQ7CMTZrNHPWAJ9Bd25sHTsNlYr/URuVKap+OehH0/jhpiMDUKGpy69wysfNJP
+Z4z1H/DknavA8ukA3cFkdZombh2H/TgbdHbUXJ3G8RvqwJ/nQ+59PFApgbFrW6FzF8O2rY/aBzWB
+0SvT0LnLEWrr+RFgANIeQHR191JCAAAAAElFTkSuQmCC" transform="matrix(1 0 0 1 10 21)">
+			</image>
+			
+				<image width="58" height="57" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADoAAAA5CAYAAABnLziGAAAACXBIWXMAAAsSAAALEgHS3X78AAAA
+GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAVhJREFUeNrkmkkOxCAMBDHiR/7/
+E/pPc5pDRqOwGW9wyyWhaC+NFSp+Fv88Q/Ll5BSySENTAEgRYAoEuQVcS8zFt4BOw0YN3elQJqMN
+Qxi0C9scqCEZHZAE5YgJXZNB8i4oB1KSV0FPAkILtjoIVWjITMqQUD5Q9KouR1QtqwWcytWapU/2
+VnMCiQ0bKdpHNfITJ7/VjKqs+sE2YxXVc5Qzwp3IUdeQX2fkTc0jA7Me6MgkQM2Y78CPKPoG6xny
+sU/ra5qaFczudZcmDFeAlptAEa13/psw8AKoyj1SWlEkz9NHe0kNS1oWzNowkKJysAStioXHckzz
+2l4sYcW/7dkwqP5+w04gtgtkFAuIzKErejhVuyh4NvUIGL5YDV1EDVmJa5pHVSFVjJA5R0OHbDZQ
+3KDoUDq17ICjXveEBzYpaDXSZk/eXqTVRWTQUWhEV3QE2jzUPwIMAN7BQw1ftQrxAAAAAElFTkSu
+QmCC" transform="matrix(1 0 0 1 10 22)">
+			</image>
+			
+				<image width="58" height="57" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADoAAAA5CAYAAABnLziGAAAACXBIWXMAAAsSAAALEgHS3X78AAAA
+GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAodJREFUeNrkWEtKA0EQnWrmEn52
+5ga6EMGViIgLf8SFiHgCEUXREyiI4EZEEQn+Fop4BhFFRG+gJiZoTmFGezEyzLc/1dOVsaBIyGSq
+3quurqpucBBl46XD45+bvU1QfdcXFRtpApgEVYHGvY9NGrAJygLMsoFFGEwQlAEnY0uHMJgiKApO
+1aYsWZYHSYz3de0xGyCxVorjEsXG8iQpaks2LUXsMiorqesz6z0Xy2FwFajt58Sqq+uIk06yEZeW
+mMSS0h7yTFkTPVXUj5Xo5hHcsG9GqdeZFOYUVMJBdilG38Q4yWwAMnUUS7MBNqus6r5WsetSIWha
+3CKTQydKhWTaNMYwxj3qFTez6nKjVIjo3lIID9+6N322j3WuTKSDRvMiidX6SI+AmP2dUR3Isf2T
+u0qx1kc5WX8/Uh8KUle0ncFLp+5/IMvaZVZFLUacrPdbfsK6/hwtSvw3X00Ai8Oho5Gqu9XXhFYL
+nLCuPXX+EeLfk55hSRwGVeWcEtN19VEe/Hb/F1r6q/hPw5UKbOWhC8XZzsCndACwfPv+WdYfMPbH
+8r08aCzfnhe4M8qSpTuc6O4Oyq+srm/fpytaGGxJODiLt91KxIWIei06/VAVC/kV1cGyN9QASaIO
+IaIGD977ww3AaNx5DhIcs9INw8FIHfj+0FEMEcWhdZVyOFoH2ysqgoM/174zOhr7AL5PVBR7r8Yp
+x6d1C0itCsdhqIzXQKu9xB2hrPdTSQyuatpQazOnUzXAJ/pNIHUDGM7LVTCyolRS92KmCoZT1/6K
+ypDMdY9ezr5bjY6y8/JZj1ACX829kTgRaIOYPkknfD1fEKJBmayUIqRvFl6LfTk+cVzyuFLB8yPA
+AFDHuVDEzUzkAAAAAElFTkSuQmCC" transform="matrix(1 0 0 1 10 22)">
+			</image>
+			
+				<image width="29" height="15" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB0AAAAPCAYAAAAYjcSfAAAACXBIWXMAAAsSAAALEgHS3X78AAAA
+GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAE1JREFUeNrUkzEOACAMAqmf5U39
+rXFzcVCTqzJ0vVAgJKU4eZwmVlkBVRk0Zts0FAXHKmwaugP3N0Vqt0Mnoaadmn6v6Uz9QpGO1QUY
+AHWdBoFn9+uOAAAAAElFTkSuQmCC" transform="matrix(1 0 0 1 38 37)">
+			</image>
+			
+				<image width="56" height="43" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADgAAAArCAYAAAAtxEsrAAAACXBIWXMAAAsSAAALEgHS3X78AAAA
+GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAOhJREFUeNrc2UEOwyAMBMAs4i39
+/3v6GapKTaWiiBRkY+/6lEMOjNag4OBwrNbaY+Z9AE/rNSAStAOLTCgPLDLDLKBgwa1CwQRbQYIR
+N4MEK+5fKNhxd0go4EbIooKbalFmXJ9iOcSqDweyrflJsijipFu0D6sopyed4BkalNN7HzRVFXY+
+V1WYFHB4m1D6LLuqqgqjA65O1qoqLD3QavBbVWHpgB7/JVIAvWDhQG9YCHAXajswArYFGAlzBWaA
+uQAzwb5rsrjRZ4SZJJgZtgxkQC0B2WA/e3C0D1lhtwmywy5LcT76EmAAdRZnpsQcRz8AAAAASUVO
+RK5CYII=" transform="matrix(1 0 0 1 10 21)">
+			</image>
+			<g>
+				
+					<image width="19" height="7" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAAHCAYAAADqF3ZBAAAACXBIWXMAAAsSAAALEgHS3X78AAAA
+GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAACxJREFUeNpiZGBgaGCgEmCE0lQx
+kImBioARiU2p6xqo6jKaeZNcr8L1AAQYACc2AwuT3AwCAAAAAElFTkSuQmCC" transform="matrix(1 0 0 1 63 36)">
+				</image>
+			</g>
+			
+				<image width="44" height="40" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAoCAYAAACFFRgXAAAACXBIWXMAAAsSAAALEgHS3X78AAAA
+GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAANVJREFUeNrsl8sKgzAQRTMl+gPF
+PhDFx///lLpq+wMmhdSILkqtfVEyA/cuohvlcLgzIqkp1l6dYpwo0uSv42EMb9g5caxJG2MHWBG8
+Y6jvrRzaIdo5UbweWCkY/iewpIFDJWAYhrElUAkY/jgbpWAYHZZuGEMHwxg6GMaWCJQ03ZL2R9dd
+xGim+aZtz6yhsyyhO+A5TcMLPM8TWjT8CH5yr1+2owD/dMvhujxWgNeJi2JPzICfP1SWYWC/MlxV
+BxJTibo+UugOv/2l4wD709CFyk2AAQCXFWkw2gJhPgAAAABJRU5ErkJggg==" transform="matrix(1 0 0 1 38 10)">
+			</image>
+			
+				<image width="37" height="39" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACUAAAAnCAYAAACIVoEIAAAACXBIWXMAAAsSAAALEgHS3X78AAAA
+GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAG9JREFUeNrs2MENwCAMQ1Gn6kbZ
+fwTv1Eu5Fk7Fan8k7k+2EApSzvR9dChwKiwpxSYFChQoUKBAgQIFChQoUKA+jfK5urX+OSnP/hL6
+bcyYWgA5ob7e3WFNQN6NigA93T4n1NcpoIGKAsW+fZcAAwDWawmu22GKXgAAAABJRU5ErkJggg==" transform="matrix(1 0 0 1 45 11)">
+			</image>
+			
+				<image width="42" height="30" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACoAAAAeCAYAAABaKIzgAAAACXBIWXMAAAsSAAALEgHS3X78AAAA
+GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAEtJREFUeNrs2MEJwDAQA0ErxaYo
+N3vBkIdLuIPZCgY9lfVXVe9q3DMBecqNTLJbLzohUFBQUFBQUFBQUFBQUFDQwdDO78jIRT8BBgC8
+VwueoiHqZwAAAABJRU5ErkJggg==" transform="matrix(1 0 0 1 38 10)">
+			</image>
+			
+				<image width="7" height="4" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAECAYAAABCxiV9AAAACXBIWXMAAAsSAAALEgHS3X78AAAA
+GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAB5JREFUeNpiYIAAYwYsgBGXBEwS
+r05kgKzoLECAAQA0iQGdP+VRswAAAABJRU5ErkJggg==" transform="matrix(1 0 0 1 39 38)">
+			</image>
+			
+				<image width="2" height="11" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAALCAYAAABVuVzsAAAACXBIWXMAAAsSAAALEgHS3X78AAAA
+GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAB9JREFUeNpiYACC////pzGBCBCH
+iQEKKGQwwEwGCDAAcREKPHaGqlwAAAAASUVORK5CYII=" transform="matrix(1 0 0 1 44 39)">
+			</image>
+			<rect x="40.804" y="18.635" fill="none" width="37.431" height="14.661"/>
+			<text transform="matrix(1 0 0 1 40.8037 30.208)" font-family="'NokiaSans-Regular'" font-size="14.9724">Hello!</text>
+		</g>
+	</g>
+</switch>
+<i:pgf  id="adobe_illustrator_pgf">
+	<![CDATA[
+	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
+	]]>
+	<![CDATA[
+	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
+	]]>
+	<![CDATA[
+	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
+	]]>
+	<![CDATA[
+	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
+	]]>
+	<![CDATA[
+	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
+	]]>
+	<![CDATA[
+	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
+	]]>
+	<![CDATA[
+	8qw3CEVrGQD6m6D9MQR5uJsGBb5Z+2Kr4AyXptcBgPYNrQzQ9yPfVwDRbrIrOOhtG3rdmjHEId3X
+fg564+OgmGNq+6id7WAjzIoah8ZuPOzvMCkqHQLdP+iEZ/V1vXSCoNnHUbELwJGNkDBgj7AgqA6P
+uJX+OPU2yND1biHcSfIwj4yxfnsdAYjBpHNmGMdhx3HW1zHY4ghRUQMWtkk7DHTFdnjgQwY+ojHc
+PDEeGuHz0dAtihAyAh5tI6vuUeMihxx1fwYZNcCmDDoFd1MCgIHuzhgVIOZxGPKDx7xmcZjToPL9
+HjbB1jsKnKZb4VApGkZsawc94QkhOepNiR1jig4QoW7twHBDeNPw89j2Ce+OXVAUOzSGZDtDxnFa
+RbzY3ztaMcElu+LOBPwAHb2g0djag7FPaHSalCxhqVQBsbkBJN7rKsZAaGTuAIYU7uAq0o7PSM6j
+rgEhmpBgaOAK9s2QjRCaCMPqXYmx76gTEY6ikWnoZHHU32t3F/RRQxi0DO6cZqOiDWAL+T5cHxAg
+dNyBRwDcrOuS+wcMDwKNrgt1GjwA9QdPy5lBa7tNNMIRiYEB7msTwtwXA0+snEvInAcOdBmVQDSE
+pEOI8La5dw9jJ4BjOyjlansbAcF00hGQePHUOrTczfJGWAnCdOg6o2gIEC139g4FAJYR9A8Yksix
+bOZEz0Y4yzgoEWdqHWJnHA1S8FZuRYg9TijnuUIEpmYIMq8IXCp1TowPeIQ+6sH3rZE7wRjYCVdA
+aDjMd+INBqFN+TvkAvRihQE5Ydv4ma52GDpk3aSz5ykgXztqH0C9Hj0i9anT+RK5C4AK205Jwoxo
+FZn1hpXx3DkqcqF+mwAid+HtQe4blIIQqHHnKI92E9+JEUFgXELOiGtvlRNoJwXJkaxWuundPMkg
+6CYqi4ChpXOclb0Jhsywn74nZ8xqOuzvUKOmTFkaeRpn4/YiLwOe7GaFVaTQex0hdMPk9nh12A5O
+w4ZFgdtGQMCUTQ7TeMViUmj0iDrGRtQZFP/PSHT3KlM1UcF6ZmKMnX0bDXH0OixpcATZN2MaIaEu
+YeBJVDOgBFbdOk2uA6zRphGwZIbCRMevUxa2tTkN/ahXDSSt9OV+muzYmjEJi1GQnDwvDytQB8Rb
+8qA+hmxU2pc2yOsi0DA5BjLD8EVBzpA7h66VUxzG0Z0uOp5rP+N56lR2kWQY7VR2eYDB3Om2eld6
+FGwFPtq2K+YA1L3THRsSykFwHCaBvEGMjALrg65uiowGRiqeIleoQ8LBnVFYLRihn9x9Q09hnUbo
+9M5HmxqDDXJUYezcg4JIZpMcA0s82DkBepJBh4bxMTJ7owpEwBcFoaP4bKu3Z4BLccXoiVQo3Clo
+HnHWOOum4+VKuAxvnewOiXLYOTaKkAnMpTMO2tkGhw1Dw+yHfrltGoGmGKVzgHUreKMrtH4Zy66o
+RAMkhx/uGQL4ZEZiXLCzG2We/dTb26G7bfXUYzPIs0HXLyiFnlOBhgRe+T6KhNH6ZQKIavQ+TUEo
+hByHwEsz6QhtBnc8ADpSdXJeM8ic0hmDUjS6AULRgOuICqAjbiV3gmSqbwskaIUeBISgix0N+2C3
+weEYO73+SAANaxNrip2DE9ZAho/S2c26BnqFjDwgIpYRpoY3Am24vW2ZcDPQ2XfB67dkhN70Ke51
+gFiCirek0Ak90AGFToRj+TZc9F5JOHBhvDV40IrV+pF3HDsbm9TQK6ntYdNHhVq90MBwTKZ36INw
+IT0PJmuNY2JZhkaVBkSVv9b+rm30jYKhY2RlqbAyTFUjKlv0jnWx1buH/bEx9DzpCEPUhXQsIGOn
+jUp9NkBQmqroHTivuTEEFK1TZenA4pQMgMyqwmkfr1a7SHSVDW+69G2Q6gTuyHMBO/FEDRhZ1MTO
+pADqR+NUozBmcu6D8hWxdexunzgk7J+UMRjgglxJJzBXehA2jQQ5w9zpfe8mj4hYBRK6yCwbLySQ
+WAUiGXBNqqghXaKM0MIRKBHuO1VaEXc96sWiQVK/3eTIBAH6RpGgZGzpVH5sUvUbyA2OvVaCAhx+
+usTCgUJfYwqyGA0/Y7/dTGIHuLMdFKhJZStP6lV1xxxGuDgGpgyQIelfEZ8PUTqHQdEmQJ5SYOw3
+gh97vsXY2WbbKJ2TUXtU7ckIEZOvtW5t2NmxL4Z0Mn8F0hP6Vy8gvZ1NERP4CewcVd7DnSGFAspq
+quhAxmuwAQbkv0flm4IeewsEpEvCFjNubdgYWQ5I7b4igVEVDciP2/mA0Nmq8jCME0u9AKWjMjhA
+XVW+TVrNdh6dKJwESRqBZ9Yg8jbxfWBRFIRswNO6P6yaCQ0qRiZjNntdcwM7bISlEycUfj7hz7YX
+SR1+jaZcnUgLip2hU86nmZP4Toy2Sndizf+KFAMzsjeR9XiRFQO4c8bLs3ZwRi5JZaA2qcWgf+q8
+mPG1dpPKiftZowx9IMLqyU2qsEhfR8WejArdoyIIUm1JZ68sBZFJ7py73g6pV2XMPMDDyr/EkeAP
+PmZ2kh9mhdYcHY2nUWUA5P2NiDSDrSw6dovkZFbGNKKgRABkRe8cnDibhDvsTyx2ME0G9pMCIwFh
+6u9UjeC09jP5VGp/x/vZsASY3lk1B5ilYKm4fpv6FRK91jyYzOQ79QibYTKd5MzaDXl4Nj15Z7oW
+VWfXlOffqzTS22UlVu2t9RuFJBlDOmfFGMPEfM45SUmZD+UBcYC+0wGEN19OgQ1Uf3z+bL76xS+v
+/vTfF7+T2fN4+yo3et5pDKVu9Km/CqVV9B4m0amNaB+Dm491IAH992R9/wpEalGxpv6vy35A5mPP
+hDQbZ60/jXP7aPZQekGL8gjC1WYc+8gLwP6eOyf0gsGegTUwE6nVSEuezQ+enITv5/6O14nDAivJ
+nQFDQ6hzQMRYnYBAJGwW0txRnp9jG3VzR2bNaSYjok/snBnX8sMdsgJTMzSMFujJ2LJJkfvJp4r7
++9Dqw13sZYFNkD7yO6S+thGiDf2oN2lkAL4U0Am/os6SOjvetgaEM3Qy0x2Kk44AfFkXZb4YIy8Q
+gvIdQr7fJOwkAyFPjcQC6pxQPOROPO29jkB3XHYCBTTqJGGXO5tBRxinQfdeJVceARG6HHXPWzFg
+SGynI0zaiXp3eVIQEnX3XaPPoouadKadIEM1dRKB5yngrtsI5BnKIwCC0O1BGBpm2Xikjdw5A68h
+D4PMSJ3AZ3SDnD0ZBGVk6Mf185Ei98ydpJXnTpRRpHOO7WJxMxviGXiIwcWsD6yt4LOfeV4jGbel
+U9W81D3aGmLkncTOTqcV8B7IAAZmyq9xN9r8BHxbHgBpsg7Agh91Rtx+7kQiICOgSKIjsKaMOud5
+lk6Sc7ETQXkYZcOR2ZcRoL+1g2hnxXCIw8dO3jgHG4RwvKyY9xy1bY3uOWncZeTItI3nPDU2cmTm
+lkee+YKidq/TObMylDqHXk+oH4eQRib5k+eM7gA28oROHoxQMAiCO0l1wYMQ8wudPSDUTu99sBOF
+7vyFX2s/6XPS5nHnJLixY5wunegkxVMQNMj9JC3yyO2kI0QDYeKyuHOI6UijLXoEjKEHMrR8mccJ
+g9dnhUxZMZnvdRX9oAcyNcwv8oTDSDsBnaFvdOMR80vnpKsIgx8hdnp0xD5RH+l+uI+cHqgTc4LI
+q2ZDB9iP9m7unxiAppYNLvkIQD+D4i5SYsgILc+Sr9LEWHFCF76uVYBgOgCdhIjSltsIpIriOQiF
+wc6o16BDtzN7UuZAbkU2Anmm8Qiox8ROZG3HUXfXOkEI0cuctkH8AzLMMRFHqnvGBAP7Yqdb0xo4
+TYHhnsedJ31Y0adgSuxE5KjgH7tou4Dsdxz1YQH0CaHIaFFg7IUWYbRJ8O6S9wl1Dm1QnIjci43b
+69si01PsQs9jXsRofQmrJ5IF/dOsMEraduxEG4FdHkGJE9bonmY3KxkhsiFZ7knb6cNBLw8F5Pwz
+P9wj7694oJGR4QaGaMDLUxgARnVhhHzkbQNLBzKwDDCw83hGmiZPYsPQjmkE8m2RdQR+HXBTIRjD
+w6wR2rpHRThTZ7AApLTTKZDdkTtBsiz3UdQvCT/aCBO6UScawA+DVKunhpFK/OTcZNRNRkCjqx5G
+E+dJ4QneiPIF8wrzpHPD1FjKjLU28miMTZuuChqQJ2UghCeYJmO/Ex81TWw+ED4qbfDE1iCeM6nP
+oRPkuyYaxpANntlThvfH3feZrY9yyEOUh8chDro/zCXiCKHTQ0bvCx4BZcxoNA8v/NfaT4o67h94
+dfjwaGfXM483N+wpI2cX5jQyplYSoECHBe7sB70DbOmlThLrhO6GkEYgyS/NDTtbmDDvTySeifu6
+RjH92I4KPtg/6qKJanJnov5DZJKJo3ZGX9MRoWN2E/QWoUlTOoEa6wiNdo5GmQbVfnC/wTuZ277W
+/nlsx8S6YR+qBNrObSV3tkHPnryYZWBxF8tPCNUeyj7A0nV7MI2Csl3tlEYgxwfeSmFAUKGB3qnU
+CUhKJ0ZukNJp/M6MiuQm6giM7WeyIA46sUZX0U+Kuoj3txHmyHcjGl88I6VjmhfhXGQV3YZkUOrs
+1CON+3veB9T+8C2aO3Yy44l1jDiwswv6rs5u0Yxz7+UoJrIaUKeSkWhM+AyyllxvGCE0bRqBPBQE
+KBkz48MiA0bjHLGzjfJk1xrPD/3EzvCSUcEjnShK87DoaMKdqAXSVYxjGiF2yp4p94pKMmHDIzs0
+cec4x6jbaxwM9E9TqxPubA6Yq1pGEFYQh51b7YzGs0P/HAYZgdaDnYMh8cjyDnaOxhhJYJOMMBoD
+EikCg/tIXUl9Q+okrSJ3hjF9X+kpGifF4ET9ZGiUmbU8BlCSGORhEaexb9ABQkgDTyZxApjJDMjH
+nzd8Emw4st6Kv57EzRn1z7O8n8CCxySlH485CPBP7LDNIzh8OhnyzVaAuWNkBOHeUb3b9wIhnRrj
+qJ904Nyf1gvsg4pTEzNBNIIBXuKh5hluv56OAeQEF3pQYFCMMRtLH5kbthE6Ycoxdq0zejOzrwov
+pGEWcUayN/qt4M7eblDiXLEbEVC6WF9NLSq/se4qA4mIJvDkPCs4hTi0aYTZWOLZVGo4CPEC3E+W
+DuoMwsPbaWCn4u+YTI3cH+1iDbRD1DkZpLO2gjrHaCtWSkb9KPNTP6Fi7hxjAtVGR0hXkGBKRmhN
+nIrs2sudY1SoFCkNO2e7gmFUdq5FG0Wvlz6yfgY7u1HRA5F27iRZJ+FOG4GswdzfyYSDqZ70ElJf
+qxeTfM3TALPSG4rW4s6xU3RGmRu4c5oVdLpJcT31D40eBfk5QmfH1sqE1rmTFHdCxoKN0LE/Et8B
+silyZxv1MDsCX+rs9Mk4hZhGgGuoI0SGhmj6zMgmeO4kX5xEQWSAyGZHWfGgD1N6BUHUsjfom9Qr
+HYxtGgAwsim5Qi/PUpIMeZvMq8daJkr5TcWE/e1sYIaI52vtJx8goWM6xth1Crwd6w==
+	]]>
+	<![CDATA[
+	ahskIYPuWD/HNDD5CQi1EDgdjAeKzL1yZzMpmiNXQRlhYMedbAqAlqMiz5GVX9ipMr+npNQ/25rJ
+dDBhmFcwVocjHaizHQyjtrPtDuJwBageNacy7DDKittxHG0Oys6SA6ibQ2s3oAvyOjLa8t6wJE+d
+RgIiKjJtDpg/TG/ApBPuomFJxUQTps5TbD+MMY3QT6p6oBQe3Em+noxSyYUUOmfTiUR2ZZERZvb5
+ljnIXUHS0OkcOrltMwvbAg5dn0YglwN+HSKPr7V/NjaVFCTcOU5REaIYBbBz1qNv1D2HRxgVTDga
+ZWrbhg9cGFri+rAzTDqHJDthf5848GA2FQz+7cqbCJ2DYc+GZRHsHDu9Ra2pCioP28gK2h0rrblz
+mhWrijK9bVu0MOgIKBnayIlTVZqB0xhaZVqmTuemuszINNtGwOSbisRH3bfJiFlkuY7nYBc0ugHm
+ISqTyKwuPku5CxKq405VUgnDIiO0gG07PZBp1rcNXTTCx4ePnZOymaTrSSNMSh4iC+/YOfd6F3sx
+QLWoYo/jAjBbjCuY/MWVYedet0FYBewU/kHwahqhbeYcWmmEyWjDbBMLisWTug9YMY6Ykpuke5aY
++IFVPPhgaIxN7OY2DdAagWGPK+40Kk2kU17VKasaDNG1SQ0YyQj/tXUbS0i4J/UnqiwTDhwqn29k
+MPWDQKS9j6aZIVbonPrgJUPuVJ1jZNWRjIB6GcURIv5jZ1IqYL146STXHQH0uU8jdEOC9XnWxSUV
+pYNK1HzNJs/00jcHlXkt8kf6lQAT9MjA0Sx80M+8RRs9O8dCFXaqviNuBqMlLf5DUXZkJNzib6rm
+JKTJnWMwISXxjtCv6Ex0Wm3bmx7QxGPsTKLLoDEV1B9HxS+2vb0ZA6I4aUIn6hz11BzLhP3Gx/Q6
+h4FdxWS50yydSQ4g86aMMKKXuW763PEcRmb0qXNmrTDGbqv5LSYvKOpXIimKT3p0mPRi6i5OvCGC
+/qeQvj90jZE4ZpUpkEV1gDNb2rBztLm6yzaxMTo/c/9sPzP/3KKwanLPaLwr9GNxdWGDJsFws2PA
+XWeSuR1zha5gnV5Mkibl4aArHuV4Zza58fGa8Y2eNWIaWd4ElptdUNJV487w/7P3JmByVcehMBKL
+hJDEIjAIEFyhbbRMzz13vxpJaFZtLWnQCEkgxNDT0zPTqKd71IuEnBe/2P5f4oTYMXjJQmzsF+fZ
+8YKd5TkJf+z82P6DH/5IbBzn924n/pJggzdMwAZh/6fOds/tZfreWdTdo9vYUqv6nLpV59SpqlOn
+Tl1XBHY83a2pdEsgnhbnYElEwCMQcNP0PAhycEqBXOkwHx7DSOEKitcS6x3gDm/LNSoGOqpQs4ia
+cwCKfR4xQQwDhBy5ErCZ0cVAT72wI2wAesNLzqcFBsfbHht8a6ohKrW+ZaGBUudagFzWYS1F/ENG
+rEn+ukXjkAD0JJVF/gHIw8rMl2MYdJp9T/ngE2qI4z+ThrwBaMocw7phGDBc7IccjVbgoXCS789k
+jep1DDSY2jBZ1hEBkkujFDO/K0QxWHwz4dCIFgDJBTdvcTAMusX9SVXzEJAIJvNAqAusWfTiER1g
+epwFQA22bR4TDIMlHFsW+mMYRJSI3m4hQOICMmUk9t0AZ+65NJaWOCvENNBNDkkVpTyYXjoBgElM
+nA27y/uT2S7nwQvnWt6GCMO9tWzzK+EYbovzUWnZWvSIj6o/tkHQ2FUFx39IQJ7o8hNhkiASF0+0
+xOEgU3WAmZ880VNtxLNmCVCHQ4aeKfpDeQJ+TOAiPhNePIBEtHo4a+QUiXJBnRLCrlBzbBeKgdhL
+46sN6RICz+jydQVVCbiYCsmz4bWhIiiiWx4CQ6xYxGXEFulCImIIQEfntEpGk5Bgiw0yNQ3QWOVB
+I4dtyTQ5Oup6rg7JdOYWx1EFBo6UnU+RdogLAjnUm6q/A04Mf5jG1pQjjr1M3zw4tLQJgXNHXQPz
+xn1vl8sdGEK+TDR+SYXA+bGrwc9JCFpHqBYaGCQYpHFEEgZyLY3NO1tsLuTvC9XCEZBr+5QESRZc
+4SyZtBAYA3rLnbmGGKjq3FG3RVgc4JoIoVgsQqW54hwKDgo4yOFSZ3tbVY1EUrkO4XkpAOY2nq8H
+2C1zZ4Cd2gHQkaKPnC1dFYkfBk+TAyA1EibddjKQwXWNxZOMAGx6KCnAi9lZLLqnswun3vSJ3gaL
+4rKUGfnhXgxN97wFUw7ySP2NGM33QPwWAm3LIjRAFQvqmtJJBYEbBm/MExUAzJ17k5+4IMi5ZMcw
+pogIkERM/jTvKIjAEU/J1Fi4DIAsFG5yfQSXLFiOAOh72/UQ6KrB7IDu2VMd0apMdC2xZUNuZHBT
+5LK4sI7orXhmTx3Tw2xYPGgHZds9zCT7gQ0mtSbwOCHg3EUCzCLOY4lzAYBjPcxXqUoDUzqckQqm
+LUabRpNDGXfCk9HZ7U3KHWzLKBAhzySaDMZDDaZ0PEIQs52DSW8bxAVc7Gp4/J88TS9zCnWN3pfy
+zLrA7Hl1LBEC8XxWRhrnzWLZXybV+QIBFBBnIsHC/yT50jG5J0SdP8Aq4siu2P1APoM4B2SHgwSr
+6/KnGdSXJ2kSXFPI4g5pi1x4ePyTZBlxn5vlxCKeG0C51SyJBmnzb/FUA0RSF8QWGeIjAs4TAw3h
+6fE0N2oVPZpJNplDA5XC/EBj2+Dn6SzSBE1EXqFDEykB6Ir8MVngIUGQBzIMi1psIBNxD4ed/wOQ
+XP4Q08kQGCLQJM2cIbwhVhIVgKYUsZOFRw7LO+zEgqgRriPgpVYMLT+Ig4242P+T2eXqm8Q82ePY
+obdJJ5ECDRUxDFLYhWAQ+osmxgCQ3IX1L3qTHkg4YkciMJDKKsxNEiwjL5ZMsxcJYYYIYoizZdJY
++BI84kA8Yu6Z8lA9V6ceUGDg8VqD59sAkOd6w2kgp8tGXKwNSRowXBW+ns7UOOhSS0Rn6A4eHmXy
+DTi/bErALhIIyA0dCrRFeIdrYNgMCPfCOx7RTZGixDLHGNDgNo7mxFCYxVWGd5IIiNlJlUlPAOIc
+rloan2J+05vAeYKvSSNnDAk7zTZjJoPwoz12j0A8jicYg92SsNoqNzB8YwZYWfSU+zM67Kr42Ngi
+5xTg3FEThh7KWbmSi8Oe7vAIEQmLelSJU2h+/wBoEiE1h51LAFZX7JMcV+LLFsEJodLhcbaI/FhU
+wGx6iEpXhMiiB7gXJmI5tgDUNb4NFSvCltaOlzsDcFtsOYXptsVpAHMKAAgnPHxkkReYAzjyDBM9
+FtMdWljAZ5gcenmMSb5wrnVWANhvAGzpzMZloTJgVywTUvNWMGG6fDONWEAJA/H+WARpPaBQkNIx
+DAyPqYojDccUY8ZTv5h7DjA4lHdoOpgmITAckdhO86AIXQ5PpeX7HAzkhpxdDBEYuOMoMtUIBi+z
+ggUXAWjwzApZN9l0+ChcV/m08bw2kU4DQM/XIpkSYipIDWZqRh2myRyaacrMpcoxGKbYWSJLkgZS
+GJdNBfMPXRrt9Mu0S2/vUQPmGTtXsuRkA4WBhiofEdjU0BiqZJKkGCvG4B2H0uIUBGgjYQEdtlpd
+EWuDnYaItQEGluxmitMwaCwSyvimF4CuCA6pKqcB08bPlZl1YQQ7bpmWN1Qp3k7UuUeDyUNibNoM
+OZrJsxQAiHg+LjlzFiSYnlljMRRDlfJeucqBlqq4quQla0BhIdUUEkkNo+HtOHjuJMC8DCKyNWEI
+IGDIc2EddqhiaHTp+rwvQ6Nl7RgGIQ1ww50fjiv03+QutSMyJClQM3japCksLblILxKrWegCEFh8
+SfKdvMFS5SmdnjdveN6mTjVWnMO9SBSpOQdAIsUisZoudgMWqDgWFyFBaGvbPOlc3EshzQ3+QNPh
+eL0kbH5YDkCL80ZCFgKxl11rMs1tsENHShnz3aClwZPsSV0GgcGwOW+IHYhA+QONJxSTPHsKdEVy
+LkmHFxgcxB9nsarUADdFppzO6r0QIMm3pI2pwcYw1xAut6chAa7zJCoSo2KILSGS7PKIB0eOYJF6
+6YZFS146IlOdAvGwc/4MT4AhcZHfUnNEJiDALZPfClJZfgh5EQFPQEcWZw9voMQFFMOREIssXZZV
+DEAerROJwgDEMI5BRRIGrsIhWZ0tTnk02WUTQqzBpZtcyREYvAQelelJoMHieb6InXQADSbVchrd
+WAsMPF1U48EfIIEZJ43GsBnQQqKh60oIWPaMRo9LmJyYNNas0Yo3FMjzADQ5KGWYtFIVfZzp8iXj
+In5dk0RSuLjy0fVuIhK4yS9wiscZ4qacxu/ckKXB7oL5aQBLx8/feMIH1hH8Wp1Gb4MwRcNuU4p7
+WQAkFRQd6RoBAPG+mVGL6K0FojYQv2viJd2Sxg4/iCW7Yga0+EImSahMc7FDPWiJJBpIDS/6OGah
+Qf0Z4n6D4SlQk9+aFFVBmWY2NGmK2VJhF0cpEq4rZaCQdI0GZynQc62wFeFWWvMUIBJ3DiSgSi0o
+BXqOEcBtfiuUbNfjwkSKG6Bi/wqGV+OXPfkOz6XVTihthiVZaWk0DE04umzHwMvCECApR0tbqrrk
+9qku0iXM7XTLggQG19uv21wmDe/oC/ZgJr9UbFs6T5Qgm12+OgVmFg50pBvIdLvML0I7Xs6pLq9E
+frDH3RSK1uFRA4uZaY1e+BFxBx6R18QhIFHSKpN3nbtiunBMNOrheSEjh68ZUhNKBNTIjW0H7qK7
+NMUF4mk21xEsMwRihSyjkY2kiBXa4nk8awWijapt8FXv8BAktm181YpLGTT0yieUJwvDy900m82m
+zjeFUPbR4rx5GVoQVmZRJE2EwyBOzq7fQW0GGuSAkLxm8iEzvHNTRzgoiO5S2+lhkGFafCjFWR2P
+s7PUXO9wkrm6mni/SDs5fOX5MIge5LbTY1qTT6fK8h80qJajs2oBXrhHgzVsMypIoCTO4Xwrq4kM
+UQ3RQqdsJNhhMZQoQRyxF5GD822TDicvq0KAXH6QcAzhzFylK4ZVZhSn8TzFSqOVoxmQhTeROA2F
+V3BYbNQkjU8yGzQGJ+VNKZB7hYhusdtZtgT1rRFNjBAY+A0iRM9O4xxO+GdMs0QbADpMgPhuAjCz
+oIomn3ZBMgdzARENSFKgt4wQW8nIEZfzkHSmgmy6jacI2EYUWSJQjETcH0rysPvAUmlWCrcdNnP8
+0J3UYKUkIHq/kwIRu+qJvJJHJLHHUjkGfkZJUoNcnUuaSGLi2wmpPDOFq3zgLbZllJKT/BhUQ8iZ
+0H4kE4ovAXLgMAVaXeeTSfL0GAZdXNhHwhAgTRgdSUxYsX0hfAyBKk6QkXAiVIe6SmwgeV4wqfhD
+YV6uu3cTBonXYLaT9GZX5yh4SgIG8pC0RstItJNUatewGAYv/xIyrNlmGPEbmADkSUDkbjGDkUmh
+FEgXAUxhvxEtc9FOc9Jtm+sXOC+hQNXQhTAJ/Qtwl68Ui6dCGyIZEbGKLRRo2zZfxQ==
+	]]>
+	<![CDATA[
+	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
+	]]>
+	<![CDATA[
+	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
+	]]>
+	<![CDATA[
+	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
+	]]>
+	<![CDATA[
+	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
+	]]>
+	<![CDATA[
+	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
+	]]>
+	<![CDATA[
+	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
+	]]>
+	<![CDATA[
+	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
+	]]>
+	<![CDATA[
+	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
+	]]>
+	<![CDATA[
+	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
+	]]>
+	<![CDATA[
+	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
+	]]>
+	<![CDATA[
+	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
+	]]>
+	<![CDATA[
+	yMIq3d4EJhVwf9dgSu2ZMiUn090yUkRd1AWZJxuyMt3OQxc0rNZk3wXda7RIUYjgElGkwqNK/Fbo
+fQJdEtsgDjnt+YVwtsjTJAFaRSEecAwp4PiYTRK4iwu7UGGkmV5kl0t20cVIMzYRRC+i250qVEYl
+BaZHEFCY2WYwwDCIplq5kAcptBMIKYxGIuQTO5GYhRHIhCj5dkIh+3w2UiFldmIhhRHJBb6JSDCM
+IWLSh5ZcYyUagoKoZEOVChvhMIWhSWdeeqglz8PFjJEYGYQ7qLjpTcYjk8wGvUinlwZThLqamkd/
+pUDUjbxMlQtF0J5Y1ULRMvCAjDhR0mvAkyKDEZDHvVmFKAgmRXOiJsFM3AiKrrTyVKWRFXylkmQA
+oqyoNLPG0GdU6rVltR4sYtQtvciiOOWlmEW3yiusuqUjiHVuFEjQDsanqDLZu6a0C73nJUIyvEi3
+QABungQ5FKg3knZFVFWqnSq4cWROBCeplmcCd66ixWXWzUJm3pnCMDNv8pQx91AUdfZtkk9QTHU/
+IgUwuXImDZAxRaUCixtGpwPG4xKaEgh0Oy2QwqjUMC9pIZrSYhZlRicGsgzwBSJIeCra9CJKOxh+
+I+SJkWLgQaA5byy+JF5nE5nk4OXplqikmWi6fLbbVGVXw0umbiS9Iw1ndxtzZS8nLkiwTzRskKAu
+Oz4o9UbEiOnlY5c6F6w4u96YH6FFWpZY/YGj9rRWRHom6+EO9pm2GoKWErKPCq1wIk0zA8ImCoap
+lNAdVDvs+ZKGc2BmITM0jylzDI8tCztAZy/mOMuaOCFHXOIBBdgEF8vhSZd44iV+RR7BDjvod3v/
+qxVcTAajf40C7AV+eLuNTdNTAyr2lCZYAEhMAgZeoceIqi4kJksvaphFSoGG1TXMD12KmA8BHbep
+hX82Y7nyoP/60f/ov522J+/aEZ7uEdvGRDfQisZDGKr9LjkmIUOOVzwQ6akM5dFgOAZWGPdGXUB2
+LIdv+gMsPm6PPsexz/7gf/qx/mAS+z+WIxR03yJFyXkEmZ24PwfI48mIJHg+Jgn73d55nceArkjn
+iQyZArxEH4OIu0SApAv8IkMkHPwrKloZi4pf8hl0SPuOBlGSDwt5+iFPtwGcH6Jng3yINYwP4Qf9
+En74fcrpX3Lmh7Sv+MO1s+zv/yf28apNGsyiNmUrK6ftt97lqP3xhedqvI3b/+nF2v0+Js72hvAq
+9jbqjYGYe7Hx++B/sAQ/Mj5YWame1Bb++X8B1IaZMw==
+	]]>
+</i:pgf>
+</svg>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/examples/minibrowserwidgetplugin/resource/minibrowserwidgetplugin.xml	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<service>
+    <name>minibrowserwidgetplugin</name>
+    <filepath>minibrowserwidgetplugin</filepath>
+    <description>Example widget</description>
+    <interface>
+        <name>com.nokia.symbian.IHomeScreenWidget</name>
+        <version>1.0</version>
+        <description>Example of home screen widget</description>
+    </interface>
+</service>

Binary file homescreenapp/examples/minibrowserwidgetplugin/resource/minibrowserwidgetpluginpreview.png has changed

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/examples/minibrowserwidgetplugin/sis/minibrowserwidgetplugin.bat	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,30 @@
+@rem
+@rem Copyright (c) 2010 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 minibrowserwidgetplugin.sisx del minibrowserwidgetplugin.sisx
+
+makesis minibrowserwidgetplugin.pkg
+signsis minibrowserwidgetplugin.sis minibrowserwidgetplugin.sisx ../../../sis/rd.cer ../../../sis/rd-key.pem
+
+if exist minibrowserwidgetplugin.sisx (
+echo minibrowserwidgetplugin.sisx creation SUCCEEDED
+del minibrowserwidgetplugin.sis
+)
+
+if not exist minibrowserwidgetplugin.sisx (
+echo minibrowserwidgetplugin.sisx creation FAILED
+)
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/examples/minibrowserwidgetplugin/sis/minibrowserwidgetplugin.pkg	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,45 @@
+;
+; 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/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/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"
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/examples/minibrowserwidgetplugin/sis/minibrowserwidgetplugin_winscw.pkg	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,44 @@
+;
+; 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"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/examples/minibrowserwidgetplugin/src/minibrowserwidget.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,221 @@
+/*
+* 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:  Example of home screen widget
+*
+*/
+
+#include <QDebug>
+#include <QGraphicsLinearLayout>
+#include <QGraphicsWebView>
+#include <HbPushButton>
+#include <HbLineEdit>
+#include <HbFrameDrawer>
+#include <HbFrameItem>
+#include <HbDeviceProfile>
+#include "minibrowserwidget.h"
+
+/*!
+    \ingroup group_minibrowser_widget
+    \class MiniBrowserWidget
+    \brief Example implementation for home screen widget.
+
+    MiniBrowserWidget derived from the HbWidget and implements 
+    needed functions for the home screen widget. 
+    As name suggests MiniBrowserWidget is a small web browser widget in
+    the home screen. 
+    
+    Mini browser widget demonstrates the following home screen widget features:
+    <ol>
+    <li> home screen online/offline state, see \ref sssection_isonline </li>
+    <li> preferences, see \ref sssection_setpreferences </li>
+    </ol>
+    It also shows use of HbPushButton and HbLineEdit widgets. 
+    @image html hs_minibrowser.png
+    
+    
+*/
+
+/*!
+    Constructs a widget which is a child of \a parent, with widget flags set to \a flags.
+    Widget creates two buttons ('go' and 'stop'), text field to write url and browser view.
+    Note that this is just an simple example so this creates child widgets directly to the layout.
+    For more complicated widget layouting, see Orbit documentation and especially WidgetML section of it.
+*/
+MiniBrowserWidget::MiniBrowserWidget(QGraphicsItem* parent, Qt::WindowFlags flags)
+    : HbWidget(parent, flags)
+{
+    QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Vertical);
+    setLayout(layout);
+    
+    QGraphicsLinearLayout *buttonLayout = new QGraphicsLinearLayout(Qt::Horizontal);
+    mGoButton = new HbPushButton("Go");
+    connect(mGoButton, SIGNAL(pressed()), SLOT(pressGoButton()));
+    buttonLayout->addItem(mGoButton);
+    mStopButton = new HbPushButton("Stop");
+    connect(mStopButton, SIGNAL(pressed()), SLOT(pressStopButton()));
+    buttonLayout->addItem(mStopButton);
+    mStopButton->setEnabled(false);
+    mEditor = new HbLineEdit();
+    buttonLayout->addItem(mEditor);
+    
+    layout->addItem(buttonLayout);
+
+    mWeb = new QGraphicsWebView();
+    layout->addItem(mWeb);
+    
+    connect(mWeb, SIGNAL(loadStarted()), SLOT(loadStarted()));
+    connect(mWeb, SIGNAL(loadProgress(int)), SLOT(loadProgress(int)));
+    connect(mWeb, SIGNAL(loadFinished(bool)), SLOT(loadFinished(bool)));
+
+    // maximum size of the home screen widget is (48,39) units. Convert units to pixels and 
+    // resize minibrowser as maximum size
+    HbFrameDrawer *drawer = new HbFrameDrawer(
+        QLatin1String("qtg_fr_hsshortcut_normal"), HbFrameDrawer::NinePieces);
+    setBackgroundItem(new HbFrameItem(drawer));
+    
+    HbDeviceProfile profile;
+    qreal factor = profile.unitValue();
+    setPreferredSize(48*factor, 39*factor);
+    resize(preferredSize());
+    
+    mUrl = QString("http://www.nokia.com");
+}
+
+/*!
+    Destructor
+*/
+MiniBrowserWidget::~MiniBrowserWidget()
+{
+}
+
+/*!
+    Returns widget's online state
+*/
+// Start of snippet 1
+bool MiniBrowserWidget::isOnline()
+{ 
+    return mOnline;
+}
+
+/*!
+    Sets online state of the widget as \a online
+*/
+void MiniBrowserWidget::setOnline(bool online)
+{ 
+    mOnline = online;
+}
+// End of snippet 1
+
+/*!
+    Returns url of the widget currently showing.
+*/
+// Start of snippet 2
+QString MiniBrowserWidget::url() const
+{
+    return mUrl;
+}
+
+/*!
+    Sets url of the widget as \a url
+*/
+void MiniBrowserWidget::setUrl(const QString& url)
+{
+    mUrl = url;
+}
+// End of snippet 2
+
+/*!
+    Called when widget is initialized and all to properties are set
+*/
+void MiniBrowserWidget::onInitialize()
+{
+    mGoButton->setEnabled(mOnline);
+    mEditor->setText(mUrl);
+}
+
+/*!
+    Called when widget is shown in the home screen
+*/
+// Start of snippet 3
+void MiniBrowserWidget::onShow()
+{
+    if (mOnline) {
+        mWeb->load(QUrl(mUrl));
+        mStopButton->setEnabled(true);
+        }
+}
+// End of snippet 3
+
+/*!
+    Called when widget is hidden from the home screen.
+    Widget can decide what is appropriate action when 
+    widget is not visible on the screen. At least it
+    should not update itself as often as when on the 
+    screen to save battery etc.
+*/
+// Start of snippet 4
+void MiniBrowserWidget::onHide()
+{
+    mWeb->stop();
+}
+// End of snippet 4
+
+/*!
+    Slot connected to 'go' button
+*/
+// Start of snippet 5
+void MiniBrowserWidget::pressGoButton()
+{
+    setUrl(mEditor->text());
+    if (mOnline) {
+        mWeb->load(QUrl(mUrl));
+        mStopButton->setEnabled(true);
+        }
+    QStringList list;
+    list.append("url");
+    emit setPreferences(list);
+}
+// End of snippet 5
+
+/*!
+    Slot connected to 'stop' button
+*/
+void MiniBrowserWidget::pressStopButton()
+{
+    mWeb->stop();
+    //mStopButton->setEnabled(false);
+}
+
+/*!
+    Slot connected to webview's loadProgress signal
+    TODO: check if this is needed.
+*/
+void MiniBrowserWidget::loadProgress(int progress)
+{
+    Q_UNUSED(progress)
+    qDebug() << progress;
+}
+
+/*!
+    Slot connected to webview's loadFinished signal
+*/
+void MiniBrowserWidget::loadFinished(bool ok)
+{
+    Q_UNUSED(ok)
+    mStopButton->setEnabled(false);
+}
+void MiniBrowserWidget::loadStarted()
+{
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/examples/minibrowserwidgetplugin/src/minibrowserwidgetplugin.cpp	Wed Aug 18 09:40:07 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:  Example of home screen widget
+*
+*/
+
+#include <qserviceinterfacedescriptor.h>
+#include <qabstractsecuritysession.h>
+#include <qservicecontext.h>
+
+#include "minibrowserwidgetplugin.h"
+#include "minibrowserwidget.h"
+
+/*!
+    \ingroup group_minibrowser_widget
+    \class MiniBrowserWidgetPlugin
+    \brief Example implementation for home screen widget plugin.
+*/    
+    
+/*!
+    Initialize plugin for minibrowser widget. Contains necessary information about 
+    the minibrowser widget that it can be loaded through QT Service Framework.
+*/
+QObject *MiniBrowserWidgetPlugin::createInstance(const QServiceInterfaceDescriptor &descriptor,
+                                             QServiceContext *context,
+                                             QAbstractSecuritySession *session)
+{
+    Q_UNUSED(context);
+    Q_UNUSED(session);
+
+    if (descriptor.interfaceName() == QLatin1String("com.nokia.symbian.IHomeScreenWidget")) {
+        return new MiniBrowserWidget();
+    } else {
+        return 0;
+    }
+}
+
+Q_EXPORT_PLUGIN2(minibrowserwidgetplugin, MiniBrowserWidgetPlugin)

--- a/homescreenapp/homescreenapp.pro	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/homescreenapp.pro	Wed Aug 18 09:40:07 2010 +0300
@@ -18,7 +18,6 @@
 
 SUBDIRS  += hsutils \
             hsdomainmodel \
-            runtimeplugins \
             serviceproviders \
             stateplugins \
             widgetplugins \
@@ -27,10 +26,11 @@
 
 symbian: {
 SUBDIRS  += hshomescreenclientplugin \
-            hswidgetuninstaller
+            hswidgetuninstaller \
+            hsapplicationlauncher
 }
 
-SUBDIRS  += ./../tsrc
+exists(./../tsrc/tsrc.pro): SUBDIRS  += ./../tsrc
 
 CONFIG += ordered

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/conf/base/confml/CI_homescreendb.confml	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,125 @@
+<?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>widgetTapAndHoldTimeout</confml:key><confml:value>500</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>sceneTapAndHoldTimeout</confml:key><confml:value>500</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>pageChangeAnimationDuration</confml:key><confml:value>200</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>pageChangeZoneAnimationDuration</confml:key><confml:value>800</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>200</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>newPageAddedAnimationDuration</confml:key><confml:value>200</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>widgetDragEffectDuration</confml:key><confml:value>200</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>3</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>pageChangePanDistanceInPixels</confml:key><confml:value>120</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>tapAndHoldDistance</confml:key><confml:value>16</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>pageChangeZoneWidth</confml:key><confml:value>60</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>17.91</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>100</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>200</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:HomeScreenDbSettings>
+  </confml:data>
+</confml:configuration>

--- a/homescreenapp/hsapplication/conf/base/confml/homescreendb.confml	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsapplication/conf/base/confml/homescreendb.confml	Wed Aug 18 09:40:07 2010 +0300
@@ -1,125 +1,127 @@
 <?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>hsdialerwidgetplugin</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>widgetTapAndHoldTimeout</confml:key><confml:value>500</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>sceneTapAndHoldTimeout</confml:key><confml:value>500</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>pageChangeAnimationDuration</confml:key><confml:value>200</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>pageChangeZoneAnimationDuration</confml:key><confml:value>800</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>200</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>newPageAddedAnimationDuration</confml:key><confml:value>200</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>widgetDragEffectDuration</confml:key><confml:value>200</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>3</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>pageChangePanDistanceInPixels</confml:key><confml:value>120</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>tapAndHoldDistance</confml:key><confml:value>16</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>pageChangeZoneWidth</confml:key><confml:value>60</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>17.91</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>100</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>snapBorderGap</confml:key><confml:value>0</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>snapLineFadeInDuration</confml:key><confml:value>200</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:HomeScreenDbSettings>
-  </confml:data>
-</confml:configuration>
+<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>widgetTapAndHoldTimeout</key><value>500</value></Configuration>
+      <Configuration><key>sceneTapAndHoldTimeout</key><value>500</value></Configuration>
+      <Configuration><key>pageChangeAnimationDuration</key><value>200</value></Configuration>
+      <Configuration><key>pageChangeZoneAnimationDuration</key><value>800</value></Configuration>
+      <Configuration><key>pageChangeZoneReverseAnimationDuration</key><value>200</value></Configuration>
+      <Configuration><key>pageRemovedAnimationDuration</key><value>200</value></Configuration>
+      <Configuration><key>newPageAddedAnimationDuration</key><value>200</value></Configuration>
+      <Configuration><key>widgetDragEffectDuration</key><value>200</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>3</value></Configuration>
+      <Configuration><key>pageChangePanDistanceInPixels</key><value>120</value></Configuration>
+      <Configuration><key>tapAndHoldDistance</key><value>16</value></Configuration>
+      <Configuration><key>pageChangeZoneWidth</key><value>60</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>17.91</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>100</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>200</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	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsapplication/conf/base/implml/homescreendb.implml	Wed Aug 18 09:40:07 2010 +0300
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <container xmlns="http://www.symbianfoundation.org/xml/implml/1">
-    <tag name="target" value="rofs3"/>
-    
+  <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
@@ -15,6 +16,10 @@
     
     <!-- 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>
@@ -26,13 +31,13 @@
     <!-- 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='../homescreen.db ".read create.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='../homescreen.db ".genfkey --exec"'/>
+            <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='../homescreen.db ".read fill.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/hsapplication.pri	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsapplication/hsapplication.pri	Wed Aug 18 09:40:07 2010 +0300
@@ -14,10 +14,14 @@
 # Description:
 #
 
-HEADERS += ./inc/hshomescreen.h
+HEADERS += ./inc/hshomescreen.h \
+           ./inc/hsstatemachine.h
 SOURCES += ./src/hshomescreen.cpp \
+           ./src/hsstatemachine.cpp \        
            ./src/main.cpp
 symbian:{
-    HEADERS += ./inc/hshomescreenclientserviceprovider.h
-    SOURCES += ./src/hshomescreenclientserviceprovider.cpp 
+    HEADERS += ./inc/hshomescreenclientserviceprovider.h \
+               ./inc/hsrecoverymanager.h
+    SOURCES += ./src/hshomescreenclientserviceprovider.cpp \
+               ./src/hsrecoverymanager.cpp
 }

--- a/homescreenapp/hsapplication/hsapplication.pro	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsapplication/hsapplication.pro	Wed Aug 18 09:40:07 2010 +0300
@@ -18,16 +18,17 @@
 
 include(../common.pri)
 
-LIBS += -lhsutils -lhsdomainmodel
 CONFIG += console
 
-QT += xml
+#QT += xml
 
 CONFIG += hb mobility
-MOBILITY = serviceframework
+MOBILITY = serviceframework publishsubscribe
 
 fute:DEFINES += FUTE
 
+new_short:DEFINES += HSWIDGETORGANIZER_ALGORITHM
+
 DEPENDPATH += . \
               ./inc \
               ./src
@@ -40,7 +41,8 @@
 TRANSLATIONS = homescreen.ts
 
 LIBS += -lhsutils \
-        -lhsdomainmodel
+        -lhsdomainmodel \
+	-lcaclient
 
 
 symbian: {
@@ -56,12 +58,12 @@
     include(hsapplication_exports_to_rom.pri)    
 
     CONFIG += service
-    LIBS +=  -lxqservice -lxqserviceutil 
+    LIBS +=  -lxqservice -lxqserviceutil -lXQKeyCapture
            
     SERVICE.FILE = ipc_service_conf.xml
 }
 
-win32: {
+!symbian: {
     include(installs_win.pri)
 }

--- a/homescreenapp/hsapplication/hsapplication_exports_to_rom.pri	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsapplication/hsapplication_exports_to_rom.pri	Wed Aug 18 09:40:07 2010 +0300
@@ -16,6 +16,7 @@
 
 # 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)" \

--- a/homescreenapp/hsapplication/inc/hshomescreen.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsapplication/inc/hshomescreen.h	Wed Aug 18 09:40:07 2010 +0300
@@ -53,7 +53,7 @@
     bool eventFilter(QObject *watched, QEvent *event);
 
 private:
-    void registerServicePlugins(QServiceManager &serviceManager);
+    void registerServicePlugins();
     void registerServicePlugins(const QString &root, QServiceManager &serviceManager);
 
 private slots:

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/inc/hsrecoverymanager.h	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,51 @@
+/*
+* 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 HSRECOVERYMANAGER_H
+#define HSRECOVERYMANAGER_H
+
+#include <QObject>
+#include <QTimer>
+
+#include "hstest_global.h"
+HOMESCREEN_TEST_CLASS(t_hsapplication)
+
+class HsRecoveryManager : public QObject
+{
+    Q_OBJECT
+
+public:
+    HsRecoveryManager(QObject *parent = 0);
+    ~HsRecoveryManager();
+
+    void execute();
+    
+private slots:
+    void restoreRomDatabase();
+    void resetCrashCount();
+           
+private:
+    Q_DISABLE_COPY(HsRecoveryManager)
+    int crashCount();
+    
+private:
+    QTimer mTimer;
+
+    HOMESCREEN_TEST_FRIEND_CLASS(t_hsapplication)
+};
+
+#endif // HSRECOVERYMANAGER_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/inc/hsstatemachine.h	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,87 @@
+/*
+* 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:  Default implementation of the home screen runtime.
+*
+*/
+
+#ifndef HSSTATEMACHINE_H
+#define HSSTATEMACHINE_H
+
+#include <QStateMachine>
+#include <qmobilityglobal.h>
+
+#ifdef Q_OS_SYMBIAN
+#include <XQKeyCapture>
+#endif
+
+#include "hstest_global.h"
+
+class HsContentService;
+QTM_BEGIN_NAMESPACE
+class QValueSpacePublisher;
+QTM_END_NAMESPACE
+
+QTM_USE_NAMESPACE
+
+HOMESCREEN_TEST_CLASS(t_hsapplication)
+
+class HsStateMachine : public QStateMachine
+{
+    Q_OBJECT
+
+public:
+    HsStateMachine(QObject *parent = 0);
+    ~HsStateMachine();
+
+signals:
+    void event_exit();
+    void event_toIdle();
+    void event_toAppLib();
+protected:
+    bool eventFilter(QObject *watched, QEvent *event);
+
+private:
+    Q_DISABLE_COPY(HsStateMachine)
+
+
+    void registerAnimations();
+    void createStatePublisher();
+    void createContentServiceParts();
+    void createStates();
+	void updatePSKeys();
+    void captureEndKey(bool enable); 
+
+private slots:
+	void onIdleStateEntered();
+	void onIdleStateExited();
+	void activityRequested(const QString &name);
+	
+
+private:
+    HsContentService *mContentService;	
+	
+	bool mHomeScreenActive;
+	bool mIdleStateActive;
+    bool mEndKeyCaptured;
+
+	QValueSpacePublisher *mPublisher;
+	
+#ifdef Q_OS_SYMBIAN
+    XQKeyCapture keyCapture;
+#endif
+    
+    HOMESCREEN_TEST_FRIEND_CLASS(t_hsapplication)
+};
+
+#endif

--- a/homescreenapp/hsapplication/installs_symbian.pri	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsapplication/installs_symbian.pri	Wed Aug 18 09:40:07 2010 +0300
@@ -17,21 +17,29 @@
 deploy.path = z:
 
 exports1.path = /private/20022F35
+# this database is only for winscw emulator, for HW it is generated during image creation from confml
+exports1.sources += resource/resource_emulator/homescreen.db
 exports1.sources += data/backup_registration.xml
 for(export1, exports1.sources):BLD_INF_RULES.prj_exports += "./$$export1 $$deploy.path$$exports1.path/$$basename(export1)"
 
 exports2.path = /private/20022f35/wallpapers/scene
-exports2.sources += resource/scene/default_landscape.png
-exports2.sources += resource/scene/default_portrait.png
+exports2.sources += resource/wallpapers/scene/default_landscape.png
+exports2.sources += resource/wallpapers/scene/default_portrait.png
 for(export2, exports2.sources):BLD_INF_RULES.prj_exports += "./$$export2 $$deploy.path$$exports2.path/$$basename(export2)"
 
 exports3.path = /private/20022f35/wallpapers/page
-exports3.sources += resource/page/default_landscape.png
-exports3.sources += resource/page/default_portrait.png
-exports3.sources += resource/page/1_landscape.png
-exports3.sources += resource/page/1_portrait.png
-exports3.sources += resource/page/2_landscape.png
-exports3.sources += resource/page/2_portrait.png
-exports3.sources += resource/page/3_landscape.png
-exports3.sources += resource/page/3_portrait.png
+exports3.sources += resource/wallpapers/page/default_landscape.png
+exports3.sources += resource/wallpapers/page/default_portrait.png
+exports3.sources += resource/wallpapers/page/1_landscape.png
+exports3.sources += resource/wallpapers/page/1_portrait.png
+exports3.sources += resource/wallpapers/page/2_landscape.png
+exports3.sources += resource/wallpapers/page/2_portrait.png
+exports3.sources += resource/wallpapers/page/3_landscape.png
+exports3.sources += resource/wallpapers/page/3_portrait.png
 for(export3, exports3.sources):BLD_INF_RULES.prj_exports += "./$$export3 $$deploy.path$$exports3.path/$$basename(export3)"
+
+exports4.path = /private/20022f35/wallpapers/originals
+exports4.sources += resource/wallpapers/page/originals/car.png
+exports4.sources += resource/wallpapers/page/originals/shapes.png
+exports4.sources += resource/wallpapers/page/originals/shoes.png
+for(export4, exports4.sources):BLD_INF_RULES.prj_exports += "./$$export4 $$deploy.path$$exports4.path/$$basename(export4)"

--- a/homescreenapp/hsapplication/installs_win.pri	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsapplication/installs_win.pri	Wed Aug 18 09:40:07 2010 +0300
@@ -16,9 +16,9 @@
 
 kqtihswallpapers.CONFIG += no_build
 kqtihswallpapers.path = $$DESTDIR/resource/kqtihswallpapers
-kqtihswallpapers.files = ./resource/bg_1.png \
-                         ./resource/bg_2.png \
-                         ./resource/bg_3.png
+kqtihswallpapers.files = ./resource/wallpapers/page/originals/car.png \
+                         ./resource/wallpapers/page/originals/shapes.png \
+                         ./resource/wallpapers/page/originals/shoes.png
 
 homescreendb.CONFIG += no_build
 homescreendb.path = $$DESTDIR/private/20022f35
@@ -26,19 +26,19 @@
 
 scenewallpapers.CONFIG += no_build
 scenewallpapers.path = $$DESTDIR/private/20022f35/wallpapers/scene
-scenewallpapers.files = ./resource/scene/default_landscape.png \
-                   ./resource/scene/default_portrait.png
+scenewallpapers.files = ./resource/wallpapers/scene/default_landscape.png \
+                        ./resource/wallpapers/scene/default_portrait.png
 
 pagewallpapers.CONFIG += no_build
 pagewallpapers.path = $$DESTDIR/private/20022f35/wallpapers/page
-pagewallpapers.files = ./resource/page/default_landscape.png \
-                       ./resource/page/default_portrait.png \
-                       ./resource/page/1_portrait.png \
-                       ./resource/page/1_landscape.png \
-                       ./resource/page/2_portrait.png \
-                       ./resource/page/2_landscape.png \
-                       ./resource/page/3_portrait.png \
-                       ./resource/page/3_landscape.png
+pagewallpapers.files = ./resource/wallpapers/page/default_landscape.png \
+                       ./resource/wallpapers/page/default_portrait.png \
+                       ./resource/wallpapers/page/1_portrait.png \
+                       ./resource/wallpapers/page/1_landscape.png \
+                       ./resource/wallpapers/page/2_portrait.png \
+                       ./resource/wallpapers/page/2_landscape.png \
+                       ./resource/wallpapers/page/3_portrait.png \
+                       ./resource/wallpapers/page/3_landscape.png
 
 INSTALLS += kqtihswallpapers homescreendb scenewallpapers pagewallpapers
 PRE_TARGETDEPS += install_kqtihswallpapers install_homescreendb install_scenewallpapers install_pagewallpapers

Binary file homescreenapp/hsapplication/resource/bg_1.png has changed

Binary file homescreenapp/hsapplication/resource/bg_2.png has changed

Binary file homescreenapp/hsapplication/resource/bg_3.png has changed

Binary file homescreenapp/hsapplication/resource/page/1_landscape.png has changed

Binary file homescreenapp/hsapplication/resource/page/1_portrait.png has changed

Binary file homescreenapp/hsapplication/resource/page/2_landscape.png has changed

Binary file homescreenapp/hsapplication/resource/page/2_portrait.png has changed

Binary file homescreenapp/hsapplication/resource/page/3_landscape.png has changed

Binary file homescreenapp/hsapplication/resource/page/3_portrait.png has changed

Binary file homescreenapp/hsapplication/resource/page/default_landscape.png has changed

Binary file homescreenapp/hsapplication/resource/page/default_portrait.png has changed

Binary file homescreenapp/hsapplication/resource/resource_emulator/homescreen.db has changed

Binary file homescreenapp/hsapplication/resource/resource_win/homescreen.db has changed

Binary file homescreenapp/hsapplication/resource/scene/default_landscape.png has changed

Binary file homescreenapp/hsapplication/resource/scene/default_portrait.png has changed

Binary file homescreenapp/hsapplication/resource/wallpapers/page/1_landscape.png has changed

Binary file homescreenapp/hsapplication/resource/wallpapers/page/1_portrait.png has changed

Binary file homescreenapp/hsapplication/resource/wallpapers/page/2_landscape.png has changed

Binary file homescreenapp/hsapplication/resource/wallpapers/page/2_portrait.png has changed

Binary file homescreenapp/hsapplication/resource/wallpapers/page/3_landscape.png has changed

Binary file homescreenapp/hsapplication/resource/wallpapers/page/3_portrait.png has changed

Binary file homescreenapp/hsapplication/resource/wallpapers/page/default_landscape.png has changed

Binary file homescreenapp/hsapplication/resource/wallpapers/page/default_portrait.png has changed

Binary file homescreenapp/hsapplication/resource/wallpapers/page/originals/car.png has changed

Binary file homescreenapp/hsapplication/resource/wallpapers/page/originals/shapes.png has changed

Binary file homescreenapp/hsapplication/resource/wallpapers/page/originals/shoes.png has changed

Binary file homescreenapp/hsapplication/resource/wallpapers/scene/default_landscape.png has changed

Binary file homescreenapp/hsapplication/resource/wallpapers/scene/default_portrait.png has changed

Binary file homescreenapp/hsapplication/resource/wallpapers/scene/originals/kites.png has changed

--- a/homescreenapp/hsapplication/src/hshomescreen.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsapplication/src/hshomescreen.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -26,6 +26,7 @@
 
 #include "hshomescreen.h"
 #include "hstest_global.h"
+#include "hsstatemachine.h"
 #ifdef Q_OS_SYMBIAN
 #include "hshomescreenclientserviceprovider.h"
 #endif
@@ -35,8 +36,7 @@
     \class HsHomeScreen
     \ingroup group_hsapplication
     \brief Homescreen application main class.
-    Loads a runtime from a runtime provider plugin. Manages
-    the state machine execution.
+    Manages the state machine execution.
 */
 
 /*!
@@ -52,34 +52,17 @@
 {
     HSTEST_FUNC_ENTRY("HS::HsHomeScreen::HsHomeScreen");
 
-    QServiceManager serviceManager;
-
-    registerServicePlugins(serviceManager);
+    registerServicePlugins();
     
-    QServiceFilter filter("com.nokia.symbian.IHomeScreenRuntime");
-    QList<QServiceInterfaceDescriptor> interfaces = serviceManager.findInterfaces(filter);
-
-    if (interfaces.isEmpty()) {
-        emit exit();
-        return;
-    }
+    mRuntime = new HsStateMachine(this);
 
-    QObject *object = serviceManager.loadInterface(interfaces.first().interfaceName());
-    mRuntime = qobject_cast<QStateMachine *>(object);
-
-    if (mRuntime) {
-        mRuntime->setParent(this);
-        connect(mRuntime, SIGNAL(started()), SLOT(onRuntimeStarted()));
-        connect(mRuntime, SIGNAL(stopped()), SLOT(onRuntimeStopped()));
-        hbInstance->allMainWindows().first()->installEventFilter(this);
+    connect(mRuntime, SIGNAL(started()), SLOT(onRuntimeStarted()));
+    connect(mRuntime, SIGNAL(stopped()), SLOT(onRuntimeStopped()));
+    hbInstance->allMainWindows().first()->installEventFilter(this);
 #ifdef Q_OS_SYMBIAN
-        mHomeScreenClientServiceProvider = new HsHomeScreenClientServiceProvider;
-        mHomeScreenClientServiceProvider->setParent(this);
+    mHomeScreenClientServiceProvider = new HsHomeScreenClientServiceProvider;
+    mHomeScreenClientServiceProvider->setParent(this);
 #endif
-    } else {
-        delete object;
-        emit exit();
-    }
 
     HSTEST_FUNC_EXIT("HS::HsHomeScreen::HsHomeScreen");
 }
@@ -97,26 +80,21 @@
 */
 
 /*!
-    Starts the runtime.
+    Starts the state machine.
 */
 void HsHomeScreen::start()
 {
     HSTEST_FUNC_ENTRY("HS::HsHomeScreen::start");
-    if (mRuntime) {
-        mRuntime->start();
-    } else {
-        HSTEST_FUNC_EXIT("HS::HsHomeScreen::start, mRuntime not created, exit application");
-        emit exit();
-    }
+    mRuntime->start();
     HSTEST_FUNC_EXIT("HS::HsHomeScreen::start");
 }
 
 /*!
-    Stops the runtime.
+    Stops the state machine.
 */
 void HsHomeScreen::stop()
 {
-	if (mRuntime && mRuntime->isRunning()) {
+	if (mRuntime->isRunning()) {
         QEventLoop eventLoop;
         connect(mRuntime, SIGNAL(finished()), &eventLoop, SLOT(quit()));
         QMetaObject::invokeMethod(mRuntime, "event_exit", Qt::QueuedConnection);
@@ -137,14 +115,14 @@
 }
 
 /*!
-    Called after the runtime has started.
+    Called after the state machine has started.
 */
 void HsHomeScreen::onRuntimeStarted()
 {
 }
 
 /*!
-    Called after the runtime has stopped.
+    Called after the state machine has stopped.
 */
 void HsHomeScreen::onRuntimeStopped()
 {
@@ -154,13 +132,15 @@
 /*!
     Registers service plugins pre-installed on the device.
 */
-void HsHomeScreen::registerServicePlugins(QServiceManager &serviceManager)
-{
+void HsHomeScreen::registerServicePlugins()
+{    
     HSTEST_FUNC_ENTRY("HS::HsHomeScreen::registerServicePlugins()");
+    
+    QServiceManager serviceManager;
+    
     QStringList pluginPaths;
     
-    pluginPaths << "private/20022F35";    
-    pluginPaths << "hsresources/plugins";
+    pluginPaths << "private/20022F35";
 
     QFileInfoList drives = QDir::drives();
     foreach(const QString pluginPath, pluginPaths) {
@@ -182,6 +162,12 @@
     HSTEST_FUNC_EXIT("HS::HsHomeScreen::registerServicePlugins()");
 }
 
+#ifdef COVERAGE_MEASUREMENT 
+#ifndef Q_OS_SYMBIAN 
+#pragma CTC SKIP
+#endif // Q_OS_SYMBIAN
+#endif //COVERAGE_MEASUREMENT
+
 /*!
     Recursively registers service plugins starting from given /a root
     directory. All directories containing plugins are added to
@@ -214,3 +200,9 @@
     }
     HSTEST_FUNC_EXIT("HS::HsHomeScreen::registerServicePlugins(const QString &)");
 }
+
+#ifdef COVERAGE_MEASUREMENT
+#ifndef Q_OS_SYMBIAN 
+#pragma CTC ENDSKIP
+#endif // Q_OS_SYMBIAN
+#endif //COVERAGE_MEASUREMENT
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/src/hsrecoverymanager.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,104 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#include <e32property.h>
+
+#include <QFile>
+
+#include "hsrecoverymanager.h"
+
+const TInt KPSCategoryUid(0x20022F36);
+const TInt KPSCrashCountKey(1);
+const int KCrashCountThreshold(3);
+const int KResetCrashCountInterval(60000);
+
+/*!
+    \class HsRecoveryManager
+    \ingroup group_hsapplication
+    \brief Used during homescreen startup for recovering from possible crash situations.
+*/
+
+/*!
+    Constructs a new recovery manager with the given \a parent item.
+*/
+HsRecoveryManager::HsRecoveryManager(QObject *parent)
+  : QObject(parent)
+{    
+    mTimer.setInterval(KResetCrashCountInterval);
+    mTimer.setSingleShot(true);
+    connect(&mTimer, SIGNAL(timeout()), SLOT(resetCrashCount()));
+}
+
+/*!
+    Destructor.
+*/
+HsRecoveryManager::~HsRecoveryManager()
+{
+}
+
+/*!
+    Executes this recovery manager. If crash count exceeds the
+    threshold, the ROM configuration is selected. Otherwise,
+    the existing one is used.
+*/
+void HsRecoveryManager::execute()
+{
+    int count = crashCount();    
+    if (KCrashCountThreshold <= count) {
+        restoreRomDatabase();
+        resetCrashCount();
+        return;
+    }
+    if (0 < count) {
+        mTimer.start();
+    }
+}
+
+/*!
+    Restores the ROM database to c: drive.
+*/
+void HsRecoveryManager::restoreRomDatabase()
+{
+    // If exists, remove the database from c:
+    QFile file("c:/private/20022f35/homescreen.db");
+    if (file.exists()) {        
+        file.remove();
+    }          
+    // Copy the rom database to c: and set permissions.
+    file.setFileName("z:/private/20022f35/homescreen.db");     
+    file.copy("c:/private/20022f35/homescreen.db");
+    file.setFileName("c:/private/20022f35/homescreen.db");
+    file.setPermissions(QFile::ReadOwner | QFile::WriteOwner);
+}
+
+/*!
+    Resets the crash count to zero.
+*/
+void HsRecoveryManager::resetCrashCount()
+{
+    RProperty::Set(TUid::Uid(KPSCategoryUid), KPSCrashCountKey, 0); 
+}
+
+/*!
+    Returns the current crash count.
+*/
+int HsRecoveryManager::crashCount()
+{
+    TInt count = 0;
+    RProperty::Get(TUid::Uid(KPSCategoryUid), KPSCrashCountKey, count);    
+    return count;
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/src/hsstatemachine.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,426 @@
+/*
+* 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:  Default implementation of the home state machine.
+*
+*/
+
+#include <QState>
+#include <QFinalState>
+#include <QHistoryState>
+#include <QSignalTransition>
+#include <QKeyEventTransition>
+#include <QKeyEvent>
+
+#include <qvaluespacepublisher.h>
+#include <qservicemanager.h>
+#include <qservicefilter.h>
+#include <qserviceinterfacedescriptor.h>
+
+#include <HbApplication>
+#include <HbActivityManager>
+#include <HbInstance>
+#include <HbIconAnimationManager>
+#include <HbIconAnimationDefinition>
+
+#include "hsmenueventfactory.h"
+#include "homescreendomainpskeys.h"
+#include "hsstatemachine.h"
+#include "hsdatabase.h"
+#include "hscontentservice.h"
+#include "hsshortcutservice.h"
+#include "hsmenueventtransition.h"
+#include "hswidgetpositioningonorientationchange.h"
+#include "hswidgetpositioningonwidgetadd.h"
+#include "hsconfiguration.h"
+#include "hstest_global.h"
+#include "hswidgetpositioningonwidgetmove.h"
+
+QTM_USE_NAMESPACE
+#define hbApp qobject_cast<HbApplication*>(qApp)
+
+namespace
+{
+    const char KHsRootStateInterface[] = "com.nokia.homescreen.state.HsRootState";
+    const char KHsLoadSceneStateInterface[] = "com.nokia.homescreen.state.HsLoadSceneState";
+    const char KHsIdleStateInterface[] = "com.nokia.homescreen.state.HsIdleState";
+    const char KHsAppLibraryStateInterface[] = "com.nokia.homescreen.state.HsAppLibraryState";
+    const char KHsMenuWorkerStateInterface[] = "com.nokia.homescreen.state.HsMenuWorkerState";
+    const char KHsBacupRestoreStateInterface[] = "com.nokia.homescreen.state.HsBackupRestoreState";
+}
+
+
+/*!
+    \class HsStateMachine
+    \ingroup group_hsstatemachine
+    \brief Default implementation of the home screen state machine.
+    Creates an execution context (EC) and populates it with
+    runtime services. States are loaded from state plugins.
+    Each state is given an access to the EC. States
+    are added to a state machine. Finally, the state machine
+    is started.
+*/
+
+/*!
+    Constructs state machine with \a parent as the parent object.
+*/
+HsStateMachine::HsStateMachine(QObject *parent)
+    : QStateMachine(parent),
+      mContentService(0),	  
+      mHomeScreenActive(false),
+      mIdleStateActive(false),
+      mEndKeyCaptured(false),
+      mPublisher(NULL)
+#ifdef Q_OS_SYMBIAN
+	  ,keyCapture()
+#endif
+{
+    HSTEST_FUNC_ENTRY("HS::HsStateMachine::HsStateMachine");
+
+    HsDatabase *db = new HsDatabase(QCoreApplication::instance());
+    db->setConnectionName("homescreen.dbc");
+#ifdef Q_OS_SYMBIAN
+    db->setDatabaseName("c:/private/20022f35/homescreen.db");
+#else
+    db->setDatabaseName("private/20022f35/homescreen.db");
+#endif    
+    db->open();
+    HsDatabase::setInstance(db);
+
+    HsConfiguration::setInstance(new HsConfiguration(QCoreApplication::instance()));
+    HsConfiguration::instance()->load();
+            
+    HsWidgetPositioningOnOrientationChange::setInstance(
+        new HsAdvancedWidgetPositioningOnOrientationChange);
+#ifdef HSWIDGETORGANIZER_ALGORITHM
+    HsWidgetPositioningOnWidgetAdd::setInstance(
+        new HsWidgetOrganizer);
+#else
+    HsWidgetPositioningOnWidgetAdd::setInstance(
+        new HsAnchorPointInBottomRight);
+#endif
+
+    HsWidgetPositioningOnWidgetMove::setInstance(
+        new HsSnapToLines);
+
+    registerAnimations();
+
+    createStatePublisher();
+    createContentServiceParts();
+    createStates();    
+
+    // create the instance so that singleton is accessible from elsewhere
+    HsShortcutService::instance(this);
+
+    QCoreApplication::instance()->installEventFilter(this);
+
+    if (hbApp) { // Qt test framework uses QApplication.
+        connect(hbApp->activityManager(), SIGNAL(activityRequested(QString)), 
+                this, SLOT(activityRequested(QString)));
+    }
+    HSTEST_FUNC_EXIT("HS::HsStateMachine::HsStateMachine");
+}
+
+/*!
+    Destructor.
+*/
+HsStateMachine::~HsStateMachine()
+{
+    HsWidgetPositioningOnOrientationChange::setInstance(0);
+    HsWidgetPositioningOnWidgetAdd::setInstance(0);
+    HsWidgetPositioningOnWidgetMove::setInstance(0);
+    delete mPublisher;
+}
+
+/*!
+    \fn void HsStateMachine::stopStateMachine()
+    Emission of this signal initiates a transition to the final state.
+*/
+
+/*!
+    \copydoc QObject::eventFilter(QObject *watched, QEvent *event)
+*/
+bool HsStateMachine::eventFilter(QObject *watched, QEvent *event)
+{
+    Q_UNUSED(watched);
+
+    switch (event->type()) {
+        case QEvent::ApplicationActivate:
+            qDebug() << "HsStateMachine::eventFilter: QEvent::ApplicationActivate";
+            mHomeScreenActive = true;
+            updatePSKeys();
+            break;
+        case QEvent::ApplicationDeactivate:
+            qDebug() << "HsStateMachine::eventFilter: QEvent::ApplicationDeactivate";
+            mHomeScreenActive = false;
+            updatePSKeys();
+            break;
+        default:
+            break;
+    }
+        
+    bool result =  QStateMachine::eventFilter(watched, event);    
+    if (event->type() == QEvent::KeyPress ) {
+        QKeyEvent* ke = static_cast<QKeyEvent *>(event);                 
+        result = (ke->key() == Qt::Key_Home);
+    }
+    return result;
+}
+
+
+/*!
+    Registers framework animations.
+*/
+void HsStateMachine::registerAnimations()
+{
+    HbIconAnimationManager *manager = HbIconAnimationManager::global();
+    manager->addDefinitionFile(QLatin1String("qtg_anim_loading.axml"));
+}
+
+/*!
+    Creates Home screen state publisher.
+*/
+void HsStateMachine::createStatePublisher()
+{
+    mPublisher = new QValueSpacePublisher(QValueSpace::PermanentLayer, HsStatePSKeyPath);
+
+    if (!mPublisher->isConnected()){
+    	// No permanent layer available
+    	mPublisher = new QValueSpacePublisher(HsStatePSKeyPath);
+    }
+
+    mPublisher->setValue(HsStatePSKeySubPath, EHomeScreenInactive);
+}
+
+/*!
+    Creates content service parts.
+*/
+void HsStateMachine::createContentServiceParts()
+{
+    HSTEST_FUNC_ENTRY("HS::HsStateMachine::createContentServiceParts");
+
+    mContentService = new HsContentService(this);
+
+    HSTEST_FUNC_EXIT("HS::HsStateMachine::createContentServiceParts");
+}
+
+/*!
+    Creates states.
+*/
+void HsStateMachine::createStates()
+{
+    HSTEST_FUNC_ENTRY("HS::HsStateMachine::createStates");
+
+    QFinalState *finalState = new QFinalState();
+    addState(finalState);
+
+    QState *guiRootState = new QState();
+    addState(guiRootState);
+
+    guiRootState->addTransition(this, SIGNAL(event_exit()), finalState);
+
+    QServiceManager manager;
+
+    
+    QObject *loadSceneStateObj = manager.loadInterface(KHsLoadSceneStateInterface);
+    QState *loadSceneState = qobject_cast<QState *>(loadSceneStateObj);
+    loadSceneState->setParent(guiRootState);
+    loadSceneState->setObjectName(KHsLoadSceneStateInterface);
+
+    QObject *rootStateObj = manager.loadInterface(KHsRootStateInterface);
+    QState *rootState = qobject_cast<QState *>(rootStateObj);   
+    rootState->setParent(guiRootState);
+    rootState->setObjectName(KHsRootStateInterface);       
+
+    QObject *idleStateObj = manager.loadInterface(KHsIdleStateInterface);
+    QState *idleState = qobject_cast<QState *>(idleStateObj);
+    idleState->setParent(rootState);
+    idleState->setObjectName(KHsIdleStateInterface);
+	connect(idleState, SIGNAL(entered()), SLOT(onIdleStateEntered()));
+	connect(idleState, SIGNAL(exited()), SLOT(onIdleStateExited()));
+
+
+    //menu state
+    QState *menuParallelState = new QState(
+            QState::ParallelStates, rootState);
+    QState *menuRootState = new QState(menuParallelState);
+
+    QObject *appLibraryStateObj = manager.loadInterface(KHsAppLibraryStateInterface);
+    QState *appLibraryState = qobject_cast<QState *>(appLibraryStateObj);
+    appLibraryState->setParent(menuRootState);
+    appLibraryState->setObjectName(KHsAppLibraryStateInterface);
+    menuRootState->setInitialState(appLibraryState);
+
+    QHistoryState *historyState = new QHistoryState(rootState);
+    historyState->setDefaultState(idleState);
+    
+    loadSceneState->addTransition(
+            loadSceneState, SIGNAL(event_history()), historyState);            
+
+    QObject *menuWorkerStateObj = manager.loadInterface(KHsMenuWorkerStateInterface);
+    QState *menuWorkerState = qobject_cast<QState *>(menuWorkerStateObj);
+    menuWorkerState->setParent(menuParallelState);
+    menuWorkerState->setObjectName(KHsMenuWorkerStateInterface);
+
+    connect(appLibraryState, SIGNAL(collectionEntered()), 
+            menuWorkerState, SIGNAL(reset()));
+
+    //Backup/Restore state
+    QObject *backupRestoreStateObj = manager.loadInterface(KHsBacupRestoreStateInterface);
+    QState *backupRestoreState = qobject_cast<QState *>(backupRestoreStateObj);   
+    backupRestoreState->setParent(guiRootState);
+    backupRestoreState->setObjectName(KHsBacupRestoreStateInterface);
+    backupRestoreState->addTransition(
+            backupRestoreState, SIGNAL(event_loadScene()), loadSceneState);
+
+    // root state transitions
+    idleState->addTransition(idleState, SIGNAL(event_applicationLibrary()), menuRootState);
+    appLibraryState->addTransition(
+            appLibraryState, SIGNAL(toHomescreenState()), idleState);
+    rootState->addTransition(rootState, SIGNAL(event_backupRestore()), backupRestoreState);
+    // opening shortcut to Application Library
+    HsMenuEventTransition *idleToAppLibTransition =
+        new HsMenuEventTransition(HsMenuEvent::OpenApplicationLibrary,
+                                  idleState, appLibraryState);
+    idleState->addTransition(idleToAppLibTransition);
+
+    HsMenuEventTransition *appLibToIdleTransition =
+        new HsMenuEventTransition(
+            HsMenuEvent::OpenHomeScreen, appLibraryState, idleState);
+    appLibraryState->addTransition(appLibToIdleTransition);
+
+    HbMainWindow *window = hbInstance->allMainWindows().first();
+
+#ifndef  Q_OS_SYMBIAN   
+    // key driven transition from idle to menu
+    QKeyEventTransition *idleToMenuRootTransition =
+        new QKeyEventTransition(
+                window, QEvent::KeyPress, Qt::Key_Home);
+    idleToMenuRootTransition->setTargetState(menuRootState);
+    idleState->addTransition(idleToMenuRootTransition);
+    // key driven transition from menu to idle
+    QKeyEventTransition *menuToIdleTransition =
+        new QKeyEventTransition(
+                window, QEvent::KeyPress, Qt::Key_Home);
+    menuToIdleTransition->setTargetState(idleState);
+    menuRootState->addTransition(menuToIdleTransition);
+#endif 
+    // key driven transition from menu to idle
+    QKeyEventTransition *menuToIdleTransitionNoKey =
+        new QKeyEventTransition(
+                window, QEvent::KeyPress, Qt::Key_No);
+    menuToIdleTransitionNoKey->setTargetState(idleState);
+    menuRootState->addTransition(menuToIdleTransitionNoKey);
+    
+    // add transition to switch to idle
+    menuRootState->addTransition( this, SIGNAL(event_toIdle()), idleState);    
+    // add transition to switch to applib 
+    idleState->addTransition( this, SIGNAL(event_toAppLib()), menuRootState);
+    
+    // transitions to child states
+    // opening shortcut to a colleciton
+    QList<QState *> collectionStates =
+        appLibraryState->
+            findChildren<QState *>
+                ("homescreen.nokia.com/state/applibrarystate/collectionstate");
+    qDebug(
+        "Found %d \"collectionstate\" children for Application Library State",
+            collectionStates.count());
+    if (collectionStates.count()) {
+        HsMenuEventTransition *idleToCollectionTransition =
+            new HsMenuEventTransition(HsMenuEvent::OpenCollection,
+                                      idleState, collectionStates[0]);
+        idleState->addTransition(idleToCollectionTransition);
+    }
+
+    guiRootState->setInitialState(loadSceneState);
+    setInitialState(guiRootState);
+    
+    HSTEST_FUNC_EXIT("HS::HsStateMachine::createStates");
+}
+
+
+/*!
+    Publishes Home screen states via Publish & Subscribe.
+*/
+void HsStateMachine::updatePSKeys()
+{	
+	if (!mPublisher){
+		createStatePublisher();
+	}
+
+	if (mHomeScreenActive && mIdleStateActive){
+    	qDebug() << "HsStateMachine::updatePSKeys: EHomeScreenIdleState";
+    	mPublisher->setValue(HsStatePSKeySubPath, EHomeScreenIdleState);
+    }
+    else{
+    	qDebug() << "HsStateMachine::updatePSKeys: EHomeScreenInactive";
+    	mPublisher->setValue(HsStatePSKeySubPath, EHomeScreenInactive);
+    }	
+    
+    if (mHomeScreenActive && !mIdleStateActive) {
+        captureEndKey(true);
+    } else {
+        captureEndKey(false);
+    }
+}
+
+/*!
+    capture End key 
+*/
+void HsStateMachine::captureEndKey(bool enable) 
+{
+#ifdef Q_OS_SYMBIAN
+    if (enable && !mEndKeyCaptured) {
+        mEndKeyCaptured = true;
+        keyCapture.captureKey(Qt::Key_No);        
+    } else if (mEndKeyCaptured) {
+        mEndKeyCaptured = false;
+        keyCapture.cancelCaptureKey(Qt::Key_No);
+    }
+#endif
+}
+
+/*!
+    Called when state machine is in Idle state.
+*/
+void HsStateMachine::onIdleStateEntered()
+{
+	mIdleStateActive = true;
+	updatePSKeys();
+}
+
+/*!
+    Called when state machine leaves the Idle state.
+*/
+void HsStateMachine::onIdleStateExited()
+{
+	mIdleStateActive = false;
+	updatePSKeys();
+}
+
+/*!
+    Activity requested by another client 
+*/
+void HsStateMachine::activityRequested(const QString &name) 
+{
+    if (name == groupAppLibRecentView()) {
+        this->postEvent(
+            HsMenuEventFactory::createOpenCollectionEvent(0,
+            collectionDownloadedTypeName()));
+    } else if (name == activityHsIdleView()) {
+        emit event_toIdle();
+    } else if (name == activityAppLibMainView()) {
+        emit event_toAppLib();
+    }
+}

--- a/homescreenapp/hsapplication/src/main.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsapplication/src/main.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -36,6 +36,7 @@
 #include <e32debug.h>
 #include <apgwgnam.h>
 
+#include "hsrecoverymanager.h"
 
 void loadTranslationFilesOnSymbian(QTranslator &commonTranslator, 
                                     QTranslator &hsTranslator, 
@@ -43,6 +44,7 @@
 void copyWallpapersFromRom();
 void copyHsDatabaseFileFromRom();
 void createPrivateFolder();
+void copyWallpaperOriginalsFromRomToPhotos();
 
 /*!
     \fn setHomescreenAsSystemAppL(CEikonEnv* eikonEnv)
@@ -133,6 +135,8 @@
     
 #ifdef Q_OS_SYMBIAN
     copyHsDatabaseFileFromRom();
+    HsRecoveryManager recoveryManager;
+    recoveryManager.execute();
     copyWallpapersFromRom();
 #endif
     
@@ -203,7 +207,7 @@
         HSTEST("HS::main() - homescreen.db not in c:");
         file.setFileName("z:/private/20022f35/homescreen.db");
         if(!file.exists()) {
-            HSTEST("HS::main() - homescreen.db not in ROM!");
+            qWarning() << "HS::main() - homescreen.db not in ROM!";
         } else {
             HSTEST("HS::main() - homescreen.db found from z:");
             createPrivateFolder();
@@ -214,10 +218,12 @@
             HSTEST("HS::main() - homescreen.db copied from ROM to c:!");
             file.setFileName("c:/private/20022f35/homescreen.db");
             if(!file.setPermissions(QFile::ReadOwner | QFile::WriteOwner)) {
-                HSTEST("HS::main() - homescreen.db ReadWrite permission settings on c: failed!");
+                qWarning() << "HS::main() - homescreen.db ReadWrite permission settings on c: failed!";
             }
             HSTEST("HS::main() - homescreen.db permission set to ReadWrite!");
         }
+        // Copy wallpaper originals to C drive user data to be visible in Photos
+        copyWallpaperOriginalsFromRomToPhotos();
     }
 #ifdef __WINS__
     else if(!file.setPermissions(QFile::ReadOwner | QFile::WriteOwner)) {
@@ -280,6 +286,36 @@
 }
 
 /*!
+    \fn copyWallpaperOriginalFromRomToPhotos()
+    \ingroup group_hsapplication
+    \internal    
+    \brief Wallpaper original copier
+    Copies homescreen wallpaper originals from rom to C for Photos
+    does not exist on c: drive
+*/
+void copyWallpaperOriginalsFromRomToPhotos()
+{
+    QString targetPath("e:/data/images/wallpapers");
+    QDir dir(targetPath);
+    if(!dir.exists()) {
+        dir.mkpath(targetPath);    
+        QDir dir2("z:/private/20022f35/wallpapers/originals");
+        dir2.setFilter(QDir::Files);
+        QStringList files = dir2.entryList();
+        foreach(QString file, files) {
+            QString targetFile(targetPath + "/" + file);
+            if ( QFile::copy(dir2.absoluteFilePath(file), targetFile) ) {
+                qDebug() << "Wallpaper original copied from " << dir2.absoluteFilePath(file) << "to " << targetFile;
+            } 
+            QFile createdFile(targetFile);
+            if(!createdFile.setPermissions(QFile::ReadOwner | QFile::WriteOwner)) {
+                qDebug() << "Read write permission set failed for wallpaper original" << targetFile;
+            }
+        }
+    }
+}
+
+/*!
     \fn loadTranslationFilesOnSymbian(QTranslator &commonTranslator, 
                                       QTranslator &hsTranslator, 
                                       QTranslator &alTranslator)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplicationlauncher/group/hsapplicationlauncher.mmp	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,50 @@
+/*
+* 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:  Makefile of hsapplicationlauncher
+*
+*/
+
+#include <platform_paths.hrh>
+
+TARGET hsapplicationlauncher.exe
+
+targettype exe
+
+UID             0x1000008d 0x20022F36
+CAPABILITY      ReadDeviceData WriteDeviceData
+VENDORID        VID_DEFAULT
+SECUREID        0x20022F36
+
+EPOCHEAPSIZE	0x1000 0x100000   // 4KB - 1 MB
+EPOCSTACKSIZE	0x5000
+
+SOURCEPATH		../src
+SOURCE			hsapplicationlauncher.cpp
+SOURCE			hsprocessmonitor.cpp
+SOURCE			hsshutdownmonitor.cpp
+
+USERINCLUDE		. 
+USERINCLUDE		../inc
+
+MW_LAYER_SYSTEMINCLUDE
+
+LIBRARY			euser.lib  // CBase etc
+LIBRARY			bafl.lib   // descriptors
+LIBRARY			ssmcmn.lib // state manager
+LIBRARY         centralrepository.lib
+LIBRARY         cenrepnotifhandler.lib
+
+LANG			SC
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplicationlauncher/hsapplicationlauncher.pro	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,21 @@
+#
+# 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: Main project file for homescreen application
+#
+
+TEMPLATE = subdirs
+
+symbian: {
+    BLD_INF_RULES.prj_mmpfiles += "./group/hsapplicationlauncher.mmp"    
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplicationlauncher/inc/hsapplicationlauncher.h	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,186 @@
+/*
+* Copyright (c) 1020 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: application class.
+*/
+
+#ifndef __HS_LAUNCH_
+#define __HS_LAUNCH_
+
+#include <e32base.h>
+#include <centralrepository.h>
+#include <cenrepnotifyhandler.h>
+#include "hsprocessmonitor.h"
+#include "hsshutdownmonitor.h"
+
+class t_hsapplicationlauncher;
+
+/**
+ * CHsLaunch
+ * 
+ * application class.
+ * 
+ * @since S60 5.2  
+ */
+class CHsLaunch : public CActive,
+                         MCenRepNotifyHandlerCallback,
+                         MHsProcessMonitorObserver,
+                         MHsShutdownMonitorObserver
+    {
+    public:
+        /**
+         * Create new launcher
+         *
+         * @since S60 5.2     
+         */    
+        static CHsLaunch* NewL();
+        
+        /**
+         * Destructor.
+         *
+         * @since S60 5.2     
+         */
+        virtual ~CHsLaunch();
+
+        /**
+         * Set active object to be ran
+         * 
+         * @since S60 5.2
+         */        
+        void Activate();        
+
+        /**
+         * Get application return value
+         * 
+         * @return TInt     Application return value
+         * @since S60 5.2
+         */        
+        TInt ApplicationReturnValue();      
+        
+    protected:
+        /**
+         * C++ constructor.
+         *
+         * @since S60 5.2      
+         */        
+        CHsLaunch();    
+        
+        /**
+         * Symbian 2nd phase constructor
+         * 
+         * @since S60 5.2
+         */        
+        void ConstructL();
+    
+    private: // From CActive.
+        /**
+         * From CActive
+         */        
+        void RunL();
+
+        /**
+         * From CActive
+         * 
+         * @since S60 5.2
+         */        
+        void DoCancel(); 
+
+        /**
+         * From CActive
+         * 
+         * @since S60 5.2
+         */        
+        TInt RunError( TInt aError );
+
+    private: // From MCenRepNotifyHandlerCallback
+        /**
+         * From MCenRepNotifyHandlerCallback
+         */
+        void HandleNotifyInt(TUint32 aId, TInt aNewValue);
+        
+    private: // From MHsProcessMonitorObserver
+        /**
+         * From MHsProcessMonitorObserver
+         */
+        void ProcessEnded( const TExitType& aExitType,
+                           const TInt aExitReason,
+                           const TExitCategoryName& aExitCategory );
+
+        /**
+         * From MHsProcessMonitorObserver
+         */
+        void ProcessMonitoringError( TInt aError );
+
+    private: // From MHsShutdownMonitorObserver
+        /**
+         * From MHsShutdownMonitorObserver
+         */
+        void SystemShutdownEvent();
+
+    private:
+        /**
+         * Initialize process monitor
+         * 
+         * @param aProcessId    Id of process to monitor 
+         */
+        void InitProcessMonitorL( const TInt aProcessId );
+        
+        /**
+         * Shut down application 
+         * 
+         * @param aApplicationReturnValue   Application return value.
+         */
+        void ShutdownApp( const TInt aApplicationReturnValue );         
+        
+        /**
+         * Starts the home screen application.
+         */
+        void StartHomeScreen();
+        
+        /**
+         * Checks if the language is selected.
+         */
+        TBool IsLanguageSelectedL();
+        
+        /**
+         * Starts listening the repository notifications for
+         * language selection.
+         */
+        void StartListeningLanguageSelectionL();
+        
+        /**
+         * Stops listening the repository notifications for
+         * language selection.
+         */
+        void StopListeningLanguageSelection();
+        
+    private: // data.
+        // Process monitor. Owned.
+        CHsProcessMonitor* iProcessMonitor;
+        
+        // Shutdown monitor. Owned.
+        CHsShutdownMonitor* iShutdownMonitor;
+        
+        // Repository.
+        CRepository *iRepository;
+
+        // Repository notify handler.
+        CCenRepNotifyHandler* iCenRepNotifyHandler;
+        
+        // Application return value
+        TInt iApplicationReturnValue;
+
+        friend class t_hsapplicationlauncher;
+    };
+
+#endif // __HS_LAUNCH_

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplicationlauncher/inc/hsprocessmonitor.h	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,159 @@
+/*
+* Copyright (c) 1020 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: process monitor.
+*/
+
+
+#ifndef __HS_PROCESS_MONITOR__
+#define __HS_PROCESS_MONITOR__
+
+#include <e32base.h>
+
+class t_hsapplicationlauncher;
+
+/**
+ * MHsProcessMonitorObserver
+ * 
+ * Monitor component observer.
+ * 
+ * @since S60 5.2
+ */
+class MHsProcessMonitorObserver
+    {    
+    public:
+        /**
+         * Called when monitored process is ended.
+         * 
+         * @param aExitType         Exit type
+         * @param aExitReason       Exit reason
+         * @param aExitCategory     Exit category
+         */
+        virtual void ProcessEnded( const TExitType& aExitType,
+                                   const TInt aExitReason,
+                                   const TExitCategoryName& aExitCategory ) = 0;
+
+        /**
+         * Called when error occured during monitoring.
+         * 
+         * @param aError System wide error code.
+         */        
+        virtual void ProcessMonitoringError( TInt aError ) = 0;											
+    };
+
+/**
+ * HsProcessMonitor
+ * 
+ * Component for monitoring process states.
+ * 
+ * @since S60 5.2
+ */  
+class CHsProcessMonitor : public CActive
+    {
+    public:
+        /**
+         * Create new monitor
+         * 
+         * @param aProcessName	process id
+         * @param aObserver monitor observer
+         * @since S60 5.2     
+         */    
+        static CHsProcessMonitor* NewL( const TInt aProcessId,
+                                        MHsProcessMonitorObserver& aObserver );   
+        
+        /**
+         * Destructor
+         * 
+         * @since S60 5.2     
+         */    
+        ~CHsProcessMonitor();
+    
+        /**
+         * Attach monitor
+         * 
+         * @return TInt     System wide error code.       
+         * @since S60 5.2
+         */        
+        TInt AttachMonitor();
+        
+        /**
+         * Start monitor
+         * 
+         * @return TInt     System wide error code.
+         * @since S60 5.2
+         */        
+        TInt StartMonitor();        
+
+    protected:
+        /** 
+         * C++ constructor
+         *
+         * @param aProcessName  process id
+         * @param aObserver     watchdog observer.   
+         * @since S60 5.2      
+         */        
+        CHsProcessMonitor( const TInt aProcessId,
+                           MHsProcessMonitorObserver& aObserver );    
+
+        /**
+         * Symbian 2nd phase constructor
+         * 
+         * @since S60 5.2
+         */        
+        void ConstructL();
+
+    private: // From CActive
+        /**
+         * From CActive
+         */        
+        void RunL();
+
+        /**
+         * From CActive
+         * 
+         * @since S60 5.2
+         */        
+        void DoCancel(); 
+
+        /**
+         * From CActive
+         * 
+         * @since S60 5.2
+         */        
+        TInt RunError( TInt aError );
+
+    private: // New methods
+        /**
+         * Close process handle if open
+         * 
+         * @since S60 5.2
+         */        
+        void SecureProcessHandleAsClosed();     
+
+    private:	
+        // process id
+        TInt iProcessId;        
+        
+        // watchdog observer
+        MHsProcessMonitorObserver& iObserver;
+        
+        // Process handle
+        RProcess iProcess;
+        
+        // boolean to represent whether process handle is open
+        TBool iProcessHandleOpen;        
+
+        friend class t_hsapplicationlauncher;
+    };
+
+#endif // __HS_PROCESS_MONITOR__

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplicationlauncher/inc/hsshutdownmonitor.h	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,121 @@
+/*
+* Copyright (c) 1020 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: shutdown monitor.
+*/
+
+
+#ifndef __HS_SHUTDOWN_MONITOR__
+#define __HS_SHUTDOWN_MONITOR__
+
+#include <e32base.h>
+#include <ssm/ssmstateawaresession.h>
+
+class t_hsapplicationlauncher;
+
+/**
+ * MHsShutdownMonitorObserver
+ * 
+ * Monitor component observer.
+ * 
+ * @since S60 5.2
+ */
+class MHsShutdownMonitorObserver
+    {    
+    public:
+        /**
+         * Called when shutdown occurs 
+         */
+        virtual void SystemShutdownEvent() = 0;
+    };
+
+/**
+ * HsShutdownMonitor
+ * 
+ * Component for monitoring shutdown
+ * 
+ * @since S60 5.2
+ */  
+class CHsShutdownMonitor : public CActive
+    {
+    public:
+        /**
+         * Create new monitor
+         * 
+         * @param aObserver monitor observer
+         * @since S60 5.2     
+         */    
+        static CHsShutdownMonitor* NewL(
+                MHsShutdownMonitorObserver& aObserver );   
+        
+        /**
+         * Destructor
+         * 
+         * @since S60 5.2     
+         */    
+        ~CHsShutdownMonitor();
+    
+        /**
+         * Start monitor
+         * 
+         * @since S60 5.2
+         */        
+        void StartMonitor();        
+
+    protected:
+        /** 
+         * C++ constructor
+         *
+         * @param aObserver     monitor observer.   
+         * @since S60 5.2      
+         */        
+        CHsShutdownMonitor( MHsShutdownMonitorObserver& aObserver );    
+
+        /**
+         * Symbian 2nd phase constructor
+         * 
+         * @since S60 5.2
+         */        
+        void ConstructL();
+
+    private: // From CActive
+        /**
+         * From CActive
+         */        
+        void RunL();
+
+        /**
+         * From CActive
+         * 
+         * @since S60 5.2
+         */        
+        void DoCancel(); 
+
+        /**
+         * From CActive
+         * 
+         * @since S60 5.2
+         */        
+        TInt RunError( TInt aError );
+
+    private:	
+        // watchdog observer
+        MHsShutdownMonitorObserver& iObserver;
+
+        // State aware session.
+        RSsmStateAwareSession iSAS;
+
+        friend class t_hsapplicationlauncher;
+    };
+
+#endif // __HS_PROCESS_MONITOR__

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplicationlauncher/src/hsapplicationlauncher.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,452 @@
+/*
+ * Copyright (c) 2008 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: application class.                 
+ *
+ */
+
+#include <e32property.h>
+#include <e32debug.h>
+#include "hsapplicationlauncher.h"
+
+// ========================= DECLARATIONS ==================================
+_LIT( KHsExeName, "hsapplication.exe" );
+_LIT( KHsProcessName, "hsapplication.exe" );
+const TInt KSleepOnRetry = 250000; // 250ms
+const TUid KPSCategoryUid = TUid::Uid( 0x20022F36 );
+const TInt KPSCrashCountKey = 1;
+_LIT_SECURITY_POLICY_C1( KPSReadPolicy, ECapabilityReadDeviceData );
+_LIT_SECURITY_POLICY_C1( KPSWritePolicy, ECapabilityWriteDeviceData );
+
+// ========================= LOCAL FUNCTIONS ==================================
+#ifdef COVERAGE_MEASUREMENT
+#pragma CTC SKIP
+#endif //COVERAGE_MEASUREMENT
+void RunAppL()
+    {
+    // Construct active scheduler.
+    CActiveScheduler* activeScheduler = new ( ELeave )CActiveScheduler();
+    CleanupStack::PushL( activeScheduler );
+    CActiveScheduler::Install( activeScheduler );
+
+    // Construct app.
+    CHsLaunch* app = CHsLaunch::NewL();
+    CleanupStack::PushL( app );
+    
+    app->Activate();
+    
+    // Signal startup.
+    RProcess::Rendezvous(KErrNone);
+    
+    // Start active scheduler.
+    CActiveScheduler::Start();
+    
+    User::LeaveIfError( app->ApplicationReturnValue() );
+    
+    // Cleanup.
+    CleanupStack::PopAndDestroy( app );
+    CleanupStack::PopAndDestroy( activeScheduler );
+    }
+
+#ifndef HOMESCREEN_TEST
+// -----------------------------------------------------------------------------
+// E32Main
+// entry-point
+// -----------------------------------------------------------------------------
+//
+TInt E32Main()
+    {            
+    TInt error = KErrNone;
+    
+    __UHEAP_MARK;    
+    
+    // Construct cleanup stack.
+    CTrapCleanup* cleanupstack = CTrapCleanup::New();
+    if( !cleanupstack )
+        {
+        error  = KErrNoMemory;
+        }
+    
+    // Call next phase of startup.
+    if( !error )
+        {
+        TRAP( error, RunAppL() );
+        }
+    
+    // Cleanup.
+    delete cleanupstack;
+    cleanupstack = NULL;
+    
+    __UHEAP_MARKEND;
+    
+    return error;
+    }
+#endif //HOMESCREEN_TEST
+#ifdef COVERAGE_MEASUREMENT
+#pragma CTC ENDSKIP
+#endif //COVERAGE_MEASUREMENT
+// ========================= MEMBER FUNCTIONS ==================================
+
+// -----------------------------------------------------------------------------
+// CHsLaunch::NewL()
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+CHsLaunch* CHsLaunch::NewL()
+    {
+    CHsLaunch* self = new ( ELeave ) CHsLaunch();
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    CleanupStack::Pop( self );
+    return self;
+    }
+
+// -----------------------------------------------------------------------------
+// CHsLaunch::ConstructL()
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void CHsLaunch::ConstructL()
+    {
+    iRepository = CRepository::NewL(TUid::Uid(0x2002b3aa));
+    
+    iShutdownMonitor = CHsShutdownMonitor::NewL( *this );
+    iShutdownMonitor->StartMonitor();
+    
+    // Create property to pub/sub.    
+    TInt error = RProperty::Define( KPSCrashCountKey,
+                                    RProperty::EInt,
+                                    KPSReadPolicy,
+                                    KPSWritePolicy );    
+    if( error == KErrNone )
+        {
+        // Init it to zero.
+        error = RProperty::Set( KPSCategoryUid, KPSCrashCountKey, 0 );
+        }                
+    else if( error == KErrAlreadyExists )
+        {
+        error = KErrNone;        
+        }        
+    
+    User::LeaveIfError( error );
+    }
+
+// -----------------------------------------------------------------------------
+// CHsLaunch::CHsLaunch()
+// C++ default constructor can NOT contain any code, that might leave.
+// -----------------------------------------------------------------------------
+CHsLaunch::CHsLaunch() :
+        CActive( EPriorityStandard ),
+        iApplicationReturnValue( KErrNone )
+    {
+    CActiveScheduler::Add( this );
+    }
+
+// -----------------------------------------------------------------------------
+// CHsLaunch::~CHsLaunch()
+// Destructor.
+// -----------------------------------------------------------------------------
+//
+CHsLaunch::~CHsLaunch()
+    {
+    Cancel();
+    
+    delete iRepository;
+    iRepository = NULL;
+    
+    delete iProcessMonitor;
+    iProcessMonitor = NULL;
+    
+    delete iShutdownMonitor;
+    iShutdownMonitor = NULL;
+    }
+
+// -----------------------------------------------------------------------------
+// CHsLaunch::Activate()
+// Set active object to be ran
+// -----------------------------------------------------------------------------
+//
+void CHsLaunch::Activate()
+    {   
+    SetActive();
+    TRequestStatus* tmp = &iStatus;
+    User::RequestComplete( tmp, KErrNone );
+    }
+
+// -----------------------------------------------------------------------------
+// CHsLaunch::ApplicationReturnValue()
+// Get application return value
+// -----------------------------------------------------------------------------
+//
+TInt CHsLaunch::ApplicationReturnValue()
+    {
+    return iApplicationReturnValue;
+    }
+
+// -----------------------------------------------------------------------------
+// CHsLaunch::RunL
+// -----------------------------------------------------------------------------
+//
+void CHsLaunch::RunL()
+    {
+#if defined( __WINS__ )
+    StartHomeScreen();
+#else 
+    if (IsLanguageSelectedL()) 
+        {
+        StartHomeScreen();
+        } 
+    else 
+        {
+        StartListeningLanguageSelectionL();
+        }
+#endif //__WINS__
+    }
+
+// -----------------------------------------------------------------------------
+// CHsLaunch::DoCancel()
+// From CActive.
+// -----------------------------------------------------------------------------
+//
+void CHsLaunch::DoCancel()
+    {
+    if( iProcessMonitor )
+        {
+        iProcessMonitor->Cancel();
+        }
+    
+    if( iShutdownMonitor )
+        {
+        iShutdownMonitor->Cancel();
+        }
+    }      
+
+// -----------------------------------------------------------------------------
+// CHsLaunch::RunError()
+// From CActive.
+// -----------------------------------------------------------------------------
+//
+TInt CHsLaunch::RunError( TInt aError )
+    {
+    /* Shutdown. This application
+     * will be restarted by startup sw. */
+    ShutdownApp( KErrGeneral );
+    return KErrNone;
+    } 
+
+// -----------------------------------------------------------------------------
+// CHsLaunch::HandleNotifyInt()
+// From MCenRepNotifyHandlerCallback
+// -----------------------------------------------------------------------------
+//
+void CHsLaunch::HandleNotifyInt(TUint32 aId, TInt aNewValue)
+{
+    if (aId == 0x00000007 && aNewValue) 
+        {
+        StopListeningLanguageSelection();
+        StartHomeScreen();
+        }
+}
+
+// -----------------------------------------------------------------------------
+// CHsLaunch::ProcessEndedL()
+// From MHsProcessMonitorObserver
+// -----------------------------------------------------------------------------
+//
+void CHsLaunch::ProcessEnded( const TExitType& aExitType,
+                              const TInt aExitReason,
+                              const TExitCategoryName& /*aExitCategory*/ )
+    {    
+    TInt crashCount = 0;
+    TInt error = RProperty::Get( KPSCategoryUid,
+                                 KPSCrashCountKey,
+                                 crashCount );
+    
+    // increment crash count in cenrep if the process has panic'd or killed with
+    // an error code
+    if( aExitType == EExitPanic ||
+        ( aExitType == EExitKill && aExitReason != KErrNone ) )
+        {
+        if( error == KErrNone )
+            {
+            crashCount++;
+            error = RProperty::Set( KPSCategoryUid,
+                                    KPSCrashCountKey,
+                                    crashCount );                          
+            }
+        
+        if( error == KErrNone )
+            {      
+            User::After( KSleepOnRetry ); 
+            Activate();
+            }
+        else
+            {           
+            ShutdownApp( error );
+            }
+        }
+    }
+
+// -----------------------------------------------------------------------------
+// CHsLaunch::ProcessMonitoringErrorL()
+// From MHsProcessMonitorObserver
+// -----------------------------------------------------------------------------
+//
+void CHsLaunch::ProcessMonitoringError( TInt aError )
+    {
+    /* Error in this method is critical and it might cause
+     * endless active scheduler loop if no active objects are
+     * not triggered. Therefore shutdown. This application
+     * will be restarted by startup sw. */
+    ShutdownApp( aError );
+    }
+
+// -----------------------------------------------------------------------------
+// CHsLaunch::SystemShutdownEvent()
+// From MHsShutdownMonitorObserver
+// -----------------------------------------------------------------------------
+//
+void CHsLaunch::SystemShutdownEvent()
+    {
+    // Do not shut down app. Startup app would try to restart this app.
+    // Just deactivate all active objects and wait for power off.
+    if( IsActive() )
+        {
+        Cancel();
+        }
+    else
+        {
+        DoCancel();
+        }    
+    }
+
+// -----------------------------------------------------------------------------
+// CHsLaunch::InitProcessMonitorL()
+// Initialize process monitor
+// -----------------------------------------------------------------------------
+//
+void CHsLaunch::InitProcessMonitorL( const TInt aProcessId )
+    {
+    if( iProcessMonitor )
+        {
+        delete iProcessMonitor;
+        iProcessMonitor = NULL;
+        }
+    iProcessMonitor = CHsProcessMonitor::NewL( aProcessId, *this );    
+    User::LeaveIfError( iProcessMonitor->StartMonitor() );
+    }
+
+// -----------------------------------------------------------------------------
+// CHsLaunch::ShutdownApp()
+// Shut down application
+// -----------------------------------------------------------------------------
+//
+void CHsLaunch::ShutdownApp( const TInt aApplicationReturnValue )
+    {
+    if( IsActive() )
+        {
+        Cancel();
+        }
+    else
+        {
+        DoCancel();
+        }
+    
+    iApplicationReturnValue = aApplicationReturnValue;
+#ifndef HOMESCREEN_TEST    
+    CActiveScheduler::Stop();
+#endif //HOMESCREEN_TEST
+    }
+
+// -----------------------------------------------------------------------------
+// CHsLaunch::StartHomeScreen()
+// Starts the homescreen application.
+// -----------------------------------------------------------------------------
+//
+void CHsLaunch::StartHomeScreen()
+    {
+    // Create app or connect to existing.
+    TInt processExisted = EFalse;
+    
+    RProcess process;
+    TInt processError = process.Create( KHsExeName, KNullDesC );    
+    if( processError == KErrAlreadyExists )
+        {        
+        processError = process.Open( KHsProcessName, EOwnerProcess );
+        processExisted = ETrue;
+        }
+    TInt monitorError = KErrNone;
+    if( processError == KErrNone )
+        {
+        TRAP( monitorError, InitProcessMonitorL( process.Id() ) );
+        }
+    
+    if( processError == KErrNone &&
+        !processExisted )
+        {
+        // Make sure process is started even if monitor startup
+        // fails. This will assure that process is not left in
+        // suspended state. Resume can not be called for
+        // already running process (will cause KERN-EXEC 46).
+        process.Resume();
+        }
+                     
+    process.Close();
+    
+    if( processError != KErrNone ||
+        monitorError != KErrNone )
+        {
+        /* Error in this method is critical and it might cause
+         * endless active scheduler loop if no active objects are
+         * not triggered. Therefore shutdown. This application
+         * will be restarted by startup sw. */
+        ShutdownApp( KErrGeneral );
+        }
+    }
+        
+// -----------------------------------------------------------------------------
+// CHsLaunch::IsLanguageSelected()
+// Checks if the language is selected.
+// -----------------------------------------------------------------------------
+//  
+TBool CHsLaunch::IsLanguageSelectedL()
+    {
+    TInt value;
+    User::LeaveIfError(iRepository->Get(0x00000007, value));
+    return value;
+    }
+
+// -----------------------------------------------------------------------------
+// CHsLaunch::StartListeningLanguageSelection()
+// Starts to listen repository notifications.
+// -----------------------------------------------------------------------------
+//  
+void CHsLaunch::StartListeningLanguageSelectionL()
+    {
+    iCenRepNotifyHandler = CCenRepNotifyHandler::NewL(
+            *this, *iRepository, CCenRepNotifyHandler::EIntKey, 0x00000007);
+    iCenRepNotifyHandler->StartListeningL();
+    }
+        
+// -----------------------------------------------------------------------------
+// CHsLaunch::StopListeningLanguageSelection()
+// Stops to listen repository notifications.
+// -----------------------------------------------------------------------------
+//      
+void CHsLaunch::StopListeningLanguageSelection()
+    {
+    iCenRepNotifyHandler->StopListening();
+    delete iCenRepNotifyHandler;
+    iCenRepNotifyHandler = NULL;
+    }
+
+// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplicationlauncher/src/hsprocessmonitor.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,184 @@
+/* 
+ * Copyright (c) 2008 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: process monitor.                 
+ *
+ */
+
+#include "hsprocessmonitor.h"
+
+// ========================= MEMBER FUNCTIONS ==================================
+
+// -----------------------------------------------------------------------------
+// CHsProcessMonitor::NewL()
+// Two-phased constructor
+// -----------------------------------------------------------------------------
+CHsProcessMonitor* CHsProcessMonitor::NewL( const TInt iProcessId,
+                                            MHsProcessMonitorObserver& aObserver )
+    {
+    CHsProcessMonitor* self = new ( ELeave ) CHsProcessMonitor( iProcessId,
+                                                                aObserver );
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    CleanupStack::Pop( self );
+    return self;
+    }
+
+// -----------------------------------------------------------------------------
+// CHsProcessMonitor::~CHsProcessMonitor()
+// Destructor.
+// -----------------------------------------------------------------------------
+//
+CHsProcessMonitor::~CHsProcessMonitor()
+    {
+    Cancel();
+    SecureProcessHandleAsClosed();    	
+    iProcessId = KErrNotFound;
+    }
+
+// -----------------------------------------------------------------------------
+// CHsProcessMonitor::AttachMonitor()
+// Attach monitor
+// -----------------------------------------------------------------------------
+//
+TInt CHsProcessMonitor::AttachMonitor()
+    {   
+    SecureProcessHandleAsClosed();
+    
+    TInt error = iProcess.Open( iProcessId, EOwnerProcess );
+    
+    if( error == KErrNone )
+        {
+        iProcessHandleOpen = ETrue;
+        }
+    
+    return error;
+    }   
+
+// -----------------------------------------------------------------------------
+// CHsProcessMonitor::StartMonitor()
+// Start monitor
+// -----------------------------------------------------------------------------
+//
+TInt CHsProcessMonitor::StartMonitor()
+    {
+    TInt error = KErrNone;
+    
+    if( !iProcessHandleOpen )
+        {
+        error = AttachMonitor();
+        }
+    
+    if( error == KErrNone )
+        {
+        iProcess.Logon( iStatus );
+        SetActive();                
+        }
+    
+    return error;
+    }   
+
+// -----------------------------------------------------------------------------
+// CHsProcessMonitor::CHsProcessMonitor()
+// C++ default constructor can NOT contain any code, that might leave.
+// -----------------------------------------------------------------------------
+CHsProcessMonitor::CHsProcessMonitor( const TInt aProcessId,
+                                      MHsProcessMonitorObserver& aObserver ) :
+        CActive( EPriorityStandard ),
+        iProcessId( aProcessId ),
+        iObserver( aObserver ),
+        iProcessHandleOpen( EFalse )
+    {
+    CActiveScheduler::Add( this );
+    }
+
+// -----------------------------------------------------------------------------
+// CHsProcessMonitor::ConstructL()
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void CHsProcessMonitor::ConstructL()
+    {    
+    }
+
+// -----------------------------------------------------------------------------
+// CHsProcessMonitor::RunL
+// -----------------------------------------------------------------------------
+//
+void CHsProcessMonitor::RunL()
+    {
+    iProcess.LogonCancel( iStatus );    	
+    
+    const TInt error = iStatus.Int();        
+    
+    if( error == KErrCancel )
+        {
+        }
+    else if( error == KErrNoMemory )
+        {
+        User::Leave( KErrNoMemory );
+        }
+    else
+        {
+        const TExitType exitType = iProcess.ExitType();									
+        if( exitType == EExitPending )
+            {
+            User::LeaveIfError( StartMonitor() );
+            }
+        else
+            {
+            iObserver.ProcessEnded( exitType,
+                                    iProcess.ExitReason(),
+                                    iProcess.ExitCategory() );
+            }
+        }
+    }
+
+// -----------------------------------------------------------------------------
+// CHsProcessMonitor::DoCancel()
+// From CActive.
+// -----------------------------------------------------------------------------
+//
+void CHsProcessMonitor::DoCancel()
+    {
+    iProcess.LogonCancel( iStatus );
+    }      
+
+// -----------------------------------------------------------------------------
+// CHsProcessMonitor::RunError()
+// From CActive.
+// -----------------------------------------------------------------------------
+//
+TInt CHsProcessMonitor::RunError( TInt aError )
+    {    
+    iObserver.ProcessMonitoringError( aError );
+
+    // Observer will handle error. Return green light.
+    return KErrNone;    
+    }  
+
+// -----------------------------------------------------------------------------
+// CHsProcessMonitor::SecureProcessHandleAsClosed()
+// Close process handle if open
+// -----------------------------------------------------------------------------
+//
+void CHsProcessMonitor::SecureProcessHandleAsClosed()
+    {
+    if( iProcessHandleOpen )
+        {
+        iProcess.Close();
+        iProcessHandleOpen = EFalse;
+        }
+    } 
+
+// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplicationlauncher/src/hsshutdownmonitor.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,130 @@
+/* 
+ * Copyright (c) 2008 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: shutdown monitor.                 
+ *
+ */
+
+#include <ssm/ssmstate.h>
+#include <ssm/ssmdomaindefs.h>
+
+#include "hsshutdownmonitor.h"
+
+// ========================= MEMBER FUNCTIONS ==================================
+
+// -----------------------------------------------------------------------------
+// CHsShutdownMonitor::NewL()
+// Two-phased constructor
+// -----------------------------------------------------------------------------
+CHsShutdownMonitor* CHsShutdownMonitor::NewL(
+        MHsShutdownMonitorObserver& aObserver )
+    {
+    CHsShutdownMonitor* self = new ( ELeave ) CHsShutdownMonitor( aObserver );
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    CleanupStack::Pop( self );
+    return self;
+    }
+
+// -----------------------------------------------------------------------------
+// CHsShutdownMonitor::~CHsShutdownMonitor()
+// Destructor.
+// -----------------------------------------------------------------------------
+//
+CHsShutdownMonitor::~CHsShutdownMonitor()
+    {
+    Cancel();
+    iSAS.Close();
+    }
+
+// -----------------------------------------------------------------------------
+// CHsShutdownMonitor::StartMonitor()
+// Start monitor
+// -----------------------------------------------------------------------------
+//
+void CHsShutdownMonitor::StartMonitor()
+    {
+    iSAS.RequestStateNotification( iStatus );
+    SetActive();    
+    }   
+
+// -----------------------------------------------------------------------------
+// CHsShutdownMonitor::CHsShutdownMonitor()
+// C++ default constructor can NOT contain any code, that might leave.
+// -----------------------------------------------------------------------------
+CHsShutdownMonitor::CHsShutdownMonitor( MHsShutdownMonitorObserver& aObserver ) :
+        CActive( EPriorityStandard ),
+        iObserver( aObserver )
+    {
+    CActiveScheduler::Add( this );
+    }
+
+// -----------------------------------------------------------------------------
+// CHsShutdownMonitor::ConstructL()
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void CHsShutdownMonitor::ConstructL()
+    {
+    User::LeaveIfError( iSAS.Connect( KSM2GenMiddlewareDomain3 ) );
+    }
+
+// -----------------------------------------------------------------------------
+// CHsShutdownMonitor::RunL
+// -----------------------------------------------------------------------------
+//
+void CHsShutdownMonitor::RunL()
+    {
+    User::LeaveIfError( iStatus.Int() );
+    
+    TBool registerForMoreEvents = ETrue;
+    
+    TSsmState state = iSAS.State();
+    if( state.MainState() == ESsmShutdown )
+        {
+        iObserver.SystemShutdownEvent();
+        registerForMoreEvents = EFalse;
+        }
+    
+    if( registerForMoreEvents )
+        {
+        iSAS.AcknowledgeAndRequestStateNotification( KErrNone, iStatus );
+        SetActive();
+        }
+    else
+        {
+        iSAS.AcknowledgeStateNotification( KErrNone );
+        }        
+    }
+
+// -----------------------------------------------------------------------------
+// CHsShutdownMonitor::DoCancel()
+// From CActive.
+// -----------------------------------------------------------------------------
+//
+void CHsShutdownMonitor::DoCancel()
+    {
+    iSAS.RequestStateNotificationCancel();
+    }      
+
+// -----------------------------------------------------------------------------
+// CHsShutdownMonitor::RunError()
+// From CActive.
+// -----------------------------------------------------------------------------
+//
+TInt CHsShutdownMonitor::RunError( TInt aError )
+    {
+    return aError;
+    }
+
+// End of File

--- a/homescreenapp/hsdomainmodel/hsdomainmodel.pri	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsdomainmodel/hsdomainmodel.pri	Wed Aug 18 09:40:07 2010 +0300
@@ -19,6 +19,7 @@
            ./inc/hsdatabase.h  \
            ./inc/hsdomainmodel_global.h  \
            ./inc/hspage.h \
+           ./inc/hspagevisual.h \
            ./inc/hspagenewwidgetlayout.h \
            ./inc/hsgui.h  \
            ./inc/hsscene.h \
@@ -27,18 +28,24 @@
            ./inc/hswallpaper.h \
            ./inc/hswallpaperloader.h \
            ./inc/hswallpaperloaderthread.h \
+           ./inc/hshostedwidgetfactory.h \
            ./inc/hswidgethost.h \
+           ./inc/hswidgethostvisual.h \
            ./inc/hswidgetcomponentregistry.h \
            ./inc/hswidgetcomponent.h \
            ./inc/hswidgetcomponentdescriptor.h \
            ./inc/hsbackuprestoreobserver.h \
            ./inc/hsconfiguration.h \
            ./inc/hswidgettoucharea.h \
-           ./inc/hspagetoucharea.h
+           ./inc/hspagetoucharea.h \
+           ./inc/hsidlewidget.h \
+           ./inc/hsdocumentloader.h
+        
 
 SOURCES += ./src/hscontentservice.cpp \
            ./src/hsdatabase.cpp \
            ./src/hspage.cpp \
+           ./src/hspagevisual.cpp \
            ./src/hspagenewwidgetlayout.cpp \
            ./src/hsgui.cpp \
            ./src/hsscene.cpp \
@@ -46,14 +53,18 @@
            ./src/hswallpaper.cpp \
            ./src/hswallpaperloader.cpp \
            ./src/hswallpaperloaderthread.cpp \
+           ./src/hshostedwidgetfactory.cpp \
            ./src/hswidgethost.cpp \
+           ./src/hswidgethostvisual.cpp \
            ./src/hswidgetcomponentregistry.cpp \
            ./src/hswidgetcomponent.cpp \
            ./src/hswidgetcomponentdescriptor.cpp \
            ./src/hsbackuprestoreobserver.cpp \
            ./src/hsconfiguration.cpp \
            ./src/hswidgettoucharea.cpp \
-           ./src/hspagetoucharea.cpp
+           ./src/hspagetoucharea.cpp \
+           ./src/hsidlewidget.cpp \
+           ./src/hsdocumentloader.cpp
 
 symbian: {
 HEADERS += ./inc/hsbackuprestoreobserver_p.h \

--- a/homescreenapp/hsdomainmodel/hsdomainmodel.pro	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsdomainmodel/hsdomainmodel.pro	Wed Aug 18 09:40:07 2010 +0300
@@ -40,11 +40,16 @@
                ../hsutils/inc \
                ../hsapplication/inc
 
+RESOURCES += hsdomainmodel.qrc
+
 symbian: {
     TARGET.UID3 = 0x20022F38
     LIBS += -lxqsettingsmanager -labclient
 }
-win32:{
+!symbian:{
     QT += network 
 }
+
+new_short:DEFINES += HSWIDGETORGANIZER_ALGORITHM
+
 include(hsdomainmodel.pri)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsdomainmodel/hsdomainmodel.qrc	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/" >           
+        <file alias="controllayer.docml">resource/controllayer.docml</file>
+    </qresource>    
+</RCC>

--- a/homescreenapp/hsdomainmodel/inc/hsconfiguration.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsdomainmodel/inc/hsconfiguration.h	Wed Aug 18 09:40:07 2010 +0300
@@ -20,6 +20,7 @@
 
 #include <QObject>
 #include <QVariant>
+#include <QEasingCurve>
 
 #include <HbFeedback>
 
@@ -47,7 +48,7 @@
     Q_PROPERTY(int widgetDragEffectDuration READ widgetDragEffectDuration WRITE setWidgetDragEffectDuration)
     Q_PROPERTY(int widgetDropEffectDuration READ widgetDropEffectDuration WRITE setWidgetDropEffectDuration)
     Q_PROPERTY(int defaultPageId READ defaultPageId WRITE setDefaultPageId)
-    Q_PROPERTY(int maximumPageCount READ maximumPageCount WRITE setMaximumPageCount)    
+    Q_PROPERTY(int maximumPageCount READ maximumPageCount WRITE setMaximumPageCount)
     Q_PROPERTY(bool isShortcutLabelVisible READ isShortcutLabelVisible WRITE setShortcutLabelVisible)
     Q_PROPERTY(qreal bounceFeedbackEffectDistance READ bounceFeedbackEffectDistance WRITE setBounceFeedbackEffectDistance)
     Q_PROPERTY(qreal pageChangePanDistanceInPixels READ pageChangePanDistanceInPixels WRITE setPageChangePanDistanceInPixels)
@@ -73,11 +74,13 @@
     Q_PROPERTY(int snapTimeout READ snapTimeout WRITE setSnapTimeout)
     Q_PROPERTY(qreal snapForce READ snapForce WRITE setSnapForce)
     Q_PROPERTY(qreal snapGap READ snapGap WRITE setSnapGap)
-    Q_PROPERTY(qreal snapBorderGap READ snapBorderGap WRITE setSnapBorderGap)
+    Q_PROPERTY(qreal pageMargin READ pageMargin WRITE setPageMargin)
     Q_PROPERTY(int snapLineFadeInDuration READ snapLineFadeInDuration WRITE setSnapLineFadeInDuration)
     Q_PROPERTY(int snapLineFadeOutDuration READ snapLineFadeOutDuration WRITE setSnapLineFadeOutDuration)
     Q_PROPERTY(bool isSnapEffectsEnabled READ isSnapEffectsEnabled WRITE setSnapEffectsEnabled)
     Q_PROPERTY(SceneType sceneType READ sceneType WRITE setSceneType)
+    Q_PROPERTY(QEasingCurve::Type bounceAnimationEasingCurve READ bounceAnimationEasingCurve WRITE setBounceAnimationEasingCurve)
+    Q_PROPERTY(QEasingCurve::Type pageChangeAnimationEasingCurve READ pageChangeAnimationEasingCurve WRITE setPageChangeAnimationEasingCurve)
 
     Q_ENUMS(SceneType)
 
@@ -91,107 +94,122 @@
         SceneWallpaper
     };
 
+#define SETVALUE(member, name) \
+    if (member != value) { \
+        member = value; \
+        emit propertyChanged(name); \
+    }
+
     int bounceEffect() const { return mBounceEffect; }
-    void setBounceEffect(int effect) { mBounceEffect = effect; }
+    void setBounceEffect(int value) { SETVALUE(mBounceEffect, "bounceEffect") }
     int widgetTapAndHoldTimeout() const { return mWidgetTapAndHoldTimeout; }
-    void setWidgetTapAndHoldTimeout(int timeout) { mWidgetTapAndHoldTimeout = timeout; }
+    void setWidgetTapAndHoldTimeout(int value) { SETVALUE(mWidgetTapAndHoldTimeout, "widgetTapAndHoldTimeout") }
     int sceneTapAndHoldTimeout() const { return mSceneTapAndHoldTimeout; }
-    void setSceneTapAndHoldTimeout(int timeout) { mSceneTapAndHoldTimeout = timeout; }
+    void setSceneTapAndHoldTimeout(int value) { SETVALUE(mSceneTapAndHoldTimeout, "sceneTapAndHoldTimeout") }
     int pageChangeAnimationDuration() const { return mPageChangeAnimationDuration; }
-    void setPageChangeAnimationDuration(int duration) { mPageChangeAnimationDuration = duration; }    
+    void setPageChangeAnimationDuration(int value) { SETVALUE(mPageChangeAnimationDuration, "pageChangeAnimationDuration") }
     int pageChangeZoneAnimationDuration() const { return mPageChangeZoneAnimationDuration; }
-    void setPageChangeZoneAnimationDuration(int duration) { mPageChangeZoneAnimationDuration = duration; }    
+    void setPageChangeZoneAnimationDuration(int value) { SETVALUE(mPageChangeZoneAnimationDuration, "pageChangeZoneAnimationDuration") }
     int pageChangeZoneReverseAnimationDuration() const { return mPageChangeZoneReverseAnimationDuration; }
-    void setPageChangeZoneReverseAnimationDuration(int duration) { mPageChangeZoneReverseAnimationDuration = duration; }
+    void setPageChangeZoneReverseAnimationDuration(int value) { SETVALUE(mPageChangeZoneReverseAnimationDuration, "pageChangeZoneReverseAnimationDuration") }
     int pageRemovedAnimationDuration() const { return mPageRemovedAnimationDuration; }
-    void setPageRemovedAnimationDuration(int duration) { mPageRemovedAnimationDuration = duration; }    
+    void setPageRemovedAnimationDuration(int value) { SETVALUE(mPageRemovedAnimationDuration, "pageRemovedAnimationDuration") }
     int newPageAddedAnimationDuration() const { return mNewPageAddedAnimationDuration; }
-    void setNewPageAddedAnimationDuration(int duration) { mNewPageAddedAnimationDuration = duration; }  
+    void setNewPageAddedAnimationDuration(int value) { SETVALUE(mNewPageAddedAnimationDuration, "newPageAddedAnimationDuration") }
     int widgetDragEffectDuration() const { return mWidgetDragEffectDuration; }
-    void setWidgetDragEffectDuration(int duration) { mWidgetDragEffectDuration = duration; }  
+    void setWidgetDragEffectDuration(int value) { SETVALUE(mWidgetDragEffectDuration, "widgetDragEffectDuration") }
     int widgetDropEffectDuration() const { return mWidgetDropEffectDuration; }
-    void setWidgetDropEffectDuration(int duration) { mWidgetDropEffectDuration = duration; }  
+    void setWidgetDropEffectDuration(int value) { SETVALUE(mWidgetDropEffectDuration, "widgetDropEffectDuration") }
     int defaultPageId() const { return mDefaultPageId; }
-    void setDefaultPageId(int id) { mDefaultPageId = id; }
+    void setDefaultPageId(int value) { SETVALUE(mDefaultPageId, "defaultPageId") }
     int maximumPageCount() const { return mMaximumPageCount; }
-    void setMaximumPageCount(int count) { mMaximumPageCount = count; }  
+    void setMaximumPageCount(int value) { SETVALUE(mMaximumPageCount, "maximumPageCount") }
     bool isShortcutLabelVisible() const { return mIsShortcutLabelVisible; }
-    void setShortcutLabelVisible(bool visible) { mIsShortcutLabelVisible = visible; }  
+    void setShortcutLabelVisible(bool value) { SETVALUE(mIsShortcutLabelVisible, "isShortcutLabelVisible") }
     qreal bounceFeedbackEffectDistance() const { return mBounceFeedbackEffectDistance; }
-    void setBounceFeedbackEffectDistance(qreal distance) { mBounceFeedbackEffectDistance = distance; }  
+    void setBounceFeedbackEffectDistance(qreal value) { SETVALUE(mBounceFeedbackEffectDistance, "bounceFeedbackEffectDistance") }
     qreal pageChangePanDistanceInPixels() const { return mPageChangePanDistanceInPixels; }
-    void setPageChangePanDistanceInPixels(qreal distance) { mPageChangePanDistanceInPixels = distance; }  
+    void setPageChangePanDistanceInPixels(qreal value) { SETVALUE(mPageChangePanDistanceInPixels, "pageChangePanDistanceInPixels") }
     qreal tapAndHoldDistance() const { return mTapAndHoldDistance; }
-    void setTapAndHoldDistance(qreal distance) { mTapAndHoldDistance = distance; }  
+    void setTapAndHoldDistance(qreal value) { SETVALUE(mTapAndHoldDistance, "tapAndHoldDistance") }
     qreal pageChangeZoneWidth() const { return mPageChangeZoneWidth; }
-    void setPageChangeZoneWidth(qreal width) { mPageChangeZoneWidth = width; }  
+    void setPageChangeZoneWidth(qreal value) { SETVALUE(mPageChangeZoneWidth, "pageChangeZoneWidth") }
     qreal pageIndicatorSpacing() const { return mPageIndicatorSpacing; }
-    void setPageIndicatorSpacing(qreal spacing) { mPageIndicatorSpacing = spacing; }
+    void setPageIndicatorSpacing(qreal value) { SETVALUE(mPageIndicatorSpacing, "pageIndicatorSpacing") }
     qreal maximumWidgetHeight() const { return mMaximumWidgetHeight; }
-    void setMaximumWidgetHeight(qreal height) { mMaximumWidgetHeight = height; }  
+    void setMaximumWidgetHeight(qreal value) { SETVALUE(mMaximumWidgetHeight, "maximumWidgetHeight") }
     qreal maximumWidgetWidth() const { return mMaximumWidgetWidth; }
-    void setMaximumWidgetWidth(qreal width) { mMaximumWidgetWidth = width; }  
+    void setMaximumWidgetWidth(qreal value) { SETVALUE(mMaximumWidgetWidth, "maximumWidgetWidth") }
     qreal minimumWidgetHeight() const { return mMinimumWidgetHeight; }
-    void setMinimumWidgetHeight(qreal height) { mMinimumWidgetHeight = height; }
+    void setMinimumWidgetHeight(qreal value) { SETVALUE(mMinimumWidgetHeight, "minimumWidgetHeight") }
     qreal minimumWidgetWidth() const { return mMinimumWidgetWidth; }
-    void setMinimumWidgetWidth(qreal width) { mMinimumWidgetWidth = width; }  
+    void setMinimumWidgetWidth(qreal value) { SETVALUE(mMinimumWidgetWidth, "minimumWidgetWidth") }
     qreal pageChangePanDistance() const { return mPageChangePanDistance; }
-    void setPageChangePanDistance(qreal distance) { mPageChangePanDistance = distance; }  
+    void setPageChangePanDistance(qreal value) { SETVALUE(mPageChangePanDistance, "pageChangePanDistance") }
     HbFeedback::InstantEffect pageChangeFeedbackEffect() const { return mPageChangeFeedbackEffect; }
-    void setPageChangeFeedbackEffect(HbFeedback::InstantEffect effect) { mPageChangeFeedbackEffect = effect; }   
+    void setPageChangeFeedbackEffect(HbFeedback::InstantEffect value) { SETVALUE(mPageChangeFeedbackEffect, "pageChangeFeedbackEffect") }
     HbFeedback::InstantEffect widgetPickFeedbackEffect() const { return mWidgetPickFeedbackEffect; }
-    void setWidgetPickFeedbackEffect(HbFeedback::InstantEffect effect) { mWidgetPickFeedbackEffect = effect; }  
+    void setWidgetPickFeedbackEffect(HbFeedback::InstantEffect value) { SETVALUE(mWidgetPickFeedbackEffect, "widgetPickFeedbackEffect") }
     HbFeedback::InstantEffect widgetDropFeedbackEffect() const { return mWidgetDropFeedbackEffect; }
-    void setWidgetDropFeedbackEffect(HbFeedback::InstantEffect effect) { mWidgetDropFeedbackEffect = effect; }  
+    void setWidgetDropFeedbackEffect(HbFeedback::InstantEffect value) { SETVALUE(mWidgetDropFeedbackEffect, "widgetDropFeedbackEffect") }
     HbFeedback::InstantEffect widgetRepositionFeedbackEffect() const { return mWidgetRepositionFeedbackEffect; }
-    void setWidgetRepositionFeedbackEffect(HbFeedback::InstantEffect effect) { mWidgetRepositionFeedbackEffect = effect; } 
+    void setWidgetRepositionFeedbackEffect(HbFeedback::InstantEffect value) { SETVALUE(mWidgetRepositionFeedbackEffect, "widgetRepositionFeedbackEffect") }
     HbFeedback::InstantEffect widgetOverTrashbinFeedbackEffect() const { return mWidgetOverTrashbinFeedbackEffect; }
-    void setWidgetOverTrashbinFeedbackEffect(HbFeedback::InstantEffect effect) { mWidgetOverTrashbinFeedbackEffect = effect; } 
+    void setWidgetOverTrashbinFeedbackEffect(HbFeedback::InstantEffect value) { SETVALUE(mWidgetOverTrashbinFeedbackEffect, "widgetOverTrashbinFeedbackEffect") }
     HbFeedback::InstantEffect widgetDropToTrashbinFeedbackEffect() const { return mWidgetDropToTrashbinFeedbackEffect; }
-    void setWidgetDropToTrashbinFeedbackEffect(HbFeedback::InstantEffect effect) { mWidgetDropToTrashbinFeedbackEffect = effect; } 
+    void setWidgetDropToTrashbinFeedbackEffect(HbFeedback::InstantEffect value) { SETVALUE(mWidgetDropToTrashbinFeedbackEffect, "widgetDropToTrashbinFeedbackEffect") }
     HbFeedback::InstantEffect shortcutWidgetTapFeedbackEffect() const { return mShortcutWidgetTapFeedbackEffect; }
-    void setShortcutWidgetTapFeedbackEffect(HbFeedback::InstantEffect effect) { mShortcutWidgetTapFeedbackEffect = effect; } 
+    void setShortcutWidgetTapFeedbackEffect(HbFeedback::InstantEffect value) { SETVALUE(mShortcutWidgetTapFeedbackEffect, "shortcutWidgetTapFeedbackEffect") }
     HbFeedback::InstantEffect widgetMoveBlockedFeedbackEffect() const { return mWidgetMoveBlockedFeedbackEffect; }
-    void setWidgetMoveBlockedFeedbackEffect(HbFeedback::InstantEffect effect) { mWidgetMoveBlockedFeedbackEffect = effect; } 
+    void setWidgetMoveBlockedFeedbackEffect(HbFeedback::InstantEffect value) { SETVALUE(mWidgetMoveBlockedFeedbackEffect, "widgetMoveBlockedFeedbackEffect") }
     HbFeedback::InstantEffect clockWidgetTapFeedbackEffect() const { return mClockWidgetTapFeedbackEffect; }
-    void setClockWidgetTapFeedbackEffect(HbFeedback::InstantEffect effect) { mClockWidgetTapFeedbackEffect = effect; } 
+    void setClockWidgetTapFeedbackEffect(HbFeedback::InstantEffect value) { SETVALUE(mClockWidgetTapFeedbackEffect, "clockWidgetTapFeedbackEffect") }
     HbFeedback::InstantEffect widgetSnappingFeedbackEffect() const { return mWidgetSnappingFeedbackEffect; }
-    void setWidgetSnappingFeedbackEffect(HbFeedback::InstantEffect effect) { mWidgetSnappingFeedbackEffect = effect; }
+    void setWidgetSnappingFeedbackEffect(HbFeedback::InstantEffect value) { SETVALUE(mWidgetSnappingFeedbackEffect, "widgetSnappingFeedbackEffect") }
     bool isSnapEnabled() const { return mIsSnapEnabled; }
-    void setSnapEnabled(bool enabled) { mIsSnapEnabled = enabled; }
+    void setSnapEnabled(bool value) { SETVALUE(mIsSnapEnabled, "isSnapEnabled") }
     int snapTimeout() const { return mSnapTimeout; }
-    void setSnapTimeout(int timeout) { mSnapTimeout = timeout; }
+    void setSnapTimeout(int value) { SETVALUE(mSnapTimeout, "snapTimeout") }
     qreal snapForce() const { return mSnapForce; }
-    void setSnapForce(qreal force) { mSnapForce = force; }  
+    void setSnapForce(qreal value) { SETVALUE(mSnapForce, "snapForce") }
     qreal snapGap() const { return mSnapGap; }
-    void setSnapGap(qreal gap) { mSnapGap = gap; }  
-    qreal snapBorderGap() const { return mSnapBorderGap; }
-    void setSnapBorderGap(qreal gap) { mSnapBorderGap = gap; }
+    void setSnapGap(qreal value) { SETVALUE(mSnapGap, "snapGap") }
+    qreal pageMargin() const { return mPageMargin; }
+    void setPageMargin(qreal value) { SETVALUE(mPageMargin, "pageMargin") }
     int snapLineFadeInDuration() const { return mSnapLineFadeInDuration; }
-    void setSnapLineFadeInDuration(int duration) { mSnapLineFadeInDuration = duration; }
+    void setSnapLineFadeInDuration(int value) { SETVALUE(mSnapLineFadeInDuration, "snapLineFadeInDuration") }
     int snapLineFadeOutDuration() const { return mSnapLineFadeOutDuration; }
-    void setSnapLineFadeOutDuration(int duration) { mSnapLineFadeOutDuration = duration; }
+    void setSnapLineFadeOutDuration(int value) { SETVALUE(mSnapLineFadeOutDuration, "snapLineFadeOutDuration") }
     bool isSnapEffectsEnabled() const { return mIsSnapEffectsEnabled; }
-    void setSnapEffectsEnabled(bool enabled) { mIsSnapEffectsEnabled = enabled; }
+    void setSnapEffectsEnabled(bool value) { SETVALUE(mIsSnapEffectsEnabled, "isSnapEffectsEnabled") }
     SceneType sceneType() const { return mSceneType; }
-    void setSceneType(SceneType type) { mSceneType = type; }
-     
+    void setSceneType(SceneType value) { SETVALUE(mSceneType, "sceneType") }
+    QEasingCurve::Type bounceAnimationEasingCurve() const { return mBounceAnimationEasingCurve; }
+    void setBounceAnimationEasingCurve(QEasingCurve::Type value) { SETVALUE(mBounceAnimationEasingCurve, "bounceAnimationEasingCurve") }
+    QEasingCurve::Type pageChangeAnimationEasingCurve() const { return mPageChangeAnimationEasingCurve; }
+    void setPageChangeAnimationEasingCurve(QEasingCurve::Type value) { SETVALUE(mPageChangeAnimationEasingCurve, "pageChangeAnimationEasingCurve") }
+
+#undef SETVALUE
+
     QSizeF minimumWidgetSizeInUnits() const;
     QSizeF maximumWidgetSizeInUnits() const;
     QSizeF minimumWidgetSizeInPixels() const;
     QSizeF maximumWidgetSizeInPixels() const;
-    
+
     bool load();
     bool importFromFile(const QString &path);
     bool exportToFile(const QString &path);
-        
+
     static HsConfiguration *instance();
     static HsConfiguration *takeInstance();
     static void setInstance(HsConfiguration *instance);
 
+signals:
+    void propertyChanged(const QString &name);
+
 private:
     Q_DISABLE_COPY(HsConfiguration)
-    
+
 private:
     int mBounceEffect;
     int mWidgetTapAndHoldTimeout;
@@ -230,12 +248,14 @@
     int mSnapTimeout;
     qreal mSnapForce;
     qreal mSnapGap;
-    qreal mSnapBorderGap;
+    qreal mPageMargin;
     int mSnapLineFadeInDuration;
     int mSnapLineFadeOutDuration;
     bool mIsSnapEffectsEnabled;
     SceneType mSceneType;
-
+    QEasingCurve::Type mBounceAnimationEasingCurve;
+    QEasingCurve::Type mPageChangeAnimationEasingCurve;
+    
     static HsConfiguration *mInstance;
 
     HOMESCREEN_TEST_FRIEND_CLASS(TestHsDomainModel)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsdomainmodel/inc/hsdocumentloader.h	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,42 @@
+/*
+* 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:  Homescreen document loader class.
+*
+*/
+
+#ifndef HSDOCUMENTLOADER_H
+#define HSDOCUMENTLOADER_H
+
+#include <hbdocumentloader.h>
+#include "hstest_global.h"
+
+HOMESCREEN_TEST_CLASS(TestHsDomainModel)
+
+class HsDocumentLoader : public HbDocumentLoader
+{
+public:
+    HsDocumentLoader();
+    virtual ~HsDocumentLoader();
+
+public:
+    QObject *createObject(const QString &type, const QString &name);
+
+private:
+
+    Q_DISABLE_COPY(HsDocumentLoader)
+
+    HOMESCREEN_TEST_FRIEND_CLASS(TestHsDomainModel)
+};
+
+#endif

--- a/homescreenapp/hsdomainmodel/inc/hsdomainmodel_global.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsdomainmodel/inc/hsdomainmodel_global.h	Wed Aug 18 09:40:07 2010 +0300
@@ -19,7 +19,7 @@
 #ifndef HSDOMAINMODEL_GLOBAL_H
 #define HSDOMAINMODEL_GLOBAL_H
 
-#include <Qt/qglobal.h>
+#include <qglobal.h>
 
 // services uri; services key names used when the service is passed as property in state
 const char CONTENT_SERVICE_KEY[]  = "http://homescreen.nokia.com/runtimeservices/contentservice";

--- a/homescreenapp/hsdomainmodel/inc/hsdomainmodeldatastructures.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsdomainmodel/inc/hsdomainmodeldatastructures.h	Wed Aug 18 09:40:07 2010 +0300
@@ -19,7 +19,7 @@
 #define HSDOMAINMODELDATASTRUCTURES_H
 
 #include <QPointF>
-
+#include <QString>
 #include "hsdomainmodel_global.h"
 
 class HSDOMAINMODEL_EXPORT HsSceneData

--- a/homescreenapp/hsdomainmodel/inc/hsgui.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsdomainmodel/inc/hsgui.h	Wed Aug 18 09:40:07 2010 +0300
@@ -18,34 +18,61 @@
 #ifndef HSGUI_H
 #define HSGUI_H
 
+
+#include <QObject>
 #include <QPointer>
-
+#include <Hb> 
 #include "hsdomainmodel_global.h"
 #include "hstest_global.h"
 
+HOMESCREEN_TEST_CLASS(TestHsDomainModel)
 HOMESCREEN_TEST_CLASS(HomeScreenStatePluginTest)
 
 class HbView;
-class HbMainWindow;
+class HsIdleWidget;
+class HsPropertyAnimationWrapper;
 
-class HSDOMAINMODEL_EXPORT HsGui
+struct HsGuiImpl;
+
+class HSDOMAINMODEL_EXPORT HsGui: public QObject
 {
+    Q_OBJECT
 public:
-	static HbView *idleView();	
-	static HbView *takeIdleView();
-	static void setIdleView(HbView *idleView);	
-	
-    static HbMainWindow *mainWindow();
+    ~HsGui();
+
+    static HsGui *setInstance(HsGui *);
+    static HsGui *instance();
+    static HsGui *takeInstance();
+
+    void setupIdleUi();
+    void cleanupIdleUi();
+
+    void setOrientation(Qt::Orientation);
+    Qt::Orientation orientation();
+    
+    HbView *idleView() const;
+    HsIdleWidget *idleWidget() const;
+   
+    QRectF layoutRect() const;
+    
+    void show();
+    
+    HsPropertyAnimationWrapper *pageChangeAnimation();
+    HsPropertyAnimationWrapper *pageCrawlingAnimation();
+signals:
+    void orientationChanged(Qt::Orientation);
+    void navigateToApplibrary();
+ 
+private:
+    HsGui(QObject *parent=0);
 
 private:
-    HsGui() {}
-
-private:
-	static QPointer<HbView> mIdleView;
-	
+    static HsGui *mInstance;
+    HsGuiImpl *mImpl;
+    HOMESCREEN_TEST_FRIEND_CLASS(TestHsDomainModel)
     HOMESCREEN_TEST_FRIEND_CLASS(HomeScreenStatePluginTest)
 };
 
-Q_DECLARE_METATYPE(HsGui*)
+
 
 #endif // HSGUI_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsdomainmodel/inc/hshostedwidgetfactory.h	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,53 @@
+/*
+* 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 HSHOSTEDWIDGETFACTORY_H
+#define HSHOSTEDWIDGETFACTORY_H
+
+#include <QObject>
+
+
+#include "hsdomainmodel_global.h"
+#include "hsdomainmodeldatastructures.h"
+
+#include "hstest_global.h"
+HOMESCREEN_TEST_CLASS(TestHsDomainModel)
+
+struct HsHostedWidgetFactoryImpl;
+
+class HSDOMAINMODEL_EXPORT HsHostedWidgetFactory : public QObject
+{
+    Q_OBJECT
+
+public:
+    static HsHostedWidgetFactory *instance();
+    static HsHostedWidgetFactory *takeInstance();
+    static HsHostedWidgetFactory *setInstance(HsHostedWidgetFactory *);
+    ~HsHostedWidgetFactory();
+
+    QObject *createWidget(const QString &uri);
+private:
+    Q_DISABLE_COPY(HsHostedWidgetFactory)
+    HsHostedWidgetFactory(QObject *parent = 0);
+private:
+    static HsHostedWidgetFactory *mInstance;
+    HsHostedWidgetFactoryImpl *mImpl;
+    
+    HOMESCREEN_TEST_FRIEND_CLASS(TestHsDomainModel)
+};
+
+#endif // HSWIDGETHOST_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsdomainmodel/inc/hsidlewidget.h	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,94 @@
+/*
+* 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 HSIDLEWIDGET_H
+#define HSIDLEWIDGET_H
+
+#include <HbWidget>
+
+#include "hstest_global.h"
+#include "hsdomainmodel_global.h"
+
+HOMESCREEN_TEST_CLASS(TestHsDomainModel)
+
+class HsPage;
+class HsTrashBinWidget;
+class HsPageIndicator;
+class HsSnapLine;
+
+class HSDOMAINMODEL_EXPORT HsIdleWidget : public HbWidget
+{
+    Q_OBJECT
+    Q_PROPERTY(qreal sceneX READ sceneX WRITE setSceneX)
+
+public:
+    HsIdleWidget(QGraphicsItem *parent = 0);
+		~HsIdleWidget();
+
+    qreal sceneX() const;
+    void setSceneX(qreal x);
+
+    void setGeometry(const QRectF &rect);
+
+    void setActivePage(int index);
+    void insertPage(int index, HsPage *page);
+    void removePage(int index);
+
+    HbWidget *controlLayer() const { return mControlLayer; }
+    HbWidget *pageLayer() const { return mPageLayer; }
+    HbWidget *pageWallpaperLayer() const { return mPageWallpaperLayer; }
+    HbWidget *sceneLayer() const { return mSceneLayer; }
+
+    HsTrashBinWidget *trashBin() const { return mTrashBin; }
+    HsPageIndicator *pageIndicator() const { return mPageIndicator; }
+
+    qreal parallaxFactor() const;
+
+
+public slots:
+    void showTrashBin();
+    void showPageIndicator();
+
+    void showVerticalSnapLine(const QLineF &snapLine);	
+    void hideVerticalSnapLine();
+    void showHorizontalSnapLine(const QLineF &snapLine);
+    void hideHorizontalSnapLine();
+
+protected:
+    void polishEvent();
+
+private:
+    Q_DISABLE_COPY(HsIdleWidget)
+    void loadControlLayer();
+        
+private:
+    HbWidget *mControlLayer;
+    HbWidget *mPageLayer;
+    HbWidget *mPageWallpaperLayer;
+    HbWidget *mSceneLayer;
+
+    HsTrashBinWidget *mTrashBin;
+    HsPageIndicator *mPageIndicator;
+
+    HsSnapLine *mHorizontalSnapLine;
+    HsSnapLine *mVerticalSnapLine;
+
+    HOMESCREEN_TEST_FRIEND_CLASS(TestHsDomainModel)
+};
+
+#endif // HSIDLEWIDGET_H

--- a/homescreenapp/hsdomainmodel/inc/hspage.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsdomainmodel/inc/hspage.h	Wed Aug 18 09:40:07 2010 +0300
@@ -18,6 +18,7 @@
 #ifndef HSPAGE_H
 #define HSPAGE_H
 
+#include <QPointF>
 #include <HbWidget>
 #include <HbIconItem>
 #include "hsdomainmodel_global.h"
@@ -27,62 +28,60 @@
 class HsPageData;
 class HsWallpaper;
 class HsPageTouchArea;
+class HsPageVisual;
 
 HOMESCREEN_TEST_CLASS(TestHsDomainModel)
 
-class HSDOMAINMODEL_EXPORT HsPage : public HbWidget
+class HSDOMAINMODEL_EXPORT HsPage : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int pageIndex READ pageIndex)
 
 public:
-    HsPage(QGraphicsItem *parent = 0);
+    HsPage(QObject *parent = 0);
     ~HsPage();
-
     int databaseId() const;
     void setDatabaseId(int id);
-
-    void setGeometry(const QRectF &rect);
-
+   // void setGeometry(const QRectF &rect);
     bool load();
-
     HsWallpaper *wallpaper() const;
-
     bool addExistingWidget(HsWidgetHost *widgetHost);
     bool removeWidget(HsWidgetHost *widgeHost);
-
     QList<HsWidgetHost *> newWidgets();
     bool addNewWidget(HsWidgetHost *widgetHost, const QPointF &position = QPointF());
     void layoutNewWidgets();
     void resetNewWidgets();
     bool deleteFromDatabase();
-
     QList<HsWidgetHost *> widgets() const;
-
     bool isRemovable() const;
     void setRemovable(bool removable);
-
     bool isDefaultPage() const;
     bool isActivePage() const;
-    
     static HsPage *createInstance(const HsPageData &pageData);
-
-    QPointF mTouchPoint;
-
+    QPointF adjustedWidgetPosition(const QRectF &origWidgetRect);
+    QRectF contentGeometry();
+    QRectF contentGeometry(Qt::Orientation orientation);
+    QRectF contentRect();
+    QRectF contentRect(Qt::Orientation orientation);
+    HsPageVisual *visual() const;
+#ifdef HSWIDGETORGANIZER_ALGORITHM
+    enum sortOrder { height, width};
+#endif //HSWIDGETORGANIZER_ALGORITHM
 public slots:
     void showWidgets();
     void hideWidgets();
     void setOnline(bool online = true);
-
     void updateZValues();
-
     int pageIndex();
 
 private:
     Q_DISABLE_COPY(HsPage)
-    void setupTouchArea();
+  //  void setupTouchArea();
     void connectWidget(HsWidgetHost *widget);
     void disconnectWidget(HsWidgetHost *widget);
+#ifdef HSWIDGETORGANIZER_ALGORITHM
+    void sortWidgets(sortOrder order, QList<HsWidgetHost*> &widgets);
+#endif //HSWIDGETORGANIZER_ALGORITHM
 
 private slots:
     void onWidgetFinished();
@@ -90,18 +89,20 @@
     void onWidgetResized();
     void onWidgetAvailable();
     void onWidgetUnavailable();
-
     void onOrientationChanged(Qt::Orientation orientation);
+    void onPageMarginChanged(const QString &value);
 
 private:
     int mDatabaseId;
+    HsPageVisual *mPageVisual;
     HsWallpaper *mWallpaper;
     bool mRemovable;
     QList<HsWidgetHost*> mWidgets;
     QList<HsWidgetHost*> mNewWidgets;
     QList<HsWidgetHost*> mUnavailableWidgets;
-    HsPageTouchArea *mTouchArea;
-    
+    //HsPageTouchArea *mTouchArea;
+    QPointF mTouchPoint;    
+    qreal mPageMargin;
     HOMESCREEN_TEST_FRIEND_CLASS(TestHsDomainModel)
 };

--- a/homescreenapp/hsdomainmodel/inc/hspagenewwidgetlayout.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsdomainmodel/inc/hspagenewwidgetlayout.h	Wed Aug 18 09:40:07 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -35,9 +35,13 @@
     void removeAt(int index);
     QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
     void setGeometry(const QRectF &rect);
-    
     void addItem(HsWidgetHost *item);
-    
+    enum sortOrder { height, width};
+
+private:
+#ifdef HSWIDGETORGANIZER_ALGORITHM
+    QList<HsWidgetHost*> sortWidgets(sortOrder order);
+#endif    
 private:
     QSizeF mSize;
     QList<HsWidgetHost*> mNewWidgets;
@@ -46,5 +50,4 @@
     HOMESCREEN_TEST_FRIEND_CLASS(TestHsDomainModel)
 };
 
-
 #endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsdomainmodel/inc/hspagevisual.h	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,51 @@
+/*
+* 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 HSPAGEVISUAL_H
+#define HSPAGEVISUAL_H
+
+
+#include <HbWidget>
+#include "hsdomainmodel_global.h"
+#include "hstest_global.h"
+
+
+class HsPageTouchArea;
+
+HOMESCREEN_TEST_CLASS(TestHsDomainModel)
+
+class HSDOMAINMODEL_EXPORT HsPageVisual : public HbWidget
+{
+    Q_OBJECT
+   
+
+public:
+    HsPageVisual(QGraphicsItem *parent = 0);
+    ~HsPageVisual();
+   
+    void setGeometry(const QRectF &rect);
+
+private:
+    Q_DISABLE_COPY(HsPageVisual)
+    void setupTouchArea();
+
+private:
+    HsPageTouchArea *mTouchArea;
+    HOMESCREEN_TEST_FRIEND_CLASS(TestHsDomainModel)
+};
+
+#endif

--- a/homescreenapp/hsdomainmodel/inc/hsscene.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsdomainmodel/inc/hsscene.h	Wed Aug 18 09:40:07 2010 +0300
@@ -71,8 +71,8 @@
     static HsScene *instance();
     static HsScene *takeInstance();
     static void setInstance(HsScene *instance);
-    static HbMainWindow *mainWindow();
-    static Qt::Orientation orientation();
+    //static HbMainWindow *mainWindow();
+    //static Qt::Orientation orientation();
 
 signals:
     void pageTapAndHoldFinished(QGestureEvent *event);
@@ -105,7 +105,7 @@
 
     friend class HsPage;
     friend class HsPageTouchArea;
-    friend class HsWidgetHost;
+    friend class HsWidgetHostVisual;
     friend class HsWidgetTouchArea;
     friend class HsWidgetMoveTouchArea;

--- a/homescreenapp/hsdomainmodel/inc/hswidgethost.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsdomainmodel/inc/hswidgethost.h	Wed Aug 18 09:40:07 2010 +0300
@@ -18,7 +18,7 @@
 #ifndef HSWIDGETHOST_H
 #define HSWIDGETHOST_H
 
-#include <HbWidget>
+#include <QObject>
 #include <QMetaMethod>
 #include <QMetaProperty>
 
@@ -33,13 +33,14 @@
 class HsWidgetTouchArea;
 class HsWidgetComponent;
 class HsPage;
+class HsWidgetHostVisual;
 
-class HSDOMAINMODEL_EXPORT HsWidgetHost : public HbWidget
+class HSDOMAINMODEL_EXPORT HsWidgetHost : public QObject
 {
     Q_OBJECT
 
 public:
-    HsWidgetHost(int databaseId, QGraphicsItem *parent = 0);
+    HsWidgetHost(int databaseId, QObject *parent = 0);
     ~HsWidgetHost();
 
     static HsWidgetHost *createInstance(
@@ -58,8 +59,8 @@
     bool savePresentation(HsWidgetPresentationData &presentation);
     bool getPresentation(HsWidgetPresentationData &presentation);
     bool removePresentation(Qt::Orientation orientation);
-    QPainterPath shape() const;
-
+    
+    HsWidgetHostVisual *visual() const;
 signals:
     void event_startAndShow();
     void event_startAndHide();
@@ -73,7 +74,6 @@
     
     void finished();
     void faulted();
-    void resized();
     void available();
     void unavailable();
 
@@ -90,22 +90,20 @@
     void startDropEffect();
 
 protected:
-    bool eventFilter(QObject *watched, QEvent *event);
+/*    bool eventFilter(QObject *watched, QEvent *event);
     void gestureEvent(QGestureEvent *event);
     void mousePressEvent(QGraphicsSceneMouseEvent *) {}
-
+*/
 private:
     Q_DISABLE_COPY(HsWidgetHost)
-    void setupTouchArea();
-    void setupEffects();
+  
     void setupStates();
 
     bool setProperty(const char *name, QMetaProperty &property); 
     bool setMethod(const char *signature, QMetaMethod &method);    
     bool hasSignal(const char *signature);
 
-    void setNewSize(const QSizeF &size);
-
+  
     bool setPreferencesToWidget();
 
 private slots:
@@ -127,12 +125,13 @@
     void onSetPreferences(const QStringList &names);
 
 private:
-    int mDatabaseId;        
+    int mDatabaseId;
+    HsWidgetHostVisual *mVisual;
     QStateMachine *mStateMachine;
-    QGraphicsWidget *mWidget;
+    QObject *mWidget;
     HsPage *mPage;    
     HsWidgetComponent *mComponent;
-    HsWidgetTouchArea *mTouchArea;
+
     QMetaMethod mOnInitializeMethod;
     QMetaMethod mOnShowMethod;
     QMetaMethod mOnHideMethod;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsdomainmodel/inc/hswidgethostvisual.h	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,76 @@
+/*
+* 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 HSWIDGETHOSTVISUAL_H
+#define HSWIDGETHOSTVISUAL_H
+
+#include <HbWidget>
+#include <QMetaMethod>
+#include <QMetaProperty>
+
+#include "hsdomainmodel_global.h"
+#include "hsdomainmodeldatastructures.h"
+
+#include "hstest_global.h"
+HOMESCREEN_TEST_CLASS(TestHsDomainModel)
+
+class QStateMachine;
+
+class HsWidgetTouchArea;
+class HsWidgetComponent;
+class HsPage;
+class HsWidgetHost;
+
+class HSDOMAINMODEL_EXPORT HsWidgetHostVisual : public HbWidget
+{
+    Q_OBJECT
+
+public:
+    HsWidgetHostVisual(QGraphicsItem *parent = 0);
+    ~HsWidgetHostVisual();
+    
+    QPainterPath shape() const;
+    void setWidget(QObject *widget);
+    void setVisualModel(HsWidgetHost *model);
+    HsWidgetHost *visualModel() const;
+signals:
+    void resized();
+
+public slots:
+    void startDragEffect();
+    void startDropEffect();
+
+protected:
+    bool eventFilter(QObject *watched, QEvent *event);
+    void gestureEvent(QGestureEvent *event);
+    void mousePressEvent(QGraphicsSceneMouseEvent *) {}
+
+private:
+    Q_DISABLE_COPY(HsWidgetHostVisual)
+    void setupTouchArea();
+    void setupEffects();
+
+    void setNewSize(const QSizeF &size);
+
+private:
+    HsWidgetTouchArea *mTouchArea;
+    HsWidgetHost *mVisualModel;
+    QGraphicsWidget *mWidget;
+    HOMESCREEN_TEST_FRIEND_CLASS(TestHsDomainModel)
+};
+
+#endif // HSWIDGETHOST_H

--- a/homescreenapp/hsdomainmodel/inc/hswidgettoucharea.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsdomainmodel/inc/hswidgettoucharea.h	Wed Aug 18 09:40:07 2010 +0300
@@ -24,14 +24,14 @@
 
 HOMESCREEN_TEST_CLASS(TestHsDomainModel)
 
-class HsWidgetHost;
+class HsWidgetHostVisual;
 
 class HsWidgetTouchArea : public HbTouchArea
 {
     Q_OBJECT
 
 public:
-    HsWidgetTouchArea(HsWidgetHost *widgetHost);
+    HsWidgetTouchArea(HsWidgetHostVisual *widgetHost);
     ~HsWidgetTouchArea();
 
     bool sceneEvent(QEvent *event);
@@ -44,7 +44,7 @@
     Q_DISABLE_COPY(HsWidgetTouchArea)
     
 private:
-    HsWidgetHost *mWidgetHost;
+    HsWidgetHostVisual *mWidgetHostVisual;
 
     HOMESCREEN_TEST_FRIEND_CLASS(TestHsDomainModel)
 };

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsdomainmodel/resource/controllayer.docml	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument version="0.9">
+    <widget name="controlLayer" type="HbWidget">
+        <widget name="pageIndicator" type="HsPageIndicator">
+            <sizehint height="2.5un" type="PREFERRED"/>
+        </widget>
+        <widget name="trashBin" type="HsTrashBinWidget">
+            <sizehint type="PREFERRED" height="11un" width="11un"/>
+        </widget>
+        <layout type="anchor">
+            <anchoritem dst="pageIndicator" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
+            <anchoritem dst="pageIndicator" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
+            <anchoritem dst="pageIndicator" dstEdge="BOTTOM" spacing="-1un" src="" srcEdge="BOTTOM"/>
+            <anchoritem dst="trashBin" dstEdge="CENTERH" spacing="0un" src="" srcEdge="CENTERH"/>
+            <anchoritem dst="trashBin" dstEdge="BOTTOM" spacing="-1un" src="" srcEdge="BOTTOM"/>
+        </layout>
+    </widget>
+    <metadata activeUIState="Common ui state" display="NHD portrait" unit="un">
+        <uistate name="Common ui state" sections="#common"/>
+    </metadata>
+</hbdocument>

--- a/homescreenapp/hsdomainmodel/src/hsconfiguration.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsdomainmodel/src/hsconfiguration.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -73,11 +73,13 @@
     mSnapTimeout(100),
     mSnapForce(30),
     mSnapGap(6),
-    mSnapBorderGap(0),
+    mPageMargin(0),
     mSnapLineFadeInDuration(200),
     mSnapLineFadeOutDuration(100),
     mIsSnapEffectsEnabled(true),    
-    mSceneType(PageWallpapers)
+    mSceneType(PageWallpapers),
+    mBounceAnimationEasingCurve(QEasingCurve::Linear),
+    mPageChangeAnimationEasingCurve(QEasingCurve::Linear)
 {    
 }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsdomainmodel/src/hsdocumentloader.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,65 @@
+/*
+* 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:  Homescreen document loader class.
+*
+*/
+
+#include "hsdocumentloader.h"
+#include "hspageindicator.h"
+#include "hstrashbinwidget.h"
+#include "hsconfiguration.h"
+
+/*!
+    \class HsDocumentLoader
+    \ingroup group_hshomescreenstateplugin
+    \brief Homescreen document loader class.
+
+    Loads own widgets from docml.
+*/
+
+/*!
+    Constructor.
+*/
+HsDocumentLoader::HsDocumentLoader()
+    : HbDocumentLoader()
+{
+}
+
+/*!
+    Destructor.
+*/
+HsDocumentLoader::~HsDocumentLoader()
+{
+}
+
+/*!
+    Looks up an object which inherits class type and of which object name equals to name.
+    \a type type of the desired object.
+    \a name object name of the desired object.
+    */
+QObject *HsDocumentLoader::createObject(const QString &type, const QString &name)
+{
+    if (type == HsPageIndicator::staticMetaObject.className()) {
+        QObject *object = new HsPageIndicator(HSCONFIGURATION_GET(pageIndicatorSpacing));
+        object->setObjectName(name);
+        return object;
+    }
+    else if (type == HsTrashBinWidget::staticMetaObject.className()) {
+        QObject *object = new HsTrashBinWidget;
+        object->setObjectName(name);
+        return object;
+    }
+        
+    return HbDocumentLoader::createObject(type, name);
+}

--- a/homescreenapp/hsdomainmodel/src/hsgui.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsdomainmodel/src/hsgui.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -16,9 +16,19 @@
 */
 
 #include <HbInstance>
+#include <HbMainWindow>
 #include <HbView>
+#include <HbMenu>
+#include <HbAction>
 
 #include "hsgui.h"
+#include "hsidlewidget.h"
+#include "hsscene.h"
+#include "hsconfiguration.h"
+#include "hspropertyanimationwrapper.h"
+namespace {
+      const char gApplicationLibraryIconName[] = "qtg_mono_applications_all";
+}
 
 /*!
     \class HsGui
@@ -27,47 +37,160 @@
     HsGui includes common UI components for Home screen.
 */
 
-/*!
-    Returns the idle view. 
-*/
-HbView *HsGui::idleView()
+HsGui *HsGui::mInstance(0);
+
+struct HsGuiImpl
 {
-    return mIdleView;    
+    HsIdleWidget *mIdleWidget;
+    HbView *mIdleView;
+    HbMainWindow *mWindow;
+    HbAction *mNavigationAction;
+    HsPropertyAnimationWrapper *mPageChangeAnimation;
+    HsPropertyAnimationWrapper *mPageCrawlingAnimation;
+};
+
+
+
+HsGui::~HsGui()
+{
+    if (mImpl->mNavigationAction) {
+        delete mImpl->mNavigationAction;
+    }
+
+    if (mImpl->mPageChangeAnimation) {
+        mImpl->mPageChangeAnimation->stop();
+        delete mImpl->mPageChangeAnimation;
+    }
+    if (mImpl->mPageCrawlingAnimation) {
+        mImpl->mPageCrawlingAnimation->stop();
+        delete mImpl->mPageCrawlingAnimation;
+    }
+    delete mImpl;
 }
 
-/*!
-    Returns the current idle view instance. Callers of this 
-    function take ownership of the instance. The current 
-    view instance will be reset to null.    
-*/
-HbView *HsGui::takeIdleView()
-{	
-    HbView *idleView = mIdleView;
-    mIdleView = 0;
-    return idleView;
+HsGui *HsGui::setInstance(HsGui *instance)
+{
+    HsGui *old = mInstance;
+    if (mInstance != instance) {
+        mInstance = instance;
+    }
+    return old;
+}
+
+HsGui *HsGui::instance()
+{
+    if (!mInstance) {
+        mInstance = new HsGui(QCoreApplication::instance());
+    }
+    return mInstance;
+}
+
+HsGui *HsGui::takeInstance()
+{
+    HsGui *instance = mInstance;
+    mInstance = 0;
+    return instance;
+}
+
+void HsGui::setupIdleUi()
+{
+    if (!mImpl->mIdleWidget) {
+        mImpl->mIdleWidget = new HsIdleWidget;
+        mImpl->mIdleView = mImpl->mWindow->addView(mImpl->mIdleWidget);
+        mImpl->mIdleView->setContentFullScreen();
+
+        delete mImpl->mNavigationAction;
+        mImpl->mNavigationAction = 0;
+        mImpl->mNavigationAction = new HbAction;
+        mImpl->mNavigationAction->setIcon(HbIcon(gApplicationLibraryIconName));
+        mImpl->mNavigationAction->setObjectName("applib_navigation_action");
+        connect(mImpl->mNavigationAction, SIGNAL(triggered()), SIGNAL(navigateToApplibrary()));
+        mImpl->mIdleView->setNavigationAction(mImpl->mNavigationAction);
+    }
+    bool animate  = !mImpl->mWindow->isObscured();
+    mImpl->mWindow->setCurrentView(mImpl->mIdleView, animate);    
 }
 
-/*!
-    Sets the idle view instance. The existing instance
-    will be deleted.
-*/
-void HsGui::setIdleView(HbView *idleView)
+void HsGui::cleanupIdleUi()
 {
-    if (mIdleView != idleView) {
-        delete mIdleView;
-        mIdleView = idleView;
+    if (mImpl->mIdleView) {
+        mImpl->mIdleView->setNavigationAction(0);
+        delete mImpl->mNavigationAction;
+        mImpl->mNavigationAction = 0;
+        
+        mImpl->mWindow->removeView(mImpl->mIdleView);
+        delete mImpl->mIdleView;
+        mImpl->mIdleView = 0;
+
+        delete mImpl->mPageChangeAnimation;
+        mImpl->mPageChangeAnimation = 0;
+        
+        delete mImpl->mPageCrawlingAnimation;
+        mImpl->mPageCrawlingAnimation = 0;
     }
+    
+}
+
+void HsGui::setOrientation(Qt::Orientation orientation)
+{
+    mImpl->mWindow->setOrientation(orientation);
+}
+
+Qt::Orientation HsGui::orientation()
+{
+    return mImpl->mWindow->orientation();
+}
+
+HbView *HsGui::idleView() const
+{
+    return mImpl->mIdleView;
+}
+
+HsIdleWidget *HsGui::idleWidget() const
+{
+    return mImpl->mIdleWidget;
 }
 
-/*!
-    Returns the main window.
-*/
-HbMainWindow *HsGui::mainWindow()
+QRectF HsGui::layoutRect() const
 {
-    return hbInstance->allMainWindows().first();
+    return mImpl->mWindow->layoutRect();
+}
+
+void HsGui::show()
+{
+    mImpl->mWindow->raise();
+    mImpl->mWindow->show();
 }
 
-/*!
-    Points to the idle view instance.
-*/
-QPointer<HbView> HsGui::mIdleView(0);
+HsPropertyAnimationWrapper *HsGui::pageChangeAnimation()
+{
+    if (!mImpl->mPageChangeAnimation) {
+        mImpl->mPageChangeAnimation = new HsPropertyAnimationWrapper;
+        mImpl->mPageChangeAnimation->setTargetObject(mImpl->mIdleWidget);
+        mImpl->mPageChangeAnimation->setPropertyName("sceneX"); 
+    }
+    return mImpl->mPageChangeAnimation;
+}
+HsPropertyAnimationWrapper *HsGui::pageCrawlingAnimation()
+{
+    if (!mImpl->mPageCrawlingAnimation) {
+        mImpl->mPageCrawlingAnimation = new HsPropertyAnimationWrapper;
+        mImpl->mPageCrawlingAnimation->setTargetObject(mImpl->mIdleWidget);
+        mImpl->mPageCrawlingAnimation->setPropertyName("sceneX"); 
+    }
+    return mImpl->mPageCrawlingAnimation;
+}
+
+HsGui::HsGui(QObject *parent):
+    QObject(parent),mImpl(new HsGuiImpl)
+{
+    mImpl->mIdleView = 0;
+    mImpl->mIdleWidget = 0;
+    mImpl->mNavigationAction = 0;
+    mImpl->mPageChangeAnimation = 0;
+    mImpl->mPageCrawlingAnimation = 0;
+
+    mImpl->mWindow = hbInstance->allMainWindows().first();
+    connect(mImpl->mWindow, SIGNAL(orientationChanged(Qt::Orientation)),
+        SIGNAL(orientationChanged(Qt::Orientation)));
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsdomainmodel/src/hshostedwidgetfactory.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,106 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+#include <qservicemanager.h>
+#include <qservicefilter.h>
+#include <qserviceinterfacedescriptor.h>
+#include <QGraphicsWidget>
+#include "hshostedwidgetfactory.h"
+
+QTM_USE_NAMESPACE
+
+/*!
+    \class HsWidgetFactory
+    \ingroup group_hsdomainmodel
+    \brief Each widget is controlled by the home screen framework through a widget host.
+*/
+
+
+struct HsHostedWidgetFactoryImpl{
+    QServiceManager mServiceManager;
+    QServiceFilter mFilter;
+};
+
+
+
+HsHostedWidgetFactory *HsHostedWidgetFactory::mInstance = 0;
+
+HsHostedWidgetFactory *HsHostedWidgetFactory::instance()
+{
+    if (!mInstance) {
+        mInstance = new HsHostedWidgetFactory;
+    }
+    return mInstance;
+}
+
+HsHostedWidgetFactory *HsHostedWidgetFactory::takeInstance()
+{
+    HsHostedWidgetFactory *instance = mInstance;
+    mInstance = 0;
+    return instance;
+}
+
+HsHostedWidgetFactory *HsHostedWidgetFactory::setInstance
+                                             (HsHostedWidgetFactory *instance)
+{
+    HsHostedWidgetFactory *old = mInstance;
+    if (mInstance != instance) {
+        mInstance = instance;
+    }
+    return old;
+}
+
+QObject *HsHostedWidgetFactory::createWidget(const QString &uri)
+{
+    mImpl->mFilter.setServiceName(uri);
+    QList<QServiceInterfaceDescriptor> interfaces = 
+        mImpl->mServiceManager.findInterfaces(mImpl->mFilter);
+    
+    if (interfaces.isEmpty()) {
+        return 0;
+    }
+    // In theory we support QGraphicsWidget derived widgets
+    QObject *widgetObject = mImpl->mServiceManager.loadInterface(interfaces.first());
+    
+    if (!qobject_cast<QGraphicsWidget *>(widgetObject)) {
+        delete widgetObject;
+        widgetObject = 0;
+    }
+    return widgetObject;
+}
+
+/*!
+    Constructs a new widget host with given \a databaseId and
+    \a parent item.
+*/
+HsHostedWidgetFactory::HsHostedWidgetFactory(QObject *parent)
+  : QObject(parent),
+    mImpl(new HsHostedWidgetFactoryImpl)
+{
+    mImpl->mFilter.setInterface("com.nokia.symbian.IHomeScreenWidget");
+}
+
+/*!
+    Destructor.
+*/
+HsHostedWidgetFactory::~HsHostedWidgetFactory()
+{
+    delete mImpl;
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsdomainmodel/src/hsidlewidget.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,409 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#include <QApplication>
+#include <QGraphicsSceneMouseEvent>
+#include <QGraphicsLinearLayout>
+#include <QDir>
+
+#include <HbMainWindow>
+#include <HbVkbHost>
+
+#include "hsidlewidget.h"
+#include "hsscene.h"
+#include "hspage.h"
+#include "hspagevisual.h"
+#include "hswidgethost.h"
+#include "hswallpaper.h"
+#include "hstrashbinwidget.h"
+#include "hspageindicator.h"
+#include "hsdocumentloader.h"
+#include "hsconfiguration.h"
+#include "hsapp_defs.h"
+#include "hssnapline.h"
+#include "hsgui.h"
+
+
+namespace
+{
+    const char gControlLayerDocmlName[] = "controllayer.docml";
+    const char gControlLayerName[]      = "controlLayer";
+    const char gTrashBinName[]          = "trashBin";
+    const char gPageIndicatorName[]     = "pageIndicator";
+}
+
+/*!
+    \class HsIdleWidget
+    \ingroup group_hshomescreenstateplugin
+    \brief View part of the home screen idle state.
+
+    Maintains the idle view ui layers and takes care of
+    receiving user input and communicating it to the idle
+    state for further processing.
+*/
+
+/*!
+    Constructs a new idle widget with the given \a parent.
+*/
+HsIdleWidget::HsIdleWidget(QGraphicsItem *parent)
+  : HbWidget(parent),
+    mControlLayer(0), mPageLayer(0), mPageWallpaperLayer(0),
+    mSceneLayer(0),
+    mTrashBin(0), mPageIndicator(0),
+    mHorizontalSnapLine(0), mVerticalSnapLine(0)
+{
+    setFlag(ItemHasNoContents);
+
+    loadControlLayer();
+
+    QGraphicsLinearLayout *linearLayout = 0;
+
+    linearLayout = new QGraphicsLinearLayout(Qt::Horizontal);
+    linearLayout->setContentsMargins(0, 0, 0, 0);
+    linearLayout->setSpacing(0);
+    mPageLayer = new HbWidget(this);
+    mPageLayer->setLayout(linearLayout);
+    mPageLayer->setZValue(2);
+    
+    linearLayout = new QGraphicsLinearLayout(Qt::Horizontal);
+    linearLayout->setContentsMargins(0, 0, 0, 0);
+    linearLayout->setSpacing(0);
+    mPageWallpaperLayer = new HbWidget(this);
+    mPageWallpaperLayer->setLayout(linearLayout);
+    mPageWallpaperLayer->setZValue(1);
+    
+    linearLayout = new QGraphicsLinearLayout(Qt::Horizontal);
+    linearLayout->setContentsMargins(0, 0, 0, 0);
+    linearLayout->setSpacing(0);
+    mSceneLayer = new HbWidget(this);
+    mSceneLayer->setLayout(linearLayout);
+    mSceneLayer->setZValue(0);
+}
+
+/*!
+    Destroys this idle widget.
+*/
+HsIdleWidget::~HsIdleWidget()
+{
+    QList<HsPage *> pages = HsScene::instance()->pages();
+    foreach (HsPage *page, pages) {
+        page->visual()->setParentItem(0);
+        if (page->visual()->scene()) {
+            page->visual()->scene()->removeItem(page->visual());
+        }
+        HsWallpaper *pageWallpaper = page->wallpaper();
+        if (pageWallpaper) {
+            pageWallpaper->setParentItem(0);
+            if (pageWallpaper->scene()) {
+                pageWallpaper->scene()->removeItem(pageWallpaper);
+            }
+        }
+    }
+
+    HsWallpaper *sceneWallpaper = HsScene::instance()->wallpaper();
+    if (sceneWallpaper) {
+        sceneWallpaper->setParentItem(0);
+        if (sceneWallpaper->scene()) {
+            sceneWallpaper->scene()->removeItem(sceneWallpaper);
+        }
+    }
+}
+
+qreal HsIdleWidget::sceneX() const
+{
+    return mPageLayer->x();
+}
+
+void HsIdleWidget::setSceneX(qreal x)
+{
+    if (HSCONFIGURATION_GET(sceneType) == HsConfiguration::SceneWallpaper) {
+        mPageLayer->setX(x);
+        mSceneLayer->setX((parallaxFactor() * x) - HSCONFIGURATION_GET(bounceEffect) / 2);
+    } else {
+        mPageLayer->setX(x);
+        mPageWallpaperLayer->setX(x);
+    }
+}
+
+/*!
+    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);
+    }
+}
+
+/*!
+    Sets the active page \a index to the page
+    indicator.
+*/
+void HsIdleWidget::setActivePage(int index)
+{
+    mPageIndicator->setActiveItemIndex(index);
+}
+
+/*!
+    Inserts the given \a page at index position
+    \a index in the page layer.
+*/
+void HsIdleWidget::insertPage(int index, HsPage *page)
+{
+    QGraphicsLinearLayout *layout =
+        static_cast<QGraphicsLinearLayout *>(mPageLayer->layout());
+    layout->insertItem(index, page->visual());
+    mPageLayer->resize(
+        layout->count() * size().width(), size().height());
+
+    if (HSCONFIGURATION_GET(sceneType) == HsConfiguration::PageWallpapers) {
+        QGraphicsLinearLayout *layout =
+            static_cast<QGraphicsLinearLayout *>(mPageWallpaperLayer->layout());
+        layout->insertItem(index, page->wallpaper());
+        mPageWallpaperLayer->resize(
+            layout->count() * size().width(), size().height());
+    }
+}
+
+/*!
+    Removes the page at index position
+    \a index in the page layer.
+*/
+void HsIdleWidget::removePage(int index)
+{
+    QGraphicsLinearLayout *layout =
+        static_cast<QGraphicsLinearLayout *>(mPageLayer->layout());
+    layout->removeAt(index);
+    mPageLayer->resize(
+        layout->count() * size().width(), size().height());
+
+    if (HSCONFIGURATION_GET(sceneType) == HsConfiguration::PageWallpapers) {
+        QGraphicsLinearLayout *layout =
+            static_cast<QGraphicsLinearLayout *>(mPageWallpaperLayer->layout());
+        layout->removeAt(index);
+        mPageWallpaperLayer->resize(
+            layout->count() * size().width(), size().height());
+    }
+    mPageIndicator->removeItem(index);
+}
+
+/*!
+    \fn HsIdleWidget::controlLayer() const
+
+    Returns the control layer.
+*/
+
+/*!
+    \fn HsIdleWidget::pageLayer() const
+
+    Returns the page layer.
+*/
+
+/*!
+    \fn HsIdleWidget::sceneLayer() const
+
+    Returns the scene layer.
+*/
+
+/*!
+    \fn HsIdleWidget::trashBin() const
+
+    Returns the trashbin widget.
+*/
+
+/*!
+    \fn HsIdleWidget::pageIndicator() const
+
+    Returns the page indicator widget.
+*/
+
+/*!
+    Sets the trashbin visible and hides the page indicator.
+*/
+void HsIdleWidget::showTrashBin()
+{
+    mPageIndicator->hide();
+    mTrashBin->show();
+}
+
+/*!
+    Sets the page indicator visible and hides the trashbin.
+*/
+void HsIdleWidget::showPageIndicator()
+{
+    mTrashBin->hide();
+    mTrashBin->deactivate();
+    mPageIndicator->setSpacing(HSCONFIGURATION_GET(pageIndicatorSpacing)); // for usability optimization widget, can be removed later on
+    mPageIndicator->setVisible(1 < mPageIndicator->itemCount());
+}
+
+/*!
+    Shows the Vertical snapping lines showing the guidance
+*/
+void HsIdleWidget::showVerticalSnapLine(const QLineF &snapLine)
+{
+    QVariantHash snapConfiguration;
+    snapConfiguration[SNAPLINEFADEINDURATION] = QString::number(HSCONFIGURATION_GET(snapLineFadeInDuration));
+    snapConfiguration[SNAPLINEFADEOUTDURATION] = QString::number(HSCONFIGURATION_GET(snapLineFadeOutDuration));
+
+    mVerticalSnapLine->setConfiguration(snapConfiguration);
+    mVerticalSnapLine->showLine(snapLine);
+}
+
+/*!
+    Shows the Horizontal snapping lines showing the guidance
+*/
+void HsIdleWidget::showHorizontalSnapLine(const QLineF &snapLine)
+{
+    QVariantHash snapConfiguration;
+    snapConfiguration[SNAPLINEFADEINDURATION] = QString::number(HSCONFIGURATION_GET(snapLineFadeInDuration));
+    snapConfiguration[SNAPLINEFADEOUTDURATION] = QString::number(HSCONFIGURATION_GET(snapLineFadeOutDuration));
+
+    mHorizontalSnapLine->setConfiguration(snapConfiguration);
+    mHorizontalSnapLine->showLine(snapLine);
+}
+
+/*!
+    Hides the Vertical snapping line showing the guidance
+*/
+void HsIdleWidget::hideVerticalSnapLine()
+{
+    mVerticalSnapLine->hideLine();
+}
+
+/*!
+    Hides the Horizontal snapping line showing the guidance
+*/
+void HsIdleWidget::hideHorizontalSnapLine()
+{
+    mHorizontalSnapLine->hideLine();
+}
+
+/*!
+    Reimplements QGraphicsWidget::polishEvent().
+*/
+void HsIdleWidget::polishEvent()
+{
+    HsScene *scene = HsScene::instance();
+    Q_ASSERT(scene);
+
+    QGraphicsLinearLayout *pageLayout = 
+        static_cast<QGraphicsLinearLayout *>(mPageLayer->layout());
+
+    QList<HsPage *> pages = scene->pages();
+
+    foreach (HsPage *page, pages) {
+        pageLayout->addItem(page->visual());
+        if (HSCONFIGURATION_GET(sceneType) == HsConfiguration::PageWallpapers) {
+            QGraphicsLinearLayout *pageWallpaperLayout = 
+                static_cast<QGraphicsLinearLayout *>(mPageWallpaperLayer->layout());
+            pageWallpaperLayout->addItem(page->wallpaper());
+        }
+    }
+   if (HSCONFIGURATION_GET(sceneType) == HsConfiguration::SceneWallpaper) {
+        QGraphicsLinearLayout *sceneLayout = 
+            static_cast<QGraphicsLinearLayout *>(mSceneLayer->layout());
+    	HsWallpaper *wallpaper = HsScene::instance()->wallpaper();
+        sceneLayout->addItem(wallpaper);
+    }
+           
+    mPageIndicator->initialize(pages.count(), scene->activePageIndex());    
+    showPageIndicator();
+
+   // HsGui::instance()->scene()->installEventFilter(this);
+}
+
+/*!
+    Loads the control layer declared in a docml file.
+*/
+void HsIdleWidget::loadControlLayer()
+{
+    HsDocumentLoader loader;
+    bool loaded = false;
+
+#ifndef Q_OS_SYMBIAN
+    QString path = QDir::currentPath();
+#else
+    QString path = "c:";
+#endif
+
+    QString file = path + "/hsresources/" + gControlLayerDocmlName;
+    QString fallbackPath = QString(":/") + gControlLayerDocmlName;
+
+    if (QFile::exists(file)) {
+        loader.load(file, &loaded);
+        if (!loaded) {
+            loader.load(fallbackPath, &loaded);
+        }
+    } else {
+        loader.load(fallbackPath, &loaded);
+    }
+
+    if (loaded) {
+        mControlLayer = qobject_cast<HbWidget *>(loader.findWidget(gControlLayerName));
+        mControlLayer->setZValue(3);
+        mControlLayer->setParentItem(this);
+
+        mTrashBin = qobject_cast<HsTrashBinWidget *>(loader.findWidget(gTrashBinName));
+        mTrashBin->setZValue(1e6);
+
+        mPageIndicator = qobject_cast<HsPageIndicator *>(loader.findWidget(gPageIndicatorName));
+        mPageIndicator->setZValue(1e6);
+
+
+        mHorizontalSnapLine = new HsSnapLine(mControlLayer);
+        mHorizontalSnapLine->setZValue(10);
+
+        mVerticalSnapLine = new HsSnapLine(mControlLayer);
+        mVerticalSnapLine->setZValue(10);
+    } else {
+        // TODO: Handle error.
+    }
+}
+
+qreal HsIdleWidget::parallaxFactor() const
+{   
+    qreal clw = mControlLayer->size().width();
+    qreal slw = mSceneLayer->size().width() - HSCONFIGURATION_GET(bounceEffect);
+    int n = HsScene::instance()->pages().count();
+    if (n < 2) {
+        return 1;
+    } else {
+        return (slw - clw) / ((n - 1) * clw);
+    }
+}

--- a/homescreenapp/hsdomainmodel/src/hspage.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsdomainmodel/src/hspage.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -19,15 +19,18 @@
 
 #include "hsdomainmodeldatastructures.h"
 #include "hspage.h"
+#include "hspagevisual.h"
 #include "hspagetoucharea.h"
 #include "hspagenewwidgetlayout.h"
 #include "hsscene.h"
 #include "hsdatabase.h"
 #include "hswidgethost.h"
+#include "hswidgethostvisual.h"
 #include "hswallpaper.h"
 #include "hswidgetpositioningonwidgetadd.h"
 #include "hswidgetpositioningonorientationchange.h"
 #include "hsconfiguration.h"
+#include "hsgui.h"
 
 
 /*!
@@ -43,18 +46,18 @@
     \a parent Owner.
     \a aFlags Window flags.
 */
-HsPage::HsPage(QGraphicsItem* parent)
-    : HbWidget(parent),
+HsPage::HsPage(QObject* parent)
+    : QObject(parent),
       mDatabaseId(-1),
+      mPageVisual(new HsPageVisual), 
       mWallpaper(0),
       mRemovable(true),
-      mTouchArea(0)
+      mPageMargin(0.0)
 {
-    setFlag(QGraphicsItem::ItemHasNoContents);
-    setSizePolicy(QSizePolicy(QSizePolicy::Ignored,
-                              QSizePolicy::Ignored));
-
-    setupTouchArea();
+ 
+    //Page margin
+    mPageMargin = HSCONFIGURATION_GET(pageMargin);
+    connect(HsConfiguration::instance(), SIGNAL(propertyChanged(QString)), SLOT(onPageMarginChanged(QString)));
 }
 
 /*!
@@ -62,6 +65,36 @@
 */
 HsPage::~HsPage()
 {
+    // visuals are owned by widget host, detach those from page visual
+    HsWidgetHostVisual *visual(0);
+    foreach (HsWidgetHost *widget, mWidgets) {
+        visual = widget->visual();
+        visual->setParent(0);
+        if (visual->scene()) {
+            visual->scene()->removeItem(visual);
+        }
+    }
+   
+    foreach (HsWidgetHost *widget, mNewWidgets) {
+        visual = widget->visual();
+        visual->setParent(0);
+        if (visual->scene()) {
+            visual->scene()->removeItem(visual);
+        }
+    }
+   
+    foreach (HsWidgetHost *widget, mUnavailableWidgets) {
+        visual = widget->visual();
+        visual->setParent(0);
+        if (visual->scene()) {
+            visual->scene()->removeItem(visual);
+        }
+    }
+    qDeleteAll(mWidgets);
+    qDeleteAll(mNewWidgets);
+    qDeleteAll(mUnavailableWidgets);
+
+    delete mPageVisual;
     delete mWallpaper;
 }
 
@@ -80,7 +113,7 @@
 {
     mDatabaseId = id;
 }
-
+/*
 void HsPage::setGeometry(const QRectF &rect)
 {
     if (mTouchArea) {
@@ -89,7 +122,7 @@
 
     HbWidget::setGeometry(rect);
 }
-
+*/
 /*!
     Loads widgets.
 */
@@ -112,14 +145,23 @@
 
     foreach (HsWidgetData data, datas) {
         HsWidgetHost *widget = new HsWidgetHost(data.id);
-        mWidgets.append(widget);
-        connectWidget(widget);
-        widget->setPage(this);
-        widget->setParentItem(this);
-        widget->startWidget(isDefaultPage());
+        if (!widget->loadPresentation(Qt::Horizontal) &&
+            !widget->loadPresentation(Qt::Vertical)) {
+            widget->setPage(this);
+            widget->visual()->hide();
+            connectWidget(widget);
+            mNewWidgets << widget;            
+        }
+        else {
+            mWidgets.append(widget);
+            connectWidget(widget);
+            widget->setPage(this);
+            widget->visual()->setParentItem(this->visual());
+            widget->startWidget(isDefaultPage());
+        }
     }
 
-    connect(HsScene::mainWindow(),
+    connect(HsGui::instance(),
         SIGNAL(orientationChanged(Qt::Orientation)),
         SLOT(onOrientationChanged(Qt::Orientation)));
 
@@ -127,7 +169,7 @@
 }
 
 /*!
-    Return wallpaper. 
+    Return wallpaper.
 */
 HsWallpaper *HsPage::wallpaper() const
 {
@@ -152,10 +194,11 @@
 
     connectWidget(widgetHost);
     mWidgets << widgetHost;
-    widgetHost->setParentItem(this);
+    widgetHost->visual()->setParentItem(visual());
 
     return true;
  }
+
 /*!
     Remove given \a widgetHost from a page. Widget is not deleted. 
     Returns true if successful
@@ -168,10 +211,11 @@
 
     disconnectWidget(widgetHost);
     mWidgets.removeOne(widgetHost);
-    widgetHost->setParentItem(0);
+    widgetHost->visual()->setParentItem(0);
 
     return true;
 }
+
 /*!
     Returns list of new widgets belonging to a page. Widgets which are
     not yet layouted are considered as new widgets. 
@@ -195,19 +239,10 @@
     if (mNewWidgets.contains(widgetHost)) {
         return true;
     }
+    
+    widgetHost->setPage(this);    
 
-    HsWidgetPresentationData presentation;
-    presentation.orientation = HsScene::orientation();
-    if (!widgetHost->getPresentation(presentation)) {
-        presentation.orientation = HsScene::orientation();
-        presentation.setPos(mTouchPoint);
-        presentation.zValue = 0;
-        widgetHost->savePresentation(presentation);
-    }
-
-    widgetHost->hide();
-    widgetHost->setPos(presentation.x, presentation.y);
-    widgetHost->setZValue(presentation.zValue);
+    widgetHost->visual()->hide();
 
     connectWidget(widgetHost);
     mNewWidgets << widgetHost;
@@ -224,10 +259,10 @@
         return;
     }
 
-    HsPageNewWidgetLayout *newWidgetLayout = static_cast<HsPageNewWidgetLayout *>(layout());
+    HsPageNewWidgetLayout *newWidgetLayout = static_cast<HsPageNewWidgetLayout *>(visual()->layout());
     if (!newWidgetLayout) {
         newWidgetLayout = new HsPageNewWidgetLayout(mTouchPoint);
-        setLayout(newWidgetLayout);
+        visual()->setLayout(newWidgetLayout);
     }    
     updateZValues();
     HsWidgetHost *widget = 0;
@@ -235,36 +270,67 @@
         widget = mNewWidgets.at(i);
         newWidgetLayout->addItem(widget);
         widget->setPage(this);
-        widget->setParentItem(this);
+        widget->visual()->setParentItem(visual());
         widget->showWidget();
-        widget->show();
+        widget->visual()->show();
     }
     mWidgets << mNewWidgets;
     mNewWidgets.clear();
 }
 
 /*!
+    Clears new widgets list and resets layout.
+*/
+void HsPage::resetNewWidgets()
+{
+    mNewWidgets.clear();
+    visual()->setLayout(0);
+}
+
+/*!
     Remove page and all it's contained widgets from database 
 */
 bool HsPage::deleteFromDatabase()
 {
+    
+    HsWidgetHostVisual *visual(0);
     foreach (HsWidgetHost *widget, mWidgets) {
+        visual = widget->visual();
+        visual->setParent(0);
+        if (visual->scene()) {
+            visual->scene()->removeItem(visual);
+        }
         widget->remove();
     }
     mWidgets.clear();
+    
 
     foreach (HsWidgetHost *widget, mNewWidgets) {
+        visual = widget->visual();
+        visual->setParent(0);
+        if (visual->scene()) {
+            visual->scene()->removeItem(visual);
+        }
         widget->remove();
     }
     mNewWidgets.clear();
 
     foreach (HsWidgetHost *widget, mUnavailableWidgets) {
+        visual = widget->visual();
+        visual->setParent(0);
+        if (visual->scene()) {
+            visual->scene()->removeItem(visual);
+        }
         widget->remove();
     }
     mUnavailableWidgets.clear();
-
+    
+    if (mWallpaper) {
+        mWallpaper->remove();
+    }
     return HsDatabase::instance()->deletePage(mDatabaseId);
 }
+
 /*!
     Return list of widgets belonging to a page 
 */
@@ -289,6 +355,7 @@
 {
     mRemovable = removable;
 }
+
 /*!
     Return true if page is default page.
 */
@@ -296,6 +363,7 @@
 {
     return mDatabaseId == HSCONFIGURATION_GET(defaultPageId);
 }
+
 /*!
     Return true if page is active page.
 */
@@ -303,6 +371,7 @@
 {
     return this == HsScene::instance()->activePage();
 }
+
 /*!
     Create page into database and return instance of a new page.
 */
@@ -322,12 +391,75 @@
 }
 
 /*!
+    The widget is bounded in the rectangle which is smaller by pageMargin on all sides of page.
+*/
+QPointF HsPage::adjustedWidgetPosition(const QRectF &origWidgetRect)
+{
+    QRectF widgetAreaRect = contentGeometry();
+    qreal widgetX = qBound(widgetAreaRect.left(), origWidgetRect.x(), widgetAreaRect.right() - origWidgetRect.width());
+    qreal widgetY = qBound(widgetAreaRect.top(), origWidgetRect.y(), widgetAreaRect.bottom() - origWidgetRect.height());
+
+    return QPointF(widgetX, widgetY);
+}
+
+/*!
+    Returns rect of rectangular where widgets are allowed to be placed in the page.
+*/
+QRectF HsPage::contentGeometry()
+{
+    return contentGeometry(HsGui::instance()->orientation());
+}
+
+/*!
+    Returns rect of rectangular where widgets are allowed to be placed in the page.
+*/
+QRectF HsPage::contentGeometry(Qt::Orientation orientation)
+{
+    QRectF pageRect = HsGui::instance()->layoutRect();
+
+    if (orientation != HsGui::instance()->orientation()) {
+        qreal width = pageRect.width();
+        qreal height = pageRect.height();
+        pageRect.setWidth(height);
+        pageRect.setHeight(width);
+    }
+
+    //Take care of chrome in both orientation
+    pageRect.setTop(64);
+
+    //Shrink by page margins at each side
+    return pageRect.adjusted(mPageMargin, mPageMargin, -mPageMargin, -mPageMargin);
+}
+
+/*!
+    Returns rect of rectangular where widgets are allowed to be placed in the page.
+*/
+QRectF HsPage::contentRect()
+{
+    return contentRect(HsGui::instance()->orientation());
+}
+
+/*!
+    Returns rect of rectangular where widgets are allowed to be placed in the page.
+*/
+QRectF HsPage::contentRect(Qt::Orientation orientation)
+{
+    QRectF rect = contentGeometry(orientation);
+    rect.moveTopLeft(QPointF(0,0));
+    return rect;
+}
+
+HsPageVisual *HsPage::visual() const
+{
+    return mPageVisual;
+}
+/*!
     Calls onShow() for contained widgets.
 */
 void HsPage::showWidgets()
 {
     foreach (HsWidgetHost *widget, mWidgets) {
-        if (widget->parentItem() == this) {
+        if (widget->visual()->parentItem() == visual()) {
             widget->showWidget();
         }
     }
@@ -339,14 +471,14 @@
 void HsPage::hideWidgets()
 {
     foreach (HsWidgetHost *widget, mWidgets) {
-        if (widget->parentItem() == this) {
+        if (widget->visual()->parentItem() == visual()) {
             widget->hideWidget();
         }
     }
 }
 
 /*!
-    Propogate online state to widgets.
+    Propagate online state to widgets.
 */
 void HsPage::setOnline(bool online)
 {
@@ -357,6 +489,7 @@
         widget->setOnline(online);
     }
 }
+
 /*!
     Update widgets z-values and persist those. Active widget has top most 
     z-value.
@@ -368,7 +501,7 @@
     if (!mWidgets.isEmpty()) {
         QMultiMap<qreal, HsWidgetHost *> map;
         foreach (HsWidgetHost *widget, mWidgets) {
-            map.insert(widget->zValue(), widget);
+            map.insert(widget->visual()->zValue(), widget);
         }
 
         QList<HsWidgetHost *> sortedWidgets = map.values();
@@ -380,14 +513,14 @@
         }
 
         foreach (HsWidgetHost *widget, sortedWidgets) {
-            widget->setZValue(z++);
+            widget->visual()->setZValue(z++);
             widget->savePresentation();
         }
     }
 
     if (!mNewWidgets.isEmpty()) {
         foreach (HsWidgetHost *widget, mNewWidgets) {
-            widget->setZValue(z++);
+            widget->visual()->setZValue(z++);
             widget->savePresentation();
         }
     }
@@ -402,11 +535,11 @@
 /*!
     Create touch area for page.
 */
-void HsPage::setupTouchArea()
+/*void HsPage::setupTouchArea()
 {
     mTouchArea = new HsPageTouchArea(this);
     mTouchArea->setZValue(-1);
-}
+}*/
 /*!
     Utility to connect widget signals to page.
 */
@@ -414,7 +547,7 @@
 {
     connect(widget, SIGNAL(finished()), SLOT(onWidgetFinished()));
     connect(widget, SIGNAL(faulted()), SLOT(onWidgetFaulted()));
-    connect(widget, SIGNAL(resized()), SLOT(onWidgetResized()));
+    connect(widget->visual(), SIGNAL(resized()), SLOT(onWidgetResized()));
     connect(widget, SIGNAL(available()), SLOT(onWidgetAvailable()));
     connect(widget, SIGNAL(unavailable()), SLOT(onWidgetUnavailable()));
 }
@@ -423,6 +556,7 @@
 */
 void HsPage::disconnectWidget(HsWidgetHost *widget)
 {
+    widget->visual()->disconnect(this);
     widget->disconnect(this);
 }
 /*!
@@ -437,6 +571,14 @@
     if (!mNewWidgets.removeOne(widget)) {
         mWidgets.removeOne(widget);
     }
+    if (widget){     
+        HsWidgetHostVisual *visual = widget->visual();
+        visual->setParentItem(0);
+        if (visual->scene()) {
+            visual->scene()->removeItem(visual);
+        }
+    }
+    
 
     disconnectWidget(widget);
     widget->remove();
@@ -455,15 +597,11 @@
 */
 void HsPage::onWidgetResized()
 {
-    if ( !layout() ) {
-        HsWidgetHost *widget = qobject_cast<HsWidgetHost *>(sender());
-        QRectF widgetRect = widget->geometry();
-        QRectF pageRect = HsScene::mainWindow()->layoutRect();
-        qreal widgetX = qBound(qreal(0), widgetRect.x(), pageRect.width() - widgetRect.width());
-        qreal widgetY = qBound(qreal(64), widgetRect.y(), pageRect.height() - widgetRect.height());
-        widget->setPos(widgetX, widgetY);
+    if (!visual()->layout()) {
+        HsWidgetHostVisual *widgetVisual = qobject_cast<HsWidgetHostVisual *>(sender());
+        widgetVisual->setPos(adjustedWidgetPosition(widgetVisual->geometry()));
     } else {
-        layout()->invalidate();
+        visual()->layout()->invalidate();
     }
 }
 /*!
@@ -472,13 +610,14 @@
 void HsPage::onWidgetAvailable()
 {
     HsWidgetHost *widget = qobject_cast<HsWidgetHost *>(sender());
+    HsWidgetHostVisual *widgetVisual(widget->visual());
 
     mUnavailableWidgets.removeOne(widget);
     mWidgets.append(widget);
 
-    widget->setParentItem(this);
+    widgetVisual->setParentItem(visual());
     widget->startWidget(isActivePage());
-    widget->show();
+    widgetVisual->show();
 }
 /*!
     Update internal bookkeeping and hide widget
@@ -486,6 +625,7 @@
 void HsPage::onWidgetUnavailable()
 {
     HsWidgetHost *widget = qobject_cast<HsWidgetHost *>(sender());
+    HsWidgetHostVisual *widgetVisual(widget->visual());
 
     if (mWidgets.contains(widget)) {
         mWidgets.removeOne(widget);
@@ -497,46 +637,154 @@
 
     mUnavailableWidgets.append(widget);
 
-    widget->hide();
-    widget->setParentItem(0);
+    widgetVisual->hide();
+    widgetVisual->setParentItem(0);
 }
+
 /*!
     Run positioning algorithm for widgets which don't have position on 
     target orientation. Otherwise set orientation positions for widgets.
 */
 void HsPage::onOrientationChanged(Qt::Orientation orientation)
 {
-    QRectF rect = HsScene::mainWindow()->layoutRect();
-
     HsWidgetPositioningOnOrientationChange *converter =
         HsWidgetPositioningOnOrientationChange::instance();
 
-    qreal chrome = 64;
-    QRectF from(0, chrome, rect.height(), rect.width() - chrome);
-    QRectF to(0, chrome, rect.width(), rect.height() - chrome);
+    Qt::Orientation orientationFrom = orientation == Qt::Vertical ? Qt::Horizontal : Qt::Vertical;
+    QRectF from = contentGeometry(orientationFrom);
+    QRectF to = contentGeometry(orientation);
 
     HsWidgetPresentationData presentation;
     presentation.orientation = orientation;
-
+    
+    HsWidgetHostVisual *visual(0);
+#ifdef HSWIDGETORGANIZER_ALGORITHM
+    QList<HsWidgetHost*> newWidgets;
+#endif //HSWIDGETORGANIZER_ALGORITHM    
     foreach (HsWidgetHost *widget, mWidgets) {
+        visual = widget->visual();
         if (!widget->getPresentation(presentation)) {
+#ifndef HSWIDGETORGANIZER_ALGORITHM
             QList<QRectF> geometries = converter->convert(
-                from, QList<QRectF>() << widget->geometry(), to);
-            widget->setGeometry(geometries.first());
+                from, QList<QRectF>() << visual->geometry(), to);
+            visual->setGeometry(geometries.first());
             widget->savePresentation();
+#else //HSWIDGETORGANIZER_ALGORITHM
+            newWidgets << widget;
+#endif //HSWIDGETORGANIZER_ALGORITHM
         } else {
-            widget->setPos(presentation.pos());
-            widget->setZValue(presentation.zValue);
+            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
+        }
+    }
+    
+#ifdef HSWIDGETORGANIZER_ALGORITHM
+    // sort new widgets in order
+    if (newWidgets.count()) {
+        // TODO: read from configuration? or just use height for portrait and width for landscape (currently only height is used)
+        sortOrder order(height);
+        if(orientation == Qt::Horizontal) {
+            order = width;
+        } 
+        sortWidgets(order, newWidgets);
+        // get rects for new widgets
+        QList<QRectF> newRects;
+        foreach (HsWidgetHost *newWidget, newWidgets) {
+            newRects << QRectF(QPointF(), newWidget->visual()->preferredSize());
+        }
+        
+        // get page rect
+        QRectF pageRect = contentGeometry();
+
+        // scan existing widgets rects
+        QList<QRectF> existingRects;
+        foreach (HsWidgetHost *widget, mWidgets) {
+            if (!newWidgets.contains(widget)) {
+                existingRects << QRectF(widget->visual()->pos(), widget->visual()->preferredSize());
+            }
+        }
+         
+        // calculate new widget positions with "stuck 'em all"-algorithm
+        HsWidgetPositioningOnWidgetAdd *algorithm =
+            HsWidgetPositioningOnWidgetAdd::instance();
+        QList<QRectF> calculatedRects =
+            algorithm->convert(pageRect, existingRects, newRects, QPointF());
+
+        for ( int i=0; i<newWidgets.count(); i++) {            
+            int j = mWidgets.indexOf(newWidgets.at(i));
+            mWidgets.at(j)->visual()->setGeometry(calculatedRects.at(i));
+            mWidgets.at(j)->savePresentation();            
+        }               
+    }    
+#endif //HSWIDGETORGANIZER_ALGORITHM
+    
+}
+
+void HsPage::onPageMarginChanged(const QString &value)
+{
+    if (value == "pageMargin") {
+        mPageMargin = HSCONFIGURATION_GET(pageMargin);
+        HsWidgetHostVisual *visual(0);
+        if (!mWidgets.isEmpty()) {
+            foreach (HsWidgetHost *widget, mWidgets) {
+                visual = widget->visual();
+                visual->setPos(adjustedWidgetPosition(visual->geometry()));
+                widget->savePresentation();
+            }
+        }
+
+        if (!mNewWidgets.isEmpty()) {
+            foreach (HsWidgetHost *widget, mNewWidgets) {
+                visual = widget->visual();
+                visual->setPos(adjustedWidgetPosition(visual->geometry()));
+                widget->savePresentation();
+            }
         }
     }
 }
-
+#ifdef HSWIDGETORGANIZER_ALGORITHM
+// TODO: sorting should be done in algorithm class, make widget<->rect mapping here and move sortWidgets function to algorithm side
 /*!
-    Clears new widgets list and resets layout.
+    Sorts widgets in height/width order
 */
-void HsPage::resetNewWidgets()
+void HsPage::sortWidgets(sortOrder order, QList<HsWidgetHost*> &widgets)
 {
-    mNewWidgets.clear();
-    setLayout(0);
+    QList<HsWidgetHost*> tmpWidgets;
+
+    for ( int i = 0; i < widgets.count(); i++) {
+        int index = 0;
+        // add first widget to sorted list
+        if (i == 0) {
+            tmpWidgets << widgets.at(i);
+        } else {
+            // go through existing widgets in the sorted list
+            for ( int j = 0; j < tmpWidgets.count(); j++) {
+                // sort widgets in height order
+                if (order == height) {
+                    /* if widgets heigth is smaller on already
+                       existing ones in the list -> increment index
+                    */
+                    if (widgets.at(i)->visual()->preferredHeight() <= tmpWidgets.at(j)->visual()->preferredHeight()) {
+                        index++;
+                    }
+                // sort widgets in width order
+                } else {
+                    /* if widgets width is smaller on already
+                       existing ones in the sorted list -> increment index
+                    */
+                    if (widgets.at(i)->visual()->preferredWidth() <= tmpWidgets.at(j)->visual()->preferredWidth()) {
+                        index++;
+                    }
+                }
+            }
+            // add widget to its correct index in sorted list
+            tmpWidgets.insert(index, widgets.at(i));
+        }
+    }
+    widgets = tmpWidgets;    
 }
-
+#endif //HSWIDGETORGANIZER_ALGORITHM

--- a/homescreenapp/hsdomainmodel/src/hspagenewwidgetlayout.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsdomainmodel/src/hspagenewwidgetlayout.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -15,17 +15,18 @@
 *
 */
 
-#include <HbInstance>
-
 #include "hsdomainmodeldatastructures.h"
 #include "hspagenewwidgetlayout.h"
 #include "hsscene.h"
+#include "hspage.h"
 #include "hsdatabase.h"
 #include "hswidgethost.h"
+#include "hswidgethostvisual.h"
 #include "hswallpaper.h"
 #include "hswidgetpositioningonwidgetadd.h"
 #include "hswidgetpositioningonorientationchange.h"
 #include "hsconfiguration.h"
+#include "hsgui.h"
 
 
 /*!
@@ -45,7 +46,7 @@
     : QGraphicsLayout(parent),    
     mTouchPoint(touchPoint)
 {
-    mSize = HsScene::mainWindow()->layoutRect().size();
+    mSize = HsGui::instance()->layoutRect().size();
 }
 
 /*!
@@ -68,7 +69,7 @@
 */
 QGraphicsLayoutItem *HsPageNewWidgetLayout::itemAt(int i) const
 {
-    return mNewWidgets.at(i);
+    return mNewWidgets.at(i)->visual();
 }
 
 /*!
@@ -102,10 +103,20 @@
 void HsPageNewWidgetLayout::setGeometry(const QRectF &rect)
 {
     QGraphicsLayout::setGeometry(rect);
-   
-    QList<QRectF> rects;
+
+#ifdef HSWIDGETORGANIZER_ALGORITHM
+    // sort new widgets in order
+    if (mNewWidgets.count() > 1) {
+        // TODO: read from configuration? or just use height for portrait and width for landscape (currently only height is used)
+        sortOrder order(height);
+        mNewWidgets = sortWidgets(order);
+    }
+#endif
+
+    // get rects for new widgets
+    QList<QRectF> newRects;
     foreach (HsWidgetHost *newWidget, mNewWidgets) {
-        rects << QRectF(QPointF(), newWidget->preferredSize());
+        newRects << QRectF(QPointF(), newWidget->visual()->preferredSize());
     }
 
     /* if there is touch point defined (widget added from context menu)
@@ -113,29 +124,38 @@
        -> set widget center point to this touch point
     */
     if (mTouchPoint != QPointF() && mNewWidgets.count() == 1) {
-        QRectF pageRect = HsScene::mainWindow()->layoutRect();
-        qreal widgetX = qBound(qreal(0), mTouchPoint.x() - rects.at(0).width() / 2, pageRect.width() - rects.at(0).width());
-        qreal widgetY = qBound(qreal(64), mTouchPoint.y() - rects.at(0).height() / 2, pageRect.height() - rects.at(0).height());
-        mNewWidgets.at(0)->setGeometry(widgetX,
-                                       widgetY,
-                                       rects.at(0).width(), 
-                                       rects.at(0).height());
+        QRectF widgetRect = newRects.at(0);
+        widgetRect.moveCenter(mTouchPoint);
+        widgetRect.moveTopLeft(HsScene::instance()->activePage()->adjustedWidgetPosition(widgetRect));
+        mNewWidgets.at(0)->visual()->setGeometry(widgetRect);
         /* we have to save widget presentation data here after drawing
            to get correct position for later use
         */
         mNewWidgets.at(0)->savePresentation();
     }
-    // otherwise calculate position with algorithm
+    // otherwise calculate widget positions with algorithm
     else {
+        // get page rect
+        QRectF pageRect = HsScene::instance()->activePage()->contentGeometry();
+
+        // scan existing widgets rects
+        QList<HsWidgetHost*> existingWidgets;
+        existingWidgets = HsScene::instance()->activePage()->widgets();
+        QList<QRectF> existingRects;
+        foreach (HsWidgetHost *widget, existingWidgets) {
+            if (!mNewWidgets.contains(widget)) {
+                existingRects << QRectF(widget->visual()->pos(), widget->visual()->preferredSize());
+            }
+        }
+         
+        // calculate new widget positions with "stuck 'em all"-algorithm
         HsWidgetPositioningOnWidgetAdd *algorithm =
             HsWidgetPositioningOnWidgetAdd::instance();
-        QRectF pageRect = HsScene::mainWindow()->layoutRect();
-        pageRect.adjust( (qreal)0,(qreal)64,(qreal)0,(qreal)0);
         QList<QRectF> calculatedRects =
-            algorithm->convert(pageRect, rects, QPointF());
+            algorithm->convert(pageRect, existingRects, newRects, QPointF());
 
         for ( int i=0; i<mNewWidgets.count(); i++) {
-            mNewWidgets.at(i)->setGeometry(calculatedRects.at(i));
+            mNewWidgets.at(i)->visual()->setGeometry(calculatedRects.at(i));
             mNewWidgets.at(i)->savePresentation();
         }
     }
@@ -148,3 +168,46 @@
 {
     mNewWidgets.append(item);
 }
+
+#ifdef HSWIDGETORGANIZER_ALGORITHM
+// TODO: sorting should be done in algorithm class, make widget<->rect mapping here and move sortWidgets function to algorithm side
+/*!
+    Sorts widgets in height/width order
+*/
+QList<HsWidgetHost*> HsPageNewWidgetLayout::sortWidgets(sortOrder order)
+{
+    QList<HsWidgetHost*> tmpWidgets;
+
+    for ( int i = 0; i < mNewWidgets.count(); i++) {
+        int index = 0;
+        // add first widget to sorted list
+        if (i == 0) {
+            tmpWidgets << mNewWidgets.at(i);
+        } else {
+            // go through existing widgets in the sorted list
+            for ( int j = 0; j < tmpWidgets.count(); j++) {
+                // sort widgets in height order
+                if (order == height) {
+                    /* if widgets heigth is smaller on already
+                       existing ones in the list -> increment index
+                    */
+                    if (mNewWidgets.at(i)->visual()->preferredHeight() <= tmpWidgets.at(j)->visual()->preferredHeight()) {
+                        index++;
+                    }
+                // sort widgets in width order
+                } else {
+                    /* if widgets width is smaller on already
+                       existing ones in the sorted list -> increment index
+                    */
+                    if (mNewWidgets.at(i)->visual()->preferredWidth() <= tmpWidgets.at(j)->visual()->preferredWidth()) {
+                        index++;
+                    }
+                }
+            }
+            // add widget to its correct index in sorted list
+            tmpWidgets.insert(index, mNewWidgets.at(i));
+        }
+    }
+    return tmpWidgets;
+}
+#endif // HSWIDGETORGANIZER_ALGORITHM
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsdomainmodel/src/hspagevisual.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,73 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#include "hspagevisual.h"
+#include "hspagetoucharea.h"
+
+
+
+/*!
+    \class HsPageVisual
+    \ingroup group_hsdomainmodel
+    \brief Represents a page in the framework.
+    HsPageVisual contains group of widgets. HsPageVisual can have a wallpaper.
+*/
+
+/*!
+    Constructor.
+
+    \a parent Owner.
+    \a aFlags Window flags.
+*/
+HsPageVisual::HsPageVisual(QGraphicsItem* parent)
+    : HbWidget(parent),
+      mTouchArea(0)
+{
+    setFlag(QGraphicsItem::ItemHasNoContents);
+    setSizePolicy(QSizePolicy(QSizePolicy::Ignored,
+                              QSizePolicy::Ignored));
+
+    setupTouchArea();
+}
+
+/*!
+    Destructor.
+*/
+HsPageVisual::~HsPageVisual()
+{
+}
+
+void HsPageVisual::setGeometry(const QRectF &rect)
+{
+    if (mTouchArea) {
+        mTouchArea->resize(rect.size());
+    }
+
+    HbWidget::setGeometry(rect);
+}
+
+/*!
+    Create touch area for page.
+*/
+void HsPageVisual::setupTouchArea()
+{
+    mTouchArea = new HsPageTouchArea(this);
+    mTouchArea->setZValue(-1);
+}
+
+
+

--- a/homescreenapp/hsdomainmodel/src/hsscene.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsdomainmodel/src/hsscene.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -164,29 +164,41 @@
         return true;
     }
 
-    int index = mPages.indexOf(page) + 1;
+    int nextIndex = mPages.indexOf(page) + 1;
 
     HsDatabase *db = HsDatabase::instance();
     db->transaction();
-
+    // update page indexes
     HsPageData data;
-    for (int i = index; i < mPages.count(); ++i) {
-        data.id = mPages.at(i)->databaseId();
-        data.indexPosition = i - 1;
+    int pageCount(mPages.count());
+    for (;nextIndex < pageCount; ++nextIndex) {
+        data.id = mPages.at(nextIndex)->databaseId();
+        data.indexPosition = nextIndex - 1;
         if (!db->updatePage(data)) {
             db->rollback();
             return false;
         }
     }
-
+    // page will remove itself from database
     if (!page->deleteFromDatabase()) {
         db->rollback();
         return false;
     }
 
     db->commit();
-
+    // update internal list
+    int index = mPages.indexOf(page);
+    bool lastPage(mPages.last() == page);
     mPages.removeOne(page);
+    if (mPages.isEmpty()) {
+        mActivePage = NULL;
+    }else if (mActivePage == page) {
+        if (lastPage) {
+            index--;
+        }
+        setActivePageIndex(index);
+    }
+    
     return true;
 }
 
@@ -309,18 +321,18 @@
 /*!
     Return main window.
 */
-HbMainWindow *HsScene::mainWindow()
+/*HbMainWindow *HsGui::instance()
 {
     return hbInstance->allMainWindows().first();
 }
-
+*/
 /*!
     Return current orientation.
 */
-Qt::Orientation HsScene::orientation()
+/*Qt::Orientation HsGui::instance()->orientation()
 {
     return mainWindow()->orientation();
-}
+}*/
 
 /*!
     Listens for application background/foreground changes.

--- a/homescreenapp/hsdomainmodel/src/hswallpaper.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsdomainmodel/src/hswallpaper.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -28,6 +28,8 @@
 #include "hspage.h"
 #include "hswallpaperloader.h"
 #include "hsconfiguration.h"
+#include "hsgui.h"
+
 
 /*!
     \class HsWallpaper
@@ -58,7 +60,7 @@
     layout->addItem(mIconItem);
     setLayout(layout);
 
-    connect(HsScene::mainWindow(),
+    connect(HsGui::instance(),
         SIGNAL(orientationChanged(Qt::Orientation)),
         SLOT(updateIconItem(Qt::Orientation)));
 }
@@ -110,7 +112,7 @@
     mLandscapeImagePath = infos.first().absoluteFilePath();
     mPortraitImagePath = infos.last().absoluteFilePath();
 
-    updateIconItem(HsScene::orientation());
+    updateIconItem(HsGui::instance()->orientation());
 }
 
 /*!
@@ -150,7 +152,7 @@
     mLandscapeImagePath = infos.first().absoluteFilePath();
     mPortraitImagePath = infos.last().absoluteFilePath();
 
-    updateIconItem(HsScene::orientation());
+    updateIconItem(HsGui::instance()->orientation());
     return true;
 }

--- a/homescreenapp/hsdomainmodel/src/hswidgetcomponentregistry.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsdomainmodel/src/hswidgetcomponentregistry.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -25,13 +25,12 @@
 #include "caentry.h" 
 #include "cadefs.h"
 #include "canotifier.h"
-#include "hsscene.h"
 
 #include <QSignalMapper>
 #include <QDir>
 #include <QCoreApplication>
 
-#include <HbMainWindow>
+//#include <HbMainWindow>
 
 /*!
     \class HsWidgetComponentRegistry
@@ -58,7 +57,7 @@
 {
     if (!mInstance) {
         mInstance = new HsWidgetComponentRegistry;
-        mInstance->setParent(HsScene::mainWindow());
+        mInstance->setParent(QCoreApplication::instance());
     }
     return mInstance;
 }

--- a/homescreenapp/hsdomainmodel/src/hswidgethost.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsdomainmodel/src/hswidgethost.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -19,31 +19,20 @@
 #include <QStateMachine>
 #include <QState>
 #include <QFinalState>
-#include <QGraphicsLinearLayout>
-#include <QParallelAnimationGroup>
-#include <QPropertyAnimation>
-#include <QGraphicsDropShadowEffect>
-#include <QGraphicsSceneResizeEvent>
-#include <QGesture>
-#include <QGraphicsScene>
-
-#include <qservicemanager.h>
-#include <qservicefilter.h>
-#include <qserviceinterfacedescriptor.h>
-
-#include <HbInstantFeedback>
-#include <HbTouchArea>
 
 #include "hsdatabase.h"
 #include "hsdomainmodeldatastructures.h"
 #include "hsscene.h"
 #include "hspage.h"
 #include "hswidgethost.h"
-#include "hswidgettoucharea.h"
+#include "hswidgethostvisual.h"
+#include "hshostedwidgetfactory.h"
+
 #include "hswidgetcomponentregistry.h"
 #include "hswidgetcomponent.h"
 #include "hsconfiguration.h"
 #include "hscontentservice.h"
+#include "hsgui.h"
 
 // Helper macros for connecting state entry and exit actions.
 #define ENTRY_ACTION(state, action) \
@@ -51,7 +40,7 @@
 #define EXIT_ACTION(state, action) \
     connect(state, SIGNAL(exited()), SLOT(action()));
 
-QTM_USE_NAMESPACE
+
 
 
 /*!
@@ -64,8 +53,9 @@
     Constructs a new widget host with given \a databaseId and
     \a parent item.
 */
-HsWidgetHost::HsWidgetHost(int databaseId, QGraphicsItem *parent)
-  : HbWidget(parent),
+HsWidgetHost::HsWidgetHost(int databaseId, QObject *parent)
+  : QObject(parent),
+    mVisual(new HsWidgetHostVisual),
     mDatabaseId(databaseId),
     mStateMachine(0),
     mWidget(0),
@@ -73,19 +63,8 @@
     mComponent(0),
     mIsFinishing(false)
 {
-    setFlag(QGraphicsItem::ItemClipsChildrenToShape);
-    setFlag(QGraphicsItem::ItemHasNoContents);
-
-    grabGesture(Qt::TapGesture);
-    grabGesture(Qt::TapAndHoldGesture);
-    grabGesture(Qt::PanGesture);
-    grabGesture(Qt::PinchGesture);
-    grabGesture(Qt::SwipeGesture);
-    grabGesture(Qt::CustomGesture);
-    
-    setupTouchArea();
-    setupEffects();
     setupStates();
+    mVisual->setVisualModel(this);
 }
 
 /*!
@@ -93,6 +72,7 @@
 */
 HsWidgetHost::~HsWidgetHost()
 {
+    delete mVisual;
 }
 
 /*!
@@ -145,6 +125,7 @@
     }
 
     mPage = page;
+    
     return true;
 }
  
@@ -163,7 +144,7 @@
 */
 bool HsWidgetHost::loadPresentation()
 {
-    return loadPresentation(HsScene::orientation());
+    return loadPresentation(HsGui::instance()->orientation());
 }
 
 /*!
@@ -180,8 +161,8 @@
     if (!db->widgetPresentation(data)) {
         return false;
     }
-    setPos(data.x, data.y);
-    setZValue(data.zValue);
+    mVisual->setPos(data.x, data.y);
+    mVisual->setZValue(data.zValue);
     return true;
 }
 
@@ -191,7 +172,7 @@
 */
 bool HsWidgetHost::savePresentation()
 {
-    return savePresentation(HsScene::orientation());
+    return savePresentation(HsGui::instance()->orientation());
 }
 
 /*!
@@ -204,8 +185,8 @@
         
     HsWidgetPresentationData data;
     data.orientation = orientation;
-    data.setPos(pos());
-    data.zValue = zValue();
+    data.setPos(mVisual->pos());
+    data.zValue = mVisual->zValue();
     data.widgetId = mDatabaseId;
     return db->setWidgetPresentation(data);
 }
@@ -245,29 +226,9 @@
     return db->deleteWidgetPresentation(mDatabaseId, orientation);
 }
 
-/*!
-    Reimplemented from QGraphicsItem. Returns the shape of the
-    this widget host. The shape is computed based on the contained
-    widget.
-*/
-QPainterPath HsWidgetHost::shape() const
+HsWidgetHostVisual *HsWidgetHost::visual() const
 {
-    QPainterPath path;
-
-    if (mWidget) {
-        QRectF currRect = rect();
-        path = mWidget->shape();
-
-        QRectF pathRect(path.boundingRect());
-
-        if (pathRect.width() > currRect.width()
-            || pathRect.height() > currRect.height()) {
-            QPainterPath newPath(currRect.topLeft());
-            newPath.addRect(currRect);
-            path = path.intersected(newPath);
-        }
-    }
-    return path;
+    return mVisual;
 }
 
 /*!
@@ -327,11 +288,7 @@
     host has moved to faulted state.
 */
 
-/*!
-    \fn HsWidgetHost::resized()
-    Notifies the home screen framework that this widget
-    host has resized itself.
-*/
+
 
 /*!
     \fn HsWidgetHost::available()
@@ -424,29 +381,7 @@
 */
 void HsWidgetHost::startDragEffect()
 {
-    /* TODO: Uncomment after the Qt bug has been fixed.
-    QGraphicsDropShadowEffect *effect =
-        static_cast<QGraphicsDropShadowEffect *>(graphicsEffect());
-    */
-    HbInstantFeedback::play(HbFeedback::ItemPick);
-
-    setTransformOriginPoint(rect().center());
-
-    QParallelAnimationGroup *animationGroup = new QParallelAnimationGroup();
-
-    QPropertyAnimation *animation = new QPropertyAnimation(this, "scale");
-    animation->setDuration(HSCONFIGURATION_GET(widgetDragEffectDuration));
-    animation->setEndValue(1.1);
-    animationGroup->addAnimation(animation);
-
-    /* TODO: Uncomment after the Qt bug has been fixed.
-    animation = new QPropertyAnimation(effect, "offset");
-    animation->setDuration(200);
-    animation->setEndValue(QPointF(8 ,8));
-    animationGroup->addAnimation(animation);
-    */
-
-    animationGroup->start(QAbstractAnimation::DeleteWhenStopped);
+   mVisual->startDragEffect();
 }
 
 /*!
@@ -454,98 +389,7 @@
 */
 void HsWidgetHost::startDropEffect()
 {
-    /* TODO: Uncomment after the Qt bug has been fixed.
-    QGraphicsDropShadowEffect *effect =
-        static_cast<QGraphicsDropShadowEffect *>(graphicsEffect());
-    */
-    HbInstantFeedback::play(HbFeedback::ItemDrop);
-
-    QParallelAnimationGroup *animationGroup = new QParallelAnimationGroup;
-
-    QPropertyAnimation *animation = new QPropertyAnimation(this, "scale");
-    animation->setDuration(HSCONFIGURATION_GET(widgetDropEffectDuration));
-    animation->setEndValue(1);
-    animationGroup->addAnimation(animation);
-
-    /* TODO: Uncomment after the Qt bug has been fixed.
-    animation = new QPropertyAnimation(effect, "offset");
-    animation->setDuration(200);
-    animation->setEndValue(QPointF(3, 3));
-    animationGroup->addAnimation(animation);
-    */
-
-    animationGroup->start(QAbstractAnimation::DeleteWhenStopped);
-}
-
-/*!
-    Reimplemented from QObject for monitoring changes in 
-    contained widget's size.
-*/
-bool HsWidgetHost::eventFilter(QObject *watched, QEvent *event)
-{
-    if (event->type() == QEvent::GraphicsSceneResize ) {
-        QGraphicsSceneResizeEvent *resizeEvent = 
-            static_cast<QGraphicsSceneResizeEvent *>(event);
-        setNewSize(resizeEvent->newSize());
-        emit resized();
-    }
-    return HbWidget::eventFilter(watched, event);
-}
-
-/*!
-    Reimplemented from HbWidget for pan gesture handling.
-*/
-void HsWidgetHost::gestureEvent(QGestureEvent *event)
-{
-    HsScene *scene = HsScene::instance();    
-    QGesture *gesture = event->gesture(Qt::PanGesture);
-    if (gesture) {
-        switch (gesture->state()) {
-            case Qt::GestureStarted:
-                grabMouse();
-                emit scene->pagePanStarted(event);
-                break;
-            case Qt::GestureUpdated:
-                emit scene->pagePanUpdated(event);
-                break;
-            case Qt::GestureFinished:
-            case Qt::GestureCanceled:
-                ungrabMouse();
-                emit scene->pagePanFinished(event);
-                break;
-            default:
-                break;
-        }
-    }
-}
-
-/*!
-    \fn HsWidgetHost::mousePressEvent(QGraphicsSceneMouseEvent *)
-    Reimplemented from QGraphicsItem for eating all mouse presses.
-*/
-
-/*!
-    Configures the touch are for this widget host.
-*/
-void HsWidgetHost::setupTouchArea()
-{
-    mTouchArea = new HsWidgetTouchArea(this);
-    mTouchArea->setZValue(1);
-}
-
-/*!
-    Configures the effects for this widget host.
-*/
-void HsWidgetHost::setupEffects()
-{
-    /* TODO: Uncomment after the Qt bug has been fixed.
-    QGraphicsDropShadowEffect *effect =
-        new QGraphicsDropShadowEffect(this);
-    effect->setColor(QColor(0, 0, 0, 150));
-    effect->setBlurRadius(5);
-    effect->setOffset(3);
-    setGraphicsEffect(effect);
-    */
+    mVisual->startDropEffect();
 }
 
 /*!
@@ -681,15 +525,6 @@
     return index >= 0;
 }
 
-/*!
-    Resizes this widget host to the given \a size.
-*/
-void HsWidgetHost::setNewSize(const QSizeF &size)
-{
-    mTouchArea->resize(size);
-    resize(size);
-    setPreferredSize(size);
-}
 
 /*!
     Assigns preferences for the contained widget.
@@ -752,26 +587,21 @@
 */
 void HsWidgetHost::action_load()
 {
-    QServiceManager manager;
-    QServiceFilter filter("com.nokia.symbian.IHomeScreenWidget");
-    filter.setServiceName(mComponent->uri());
-    QList<QServiceInterfaceDescriptor> interfaces = manager.findInterfaces(filter);
-    if (interfaces.isEmpty()) {
+    mWidget = HsHostedWidgetFactory::instance()->createWidget(mComponent->uri());
+    if (!mWidget) {
         emit event_faulted();
         return;
     }
-
-    QObject *widgetObject = manager.loadInterface(interfaces.first());
-    mWidget = qobject_cast<QGraphicsWidget *>(widgetObject);
-
-    if (!mWidget ||
-        !setMethod("onShow()", mOnShowMethod) ||
+    // must have fuctions
+    if (!setMethod("onShow()", mOnShowMethod) || 
         !setMethod("onHide()", mOnHideMethod)) {
+        delete mWidget;
         mWidget = 0;
-        delete widgetObject;
         emit event_faulted();
         return;
     }
+    
+    mVisual->setWidget(mWidget);
 
     setMethod("onInitialize()", mOnInitializeMethod);
     setMethod("onUninitialize()", mOnUninitializeMethod);
@@ -792,21 +622,12 @@
             SLOT(onError()), Qt::QueuedConnection);
     }
 
-    mWidget->installEventFilter(this);
-
-    setMinimumSize(HSCONFIGURATION_GET(minimumWidgetSizeInPixels));
-    setMaximumSize(HSCONFIGURATION_GET(maximumWidgetSizeInPixels));
-    
     loadPresentation();
-
-    mWidget->setParentItem(this);
-
-    setNewSize(mWidget->size());
-
+   
     QString objName(mComponent->uri());
     objName.append(":");
     objName.append(QString::number(mDatabaseId));
-    setObjectName(objName);
+    mVisual->setObjectName(objName);
 }
 
 /*!
@@ -814,6 +635,7 @@
 */
 void HsWidgetHost::action_unload()
 {
+    mVisual->setWidget(0);
     delete mWidget;
     mWidget = 0;
 		// This is needed because QServicePluginCleanup is

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsdomainmodel/src/hswidgethostvisual.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,263 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#include <QGraphicsLinearLayout>
+#include <QParallelAnimationGroup>
+#include <QPropertyAnimation>
+#include <QGraphicsDropShadowEffect>
+#include <QGraphicsSceneResizeEvent>
+#include <QGesture>
+#include <QGraphicsScene>
+
+
+#include <HbInstantFeedback>
+#include <HbTouchArea>
+
+#include "hswidgethostvisual.h"
+#include "hswidgethost.h"
+#include "hsscene.h"
+#include "hsconfiguration.h"
+#include "hswidgettoucharea.h"
+
+
+/*!
+    \class HsWidgetHostVisual
+    \ingroup group_hsdomainmodel
+    \brief Each widget is controlled by the home screen framework through a widget host.
+*/
+
+/*!
+    Constructs a new widget host with given \a databaseId and
+    \a parent item.
+*/
+HsWidgetHostVisual::HsWidgetHostVisual(QGraphicsItem *parent)
+  : HbWidget(parent),mWidget(0)
+  
+{
+    setFlag(QGraphicsItem::ItemClipsChildrenToShape);
+    setFlag(QGraphicsItem::ItemHasNoContents);
+
+    grabGesture(Qt::TapGesture);
+    grabGesture(Qt::TapAndHoldGesture);
+    grabGesture(Qt::PanGesture);
+    grabGesture(Qt::PinchGesture);
+    grabGesture(Qt::SwipeGesture);
+    grabGesture(Qt::CustomGesture);
+    
+    setupTouchArea();
+    setupEffects();
+    
+    setMinimumSize(HSCONFIGURATION_GET(minimumWidgetSizeInPixels));
+    setMaximumSize(HSCONFIGURATION_GET(maximumWidgetSizeInPixels));
+    
+}
+
+/*!
+    Destructor.
+*/
+HsWidgetHostVisual::~HsWidgetHostVisual()
+{
+}
+
+
+/*!
+    Reimplemented from QGraphicsItem. Returns the shape of the
+    this widget host. The shape is computed based on the contained
+    widget.
+*/
+QPainterPath HsWidgetHostVisual::shape() const
+{
+    QPainterPath path;
+
+    if (mWidget) {
+        QRectF currRect = rect();
+        path = mWidget->shape();
+
+        QRectF pathRect(path.boundingRect());
+
+        if (pathRect.width() > currRect.width()
+            || pathRect.height() > currRect.height()) {
+            QPainterPath newPath(currRect.topLeft());
+            newPath.addRect(currRect);
+            path = path.intersected(newPath);
+        }
+    }
+    return path;
+}
+void HsWidgetHostVisual::setWidget(QObject *widget)
+{
+    mWidget = qobject_cast<QGraphicsWidget *>(widget);
+    if (mWidget) {
+        mWidget->installEventFilter(this);
+        mWidget->setParentItem(this);
+        setNewSize(mWidget->size());
+    }
+}
+
+void HsWidgetHostVisual::setVisualModel(HsWidgetHost *model)
+{
+    mVisualModel = model;
+}
+HsWidgetHost *HsWidgetHostVisual::visualModel() const
+{
+    return mVisualModel;
+}
+/*!
+    Starts the drag effect.
+*/
+void HsWidgetHostVisual::startDragEffect()
+{
+    /* TODO: Uncomment after the Qt bug has been fixed.
+    QGraphicsDropShadowEffect *effect =
+        static_cast<QGraphicsDropShadowEffect *>(graphicsEffect());
+    */
+    HbInstantFeedback::play(HbFeedback::ItemPick);
+
+    setTransformOriginPoint(rect().center());
+
+    QParallelAnimationGroup *animationGroup = new QParallelAnimationGroup();
+
+    QPropertyAnimation *animation = new QPropertyAnimation(this, "scale");
+    animation->setDuration(HSCONFIGURATION_GET(widgetDragEffectDuration));
+    animation->setEndValue(1.1);
+    animationGroup->addAnimation(animation);
+
+    /* TODO: Uncomment after the Qt bug has been fixed.
+    animation = new QPropertyAnimation(effect, "offset");
+    animation->setDuration(200);
+    animation->setEndValue(QPointF(8 ,8));
+    animationGroup->addAnimation(animation);
+    */
+
+    animationGroup->start(QAbstractAnimation::DeleteWhenStopped);
+}
+
+/*!
+    Starts the drop effect.
+*/
+void HsWidgetHostVisual::startDropEffect()
+{
+    /* TODO: Uncomment after the Qt bug has been fixed.
+    QGraphicsDropShadowEffect *effect =
+        static_cast<QGraphicsDropShadowEffect *>(graphicsEffect());
+    */
+    HbInstantFeedback::play(HbFeedback::ItemDrop);
+
+    QParallelAnimationGroup *animationGroup = new QParallelAnimationGroup;
+
+    QPropertyAnimation *animation = new QPropertyAnimation(this, "scale");
+    animation->setDuration(HSCONFIGURATION_GET(widgetDropEffectDuration));
+    animation->setEndValue(1);
+    animationGroup->addAnimation(animation);
+
+    /* TODO: Uncomment after the Qt bug has been fixed.
+    animation = new QPropertyAnimation(effect, "offset");
+    animation->setDuration(200);
+    animation->setEndValue(QPointF(3, 3));
+    animationGroup->addAnimation(animation);
+    */
+
+    animationGroup->start(QAbstractAnimation::DeleteWhenStopped);
+}
+/*!
+    \fn HsWidgetHost::resized()
+    Notifies the home screen framework that this widget
+    host has resized itself.
+*/
+
+/*!
+    Reimplemented from QObject for monitoring changes in 
+    contained widget's size.
+*/
+bool HsWidgetHostVisual::eventFilter(QObject *watched, QEvent *event)
+{
+    if (event->type() == QEvent::GraphicsSceneResize ) {
+        QGraphicsSceneResizeEvent *resizeEvent = 
+            static_cast<QGraphicsSceneResizeEvent *>(event);
+        setNewSize(resizeEvent->newSize());
+        emit resized();
+    }
+    return HbWidget::eventFilter(watched, event);
+}
+
+/*!
+    Reimplemented from HbWidget for pan gesture handling.
+*/
+void HsWidgetHostVisual::gestureEvent(QGestureEvent *event)
+{
+    HsScene *scene = HsScene::instance();    
+    QGesture *gesture = event->gesture(Qt::PanGesture);
+    if (gesture) {
+        switch (gesture->state()) {
+            case Qt::GestureStarted:
+                grabMouse();
+                emit scene->pagePanStarted(event);
+                break;
+            case Qt::GestureUpdated:
+                emit scene->pagePanUpdated(event);
+                break;
+            case Qt::GestureFinished:
+            case Qt::GestureCanceled:
+                ungrabMouse();
+                emit scene->pagePanFinished(event);
+                break;
+            default:
+                break;
+        }
+    }
+}
+
+/*!
+    \fn HsWidgetHostVisual::mousePressEvent(QGraphicsSceneMouseEvent *)
+    Reimplemented from QGraphicsItem for eating all mouse presses.
+*/
+
+/*!
+    Configures the touch are for this widget host.
+*/
+void HsWidgetHostVisual::setupTouchArea()
+{
+    mTouchArea = new HsWidgetTouchArea(this);
+    mTouchArea->setZValue(1);
+}
+
+/*!
+    Configures the effects for this widget host.
+*/
+void HsWidgetHostVisual::setupEffects()
+{
+    /* TODO: Uncomment after the Qt bug has been fixed.
+    QGraphicsDropShadowEffect *effect =
+        new QGraphicsDropShadowEffect(this);
+    effect->setColor(QColor(0, 0, 0, 150));
+    effect->setBlurRadius(5);
+    effect->setOffset(3);
+    setGraphicsEffect(effect);
+    */
+}
+
+
+/*!
+    Resizes this widget host to the given \a size.
+*/
+void HsWidgetHostVisual::setNewSize(const QSizeF &size)
+{
+    mTouchArea->resize(size);
+    resize(size);
+    setPreferredSize(size);
+}
+

--- a/homescreenapp/hsdomainmodel/src/hswidgettoucharea.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsdomainmodel/src/hswidgettoucharea.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -24,12 +24,12 @@
 #include <HbPanGesture>
 
 #include "hswidgettoucharea.h"
-#include "hswidgethost.h"
+#include "hswidgethostvisual.h"
 #include "hsscene.h"
 
-HsWidgetTouchArea::HsWidgetTouchArea(HsWidgetHost *widgetHost)
-  : HbTouchArea(widgetHost),
-    mWidgetHost(widgetHost)
+HsWidgetTouchArea::HsWidgetTouchArea(HsWidgetHostVisual *visual)
+  : HbTouchArea(visual),
+    mWidgetHostVisual(visual)
 {
     grabGesture(Qt::TapAndHoldGesture);
 }
@@ -44,14 +44,14 @@
     switch (event->type()) {
         case QEvent::TouchBegin:
         case QEvent::GraphicsSceneMousePress:
-            emit scene->widgetTapStarted(mWidgetHost);
+            emit scene->widgetTapStarted(mWidgetHostVisual->visualModel());
             break;        
         case QEvent::TouchEnd:
             {
                 ungrabGesture(Qt::PanGesture);
                 ungrabMouse();
                 QPointF scenePos = static_cast<QTouchEvent *>(event)->touchPoints().first().scenePos();
-                emit scene->widgetMoveFinished(scenePos, mWidgetHost);
+                emit scene->widgetMoveFinished(scenePos, mWidgetHostVisual->visualModel());
             }
             break;
         case QEvent::GraphicsSceneMouseRelease:
@@ -59,7 +59,7 @@
                 ungrabGesture(Qt::PanGesture);
                 ungrabMouse();
                 QPointF scenePos = static_cast<QGraphicsSceneMouseEvent *>(event)->scenePos();
-                emit scene->widgetMoveFinished(scenePos, mWidgetHost);
+                emit scene->widgetMoveFinished(scenePos, mWidgetHostVisual->visualModel());
             }
             break;    
         default:
@@ -71,7 +71,7 @@
 
 QPainterPath HsWidgetTouchArea::shape() const
 {       
-    return mWidgetHost->shape();
+    return mWidgetHostVisual->shape();
 }
 
 void HsWidgetTouchArea::gestureEvent(QGestureEvent *event)
@@ -84,7 +84,7 @@
         if (gesture->state() == Qt::GestureFinished) {
             grabGesture(Qt::PanGesture);
             grabMouse();
-            emit scene->widgetTapAndHoldFinished(event, mWidgetHost);
+            emit scene->widgetTapAndHoldFinished(event, mWidgetHostVisual->visualModel());
         }
         return;
     }
@@ -96,12 +96,12 @@
         switch (gesture->state()) {
             case Qt::GestureStarted:
             case Qt::GestureUpdated:
-                emit scene->widgetMoveUpdated(scenePos, mWidgetHost);
+                emit scene->widgetMoveUpdated(scenePos, mWidgetHostVisual->visualModel());
                 break;
             case Qt::GestureCanceled:
             case Qt::GestureFinished:
                 ungrabGesture(Qt::PanGesture);
-                emit scene->widgetMoveFinished(scenePos, mWidgetHost);
+                emit scene->widgetMoveFinished(scenePos, mWidgetHostVisual->visualModel());
                 break;
             default:
                 break;

--- a/homescreenapp/hsmenuclientplugin/hsmenuclientplugin.pro	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsmenuclientplugin/hsmenuclientplugin.pro	Wed Aug 18 09:40:07 2010 +0300
@@ -23,20 +23,17 @@
 
 LIBS += -lcaclient
 
-INCLUDEPATH += inc
+INCLUDEPATH +=  inc \
+				../../homescreen_plat/homescreenclient_api
 
-HEADERS +=  inc/hsmenuclient.h \
-            inc/hsmenuclientplugin.h \
+HEADERS +=  ../../homescreen_plat/homescreenclient_api/hsmenuclient.h \
+            inc/hsmenuclientplugin.h
 
 SOURCES +=  src/hsmenuclient.cpp \
-            src/hsmenuclientplugin.cpp \
+            src/hsmenuclientplugin.cpp
 
 symbian: {
 	TARGET.UID3 = 0x20028715
-#export interface header to platform
-BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include <platform_paths.hrh>"
-BLD_INF_RULES.prj_exports += "inc/hsmenuclient.h \
-	APP_LAYER_PLATFORM_EXPORT_PATH(hsmenuclient.h)"
 }
 
 include(../common.pri)

--- a/homescreenapp/hsmenuclientplugin/inc/hsmenuclient.h	Tue Jul 06 14:06:53 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +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: hsmenuclient.h
- *
- */
-
-#ifndef HSMENUCLIENT_H
-#define HSMENUCLIENT_H
-
-#include <QObject>
-#include <QVariant>
-#include <qservicemanager.h>
-
-QTM_USE_NAMESPACE
-
-//mandatory keys
-const QString hsItemName("item:name");
-// or for localized name
-const QString hsItemLocName("item:locname");
-
-const QString hsitemLaunchUri("item:launchuri");
-const QString hsitemPublisherId("item:publisherId");
-
-//not mandatory
-const QString hsItemWidgetUri("widget:uri");
-const QString hsItemDescription("item:description");
-// or for localized name
-const QString hsItemLocDescription("item:locdescription");
-
-//for icon - not mandatory
-const QString hsIconFileName("icon:filename");//to display specific icon from file
-const QString hsIconName("icon:name");// HbIcon
-const QString hsIconApplicationId("icon:applicationid"); // icon from associated application
-
-
-class HsMenuClientPrivate;
-
-class HsMenuClient : public QObject
-{
-    Q_OBJECT
-
-public:
-    HsMenuClient(QObject *parent = 0);
-    ~HsMenuClient();
-public slots:
-   bool add(const QVariantMap &entryPreference = QVariantMap());
-   bool remove(const QVariantMap &queryPreference = QVariantMap()) const;
-   
-   QList<QVariantMap > getList(const QVariantMap &queryPreference = QVariantMap());
-  
-private:
-   Q_DISABLE_COPY(HsMenuClient)
-    /**
-     * Pointer to a private implementation.
-     */
-   HsMenuClientPrivate * const m_d;
-};
-
-
-
-#endif // HSMENUCLIENT_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsutils/inc/hsmenudialogfactory.h	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,44 @@
+/*
+* 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:  Menu Dialog
+*
+*/
+
+
+#ifndef HSMENUDIALOG_H
+#define HSMENUDIALOG_H
+
+#include <QScopedPointer>
+
+class QStringList;
+class HbAction;
+class HbMessageBox;
+
+#include "hsutils_global.h"
+
+class HSUTILS_EXPORT HsMenuDialogFactory
+{
+public:
+    enum Options { OkCancel, Close };
+
+    virtual HbMessageBox *create(const QString &text,
+                                 Options options = OkCancel) const;
+    virtual ~HsMenuDialogFactory();
+private:
+    void setUpActions(HbMessageBox *box,
+                      const QStringList &translationIdentifiers) const;
+};
+
+#endif
+

--- a/homescreenapp/hsutils/inc/hsmenuevent.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsutils/inc/hsmenuevent.h	Wed Aug 18 09:40:07 2010 +0300
@@ -46,10 +46,12 @@
         OpenInstalledView,
         OpenHomeScreen,
         ArrangeCollection,
+        ArrangeAllCollections,
         CreateCollection,
         PreviewHSWidget,
         ShowAppSettings,
         ShowAppDetails,
+        ShowInstallationLog,
         Unknown
     };

--- a/homescreenapp/hsutils/inc/hsmenueventfactory.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsutils/inc/hsmenueventfactory.h	Wed Aug 18 09:40:07 2010 +0300
@@ -63,19 +63,20 @@
 
     static QEvent *createAddAppsFromApplicationsViewEvent(
         HsSortAttribute aApplicationsSortOder,
-        HsSortAttribute aCollectionsSortOder,
         int aItemId = 0);
 
-    static QEvent *createAddAppsFromCallectionViewEvent(
+    static QEvent *createAddAppsFromCollectionViewEvent(
         int aCollectionId,
-        int aApplicationId = 0,
-        HsSortAttribute aCollectionsSortOder = NoHsSortAttribute);
+        int aApplicationId = 0);
 
     static QEvent *createRemoveAppFromCollectionEvent(int aItemId, int aCollectionId);
 
     static QEvent *createUninstallApplicationEvent(int aItemId);
 
-    static QEvent *createArrangeCollectionEvent(int aTopItemId);
+    static QEvent *createArrangeCollectionEvent(int aTopItemId,
+        int aCollectionId);
+
+    static QEvent *createArrangeAllCollectionsEvent(int aTopItemId);
 
     static QEvent *createPreviewHSWidgetEvent(
         int entryId,
@@ -87,6 +88,8 @@
     static QEvent *createAppSettingsViewEvent(int entryId);
     
     static QEvent *createAppDetailsViewEvent(int entryId);
+    
+    static QEvent *createInstallationLogEvent();
 
     static QEvent *createUnknownEvent();

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsutils/inc/hsmessageboxwrapper.h	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,63 @@
+/*
+* 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 HSMESSAGEBOXWRAPPER_H
+#define HSMESSAGEBOXWRAPPER_H
+
+#include <HbWidget>
+
+#include "hsutils_global.h"
+
+#include "hstest_global.h"
+HOMESCREEN_TEST_CLASS(t_hsUtils)
+
+class HbAction;
+class HbMessageBox;
+struct HsMessageBoxWrapperImpl;
+
+class HSUTILS_EXPORT HsMessageBoxWrapper : public QObject
+{
+    Q_OBJECT
+
+public:
+    HsMessageBoxWrapper(QObject *parent=0);
+    ~HsMessageBoxWrapper();
+
+    void setHeader(const QString &header);
+    void setQueryText(const QString &queryText);
+    void close();
+
+signals:
+    void accepted();
+    void rejected();
+public slots:
+    void show();
+
+private:
+    Q_DISABLE_COPY(HsMessageBoxWrapper)
+
+private slots:
+    void onDialogClosed(int action);
+ 
+private:
+    HsMessageBoxWrapperImpl *mImpl;
+    HbMessageBox *mBox;
+
+    HOMESCREEN_TEST_FRIEND_CLASS(t_hsUtils)
+};
+
+#endif // HSPAGEINDICATOR_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsutils/inc/hspropertyanimationwrapper.h	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,65 @@
+/*
+* 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 HSPROPERTYANIMATIONWRAPPER_H
+#define HSPROPERTYANIMATIONWRAPPER_H
+
+#include <QScopedPointer>
+
+#include "hsutils_global.h"
+#include "hstest_global.h"
+
+HOMESCREEN_TEST_CLASS(t_hsUtils)
+
+class QEasingCurve;
+
+struct HsPropertyAnimationWrapperImpl;
+class HSUTILS_EXPORT HsPropertyAnimationWrapper : public QObject
+{
+    Q_OBJECT
+
+public:
+    HsPropertyAnimationWrapper(QObject *parent=0);
+    ~HsPropertyAnimationWrapper();
+    
+    void setTargetObject(QObject *target);
+    void setPropertyName(const QByteArray &propertyName);
+    bool isRunning();
+    void setEndValue(const QVariant &value);
+    void setDuration(int msecs);
+    void setForward();
+    void setBackward();
+    bool isForward() const;
+    void setEasingCurve(const QEasingCurve &curve);
+
+signals:
+    void finished();
+
+public slots:
+    void start();
+    void stop();
+
+private:
+    Q_DISABLE_COPY(HsPropertyAnimationWrapper)
+
+ 
+private:
+    QScopedPointer<HsPropertyAnimationWrapperImpl> mImpl;
+    HOMESCREEN_TEST_FRIEND_CLASS(t_hsUtils)
+};
+
+#endif // HSPAGEINDICATOR_H

--- a/homescreenapp/hsutils/inc/hsutils_global.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsutils/inc/hsutils_global.h	Wed Aug 18 09:40:07 2010 +0300
@@ -19,7 +19,7 @@
 #ifndef HSUTILS_GLOBAL_H
 #define HSUTILS_GLOBAL_H
 
-#include <Qt/qglobal.h>
+#include <qglobal.h>
 
 
 #ifdef HSUTILS_LIB

--- a/homescreenapp/hsutils/inc/hswidgetpositioningonwidgetadd.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsutils/inc/hswidgetpositioningonwidgetadd.h	Wed Aug 18 09:40:07 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -20,15 +20,19 @@
 
 #include <QList>
 #include <QRectF>
+#include <QPointF>
 #include "hsutils_global.h"
 
+class HsWidgetHost;
+
 class HSUTILS_EXPORT HsWidgetPositioningOnWidgetAdd
 {
 public:
     virtual ~HsWidgetPositioningOnWidgetAdd() {}
     
     virtual QList<QRectF> convert(const QRectF &contentArea,
-                                  const QList<QRectF> &rects, 
+                                  const QList<QRectF> &existingRects,
+                                  const QList<QRectF> &newRects,
                                   const QPointF &startPoint) = 0;
    
     static void setInstance(HsWidgetPositioningOnWidgetAdd *instance);
@@ -42,7 +46,8 @@
 {
 public:
     QList<QRectF> convert(const QRectF &contentArea,
-                          const QList<QRectF> &rects,
+                          const QList<QRectF> &existingRects,
+                          const QList<QRectF> &newRects,
                           const QPointF &startPoint);
  
 };
@@ -51,9 +56,40 @@
 {
 public:
     QList<QRectF> convert(const QRectF &contentArea,
-                          const QList<QRectF> &rects,
+                          const QList<QRectF> &existingRects,
+                          const QList<QRectF> &newRects,
                           const QPointF &startPoint);
  };
 
+class HSUTILS_EXPORT HsWidgetOrganizer : public HsWidgetPositioningOnWidgetAdd
+{
+public:
+    QList<QRectF> convert(const QRectF &contentArea,
+                          const QList<QRectF> &existingRects,
+                          const QList<QRectF> &newRects,
+                          const QPointF &startPoint);
+
+private:
+    bool initAnchors(const QSizeF &areaSize);
+    bool getAnchorPoint(const QSizeF &contentSize);
+    bool searchWidthSpace(const QSizeF &contentSize);
+    bool searchHeightSpace(int contentHeight);
+    bool markReservedAnchors();
+    QPointF getAnchorCoordinates(int index);
+    int getIndexForCoordinate(QPointF position);
+    int lenghtInAnchorPoints(QVariant length);
+
+private:
+    int mAnchorColumns;
+    int mAnchorRows;
+    int mAnchorDistance;
+    QPointF mStartWidthAnchorPoint;
+    QPointF mEndWidthAnchorPoint;
+    QPointF mEndHeightAnchorPoint;
+    // TODO: is there better way to store anchor points, perhaps with pointers?
+    QList<bool> mAnchors;
+
+};
+
 
 #endif // HSWIDGETPOSITIONINGONWIDGETADD_H

--- a/homescreenapp/hsutils/inc/hswidgetpositioningonwidgetmove.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsutils/inc/hswidgetpositioningonwidgetmove.h	Wed Aug 18 09:40:07 2010 +0300
@@ -103,13 +103,20 @@
 private:
 
     void createSnappableRectangles(const QList<QRectF> &inactiveRects);
-    void checkForCenterSnapping();
     void checkInactiveRectLieAboveOrBelowOfMovingRect();
+    void checkInactiveRectVerticalEdgesInRange(qreal movingRectVerticalEdgePosition);
+    void checkInactiveRectBetterFitForHorizontalSnapping(qreal containerVerticalEdgeToInactiveRectVerticalEdge,
+                                                         qreal containerOtherVerticalEdgeToInactiveRectOtherVerticalEdge);
     void compareLeftSideOfMovingRectForSnapping();
     void compareRightSideOfMovingRectForSnapping();
     void checkInactiveRectLieLeftOrRightOfMovingRect();
+    void checkInactiveRectHorizontalEdgesInRange(qreal movingRectHorizontalEdgePosition);
+    void checkInactiveRectBetterFitForVerticalSnapping(qreal containerHorizontalEdgeToInactiveRectHorizontalEdge,
+                                                       qreal containerOtherHorizontalEdgeToInactiveRectOtherHorizontalEdge);
     void compareTopOfMovingRectForSnapping();
     void compareBottomOfMovingRectForSnapping();
+    void createVerticalLine();
+    void createHorizontalLine();
     void extendVerticalLine();
     void extendHorizontalLine();
     void checkInactiveRectPositionToVerticalLine();
@@ -128,6 +135,8 @@
     QRectF mInactiveRectToCompare;
     HsSnapRectangle mInactiveSnapRectToCompare;
     QRectF mMovingRect;
+
+    qreal mMinDistancePosition;
     qreal mHorizontalSnapPosition;
     qreal mVerticalSnapPosition;
 
@@ -140,6 +149,10 @@
     bool mRectLieAbove;
     bool mLeftInRange;
     bool mRightInRange;
+    bool mIsBetterFitHorizontalSnap;
+    qreal mDistanceVerticalEdges;
+    qreal mVerticalEdgeToLeftOfInactiveRect;
+    qreal mVerticalEdgeToRightOfInactiveRect;
     qreal mMinVerticalEdgesDistance;
     qreal mVerticalDistance;
     qreal mVerticalDistanceFromSelectedRect;
@@ -148,6 +161,10 @@
     bool mRectLieLeft;
     bool mTopInRange;
     bool mBottomInRange;
+    bool mIsBetterFitVerticalSnap;
+    qreal mDistanceHorizontalEdges;
+    qreal mHorizontalEdgeToTopOfInactiveRect;
+    qreal mHorizontalEdgeToBottomOfInactiveRect;
     qreal mMinHorizontalEdgesDistance;
     qreal mHorizontalDistance;
     qreal mHorizontalDistanceFromSelectedRect;
@@ -156,7 +173,6 @@
     bool mSnapEnabled;
     qreal mSnapForce;
     qreal mSnapGap;
-    qreal mSnapBorderGap;
 
     bool mRectVerticalEdgeLiesInLineWithVerticalLine;
     bool mRectLieAboveVerticalLine;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsutils/src/hsmenudialogfactory.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,110 @@
+/*
+* 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:  Menu Dialog
+*
+*/
+
+#include <QString>
+#include <QStringList>
+#include <QList>
+#include <QAction>
+
+#include <HbAction>
+#include <HbMessageBox>
+#include "hsmenudialogfactory.h"
+
+/*!
+    \class HsMenuDialogFactory
+    \ingroup group_hsutils
+
+    \brief Creates dialog instances for Application Library.
+
+    \sa HsMenuEvent
+*/
+
+/*! \enum HsMenuDialogFactory::Options
+ Describes what actions the dialog will have.
+ */
+
+/*! \var HsMenuDialogFactory::Options HsMenuDialogFactory::OkCancel
+ Requested dialog should have two actions in the following order: Ok (confirm) and Cancel (reject).
+ */
+/*! \var HsMenuDialogFactory::Options HsMenuDialogFactory::Close
+ Requested dialog should have one action: Close.
+ */
+/*!
+    Creates dialog.
+    \param text to be displayed in the dialog.
+    \param options specify dialog actions.
+    \return requested dialog.
+*/
+HbMessageBox *HsMenuDialogFactory::create(const QString &text,
+                                 Options options) const
+{
+
+    QStringList actionIdentifiers; // head of the list will be first action in dialog
+    HbMessageBox::MessageBoxType type(HbMessageBox::MessageTypeNone);
+
+    switch (options) {
+
+    case OkCancel:
+
+        actionIdentifiers << hbTrId("txt_common_button_ok");
+        actionIdentifiers << hbTrId("txt_common_button_cancel");
+        type = HbMessageBox::MessageTypeQuestion;
+        break;
+
+    case Close:
+
+        actionIdentifiers << hbTrId("txt_common_button_close");
+        type = HbMessageBox::MessageTypeInformation;
+        break;
+
+    default:
+        break;
+    }
+
+    QScopedPointer<HbMessageBox> box(new HbMessageBox(type));
+
+    setUpActions(box.data(), actionIdentifiers);
+
+    box->setText(text);
+    box->setAttribute(Qt::WA_DeleteOnClose);
+
+    return box.take();
+}
+
+
+/*!
+    Destructor.
+*/
+HsMenuDialogFactory::~HsMenuDialogFactory() {}
+
+/*!
+    Sets up dialog actions
+    \param box dialog to operate on.
+    \param actionIdentifiers list of translation identifiers for actions. Order of
+    actions in the dialog will reflect the identifiers order in the list.
+*/
+void HsMenuDialogFactory::setUpActions(HbMessageBox *box,
+                                    const QStringList &translationIdentifiers) const
+{
+    box->clearActions();
+
+    foreach (QString identifier, translationIdentifiers) {
+        QScopedPointer<HbAction> action(new HbAction(identifier));
+        action->setParent(box);
+        box->addAction(action.take());
+    }
+}

--- a/homescreenapp/hsutils/src/hsmenuevent.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsutils/src/hsmenuevent.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -57,7 +57,7 @@
     Opening application library from shortcut.
 */
 /*! \var HsMenuEvent::OperationType HsMenuEvent::ArrangeCollection
-    Swith to arrange mode.
+    Switch to arrange mode.
 */
 /*! \var HsMenuEvent::OperationType HsMenuEvent::Unknown
     Unknown menu event.

--- a/homescreenapp/hsutils/src/hsmenueventfactory.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsutils/src/hsmenueventfactory.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -177,18 +177,15 @@
     Creates an HsMenuEvent::AddAppsToCollection event.
 
     \param aApplicationsSortOder applications sort order.
-    \param aCollectionsSortOder collections sort order.
     \param aItemId item id.
     \return Add applications to collection event.
  */
 QEvent *HsMenuEventFactory::createAddAppsFromApplicationsViewEvent(
     HsSortAttribute aApplicationsSortOder,
-    HsSortAttribute aCollectionsSortOder,
     int aItemId)
 {
     QVariantMap params;
     params.insert(appSortOrderKey(), aApplicationsSortOder);
-    params.insert(collectionSortOrderKey(), aCollectionsSortOder);
     params.insert(itemIdKey(), aItemId);
     return  new HsMenuEvent(HsMenuEvent::AddAppsToCollection, params);
 }
@@ -198,18 +195,15 @@
 
     \param aCollectionId collection id.
     \param aApplicationId application id.
-    \param aCollectionsSortOder collections sort order.
     \return Add applications to collection event.
  */
-QEvent *HsMenuEventFactory::createAddAppsFromCallectionViewEvent(
+QEvent *HsMenuEventFactory::createAddAppsFromCollectionViewEvent(
     int aCollectionId,
-    int aApplicationId,
-    HsSortAttribute aCollectionsSortOder)
+    int aApplicationId)
 {
     QVariantMap params;
     params.insert(itemIdKey(), aApplicationId);
     params.insert(collectionIdKey(), aCollectionId);
-    params.insert(collectionSortOrderKey(), aCollectionsSortOder);
     return new HsMenuEvent(HsMenuEvent::AddAppsToCollection, params);
 }
 
@@ -247,16 +241,33 @@
     Creates an HsMenuEvent::ArrangeCollection event.
 
     \param aTopItemId Item id to be scrolled.
-    \return ArrangeCollection event.
+    \param aCollectionId Collection id.
+    \retval ArrangeCollection event.
  */
-QEvent *HsMenuEventFactory::createArrangeCollectionEvent(int aTopItemId)
+QEvent *HsMenuEventFactory::createArrangeCollectionEvent(
+    int aTopItemId,
+    int aCollectionId)
 {
     QVariantMap params;
     params.insert(itemIdKey(), aTopItemId);
+    params.insert(collectionIdKey(), aCollectionId);
     return new HsMenuEvent(HsMenuEvent::ArrangeCollection, params);
 }
 
 /*!
+    Creates an HsMenuEvent::ArrangeAllCollections event.
+
+    \param aTopItemId Item id to be scrolled.
+    \retval ArrangeAllCollections event.
+ */
+QEvent *HsMenuEventFactory::createArrangeAllCollectionsEvent(int aTopItemId)
+{
+    QVariantMap params;
+    params.insert(itemIdKey(), aTopItemId);
+    return new HsMenuEvent(HsMenuEvent::ArrangeAllCollections, params);
+}
+
+/*!
     Prepares event triggered on tap on Widget.
     \param entryId Id of an item.
     \param entryTypeName Name of the entry type (e.g. application, widget).
@@ -315,6 +326,16 @@
 }
 
 /*!
+    Creates an HsMenuEvent::ShowInstallationLog event.
+
+    \return Event for installation log.
+*/
+QEvent *HsMenuEventFactory::createInstallationLogEvent()
+{
+    return new HsMenuEvent(HsMenuEvent::ShowInstallationLog);
+}
+
+/*!
     Creates an HsMenuEvent::Unknown event.
 
     \return Unknown event.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsutils/src/hsmessageboxwrapper.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,106 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#include <HbMessageBox>
+#include <HbLabel>
+#include <HbAction>
+#include "hsmessageboxwrapper.h"
+
+/*!
+    \class HsMessageBoxWrapper
+    \ingroup group_hsutils
+    \brief 
+*/
+
+
+struct HsMessageBoxWrapperImpl{
+	 QString mHeader;
+   QString mQueryText;
+
+};
+/*!
+
+*/
+HsMessageBoxWrapper::HsMessageBoxWrapper(QObject *parent)
+  : QObject(parent),
+    mImpl(new HsMessageBoxWrapperImpl),
+    mBox(0)
+{
+}
+
+/*!
+
+*/
+HsMessageBoxWrapper::~HsMessageBoxWrapper()
+{
+  delete mImpl;
+}
+
+/*!
+
+*/
+void HsMessageBoxWrapper::setHeader(const QString &header)
+{
+    mImpl->mHeader = header;
+}
+/*!
+
+*/
+void HsMessageBoxWrapper::setQueryText(const QString &queryText)
+{
+    mImpl->mQueryText = queryText;
+}
+/*!
+
+*/
+#ifdef COVERAGE_MEASUREMENT
+#pragma CTC SKIP
+#endif 
+
+void HsMessageBoxWrapper::show()
+{
+    mBox = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
+    mBox->setAttribute(Qt::WA_DeleteOnClose);
+    mBox->setHeadingWidget(new HbLabel(mImpl->mHeader));
+    mBox->setText(mImpl->mQueryText);
+    mBox->setStandardButtons(HbMessageBox::Yes | HbMessageBox::No);
+
+    mBox->open(this,SLOT(onDialogClosed(int)));
+}
+
+void HsMessageBoxWrapper::close()
+{
+    if (mBox) {
+        mBox->close();
+        mBox = NULL;
+    }
+}
+
+/*!
+
+*/
+void HsMessageBoxWrapper::onDialogClosed(int action)
+{
+    if (action == HbMessageBox::Yes){
+       emit accepted();  
+    } else {
+       emit rejected();
+    }
+}
+#ifdef COVERAGE_MEASUREMENT
+#pragma CTC ENDSKIP
+#endif //COVERAGE_MEASUREMENT

--- a/homescreenapp/hsutils/src/hspageindicator.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsutils/src/hspageindicator.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -79,7 +79,7 @@
 */
 void HsPageIndicator::setActiveItemIndex(int activeItemIndex)
 {
-    if (activeItemIndex < 0 || itemCount() <= activeItemIndex) {
+    if (activeItemIndex < 0 || itemCount()-1 < activeItemIndex) {
         return;
     }
 
@@ -116,13 +116,18 @@
 */
 void HsPageIndicator::removeItem(int activeItemIndex)
 {
-    if (activeItemIndex < 0 || itemCount() - 1 <= activeItemIndex) {
+    if (activeItemIndex < 0 || itemCount() <= activeItemIndex) {
         return;
     }
 
+    if (activeItemIndex == itemCount()-1) {
+        activeItemIndex--;
+    }
+
     delete mItems.last();
     mItems.removeLast();
     layoutItems();
+    
     setActiveItemIndex(activeItemIndex);
 }

--- a/homescreenapp/hsutils/src/hspageindicatoritem.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsutils/src/hspageindicatoritem.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -111,9 +111,12 @@
     setTransformOriginPoint(rect().center());
     QPropertyAnimation *animation = 
         new QPropertyAnimation(graphicsEffect(), "strength");
+    
     animation->setDuration(800);
     animation->setKeyValueAt(0.2, 1);
     animation->setEndValue(0);
+    
+    connect(this,SIGNAL(destroyed()),animation,SLOT(stop()));
     connect(animation, SIGNAL(finished()), SLOT(animationFinished()));
     animation->start(QAbstractAnimation::DeleteWhenStopped);
 }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsutils/src/hspropertyanimationwrapper.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,118 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#include <QPropertyAnimation>
+#include <QEasingCurve>
+#include "hspropertyanimationwrapper.h"
+
+/*!
+    \class HsMessageBoxWrapper
+    \ingroup group_hsutils
+    \brief 
+*/
+
+struct HsPropertyAnimationWrapperImpl
+{
+public:
+    QPropertyAnimation *mPropertyAnimation;
+};
+
+/*!
+
+*/
+HsPropertyAnimationWrapper::HsPropertyAnimationWrapper(QObject *parent)
+  : QObject(parent),mImpl(new HsPropertyAnimationWrapperImpl)
+{
+    mImpl->mPropertyAnimation = new QPropertyAnimation(parent);
+    connect(mImpl->mPropertyAnimation,SIGNAL(finished()),SIGNAL(finished()));
+}
+
+/*!
+
+*/
+HsPropertyAnimationWrapper::~HsPropertyAnimationWrapper()
+{
+
+}
+
+/*!
+
+*/
+void HsPropertyAnimationWrapper::setTargetObject(QObject *target)
+{
+   mImpl->mPropertyAnimation->setTargetObject(target);
+}
+/*!
+
+*/
+void HsPropertyAnimationWrapper::setPropertyName(const QByteArray &propertyName)
+{
+   mImpl->mPropertyAnimation->setPropertyName(propertyName);
+}
+
+bool HsPropertyAnimationWrapper::isRunning()
+{
+    return (mImpl->mPropertyAnimation->state() == QAbstractAnimation::Running);
+}
+
+void HsPropertyAnimationWrapper::setEndValue(const QVariant &value)
+{
+    mImpl->mPropertyAnimation->setEndValue(value);
+}
+
+void HsPropertyAnimationWrapper::setDuration(int msecs)
+{
+    mImpl->mPropertyAnimation->setDuration(msecs);
+}
+
+void HsPropertyAnimationWrapper::setForward()
+{
+    mImpl->mPropertyAnimation->setDirection(QAbstractAnimation::Forward);
+}
+
+void HsPropertyAnimationWrapper::setBackward()
+{
+    mImpl->mPropertyAnimation->setDirection(QAbstractAnimation::Backward);
+}
+
+bool HsPropertyAnimationWrapper::isForward() const
+{
+    return (mImpl->mPropertyAnimation->direction() == QAbstractAnimation::Forward);
+}
+/*!
+
+*/
+void HsPropertyAnimationWrapper::start()
+{
+    mImpl->mPropertyAnimation->start();
+}
+/*!
+
+*/
+void HsPropertyAnimationWrapper::stop()
+{
+    mImpl->mPropertyAnimation->stop();
+}
+
+/*!
+
+*/
+void HsPropertyAnimationWrapper::setEasingCurve(const QEasingCurve &curve)
+{
+    mImpl->mPropertyAnimation->setEasingCurve(curve);
+}
+

--- a/homescreenapp/hsutils/src/hssnapline.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsutils/src/hssnapline.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -17,9 +17,10 @@
 
 #include <QGraphicsOpacityEffect>
 #include <QPropertyAnimation>
+#include <hbcolorscheme.h>
 
 #include "hsapp_defs.h"
-#include "HsSnapLine.h"
+#include "hssnapline.h"
 
 /*!
     Constructor.
@@ -44,11 +45,6 @@
 
     mFadeOutAnimation = new QPropertyAnimation(graphicsEffect(), "opacity", this);
     connect(mFadeOutAnimation, SIGNAL(finished()), SLOT(fadeOutAnimationFinished()));
-
-    QPen pen;
-    pen.setWidth(3);
-    pen.setColor(Qt::darkCyan); //TODO: Change the color to the Theme element
-    setPen(pen);
 }
  
 /*!
@@ -111,6 +107,23 @@
         displayLine.translate(-1.0, 0.0);
     }
 
+    QLinearGradient gradient(displayLine.p1(), displayLine.p2());
+    gradient.setColorAt(0.0, Qt::white);
+    QColor snapLineColor = HbColorScheme::color("qtc_hs_snapguide");
+    if (!snapLineColor.isValid()) {
+        //if valid color is not loaded from the theme, the darkCyan color is used as a backup.color
+        snapLineColor = Qt::darkCyan;
+    }
+    gradient.setColorAt(0.4, snapLineColor);
+    gradient.setColorAt(0.6, snapLineColor);
+    gradient.setColorAt(1.0, Qt::white);
+    QBrush brush(gradient);
+    QPen pen;
+    pen.setWidth(3);
+    pen.setCapStyle(Qt::RoundCap);
+    pen.setBrush(brush);
+    setPen(pen);
+
     setLine(displayLine);
     show();
 }

--- a/homescreenapp/hsutils/src/hswidgetpositioningonwidgetadd.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsutils/src/hswidgetpositioningonwidgetadd.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -15,10 +15,15 @@
 *
 */
 
+#include <QLineF>
 #include <QtGlobal>
+#include <QPointF>
+#include <math.h>
+
+#include <HbInstance>
+
+
 #include "hswidgetpositioningonwidgetadd.h"
-#include <math.h>
-#include <QLineF>
 
 const qreal offset = 40; //TODO: Implement this as configurable parameter
 
@@ -71,9 +76,12 @@
 */
 QList<QRectF> HsAnchorPointInBottomRight::convert(
     const QRectF &contentArea,
-    const QList<QRectF> &rects,
+    const QList<QRectF> &existingRects,
+    const QList<QRectF> &newRects,
     const QPointF &startPoint)
 {
+    Q_UNUSED(existingRects);
+
     QList<QRectF> toGeometries;
 
     //Offset for widgets' bottom right position to each other
@@ -87,16 +95,16 @@
     if(startPoint.isNull()){
 
         QLineF diagonal(contentArea.topLeft(), contentArea.bottomRight());
-        QLineF widgetRightSide(contentArea.center().x()+ rects.at(0).width()/2,
+        QLineF widgetRightSide(contentArea.center().x()+ newRects.at(0).width()/2,
                            contentArea.top(),
-                           contentArea.center().x()+ rects.at(0).width()/2,
+                           contentArea.center().x()+ newRects.at(0).width()/2,
                            contentArea.bottom());
 
         // right side line intersection with diagonal will be bottom right position
         // for the first rect
         if(QLineF::BoundedIntersection != 
             diagonal.intersect(widgetRightSide, &anchorPoint)) {
-            return rects; //Return original since undefined error.
+            return newRects; //Return original since undefined error.
                             //In this case widget's must be wider than the content area.
         }
     }else{
@@ -104,8 +112,8 @@
     }
 
     QRectF widgetRect;
-    for(int i=0;i<rects.count();++i) {
-        widgetRect = rects.at(i);
+    for(int i=0;i<newRects.count();++i) {
+        widgetRect = newRects.at(i);
         widgetRect.moveBottomRight(anchorPoint);
         //if widget rect doesn't fit, try to move it
         if(!contentArea.contains(widgetRect)) {
@@ -137,9 +145,11 @@
 #endif //COVERAGE_MEASUREMENT
 QList<QRectF> HsAnchorPointInCenter::convert(
     const QRectF &contentArea,
-    const QList<QRectF> &rects,
+    const QList<QRectF> &existingRects,
+    const QList<QRectF> &newRects,
     const QPointF &startPoint )
 {
+    Q_UNUSED(existingRects);
     Q_UNUSED(startPoint)
 
     QList<QRectF> toGeometries;
@@ -152,7 +162,7 @@
 
     //First widget to the center of the content area
     QPointF anchorPoint = contentArea.center();
-    foreach (QRectF g, rects) {
+    foreach (QRectF g, newRects) {
         g.moveCenter(anchorPoint);
         toGeometries << g;
         anchorPoint -= offsetPoint;
@@ -163,6 +173,279 @@
     return toGeometries;
 }
 
+/*!
+    \class HsWidgetOrganizer
+    \brief Advanced widget positioning algorithm.
+    
+    Organizes widget's starting from upper left corner towards right,
+    and then continues the on the next line.
+*/
+QList<QRectF> HsWidgetOrganizer::convert(
+    const QRectF &contentArea,
+    const QList<QRectF> &existingRects,
+    const QList<QRectF> &newRects,
+    const QPointF &startPoint)
+{
+    Q_UNUSED(startPoint)
+
+    // TODO: maybe we can utilize start point in some use cases / optimizations?
+
+    QList<QRectF> toGeometries;
+
+    // TODO: anchor distance to configuration?
+    // TODO: optimize anchor distance based on new content amount
+    // TODO: snap value to same as anchor distance?
+    mAnchorDistance = 5;
+    QList<bool> temp;
+    mAnchors = temp;
+
+    // test flag
+    int test = 0;
+
+    // initialize anchor network for widget positions
+    if (test == 0) {
+        initAnchors(contentArea.size());
+    } else {
+        mAnchorDistance = 2;
+        initAnchors(QSizeF(6,6));
+    }
+
+    // mark existing rects (widgets) reserved
+    foreach (QRectF rect, existingRects) {
+        // TODO: could mStartWidthAnchorPoint, mEndWidthAnchorPoint, mEndHeightAnchorPoint be somehow refactored better way?
+        mStartWidthAnchorPoint.setX(lenghtInAnchorPoints(rect.x() - contentArea.x()));
+        mEndWidthAnchorPoint.setX(lenghtInAnchorPoints(rect.x() + rect.width() - contentArea.x()));
+        mStartWidthAnchorPoint.setY(lenghtInAnchorPoints(rect.y() - contentArea.y()));
+        mEndHeightAnchorPoint.setY(lenghtInAnchorPoints(rect.y() + rect.height() - contentArea.y()));
+        // mark reserved anchor points
+        markReservedAnchors();
+        mStartWidthAnchorPoint = QPointF(0,0);
+        mEndWidthAnchorPoint = QPointF(0,0);
+        mEndHeightAnchorPoint = QPointF(0,0);
+    }
+
+    QList<QRectF> notOrganizedRects;
+
+    // get positions for all new rects (widgets)
+    for ( int i = 0; i < newRects.count(); i++) {
+        bool found = false;
+        if (test == 0) {
+            // find first free anchor point for rect
+            found = getAnchorPoint(newRects.at(i).size());
+        } else {
+            found = getAnchorPoint(QSizeF(2,2));
+        }
+
+        if (found) {
+            // save to geometry list
+            toGeometries << QRectF(mStartWidthAnchorPoint.x() * mAnchorDistance + contentArea.x(),
+                                   mStartWidthAnchorPoint.y() * mAnchorDistance + contentArea.y(),
+                                   newRects.at(i).width(), newRects.at(i).height());
+            // mark new widgets rect reserved
+            markReservedAnchors();
+            // TODO: these optimizations could be used for empty page
+            //mStartWidthAnchorPoint.setX(mEndWidthAnchorPoint.x() + 1);
+            //mStartWidthAnchorPoint.setY(mEndWidthAnchorPoint.y());
+        } else {
+            // collect widgets that do not fit
+            notOrganizedRects << newRects.at(i);
+        }
+        // TODO: remove these to optimize for empty page
+        mStartWidthAnchorPoint = QPointF(0,0);
+        mEndWidthAnchorPoint = QPointF(0,0);
+    }
+
+    // use center algorithm with offset for the rest widget that did not fit to screen
+    if (notOrganizedRects.count() > 0) {
+        QList<QRectF> tmpExistingRects;
+        tmpExistingRects += newRects;
+        tmpExistingRects += existingRects;
+        HsAnchorPointInCenter *centerAlgorithm = new HsAnchorPointInCenter();
+        QList<QRectF> calculatedRects =
+            centerAlgorithm->convert(contentArea, tmpExistingRects, notOrganizedRects, QPointF());
+        toGeometries += calculatedRects;
+    }
+
+    return toGeometries;
+}
+
+
+/*!    
+    Initializes anchor points for context area
+*/
+bool HsWidgetOrganizer::initAnchors(const QSizeF &areaSize)
+{
+    // mandatory check ups
+    // TODO: these mAnchorDistance checks to earlier phase
+    if (areaSize == QSizeF(0,0) || areaSize.width() < mAnchorDistance ||
+        areaSize.height() < mAnchorDistance || mAnchorDistance == 0 || mAnchorDistance == 1) {
+        return false;
+    }
+    mAnchorColumns = 0;
+    mAnchorRows = 0;
+
+    // TODO: can we optimize anchor amount utilizing minimum widget size
+    mAnchorColumns = lenghtInAnchorPoints(areaSize.width());
+    mAnchorRows = lenghtInAnchorPoints(areaSize.height());
+
+    // create anchor network
+    for (int i = 0; i < (mAnchorRows * mAnchorColumns); i = i++) {
+        mAnchors << false;
+    }
+    // zero start points
+    mStartWidthAnchorPoint = QPointF(0,0);
+    mEndWidthAnchorPoint = QPointF(0,0);
+
+    return true;
+}
+
+/*!    
+    Finds anchor points for content size
+*/
+bool HsWidgetOrganizer::getAnchorPoint(const QSizeF &contentSize)
+{
+    bool anchorFound = false;
+
+    while (anchorFound == false) {
+        // if no width found for content
+        if (!searchWidthSpace(contentSize)) {
+            // when content organized in height order remove this line for optimization
+            mStartWidthAnchorPoint = QPointF(0,0);
+            mEndWidthAnchorPoint = QPointF(0,0);
+            return false;
+        }
+        // search height for content
+        int height = lenghtInAnchorPoints(contentSize.height());
+        anchorFound = searchHeightSpace(height);
+    }
+    return true;
+}
+
+/*!    
+    Searches anchor point width for content size
+*/
+bool HsWidgetOrganizer::searchWidthSpace(const QSizeF &contentSize) 
+{
+    int availableWidth = 0;    
+    int contentWidth = lenghtInAnchorPoints(contentSize.width());
+    // TODO: use this optimizations for empty page
+    //int contentHeight = lenghtInAnchorPoints(contentSize.height());
+    bool newRow = true;
+
+    for (int i = getIndexForCoordinate(mStartWidthAnchorPoint); i <= mAnchors.count(); i++) {
+        // no width left on the page
+        if ((newRow == false) && ((i % (mAnchorColumns)) == 0)) {
+            availableWidth = 0;
+            // jump to new row
+            mStartWidthAnchorPoint.setX(0);
+            // TODO: use this optimizations for empty page
+            //mStartWidthAnchorPoint.setY(mStartWidthAnchorPoint.y() + contentHeight + 1);
+            mStartWidthAnchorPoint.setY(mStartWidthAnchorPoint.y() + 1);
+            i = getIndexForCoordinate(mStartWidthAnchorPoint) - 1;
+            // if no height found
+            if (i < 0) {
+                return false;
+            }
+            newRow = true;
+        } else {
+            // if enough width found
+            if (availableWidth == contentWidth) {
+                mEndWidthAnchorPoint = getAnchorCoordinates(i);
+                if (mEndWidthAnchorPoint == QPointF()) {
+                    return false;
+                }
+                return true;
+            }
+            // if anchor reserved
+            if (mAnchors[i] == true) {
+                availableWidth = 0;
+            } else {
+                // update available width
+                availableWidth = availableWidth + 1;
+            }
+            newRow = false;
+        }   
+    }
+    return false;
+}
+
+/*!    
+    Searches anchor point area for content size
+*/
+bool HsWidgetOrganizer::searchHeightSpace(int contentHeight)
+{
+    mEndHeightAnchorPoint = QPointF(0,0);
+ 
+    for (int i = mStartWidthAnchorPoint.x(); i <= mEndWidthAnchorPoint.x(); i = i++) {
+        for (int j = mStartWidthAnchorPoint.y(); j <= (mStartWidthAnchorPoint.y() + contentHeight); j = j++) {
+            int index = getIndexForCoordinate(QPointF(i,j));
+            // check that index is not out of bounds
+            if (index == -1) {
+                // update start width point one step
+                mStartWidthAnchorPoint.setX(mStartWidthAnchorPoint.x() + 1); 
+                return false;
+            }
+            // if anchor reserved
+            if (mAnchors[index] == true) {
+                // update start width point one step
+                mStartWidthAnchorPoint.setX(mStartWidthAnchorPoint.x() + 1);
+                return false;
+            }
+        }
+    }
+    mEndHeightAnchorPoint = QPointF(mEndWidthAnchorPoint.x(), mEndWidthAnchorPoint.y() + contentHeight);
+    return true;
+}
+
+/*!    
+    Marks reserved anchor points based on pre-defined starting and ending points
+*/
+bool HsWidgetOrganizer::markReservedAnchors()
+{
+    for (int i = mStartWidthAnchorPoint.x(); i <= mEndWidthAnchorPoint.x(); i++) {
+        for (int j = mStartWidthAnchorPoint.y(); j <= mEndHeightAnchorPoint.y(); j++) {
+            mAnchors[getIndexForCoordinate(QPointF(i,j))] = true;
+        }
+    }
+    return true;
+}
+
+/*!    
+    Returns pixel coordinate based on anchor coordinate
+*/
+QPointF HsWidgetOrganizer::getAnchorCoordinates(int index)
+{
+    if (index < mAnchors.count()) {
+        int x = index % mAnchorColumns;
+        int y = (index - x) / mAnchorColumns;
+        return QPointF(x,y);
+    } else {
+        return QPointF();
+    }
+}
+
+/*!    
+    Returns anchor coordinate based on pixel coordinate
+*/
+int HsWidgetOrganizer::getIndexForCoordinate(QPointF position)
+{
+    int index = (position.y() * mAnchorColumns) + position.x();
+    if (index < mAnchors.count()) {
+        return index;
+    } else {
+        return -1;
+    }
+}
+
+/*!    
+    Calculates pixel length as anchor points
+*/
+int HsWidgetOrganizer::lenghtInAnchorPoints(QVariant length)
+{
+    // check remainder
+    int remainder = length.toInt() % mAnchorDistance;
+    return ((length.toInt() - remainder) / mAnchorDistance);
+}
 
 #ifdef COVERAGE_MEASUREMENT
 #pragma CTC ENDSKIP

--- a/homescreenapp/hsutils/src/hswidgetpositioningonwidgetmove.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/hsutils/src/hswidgetpositioningonwidgetmove.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -53,17 +53,18 @@
     Constructor.
 */
 HsSnapToLines::HsSnapToLines() :
-    mActiveRectWidth(0.0), mActiveRectHeight(0.0),
+    mActiveRectWidth(0.0), mActiveRectHeight(0.0), mMinDistancePosition(0.0),
     mHorizontalSnapPosition(0.0), mVerticalSnapPosition(0.0),
-    mHorizontalSnapFound(false),
-    mVerticalSnapFound(false),
-    mRectLieAbove(false), mLeftInRange(false), mRightInRange(false),
+    mHorizontalSnapFound(false), mVerticalSnapFound(false),
+    mRectLieAbove(false), mLeftInRange(false), mRightInRange(false), mIsBetterFitHorizontalSnap(false),
+    mDistanceVerticalEdges(0.0), mVerticalEdgeToLeftOfInactiveRect(0.0), mVerticalEdgeToRightOfInactiveRect(0.0),
     mMinVerticalEdgesDistance(0.0), mVerticalDistance(0.0),
     mVerticalDistanceFromSelectedRect(0.0), mContainerVerticalEdgeDistance(0.0),
-    mRectLieLeft(false), mTopInRange(false), mBottomInRange(false),
+    mRectLieLeft(false), mTopInRange(false), mBottomInRange(false), mIsBetterFitVerticalSnap(false),
+    mDistanceHorizontalEdges(0.0), mHorizontalEdgeToTopOfInactiveRect(0.0), mHorizontalEdgeToBottomOfInactiveRect(0.0),
     mMinHorizontalEdgesDistance(0.0), mHorizontalDistance(0.0),
     mHorizontalDistanceFromSelectedRect(0.0), mContainerHorizontalEdgeDistance(0.0),
-    mSnapEnabled(false), mSnapForce(0.0), mSnapGap(0.0), mSnapBorderGap(0.0),
+    mSnapEnabled(false), mSnapForce(0.0), mSnapGap(0.0),
     mRectVerticalEdgeLiesInLineWithVerticalLine(false), mRectLieAboveVerticalLine(false), mRectLieBelowVerticalLine(false),
     mRectHorizontalEdgeLiesInLineWithHorizontalLine(false), mRectLieLeftOfHorizontalLine(false), mRectLiesRightOfHorizontalLine(false)
 {
@@ -80,7 +81,6 @@
     //The following values should be in qreal, so the status received in canConvert is ignored
     mSnapForce = configuration[SNAPFORCE].toDouble(&canConvert);
     mSnapGap = configuration[SNAPGAP].toDouble(&canConvert);
-    mSnapBorderGap = configuration[SNAPBORDERGAP].toDouble(&canConvert);
 }
 
 /*!
@@ -91,11 +91,7 @@
                                         const QList<QRectF> &inactiveRects,
                                         const QRectF &activeRect)
 {
-    mContainerRect.setLeft(containerRect.left() + mSnapBorderGap);
-    mContainerRect.setTop(containerRect.top() + mSnapBorderGap);
-    mContainerRect.setRight(containerRect.right() - mSnapBorderGap);
-    mContainerRect.setBottom(containerRect.bottom() - mSnapBorderGap);
-
+    mContainerRect = containerRect;
     mActiveRectWidth = activeRect.width();
     mActiveRectHeight = activeRect.height();
 
@@ -178,16 +174,14 @@
         mContainerHorizontalEdgeDistance = 0.0;
         mVerticalSnapFound = false;
 
-        checkForCenterSnapping();
         for (int i = 0; i < mInactiveSnapRects.count(); ++i) {
             mInactiveSnapRectToCompare = mInactiveSnapRects[i];
             mInactiveRectToCompare = mInactiveSnapRectToCompare.rectangle;
             if (!movingRect.intersects(mInactiveRectToCompare)) { //Only compare if Inactive Rect and moving rect do not overlap.
-                //TODO: Move the above check to another function...
-                // X - Direction Snapping
+                // Horizontal - Direction Snapping
                 compareLeftSideOfMovingRectForSnapping();
                 compareRightSideOfMovingRectForSnapping();
-                // Y - Direction Snapping
+                // Vertical - Direction Snapping
                 compareTopOfMovingRectForSnapping();
                 compareBottomOfMovingRectForSnapping();
             }
@@ -212,29 +206,6 @@
 }
 
 /*!
-    Check if the center of moving rect is in the snap force in the middle of continer rect.
-*/
-void HsSnapToLines::checkForCenterSnapping()
-{
-    QPointF centerOfContainerRect = mContainerRect.center();
-
-    QRectF verticalSnapField = QRectF(QPointF(centerOfContainerRect.x() - (mSnapForce/2), mContainerRect.top()),
-         QPointF(centerOfContainerRect.x() + (mSnapForce/2), mContainerRect.bottom()));
-
-    //Check that the widget lies in the container rect, if the snapping position is proposed... is not required,
-    //unless some widget is bigger than the page width
-    QPointF centerOfMovingRect = mMovingRect.center();
-    if (verticalSnapField.contains(centerOfMovingRect)) {
-        mHorizontalSnapFound = true;
-        mHorizontalSnapPosition = centerOfContainerRect.x() - mActiveRectWidth/2;
-        mMinVerticalEdgesDistance = qAbs(centerOfContainerRect.x() - centerOfMovingRect.x());
-        //save the points for the Vertical line
-        mVerticalLine.setP1(QPointF(centerOfContainerRect.x(), mMovingRect.top()));
-        mVerticalLine.setP2(QPointF(centerOfContainerRect.x(), mMovingRect.bottom()));
-    }
-}
-
-/*!
     Check if the inactive rect being compared with moving rect lies above or below of moving rect.
 */
 void HsSnapToLines::checkInactiveRectLieAboveOrBelowOfMovingRect()
@@ -264,6 +235,81 @@
     }
 }
 
+/*!
+    Check if the Vertical edges (Left and Right Edges) of the inactive rect being compared
+    is in range of the snapping distance of the vertical edge of moving rect
+    \param movingRectVerticalEdgePosition Position of the Vertical edge(either left or right) of moving rect.
+*/
+void HsSnapToLines::checkInactiveRectVerticalEdgesInRange(qreal movingRectVerticalEdgePosition)
+{
+    mLeftInRange = false;
+    mRightInRange = false;
+
+    //calculate the distance of the moving rect's vertical edge to the inactive rect's left and right edges
+    mVerticalEdgeToLeftOfInactiveRect = qAbs(mInactiveRectToCompare.left() - movingRectVerticalEdgePosition);
+    mVerticalEdgeToRightOfInactiveRect = qAbs(mInactiveRectToCompare.right() - movingRectVerticalEdgePosition);
+
+    if (mVerticalEdgeToLeftOfInactiveRect <= mMinVerticalEdgesDistance 
+        && (mRectLieAbove && mInactiveSnapRectToCompare.isLeftSnapableForBelow
+        || !mRectLieAbove && mInactiveSnapRectToCompare.isLeftSnapableForAbove)) { 
+        mLeftInRange = true;
+    }
+    if (mVerticalEdgeToRightOfInactiveRect <= mMinVerticalEdgesDistance
+        && (mRectLieAbove && mInactiveSnapRectToCompare.isRightSnapableForBelow
+        || !mRectLieAbove && mInactiveSnapRectToCompare.isRightSnapableForAbove)) {
+        mRightInRange = true;
+    }
+}
+
+/*!
+    Check if this inactive rect is better fit for Horizontal snapping
+    \param containerVerticalEdgeToInactiveRectVerticalEdge
+           difference between the vertical edge of the container and same vertical edge of inactive rect
+    \param containerOtherVerticalEdgeToInactiveRectOtherVerticalEdge
+           difference between the opposite vertical edges of continer and the inactive rect
+*/
+void HsSnapToLines::checkInactiveRectBetterFitForHorizontalSnapping(qreal containerVerticalEdgeToInactiveRectVerticalEdge,
+                                                                    qreal containerOtherVerticalEdgeToInactiveRectOtherVerticalEdge)
+{
+    //Check if the inactive rect is better fit or if it is inline with already selected position and hence is also a better fit
+    mIsBetterFitHorizontalSnap = false;
+    if (mLeftInRange || mRightInRange) {
+        if (mDistanceVerticalEdges < mMinVerticalEdgesDistance) {
+            mIsBetterFitHorizontalSnap = true;
+        }
+        else if (mDistanceVerticalEdges == mMinVerticalEdgesDistance) { //the distance in the vertical edges is same as from the previously selected rect
+            //check the position of rect with respect to Vertical line
+            checkInactiveRectPositionToVerticalLine();
+            //if horizontal snap position was previously found and the rect's edge is in line with Vertical line
+            if (mHorizontalSnapFound && mRectVerticalEdgeLiesInLineWithVerticalLine) {
+                if (mRectLieAboveVerticalLine || mRectLieBelowVerticalLine) {
+                    extendVerticalLineToIncludeInactiveRect();
+                }
+            }
+            //here the case is that moving rect lies exactly in middle of two same sides of two different inactive widgets.
+            else {
+                //Prioritize first on the fact if the inactive rect is closer to the moving rect in Y - direction.
+                if (mVerticalDistance < mVerticalDistanceFromSelectedRect) {
+                    mIsBetterFitHorizontalSnap = true;
+                }
+                else if (mVerticalDistance == mVerticalDistanceFromSelectedRect) {
+                    //Prioritize next if this Inactive rect's vertical edge is closer to the same vertical edge of the container rect, then the previously selected rect
+                    if (containerVerticalEdgeToInactiveRectVerticalEdge < mContainerVerticalEdgeDistance) {
+                        mIsBetterFitHorizontalSnap = true;
+                    }
+                    //Prioritize next if the Inactive rect's vertical edge lies near to same vertical edge of the container rect than the other pair
+                    else if (containerVerticalEdgeToInactiveRectVerticalEdge < containerOtherVerticalEdgeToInactiveRectOtherVerticalEdge) {
+                        mIsBetterFitHorizontalSnap = true;
+                    }
+                    else {
+                        //This else will happen if this rectangle being compared is exactly the same as the selected rectangle for snapping, but in opposite Y direction.
+                        //In that case it does not matter which is the selected rectangle. Hece we leave the already selected rectangle as the better fit.
+                    }
+                }
+            }
+        }
+    }
+}
 
 /*!
     Check if the left edge of moving rect is snappable to the incative rect's left or right edge.
@@ -273,141 +319,80 @@
 {
     checkInactiveRectLieAboveOrBelowOfMovingRect();
 
-    //calculate the distance of the moving rect's left edge to the inactive rect's left and right edges
-    qreal leftToLeftOfInactiveRect = qAbs(mInactiveRectToCompare.left() - mMovingRect.left());
-    qreal leftToRightOfInactiveRect = qAbs(mInactiveRectToCompare.right() - mMovingRect.left());
-    mLeftInRange = false;
-    mRightInRange = false;
-
-    if (leftToLeftOfInactiveRect <= mMinVerticalEdgesDistance) {
-        if (mRectLieAbove && mInactiveSnapRectToCompare.isLeftSnapableForBelow
-         || !mRectLieAbove && mInactiveSnapRectToCompare.isLeftSnapableForAbove) { 
-            mLeftInRange = true;
-        }
-    }
-    if (leftToRightOfInactiveRect <= mMinVerticalEdgesDistance) {
-        if (mRectLieAbove && mInactiveSnapRectToCompare.isRightSnapableForBelow
-         || !mRectLieAbove && mInactiveSnapRectToCompare.isRightSnapableForAbove) {
-            mRightInRange = true;
-        }
-    }
+    checkInactiveRectVerticalEdgesInRange(mMovingRect.left());
 
     //calculate the distance of inactive rect's left edge and container rect's left edge
     qreal differenceContainerLeftEdgeToInactiveRectLeftEdge = mInactiveRectToCompare.left() - mContainerRect.left();
     //calculate the distance of inactive rect's right edge and container rect's right edge
     qreal differenceContainerRightEdgeToInactiveRectRightEdge = mContainerRect.right() - mInactiveRectToCompare.right();
-
-    qreal minDistancePosition = 0.0;
-    qreal distanceVerticalEdges = 0.0;
     qreal xSnapGapAdjustment = 0.0;
+    mDistanceVerticalEdges = 0.0;
+    mMinDistancePosition = 0.0;
 
     //If only one edge of inactive rect is in snappable range, save that position
     if ((mLeftInRange && !mRightInRange)
         || !mLeftInRange && mRightInRange) {
         if (mLeftInRange) {
-            minDistancePosition = mInactiveRectToCompare.left();
-            distanceVerticalEdges = leftToLeftOfInactiveRect;
+            mMinDistancePosition = mInactiveRectToCompare.left();
+            mDistanceVerticalEdges = mVerticalEdgeToLeftOfInactiveRect;
             xSnapGapAdjustment = 0.0;
         }
         else {
-            minDistancePosition = mInactiveRectToCompare.right();
-            distanceVerticalEdges = leftToRightOfInactiveRect;
+            mMinDistancePosition = mInactiveRectToCompare.right();
+            mDistanceVerticalEdges = mVerticalEdgeToRightOfInactiveRect;
             xSnapGapAdjustment = mSnapGap;
         }
     }
     //else both edges of inactive rect are in range, check which is a better fit
     else if (mLeftInRange && mRightInRange) {
         //if left edge of moving rect to the left of the inactive rect is closer than the left edge of moving rect to the right of the inactive rect
-        if (leftToLeftOfInactiveRect < leftToRightOfInactiveRect) {
-            minDistancePosition = mInactiveRectToCompare.left();
-            distanceVerticalEdges = leftToLeftOfInactiveRect;
+        if (mVerticalEdgeToLeftOfInactiveRect < mVerticalEdgeToRightOfInactiveRect) {
+            mMinDistancePosition = mInactiveRectToCompare.left();
+            mDistanceVerticalEdges = mVerticalEdgeToLeftOfInactiveRect;
             xSnapGapAdjustment = 0.0;
             mRightInRange = false;
         }
         //if the left edge of inactive rect to left of moving rect is at the same distance as the right edge of inactive rect to the right of moving rect
-        else if (leftToLeftOfInactiveRect == leftToRightOfInactiveRect) {
+        else if (mVerticalEdgeToLeftOfInactiveRect == mVerticalEdgeToRightOfInactiveRect) {
             //if inactive rect lies towards the left or middle of container rect, then the left edge is priortized as the selected edge for outside snapping 
             if (differenceContainerLeftEdgeToInactiveRectLeftEdge <= differenceContainerRightEdgeToInactiveRectRightEdge) { 
-                minDistancePosition = mInactiveRectToCompare.left();
-                distanceVerticalEdges = leftToLeftOfInactiveRect;
+                mMinDistancePosition = mInactiveRectToCompare.left();
+                mDistanceVerticalEdges = mVerticalEdgeToLeftOfInactiveRect;
                 xSnapGapAdjustment = 0.0;
                 mRightInRange = false;
             }
             //else right of the inactive rect lies more close to the right of the container rect, and hence prioritize it for snapping.
             else {
-                minDistancePosition = mInactiveRectToCompare.right();
-                distanceVerticalEdges = leftToRightOfInactiveRect;
+                mMinDistancePosition = mInactiveRectToCompare.right();
+                mDistanceVerticalEdges = mVerticalEdgeToRightOfInactiveRect;
                 xSnapGapAdjustment = mSnapGap;
                 mLeftInRange = false;
             }
         }
         //else right edge of inactive rect to the left of the moving rect is closer than the left edge of inactive rect to the left of the moving rect
         else{
-            minDistancePosition = mInactiveRectToCompare.right();
-            distanceVerticalEdges = leftToRightOfInactiveRect;
+            mMinDistancePosition = mInactiveRectToCompare.right();
+            mDistanceVerticalEdges = mVerticalEdgeToRightOfInactiveRect;
             xSnapGapAdjustment = mSnapGap;
             mLeftInRange = false;
         }
     }
 
-    //Check if this inactive rect is better fit than the previous selected rect for X - snapping
-    bool horizontalSnappingBetterFit = false;
-    if (mLeftInRange || mRightInRange) {
-        if (distanceVerticalEdges < mMinVerticalEdgesDistance) {
-            horizontalSnappingBetterFit = true;
-        }
-        else if (distanceVerticalEdges == mMinVerticalEdgesDistance) { //the distance in the vertical edges is same as from the selected rectangle
-            //check the position of rect with respect to Vertical line
-            checkInactiveRectPositionToVerticalLine();
-            //if horizontal snap position was previously found the rect's edges are in line with Vertical line
-            if (mHorizontalSnapFound && mRectVerticalEdgeLiesInLineWithVerticalLine) {
-                if (mRectLieAboveVerticalLine || mRectLieBelowVerticalLine) {
-                    extendVerticalLineToIncludeInactiveRect();
-                }
-            }
-            //here the case is that moving rect lies exactly in middle of two same sides of two inactive widgets.
-            else {
-                //Prioritize first on the fact if the inactive rect is closer to the moving rect in Y - direction.
-                if (mVerticalDistance < mVerticalDistanceFromSelectedRect) {
-                    horizontalSnappingBetterFit = true;
-                }
-                else if (mVerticalDistance == mVerticalDistanceFromSelectedRect) {
-                    //Prioritize next if this Inactive rect is closer to the left edge of the container rect, then the previously selected rect
-                    if (differenceContainerLeftEdgeToInactiveRectLeftEdge < mContainerVerticalEdgeDistance) {
-                        horizontalSnappingBetterFit = true;
-                    }
-                    //Prioritize next if the Inactive widget's left edge lies near to left edge of the container rect
-                    else if (differenceContainerLeftEdgeToInactiveRectLeftEdge < differenceContainerRightEdgeToInactiveRectRightEdge) {
-                        horizontalSnappingBetterFit = true;
-                    }
-                    else {
-                        //This else will happen if this rectangle being compared is exactly the same as the selected rectangle for snapping.
-                        //In that case it does not matter which is the selected rectangle. Hence we leave the already selected rectangle as the better fit.
-                    }
-                }
-            }
-        }
-    }
+    //Check if this inactive rect is better fit than the previous selected rect for Horizontal - snapping
+    checkInactiveRectBetterFitForHorizontalSnapping(differenceContainerLeftEdgeToInactiveRectLeftEdge,
+                                                    differenceContainerRightEdgeToInactiveRectRightEdge);
 
-    if (horizontalSnappingBetterFit) {
-        qreal proposedRightOfActiveRect = minDistancePosition + xSnapGapAdjustment + mActiveRectWidth;
+    if (mIsBetterFitHorizontalSnap) {
+        qreal proposedRightOfActiveRect = mMinDistancePosition + xSnapGapAdjustment + mActiveRectWidth;
         if (qBound(mContainerRect.left(), proposedRightOfActiveRect, mContainerRect.right())
             == proposedRightOfActiveRect) {
             mHorizontalSnapFound = true;
-            mHorizontalSnapPosition = minDistancePosition + xSnapGapAdjustment;
-            mMinVerticalEdgesDistance = distanceVerticalEdges;
+            mHorizontalSnapPosition = mMinDistancePosition + xSnapGapAdjustment;
+            mMinVerticalEdgesDistance = mDistanceVerticalEdges;
             mVerticalDistanceFromSelectedRect = mVerticalDistance;
             //Save the new distance of the Chosen Rectangle's left edge from Container's left edge
             mContainerVerticalEdgeDistance = differenceContainerLeftEdgeToInactiveRectLeftEdge;
-
-            if (mRectLieAbove) {
-                mVerticalLine.setP1(QPointF(minDistancePosition, mInactiveRectToCompare.top()));
-                mVerticalLine.setP2(QPointF(minDistancePosition, mMovingRect.bottom()));
-            }
-            else {
-                mVerticalLine.setP1(QPointF(minDistancePosition, mInactiveRectToCompare.bottom()));
-                mVerticalLine.setP2(QPointF(minDistancePosition, mMovingRect.top()));
-            }
+            createVerticalLine();
         }
     }
 }
@@ -420,143 +405,96 @@
 {
     checkInactiveRectLieAboveOrBelowOfMovingRect();
 
-    //calculate the distance of the moving rect's right edge to the inactive rect's left and right edges
-    qreal rightToLeftOfInactiveRect = qAbs(mInactiveRectToCompare.left() - mMovingRect.right());
-    qreal rightToRightOfInactiveRect = qAbs(mInactiveRectToCompare.right() - mMovingRect.right());
-    mLeftInRange = false;
-    mRightInRange = false;
-
-    if (rightToLeftOfInactiveRect <= mMinVerticalEdgesDistance) {
-        if (mRectLieAbove && mInactiveSnapRectToCompare.isLeftSnapableForBelow
-         || !mRectLieAbove && mInactiveSnapRectToCompare.isLeftSnapableForAbove) {
-            mLeftInRange = true;
-        }
-    }
-    if (rightToRightOfInactiveRect <= mMinVerticalEdgesDistance) {
-        if (mRectLieAbove && mInactiveSnapRectToCompare.isRightSnapableForBelow
-         || !mRectLieAbove && mInactiveSnapRectToCompare.isRightSnapableForAbove) {
-            mRightInRange = true;
-        }
-    }
+    checkInactiveRectVerticalEdgesInRange(mMovingRect.right());
 
     //calculate the distance of inactive rect's left edge and container rect's left edge
     qreal differenceContainerLeftEdgeToInactiveRectLeftEdge = mInactiveRectToCompare.left() - mContainerRect.left();
     //calculate the distance of inactive rect's right edge and container rect's right edge
     qreal differenceContainerRightEdgeToInactiveRectRightEdge = mContainerRect.right() - mInactiveRectToCompare.right();
-    qreal minDistancePosition = 0.0;
-    qreal distanceVerticalEdges = 0.0;
     qreal xSnapGapAdjustment = 0.0;
+    mDistanceVerticalEdges = 0.0;
+    mMinDistancePosition = 0.0;
 
     //If only one edge of inactive rect is in snappable range, save that position
     if ((mLeftInRange && !mRightInRange)
         || !mLeftInRange && mRightInRange) {
         if (mLeftInRange) {
-            minDistancePosition = mInactiveRectToCompare.left();
-            distanceVerticalEdges = rightToLeftOfInactiveRect;
+            mMinDistancePosition = mInactiveRectToCompare.left();
+            mDistanceVerticalEdges = mVerticalEdgeToLeftOfInactiveRect;
             xSnapGapAdjustment = mSnapGap;
         }
         else {
-            minDistancePosition = mInactiveRectToCompare.right();
-            distanceVerticalEdges = rightToRightOfInactiveRect;
+            mMinDistancePosition = mInactiveRectToCompare.right();
+            mDistanceVerticalEdges = mVerticalEdgeToRightOfInactiveRect;
             xSnapGapAdjustment = 0.0;
         }
     }
     //else both edges of inactive rect are in range, check which is a better fit
     else if (mLeftInRange && mRightInRange) {
         //if right edge of moving rect to the right of the inactive rect is closer than the right edge of moving rect to the left of inactive rect
-        if (rightToRightOfInactiveRect < rightToLeftOfInactiveRect) {
-            minDistancePosition = mInactiveRectToCompare.right();
-            distanceVerticalEdges = rightToRightOfInactiveRect;
+        if (mVerticalEdgeToRightOfInactiveRect < mVerticalEdgeToLeftOfInactiveRect) {
+            mMinDistancePosition = mInactiveRectToCompare.right();
+            mDistanceVerticalEdges = mVerticalEdgeToRightOfInactiveRect;
             xSnapGapAdjustment = 0.0;
             mLeftInRange = false;
         }
         //if the right edge of moving rect to right of inactive rect is at the same distance as the right edge of moving rect to the left of inactive rect
-        else if (rightToRightOfInactiveRect == rightToLeftOfInactiveRect) {
+        else if (mVerticalEdgeToRightOfInactiveRect == mVerticalEdgeToLeftOfInactiveRect) {
             //if inactive rect lies towards the right of container rect, then the right edge is priortized as the selected edge for outside snapping
             if (differenceContainerRightEdgeToInactiveRectRightEdge < differenceContainerLeftEdgeToInactiveRectLeftEdge ) { 
-                minDistancePosition = mInactiveRectToCompare.right();
-                distanceVerticalEdges = rightToRightOfInactiveRect;
+                mMinDistancePosition = mInactiveRectToCompare.right();
+                mDistanceVerticalEdges = mVerticalEdgeToRightOfInactiveRect;
                 xSnapGapAdjustment = 0.0;
                 mLeftInRange = false;
             }
             //else left of the inactive rect lies more close to the left or middle of the container rect, and hence prioritize it
             else {
-                minDistancePosition = mInactiveRectToCompare.left();
-                distanceVerticalEdges = rightToLeftOfInactiveRect;
+                mMinDistancePosition = mInactiveRectToCompare.left();
+                mDistanceVerticalEdges = mVerticalEdgeToLeftOfInactiveRect;
                 xSnapGapAdjustment = mSnapGap;
                 mRightInRange = false;
             }
         }
         //else right edge of moving rect to the left of the inactive rect is closer than the right edge of moving rect to the right of the incoming rect
         else{
-            minDistancePosition = mInactiveRectToCompare.left();
-            distanceVerticalEdges = rightToLeftOfInactiveRect;
+            mMinDistancePosition = mInactiveRectToCompare.left();
+            mDistanceVerticalEdges = mVerticalEdgeToLeftOfInactiveRect;
             xSnapGapAdjustment = mSnapGap;
             mRightInRange = false;
         }
     }
 
     //Check if this inactive rect is better fit than the previous selected rect 
-    bool horizontalSnappingBetterFit = false;
-    if (mLeftInRange || mRightInRange) {
-        if (distanceVerticalEdges < mMinVerticalEdgesDistance) {
-            horizontalSnappingBetterFit = true;
-        }
-        else if (distanceVerticalEdges == mMinVerticalEdgesDistance) { //the distance in the vertical edge is same as from the selected rectangle
-            //check the position of rect with respect to Vertical line
-            checkInactiveRectPositionToVerticalLine();
-            //if horizontal snap position was previously found and the rect's edge is in line with Vertical line
-            if (mHorizontalSnapFound && mRectVerticalEdgeLiesInLineWithVerticalLine) {
-                if (mRectLieAboveVerticalLine || mRectLieBelowVerticalLine) {
-                    extendVerticalLineToIncludeInactiveRect();
-                }
-            }
-            //here the case is that moving rect lies exactly in middle of two same sides of two inactive widgets.
-            else {
-                //Prioritize first on the fact if the inactive rect is closer to the moving rect in Y - direction.
-                if (mVerticalDistance < mVerticalDistanceFromSelectedRect) {
-                    horizontalSnappingBetterFit = true;
-                }
-                else if (mVerticalDistance == mVerticalDistanceFromSelectedRect) {
-                    //Prioritize next if this Inactive rect is closer to the right edge of the container rect, then the previously selected rect
-                    if (differenceContainerRightEdgeToInactiveRectRightEdge < mContainerVerticalEdgeDistance) {
-                        horizontalSnappingBetterFit = true;
-                    }
-                    //Prioritize next if the Inactive rect's right edge lies near to right edge of the container rect
-                    else if (differenceContainerRightEdgeToInactiveRectRightEdge < differenceContainerLeftEdgeToInactiveRectLeftEdge) {
-                        horizontalSnappingBetterFit = true;
-                    }
-                    else {
-                        //This else will happen if this rectangle being compared is exactly the same as the selected rectangle for snapping, but in opposite Y direction.
-                        //In that case it does not matter which is the selected rectangle. Hece we leave the already selected rectangle as the better fit.
-                    }
-                }
-            }
-        }
-    }
+    checkInactiveRectBetterFitForHorizontalSnapping(differenceContainerRightEdgeToInactiveRectRightEdge,
+                                                    differenceContainerLeftEdgeToInactiveRectLeftEdge);
 
-    if (horizontalSnappingBetterFit) {
-        qreal proposedLeftOfActiveRect = minDistancePosition - mActiveRectWidth - xSnapGapAdjustment;
+    if (mIsBetterFitHorizontalSnap) {
+        qreal proposedLeftOfActiveRect = mMinDistancePosition - mActiveRectWidth - xSnapGapAdjustment;
         if (qBound(mContainerRect.left(), proposedLeftOfActiveRect, mContainerRect.right())
             == proposedLeftOfActiveRect) {
             mHorizontalSnapFound = true;
             mHorizontalSnapPosition = proposedLeftOfActiveRect;
-            mMinVerticalEdgesDistance = distanceVerticalEdges;
+            mMinVerticalEdgesDistance = mDistanceVerticalEdges;
             mVerticalDistanceFromSelectedRect = mVerticalDistance;
             //Save the new distance of the Chosen Rectangle's right edge from Container's right edge
             mContainerVerticalEdgeDistance = differenceContainerRightEdgeToInactiveRectRightEdge;
+            createVerticalLine();
+        }
+    }
+}
 
-            if (mRectLieAbove) {
-                //save the points for the Vertical line
-                mVerticalLine.setP1(QPointF(minDistancePosition, mInactiveRectToCompare.top()));
-                mVerticalLine.setP2(QPointF(minDistancePosition, mMovingRect.bottom()));
-            }
-            else {
-                //save the points for the Vertical line
-                mVerticalLine.setP1(QPointF(minDistancePosition, mInactiveRectToCompare.bottom()));
-                mVerticalLine.setP2(QPointF(minDistancePosition, mMovingRect.top()));
-            }
-        }
+/*!
+    Create the vertical line for horizontal snap guidance
+*/
+void HsSnapToLines::createVerticalLine()
+{
+    if (mRectLieAbove) {
+        mVerticalLine.setP1(QPointF(mMinDistancePosition, mInactiveRectToCompare.top()));
+        mVerticalLine.setP2(QPointF(mMinDistancePosition, mMovingRect.bottom()));
+    }
+    else {
+        mVerticalLine.setP1(QPointF(mMinDistancePosition, mInactiveRectToCompare.bottom()));
+        mVerticalLine.setP2(QPointF(mMinDistancePosition, mMovingRect.top()));
     }
 }
 
@@ -590,97 +528,49 @@
 }
 
 /*!
-    Check if the top edge of moving rect is snappable to the incative rect's top or bottom edge.
-    The inactive rect's edge is only chosen if it is a better fit for vertical snapping.
+    Check if the Horizontal edges (Top and Bottom Edges) of the inactive rect being compared
+    is in range of the snapping distance of the horizontal edge of moving rect
+    \param movingRectHorizontalEdgePosition Position of the Horizontal edge(either top or bottom) of moving rect.
 */
-void HsSnapToLines::compareTopOfMovingRectForSnapping()
+void HsSnapToLines::checkInactiveRectHorizontalEdgesInRange(qreal movingRectHorizontalEdgePosition)
 {
-    //Check if the inactive rect lies to the left or right of the moving rect
-    checkInactiveRectLieLeftOrRightOfMovingRect();
-
-    //calculate the distance of the moving rect's top edge to the inactive rect's top and bottom edges
-    qreal topToTopOfInactiveRect = qAbs(mInactiveRectToCompare.top() - mMovingRect.top());
-    qreal topToBottomOfInactiveRect = qAbs(mInactiveRectToCompare.bottom() - mMovingRect.top());
     mTopInRange = false;
     mBottomInRange = false;
 
-    if (topToTopOfInactiveRect <= mMinHorizontalEdgesDistance) {
+    //calculate the distance of the moving rect's horizontal edge to the inactive rect's top and bottom edges
+    mHorizontalEdgeToTopOfInactiveRect = qAbs(mInactiveRectToCompare.top() - movingRectHorizontalEdgePosition);
+    mHorizontalEdgeToBottomOfInactiveRect = qAbs(mInactiveRectToCompare.bottom() - movingRectHorizontalEdgePosition);
+
+    if (mHorizontalEdgeToTopOfInactiveRect <= mMinHorizontalEdgesDistance) {
         if (mRectLieLeft && mInactiveSnapRectToCompare.isTopSnapableForRight
          || !mRectLieLeft && mInactiveSnapRectToCompare.isTopSnapableForLeft) {
             mTopInRange = true;
         }
     }
-    if (topToBottomOfInactiveRect <= mMinHorizontalEdgesDistance) {
+    if (mHorizontalEdgeToBottomOfInactiveRect <= mMinHorizontalEdgesDistance) {
         if (mRectLieLeft && mInactiveSnapRectToCompare.isBottomSnapableForRight
          || !mRectLieLeft && mInactiveSnapRectToCompare.isBottomSnapableForLeft) {
             mBottomInRange = true;
         }
     }
-
-    //calculate the distance of inactive rect's top edge and container rect's top edge
-    qreal differenceContainerTopEdgeToInactiveRectTopEdge = mInactiveRectToCompare.top() - mContainerRect.top();
-    //calculate the distance of inactive rect's bottom edge and container rect's bottom edge
-    qreal differenceContainerBottomEdgeToInactiveRectBottomEdge = mContainerRect.bottom() - mInactiveRectToCompare.bottom();
-    qreal minDistancePosition = 0.0;
-    qreal distanceHorizontalEdges = 0.0;
-    qreal ySnapGapAdjustment = 0.0;
+}
 
-    //If only one edge of inactive rect is in snappable range, save that position
-    if ((mTopInRange && !mBottomInRange)
-        || !mTopInRange && mBottomInRange) {
-        if (mTopInRange) {
-            minDistancePosition = mInactiveRectToCompare.top();
-            distanceHorizontalEdges = topToTopOfInactiveRect;
-            ySnapGapAdjustment = 0.0;
-        }
-        else {
-            minDistancePosition = mInactiveRectToCompare.bottom();
-            distanceHorizontalEdges = topToBottomOfInactiveRect;
-            ySnapGapAdjustment = mSnapGap;
-        }
-    }
-    //else both edges of inactive rect are in range, check which is a better fit
-    else if (mTopInRange && mBottomInRange) {
-        //if top edge of moving rect to the top of the inactive rect is closer than the bottom edge of moving rect to the bottom of the inactive rect
-        if (topToTopOfInactiveRect < topToBottomOfInactiveRect) {
-            minDistancePosition = mInactiveRectToCompare.top();
-            distanceHorizontalEdges = topToTopOfInactiveRect;
-            ySnapGapAdjustment = 0.0;
-            mBottomInRange = false;
+/*!
+    Check if this inactive rect is better fit for Vertical snapping
+    \param containerHorizontalEdgeToInactiveRectHorizontalEdge
+           difference between the horizontal edge of the container and same horizontal edge of inactive rect
+    \param containerOtherHorizontalEdgeToInactiveRectOtherHorizontalEdge
+           difference between the opposite horizontal edges of continer and the inactive rect
+*/
+void HsSnapToLines::checkInactiveRectBetterFitForVerticalSnapping(qreal containerHorizontalEdgeToInactiveRectHorizontalEdge,
+                                                       qreal containerOtherHorizontalEdgeToInactiveRectOtherHorizontalEdge)
+{
+    mIsBetterFitVerticalSnap = false;
+    if (mTopInRange || mBottomInRange) {
+        if (mDistanceHorizontalEdges < mMinHorizontalEdgesDistance) {
+            mIsBetterFitVerticalSnap = true;
         }
-        //if the top edge of moving rect to top of inactive rect is at the same distance as the top edge of moving rect to the bottom of inactive rect
-        else if (topToTopOfInactiveRect == topToBottomOfInactiveRect) {
-            //if inactive rect lies towards the top or middle of container rect, then the top edge is priortized as the selected edge for outside snapping
-            if (differenceContainerTopEdgeToInactiveRectTopEdge <= differenceContainerBottomEdgeToInactiveRectBottomEdge) { 
-                minDistancePosition = mInactiveRectToCompare.top();
-                distanceHorizontalEdges = topToTopOfInactiveRect;
-                ySnapGapAdjustment = 0.0;
-                mBottomInRange = false;
-            }
-            //else bottom of the inactive rect lies more close to the bottom of the container rect, and hence prioritize it for snapping.
-            else {
-                minDistancePosition = mInactiveRectToCompare.bottom();
-                distanceHorizontalEdges = topToBottomOfInactiveRect;
-                ySnapGapAdjustment = mSnapGap;
-                mTopInRange = false;
-            }
-        }
-        //else top edge of moving rect to the bottom of the inactive rect is closer than the top edge of moving rect to the top of the inactive rect
-        else{
-            minDistancePosition = mInactiveRectToCompare.bottom();
-            distanceHorizontalEdges = topToBottomOfInactiveRect;
-            ySnapGapAdjustment = mSnapGap;
-            mTopInRange = false;
-        }
-    }
-
-    //Check if this inactive rect is better fit than the previous selected rect 
-    bool verticalSnappingBetterFit = false;
-    if (mTopInRange || mBottomInRange) {
-        if (distanceHorizontalEdges < mMinHorizontalEdgesDistance) {
-            verticalSnappingBetterFit = true;
-        }
-        else if (distanceHorizontalEdges == mMinHorizontalEdgesDistance) { //the distance in the horizontal edge is same as from the selected rectangle
+        else if (mDistanceHorizontalEdges == mMinHorizontalEdgesDistance) { //the distance in the horizontal edge is same as from the selected rectangle
             //check the position of rect with respect to horizontal line
             checkInactiveRectPositionToHorizontalLine();
             //if vertical snap position was already found and this rect's horizontal edges lies in line with Horizontal snap line
@@ -692,16 +582,16 @@
             else {
                 //Prioritize first on the fact if the inactive rect is closer to the moving rect in X - direction.
                 if (mHorizontalDistance < mHorizontalDistanceFromSelectedRect) {
-                    verticalSnappingBetterFit = true;
+                    mIsBetterFitVerticalSnap = true;
                 }
                 else if (mHorizontalDistance == mHorizontalDistanceFromSelectedRect) {
                     //Prioritize next if this Inactive rect is closer to the top edge of the container rect, then the previously selected rect
-                    if (differenceContainerTopEdgeToInactiveRectTopEdge < mContainerHorizontalEdgeDistance) {
-                        verticalSnappingBetterFit = true;
+                    if (containerHorizontalEdgeToInactiveRectHorizontalEdge < mContainerHorizontalEdgeDistance) {
+                        mIsBetterFitVerticalSnap = true;
                     }
                     //Prioritize next if the Inactive widget's top edge lies near to top edge of the container rect
-                    else if (differenceContainerTopEdgeToInactiveRectTopEdge < differenceContainerBottomEdgeToInactiveRectBottomEdge) {
-                        verticalSnappingBetterFit = true;
+                    else if (containerHorizontalEdgeToInactiveRectHorizontalEdge < containerOtherHorizontalEdgeToInactiveRectOtherHorizontalEdge) {
+                        mIsBetterFitVerticalSnap = true;
                     }
                     else {
                         //This else will happen if this rectangle being compared is exactly the same as the selected rectangle for snapping, or in opposite X direction.
@@ -712,27 +602,91 @@
         }
     }
 
-    if (verticalSnappingBetterFit) {
-        qreal proposedBottomOfActiveRect = minDistancePosition + mActiveRectHeight + ySnapGapAdjustment;
+}
+
+/*!
+    Check if the top edge of moving rect is snappable to the incative rect's top or bottom edge.
+    The inactive rect's edge is only chosen if it is a better fit for vertical snapping.
+*/
+void HsSnapToLines::compareTopOfMovingRectForSnapping()
+{
+    //Check if the inactive rect lies to the left or right of the moving rect
+    checkInactiveRectLieLeftOrRightOfMovingRect();
+
+    checkInactiveRectHorizontalEdgesInRange(mMovingRect.top());
+
+    //calculate the distance of inactive rect's top edge and container rect's top edge
+    qreal differenceContainerTopEdgeToInactiveRectTopEdge = mInactiveRectToCompare.top() - mContainerRect.top();
+    //calculate the distance of inactive rect's bottom edge and container rect's bottom edge
+    qreal differenceContainerBottomEdgeToInactiveRectBottomEdge = mContainerRect.bottom() - mInactiveRectToCompare.bottom();
+    qreal ySnapGapAdjustment = 0.0;
+    mDistanceHorizontalEdges = 0.0;
+    mMinDistancePosition = 0.0;
+
+    //If only one edge of inactive rect is in snappable range, save that position
+    if ((mTopInRange && !mBottomInRange)
+        || !mTopInRange && mBottomInRange) {
+        if (mTopInRange) {
+            mMinDistancePosition = mInactiveRectToCompare.top();
+            mDistanceHorizontalEdges = mHorizontalEdgeToTopOfInactiveRect;
+            ySnapGapAdjustment = 0.0;
+        }
+        else {
+            mMinDistancePosition = mInactiveRectToCompare.bottom();
+            mDistanceHorizontalEdges = mHorizontalEdgeToBottomOfInactiveRect;
+            ySnapGapAdjustment = mSnapGap;
+        }
+    }
+    //else both edges of inactive rect are in range, check which is a better fit
+    else if (mTopInRange && mBottomInRange) {
+        //if top edge of moving rect to the top of the inactive rect is closer than the bottom edge of moving rect to the bottom of the inactive rect
+        if (mHorizontalEdgeToTopOfInactiveRect < mHorizontalEdgeToBottomOfInactiveRect) {
+            mMinDistancePosition = mInactiveRectToCompare.top();
+            mDistanceHorizontalEdges = mHorizontalEdgeToTopOfInactiveRect;
+            ySnapGapAdjustment = 0.0;
+            mBottomInRange = false;
+        }
+        //if the top edge of moving rect to top of inactive rect is at the same distance as the top edge of moving rect to the bottom of inactive rect
+        else if (mHorizontalEdgeToTopOfInactiveRect == mHorizontalEdgeToBottomOfInactiveRect) {
+            //if inactive rect lies towards the top or middle of container rect, then the top edge is priortized as the selected edge for outside snapping
+            if (differenceContainerTopEdgeToInactiveRectTopEdge <= differenceContainerBottomEdgeToInactiveRectBottomEdge) { 
+                mMinDistancePosition = mInactiveRectToCompare.top();
+                mDistanceHorizontalEdges = mHorizontalEdgeToTopOfInactiveRect;
+                ySnapGapAdjustment = 0.0;
+                mBottomInRange = false;
+            }
+            //else bottom of the inactive rect lies more close to the bottom of the container rect, and hence prioritize it for snapping.
+            else {
+                mMinDistancePosition = mInactiveRectToCompare.bottom();
+                mDistanceHorizontalEdges = mHorizontalEdgeToBottomOfInactiveRect;
+                ySnapGapAdjustment = mSnapGap;
+                mTopInRange = false;
+            }
+        }
+        //else top edge of moving rect to the bottom of the inactive rect is closer than the top edge of moving rect to the top of the inactive rect
+        else{
+            mMinDistancePosition = mInactiveRectToCompare.bottom();
+            mDistanceHorizontalEdges = mHorizontalEdgeToBottomOfInactiveRect;
+            ySnapGapAdjustment = mSnapGap;
+            mTopInRange = false;
+        }
+    }
+
+    //Check if this inactive rect is better fit than the previous selected rect 
+    checkInactiveRectBetterFitForVerticalSnapping(differenceContainerTopEdgeToInactiveRectTopEdge,
+                                                  differenceContainerBottomEdgeToInactiveRectBottomEdge);
+
+    if (mIsBetterFitVerticalSnap) {
+        qreal proposedBottomOfActiveRect = mMinDistancePosition + mActiveRectHeight + ySnapGapAdjustment;
         if (qBound(mContainerRect.top(), proposedBottomOfActiveRect, mContainerRect.bottom())
             == proposedBottomOfActiveRect) {
             mVerticalSnapFound = true;
-            mVerticalSnapPosition = minDistancePosition + ySnapGapAdjustment;
-            mMinHorizontalEdgesDistance = distanceHorizontalEdges;
+            mVerticalSnapPosition = mMinDistancePosition + ySnapGapAdjustment;
+            mMinHorizontalEdgesDistance = mDistanceHorizontalEdges;
             mHorizontalDistanceFromSelectedRect = mHorizontalDistance;
             //Save the new distance of the Chosen Rectangle's top edge from Container's top edge
             mContainerHorizontalEdgeDistance = differenceContainerTopEdgeToInactiveRectTopEdge;
-
-            if (mRectLieLeft) {
-                //save the points for the Horizontal line
-                mHorizontalLine.setP1(QPointF(mInactiveRectToCompare.left(), minDistancePosition));
-                mHorizontalLine.setP2(QPointF(mMovingRect.right(), minDistancePosition));
-            }
-            else {
-                //save the points for the Horizontal line
-                mHorizontalLine.setP1(QPointF(mInactiveRectToCompare.right(), minDistancePosition));
-                mHorizontalLine.setP2(QPointF(mMovingRect.left(), minDistancePosition));
-            }
+            createHorizontalLine();
         }
     }
 }
@@ -747,142 +701,99 @@
     checkInactiveRectLieLeftOrRightOfMovingRect();
 
     //calculate the distance of the moving rect's bottom edge to the inactive rect's top and bottom edges
-    qreal bottomToTopOfInactiveRect = qAbs(mInactiveRectToCompare.top() - mMovingRect.bottom());
-    qreal bottomToBottomOfInactiveRect = qAbs(mInactiveRectToCompare.bottom() - mMovingRect.bottom());
-    mTopInRange = false;
-    mBottomInRange = false;
-
-    if (bottomToTopOfInactiveRect <= mMinHorizontalEdgesDistance) {
-        if (mRectLieLeft && mInactiveSnapRectToCompare.isTopSnapableForRight
-         || !mRectLieLeft && mInactiveSnapRectToCompare.isTopSnapableForLeft) {
-            mTopInRange = true;
-        }
-    }
-    if (bottomToBottomOfInactiveRect <= mMinHorizontalEdgesDistance) {
-        if (mRectLieLeft && mInactiveSnapRectToCompare.isBottomSnapableForRight
-         || !mRectLieLeft && mInactiveSnapRectToCompare.isBottomSnapableForLeft) {
-            mBottomInRange = true;
-        }
-    }
+    checkInactiveRectHorizontalEdgesInRange(mMovingRect.bottom());
 
     //calculate the distance of inactive rect's top edge and container rect's top edge
     qreal differenceContainerTopEdgeToInactiveRectTopEdge = mInactiveRectToCompare.top() - mContainerRect.top();
     //calculate the distance of inactive rect's bottom edge and container rect's bottom edge
     qreal differenceContainerBottomEdgeToInactiveRectBottomEdge = mContainerRect.bottom() - mInactiveRectToCompare.bottom();
-    qreal minDistancePosition = 0.0;
-    qreal distanceHorizontalEdges = 0.0;
     qreal ySnapGapAdjustment = 0.0;
+    mDistanceHorizontalEdges = 0.0;
+    mMinDistancePosition = 0.0;
 
     //If only one edge of inactive rect is in snappable range, save that position
     if ((mTopInRange && !mBottomInRange)
         || !mTopInRange && mBottomInRange) {
         if (mTopInRange) {
-            minDistancePosition = mInactiveRectToCompare.top();
-            distanceHorizontalEdges = bottomToTopOfInactiveRect;
+            mMinDistancePosition = mInactiveRectToCompare.top();
+            mDistanceHorizontalEdges = mHorizontalEdgeToTopOfInactiveRect;
             ySnapGapAdjustment = mSnapGap;
         }
         else {
-            minDistancePosition = mInactiveRectToCompare.bottom();
-            distanceHorizontalEdges = bottomToBottomOfInactiveRect;
+            mMinDistancePosition = mInactiveRectToCompare.bottom();
+            mDistanceHorizontalEdges = mHorizontalEdgeToBottomOfInactiveRect;
             ySnapGapAdjustment = 0.0;
         }
     }
     //else both edges of inactive rect are in range, check which is a better fit
     else if (mTopInRange && mBottomInRange) {
         //if bottom edge of moving rect to the bottom of inactive rect is closer than the bottom edge of moving rect to the top of the inactive rect
-        if (bottomToBottomOfInactiveRect < bottomToTopOfInactiveRect ) {
-            minDistancePosition = mInactiveRectToCompare.bottom();
-            distanceHorizontalEdges = bottomToBottomOfInactiveRect;
+        if (mHorizontalEdgeToBottomOfInactiveRect < mHorizontalEdgeToTopOfInactiveRect ) {
+            mMinDistancePosition = mInactiveRectToCompare.bottom();
+            mDistanceHorizontalEdges = mHorizontalEdgeToBottomOfInactiveRect;
             ySnapGapAdjustment = 0.0;
             mTopInRange = false;
         }
         //if bottom edge of moving rect to the bottom of inactive rect is at the same distance as the bottom edge of moving rect to the top of inactive rect
-        else if (bottomToBottomOfInactiveRect == bottomToTopOfInactiveRect) {
+        else if (mHorizontalEdgeToBottomOfInactiveRect == mHorizontalEdgeToTopOfInactiveRect) {
             //if inactive rect lies towards the bottom of container rect, then the bottom edge is priortized as the selected edge for snapping
             //This is done for outside snapping
             if (differenceContainerBottomEdgeToInactiveRectBottomEdge < differenceContainerTopEdgeToInactiveRectTopEdge) {
-                minDistancePosition = mInactiveRectToCompare.bottom();
-                distanceHorizontalEdges = bottomToBottomOfInactiveRect;
+                mMinDistancePosition = mInactiveRectToCompare.bottom();
+                mDistanceHorizontalEdges = mHorizontalEdgeToBottomOfInactiveRect;
                 ySnapGapAdjustment = 0.0;
                 mTopInRange = false;
             }
             //else top of the inactive rect lies more close to the top of the container rect or at the same distance, and hence prioritize it
             else {
-                minDistancePosition = mInactiveRectToCompare.top();
-                distanceHorizontalEdges = bottomToTopOfInactiveRect;
+                mMinDistancePosition = mInactiveRectToCompare.top();
+                mDistanceHorizontalEdges = mHorizontalEdgeToTopOfInactiveRect;
                 ySnapGapAdjustment = mSnapGap;
                 mBottomInRange = false;
             }
         }
         //else bottom edge of moving rect to the top of inactive rect is closer than the bottom edge of moving rect to the bottom of the inactive rect
         else{
-            minDistancePosition = mInactiveRectToCompare.top();
-            distanceHorizontalEdges = bottomToTopOfInactiveRect;
+            mMinDistancePosition = mInactiveRectToCompare.top();
+            mDistanceHorizontalEdges = mHorizontalEdgeToTopOfInactiveRect;
             ySnapGapAdjustment = mSnapGap;
             mBottomInRange = false;
         }
     }
 
     //Check if this inactive rect is better fit than the previous selected rect 
-    bool verticalSnappingBetterFit = false;
-    if (mTopInRange || mBottomInRange) {
-        if (distanceHorizontalEdges < mMinHorizontalEdgesDistance) {
-            verticalSnappingBetterFit = true;
-        }
-        else if (distanceHorizontalEdges == mMinHorizontalEdgesDistance) { //the distance in the horizontal edge is same as from the selected rectangle
-            //check the position of rect with respect to horizontal line
-            checkInactiveRectPositionToHorizontalLine();
-            //if vertical snap was already found and the horizontal line of rect is in line with horizontal snap line
-            if (mVerticalSnapFound && mRectHorizontalEdgeLiesInLineWithHorizontalLine) {
-                if (mRectLieLeftOfHorizontalLine || mRectLiesRightOfHorizontalLine) {
-                    extendHorizontalLineToIncludeInactiveRect();
-                }
-            }
-            else {
-                //Prioritize first on the fact if the inactive rect is closer to the moving rect in X - direction.
-                if (mHorizontalDistance < mHorizontalDistanceFromSelectedRect) {
-                    verticalSnappingBetterFit = true;
-                }
-                else if (mHorizontalDistance == mHorizontalDistanceFromSelectedRect) {
-                    //Prioritize next if this Inactive rect is closer to the bottom edge of the container rect, then the previously selected rect
-                    if (differenceContainerBottomEdgeToInactiveRectBottomEdge < mContainerHorizontalEdgeDistance) {
-                        verticalSnappingBetterFit = true;
-                    }
-                    //Prioritize next if the Inactive widget's bottom edge lies near to bottom edge of the container rect
-                    else if (differenceContainerBottomEdgeToInactiveRectBottomEdge < differenceContainerTopEdgeToInactiveRectTopEdge) {
-                        verticalSnappingBetterFit = true;
-                    }
-                    else {
-                        //This else will happen if this rectangle being compared is exactly the same as the selected rectangle for snapping, or in opposite X direction.
-                        //In that case it does not matter which is the selected rectangle. Hence we leave the already selected rectangle as the better fit.
-                    }
-                }
-            }
-        }
-    }
+    checkInactiveRectBetterFitForVerticalSnapping(differenceContainerBottomEdgeToInactiveRectBottomEdge,
+                                                  differenceContainerTopEdgeToInactiveRectTopEdge);
 
-    if (verticalSnappingBetterFit) {
-        qreal proposedTopOfActiveRect = minDistancePosition - mActiveRectHeight - ySnapGapAdjustment;
+    if (mIsBetterFitVerticalSnap) {
+        qreal proposedTopOfActiveRect = mMinDistancePosition - mActiveRectHeight - ySnapGapAdjustment;
         if (qBound(mContainerRect.top(), proposedTopOfActiveRect, mContainerRect.bottom())
             == proposedTopOfActiveRect) {
             mVerticalSnapFound = true;
             mVerticalSnapPosition = proposedTopOfActiveRect;
-            mMinHorizontalEdgesDistance = distanceHorizontalEdges;
+            mMinHorizontalEdgesDistance = mDistanceHorizontalEdges;
             mHorizontalDistanceFromSelectedRect = mHorizontalDistance;
             //Save the new distance of the Selected Rectangle's bottom edge from Container's bottom edge
             mContainerHorizontalEdgeDistance = differenceContainerBottomEdgeToInactiveRectBottomEdge;
+            createHorizontalLine();
+        }
+    }
+}
 
-            if (mRectLieLeft) {
-                //save the points for the Horizontal line
-                mHorizontalLine.setP1(QPointF(mInactiveRectToCompare.left(), minDistancePosition));
-                mHorizontalLine.setP2(QPointF(mMovingRect.right(), minDistancePosition));
-            }
-            else {
-                //save the points for the Horizontal line
-                mHorizontalLine.setP1(QPointF(mInactiveRectToCompare.right(), minDistancePosition));
-                mHorizontalLine.setP2(QPointF(mMovingRect.left(), minDistancePosition));
-            }
-        }
+/*!
+    Create the horizontal line for vertical snap guidance
+*/
+void HsSnapToLines::createHorizontalLine()
+{
+    if (mRectLieLeft) {
+        //save the points for the Horizontal line
+        mHorizontalLine.setP1(QPointF(mInactiveRectToCompare.left(), mMinDistancePosition));
+        mHorizontalLine.setP2(QPointF(mMovingRect.right(), mMinDistancePosition));
+    }
+    else {
+        //save the points for the Horizontal line
+        mHorizontalLine.setP1(QPointF(mInactiveRectToCompare.right(), mMinDistancePosition));
+        mHorizontalLine.setP2(QPointF(mMovingRect.left(), mMinDistancePosition));
     }
 }

--- a/homescreenapp/inc/hsapp_defs.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/inc/hsapp_defs.h	Wed Aug 18 09:40:07 2010 +0300
@@ -42,12 +42,14 @@
 inline const QString menuModeType();
 inline const QString swTypeKey();
 inline const QString javaSwType();
+static const char *const HS_CWRT_APP_TYPE="cwrt";
+static const char *const HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE="wrtwidgetuiplugin";
 inline const QString packageTypeName();
 inline const QString appSettingsPlugin();
 inline const QString groupNameAttributeName();
 inline const QString componentIdAttributeName();
 inline const QString entryShortName();
-inline const QString appLibActivity();
+
 // Sort attribute
 enum HsSortAttribute {
     NoHsSortAttribute,
@@ -71,7 +73,8 @@
     RenameContextAction, 
     DeleteContextAction, 
     RemoveFromCollectionContextAction,
-    AppDetailsContextAction
+    AppDetailsContextAction,
+    OpenContextAction
 };
 
 
@@ -86,7 +89,7 @@
 const char SNAPENABLED[] = "snapenabled";
 const char SNAPFORCE[] = "snapforce";
 const char SNAPGAP[] = "snapgap";
-const char SNAPBORDERGAP[] = "snapbordergap";
+const char PAGEMARGIN[] = "pagemargin";
 const char SNAPLINEFADEINDURATION[] = "snaplinefadeinduration";
 const char SNAPLINEFADEOUTDURATION[] = "snaplinefadeoutduration";

--- a/homescreenapp/inc/hsapp_defs.inl	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/inc/hsapp_defs.inl	Wed Aug 18 09:40:07 2010 +0300
@@ -308,15 +308,6 @@
 }
 
 /*!
-    \return app lib activity name
-*/
-inline const QString appLibActivity()
-{
-    static const QString key("AppLibMainView");
-    return key;
-}
-
-/*!
     \return homescreen activitity name to open idle iew
 */
 inline const QString activityHsIdleView()
@@ -325,5 +316,13 @@
     return key;
 }
 
+/*!
+    \return homescreen activitity name to open applib iew
+*/
+inline const QString activityAppLibMainView()
+{
+    static const QString key("AppLibMainView");
+    return key;
+}
 
 #endif

--- a/homescreenapp/rom/homescreenapp_core.iby	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/rom/homescreenapp_core.iby	Wed Aug 18 09:40:07 2010 +0300
@@ -20,6 +20,7 @@
 
 // ---- 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
 data=\epoc32\data\z\resource\apps\hsapplication.mif             resource\apps\hsapplication.mif
@@ -34,6 +35,9 @@
 data=ZPRIVATE\20022f35\wallpapers\page\2_landscape.png          private\20022f35\wallpapers\page\2_landscape.png
 data=ZPRIVATE\20022f35\wallpapers\page\3_portrait.png           private\20022f35\wallpapers\page\3_portrait.png
 data=ZPRIVATE\20022f35\wallpapers\page\3_landscape.png          private\20022f35\wallpapers\page\3_landscape.png
+data=ZPRIVATE\20022f35\wallpapers\originals\car.png             private\20022f35\wallpapers\originals\car.png
+data=ZPRIVATE\20022f35\wallpapers\originals\shapes.png          private\20022f35\wallpapers\originals\shapes.png
+data=ZPRIVATE\20022f35\wallpapers\originals\shoes.png           private\20022f35\wallpapers\originals\shoes.png
 
 // ---- hswidgetuninstaller --------------------------------------------
 file=ABI_DIR\BUILD_DIR\hswidgetuninstaller.exe            PROGRAMS_DIR\hswidgetuninstaller.exe
@@ -53,12 +57,10 @@
 data=\epoc32\data\z\resource\qt\plugins\hshomescreenclientplugin.qtplugin  resource\qt\plugins\hshomescreenclientplugin.qtplugin
 data=ZPRIVATE\20022f35\hshomescreenclientplugin.xml                        private\20022f35\hshomescreenclientplugin.xml
 
-// ---- runtimeplugins --------------------------------------------
+
 
-// -------- hsdefaultruntimeplugin
-file=ABI_DIR\BUILD_DIR\hsdefaultruntimeplugin.dll                              SHARED_LIB_DIR\hsdefaultruntimeplugin.dll
-data=ZPRIVATE\20022f35\plugins\runtimeplugins\hsdefaultruntimeplugin.qtplugin  private\20022f35\plugins\runtimeplugins\hsdefaultruntimeplugin.qtplugin
-data=ZPRIVATE\20022f35\plugins\runtimeplugins\hsdefaultruntimeplugin.xml       private\20022f35\plugins\runtimeplugins\hsdefaultruntimeplugin.xml
+
+
 
 // ---- serviceproviders --------------------------------------------

--- a/homescreenapp/runtimeplugins/hsdefaultruntimeplugin/hsdefaultruntimeplugin.pri	Tue Jul 06 14:06:53 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +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:
-#
-
-HEADERS += ./inc/hsdefaultruntime.h \
-           ./inc/hsdefaultruntimeplugin.h
-SOURCES += ./src/hsdefaultruntime.cpp \
-           ./src/hsdefaultruntimeplugin.cpp

--- a/homescreenapp/runtimeplugins/hsdefaultruntimeplugin/hsdefaultruntimeplugin.pro	Tue Jul 06 14:06:53 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +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:
-#
-
-TEMPLATE = lib
-CONFIG += plugin hb mobility
-MOBILITY = serviceframework publishsubscribe
-
-PLUGIN_SUBDIR = /private/20022F35/plugins/runtimeplugins
-
-include (../../common.pri)
-
-LIBS += -lhsdomainmodel \
-        -lhsutils
-        
-QT += xml sql
-
-DEPENDPATH += ./inc \
-              ./src
-INCLUDEPATH += ./inc \
-             ../../hsutils/inc \
-             ../../hsdomainmodel/inc \
-
-symbian: {
-    TARGET.UID3 = 0x20022F3E
-    LIBS += -lxqkeycapture
-}
-
-
-include(hsdefaultruntimeplugin.pri)

--- a/homescreenapp/runtimeplugins/hsdefaultruntimeplugin/inc/hsdefaultruntime.h	Tue Jul 06 14:06:53 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +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:  Default implementation of the home screen runtime.
-*
-*/
-
-#ifndef HSDEFAULTRUNTIME_H
-#define HSDEFAULTRUNTIME_H
-
-#include <QStateMachine>
-#include <qmobilityglobal.h>
-
-#ifdef Q_OS_SYMBIAN
-#include <xqkeycapture.h>
-#endif
-
-#ifndef HSDEFAULTRUNTIMEPLUGIN_UNITTEST
-	#define TEST_CLASS_FWD
-	#define TEST_FRIEND
-#else
-	#define TEST_CLASS_FWD class DefaultRuntimePluginTest;
-    #define TEST_FRIEND friend class DefaultRuntimePluginTest;
-#endif
-
-class HsContentService;
-QTM_BEGIN_NAMESPACE
-class QValueSpacePublisher;
-QTM_END_NAMESPACE
-
-QTM_USE_NAMESPACE
-
-TEST_CLASS_FWD
-
-class HsDefaultRuntime : public QStateMachine
-{
-    Q_OBJECT
-
-public:
-    HsDefaultRuntime(QObject *parent = 0);
-    ~HsDefaultRuntime();
-
-signals:
-    void event_exit();
-    void event_toIdle();
-protected:
-    bool eventFilter(QObject *watched, QEvent *event);
-
-private:
-    Q_DISABLE_COPY(HsDefaultRuntime)
-
-    void registerAnimations();
-    void createStatePublisher();
-    void createContentServiceParts();
-    void createStates();
-    void assignServices();
-	void updatePSKeys();
-
-private slots:
-	void onIdleStateEntered();
-	void onIdleStateExited();
-	void activityRequested(const QString &name);
-	
-
-private:
-    HsContentService *mContentService;	
-	
-	bool mHomeScreenActive;
-	bool mIdleStateActive;
-
-	QValueSpacePublisher *mPublisher;
-	
-#ifdef Q_OS_SYMBIAN
-    XqKeyCapture keyCapture;
-#endif
-    
-    TEST_FRIEND
-};
-
-#endif

--- a/homescreenapp/runtimeplugins/hsdefaultruntimeplugin/inc/hsdefaultruntimeplugin.h	Tue Jul 06 14:06:53 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +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:  Default runtime provider.
-*
-*/
-
-#ifndef HSDEFAULTRUNTIMEPLUGIN_H
-#define HSDEFAULTRUNTIMEPLUGIN_H
-
-#include <QObject>
-#include <qserviceplugininterface.h>
-
-QTM_USE_NAMESPACE
-
-class HsDefaultRuntimePlugin : public QObject, public QServicePluginInterface
-{
-    Q_OBJECT
-    Q_INTERFACES(QtMobility::QServicePluginInterface)
-
-public:
-    QObject *createInstance(const QServiceInterfaceDescriptor &descriptor,
-                            QServiceContext *context,
-                            QAbstractSecuritySession *session);
-};
-
-#endif //HSDEFAULTRUNTIMEPLUGIN_H

--- a/homescreenapp/runtimeplugins/hsdefaultruntimeplugin/resource/hsdefaultruntimeplugin.xml	Tue Jul 06 14:06:53 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<service>
-    <name>hsdefaultruntimeplugin</name>
-    <filepath>hsdefaultruntimeplugin</filepath>
-    <description>Homescreen Runtime Plugin</description>
-    <interface>
-        <name>com.nokia.symbian.IHomeScreenRuntime</name>
-        <version>1.0</version>
-        <description>Default implementation for homescreen runtime</description>
-        <capabilities></capabilities>
-    </interface>
-</service>

--- a/homescreenapp/runtimeplugins/hsdefaultruntimeplugin/src/hsdefaultruntime.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,447 +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:  Default implementation of the home screen runtime.
-*
-*/
-
-#include <QState>
-#include <QFinalState>
-#include <QHistoryState>
-#include <QSignalTransition>
-#include <QKeyEventTransition>
-#include <QKeyEvent>
-
-#include <qvaluespacepublisher.h>
-#include <qservicemanager.h>
-#include <qservicefilter.h>
-#include <qserviceinterfacedescriptor.h>
-
-#include <HbApplication>
-#include <HbActivityManager>
-#include <HbInstance>
-#include <HbIconAnimationManager>
-#include <HbIconAnimationDefinition>
-
-#include "hsmenueventfactory.h"
-#include "homescreendomainpskeys.h"
-#include "hsdefaultruntime.h"
-#include "hsdatabase.h"
-#include "hscontentservice.h"
-#include "hsshortcutservice.h"
-#include "hsmenueventtransition.h"
-#include "hswidgetpositioningonorientationchange.h"
-#include "hswidgetpositioningonwidgetadd.h"
-#include "hsconfiguration.h"
-#include "hstest_global.h"
-#include "hswidgetpositioningonwidgetmove.h"
-
-QTM_USE_NAMESPACE
-#define hbApp qobject_cast<HbApplication*>(qApp)
-
-#ifdef Q_OS_SYMBIAN
-const static Qt::Key applicationKey = Qt::Key_Menu;
-#else
-const static Qt::Key applicationKey = Qt::Key_Home;
-#endif
-
-namespace
-{
-    const char KHsRootStateInterface[] = "com.nokia.homescreen.state.HsRootState";
-    const char KHsLoadSceneStateInterface[] = "com.nokia.homescreen.state.HsLoadSceneState";
-    const char KHsIdleStateInterface[] = "com.nokia.homescreen.state.HsIdleState";
-    const char KHsAppLibraryStateInterface[] = "com.nokia.homescreen.state.HsAppLibraryState";
-    const char KHsMenuWorkerStateInterface[] = "com.nokia.homescreen.state.HsMenuWorkerState";
-    const char KHsBacupRestoreStateInterface[] = "com.nokia.homescreen.state.HsBackupRestoreState";
-}
-
-
-/*!
-    \class HsDefaultRuntime
-    \ingroup group_hsdefaultruntimeplugin
-    \brief Default implementation of the home screen runtime.
-    Creates an execution context (EC) and populates it with
-    runtime services. States are loaded from state plugins.
-    Each state is given an access to the EC. States
-    are added to a state machine. Finally, the state machine
-    is started.
-*/
-
-/*!
-    Constructs runtime with \a parent as the parent object.
-*/
-HsDefaultRuntime::HsDefaultRuntime(QObject *parent)
-    : QStateMachine(parent),
-      mContentService(0),	  
-      mHomeScreenActive(false),
-      mIdleStateActive(false),
-      mPublisher(NULL)
-#ifdef Q_OS_SYMBIAN
-	  ,keyCapture()
-#endif
-{
-    HSTEST_FUNC_ENTRY("HS::HsDefaultRuntime::HsDefaultRuntime");
-
-    HsDatabase *db = new HsDatabase;
-    db->setConnectionName("homescreen.dbc");
-#ifdef Q_OS_SYMBIAN
-    db->setDatabaseName("c:/private/20022f35/homescreen.db");
-#else
-    db->setDatabaseName("private/20022f35/homescreen.db");
-#endif    
-    db->open();
-    HsDatabase::setInstance(db);
-
-    HsConfiguration::setInstance(new HsConfiguration);
-    HsConfiguration::instance()->load();
-            
-    HsWidgetPositioningOnOrientationChange::setInstance(
-        new HsAdvancedWidgetPositioningOnOrientationChange);
-
-    HsWidgetPositioningOnWidgetAdd::setInstance(
-        new HsAnchorPointInBottomRight);
-
-    HsWidgetPositioningOnWidgetMove::setInstance(
-        new HsSnapToLines);
-
-    registerAnimations();
-
-    createStatePublisher();
-    createContentServiceParts();
-    createStates();
-    assignServices();
-
-    // create the instance so that singleton is accessible from elsewhere
-    HsShortcutService::instance(this);
-
-    QCoreApplication::instance()->installEventFilter(this);
-
-    if (hbApp) { // Qt test framework uses QApplication.
-        connect(hbApp->activityManager(), SIGNAL(activityRequested(QString)), 
-                this, SLOT(activityRequested(QString)));
-    }
-    HSTEST_FUNC_EXIT("HS::HsDefaultRuntime::HsDefaultRuntime");
-}
-
-/*!
-    Destructor.
-*/
-HsDefaultRuntime::~HsDefaultRuntime()
-{
-    HsWidgetPositioningOnOrientationChange::setInstance(0);
-    delete mPublisher;
-}
-
-/*!
-    \fn void HsDefaultRuntime::stopStateMachine()
-    Emission of this signal initiates a transition to the final state.
-*/
-
-/*!
-    \copydoc QObject::eventFilter(QObject *watched, QEvent *event)
-*/
-bool HsDefaultRuntime::eventFilter(QObject *watched, QEvent *event)
-{
-    Q_UNUSED(watched);
-
-    switch (event->type()) {
-        case QEvent::ApplicationActivate:
-            qDebug() << "HsDefaultRuntime::eventFilter: QEvent::ApplicationActivate";
-#ifdef Q_OS_SYMBIAN
-            keyCapture.captureKey(applicationKey);
-#endif
-            mHomeScreenActive = true;
-            updatePSKeys();
-            break;
-        case QEvent::ApplicationDeactivate:
-            qDebug() << "HsDefaultRuntime::eventFilter: QEvent::ApplicationDeactivate";
-#ifdef Q_OS_SYMBIAN
-            keyCapture.cancelCaptureKey(applicationKey);
-#endif
-            mHomeScreenActive = false;
-            updatePSKeys();
-            break;
-        default:
-            break;
-    }
-   
-    bool result =  QStateMachine::eventFilter(watched, event);
-    // temporary hack as we should not register twice for events
-    if (event->type() == QEvent::KeyPress ) {
-        QKeyEvent* ke = static_cast<QKeyEvent *>(event);         
-        // Key_Launch0 should be removed when QT starts to send Key_Menu
-        result = (ke->key() == applicationKey) || ke->key() == Qt::Key_Launch0;        
-    }
-    return result;
-}
-
-
-/*!
-    Registers framework animations.
-*/
-void HsDefaultRuntime::registerAnimations()
-{
-    HbIconAnimationManager *manager = HbIconAnimationManager::global();
-    manager->addDefinitionFile(QLatin1String("qtg_anim_loading.axml"));
-}
-
-/*!
-    Creates Home screen state publisher.
-*/
-void HsDefaultRuntime::createStatePublisher()
-{
-    mPublisher = new QValueSpacePublisher(QValueSpace::PermanentLayer, HsStatePSKeyPath);
-
-    if (!mPublisher->isConnected()){
-    	// No permanent layer available
-    	mPublisher = new QValueSpacePublisher(HsStatePSKeyPath);
-    }
-
-    mPublisher->setValue(HsStatePSKeySubPath, EHomeScreenInactive);
-}
-
-/*!
-    Creates content service parts.
-*/
-void HsDefaultRuntime::createContentServiceParts()
-{
-    HSTEST_FUNC_ENTRY("HS::HsDefaultRuntime::createContentServiceParts");
-
-    mContentService = new HsContentService(this);
-
-    HSTEST_FUNC_EXIT("HS::HsDefaultRuntime::createContentServiceParts");
-}
-
-/*!
-    Creates states.
-*/
-void HsDefaultRuntime::createStates()
-{
-    HSTEST_FUNC_ENTRY("HS::HsDefaultRuntime::createStates");
-
-    QFinalState *finalState = new QFinalState();
-    addState(finalState);
-
-    QState *guiRootState = new QState();
-    addState(guiRootState);
-
-    guiRootState->addTransition(this, SIGNAL(event_exit()), finalState);
-
-    QServiceManager manager;
-
-    
-    QObject *loadSceneStateObj = manager.loadInterface(KHsLoadSceneStateInterface);
-    QState *loadSceneState = qobject_cast<QState *>(loadSceneStateObj);
-    loadSceneState->setParent(guiRootState);
-    loadSceneState->setObjectName(KHsLoadSceneStateInterface);
-
-    QObject *rootStateObj = manager.loadInterface(KHsRootStateInterface);
-    QState *rootState = qobject_cast<QState *>(rootStateObj);   
-    rootState->setParent(guiRootState);
-    rootState->setObjectName(KHsRootStateInterface);       
-
-    QObject *idleStateObj = manager.loadInterface(KHsIdleStateInterface);
-    QState *idleState = qobject_cast<QState *>(idleStateObj);
-    idleState->setParent(rootState);
-    idleState->setObjectName(KHsIdleStateInterface);
-	connect(idleState, SIGNAL(entered()), SLOT(onIdleStateEntered()));
-	connect(idleState, SIGNAL(exited()), SLOT(onIdleStateExited()));
-
-
-    //menu state
-    QState *menuParallelState = new QState(
-            QState::ParallelStates, rootState);
-    QState *menuRootState = new QState(menuParallelState);
-
-    QObject *appLibraryStateObj = manager.loadInterface(KHsAppLibraryStateInterface);
-    QState *appLibraryState = qobject_cast<QState *>(appLibraryStateObj);
-    appLibraryState->setParent(menuRootState);
-    appLibraryState->setObjectName(KHsAppLibraryStateInterface);
-    menuRootState->setInitialState(appLibraryState);
-
-    QHistoryState *historyState = new QHistoryState(rootState);
-    historyState->setDefaultState(idleState);
-    
-    loadSceneState->addTransition(
-            loadSceneState, SIGNAL(event_history()), historyState);            
-
-    QObject *menuWorkerStateObj = manager.loadInterface(KHsMenuWorkerStateInterface);
-    QState *menuWorkerState = qobject_cast<QState *>(menuWorkerStateObj);
-    menuWorkerState->setParent(menuParallelState);
-    menuWorkerState->setObjectName(KHsMenuWorkerStateInterface);
-
-    connect(appLibraryState, SIGNAL(collectionEntered()), 
-            menuWorkerState, SIGNAL(reset()));
-    connect(appLibraryState, SIGNAL(allAppsStateEntered ()), 
-            menuWorkerState, SIGNAL(reset()));
-    connect(appLibraryState, SIGNAL(allCollectionsStateEntered ()), 
-            menuWorkerState, SIGNAL(reset()));
-
-    //Backup/Restore state
-    QObject *backupRestoreStateObj = manager.loadInterface(KHsBacupRestoreStateInterface);
-    QState *backupRestoreState = qobject_cast<QState *>(backupRestoreStateObj);   
-    backupRestoreState->setParent(guiRootState);
-    backupRestoreState->setObjectName(KHsBacupRestoreStateInterface);
-    backupRestoreState->addTransition(
-            backupRestoreState, SIGNAL(event_loadScene()), loadSceneState);
-
-    // root state transitions
-    idleState->addTransition(idleState, SIGNAL(event_applicationLibrary()), menuRootState);
-    appLibraryState->addTransition(
-            appLibraryState, SIGNAL(toHomescreenState()), idleState);
-    rootState->addTransition(rootState, SIGNAL(event_backupRestore()), backupRestoreState);
-    // opening shortcut to Application Library
-    HsMenuEventTransition *idleToAppLibTransition =
-        new HsMenuEventTransition(HsMenuEvent::OpenApplicationLibrary,
-                                  idleState, appLibraryState);
-    idleState->addTransition(idleToAppLibTransition);
-
-    HsMenuEventTransition *appLibToIdleTransition =
-        new HsMenuEventTransition(
-            HsMenuEvent::OpenHomeScreen, appLibraryState, idleState);
-    appLibraryState->addTransition(appLibToIdleTransition);
-
-    HbMainWindow *window = hbInstance->allMainWindows().first();
-
-    // key driven transition from idle to menu
-    QKeyEventTransition *idleToMenuRootTransition =
-        new QKeyEventTransition(
-                window, QEvent::KeyPress, applicationKey);
-    idleToMenuRootTransition->setTargetState(menuRootState);
-    idleState->addTransition(idleToMenuRootTransition);
-    // key driven transition from menu to idle
-    QKeyEventTransition *menuToIdleTransition =
-        new QKeyEventTransition(
-                window, QEvent::KeyPress, applicationKey);
-    menuToIdleTransition->setTargetState(idleState);
-    menuRootState->addTransition(menuToIdleTransition);
-    
-    // transition for Key_Launch0 should be removed 
-    // when OT starts to send Key_Menu (maybe wk14)
-    QKeyEventTransition *idleToMenuRootTransition2 =
-        new QKeyEventTransition(
-                window, QEvent::KeyPress, Qt::Key_Launch0);
-    idleToMenuRootTransition2->setTargetState(menuRootState);
-    idleState->addTransition(idleToMenuRootTransition2);
-    // key driven transition from menu to idle
-    QKeyEventTransition *menuToIdleTransition2 =
-        new QKeyEventTransition(
-                window, QEvent::KeyPress, Qt::Key_Launch0);
-    menuToIdleTransition2->setTargetState(idleState);
-    menuRootState->addTransition(menuToIdleTransition2);
-    // add transition to switch to idle
-    menuRootState->addTransition( this, SIGNAL(event_toIdle()), idleState);    
-    
-    // transitions to child states
-    // opening shortcut to a colleciton
-    QList<QState *> collectionStates =
-        appLibraryState->
-            findChildren<QState *>
-                ("homescreen.nokia.com/state/applibrarystate/collectionstate");
-    qDebug(
-        "Found %d \"collectionstate\" children for Application Library State",
-            collectionStates.count());
-    if (collectionStates.count()) {
-        HsMenuEventTransition *idleToCollectionTransition =
-            new HsMenuEventTransition(HsMenuEvent::OpenCollection,
-                                      idleState, collectionStates[0]);
-        idleState->addTransition(idleToCollectionTransition);
-    }
-
-    guiRootState->setInitialState(loadSceneState);
-    setInitialState(guiRootState);
-    
-    HSTEST_FUNC_EXIT("HS::HsDefaultRuntime::createStates");
-}
-
-/*!
-    Assigns services to states based on value of property HS_SERVICES_REGISTRATION_KEY.
-*/
-void HsDefaultRuntime::assignServices()
-{
-    HSTEST_FUNC_ENTRY("HS::HsDefaultRuntime::assignServices");
-
-    QList<QState*> children = findChildren<QState*>();
-    foreach (QState *state, children) {
-        QList<QVariant> services = state->property(HS_SERVICES_REGISTRATION_KEY).toList();
-        foreach (const QVariant &service, services) {
-            QString name = service.toString();
-            qDebug() << "Assign service:" << name << "\n to " << state->objectName();
-            if (name == CONTENT_SERVICE_KEY) {
-                state->setProperty(name.toAscii().data(), qVariantFromValue(mContentService));
-            } else if (name == SHORTCUT_SERVICE_KEY) {
-                state->setProperty(name.toAscii().data(),
-                    qVariantFromValue(HsShortcutService::instance(this)));
-            } else {
-                qWarning() << "WARNING: Service " << name << " is unknown";
-            }
-        }
-    }
-
-    HSTEST_FUNC_EXIT("HS::HsDefaultRuntime::assignServices");
-}
-
-/*!
-    Publishes Home screen states via Publish & Subscribe.
-*/
-void HsDefaultRuntime::updatePSKeys()
-{	
-	if (!mPublisher){
-		createStatePublisher();
-	}
-
-	if (mHomeScreenActive && mIdleStateActive){
-    	qDebug() << "HsDefaultRuntime::updatePSKeys: EHomeScreenIdleState";
-    	mPublisher->setValue(HsStatePSKeySubPath, EHomeScreenIdleState);
-    }
-    else{
-    	qDebug() << "HsDefaultRuntime::updatePSKeys: EHomeScreenInactive";
-    	mPublisher->setValue(HsStatePSKeySubPath, EHomeScreenInactive);
-    }	
-}
-
-/*!
-    Called when state machine is in Idle state.
-*/
-void HsDefaultRuntime::onIdleStateEntered()
-{
-	mIdleStateActive = true;
-	updatePSKeys();
-}
-
-/*!
-    Called when state machine leaves the Idle state.
-*/
-void HsDefaultRuntime::onIdleStateExited()
-{
-	mIdleStateActive = false;
-	updatePSKeys();
-}
-
-/*!
-    Activity requested by another client 
-*/
-void HsDefaultRuntime::activityRequested(const QString &name) 
-{
-    if (name == appLibActivity()) {
-        this->postEvent(
-            HsMenuEventFactory::createOpenAppLibraryEvent(NormalHsMenuMode));
-    }
-    else if (name == groupAppLibRecentView()) {
-        this->postEvent(
-            HsMenuEventFactory::createOpenCollectionEvent(0,
-            collectionDownloadedTypeName()));
-    } else if (name == activityHsIdleView()) {
-        emit event_toIdle();
-    }
-}

--- a/homescreenapp/runtimeplugins/hsdefaultruntimeplugin/src/hsdefaultruntimeplugin.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +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:  Default runtime plugin.
-*
-*/
-
-#include <qserviceinterfacedescriptor.h>
-#include <qabstractsecuritysession.h>
-#include <qservicecontext.h>
-
-#include "hsdefaultruntimeplugin.h"
-#include "hsdefaultruntime.h"
-
-#ifdef COVERAGE_MEASUREMENT
-#pragma CTC SKIP
-#endif //COVERAGE_MEASUREMENT
-
-QObject *HsDefaultRuntimePlugin::createInstance(const QServiceInterfaceDescriptor &descriptor,
-                                                QServiceContext *context,
-                                                QAbstractSecuritySession *session)
-{
-    Q_UNUSED(context);
-    Q_UNUSED(session);
-
-    if (descriptor.interfaceName() == QLatin1String("com.nokia.symbian.IHomeScreenRuntime")) {
-        return new HsDefaultRuntime(this);
-    } else {
-        return 0;
-    }
-}
-
-Q_EXPORT_PLUGIN2(hsdefaultruntimeplugin, HsDefaultRuntimePlugin)
-
-#ifdef COVERAGE_MEASUREMENT
-#pragma CTC ENDSKIP
-#endif //COVERAGE_MEASUREMENT

--- a/homescreenapp/runtimeplugins/runtimeplugins.pro	Tue Jul 06 14:06:53 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +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:
-#
-
-TEMPLATE = subdirs
-SUBDIRS  = hsdefaultruntimeplugin

--- a/homescreenapp/serviceproviders/hsmenuserviceprovider/hsmenuserviceprovider.pro	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/hsmenuserviceprovider.pro	Wed Aug 18 09:40:07 2010 +0300
@@ -23,7 +23,8 @@
 
 DEFINES += MENUSERVICE_LIB
 
-LIBS += -lcaclient
+LIBS += -lcaclient \
+        -lcasoftwareregistry
 
 symbian::TARGET.UID3 = 0x20026FA9
-win32:exportResources(./resource/*.png, resource)
+!symbian:exportResources(./resource/*.png, resource)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/inc/hsiconsidleloader.h	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,46 @@
+/*
+ * 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 All Applications state.
+ *
+ */
+
+#ifndef HSICONSIDLELOADER_H_
+#define HSICONSIDLELOADER_H_
+
+#include <QObject>
+#include "hsmenuservice_global.h"
+
+class QTimer;
+class HsMenuItemModel;
+
+
+class HsIconsIdleLoader: public QObject
+{
+    HS_SERVICE_TEST_FRIEND_CLASS(MenuServiceTest)
+    
+    Q_OBJECT
+public:
+    
+    HsIconsIdleLoader(HsMenuItemModel *model, QObject *parent = 0);
+    ~HsIconsIdleLoader();
+    
+private slots:
+    void processWhenIdle();
+    
+private:
+    HsMenuItemModel *mModel;
+    QTimer *mTimer;
+};
+
+#endif /* HSICONSIDLELOADER_H_ */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/inc/hsmenuentryremovedhandler.h	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,48 @@
+/*
+* 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:  Entry removal handler.
+*
+*/
+
+
+#ifndef HS_MENU_ENTRY_REMOVED_HANDLER_H
+#define HS_MENU_ENTRY_REMOVED_HANDLER_H
+
+#include <QScopedPointer>
+
+#include <cadefs.h>
+#include <canotifier.h>
+
+#include "hsmenuservice_global.h"
+
+class MENUSERVICE_EXPORT  HsMenuEntryRemovedHandler: public QObject
+{
+    Q_OBJECT
+public:
+    HsMenuEntryRemovedHandler(
+        int entryId, QObject *receiver, const char *callback);
+    virtual ~HsMenuEntryRemovedHandler();
+
+signals:
+    void notify();
+private slots:
+    virtual void entryChanged(int entryId, ChangeType changeType);
+    
+private:
+    void subscribe(int entryId);
+
+private:
+    QScopedPointer<CaNotifier> mNotifier;
+};
+#endif

--- a/homescreenapp/serviceproviders/hsmenuserviceprovider/inc/hsmenuitemmodel.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/inc/hsmenuitemmodel.h	Wed Aug 18 09:40:07 2010 +0300
@@ -27,10 +27,13 @@
 #include "hsmenuservice_global.h"
 #include "hsmenuservice.h"
 
+class CaUninstallNotifier;
+class HsIconsIdleLoader;
 // Class declaration
 class MENUSERVICE_EXPORT HsMenuItemModel: public CaItemModel
 {
-
+HS_SERVICE_TEST_FRIEND_CLASS(MenuServiceTest)
+Q_OBJECT
 public:
 
     // Data types
@@ -47,6 +50,15 @@
     virtual QVariant data(const QModelIndex &index,
                           int role = Qt::DisplayRole) const;
     bool newIconNeeded(const QModelIndex &index) const;
+    void preloadIcons();
+private slots:
+    void uninstallChange(int componentId, int valueOfProgress);
+    
+private:
+    HsIconsIdleLoader* mIconsIdleLoader;
+    CaUninstallNotifier* mUninstallNotifier;//not own
+    int mComponentId;
+    QList<int> mIds;
 };
 
 #endif // HSMENUITEMMODEL_H

--- a/homescreenapp/serviceproviders/hsmenuserviceprovider/inc/hsmenuservice.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/inc/hsmenuservice.h	Wed Aug 18 09:40:07 2010 +0300
@@ -40,8 +40,7 @@
     // Function declarations
     static HsMenuItemModel *getAllApplicationsModel(
         HsSortAttribute sortAttribute = DescendingNameHsSortAttribute);
-    static HsMenuItemModel *getAllCollectionsModel(
-        HsSortAttribute sortAttribute = LatestOnTopHsSortAttribute);
+    static HsMenuItemModel *getAllCollectionsModel();
     static HsMenuItemModel *getInstalledModel(
         HsSortAttribute sortAttribute = DescendingNameHsSortAttribute);
     static HsMenuItemModel *getCollectionModel(int collectionId,

--- a/homescreenapp/serviceproviders/hsmenuserviceprovider/inc/hsmenuservice_global.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/inc/hsmenuservice_global.h	Wed Aug 18 09:40:07 2010 +0300
@@ -19,7 +19,7 @@
 #define HSMENUSERVICE_GLOBAL_H
 
 // System includes
-#include <Qt/qglobal.h>
+#include <qglobal.h>
 
 #ifdef MENUSERVICE_LIB
 #define MENUSERVICE_EXPORT Q_DECL_EXPORT

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsiconsidleloader.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: Menu All Applications state.
+ *
+ */
+
+#include <QSize>
+#include <QTimer>
+#include "hsmenuitemmodel.h"
+#include "hsiconsidleloader.h"
+
+/*!
+ Constructor
+ \param model with defined icons
+ \param pointer to parent object
+ */
+HsIconsIdleLoader::HsIconsIdleLoader(HsMenuItemModel *model, QObject *parent):
+    QObject(parent),
+    mModel(model),
+    mTimer(NULL)
+{
+    mTimer = new QTimer(this);
+    connect(mTimer, SIGNAL(timeout()), this, SLOT(processWhenIdle()));
+    mTimer->start(0); // NOTE: zero for idle
+}
+
+/*!
+ Destructor
+ */
+HsIconsIdleLoader::~HsIconsIdleLoader()
+{
+    mTimer->stop();
+}
+
+/*!
+ Preloading icons if idle
+ \retval void
+ */
+void HsIconsIdleLoader::processWhenIdle()
+{
+    const QSize iconSize(mModel->getIconSize());
+    for (int i=0; i<mModel->rowCount(); i++) {
+        QModelIndex idx = mModel->index(i);
+        mModel->entry(idx)->makeIcon(iconSize);
+    }
+    mTimer->stop(); // No more timing
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenuentryremovedhandler.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,97 @@
+/*
+* 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:  Photos image fetcher client.
+*
+*/
+
+#include <QList>
+
+#include <caservice.h>
+#include <canotifier.h>
+#include <canotifierfilter.h>
+
+#include "hsmenuentryremovedhandler.h"
+/*!
+    \class HsMenuEntryRemovedHandler
+    Listens for entry removal notifications and calls a callback.
+    \ingroup group_hsutils
+    \brief 
+*/
+
+/*!
+ Constructor.
+ \param entryId identifies entry which removal is to be observed.
+ \param receiver object which \a callback is to be called on requested entry
+ removal. If \receiver is passed 0 no action will be taken on the entry removal.
+ \param callback signal or slot that will be called on entry removal. The \a callback
+ signature should correspond to void (*)(int, ChangeType) signal otherwise
+ runtime warning will be provided. If \a callback is 0 no action will be
+ taken on the entry removal.
+*/
+HsMenuEntryRemovedHandler::HsMenuEntryRemovedHandler(
+    int entryId, 
+    QObject *receiver,
+    const char *callback):
+    mNotifier(0)
+{
+    if (receiver != 0 && callback != 0) {
+        connect(this, SIGNAL(notify()), receiver, callback);
+        subscribe(entryId);
+    }
+};
+
+/*!
+ Destructor.
+*/
+HsMenuEntryRemovedHandler::~HsMenuEntryRemovedHandler() {};
+
+/*!
+  Subscribes the observer for notifications for a given entryId and
+  makes sure the \a HsMenuEntryRemovedObserver::entryChagned will be called
+  on any notification for the entry.
+  \param entryId identifier of the entry to be observed.
+
+*/
+void HsMenuEntryRemovedHandler::subscribe(int entryId)
+{
+    // create notifier for a given entryId
+    CaNotifierFilter filter;
+    QList<int> entryIds;
+    entryIds.append(entryId);
+    filter.setIds(entryIds);
+    mNotifier.reset(CaService::instance()->createNotifier(filter));
+
+    connect(mNotifier.data(),
+        SIGNAL(entryChanged(int, ChangeType)),
+        this,
+        SLOT(entryChanged(int, ChangeType)),
+        Qt::UniqueConnection);
+}
+
+
+/*!
+ Handles notification about entry change
+ \param entryId ignored as the observer is subscribed for exactly one entry.
+ \param changeType notified change type.
+ */
+void HsMenuEntryRemovedHandler::entryChanged(int entryId, 
+    ChangeType changeType)
+{
+    Q_UNUSED(entryId); // CaNotifier should care about matching id, skip it here
+    
+    if (changeType == RemoveChangeType) {
+        mNotifier.reset(0);
+        emit notify();
+    }
+}

--- a/homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenuitemmodel.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenuitemmodel.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -16,9 +16,12 @@
  */
 
 #include <hbnamespace.h>
+#include <cauninstallnotifier.h>
+#include <casoftwareregistry.h>
 
 #include "hsmenuitemmodel.h"
 #include "hsmenuserviceutils.h"
+#include "hsiconsidleloader.h"
 
 // Constants
 const QSize smallIconSize(55, 55);
@@ -29,9 +32,15 @@
  \param pointer to parent object
  */
 HsMenuItemModel::HsMenuItemModel(const CaQuery &query, QObject *parent) :
-    CaItemModel(query, parent)
+    CaItemModel(query, parent),
+    mIconsIdleLoader(NULL)
 {
     setIconSize(smallIconSize);
+    mComponentId = 0;
+    mUninstallNotifier = 
+        CaSoftwareRegistry::create()->createUninstallNotifier();
+    connect(mUninstallNotifier, SIGNAL(progressChange(int, int)),
+            this, SLOT(uninstallChange(int, int)));
 }
 
 /*!
@@ -39,7 +48,9 @@
  */
 HsMenuItemModel::~HsMenuItemModel()
 {
-
+    if (!mIds.isEmpty()) {
+        mIds.clear();
+    }
 }
 
 /*!
@@ -77,9 +88,9 @@
     } else if (role == Hb::IndexFeedbackRole){
         QVariant display = CaItemModel::data(index, Qt::DisplayRole);
         if (display.type() == QVariant::String){
-            variant = display;
+            variant = QVariant(display.toString().at(0).toUpper());;
         } else {
-            variant = QVariant(display.toList().at(0));
+            variant = QVariant(display.toList().at(0).toString().at(0).toUpper());
         }
     } else {
         variant = CaItemModel::data(index, role);
@@ -106,3 +117,35 @@
     HSMENUTEST_FUNC_EXIT("HsMenuItemModel::newIconNeeded");
     return result;
 }
+
+/*!
+ Updating uninstall progress with value for each item
+  \param componentId Component Id of installed item
+  \param valueOfProgress % value of current progress
+ */
+void HsMenuItemModel::uninstallChange(int componentId, int valueOfProgress)
+{
+    if (componentId!=mComponentId) {
+        if (!mIds.isEmpty()) {
+            mIds.clear();
+        }
+        // get items list with same componentID
+        mIds = CaItemModel::getUninstallingEntriesIds(componentId);
+        mComponentId = componentId;
+    }
+    // update each item with progress value
+    foreach (int id, mIds) {
+        CaItemModel::updateProgress(id, valueOfProgress);
+    }
+}
+
+
+/*!
+ Start preloading icons if idle
+ \param entry entry representing an item
+ \retval void
+ */
+void HsMenuItemModel::preloadIcons()
+{
+    mIconsIdleLoader = new HsIconsIdleLoader(this, this);
+}

--- a/homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenuservice.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenuservice.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -34,7 +34,8 @@
 
 // Initialization of a static member variable.
 int HsMenuService::mAllCollectionsId = 0;
-
+const char COLLECTION_TITLE_NAME[] = "title_name";
+const char COLLECTION_SHORT_NAME[] = "short_name";
 /*!
  Returns all applications model
  \param sortAttribute ::  SortAttribute
@@ -63,22 +64,16 @@
 
 /*!
  Returns all collections model
- \param sortAttribute ::  SortAttribute
- \param details : switch to return details or not
  \retval HsMenuItemModel: all collections model
  */
-HsMenuItemModel *HsMenuService::getAllCollectionsModel(
-    HsSortAttribute sortAttribute)
+HsMenuItemModel *HsMenuService::getAllCollectionsModel()
 {
-    qDebug() << "HsMenuService::getAllCollectionsModel" << "sortAttribute:"
-             << sortAttribute;
+    qDebug() << "HsMenuService::getAllCollectionsModel";
     HSMENUTEST_FUNC_ENTRY("HsMenuService::getAllCollectionsModel");
     CaQuery query;
     query.setParentId(allCollectionsId());
     query.setFlagsOn(VisibleEntryFlag);
     query.setFlagsOff(MissingEntryFlag);
-    query.setSort(HsMenuServiceUtils::sortBy(sortAttribute),
-                  HsMenuServiceUtils::sortOrder(sortAttribute));
     HsMenuItemModel *model = new HsMenuCollectionsItemModel(query);
     HSMENUTEST_FUNC_EXIT("HsMenuService::getAllCollectionsModel");
     return model;
@@ -276,6 +271,8 @@
                  << collection;
 
         collection->setText(newCollectionName);
+        collection->setAttribute(COLLECTION_TITLE_NAME, newCollectionName);
+        collection->setAttribute(COLLECTION_SHORT_NAME, newCollectionName);
         result = CaService::instance()->updateEntry(*collection);
     }
     HSMENUTEST_FUNC_EXIT("HsMenuService::renameCollection");

--- a/homescreenapp/sis/homescreenapp.pkg	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/sis/homescreenapp.pkg	Wed Aug 18 09:40:07 2010 +0300
@@ -59,13 +59,6 @@
 
 "/epoc32/release/armv5/urel/hsdomainmodel.dll" - "c:/sys/bin/hsdomainmodel.dll"
 
-; ---- runtimeplugins --------------------------------------------
-
-; -------- hsdefaultruntimeplugin
-"/epoc32/release/armv5/urel/hsdefaultruntimeplugin.dll"     - "c:/sys/bin/hsdefaultruntimeplugin.dll"
-"/epoc32/data/z/hsresources/plugins/runtimeplugins/hsdefaultruntimeplugin.qtplugin" - "c:/hsresources/plugins/runtimeplugins/hsdefaultruntimeplugin.qtplugin"
-"/epoc32/data/z/hsresources/plugins/runtimeplugins/hsdefaultruntimeplugin.manifest"  - "c:/hsresources/plugins/runtimeplugins/hsdefaultruntimeplugin.manifest"
-
 ; ---- serviceproviders --------------------------------------------
 
 ; -------- hsmenuserviceprovider

--- a/homescreenapp/sis/homescreenapp_ut_hs.pkg	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/sis/homescreenapp_ut_hs.pkg	Wed Aug 18 09:40:07 2010 +0300
@@ -33,16 +33,14 @@
 "/epoc32/release/armv5/urel/t_hsapplicationexe.exe"                         - "c:/sys/bin/t_hsapplicationexe.exe"
 "/epoc32/data/z/private/10003a3f/import/apps/t_hsapplicationexe_reg.rsc"    - "c:/private/10003a3f/import/apps/t_hsapplicationexe_reg.rsc"
 "/epoc32/data/z/resource/apps/t_hsapplicationexe.rsc"                       - "c:/resource/apps/t_hsapplicationexe.rsc"
-"/epoc32/release/armv5/urel/mockruntimeplugin.dll"                                                  - "c:/sys/bin/mockruntimeplugin.dll"
-"/epoc32/data/z/private/20022f5f/hsresources/plugins/runtimeplugins/mockruntimeplugin.qtplugin"     - "c:/private/20022f5f/hsresources/plugins/runtimeplugins/mockruntimeplugin.qtplugin"
-"/epoc32/data/z/private/20022f5f/hsresources/plugins/runtimeplugins/mockruntimeplugin.xml"          - "c:/private/20022f5f/hsresources/plugins/runtimeplugins/mockruntimeplugin.xml"
+"/epoc32/release/armv5/urel/mockstateplugins.dll"                                                  - "c:/sys/bin/mockstateplugins.dll"
+"/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"
 
 ;--------------- 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"
 "/epoc32/data/z/resource/apps/t_hsutils.rsc"                       - "c:/resource/apps/t_hsutils.rsc"
-"../hsutils/tsrc/t_hsutils/nokia.png"                              - "c:/hsresources/testresources/nokia.png"
-"../hsutils/tsrc/t_hsutils/large.jpg"                              - "c:/hsresources/testresources/large.jpg"
 
 ;--------------- hsdomainmodel ---------------
 "/epoc32/release/armv5/urel/t_hsdomainmodel.exe"                         - "c:/sys/bin/t_hsdomainmodel.exe"
@@ -69,15 +67,10 @@
 "/epoc32/data/z/private/20022F59/hsresources/plugins/widgetplugins/mockwidgetplugintoobig.qtplugin" - "c:/private/20022F59/hsresources/plugins/widgetplugins/mockwidgetplugintoobig.qtplugin"
 "/epoc32/data/z/private/20022F59/hsresources/plugins/widgetplugins/mockwidgetplugintoobig.xml"      - "c:/private/20022F59/hsresources/plugins/widgetplugins/mockwidgetplugintoobig.xml"
 
+"/epoc32/release/armv5/urel/mockwidgetplugincheater.dll"                                             - "c:/sys/bin/mockwidgetplugincheater.dll"
+"/epoc32/data/z/private/20022F59/hsresources/plugins/widgetplugins/mockwidgetplugincheater.qtplugin" - "c:/private/20022F59/hsresources/plugins/widgetplugins/mockwidgetplugincheater.qtplugin"
+"/epoc32/data/z/private/20022F59/hsresources/plugins/widgetplugins/mockwidgetplugincheater.xml"      - "c:/private/20022F59/hsresources/plugins/widgetplugins/mockwidgetplugincheater.xml"
 
-;--------------- runtimeplugins ---------------
-;hsdefaultruntimeplugin
-"/epoc32/release/armv5/urel/t_hsdefaultruntimeplugin.exe"                                       - "c:/sys/bin/t_hsdefaultruntimeplugin.exe"
-"/epoc32/data/z/private/10003a3f/import/apps/t_hsdefaultruntimeplugin_reg.rsc"                  - "c:/private/10003a3f/import/apps/t_hsdefaultruntimeplugin_reg.rsc"
-"/epoc32/data/z/resource/apps/t_hsdefaultruntimeplugin.rsc"                                     - "c:/resource/apps/t_hsdefaultruntimeplugin.rsc"
-"/epoc32/release/armv5/urel/mockstateplugins.dll"                                               - "c:/sys/bin/mockstateplugins.dll"
-"/epoc32/data/z/private/20022f63/hsresources/plugins/stateplugins/mockstateplugins.qtplugin"    - "c:/private/20022f63/hsresources/plugins/stateplugins/mockstateplugins.qtplugin"
-"/epoc32/data/z/private/20022f63/hsresources/plugins/stateplugins/mockstateplugins.xml"         - "c:/private/20022f63/hsresources/plugins/stateplugins/mockstateplugins.xml"
 
 ;--------------- serviceproviders ---------------
 
@@ -102,9 +95,9 @@
 
 ;--------------- hshomescreenclientplugin -----------------------
 ;hshomescreenclientplugin
-;"/epoc32/release/armv5/urel/t_hshomescreenclientplugin.exe"                       - "c:/sys/bin/t_hshomescreenclientplugin.exe"
-;"/epoc32/data/z/private/10003a3f/import/apps/t_hshomescreenclientplugin_reg.rsc"  - "c:/private/10003a3f/import/apps/t_hshomescreenclientplugin_reg.rsc"
-;"/epoc32/data/z/resource/apps/t_hshomescreenclientplugin.rsc"                     - "c:/resource/apps/t_hshomescreenclientplugin.rsc"
+"/epoc32/release/armv5/urel/t_hshomescreenclientplugin.exe"                       - "c:/sys/bin/t_hshomescreenclientplugin.exe"
+"/epoc32/data/z/private/10003a3f/import/apps/t_hshomescreenclientplugin_reg.rsc"  - "c:/private/10003a3f/import/apps/t_hshomescreenclientplugin_reg.rsc"
+"/epoc32/data/z/resource/apps/t_hshomescreenclientplugin.rsc"                     - "c:/resource/apps/t_hshomescreenclientplugin.rsc"
 
 ;--------------- hswidgetuninstaller -----------------------
 ;hswidgetuninstaller

Binary file homescreenapp/stateplugins/hsapplibrarystateplugin/conf/CI_hsapplibrary.confml has changed

Binary file homescreenapp/stateplugins/hsapplibrarystateplugin/conf/hsapplibrary.confml has changed

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/conf/hsapplibrary.implml	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,18 @@
+<?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"/>
+    
+    <settingRefsOverride>
+       <settingRef value="ApplicationLibrary.OperatorStoreURLIcon"/>
+    </settingRefsOverride>
+    
+    <content xmlns="http://www.s60.com/xml/content/2">
+        <output dir="content/private/20022F35/customsvg" flatten="true" file="operatorstore.svg">
+        <input>
+            <include files="${ApplicationLibrary.OperatorStoreURLIcon.localPath}"/>
+        </input>        
+        </output>
+    </content>
+
+</container>

Binary file homescreenapp/stateplugins/hsapplibrarystateplugin/conf/hsapplibrary_20022F97.crml has changed

Binary file homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrary.qm has changed

--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrary.ts	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrary.ts	Wed Aug 18 09:40:07 2010 +0300
@@ -9,17 +9,7 @@
     <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>co</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_applib_title_select_applications">
-    <comment>Heading for the mark mode dialog when selecting one or more apps to be added into a collection.</comment>        
-    <source>Select applications</source>
-    <translation variants="no">Select applications</translation>
-    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_01, applib_05, applib_09</extra-loc-viewid>
-    <extra-loc-positionid>title</extra-loc-positionid>
-    <extra-loc-feature>ap</extra-loc-feature>
+    <extra-loc-feature>common</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_common_opt_rename_item">
@@ -29,7 +19,7 @@
     <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
     <extra-loc-viewid>common</extra-loc-viewid>
     <extra-loc-positionid>opt</extra-loc-positionid>
-    <extra-loc-feature>co</extra-loc-feature>
+    <extra-loc-feature>common</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_applib_opt_view_installed_applications">
@@ -37,19 +27,9 @@
     <source>View installed applications</source>
     <translation variants="no">View installed applications</translation>
     <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_03</extra-loc-viewid>
+    <extra-loc-viewid>applib_01</extra-loc-viewid>
     <extra-loc-positionid>opt</extra-loc-positionid>
-    <extra-loc-feature>ap</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>
-    <extra-loc-positionid>menu</extra-loc-positionid>
-    <extra-loc-feature>ap</extra-loc-feature>
+    <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_applib_opt_add_to_home_screen">
@@ -59,17 +39,7 @@
     <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
     <extra-loc-viewid>applib_03, applib_09</extra-loc-viewid>
     <extra-loc-positionid>opt</extra-loc-positionid>
-    <extra-loc-feature>ap</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>ap</extra-loc-feature>
+    <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_applib_opt_sub_ascending">
@@ -79,7 +49,17 @@
     <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>ap</extra-loc-feature>
+    <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">
@@ -89,27 +69,17 @@
     <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>co</extra-loc-feature>
+    <extra-loc-feature>common</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>ap</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>
-    <translation variants="no">Delete %1?</translation>
-    <extra-loc-layout_id>qtl_dialog_pri3</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_03, applib_09</extra-loc-viewid>
-    <extra-loc-positionid>dialog</extra-loc-positionid>
-    <extra-loc-feature>ap</extra-loc-feature>
+<message numerus="no" id="txt_applib_info_following_applications_will_be_rem">
+    <comment>Second part of the confirmation note displayed if the user tries to delete an application that actually includes more than one application.</comment>        
+    <source>Following applications will be removed:</source>
+    <translation variants="no">Following applications will be removed:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_29</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="yes" id="txt_applib_dblist_val_ln_new_applications">
@@ -122,7 +92,7 @@
     <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
     <extra-loc-viewid>applib_03</extra-loc-viewid>
     <extra-loc-positionid>dblist_1_val</extra-loc-positionid>
-    <extra-loc-feature>ap</extra-loc-feature>
+    <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_common_opt_help">
@@ -132,27 +102,27 @@
     <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>co</extra-loc-feature>
+    <extra-loc-feature>common</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_applib_list_new_collection">
-    <comment>First option in a dialogue where user selects the target collection for an item. Opens an input field to name the new collection.</comment>        
-    <source>New collection</source>
-    <translation variants="no">New collection</translation>
-    <extra-loc-layout_id>qtl_list_popup_pri_graphic</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_01, applib_05, applib_09</extra-loc-viewid>
-    <extra-loc-positionid>list</extra-loc-positionid>
-    <extra-loc-feature>ap</extra-loc-feature>
+<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_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>
-    <translation variants="no">Deletes %1 also from Home Screen. Continue?</translation>
-    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_03, applib_09</extra-loc-viewid>
+<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-viewid>applib_20</extra-loc-viewid>
     <extra-loc-positionid>dialog</extra-loc-positionid>
-    <extra-loc-feature>ap</extra-loc-feature>
+    <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_common_menu_pause">
@@ -162,7 +132,7 @@
     <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>co</extra-loc-feature>
+    <extra-loc-feature>common</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_applib_opt_sub_descending">
@@ -172,17 +142,27 @@
     <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>ap</extra-loc-feature>
+    <extra-loc-feature>applib</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_applib_info_delete_1_and_associated_data">
+    <comment>Confirmation note displayed if the user tries to delete an application. %1 is the application name.</comment>        
+    <source>Delete %1 and associated data?</source>
+    <translation variants="no">Delete %1 and associated data?</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_29</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_1_will_be_removed_from_phone_c">
     <comment>Confirmation note for uninstalling an application or a widget that does not have shortcuts on HS or in collections.</comment>        
     <source>%1 will be removed from phone. Continue?</source>
     <translation variants="no">%1 will be removed from phone. Continue?</translation>
-    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_01, applib_05, applib_07, applib_09</extra-loc-viewid>
-    <extra-loc-positionid>dialog</extra-loc-positionid>
-    <extra-loc-feature>ap</extra-loc-feature>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_27</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_opt_add_content">
@@ -192,7 +172,357 @@
     <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
     <extra-loc-viewid>applib_09</extra-loc-viewid>
     <extra-loc-positionid>opt</extra-loc-positionid>
-    <extra-loc-feature>ap</extra-loc-feature>
+    <extra-loc-feature>applib</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_applib_dialog_name">
+    <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-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_mb">
+    <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-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_button_add_to_homescreen">
+    <comment>Button in widget preview dialog</comment>        
+    <source>Add to Homescreen</source>
+    <translation variants="no">Add to Homescreen</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_2</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_13</extra-loc-viewid>
+    <extra-loc-positionid>button</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_mass_storage">
+    <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-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>
+    <translation variants="no">Delete %1, all it&apos;s shortcuts and associated data?</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_29</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_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>
+    <translation variants="no">Uninstalling %1</translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_21</extra-loc-viewid>
+    <extra-loc-positionid>dblist_1</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_applications">
+    <comment>Title for all Application library views</comment>        
+    <source>Applications</source>
+    <translation variants="no">Applications</translation>
+    <extra-loc-layout_id>qtl_titlebar</extra-loc-layout_id>    
+    <extra-loc-viewid>applib</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_common_menu_delete">
+    <comment>Item specific menu item. Note! Only use this text ID if there are no icons. Erases something completely from the phone, list, or memory card, for example. Delete should only be used when something in removed permanently.</comment>        
+    <source>Delete</source>
+    <translation variants="no">Delete</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_common_menu_rename_item">
+    <comment>Item specific menu item. Note! Only use this text ID if there are no icons. Allows user to rename the selected item (file, folder, music track, image etc.).</comment>        
+    <source>Rename</source>
+    <translation variants="no">Rename</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_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>
+    <translation variants="no">Arrange</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_16</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_opt_installation_log">
+    <comment>Options menu item for viewing installation log</comment>        
+    <source>Installation log</source>
+    <translation variants="no">Installation log</translation>
+    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_07</extra-loc-viewid>
+    <extra-loc-positionid>opt</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">
+    <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>
+    <translation variants="no">Task Switcher</translation>
+    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_01, applib_03, applib_05, applib_07, applib_09, applib_11</extra-loc-viewid>
+    <extra-loc-positionid>opt</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_no_preview_available">
+    <comment>Text shown in widget preview dialog if no preview is available</comment>        
+    <source>(No preview available)</source>
+    <translation variants="no">(No preview available)</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_30</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_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>
+    <translation variants="no">Add to collection...</translation>
+    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_01</extra-loc-viewid>
+    <extra-loc-positionid>opt</extra-loc-positionid>
+    <extra-loc-feature>applib</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_applib_dpophead_added_to_homescreen">
+    <comment>Notification dialog shown after content (Widget or App shortcut) has been added from AppLib to Homescreen</comment>        
+    <source>Added to Homescreen</source>
+    <translation variants="no">Added to Homescreen</translation>
+    <extra-loc-layout_id>qtl_notifdialog_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_18</extra-loc-viewid>
+    <extra-loc-positionid>dpophead</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_details">
+    <comment>Item specific menu item. Note! Only use this text ID if there are no icons. Opens a view where information about the item is given.</comment>        
+    <source>Details</source>
+    <translation variants="no">Details</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_check_software_updates">
+    <comment>Options list item. Launches SW Update application where user can view and select softwares to be updated.</comment>        
+    <source>Check software updates</source>
+    <translation variants="no">Check software updates</translation>
+    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_01</extra-loc-viewid>
+    <extra-loc-positionid>opt</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_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>
+    <translation variants="no">Collection(%L1)</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>
+<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>
+    <translation variants="no">OK</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_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>
+    <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_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>
+    <translation variants="no">Delete %1?</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_24</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_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>
+    <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>
+    <translation variants="no">Deletes %1 also from Home Screen. Continue?</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_25</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_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>    
+    <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_description">
+    <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-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_collection_name">
@@ -200,9 +530,9 @@
     <source>Collection name:</source>
     <translation variants="no">Collection name:</translation>
     <extra-loc-layout_id>qtl_dialog_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_01, applib_05, applib_09</extra-loc-viewid>
+    <extra-loc-viewid>applib_15</extra-loc-viewid>
     <extra-loc-positionid>dialog_1</extra-loc-positionid>
-    <extra-loc-feature>ap</extra-loc-feature>
+    <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_common_menu_settings">
@@ -212,17 +542,17 @@
     <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>co</extra-loc-feature>
+    <extra-loc-feature>common</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_applib_button_add_to_homescreen">
-    <comment>Button in widget preview dialog</comment>        
-    <source>Add to Homescreen</source>
-    <translation variants="no">Add to Homescreen</translation>
-    <extra-loc-layout_id>qtl_dialog_softkey_2</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_12</extra-loc-viewid>
-    <extra-loc-positionid>button</extra-loc-positionid>
-    <extra-loc-feature>ap</extra-loc-feature>
+<message numerus="no" id="txt_applib_dpophead_added_to_collection_1">
+    <comment>Confirmation for a successful operation, app/widget added to a collection. (Use only when user is not inside the target collection.). %1 is the collection name.</comment>        
+    <source>Added to collection %1</source>
+    <translation variants="no">Added to collection %1</translation>
+    <extra-loc-layout_id>qtl_notifdialog_pri2</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_32</extra-loc-viewid>
+    <extra-loc-positionid>dpophead</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_downloaded_val_empty">
@@ -232,47 +562,27 @@
     <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
     <extra-loc-viewid>applib_03</extra-loc-viewid>
     <extra-loc-positionid>dblist_1_val</extra-loc-positionid>
-    <extra-loc-feature>ap</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>ap</extra-loc-feature>
+    <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_applib_title_applications">
-    <comment>Title for all Application library views</comment>        
-    <source>Applications</source>
-    <translation variants="no">Applications</translation>
-    <extra-loc-layout_id>qtl_titlebar</extra-loc-layout_id>    
-    <extra-loc-viewid>applib</extra-loc-viewid>
-    <extra-loc-positionid>title</extra-loc-positionid>
-    <extra-loc-feature>ap</extra-loc-feature>
+<message numerus="no" id="txt_applib_info_uninstallation_failed">
+    <comment>Dialog shown when uninstallation of an application fails</comment>        
+    <source>Uninstallation failed</source>
+    <translation variants="no">Uninstallation failed</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_common_menu_delete">
-    <comment>Item specific menu item. Note! Only use this text ID if there are no icons. Erases something completely from the phone, list, or memory card, for example. Delete should only be used when something in removed permanently.</comment>        
-    <source>Delete</source>
-    <translation variants="no">Delete</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>co</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_common_menu_rename_item">
-    <comment>Item specific menu item. Note! Only use this text ID if there are no icons. Allows user to rename the selected item (file, folder, music track, image etc.).</comment>        
-    <source>Rename</source>
-    <translation variants="no">Rename</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>co</extra-loc-feature>
+<message numerus="no" id="txt_applib_dialog_removed">
+    <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-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_applib_dialog_file_corrupted_unable_to_use_wi">
@@ -280,39 +590,9 @@
     <source>File corrupted, unable to use widget. Delete widget? </source>
     <translation variants="no">File corrupted, unable to use widget. Delete widget? </translation>
     <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_01, applib_05, applib_09</extra-loc-viewid>
-    <extra-loc-positionid>dialog</extra-loc-positionid>
-    <extra-loc-feature>ap</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>co</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>
-    <translation variants="no">Arrange</translation>
-    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_03 </extra-loc-viewid>
-    <extra-loc-positionid>title</extra-loc-positionid>
-    <extra-loc-feature>ap</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>ap</extra-loc-feature>
+    <extra-loc-viewid>applib_33</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_common_menu_install">
@@ -322,7 +602,7 @@
     <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>co</extra-loc-feature>
+    <extra-loc-feature>common</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_applib_opt_arrange">
@@ -332,37 +612,27 @@
     <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
     <extra-loc-viewid>applib_03</extra-loc-viewid>
     <extra-loc-positionid>opt</extra-loc-positionid>
-    <extra-loc-feature>ap</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>ap</extra-loc-feature>
+    <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>
-    <translation variants="no">Task Switcher</translation>
-    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_01, applib_03, applib_05, applib_07, applib_09, applib_11</extra-loc-viewid>
-    <extra-loc-positionid>opt</extra-loc-positionid>
-    <extra-loc-feature>ap</extra-loc-feature>
+<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-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_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>ap</extra-loc-feature>
+<message numerus="no" id="txt_applib_dialog_supplier">
+    <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-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_menu_add_to_collection">
@@ -372,17 +642,47 @@
     <extra-loc-layout_id>qtl_menu_pri</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>ap</extra-loc-feature>
+    <extra-loc-feature>applib</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_applib_formlabel_no_search_results">
+    <comment>Text for empty view when searching and no results are found</comment>        
+    <source>No search results</source>
+    <translation variants="no">No search results</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_19</extra-loc-viewid>
+    <extra-loc-positionid>formlabel_1</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>
-    <translation variants="no">Add to collection...</translation>
-    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_01</extra-loc-viewid>
-    <extra-loc-positionid>opt</extra-loc-positionid>
-    <extra-loc-feature>ap</extra-loc-feature>
+<message numerus="no" id="txt_applib_dialog_size">
+    <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-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_2">
+    <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-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_add_to">
@@ -390,9 +690,19 @@
     <source>Add to:</source>
     <translation variants="no">Add to:</translation>
     <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_01, applib_09</extra-loc-viewid>
+    <extra-loc-viewid>applib_34</extra-loc-viewid>
     <extra-loc-positionid>title</extra-loc-positionid>
-    <extra-loc-feature>ap</extra-loc-feature>
+    <extra-loc-feature>applib</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_applib_title_installation_logs">
+    <comment>Heading for fullscreen Installation logs dialog</comment>        
+    <source>Installation logs</source>
+    <translation variants="no">Installation logs</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_20</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_send_to_friend">
@@ -402,37 +712,37 @@
     <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>ap</extra-loc-feature>
+    <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_common_menu_details">
-    <comment>Item specific menu item. Note! Only use this text ID if there are no icons. Opens a view where information about the item is given.</comment>        
-    <source>Details</source>
-    <translation variants="no">Details</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>co</extra-loc-feature>
+<message numerus="no" id="txt_applib_formlabel_no_content">
+    <comment>Text for empty Collection</comment>        
+    <source>No content</source>
+    <translation variants="no">No content</translation>
+    <extra-loc-layout_id>qtl_dataform_pri</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_22</extra-loc-viewid>
+    <extra-loc-positionid>formlabel_1</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_check_software_updates">
-    <comment>Options list item. Launches SW Update application where user can view and select softwares to be updated.</comment>        
-    <source>Check software updates</source>
-    <translation variants="no">Check software updates</translation>
-    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_01</extra-loc-viewid>
-    <extra-loc-positionid>opt</extra-loc-positionid>
-    <extra-loc-feature>ap</extra-loc-feature>
+<message numerus="no" id="txt_applib_button_create_new">
+    <comment>Button for creating new collection</comment>        
+    <source>Create new</source>
+    <translation variants="no">Create new</translation>
+    <extra-loc-layout_id>qtl_dialog_softkey_2</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_34</extra-loc-viewid>
+    <extra-loc-positionid>button</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_uninstalls_1_and_deletes_all_sh">
     <comment>Confirmation note for uninstalling an application or a widget that has shortcuts on HS or in collections.</comment>        
     <source>%1 and all its shortcuts will be removed from phone. Continue?</source>
     <translation variants="no">%1 and all its shortcuts will be removed from phone. Continue?</translation>
-    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_01, applib_05, applib_07, applib_09</extra-loc-viewid>
-    <extra-loc-positionid>dialog</extra-loc-positionid>
-    <extra-loc-feature>ap</extra-loc-feature>
+    <extra-loc-layout_id>qtl_dialog_pri5_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_23</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_remove_from_collection">
@@ -442,7 +752,7 @@
     <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
     <extra-loc-viewid>applib_09</extra-loc-viewid>
     <extra-loc-positionid>menu</extra-loc-positionid>
-    <extra-loc-feature>ap</extra-loc-feature>
+    <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_common_opt_delete">
@@ -452,37 +762,27 @@
     <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
     <extra-loc-viewid>common</extra-loc-viewid>
     <extra-loc-positionid>opt</extra-loc-positionid>
-    <extra-loc-feature>co</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 %1? </source>
-    <translation variants="no">%1 must be closed before deleting. Close %1? </translation>
-    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_01, applib_05, applib_07, applib_09</extra-loc-viewid>
-    <extra-loc-positionid>dialog</extra-loc-positionid>
-    <extra-loc-feature>ap</extra-loc-feature>
+    <extra-loc-feature>common</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>
-    <translation variants="no">Collection(%L1)</translation>
-    <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_01, applib_05, applib_09</extra-loc-viewid>
-    <extra-loc-positionid>dialog_1_entry</extra-loc-positionid>
-    <extra-loc-feature>ap</extra-loc-feature>
+<message numerus="no" id="txt_applib_dialog_memory_in_use">
+    <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-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_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>ap</extra-loc-feature>
+<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>
+    <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_applib_opt_new_collection">
@@ -492,7 +792,27 @@
     <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
     <extra-loc-viewid>applib_03</extra-loc-viewid>
     <extra-loc-positionid>opt</extra-loc-positionid>
-    <extra-loc-feature>ap</extra-loc-feature>
+    <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>
+    <extra-loc-feature>applib</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_applib_dialog_remove_1_from_collection">
+    <comment>Confirmation for removing an app/widget from a collection. Does not delete the item from the device.</comment>        
+    <source>Remove %1 from collection?</source>
+    <translation variants="no">Remove %1 from collection?</translation>
+    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_26</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_subtitle_installed">
@@ -502,17 +822,27 @@
     <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>ap</extra-loc-feature>
+    <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_applib_dialog_remove_1_from_collection">
-    <comment>Confirmation for removing an app/widget from a collection. Does not delete the item from the device.</comment>        
-    <source>Remove %1 from collection?</source>
-    <translation variants="no">Remove %1 from collection?</translation>
-    <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_09</extra-loc-viewid>
+<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>
-    <extra-loc-feature>ap</extra-loc-feature>
+    <extra-loc-feature>applib</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_applib_title_select_items">
+    <comment>Heading for the mark mode dialog when selecting one or more apps to be added into a collection.</comment>        
+    <source>Select items:</source>
+    <translation variants="no">Select items:</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_35</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_dialog_entry_collection">
@@ -520,29 +850,29 @@
     <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_01, applib_05, applib_09</extra-loc-viewid>
+    <extra-loc-viewid>applib_15</extra-loc-viewid>
     <extra-loc-positionid>dialog_1_entry</extra-loc-positionid>
-    <extra-loc-feature>ap</extra-loc-feature>
+    <extra-loc-feature>applib</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_applib_dpopinfo_added_to_collection_1">
-    <comment>Confirmation for a successful operation, app/widget added to a collection. (Use only when user is not inside the target collection.)</comment>        
-    <source>Added to collection %1</source>
-    <translation variants="no">Added to collection %1</translation>
-    <extra-loc-layout_id>qtl_dialog_pri3</extra-loc-layout_id>    
-    <extra-loc-viewid>applib_01, applib_03, applib_05, applib_09</extra-loc-viewid>
-    <extra-loc-positionid>info</extra-loc-positionid>
-    <extra-loc-feature>ap</extra-loc-feature>
+<message numerus="no" id="txt_applib_dialog_version">
+    <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-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_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>
-    <translation variants="no">OK</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>co</extra-loc-feature>
+<message numerus="no" id="txt_applib_title_details">
+    <comment>Header of application details dialog</comment>        
+    <source>Details</source>
+    <translation variants="no">Details</translation>
+    <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
+    <extra-loc-viewid>applib_17</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>
 </context>

--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrarystateplugin.pro	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrarystateplugin.pro	Wed Aug 18 09:40:07 2010 +0300
@@ -32,7 +32,7 @@
     TARGET.UID3 = 0x20022F97
     nft::LIBS += -lhal
     include(hsapplibrarystateplugin_exports_to_rom.pri)
-    exists($${EPOCROOT}epoc32/include/platform/mw/XQSettingsManager):LIBS += -lxqsettingsmanager
+    LIBS += -lxqsettingsmanager
 }
 exportResources(./*.qm, resource/qt/translations)
 RESOURCES = hsapplibrarystateplugin.qrc

--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrarystateplugin.qrc	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrarystateplugin.qrc	Wed Aug 18 09:40:07 2010 +0300
@@ -1,6 +1,11 @@
 <RCC>
     <qresource prefix="/xml">
-        <file alias="applibrary.docml">resource/applibrary.docml</file>
+        <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>
+        <file alias="listview.docml">resource/listview.docml</file>
+        <file alias="searchview.docml">resource/searchview.docml</file>
     </qresource>
     <qresource prefix="/css">
         <file alias="hsapplibrarystateplugin.css">resource/hsapplibrarystateplugin.css</file>

--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrarystateplugin_exports_to_rom.pri	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrarystateplugin_exports_to_rom.pri	Wed Aug 18 09:40:07 2010 +0300
@@ -17,5 +17,7 @@
 BLD_INF_RULES.prj_exports += \
     "$${LITERAL_HASH}include <platform_paths.hrh>" \
     "conf/hsapplibrary.confml           APP_LAYER_CONFML(hsapplibrary.confml)" \
+    "conf/CI_hsapplibrary.confml        APP_LAYER_CONFML(CI_hsapplibrary.confml)" \
+    "conf/hsapplibrary.implml           APP_LAYER_CRML(hsapplibrary.implml)" \
     "conf/hsapplibrary_20022F97.crml    APP_LAYER_CRML(hsapplibrary_20022F97.crml)"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsaddmodeproxymodel.h	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,58 @@
+/*
+ * 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: Proxy model for view in add to homescreen mode.
+ *
+ */
+
+#ifndef HSADDMODEPROXYMODEL_H
+#define HSADDMODEPROXYMODEL_H
+
+#include <QSortFilterProxyModel>
+#include <caquery.h>
+#include <caentry.h>
+
+#include "hsmenustates_global.h"
+
+class CaNotifier;
+
+class HsAddModeProxyModel : public QSortFilterProxyModel
+{
+    Q_OBJECT
+
+    HS_STATES_TEST_FRIEND_CLASS(MenuStatesTest)
+    
+public:
+
+    HsAddModeProxyModel(QObject *parent = 0);
+    ~HsAddModeProxyModel();
+    void initilizeCwrtWidgetCache();
+
+private slots:
+
+    void updateCacheOnAddWidget(const QString &uri, const QVariantHash &preferences);
+    void updateCacheOnRemoveWidget(const QString &uri, const QVariantHash &preferences);
+    void updateEntryStatus(const CaEntry &entry, ChangeType changeType);
+
+private:
+    
+    virtual bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const;
+    static int findCwrtWidgetEntryId(const QVariantHash &preferences);
+
+    QHash<int,bool> mCwrtWidgetCache;
+    CaQuery mQuery;
+    QScopedPointer<CaNotifier> mNotifier;
+};
+
+#endif //HSADDMODEPROXYMODEL_H
+

--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsallappsstate.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsallappsstate.h	Wed Aug 18 09:40:07 2010 +0300
@@ -18,19 +18,15 @@
 #ifndef HSALLAPPSSTATE_H
 #define HSALLAPPSSTATE_H
 
-#include <qstate.h>
-#include <QModelIndex>
-#include <QPointer>
-
+#include <QState>
 #include "hsbaseviewstate.h"
 #include "hsmenumodewrapper.h"
 
 
+
 HS_STATES_TEST_CLASS(MenuStatesTest)
 
 class HbView;
-class HbAction;
-class HbMenu;
 class HbAbstractViewItem;
 class QPointF;
 class HsMenuViewBuilder;
@@ -52,40 +48,26 @@
 signals:
     void toAppLibraryState();
 
-public slots:
-    void scrollToBeginning();
-    void collectionsSortOrder(HsSortAttribute sortAttribute);
 private slots:
-    bool openTaskSwitcher();
-    int checkSoftwareUpdates();
-    void listItemActivated(const QModelIndex &index);
     void addActivated(const QModelIndex &index);
-    void listItemLongPressed(HbAbstractViewItem *item, const QPointF &coords);
     void addLongPressed(HbAbstractViewItem *item, const QPointF &coords);
     void addToCollection();
     void openInstalledView();
     void ascendingMenuAction();
     void descendingMenuAction();
-    void stateEntered();
+    void normalModeEntered();
     void addModeEntered();
-    void normalModeEntered();
     void stateExited();
     void contextMenuAction(HbAction *action);
 private:
     void construct();
     void setMenuOptions();
     void addToHomeScreen(const QModelIndex &index);
+    void setContextMenuOptions(HbAbstractViewItem *item, EntryFlags flags);
+
 private:
-    HbAction *mSecondarySoftkeyAction;
+    HsAddModeProxyModel *mAddModeProxyModel;
     HsSortAttribute mSortAttribute;
-    HsSortAttribute mCollectionsSortAttribute;
-    HsMenuView mMenuView;
-    HsMenuModeWrapper &mMenuMode;
-    HsMenuItemModel *mAllAppsModel;
-    HsMainWindow &mMainWindow;
-    QModelIndex mContextModelIndex;
-    QPointer<HbMenu> mContextMenu;
-
 };
 
 #endif // HSALLAPPSSTATE_H

--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsallcollectionsstate.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsallcollectionsstate.h	Wed Aug 18 09:40:07 2010 +0300
@@ -18,17 +18,11 @@
 #ifndef HSALLCOLLECTIONSSTATE_H
 #define HSALLCOLLECTIONSSTATE_H
 
-#include <qstate.h>
-#include <QModelIndex>
-#include <QPointF>
-#include <QPointer>
-
 #include "hsbaseviewstate.h"
-#include "hsmenumodewrapper.h"
 
 HS_STATES_TEST_CLASS(MenuStatesTest)
 
-class HbMenu;
+class QPointF;
 class HsMenuViewBuilder;
 class HbAbstractViewItem;
 class HbAction;
@@ -36,6 +30,7 @@
 class HsMenuItemModel;
 class HsMenuView;
 class HsMainWindow;
+class HsMenuModeWrapper;
 
 class HsAllCollectionsState: public HsBaseViewState
 {
@@ -49,24 +44,13 @@
     ~HsAllCollectionsState();
 protected:
 signals:
-    void sortOrderChanged(HsSortAttribute sortAttribute);
     void toAppLibraryState();
 
-public slots:
-    void scrollToBeginning();
 private slots:
-    bool openTaskSwitcher();
-    void listItemActivated(const QModelIndex &index);
     void addActivated(const QModelIndex &index);
-    void listItemLongPressed(HbAbstractViewItem *item, const QPointF &coords);
     void addLongPressed(HbAbstractViewItem *item, const QPointF &coords);
     void createNewCollection();
     void createArrangeCollection();
-    void customMenuAction();
-    void ascendingMenuAction();
-    void descendingMenuAction();
-    void stateEntered();
-    void addModeEntered();
     void normalModeEntered();
     void normalModeExited();
     void stateExited();
@@ -74,15 +58,7 @@
 private:
     void construct();
     void setMenuOptions();
-private:
-    HbAction *mSecondarySoftkeyAction;
-    HsSortAttribute mSortAttribute;
-    HsMenuView mMenuView;
-    HsMenuModeWrapper &mMenuMode;
-    HsMenuItemModel *mAllCollectionsModel;
-    HsMainWindow &mMainWindow;
-    QModelIndex mContextModelIndex;
-    QPointer<HbMenu> mContextMenu;
+    void setContextMenuOptions(HbAbstractViewItem *item, EntryFlags flags);
 };
 
 #endif // HSALLCOLLECTIONSSTATE_H

--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsapplibrarystate.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsapplibrarystate.h	Wed Aug 18 09:40:07 2010 +0300
@@ -84,28 +84,13 @@
 private:
 
     HsMenuViewBuilder mMenuViewBuilder;
-    /**
-     * All Applications state.
-     * Own.
-     */
+
     HsAllAppsState *mAllAppsState;
 
-    /**
-     * Transition to remember last visited child state in Application Library.
-     * Own.
-     */
     HsMenuModeTransition *mHistoryTransaction;
 
-    /**
-     * All Collections state.
-     * Own.
-     */
     HsAllCollectionsState *mAllCollectionsState;
 
-    /**
-     * Collection state.
-     * Own.
-     */
     HsCollectionState *mCollectionState;
 
     HsInstalledAppsState *mInstalledAppsState;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsapplibstateutils.h	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,38 @@
+/*
+ * 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: Utils for application library state plugin.
+ *
+ */
+
+#ifndef HSAPPLIBSTATEUTILS_H
+#define HSAPPLIBSTATEUTILS_H
+
+#include <QObject>
+
+#include "hsmenustates_global.h"
+
+class CaEntry;
+
+class HsAppLibStateUtils
+{
+    HS_STATES_TEST_FRIEND_CLASS(MenuStatesTest)
+    
+public:
+    
+    static bool isCWRTWidgetOnHomeScreen(const CaEntry *entry);
+    
+};
+
+#endif //HSAPPLIBSTATEUTILS_H
+

--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsbaseviewstate.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsbaseviewstate.h	Wed Aug 18 09:40:07 2010 +0300
@@ -18,14 +18,23 @@
 #ifndef HSBASEVIEWSTATE_H
 #define HSBASEVIEWSTATE_H
 
-#include <qstate.h>
+#include <QState>
+#include <QPointer>
+#include <QModelIndex>
 
 #include "hsmenustates_global.h"
 #include "hsmenuservice.h"
 #include "hsmenuview.h"
 
+
+class HbMenu;
+class HbAction;
 class HbMessageBox;
+class HbAbstractViewItem;
 class CaNotifier;
+class HsMenuModeWrapper;
+class HsMainWindow;
+class HsAddModeProxyModel;
 
 HS_STATES_TEST_CLASS(MenuStatesTest)
 
@@ -37,35 +46,56 @@
     
 public:
     
-    HsBaseViewState(QState *parent);    
+    HsBaseViewState(HsMainWindow &mainWindow, QState *parent);
+    HsBaseViewState(HsMainWindow &mainWindow, 
+        HsMenuModeWrapper& menuMode, QState *parent);
     ~HsBaseViewState();
-    
+    void scrollToBeginning();
+
 private slots:
 
-    void applicationLaunchFailMessageFinished(HbAction*);
-    
+    virtual void openAppLibrary();
+
 protected slots:
     
-    void stateExited();
+    virtual void stateEntered();
+    virtual void stateExited();
+    virtual void addModeEntered();
+    virtual void addModeExited();
+    virtual void normalModeEntered();
+    virtual void normalModeExited();
+    virtual void launchItem(const QModelIndex &index);
+    virtual void openCollection(const QModelIndex &index);
+    virtual void showContextMenu(HbAbstractViewItem *item, const QPointF &coords);
+    virtual int checkSoftwareUpdates();
+    virtual bool openTaskSwitcher();
+    virtual void closeContextMenu();
     
 protected:
     
+    void initialize(HsMenuViewBuilder &menuViewBuilder, HsStateContext stateContext);
     void createApplicationLaunchFailMessage(int errorCode,int itemId);
-    void subscribeForMemoryCardRemove();
-    
+    void defineTransitions();
+
+private:
+
+    virtual void setContextMenuOptions(HbAbstractViewItem *item, EntryFlags flags) = 0;
+    virtual void setMenuOptions() = 0;
+
 private:
     
-    void construct();
-    void cleanUpApplicationLaunchFailMessage();
-    
-private:
+    QPointer<HbMessageBox> mApplicationLaunchFailMessage;
+
+protected:
     
-    CaNotifier *mNotifier;
-    
-    int mMessageRelatedItemId;
-    
-    HbMessageBox *mApplicationLaunchFailMessage;
-
+    HsMenuItemModel *mModel;
+    QPointer<HbMenu> mContextMenu;
+    QModelIndex mContextModelIndex;
+    HbAction *mBackKeyAction;
+    QScopedPointer<HsMenuView> mMenuView;
+    HsMenuModeWrapper *mMenuMode;
+    HsMainWindow &mMainWindow;
+    HbMenu *mViewOptions;
 };

--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hscollectionstate.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hscollectionstate.h	Wed Aug 18 09:40:07 2010 +0300
@@ -18,9 +18,8 @@
 #ifndef HSCOLLECTIONSTATE_H
 #define HSCOLLECTIONSTATE_H
 
-#include <qstate.h>
-#include <qabstractitemmodel.h>
-#include <QPointer>
+#include <QState>
+#include <QAbstractItemModel>
 
 #include "hsbaseviewstate.h"
 
@@ -30,7 +29,6 @@
 class HbAction;
 class HbMenu;
 class HbAbstractViewItem;
-class QModelIndex;
 class HsMenuItemModel;
 class HsMenuModeWrapper;
 class HsMenuViewBuilder;
@@ -46,29 +44,25 @@
                       HsMainWindow &mainWindow,
                       QState *parent = 0);
     ~HsCollectionState();
-public slots:
-    void collectionsSortOrder(HsSortAttribute sortAttribute);
 protected:
     void onEntry(QEvent *event);
 signals:
     void sortOrderChanged(HsSortAttribute sortAttribute);
 private slots:
-    bool openTaskSwitcher();
-    void listItemActivated(const QModelIndex &index);
-    void listItemLongPressed(HbAbstractViewItem *item, const QPointF &coords);
     void addAppsAction(bool addApps = true);
     void addCollectionShortcutToHomeScreenAction();
     void renameAction();
     void deleteAction();
-    void backSteppingAction();
     void updateLabel();
     void stateEntered();
+
     void stateExited();
     void latestOnTopMenuAction();
     void oldestOnTopMenuAction();
     void contextMenuAction(HbAction *action);
     void handleEmptyChange(bool empty);
     void lockSearchButton(bool lock);
+    void createArrangeCollection();
 
 private:
     void construct();
@@ -76,20 +70,13 @@
     void makeConnect();
     void makeDisconnect();
     void addElementToHomeScreen(const QModelIndex &index);
+    void setContextMenuOptions(HbAbstractViewItem *item, EntryFlags flags);
+    void setMenuOptions();
 
 private:
     HsSortAttribute mSortAttribute;
-    HsSortAttribute mCollectionsSortAttribute;
     int mCollectionId;
     QString mCollectionType;
-    HsMenuView mMenuView;
-    HsMenuModeWrapper &mMenuMode;
-    HbAction *const mSecondarySoftkeyAction;
-    HsMenuItemModel *mCollectionModel;
-    HbMenu *mOptions;
-    QModelIndex mContextModelIndex;
-    QPointer<HbMenu> mContextMenu;
-    HsMainWindow &mMainWindow;
 };
 
 #endif // HSCOLLECTIONSTATE_H

--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsinstalledappsstate.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsinstalledappsstate.h	Wed Aug 18 09:40:07 2010 +0300
@@ -18,9 +18,7 @@
 #ifndef HSINSTALLEDAPPSSTATE_H
 #define HSINSTALLEDAPPSSTATE_H
 
-#include <qstate.h>
-#include <QModelIndex>
-#include <QPointer>
+#include <QState>
 
 #include "hsbaseviewstate.h"
 
@@ -51,15 +49,7 @@
 
 private slots:
 
-    bool openTaskSwitcher();
-
-    void listItemActivated(const QModelIndex &index);
-
-    void listItemLongPressed(HbAbstractViewItem *item,
-                             const QPointF &coords);
-
-    void backAction();
-
+    void openInstallationLog();
     void stateEntered();
 
     void stateExited();
@@ -71,33 +61,8 @@
 private:
 
     void construct();
-
     void setMenuOptions();
-
-private:
-    /**
-     * The View widget.
-     * Own.
-     */
-    HsMenuView mMenuView;
-
-    /**
-     * Item Model for the List.
-     * Own.
-     */
-    HsMenuItemModel *mInstalledAppsModel;
-
-    /**
-     * Secondary Softkey action.
-     * Backstepping functionality.
-     * Own.
-     */
-    HbAction *const mSecondarySoftkeyAction;
-    
-    HsMainWindow &mMainWindow;
-
-    QModelIndex mContextModelIndex;
-    QPointer<HbMenu> mContextMenu;
+    void setContextMenuOptions(HbAbstractViewItem *item, EntryFlags flags);
 };
 
 #endif // HSINSTALLEDAPPSSTATE_H

--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hslistviewitem.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hslistviewitem.h	Wed Aug 18 09:40:07 2010 +0300
@@ -19,10 +19,21 @@
 #define CUSTOMLISTVIEWITEM_H
 
 #include <hblistviewitem.h>
+#include <HbProgressBar>
 
 #include "hsmenustates_global.h"
 
-class HbProgressBar;
+// TODO: this is only temporary class for show progress bar.
+// It should be remove when fix from orbit will be in official platfrom.
+class HsProgressBar: public HbProgressBar {
+public:
+    HsProgressBar(QGraphicsItem *parent=0):HbProgressBar(parent) {}
+    
+protected:
+    void paint ( QPainter * painter, 
+            const QStyleOptionGraphicsItem * option, 
+            QWidget * widget = 0 );
+};
 
 HS_STATES_TEST_CLASS(MenuStatesTest)
 
@@ -33,17 +44,18 @@
                 
         explicit HsListViewItem(QGraphicsItem* parent=0);
         virtual ~HsListViewItem();
-        
+   
         virtual HbAbstractViewItem* createItem();
         virtual void updateChildItems();
     
+    protected:    
 	    virtual void polish(HbStyleParameters& params);
 
     private:
-
-        HbProgressBar *progress;
+	    HsProgressBar *progress;
         bool isProgress;
     HS_STATES_TEST_FRIEND_CLASS(MenuStatesTest)
 };
 
+
 #endif // CUSTOMLISTVIEWITEM_H

--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmainwindow.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmainwindow.h	Wed Aug 18 09:40:07 2010 +0300
@@ -20,31 +20,20 @@
 
 #include <QObject>
 #include <QPixmap>
+#include "hsmenustates_global.h"
 
-class HsMenuView;
-class HsMainWindow: public QObject
+HS_STATES_TEST_CLASS(MenuStatesTest)
+
+class HbView;
+
+class HsMainWindow
 {
-    Q_OBJECT
-    
 public:
     HsMainWindow();
     virtual ~HsMainWindow();
 
-    virtual void setCurrentView(const HsMenuView &menuView);
-    virtual QPixmap grabScreenshot();
-       
-    public slots:
-    virtual void saveActivity();
-    
-    signals:
-    void viewIsReady();
-    
-    private:
-    /*
-     * not owned
-     * 
-     */
-    QObject* mActivityClient;
+    virtual void setCurrentView(HbView *view);
+
 };
 
 #endif // HS_MAIN_WINDOW_H

--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmenuview.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmenuview.h	Wed Aug 18 09:40:07 2010 +0300
@@ -21,10 +21,12 @@
 #include <QObject>
 #include <QModelIndex>
 #include <QAbstractItemView>
+#include <QScopedPointer>
 #include <QSortFilterProxyModel>
 #include <HbAbstractItemView>
 #include "hsmenustates_global.h"
 #include "hsmenuviewbuilder.h"
+#include "hssearchview.h"
 #include "hsapp_defs.h"
 
 class QPointF;
@@ -32,100 +34,74 @@
 class HbView;
 class HbMainWindow;
 class HbAction;
-class HbAbstractItemView;
 class HbListView;
 class HbGroupBox;
 class HbWidget;
-class HbStaticVkbHost;
+class HbShrinkingVkbHost;
+class HsMainWindow;
 class HsMenuItemModel;
 
+HS_STATES_TEST_CLASS(MenuStatesTest)
 
-HS_STATES_TEST_CLASS(MenuStatesTest)
 
 class HsMenuView: public QObject
 {
     Q_OBJECT
 
 public:
-    HsMenuView(HsMenuViewBuilder &builder, HsViewContext viewContext);
+    HsMenuView(HsMenuViewBuilder &builder, HsStateContext stateContext,
+               HsMainWindow& mainWindow);
     ~HsMenuView();
 
-    void setSearchPanelVisible(bool visible);
-    void setContext(HsViewContext viewContext,
-                    HsOperationalContext context);
-
     HbView *view() const;
 
     HbListView *listView() const;
-    HbPushButton *collectionButton() const;
+    HbPushButton *contentButton() const;
 
     void activate();
     void inactivate();
 
     HbGroupBox *viewLabel() const;
 
-    void setModel(HsMenuItemModel *model);
+    void setModel(QAbstractItemModel *model);
+    QAbstractItemModel *model() const;
 
-
+    void reset(HsOperationalContext operationalContext);
 signals:
     void activated(const QModelIndex &index);
     void longPressed(HbAbstractViewItem *item, const QPointF &coords);
-
+    void listViewChange();
 public slots:
 
-    void activatedProxySlot(const QModelIndex &index);
-    void longPressedProxySlot(HbAbstractViewItem *item,
-                              const QPointF &coords);
-
     void showSearchPanel();
     void hideSearchPanel();
 
     void disableSearch(bool disable);
 
-
 private slots:
     void scrollToRow(int row,
                      QAbstractItemView::ScrollHint hint =
                          QAbstractItemView::PositionAtTop);
-    void findItem(QString criteriaStr);
-
-    void vkbOpened();
-    void vkbClosed();
 
 private:
 
-    QModelIndex firstVisibleItemIndex(const HbListView *view) const;
-
-    void connectSearchPanelSignals();
-    void disconnectSearchPanelSignals();
-    void connectSearchItemViewsSignals();
-    void disconnectSearchItemViewsSignals();
-
-    void searchFinished();
-    void searchBegins();
     HbAbstractItemView::ScrollHint convertScrollHint(
         QAbstractItemView::ScrollHint hint);
 
+    void switchBuilderContext();
+    void synchronizeCache();
 private:
-
-    const HsViewContext mViewContext;
     HsMenuViewBuilder &mBuilder;
-
-    QModelIndex mSearchViewInitialIndex;
-    QModelIndex mIndexToScrollAfterSearchDone;
-    QModelIndex mSearchViewLongPressedIndex;
+    const HsStateContext mStateContext;
+    HsOperationalContext mOperationalContext;
+    HsMainWindow &mMainWindow;
 
-    QSortFilterProxyModel *mProxyModel; // owned
-
-    HbView *mView;
-    HbListView *mListView;
-    HbGroupBox *mViewLabel;
+    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
 
-    HbListView *mSearchListView;
-    HbSearchPanel *mSearchPanel;
-    HbStaticVkbHost* mVkbHost;
-
-    HbPushButton *mCollectionButton;
+    QScopedPointer<HsSearchView> mHsSearchView;
 
     HS_STATES_TEST_FRIEND_CLASS(MenuStatesTest)
 };

--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmenuviewbuilder.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmenuviewbuilder.h	Wed Aug 18 09:40:07 2010 +0300
@@ -20,7 +20,9 @@
 
 #include <QFlags>
 #include <QMap>
+#include <QPair>
 #include <QSet>
+#include <QSharedPointer>
 #include <QString>
 #include <qnamespace.h>
 #include <HbDocumentLoader>
@@ -31,25 +33,25 @@
 class HbGroupBox;
 class HbLineEdit;
 class HbListView;
-class HbSearchPanel;
 class HbToolBar;
 class HbView;
 class HbWidget;
 class HbToolBarExtension;
 class HbPushButton;
 
-enum HsViewContext {
-    HsAllAppsContext,
+enum HsStateContext {
+    HsAllAppsContext = 0,
     HsAllCollectionsContext,
     HsInstalledAppsContext,
     HsCollectionContext,
+    InvalidStateContext
 };
 
 enum HsOperationalContext {
-    HsItemViewContext,
-    HsSearchContext,
+    HsItemViewContext = 0,
     HsButtonContext,
-    HsEmptyLabelContext
+    HsEmptyLabelContext,
+    InvalidOperationalContext
 };
 
 HS_STATES_TEST_CLASS(MenuStatesTest)
@@ -71,58 +73,53 @@
     HbToolBarExtension *toolBarExtension() const;
 
     // mandatory context dependent widgets accessors
-    HbView *currentView() const;
-    HbListView *currentListView() const;
+    HbView *currentView();
+    HbListView *currentListView();
 
 
     // optional widgets accessors
-    HbGroupBox *currentViewLabel() const;
-    HbSearchPanel *currentSearchPanel() const;
-    HbPushButton *collectionButton() const;
-
-
-    void setViewContext(HsViewContext viewContext);
-    void setOperationalContext(HsOperationalContext operationalContext);
-    bool build();
-
-private:
-    void init();
-
-    bool parseSection(const QString &sectionName = QString());
+    HbGroupBox *currentViewLabel();
+    HbPushButton *currentAddContentButton();
 
 
-    bool readContextConfiguration(HsViewContext, HsOperationalContext);
+    void setStateContext(HsStateContext stateContext);
+    void setOperationalContext(HsOperationalContext operationalContext);
+
+private:
+    typedef QPair<HsStateContext, HsOperationalContext> Context;
+    typedef QMap<Context, QSharedPointer<HbDocumentLoader> > LoaderMap;
+
+    QSharedPointer<HbDocumentLoader>
+            parseDocument(const QString &documentBaseName);
+
+    QSharedPointer<HbDocumentLoader> readContextConfiguration();
+
+    Context context() const;
+
+    QSharedPointer<HbDocumentLoader> currentLoader();
 
 
-    void searchPanelVisibilityChange(bool visible);
-
-    HbLineEdit *searchPanelLineEdit() const;
-
-    QMap<HsViewContext, QString > mViewContextToStringMap;
-    QMap<HsOperationalContext, QString > mOperationalContextToStringMap;
-
-    HbDocumentLoader mDocumentLoader;
     QSet<QObject *> mLoadedObjects;
 
-    const QString DOCUMENT_FILE_NAME;
+
     const QString ALL_APPS_ACTION_NAME;
     const QString ALL_COLLECTIONS_ACTION_NAME;
     const QString SEARCH_ACTION_NAME;
     const QString OVI_STORE_ACTION_NAME;
     const QString OPERATOR_ACTION_NAME;
-    const QString SEARCH_PANEL_NAME;
-    const QString BUTTON_NAME;
-    const QString TOOL_BAR_NAME;
 
     QActionGroup *mToolBarActionGroup;
     HbToolBar *mToolBar;
     HbToolBarExtension *mToolBarExtension;
     HbAction *mToolBarExtensionAction;
 
-    HsViewContext mViewContext;
+    HsStateContext mStateContext;
     HsOperationalContext mOperationalContext;
 
     HS_STATES_TEST_FRIEND_CLASS(MenuStatesTest)
+
+    LoaderMap mLoaderMap;
+    QSharedPointer<HbDocumentLoader> mCommonObjectsLoader;
 };
 
 #endif // HSMENUVIEWBUILDER_H

--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsoperatorhandler.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsoperatorhandler.h	Wed Aug 18 09:40:07 2010 +0300
@@ -23,6 +23,7 @@
 #include "hsmenustates_global.h"
 
 class HsOperatorHandlerPrivate;
+class HbAction;
 
 class HsOperatorHandler: public QObject
 {
@@ -33,10 +34,17 @@
 public:
     HsOperatorHandler(QObject *parent = 0);
     virtual ~HsOperatorHandler();
-    HbIcon icon();
+    bool operatorStorePresent();
+    bool oviStorePresent();
+    bool operatorStoreFirst();
+    HbAction *prepareOperatorStoreAction(
+            HbAction *const operatorAction);
     QString text();
 
-public slots:
+private:
+    HbIcon icon();
+
+private slots:
     void action();
 
 private:

--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsoperatorhandler_p.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsoperatorhandler_p.h	Wed Aug 18 09:40:07 2010 +0300
@@ -14,18 +14,17 @@
  * Description: Hs Operator Handler Private.
  *
  */
-
 #ifndef HSOPERATORHANDLER_P_H_
 #define HSOPERATORHANDLER_P_H_
 
-#ifndef NO_QT_EXTENSIONS
+#ifdef QT_EXTENSIONS
 
 #include <QObject>
+#include <XQSettingsManager>
 #include <HbIcon>
 #include "hsmenustates_global.h"
 
 class CaEntry;
-class XQSettingsManager;
 
 class HsOperatorHandlerPrivate: public QObject
 {
@@ -34,23 +33,46 @@
     HS_STATES_TEST_FRIEND_CLASS(MenuStatesTest)
 
 public:
+
+    enum HsStoreType {
+        NoneType,
+        UrlType,
+        ApplicationType
+    };
+
     HsOperatorHandlerPrivate(QObject *parent = 0);
     virtual ~HsOperatorHandlerPrivate();
     HbIcon icon();
     QString text();
     void action();
+    bool oviStorePresent();
+    bool operatorStorePresent();
+    bool operatorStoreFirst();
 
 private:
+    bool storeValue(XQSettingsManager *crManager, int storePresenceKey);
+    QVariant getVariantFromKey(
+            XQSettingsManager *crManager,
+            int crKey,
+            XQSettingsManager::Type type);
+    HsStoreType operatorStoreType(XQSettingsManager *crManager);
+
     void readCentralRepository();
     HbIcon createIcon(XQSettingsManager *crManager);
-    QString readText(XQSettingsManager *crManager);
+    QString operatorStoreTitle(XQSettingsManager *crManager);
     CaEntry *createAppEntry(XQSettingsManager *crManager);
     CaEntry *createUrlEntry(XQSettingsManager *crManager);
+    bool operatorStoreFirst(XQSettingsManager *crManager);
 
 private:
+    bool mOviStorePresent;
+    bool mOperatorStorePresent;
+    HsStoreType mStoreType;
     CaEntry *mOperatorEntry;
     HbIcon mIcon;
-    QString mText;
+    QString mOperatorStoreTitle;
+    bool mOperatorStoreFirst;
+
 };
 
 #endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hssearchview.h	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,110 @@
+/*
+ * 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: Search view.
+ *
+ */
+
+#ifndef HSSEARCHVIEW_H
+#define HSSEARCHVIEW_H
+
+#include <QModelIndex>
+#include <QScopedPointer>
+
+#include <HbShrinkingVkbHost>
+
+#include "hsmenustates_global.h"
+#include "hsmenuviewbuilder.h"
+#include "hssearchviewbuilder.h"
+
+class QSortFilterProxyModel;
+class HsMainWindow;
+class HbAbstractViewItem;
+class HbLineEdit;
+class HbSearchPanel;
+
+HS_STATES_TEST_CLASS(MenuStatesTest)
+
+class HsSearchView : public QObject
+{
+    Q_OBJECT
+
+    HS_STATES_TEST_FRIEND_CLASS(MenuStatesTest)
+
+public:
+
+    HsSearchView(
+            HsMenuViewBuilder &builder,
+            HsStateContext stateContext,
+            HsMainWindow &mainWindow);
+    ~HsSearchView();
+
+    void setSearchPanelVisible(bool visible);
+private:
+
+    bool isActive() const;
+
+    QModelIndex firstVisibleItemIndex(const HbListView *view) const;
+    void searchBegins();
+
+    void connectSearchItemViewsSignals();
+    void disconnectSearchItemViewsSignals();
+
+    void connectSearchPanelSignals();
+
+    void disconnectSearchPanelSignals();
+
+    void searchFinished();
+
+signals:
+    void activated(const QModelIndex &index);
+    void longPressed(HbAbstractViewItem *item, const QPointF &coords);
+
+public slots:
+    void hideSearchPanel();
+
+private slots:
+    void activatedProxySlot(const QModelIndex &index);
+    void longPressedProxySlot(
+            HbAbstractViewItem *item, const QPointF &coords);
+
+private slots:
+    void findItem(QString criteriaStr);
+    void setNoResultsVisibility();
+
+private:
+    void setOriginatingContext();
+    void initSearchPanel(HbSearchPanel &searchPanel);
+    HbLineEdit *searchPanelLineEdit(HbSearchPanel &searchPanel) const;
+
+private:
+
+    QModelIndex mSearchViewInitialIndex;
+    QModelIndex mIndexToScrollAfterSearchDone;
+    QModelIndex mSearchViewLongPressedIndex;
+    QSortFilterProxyModel *mProxyModel; // owned
+    HbView *mSearchView;
+    HbListView *mSearchListView;
+    HbSearchPanel *mSearchPanel;
+    const HsStateContext mStateContext;
+    HsOperationalContext mAfterSearchContext;
+    HsMenuViewBuilder &mBuilder;
+    HsMainWindow &mMainWindow;
+    HbListView *mListView;
+    QScopedPointer<HbShrinkingVkbHost> mVkbHost;
+    HsSearchViewBuilder mSearchViewBuilder;
+    bool mEmptyResultText;
+
+};
+
+#endif /* HSSEARCHVIEW_H_ */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hssearchviewbuilder.h	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,54 @@
+/*
+ * 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 View Builder
+ *
+ */
+
+#ifndef HSSEARCHVIEWBUILDER_H_
+#define HSSEARCHVIEWBUILDER_H_
+
+#include <HbDocumentLoader>
+#include "hsmenustates_global.h"
+
+class HbSearchPanel;
+class HbView;
+class HbListView;
+class HbGroupBox;
+
+HS_STATES_TEST_CLASS(MenuStatesTest)
+
+class HsSearchViewBuilder
+{
+
+    HS_STATES_TEST_FRIEND_CLASS(MenuStatesTest)
+
+public:
+    HsSearchViewBuilder();
+    virtual ~HsSearchViewBuilder();
+
+    HbView *searchView();
+    HbListView *searchListView();
+    HbSearchPanel *searchPanel();
+    HbGroupBox *searchViewLabel();
+    void setSearchLabledContext();
+    bool loadViewEmptySection();
+    bool loadViewListSection();
+
+private:
+    QSet<QObject *> mLoadedObjects;
+    QSharedPointer<HbDocumentLoader> mLoader;
+    bool mLabledContext;
+};
+
+#endif /* HSSEARCHVIEWBUILDER_H_ */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/resource/addcontentlabeledview.docml	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,35 @@
+<?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"/>
+                    <bool name="checkable" value="TRUE"/>
+                    <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/applibrary.docml	Tue Jul 06 14:06:53 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,509 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.1">
-    <object name="allAppsAction" type="HbAction">
-        <bool name="checkable" value="TRUE"/>
-        <icon iconName="qtg_mono_applications_all" name="icon"/>
-    </object>
-    <object name="allCollectionsAction" type="HbAction">
-        <bool name="checkable" value="TRUE"/>
-        <icon iconName="qtg_mono_applications_collections" name="icon"/>
-    </object>
-    <object name="searchAction" type="HbAction">
-        <icon iconName="qtg_mono_search" name="icon"/>
-    </object>
-    <object name="oviStoreAction" type="HbAction">
-        <icon iconName="qtg_mono_ovistore" name="icon"/>
-    </object>
-    <object name="operatorAction" type="HbAction"/>
-    <widget name="view" type="HbView">
-        <widget name="container" role="HbView:widget" type="HbWidget">
-            <widget name="collectionLabel" type="HbGroupBox">
-
-                <sizehint height="6un" type="MAXIMUM" width="100un"/>
-                <bool name="visible" value="FALSE"/>
-                <string name="heading" value="."/>
-                <bool name="marqueeHeading" value="TRUE"/>
-                <fontspec name="fontSpec" role="Title" textheight="0"/>
-                <integer name="groupBoxType" value="1"/>
-            </widget>
-            <widget name="searchPanel" type="HbSearchPanel">
-                <bool name="progressive" value="TRUE"/>
-                <sizehint height="0un" type="MAXIMUM" width="0un"/>
-                <bool name="visible" value="FALSE"/>
-            </widget>
-        </widget>
-        <bool name="contentFullScreen" value="FALSE"/>
-        <bool name="visible" value="FALSE"/>
-    </widget>
-    <section name="allAppsViewDefinition">
-        <widget name="allAppsView" type="HbView">
-            <widget name="allAppsContainer" role="HbView:widget" type="HbWidget">
-                <widget name="allAppsListView" type="HbListView">
-                    <bool name="itemRecycling" value="TRUE"/>
-                    <enums name="horizontalScrollBarPolicy" value="ScrollBarAutoHide"/>
-                    <sizehint height="100un" type="MAXIMUM" width="-1"/>
-                    <bool name="frictionEnabled" value="TRUE"/>
-                    <bool name="visible" value="TRUE"/>
-                </widget>
-                <widget name="searchPanel" type="HbSearchPanel">
-                    <sizehint height="0un" type="MAXIMUM" width="0un"/>
-                    <bool name="visible" value="FALSE"/>
-                </widget>
-                <widget name="allAppsSearchListView" type="HbListView">
-                    <bool name="visible" value="FALSE"/>
-                </widget>
-                <layout orientation="Vertical" type="linear">
-                    <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
-                    <linearitem itemname="allAppsListView"/>
-                </layout>
-            </widget>
-            <string locid="txt_applib_title_applications" name="title"/>
-            <bool name="contentFullScreen" value="FALSE"/>
-        </widget>
-    </section>
-    <section name="allAppsSearchViewDefinition">
-        <widget name="allAppsView" type="HbView">
-            <widget name="allAppsContainer" role="HbView:widget" type="HbWidget">
-                <widget name="searchPanel" type="HbSearchPanel">
-                    <sizehint height="10un" type="MAXIMUM" width="100un"/>
-                    <bool name="visible" value="TRUE"/>
-                </widget>
-                <widget name="allAppsListView" type="HbListView">
-                    <sizehint height="0un" type="MAXIMUM" width="0un"/>
-                    <bool name="visible" value="FALSE"/>
-                </widget>
-                <widget name="allAppsSearchListView" type="HbListView">
-                    <bool name="itemRecycling" value="TRUE"/>
-                    <enums name="horizontalScrollBarPolicy" value="ScrollBarAutoHide"/>
-                    <sizehint height="100un" type="MAXIMUM" width="-1"/>
-                    <bool name="frictionEnabled" value="TRUE"/>
-                    <bool name="visible" value="TRUE"/>
-                </widget>
-                <layout orientation="Vertical" type="linear">
-                    <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
-                    <linearitem itemname="allAppsSearchListView"/>
-                    <linearitem itemname="searchPanel"/>
-                </layout>
-            </widget>
-            <string locid="txt_applib_title_applications" name="title"/>
-            <bool name="contentFullScreen" value="TRUE"/>
-        </widget>
-    </section>
-    <section name="allCollectionsViewDefinition">
-        <widget name="allCollectionsView" type="HbView">
-            <widget name="allCollectionsContainer" role="HbView:widget" type="HbWidget">
-                <widget name="allCollectionsListView" type="HbListView">
-                    <bool name="itemRecycling" value="TRUE"/>
-                    <enums name="horizontalScrollBarPolicy" value="ScrollBarAutoHide"/>
-                    <sizehint height="100un" type="MAXIMUM" width="-1"/>
-                    <bool name="frictionEnabled" value="TRUE"/>
-                    <bool name="visible" value="TRUE"/>
-                </widget>
-                <layout orientation="Vertical" type="linear">
-                    <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
-                    <linearitem itemname="allCollectionsListView"/>
-                </layout>
-            </widget>
-            <widget name="allCollectionsSearchListView" type="HbListView">
-                <sizehint height="0un" type="MAXIMUM" width="0un"/>
-                <bool name="visible" value="FALSE"/>
-            </widget>
-            <widget name="searchPanel" type="HbSearchPanel">
-                <sizehint height="0un" type="MAXIMUM" width="0un"/>
-                <bool name="visible" value="FALSE"/>
-            </widget>
-            <string locid="txt_applib_title_applications" name="title"/>
-            <bool name="contentFullScreen" value="FALSE"/>
-        </widget>
-    </section>
-    <section name="allCollectionsSearchViewDefinition">
-        <widget name="allCollectionsView" type="HbView">
-            <widget name="allCollectionsContainer" role="HbView:widget" type="HbWidget">
-                <widget name="searchPanel" type="HbSearchPanel">
-                    <sizehint height="10un" type="MAXIMUM" width="100un"/>
-                    <bool name="visible" value="TRUE"/>
-                </widget>
-                <widget name="allCollectionsListView" type="HbListView">
-                    <sizehint height="0un" type="MAXIMUM" width="0un"/>
-                    <bool name="visible" value="FALSE"/>
-                </widget>
-                <widget name="allCollectionsSearchListView" type="HbListView">
-                    <bool name="itemRecycling" value="TRUE"/>
-                    <enums name="horizontalScrollBarPolicy" value="ScrollBarAutoHide"/>
-                    <sizehint height="100un" type="MAXIMUM" width="-1"/>
-                    <bool name="frictionEnabled" value="TRUE"/>
-                    <bool name="visible" value="TRUE"/>
-                </widget>
-                <layout orientation="Vertical" type="linear">
-                    <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
-                    <linearitem itemname="allCollectionsSearchListView"/>
-                    <linearitem itemname="searchPanel"/>
-                </layout>
-            </widget>
-            <string locid="txt_applib_title_applications" name="title"/>
-            <bool name="contentFullScreen" value="TRUE"/>
-        </widget>
-    </section>
-    <section name="installedAppsViewDefinition">
-        <widget name="installedAppsView" type="HbView">
-            <widget name="installedAppsContainer" role="HbView:widget" type="HbWidget">
-                <widget name="installedAppsLabel" type="HbGroupBox">
-                    <string locid="txt_applib_subtitle_installed" name="heading"/>
-                    <bool name="marqueeHeading" value="TRUE"/>
-                    <sizehint height="6un" type="MAXIMUM" width="-1"/>
-                    <fontspec name="fontSpec" role="Title" textheight="0"/>
-                    <integer name="groupBoxType" value="1"/>
-                </widget>
-                <widget name="installedAppsListView" type="HbListView">
-                    <bool name="itemRecycling" value="TRUE"/>
-                    <enums name="horizontalScrollBarPolicy" value="ScrollBarAutoHide"/>
-                    <sizehint height="100un" type="MAXIMUM" width="-1"/>
-                    <bool name="frictionEnabled" value="TRUE"/>
-                    <bool name="visible" value="TRUE"/>
-                </widget>
-                <widget name="installedAppsSearchListView" type="HbListView">
-                    <sizehint height="0un" type="MAXIMUM" width="0un"/>
-                    <bool name="visible" value="FALSE"/>
-                </widget>
-                <widget name="searchPanel" type="HbSearchPanel">
-                    <sizehint height="0un" type="MAXIMUM" width="0un"/>
-                    <bool name="visible" value="FALSE"/>
-                </widget>
-                <widget name="installedAppsEmptyLabel" type="HbLabel">
-                    <sizehint height="0un" type="MINIMUM" width="0un"/>
-                    <sizehint height="0un" type="MAXIMUM" width="0un"/>
-                    <bool name="visible" value="FALSE"/>
-                </widget>
-                <layout orientation="Vertical" type="linear">
-                    <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
-                    <linearitem itemname="installedAppsLabel"/>
-                    <linearitem itemname="installedAppsListView"/>
-                </layout>
-            </widget>
-            <string locid="txt_applib_title_applications" name="title"/>
-            <bool name="contentFullScreen" value="FALSE"/>
-        </widget>
-    </section>
-    <section name="installedAppsSearchViewDefinition">
-        <widget name="installedAppsView" type="HbView">
-            <widget name="installedAppsContainer" role="HbView:widget" type="HbWidget">
-                <widget name="installedAppsLabel" type="HbGroupBox">
-                    <string locid="txt_applib_subtitle_installed" name="heading"/>
-                    <bool name="marqueeHeading" value="TRUE"/>
-                    <sizehint height="6un" type="MAXIMUM" width="-1"/>
-                    <fontspec name="fontSpec" role="Title" textheight="0"/>
-                    <integer name="groupBoxType" value="1"/>
-                </widget>
-                <widget name="searchPanel" type="HbSearchPanel">
-                    <sizehint height="10un" type="MAXIMUM" width="100un"/>
-                    <bool name="visible" value="TRUE"/>
-                </widget>
-                <widget name="installedAppsListView" type="HbListView">
-                    <sizehint height="0un" type="MAXIMUM" width="0un"/>
-                    <bool name="visible" value="FALSE"/>
-                </widget>
-                <widget name="installedAppsSearchListView" type="HbListView">
-                    <bool name="itemRecycling" value="TRUE"/>
-                    <enums name="horizontalScrollBarPolicy" value="ScrollBarAutoHide"/>
-                    <sizehint height="100un" type="MAXIMUM" width="-1"/>
-                    <bool name="frictionEnabled" value="TRUE"/>
-                    <bool name="visible" value="TRUE"/>
-                </widget>
-                <widget name="installedAppsEmptyLabel" type="HbLabel">
-                    <sizehint height="0un" type="MINIMUM" width="0un"/>
-                    <sizehint height="0un" type="MAXIMUM" width="0un"/>
-                    <bool name="visible" value="FALSE"/>
-                </widget>
-                <layout orientation="Vertical" type="linear">
-                    <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
-                    <linearitem itemname="installedAppsLabel"/>
-                    <linearitem itemname="installedAppsSearchListView"/>
-                    <linearitem itemname="searchPanel"/>
-                </layout>
-            </widget>
-            <string locid="txt_applib_title_applications" name="title"/>
-            <bool name="contentFullScreen" value="TRUE"/>
-        </widget>
-    </section>
-    <section name="installedAppsEmptyLabelViewDefinition">
-        <widget name="installedAppsView" type="HbView">
-            <widget name="installedAppsContainer" role="HbView:widget" type="HbWidget">
-                <widget name="installedAppsLabel" type="HbGroupBox">
-                    <string locid="txt_applib_subtitle_installed" name="heading"/>
-                    <bool name="marqueeHeading" value="TRUE"/>
-                    <sizehint height="6un" type="MAXIMUM" width="-1"/>
-                    <fontspec name="fontSpec" role="Title" textheight="0"/>
-                    <integer name="groupBoxType" value="1"/>
-                </widget>
-                <widget name="installedAppsListView" type="HbListView">
-                    <sizehint height="0un" type="MAXIMUM" width="0un"/>
-                    <bool name="visible" value="FALSE"/>
-                </widget>
-                <widget name="installedAppsSearchListView" type="HbListView">
-                    <sizehint height="0un" type="MAXIMUM" width="0un"/>
-                    <bool name="visible" value="FALSE"/>
-                </widget>
-                <widget name="searchPanel" type="HbSearchPanel">
-                    <sizehint height="0un" type="MAXIMUM" width="0un"/>
-                    <bool name="visible" value="FALSE"/>
-                </widget>
-                <widget name="installedAppsEmpytLabelContainer" type="HbWidget">
-                    <widget name="installedAppsEmptyLabel" type="HbLabel">
-                        <enums name="alignment" value="AlignHCenter"/>
-                        <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Minimum" verticalStretch="0"/>
-                        <sizehint height="10un" type="MINIMUM" width="50un"/>
-                        <sizehint height="10un" type="MAXIMUM" width="50un"/>
-                        <enums name="elideMode" value="ElideMiddle"/>
-                        <bool name="visible" value="TRUE"/>
-                        <string locid="txt_applib_formlabel_empty" name="plainText"/>
-                        <fontspec name="fontSpec" role="Title" textheight="4un"/>
-                    </widget>
-                    <sizehint height="11.9403un" type="PREFERRED" width="23.8806un"/>
-                    <layout orientation="Horizontal" type="linear">
-                        <stretchitem stretchfactor="1"/>
-                        <linearitem itemname="installedAppsEmptyLabel"/>
-                        <stretchitem stretchfactor="1"/>
-                    </layout>
-                </widget>
-                <layout orientation="Vertical" type="linear">
-                    <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
-                    <linearitem itemname="installedAppsLabel"/>
-                    <stretchitem stretchfactor="1"/>
-                    <linearitem itemname="installedAppsEmpytLabelContainer"/>
-                    <stretchitem stretchfactor="5"/>
-                </layout>
-            </widget>
-            <string locid="txt_applib_title_applications" name="title"/>
-            <bool name="contentFullScreen" value="FALSE"/>
-        </widget>
-    </section>
-    <section name="collectionViewDefinition">
-        <widget name="collectionView" type="HbView">
-            <widget name="collectionContainer" role="HbView:widget" type="HbWidget">
-                <widget name="collectionLabel" type="HbGroupBox">
-                    <sizehint height="6un" type="MAXIMUM" width="100un"/>
-                    <bool name="visible" value="TRUE"/>
-                    <integer name="groupBoxType" value="1"/>
-                </widget>
-                <widget name="collectionListView" type="HbListView">
-                    <bool name="itemRecycling" value="TRUE"/>
-                    <enums name="horizontalScrollBarPolicy" value="ScrollBarAutoHide"/>
-                    <sizehint height="100un" type="MAXIMUM" width="-1"/>
-                    <bool name="frictionEnabled" value="TRUE"/>
-                    <bool name="visible" value="TRUE"/>
-                </widget>
-                <widget name="collectionSearchListView" type="HbListView">
-                    <sizehint height="0un" type="MAXIMUM" width="0un"/>
-                    <bool name="visible" value="FALSE"/>
-                </widget>
-                <widget name="searchPanel" type="HbSearchPanel">
-                    <sizehint height="0un" type="MAXIMUM" width="0un"/>
-                    <bool name="visible" value="FALSE"/>
-                </widget>
-                <widget name="collectionButton" type="HbPushButton">
-                    <sizehint height="0un" type="MAXIMUM" width="0un"/>
-                    <string locid="txt_applib_button_add_to_collection" name="text"/>
-                    <bool name="visible" value="FALSE"/>
-                </widget>
-                <widget name="collectionAppsEmptyLabel" type="HbLabel">
-                    <sizehint height="0un" type="MINIMUM" width="0un"/>
-                    <sizehint height="0un" type="MAXIMUM" width="0un"/>
-                    <bool name="visible" value="FALSE"/>
-                </widget>
-                <layout orientation="Vertical" type="linear">
-                    <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
-                    <linearitem itemname="collectionLabel"/>
-                    <linearitem itemname="collectionListView"/>
-                </layout>
-            </widget>
-            <string locid="txt_applib_title_applications" name="title"/>
-            <bool name="contentFullScreen" value="FALSE"/>
-        </widget>
-    </section>
-    <section name="collectionSearchViewDefinition">
-        <widget name="collectionView" type="HbView">
-            <widget name="collectionContainer" role="HbView:widget" type="HbWidget">
-                <widget name="collectionLabel" type="HbGroupBox">
-                    <sizehint height="6un" type="MAXIMUM" width="100un"/>
-                    <bool name="visible" value="TRUE"/>
-                    <integer name="groupBoxType" value="1"/>
-                </widget>
-                <widget name="searchPanel" type="HbSearchPanel">
-                    <sizehint height="10un" type="MAXIMUM" width="100un"/>
-                    <bool name="visible" value="TRUE"/>
-                </widget>
-                <widget name="collectionListView" type="HbListView">
-                    <sizehint height="0un" type="MAXIMUM" width="0un"/>
-                    <bool name="visible" value="FALSE"/>
-                </widget>
-                <widget name="collectionSearchListView" type="HbListView">
-                    <bool name="itemRecycling" value="TRUE"/>
-                    <enums name="horizontalScrollBarPolicy" value="ScrollBarAutoHide"/>
-                    <sizehint height="100un" type="MAXIMUM" width="-1"/>
-                    <bool name="frictionEnabled" value="TRUE"/>
-                    <bool name="visible" value="TRUE"/>
-                </widget>
-                <widget name="collectionButton" type="HbPushButton">
-                    <sizehint height="0un" type="MAXIMUM" width="0un"/>
-                    <bool name="visible" value="FALSE"/>
-                </widget>
-                <widget name="collectionAppsEmptyLabel" type="HbLabel">
-                    <sizehint height="0un" type="MINIMUM" width="0un"/>
-                    <sizehint height="0un" type="MAXIMUM" width="0un"/>
-                    <bool name="visible" value="FALSE"/>
-                </widget>
-                <layout orientation="Vertical" type="linear">
-                    <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
-                    <linearitem itemname="collectionLabel"/>
-                    <linearitem itemname="collectionSearchListView"/>
-                    <linearitem itemname="searchPanel"/>
-                </layout>
-            </widget>
-            <string locid="txt_applib_title_applications" name="title"/>
-            <bool name="contentFullScreen" value="TRUE"/>
-        </widget>
-    </section>
-    <section name="collectionButtonViewDefinition">
-        <widget name="collectionView" type="HbView">
-            <widget name="collectionContainer" role="HbView:widget" type="HbWidget">
-                <widget name="collectionLabel" type="HbGroupBox">
-                    <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
-                    <sizehint height="6un" type="MAXIMUM" width="100un"/>
-                    <bool name="visible" value="TRUE"/>
-                    <integer name="groupBoxType" value="1"/>
-                </widget>
-                <widget name="collectionListView" type="HbListView">
-                    <sizehint height="0un" type="MAXIMUM" width="0un"/>
-                    <bool name="visible" value="FALSE"/>
-                </widget>
-                <widget name="collectionSearchListView" type="HbListView">
-                    <sizehint height="0un" type="MAXIMUM" width="0un"/>
-                    <bool name="visible" value="FALSE"/>
-                </widget>
-                <widget name="searchPanel" type="HbSearchPanel">
-                    <sizehint height="0un" type="MAXIMUM" width="0un"/>
-                    <bool name="visible" value="FALSE"/>
-                </widget>
-                <widget name="collectionButtonContainer" type="HbWidget">
-                    <widget name="collectionButton" type="HbPushButton">
-                        <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
-                        <sizehint type="FIXED" width="50un"/>
-                        <sizehint height="10un" type="MINIMUM" width="50un"/>
-                        <sizehint height="10un" type="MAXIMUM" width="50un"/>
-                        <bool name="visible" value="TRUE"/>
-                    </widget>
-                    <sizehint height="11.9403un" type="PREFERRED" width="23.8806un"/>
-                    <layout orientation="Horizontal" type="linear">
-                        <stretchitem stretchfactor="1"/>
-                        <linearitem itemname="collectionButton"/>
-                        <stretchitem stretchfactor="1"/>
-                    </layout>
-                </widget>
-                <widget name="collectionAppsEmptyLabel" type="HbLabel">
-                    <sizehint height="0un" type="MINIMUM" width="0un"/>
-                    <sizehint height="0un" type="MAXIMUM" width="0un"/>
-                    <bool name="visible" value="FALSE"/>
-                </widget>
-                <layout orientation="Vertical" type="linear">
-                    <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
-                    <linearitem itemname="collectionLabel"/>
-                    <stretchitem stretchfactor="1"/>
-                    <linearitem itemname="collectionButtonContainer"/>
-                    <stretchitem stretchfactor="5"/>
-                </layout>
-            </widget>
-            <string locid="txt_applib_title_applications" name="title"/>
-            <bool name="contentFullScreen" value="FALSE"/>
-        </widget>
-    </section>
-    <section name="collectionEmptyLabelViewDefinition">
-        <widget name="collectionView" type="HbView">
-            <widget name="collectionContainer" role="HbView:widget" type="HbWidget">
-                <widget name="collectionLabel" type="HbGroupBox">
-                    <sizehint height="6un" type="MAXIMUM" width="100un"/>
-                    <bool name="visible" value="TRUE"/>
-                    <integer name="groupBoxType" value="1"/>
-                </widget>
-                <widget name="collectionListView" type="HbListView">
-                    <sizehint height="0un" type="MAXIMUM" width="0un"/>
-                    <bool name="visible" value="FALSE"/>
-                </widget>
-                <widget name="collectionSearchListView" type="HbListView">
-                    <sizehint height="0un" type="MAXIMUM" width="0un"/>
-                    <bool name="visible" value="FALSE"/>
-                </widget>
-                <widget name="searchPanel" type="HbSearchPanel">
-                    <sizehint height="0un" type="MAXIMUM" width="0un"/>
-                    <bool name="visible" value="FALSE"/>
-                </widget>
-                <widget name="collectionButton" type="HbPushButton">
-                    <sizehint height="0un" type="MAXIMUM" width="0un"/>
-                    <bool name="visible" value="FALSE"/>
-                </widget>
-                <widget name="collectionEmpytLabelContainer" type="HbWidget">
-                    <widget name="collectionAppsEmptyLabel" type="HbLabel">
-                        <enums name="alignment" value="AlignHCenter"/>
-                        <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Minimum" verticalStretch="0"/>
-                        <sizehint height="10un" type="MINIMUM" width="50un"/>
-                        <sizehint height="10un" type="MAXIMUM" width="50un"/>
-                        <enums name="elideMode" value="ElideMiddle"/>
-                        <bool name="visible" value="TRUE"/>
-                        <string locid="txt_applib_formlabel_empty" name="plainText"/>
-                        <fontspec name="fontSpec" role="Title" textheight="4un"/>
-                    </widget>
-                    <sizehint height="11.9403un" type="PREFERRED" width="23.8806un"/>
-                    <layout orientation="Horizontal" type="linear">
-                        <stretchitem stretchfactor="1"/>
-                        <linearitem itemname="collectionAppsEmptyLabel"/>
-                        <stretchitem stretchfactor="1"/>
-                    </layout>
-                </widget>
-                <layout orientation="Vertical" type="linear">
-                    <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
-                    <linearitem itemname="collectionLabel"/>
-                    <stretchitem stretchfactor="1"/>
-                    <linearitem itemname="collectionEmpytLabelContainer"/>
-                    <stretchitem stretchfactor="5"/>
-                </layout>
-            </widget>
-            <string locid="txt_applib_title_applications" name="title"/>
-            <bool name="contentFullScreen" value="FALSE"/>
-        </widget>
-    </section>
-    <metadata activeUIState="collection view with empty label state" display="NHD-3.2-inch_portrait" unit="un">
-        <uistate name="Common ui state" sections="#common"/>
-        <uistate name="all apps view state" sections="#common allAppsViewDefinition"/>
-        <uistate name="all apps search view state" sections="#common allAppsSearchViewDefinition"/>
-        <uistate name="all collections view state" sections="#common allCollectionsViewDefinition"/>
-        <uistate name="all collections search view state" sections="#common allCollectionsSearchViewDefinition"/>
-        <uistate name="installed apps view state" sections="#common installedAppsViewDefinition"/>
-        <uistate name="installed apps search view state" sections="#common installedAppsSearchViewDefinition"/>
-        <uistate name="installed apps empty view state" sections="#common installedAppsEmptyLabelViewDefinition"/>
-        <uistate name="collection view state" sections="#common collectionViewDefinition"/>
-        <uistate name="collection search view state" sections="#common collectionSearchViewDefinition"/>
-        <uistate name="collection view with button state" sections="#common collectionButtonViewDefinition"/>
-        <uistate name="collection view with empty label state" sections="#common collectionEmptyLabelViewDefinition"/>
-        <dummydata objectName="allAppsListView" section="allAppsViewDefinition" value="app_list_template5"/>
-        <dummydata objectName="allAppsSearchListView" section="allAppsViewDefinition" value="app_list_template5"/>
-        <dummydata objectName="allAppsListView" section="allAppsSearchViewDefinition" value="app_list_template5"/>
-        <dummydata objectName="allAppsSearchListView" section="allAppsSearchViewDefinition" value="app_list_template5"/>
-        <dummydata objectName="allCollectionsSearchListView" section="allCollectionsViewDefinition" value="app_list_template5"/>
-        <dummydata objectName="allCollectionsListView" section="allCollectionsViewDefinition" value="app_list_template5"/>
-        <dummydata objectName="allCollectionsSearchListView" section="allCollectionsSearchViewDefinition" value="app_list_template5"/>
-        <dummydata objectName="allCollectionsListView" section="allCollectionsSearchViewDefinition" value="app_list_template5"/>
-        <dummydata objectName="installedAppsListView" section="installedAppsViewDefinition" value="app_list_template5"/>
-        <dummydata objectName="installedAppsSearchListView" section="installedAppsViewDefinition" value="app_list_template5"/>
-        <dummydata objectName="installedAppsListView" section="installedAppsSearchViewDefinition" value="app_list_template5"/>
-        <dummydata objectName="installedAppsSearchListView" section="installedAppsSearchViewDefinition" value="app_list_template5"/>
-        <dummydata objectName="installedAppsListView" section="installedAppsEmptyLabelViewDefinition" value="app_list_template5"/>
-        <dummydata objectName="installedAppsSearchListView" section="installedAppsEmptyLabelViewDefinition" value="app_list_template5"/>
-        <dummydata objectName="collectionListView" section="collectionViewDefinition" value="app_list_template5"/>
-        <dummydata objectName="collectionSearchListView" section="collectionViewDefinition" value="app_list_template5"/>
-        <dummydata objectName="collectionListView" section="collectionSearchViewDefinition" value="app_list_template5"/>
-        <dummydata objectName="collectionSearchListView" section="collectionSearchViewDefinition" value="app_list_template5"/>
-        <dummydata objectName="collectionListView" section="collectionButtonViewDefinition" value="app_list_template5"/>
-        <dummydata objectName="collectionSearchListView" section="collectionButtonViewDefinition" value="app_list_template5"/>
-        <dummydata objectName="collectionListView" section="collectionEmptyLabelViewDefinition" value="app_list_template5"/>
-        <dummydata objectName="collectionSearchListView" section="collectionEmptyLabelViewDefinition" value="app_list_template5"/>
-    </metadata>
-</hbdocument>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/resource/common_objects.docml	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument version="1.1">
+    <object name="allAppsAction" type="HbAction">
+        <bool name="checkable" value="TRUE"/>
+        <icon iconName="qtg_mono_applications_all" name="icon"/>
+    </object>
+    <object name="allCollectionsAction" type="HbAction">
+        <bool name="checkable" value="TRUE"/>
+        <icon iconName="qtg_mono_applications_collections" name="icon"/>
+    </object>
+    <object name="searchAction" type="HbAction">
+        <icon iconName="qtg_mono_search" name="icon"/>
+    </object>
+    <object name="oviStoreAction" type="HbAction">
+        <icon iconName="qtg_mono_ovistore" name="icon"/>
+    </object>
+    <object name="operatorAction" type="HbAction"/>
+</hbdocument>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/resource/emptylabeledview.docml	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,35 @@
+<?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="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"/>
+                    <stretchitem stretchfactor="1"/>
+                    <linearitem itemname="emptyViewLabelContainer"/>
+                    <stretchitem stretchfactor="5"/>
+                </layout>
+            </widget>
+            <string locid="txt_applib_title_applications" name="title"/>
+        </widget>
+</hbdocument>

--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/resource/hslistviewitem.widgetml	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/resource/hslistviewitem.widgetml	Wed Aug 18 09:40:07 2010 +0300
@@ -1,50 +1,4 @@
 <hbwidget version="0.1" type="listviewitem">
-    <layout name="applib_text1" type="mesh">
-
-      <meshitem src="icon-1" srcEdge="LEFT" dst="" dstEdge="LEFT"  spacing="-6px"/>
-      <meshitem src="icon-1" srcEdge="TOP" dst="" dstEdge="TOP"  spacing="-5px" />
-      <meshitem src="icon-1" srcEdge="RIGHT" dst="text-1" dstEdge="LEFT" spacing="15px"/>
-      <meshitem src="icon-1" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM"  spacing="6px" />
-
-      <meshitem src="text-1" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-middle-horizontal)" />
-      <meshitem src="text-1" srcEdge="CENTERV" dst="icon-1" dstEdge="CENTERV" />      
-         
-      <meshitem src="background" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-      <meshitem src="background" srcEdge="TOP" dst="" dstEdge="TOP" />
-      <meshitem src="background" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-      <meshitem src="background" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-  
-      <meshitem src="frame" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-      <meshitem src="frame" srcEdge="TOP" dst="" dstEdge="TOP" />
-      <meshitem src="frame" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-      <meshitem src="frame" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-  </layout>
-
-  <layout name="applib_text2" type="mesh">
-    
-    <meshitem src="icon-1" srcEdge="LEFT" dst="" dstEdge="LEFT"  spacing="-6px" />
-    <meshitem src="icon-1" srcEdge="TOP" dst="" dstEdge="TOP" spacing="-5px"/>
-    <meshitem src="icon-1" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM"  spacing="6px" />
-    <meshitem src="icon-1" srcEdge="RIGHT" dst="text-1" dstEdge="LEFT" spacing="15px"/>
-
-    <meshitem src="text-1" srcEdge="BOTTOM" dst="icon-1" dstEdge="CENTERV" />    
-    <meshitem src="text-1" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-middle-horizontal)" />
-    
-    <meshitem src="text-2" srcEdge="LEFT" dst="text-1" dstEdge="LEFT" />
-    <meshitem src="text-2" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-middle-horizontal)" />
-    <meshitem src="text-2" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacing="8px" />
-
-    <meshitem src="background" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="background" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="background" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="background" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
-    <meshitem src="frame" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="frame" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="frame" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="frame" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-  </layout>
-
   <layout name="applib_progress" type="mesh">
 
     <meshitem src="icon-1" srcEdge="LEFT" dst="" dstEdge="LEFT"  spacing="-var(hb-param-margin-gene-left)" />
@@ -74,5 +28,4 @@
     <meshitem src="multiselection-toucharea" srcEdge="TOP" dst="" dstEdge="TOP" />
     <meshitem src="multiselection-toucharea" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
   </layout>
-
 </hbwidget>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/resource/labeledlistview.docml	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,23 @@
+<?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="listView" type="HbListView">
+                     <bool name="itemRecycling" value="TRUE"/>
+                     <enums name="horizontalScrollBarPolicy" value="ScrollBarAutoHide"/>
+                     <bool name="frictionEnabled" value="TRUE"/>
+                 </widget>
+                <layout orientation="Vertical" spacing="0.0un" type="linear">
+                    <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
+                    <linearitem itemname="label"/>
+                    <linearitem itemname="listView"/>
+                </layout>
+            </widget>
+            <string locid="txt_applib_title_applications" name="title"/>
+        </widget>
+</hbdocument>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/resource/listview.docml	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,15 @@
+<?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="listView" type="HbListView">
+           </widget>
+            <layout orientation="Vertical" spacing="0.0un" type="linear">
+                <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
+                <linearitem itemname="listView"/>
+            </layout>
+        </widget>
+        <string locid="txt_applib_title_applications" name="title"/>
+    </widget>
+</hbdocument>
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/resource/searchview.docml	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,136 @@
+<?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">
+                <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_search_results" 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>
+			<widget name="listView" type="HbListView">
+				 <bool name="itemRecycling" value="TRUE"/>
+				 <enums name="horizontalScrollBarPolicy" value="ScrollBarAutoHide"/>
+				 <bool name="frictionEnabled" value="TRUE"/>
+			</widget>
+            <widget name="searchPanel" type="HbSearchPanel"/>
+        </widget>
+        <string locid="txt_applib_title_applications" name="title"/>
+    </widget>
+	
+	<section name="searchViewLabeledList">
+		<widget name="view" type="HbView">
+			<widget name="container" role="HbView:widget" type="HbWidget">
+				<widget name="label" type="HbGroupBox">
+					<bool name="visible" value="TRUE"/>
+				</widget>
+				<widget name="emptyViewLabelContainer" type="HbWidget">
+					<bool name="visible" value="FALSE"/>
+				</widget>
+				<widget name="listView" type="HbListView">
+					 <bool name="visible" value="TRUE"/>
+				</widget>
+				<layout orientation="Vertical" spacing="0.0un" type="linear">
+					<contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
+					<linearitem itemname="label"/>
+					<linearitem itemname="listView"/>
+					<linearitem itemname="searchPanel"/>
+				</layout>
+			</widget>
+			<string locid="txt_applib_title_applications" name="title"/>
+			<bool name="contentFullScreen" value="TRUE"/>
+		</widget>
+    </section>
+
+	<section name="searchViewList">
+		<widget name="view" type="HbView">
+			<widget name="container" role="HbView:widget" type="HbWidget">
+				<widget name="label" type="HbGroupBox">
+					<bool name="visible" value="FALSE"/>
+				</widget>
+				<widget name="emptyViewLabelContainer" type="HbWidget">
+					<bool name="visible" value="FALSE"/>
+				</widget>
+				<widget name="listView" type="HbListView">
+					 <bool name="visible" value="TRUE"/>
+				 </widget>
+				<layout orientation="Vertical" spacing="0.0un" type="linear">
+					<contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
+					<linearitem itemname="listView"/>
+					<linearitem itemname="searchPanel"/>
+				</layout>
+			</widget>
+			<string locid="txt_applib_title_applications" name="title"/>
+			<bool name="contentFullScreen" value="TRUE"/>
+		</widget>
+    </section>
+
+	<section name="searchViewLabeledEmpty">
+	    <widget name="view" type="HbView">
+			<widget name="container" role="HbView:widget" type="HbWidget">
+				<widget name="label" type="HbGroupBox">
+					 <bool name="visible" value="TRUE"/>
+				</widget>
+				<widget name="emptyViewLabelContainer" type="HbWidget">
+					<bool name="visible" value="TRUE"/>
+				</widget>
+				<widget name="listView" type="HbListView">
+					<bool name="visible" value="FALSE"/>
+				</widget>
+				<layout orientation="Vertical" spacing="0un" type="linear">
+					<contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
+					<linearitem itemname="label"/>
+					<stretchitem stretchfactor="1"/>
+					<linearitem itemname="emptyViewLabelContainer"/>
+					<stretchitem stretchfactor="5"/>
+					<linearitem itemname="searchPanel"/>
+				</layout>
+			</widget>
+			<string locid="txt_applib_title_applications" name="title"/>
+		</widget>
+	</section>
+	
+	<section name="searchViewEmpty">
+	    <widget name="view" type="HbView">
+			<widget name="container" role="HbView:widget" type="HbWidget">
+				<widget name="emptyViewLabelContainer" type="HbWidget">
+					<bool name="visible" value="TRUE"/>
+				</widget>
+				<widget name="label" type="HbGroupBox">
+					 <bool name="visible" value="FALSE"/>
+				</widget>
+				<widget name="listView" type="HbListView">
+					<bool name="visible" value="FALSE"/>
+				</widget>
+				<layout orientation="Vertical" spacing="0un" type="linear">
+					<contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
+					<stretchitem stretchfactor="1"/>
+					<linearitem itemname="emptyViewLabelContainer"/>
+					<stretchitem stretchfactor="5"/>
+					<linearitem itemname="searchPanel"/>
+				</layout>
+			</widget>
+			<string locid="txt_applib_title_applications" name="title"/>
+		</widget>
+	</section>
+	
+    <metadata activeUIState="Common ui state" display="NHD-3.2-inch_portrait"
+        unit="un">
+        <uistate name="Common ui state" sections="#common"/>
+    </metadata>
+</hbdocument>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsaddmodeproxymodel.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,188 @@
+/*
+ * 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: Proxy model for view in add to homescreen mode.
+ *
+ */
+
+#include <QObject>
+#include <canotifier.h>
+
+#include "hscontentservice.h"
+#include "hsaddmodeproxymodel.h"
+#include "hsmenuitemmodel.h"
+#include "hsapplibstateutils.h"
+
+/*!
+ \class HsAddModeProxyModel
+ \ingroup group_hsmenustateplugin
+ \brief Proxy Model for add to homescreen mode.
+ Filtering cwrt widgets to not displaing them in add mode when they are alredy present on HS.
+ \lib ?library
+ \see QSortFilterProxyModel
+ */
+
+/*!
+ Constructor.
+ \param parent parent for object.
+ */
+HsAddModeProxyModel::HsAddModeProxyModel(QObject *parent) :
+    QSortFilterProxyModel(parent),
+    mCwrtWidgetCache(),
+    mQuery()
+{
+    initilizeCwrtWidgetCache();
+    invalidateFilter();
+    connect(HsContentService::instance(),
+        SIGNAL(widgetAdded(const QString &, const QVariantHash &)),
+        this, SLOT(updateCacheOnAddWidget(const QString&, const QVariantHash&)));
+    connect(HsContentService::instance(),
+        SIGNAL(widgetRemoved(const QString &, const QVariantHash &)),
+        this, SLOT(updateCacheOnRemoveWidget(const QString&, const QVariantHash&)));
+    // create notifier for a cwrt widgets with query created in initilizeCwrtWidgetCache
+    CaNotifierFilter filter(mQuery);
+    mNotifier.reset(CaService::instance()->createNotifier(filter));
+    connect(mNotifier.data(),
+            SIGNAL(entryChanged(const CaEntry&, ChangeType)),
+            this,
+            SLOT(updateEntryStatus(const CaEntry&, ChangeType)));
+}
+
+/*
+ Destructor.
+ */
+HsAddModeProxyModel::~HsAddModeProxyModel()
+{
+}
+
+void HsAddModeProxyModel::initilizeCwrtWidgetCache()
+{
+    QStringList entryTypeNames;
+    entryTypeNames.append(applicationTypeName());
+    mQuery.setEntryTypeNames(entryTypeNames);
+    mQuery.setAttribute(swTypeKey(), HS_CWRT_APP_TYPE);
+    mQuery.setAttribute(widgetUriAttributeName(),
+                       HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE);
+    QList< QSharedPointer<CaEntry> > entries =
+            CaService::instance()->getEntries(mQuery);
+    foreach (QSharedPointer<CaEntry> entry, entries) {
+        QVariantHash preferences;
+        QMap<QString, QString> attributes = entry->attributes();
+        QMapIterator<QString, QString> i(attributes);
+        while (i.hasNext()) {
+            i.next();
+            QString key(i.key());
+            QString value(i.value());
+            if (key.contains(widgetParam())) {
+                preferences.insert(key.remove(widgetParam()),value);
+            }
+        }
+        int count(0);
+        HsContentService::instance()->widgets(
+                HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE,preferences,count);
+        mCwrtWidgetCache.insert(entry->id(), count > 0);
+    }
+
+}
+
+/*!
+ Return entryid for given Cwrt with mini view widget.
+ \param uri of a widget.
+ \param preferences widget preferences.
+ \retval int entry id or 0 for not cwrt with mini view widgets.
+ */
+int HsAddModeProxyModel::findCwrtWidgetEntryId(const QVariantHash &preferences)
+{
+    int result = 0;
+    CaQuery query;
+    QStringList entryTypeNames;
+    query.setEntryTypeNames(entryTypeNames);
+    query.setAttribute(swTypeKey(), HS_CWRT_APP_TYPE);
+    query.setAttribute(widgetUriAttributeName(),
+            HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE);
+    foreach (QString key, preferences.keys()) {
+        query.setAttribute(widgetParam()+key,
+            preferences.value(key).toString());
+    }
+    QList< QSharedPointer<CaEntry> > entries =
+        CaService::instance()->getEntries(query);
+    if( entries.count() > 0 )
+    {
+        result = entries[0]->id();
+    }
+    return result;
+}
+
+/*
+ Slot called when widget is added to homescreen.
+ If widget is removed we checkhow many instance of this widget is left on HS.
+ \param uri of a widget.
+ \param preferences widget preferences.
+ */
+void HsAddModeProxyModel::updateCacheOnAddWidget(const QString &uri,
+    const QVariantHash &preferences){
+	if (uri == HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE) {
+        int entryId = findCwrtWidgetEntryId(preferences);
+        if (!mCwrtWidgetCache.value(entryId) ) {
+            mCwrtWidgetCache.insert(entryId,true);
+            invalidateFilter();
+        }
+    }
+}
+
+/*
+ Slot called when widget is removed from homescreen.
+ If widget is removed we checkhow many instance of this widget is left on HS.
+ \param uri of a widget.
+ \param preferences widget preferences.
+*/
+void HsAddModeProxyModel::updateCacheOnRemoveWidget(const QString &uri,
+    const QVariantHash &preferences)
+{
+    if (uri == HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE) {
+        int entryId = findCwrtWidgetEntryId(preferences);
+        if (mCwrtWidgetCache.value(entryId)) {
+            mCwrtWidgetCache.insert(entryId,false);
+            invalidateFilter();
+        }
+    }
+}
+
+/*
+ Reimplementated from QSortFilterProxyModel.
+ \param source_row row in source model.
+ \param source_parent source parent index.
+ */
+bool HsAddModeProxyModel::filterAcceptsRow(int source_row,
+        const QModelIndex &source_parent) const
+{
+    QVariant entryId = sourceModel()->data(
+            sourceModel()->index(source_row,0,source_parent),
+            CaItemModel::IdRole);
+    return !mCwrtWidgetCache.value(entryId.toInt());
+}
+
+/*
+ Update cache if some cwrt widgets were install/uninstal/update or on mmc card.
+ \param entry changed entry.
+ \param changeType the type of the change. 
+ */
+void HsAddModeProxyModel::updateEntryStatus(const CaEntry &entry, ChangeType changeType)
+{
+    if (changeType == RemoveChangeType) {
+        mCwrtWidgetCache.remove(entry.id());
+    } else {
+        mCwrtWidgetCache.insert(entry.id(),
+            HsAppLibStateUtils::isCWRTWidgetOnHomeScreen(&entry));
+    }
+}

--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallappsstate.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallappsstate.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -15,30 +15,29 @@
  *
  */
 
-#include <qstatemachine.h>
-#include <hbview.h>
-#include <hblistview.h>
-#include <hbaction.h>
-#include <hbmenu.h>
-#include <hbabstractviewitem.h>
-#include <hsmenueventfactory.h>
-#include <hbinstance.h>
+#include <QStateMachine>
+#include <HbMenu>
+#include <HbAction>
+#include <HbAbstractViewItem>
+#include <HbIndexFeedback>
+#include <HbListView>
+#include <HbScrollBar>
+#include <HbView>
+
+#include <cadefs.h>
 #include <caentry.h>
-#include <hbsearchpanel.h>
-#include <HbScrollBar>
-#include <HbIndexFeedback>
+#include <caitemmodel.h>
+#include <caservice.h>
 
+#include "hsapp_defs.h"
+#include "hsmenueventfactory.h"
 #include "hsmenuitemmodel.h"
-#include "cadefs.h"
 #include "hsallappsstate.h"
-#include "hsaddappstocollectionstate.h"
-#include "hsapp_defs.h"
 #include "hsmenumodewrapper.h"
 #include "hsmenuviewbuilder.h"
-#include "hsmenumodetransition.h"
-#include "caentry.h"
-#include "caservice.h"
 #include "hsmainwindow.h"
+#include "hsaddmodeproxymodel.h"
+#include "hsapplibstateutils.h"
 
 /*!
  \class HsAllAppsState
@@ -55,40 +54,24 @@
  */
 
 /*!
- \var HsAllAppsState::mCollectionsSortAttribute
- Collections sort order
- */
-
-/*!
- \var HsAllAppsState::mMenuView
- Wrapper for All Applications View.
- */
-
-/*!
- \var HsAllAppsState::mMenuMode
- Menu view mode wrapper.
- Not Own.
- */
-
-/*!
  Constructor.
  \param menuViewBuilder Menu view builder.
- \param menuMode reference to object representing menu mode (add mode on/add mode off).
+ \param menuMode Menu mode object(add mode on/add mode off).
+ \param mainWindow Main window wrapper.
  \param parent Owner.
  */
 HsAllAppsState::HsAllAppsState(HsMenuViewBuilder &menuViewBuilder,
                                HsMenuModeWrapper &menuMode,
                                HsMainWindow &mainWindow,
                                QState *parent) :
-    HsBaseViewState(parent), mSortAttribute(AscendingNameHsSortAttribute),
-    mCollectionsSortAttribute(LatestOnTopHsSortAttribute),
-    mMenuView(menuViewBuilder, HsAllAppsContext),
-    mMenuMode(menuMode),
-    mAllAppsModel(0),
-    mMainWindow(mainWindow),
-    mContextModelIndex(), mContextMenu(0)
+    HsBaseViewState(mainWindow, menuMode, parent),
+    mAddModeProxyModel(0),
+    mSortAttribute(AscendingNameHsSortAttribute)
 {
+    initialize(menuViewBuilder, HsAllAppsContext);
     construct();
+	mAddModeProxyModel = new HsAddModeProxyModel(this);
+    mAddModeProxyModel->setSourceModel(mModel);
 }
 
 /*!
@@ -98,64 +81,46 @@
 {
     HSMENUTEST_FUNC_ENTRY("HsAllAppsState::construct");
 
-    QState *initialState = new QState(this);
-    setInitialState(initialState);
-
-    QState *addModeState = new QState(this);
-    connect(addModeState, SIGNAL(entered()),SLOT(addModeEntered()));
-
-    QState *normalModeState = new QState(this);
-    connect(normalModeState, SIGNAL(entered()),SLOT(normalModeEntered()));
-
-    initialState->addTransition(new HsMenuModeTransition(
-                                    mMenuMode, NormalHsMenuMode, normalModeState));
-    initialState->addTransition(new HsMenuModeTransition(
-                                    mMenuMode, AddHsMenuMode, addModeState));
+    defineTransitions();
 
     const QString parentName =
         parent() != 0 ? parent()->objectName() : QString("");
     setObjectName(parentName + "/allappsstate");
 
-    connect(this, SIGNAL(entered()),SLOT(stateEntered()));
-    connect(this, SIGNAL(exited()),SLOT(stateExited()));
+    connect(mBackKeyAction, SIGNAL(triggered()), SIGNAL(toAppLibraryState()));
 
-    mSecondarySoftkeyAction = new HbAction(Hb::BackNaviAction, this);
-
-    mMenuView.view()->setNavigationAction(
-        mSecondarySoftkeyAction);
+    mModel = HsMenuService::getAllApplicationsModel(mSortAttribute);
+    mMenuView->setModel(mModel);
 
-    connect(mSecondarySoftkeyAction, SIGNAL(triggered()),
-            SIGNAL(toAppLibraryState()));
+    mModel->preloadIcons();
 
-    mAllAppsModel = HsMenuService::getAllApplicationsModel(mSortAttribute);
-    mMenuView.setModel(mAllAppsModel);
-
-    mMenuView.listView()->verticalScrollBar()->setInteractive(true);
-    HbIndexFeedback *indexFeedback = new HbIndexFeedback(mMenuView.view());
+    mMenuView->listView()->verticalScrollBar()->setInteractive(true);
+    HbIndexFeedback *indexFeedback = new HbIndexFeedback(mMenuView->view());
     indexFeedback->setIndexFeedbackPolicy(HbIndexFeedback::IndexFeedbackSingleCharacter);
-    indexFeedback->setItemView(mMenuView.listView());
+    indexFeedback->setItemView(mMenuView->listView());
 
     HSMENUTEST_FUNC_EXIT("HsAllAppsState::construct");
 }
 
+
 /*!
  Creates and installs menu options for the view
  */
 void HsAllAppsState::setMenuOptions()
 {
     HSMENUTEST_FUNC_ENTRY("HsAllAppsState::setMenuOptions");
-    QScopedPointer<HbMenu> viewOptions(new HbMenu);
-    viewOptions->addAction(hbTrId("txt_applib_opt_task_switcher"),
-                           this, SLOT(openTaskSwitcher()));
-    viewOptions->addAction(hbTrId("txt_applib_opt_add_to_collection"),
+    mViewOptions->clearActions();
+    mViewOptions->addAction(hbTrId("txt_applib_opt_task_switcher"),
+                           static_cast<HsBaseViewState*>(this), SLOT(openTaskSwitcher()));
+    mViewOptions->addAction(hbTrId("txt_applib_opt_add_to_collection"),
                            this, SLOT(addToCollection()));
-    viewOptions->addAction(hbTrId("txt_applib_opt_check_software_updates"),
-                           this, SLOT(checkSoftwareUpdates()));
+    mViewOptions->addAction(hbTrId("txt_applib_opt_check_software_updates"),
+                           static_cast<HsBaseViewState*>(this), SLOT(checkSoftwareUpdates()));
 
-    HbMenu *const sortMenu = viewOptions->addMenu(hbTrId(
+    HbMenu *const sortMenu = mViewOptions->addMenu(hbTrId(
                                  "txt_applib_opt_sort_by"));
     //Grouped options are exclusive by default.
-    QActionGroup *sortGroup = new QActionGroup(viewOptions.data());
+    QActionGroup *sortGroup = new QActionGroup(this);
 
     sortGroup->addAction(
         sortMenu->addAction(hbTrId("txt_applib_opt_sub_ascending"),
@@ -164,7 +129,7 @@
         sortMenu->addAction(hbTrId("txt_applib_opt_sub_descending"),
                             this, SLOT(descendingMenuAction())));
 
-    viewOptions->addAction(hbTrId("txt_applib_subtitle_installed"),
+    mViewOptions->addAction(hbTrId("txt_applib_opt_view_installed_applications"),
                            this, SLOT(openInstalledView()));
 
     foreach(QAction *action, sortMenu->actions()) {
@@ -184,7 +149,6 @@
     if (currentSortingPosition >= 0) {
         sortGroup->actions().at(currentSortingPosition)->setChecked(true);
     }
-    mMenuView.view()->setMenu(viewOptions.take());
 
     HSMENUTEST_FUNC_EXIT("HsAllAppsState::setMenuOptions");
 }
@@ -195,63 +159,32 @@
 
 HsAllAppsState::~HsAllAppsState()
 {
-    mMenuView.setModel(NULL);
-    delete mAllAppsModel;
 }
 
-/*!
- Scrolls view to first item at top
- */
-void HsAllAppsState::scrollToBeginning()
-{
-    mMenuView.listView()->scrollTo(
-        mAllAppsModel->index(0), HbAbstractItemView::PositionAtTop);
-}
 
 /*!
- Slot invoked when a state is entered.
+ Slot invoked when normal mode entered.
  */
-
-
-void HsAllAppsState::stateEntered()
+void HsAllAppsState::normalModeEntered()
 {
-    qDebug("AllAppsState::stateEntered()");
-    HSMENUTEST_FUNC_ENTRY("HsAllAppsState::stateEntered");
-    
-    mMainWindow.setCurrentView(mMenuView);
-    mMenuView.activate();
-
-    HSMENUTEST_FUNC_EXIT("HsAllAppsState::stateEntered");
+    HsBaseViewState::normalModeEntered();
+    if (mMenuView->model() != mModel) {
+        mMenuView->setModel(mModel);
+    }
+    connect(mMenuView.data(),
+            SIGNAL(activated(QModelIndex)),
+            static_cast<HsBaseViewState*>(this), SLOT(launchItem(QModelIndex)));
 }
 
 /*!
  Slot invoked when add mode entered.
  */
-void HsAllAppsState::normalModeEntered()
-{    
-    setMenuOptions();
-    connect(&mMainWindow, SIGNAL(viewIsReady()),
-        &mMainWindow, SLOT(saveActivity()),
-        Qt::UniqueConnection);
-    connect(&mMenuView,
-            SIGNAL(activated(QModelIndex)),
-            SLOT(listItemActivated(QModelIndex)));
-    connect(&mMenuView,
-            SIGNAL(longPressed(HbAbstractViewItem *, QPointF)),
-            SLOT(listItemLongPressed(HbAbstractViewItem *, QPointF)));
-}
-
-/*!
- Add mode entered.
- */
 void HsAllAppsState::addModeEntered()
 {
-    connect(&mMenuView,
-            SIGNAL(activated(QModelIndex)),
-            SLOT(addActivated(QModelIndex)));
-    connect(&mMenuView,
-            SIGNAL(longPressed(HbAbstractViewItem *, QPointF)),
-            SLOT(addLongPressed(HbAbstractViewItem *, QPointF)));
+    HsBaseViewState::addModeEntered();
+    if (mMenuView->model() != mAddModeProxyModel) {
+        mMenuView->setModel(mAddModeProxyModel);
+    }
 }
 
 /*!
@@ -261,161 +194,31 @@
 {
     HSMENUTEST_FUNC_ENTRY("HsAllAppsState::stateExited");
 
-    disconnect(&mMainWindow, SIGNAL(viewIsReady()),
-               &mMainWindow, SLOT(saveActivity()));
-       
-    mMenuView.setSearchPanelVisible(false);
-
-    mMenuView.disconnect(this);
+    HsBaseViewState::stateExited();
 
-    mMenuView.view()->setMenu(NULL);
-
-    mMenuView.inactivate();
-
-    if (mContextMenu)
-        mContextMenu->close();
-
-    HsBaseViewState::stateExited();
-    
     HSMENUTEST_FUNC_EXIT("HsAllAppsState::stateExited");
     qDebug("AllAppsState::stateExited()");
 }
 
 /*!
- Open task switcher.
- \retval true if operation is successful.
- */
-bool HsAllAppsState::openTaskSwitcher()
-{
-    return HsMenuService::launchTaskSwitcher();
-}
-
-/*!
- Check software updates.
- \retval 0 if operation is successful.
- */
-int HsAllAppsState::checkSoftwareUpdates()
-{
-    int errCode = HsMenuService::launchSoftwareUpdate();
-    if (errCode != 0){
-        createApplicationLaunchFailMessage(errCode,0);
-    }
-    return errCode;
-}
-
-/*!
- Slot connected to List widget in normal mode.
- \param index Model index of the activated item.
- */
-void HsAllAppsState::listItemActivated(const QModelIndex &index)
-{
-    HSMENUTEST_FUNC_ENTRY("HsAllAppsState::listItemActivated");
-
-    QSharedPointer<const CaEntry> entry = mAllAppsModel->entry(index);
-    
-    if (entry->entryTypeName() == widgetTypeName()) {
-        EntryFlags flags = index.data(CaItemModel::FlagsRole).value<
-                               EntryFlags> ();
-        if (!(flags & UninstallEntryFlag)) {
-            machine()->postEvent(
-                HsMenuEventFactory::createPreviewHSWidgetEvent(
-                    entry->id(), entry->entryTypeName(), entry->attribute(
-                        widgetUriAttributeName()), entry->attribute(
-                        widgetLibraryAttributeName())));
-
-            const int itemId = index.data(CaItemModel::IdRole).toInt();
-            HsMenuService::touch(itemId);
-        }
-    } else {
-        QVariant data = mAllAppsModel->data(index, CaItemModel::IdRole);
-        int errCode = HsMenuService::executeAction(data.toInt());
-        if (errCode != 0) {
-            createApplicationLaunchFailMessage(errCode,index.data(CaItemModel::IdRole).toInt());
-        }
-    }
-    
-    mMenuView.setSearchPanelVisible(false);
-
-    HSMENUTEST_FUNC_EXIT("HsAllAppsState::listItemActivated");
-}
-
-/*!
  Slot connected to List widget in add mode.
  \param index Model index of the activated item.
  */
 void HsAllAppsState::addActivated(const QModelIndex &index)
 {
+    mMenuView->disconnect(this);
     HSMENUTEST_FUNC_ENTRY("HsAllAppsState::addActivated");
     addToHomeScreen(index);
     HSMENUTEST_FUNC_EXIT("HsAllAppsState::addActivated");
 }
 
-/*!
- Handles long-item-pressed event in all apps view by showing context menu
- \param item View item
- \param coords Press point coordinates
- */
-void HsAllAppsState::listItemLongPressed(HbAbstractViewItem *item,
-        const QPointF &coords)
-{
-    HSMENUTEST_FUNC_ENTRY("HsAllAppsState::listItemLongPressed");
-
-    EntryFlags flags = item->modelIndex().data(
-                           CaItemModel::FlagsRole).value<EntryFlags> ();
-
-    if (!(flags & UninstallEntryFlag)) {
-        // create context menu
-        mContextMenu = new HbMenu;
-
-        HbAction *addToHomeScreenAction = mContextMenu->addAction(
-            hbTrId("txt_applib_menu_add_to_home_screen"));
-        addToHomeScreenAction->setData(AddToHomeScreenContextAction);
-
-        HbAction *addToCollectionAction = mContextMenu->addAction(
-            hbTrId("txt_applib_menu_add_to_collection"));
-        addToCollectionAction->setData(AddToCollectionContextAction);
-
-        HbAction *uninstallAction = mContextMenu->addAction(
-            hbTrId("txt_common_menu_delete"));
-        uninstallAction->setData(UninstallContextAction);
-        HbAction *appSettingsAction(NULL);
-        HbAction *appDetailsAction(NULL);
-
-        // check conditions and hide irrelevant menu items
-        QSharedPointer<const CaEntry> entry = mAllAppsModel->entry(item->modelIndex());
-
-        if (!(entry->attribute(appSettingsPlugin()).isEmpty())) {
-            appSettingsAction = mContextMenu->addAction(
-                hbTrId("txt_common_menu_settings"));
-            appSettingsAction->setData(AppSettingContextAction);
-        }
-        if (!(entry->attribute(componentIdAttributeName()).isEmpty()) &&
-                (flags & RemovableEntryFlag) ) {
-            appDetailsAction = mContextMenu->addAction(
-                hbTrId("txt_common_menu_details"));
-            appDetailsAction->setData(AppDetailsContextAction);
-        }
-
-        if (!(flags & RemovableEntryFlag)) {
-            uninstallAction->setVisible(false);
-        }
-
-        mContextModelIndex = item->modelIndex();
-        mContextMenu->setPreferredPos(coords);
-        mContextMenu->setAttribute(Qt::WA_DeleteOnClose);
-        mContextMenu->open(this, SLOT(contextMenuAction(HbAction*)));
-    }
-
-
-    HSMENUTEST_FUNC_EXIT("HsAllAppsState::listItemLongPressed");
-}
 
 /*!
  Handles context menu actions
  */
 void HsAllAppsState::contextMenuAction(HbAction *action)
 {
-    HsContextAction command = 
+    HsContextAction command =
         static_cast<HsContextAction>(action->data().toInt());
 
     const int itemId = mContextModelIndex.data(CaItemModel::IdRole).toInt();
@@ -429,25 +232,27 @@
             // an existing collection via item specific menu.
             machine()->postEvent(
                 HsMenuEventFactory::createAddAppsFromApplicationsViewEvent(
-                    mSortAttribute, mCollectionsSortAttribute, itemId));
+                    mSortAttribute, itemId));
             break;
         case UninstallContextAction:
             machine()->postEvent(
                 HsMenuEventFactory::createUninstallApplicationEvent(itemId));
             break;
-        case AppSettingContextAction: 
+        case AppSettingContextAction:
             machine()->postEvent(
                 HsMenuEventFactory::createAppSettingsViewEvent(itemId));
             break;
-        case AppDetailsContextAction: 
+        case AppDetailsContextAction:
             machine()->postEvent(
                 HsMenuEventFactory::createAppDetailsViewEvent(itemId));
-            break;            
+            break;
+        case OpenContextAction:
+            launchItem(mContextModelIndex);
+            break;
         default:
             break;
     }
-                                    
-    mMenuView.setSearchPanelVisible(false);
+    mMenuView->hideSearchPanel();
 }
 
 /*!
@@ -460,6 +265,7 @@
                                     const QPointF &coords)
 {
     Q_UNUSED(coords);
+    mMenuView->disconnect(this);
     HSMENUTEST_FUNC_ENTRY("HsAllAppsState::addLongPressed");
     addToHomeScreen(item->modelIndex());
     HSMENUTEST_FUNC_EXIT("HsAllAppsState::addLongPressed");
@@ -475,7 +281,7 @@
     // a new/an existing collection via the All view
     machine()->postEvent(
         HsMenuEventFactory::createAddAppsFromApplicationsViewEvent(
-            mSortAttribute, mCollectionsSortAttribute));
+            mSortAttribute));
 }
 
 /*!
@@ -495,50 +301,86 @@
 
 /*!
  Triggers event so that a state adding to Home Screen is reached
- \param index of an item to be added to homescreen
+ \param index of an item to be added to homescreen.
  \retval void
  */
 void HsAllAppsState::addToHomeScreen(const QModelIndex &index)
 {
     HSMENUTEST_FUNC_ENTRY("HsAllAppsState::addToHomeScreen");
-    QSharedPointer<const CaEntry> entry = mAllAppsModel->entry(index);
+    QSharedPointer<const CaEntry> entry = mModel->entry(index);
 
     machine()-> postEvent(HsMenuEventFactory::createAddToHomeScreenEvent(
-                              entry->id(), mMenuMode.getHsMenuMode(), 
-                              mMenuMode.getHsToken()));
+                              entry->id(), mMenuMode->getHsMenuMode(),
+                              mMenuMode->getHsToken()));
 
     HSMENUTEST_FUNC_EXIT("HsAllAppsState::addToHomeScreen");
 }
 
 /*!
+ Method seting context menu options.
+ */
+void HsAllAppsState::setContextMenuOptions(HbAbstractViewItem *item, EntryFlags flags)
+{
+    HbAction *openAction = mContextMenu->addAction(hbTrId(
+        "txt_common_menu_open"));
+    openAction->setData(OpenContextAction);
+
+    HbAction *addToHomeScreenAction = mContextMenu->addAction(
+        hbTrId("txt_applib_menu_add_to_home_screen"));
+    addToHomeScreenAction->setData(AddToHomeScreenContextAction);
+
+    HbAction *addToCollectionAction = mContextMenu->addAction(
+        hbTrId("txt_applib_menu_add_to_collection"));
+    addToCollectionAction->setData(AddToCollectionContextAction);
+
+    HbAction *uninstallAction = mContextMenu->addAction(
+        hbTrId("txt_common_menu_delete"));
+    uninstallAction->setData(UninstallContextAction);
+    HbAction *appSettingsAction(NULL);
+    HbAction *appDetailsAction(NULL);
+
+    // check conditions and hide irrelevant menu items
+    QSharedPointer<const CaEntry> entry = mModel->entry(item->modelIndex());
+
+    if (!(entry->attribute(appSettingsPlugin()).isEmpty())) {
+        appSettingsAction = mContextMenu->addAction(
+            hbTrId("txt_common_menu_settings"));
+        appSettingsAction->setData(AppSettingContextAction);
+    }
+    if (!(entry->attribute(componentIdAttributeName()).isEmpty()) &&
+            (flags & RemovableEntryFlag) ) {
+        appDetailsAction = mContextMenu->addAction(
+            hbTrId("txt_common_menu_details"));
+        appDetailsAction->setData(AppDetailsContextAction);
+    }
+
+    if (!(flags & RemovableEntryFlag)) {
+        uninstallAction->setVisible(false);
+    }
+
+    addToHomeScreenAction->setVisible(
+        !HsAppLibStateUtils::isCWRTWidgetOnHomeScreen(entry.data()));
+}
+
+/*!
   Menu ascending sort action slot.
  */
 void HsAllAppsState::ascendingMenuAction()
 {
     HSMENUTEST_FUNC_ENTRY("HsAllAppsState::ascendingMenuAction");
     mSortAttribute = AscendingNameHsSortAttribute;
-    mAllAppsModel->setSort(mSortAttribute);
+    mModel->setSort(mSortAttribute);
     HSMENUTEST_FUNC_EXIT("HsAllAppsState::ascendingMenuAction");
 }
 
 /*!
- Sets collections sort order
- /param sortOrder sort order.
- */
-void HsAllAppsState::collectionsSortOrder(
-    HsSortAttribute sortOrder)
-{
-    mCollectionsSortAttribute = sortOrder;
-}
-
-/*!
  Menu descending sort action slot.
  */
 void HsAllAppsState::descendingMenuAction()
 {
     HSMENUTEST_FUNC_ENTRY("HsAllAppsState::descendingMenuAction");
     mSortAttribute = DescendingNameHsSortAttribute;
-    mAllAppsModel->setSort(mSortAttribute);
+    mModel->setSort(mSortAttribute);
     HSMENUTEST_FUNC_EXIT("HsAllAppsState::descendingMenuAction");
 
 }

--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallcollectionsstate.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallcollectionsstate.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -14,25 +14,23 @@
  * Description: Menu All Collections state.
  *
  */
+#include <QPointF>
 #include <QScopedPointer>
 #include <QStateMachine>
 #include <HbView>
 #include <HbListView>
-#include <HbMainWindow>
 #include <HbMenu>
 #include <HbAction>
 #include <HbAbstractViewItem>
-#include <HbInstance>
-#include <HbSearchPanel>
+
+#include <cadefs.h>
 
-#include <hsmenueventfactory.h>
 #include "hsmenumodewrapper.h"
-#include "hsmenuviewbuilder.h"
+#include "hsmenueventfactory.h"
+#include "hsmenumodewrapper.h"
 #include "hsmenuitemmodel.h"
-#include "cadefs.h"
 #include "hsallcollectionsstate.h"
 #include "hsaddappstocollectionstate.h"
-#include "hsmenumodetransition.h"
 #include "hsmainwindow.h"
 
 /*!
@@ -45,28 +43,6 @@
  */
 
 /*!
- \var HsAllCollectionsState::mSortAttribute
- Sort order
- */
-
-/*!
- \var HsAllCollectionsState::mMenuView
- Wrapper for All Collections View.
- */
-
-/*!
- \var HsAllCollectionsState::mAllCollectionsModel
- Item Model for the List.
- Own.
- */
-
-/*!
- \fn void HsAllCollectionsState::sortOrderChanged(HsSortAttribute sortAttribute);
- Signal emitted when sort order is changed.
- \param sortOrder new sort order.
- */
-
-/*!
  Constructor.
  \param menuViewBuilder Menu view builder.
  \param menuMode reference to object representing menu mode (add mode on/add mode off).
@@ -77,14 +53,9 @@
     HsMenuModeWrapper &menuMode,
     HsMainWindow &mainWindow,
     QState *parent):
-    HsBaseViewState(parent),
-    mSortAttribute(CustomHsSortAttribute),
-    mMenuView(menuViewBuilder, HsAllCollectionsContext),
-    mMenuMode(menuMode),
-    mAllCollectionsModel(0),
-    mMainWindow(mainWindow),
-    mContextModelIndex(), mContextMenu(0)
+    HsBaseViewState(mainWindow, menuMode, parent)
 {
+    initialize(menuViewBuilder, HsAllCollectionsContext);
     construct();
 }
 
@@ -94,134 +65,73 @@
 void HsAllCollectionsState::construct()
 {
     HSMENUTEST_FUNC_ENTRY("HsAllCollectionsState::construct");
-
-    QState *initialState = new QState(this);
-    setInitialState(initialState);
-
-    QState *addModeState = new QState(this);
-    connect(addModeState, SIGNAL(entered()),SLOT(addModeEntered()));
-
-    QState *normalModeState = new QState(this);
-    connect(normalModeState, SIGNAL(entered()),SLOT(normalModeEntered()));
-    connect(normalModeState, SIGNAL(exited()),SLOT(normalModeExited()));
-
-    initialState->addTransition(new HsMenuModeTransition(
-                                    mMenuMode, NormalHsMenuMode, normalModeState));
-    initialState->addTransition(new HsMenuModeTransition(
-                                    mMenuMode, AddHsMenuMode, addModeState));
-
+    defineTransitions();
     const QString parentName =
         parent() != 0 ? parent()->objectName() : QString("");
     setObjectName(parentName + "/allcollectionsstate");
-    connect(this, SIGNAL(entered()),SLOT(stateEntered()));
-    connect(this, SIGNAL(exited()),SLOT(stateExited()));
 
-    mSecondarySoftkeyAction = new HbAction(Hb::BackNaviAction, this);
-
-    mMenuView.view()->setNavigationAction(
-        mSecondarySoftkeyAction);
+    connect(mBackKeyAction, SIGNAL(triggered()), SIGNAL(toAppLibraryState()));
 
-    connect(mSecondarySoftkeyAction, SIGNAL(triggered()),
-            SIGNAL(toAppLibraryState()));
-
-    mAllCollectionsModel = HsMenuService::getAllCollectionsModel(
-                               mSortAttribute);
-
-    mMenuView.setModel(mAllCollectionsModel);
+    mModel = HsMenuService::getAllCollectionsModel();
+    mMenuView->setModel(mModel);
 
     HSMENUTEST_FUNC_EXIT("HsAllCollectionsState::construct");
 }
 
 /*!
- Creates and installs menu options for the view
+ Creates and installs menu options for the view.
  */
 void HsAllCollectionsState::setMenuOptions()
 {
     HSMENUTEST_FUNC_ENTRY("HsAllCollectionsState::setMenuOptions");
 
-    QScopedPointer<HbMenu> viewOptions(new HbMenu);
-
-    viewOptions->addAction(hbTrId("txt_applib_opt_task_switcher"),
-                           this,
+    mViewOptions->clearActions();
+    mViewOptions->addAction(hbTrId("txt_applib_opt_task_switcher"),
+                           static_cast<HsBaseViewState*>(this),
                            SLOT(openTaskSwitcher()));
-    viewOptions->addAction(hbTrId("txt_applib_opt_new_collection"),
+    mViewOptions->addAction(hbTrId("txt_applib_opt_new_collection"),
                            this, SLOT(createNewCollection()));
 
-    HbMenu *const sortMenu = viewOptions->addMenu(
-                                 hbTrId("txt_applib_opt_sort_by"));
-
-    //Grouped options are exclusive by default.
-    QActionGroup *sortGroup = new QActionGroup(viewOptions.data());
-    sortGroup->addAction(sortMenu->addAction(
-                             hbTrId("txt_applib_opt_sub_custom"),
-                             this, SLOT(customMenuAction())));
-    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())));
-
-    if (mSortAttribute == CustomHsSortAttribute) {
-        viewOptions->addAction(hbTrId("txt_applib_opt_arrange"),
-                               this, SLOT(createArrangeCollection()));
-    }
-
-    foreach(QAction *action, sortMenu->actions()) {
-        action->setCheckable(true);
-    }
-
-    switch (mSortAttribute) {
-    case AscendingNameHsSortAttribute:
-        sortGroup->actions().at(1)->setChecked(true);
-        break;
-    case DescendingNameHsSortAttribute:
-        sortGroup->actions().at(2)->setChecked(true);
-        break;
-    case CustomHsSortAttribute:
-    default:
-        sortGroup->actions().at(0)->setChecked(true);
-        break;
-    }
-
-    mMenuView.view()->setMenu(viewOptions.take());
+    mViewOptions->addAction(hbTrId("txt_applib_opt_arrange"),
+        this, SLOT(createArrangeCollection()));
 
     HSMENUTEST_FUNC_EXIT("HsAllCollectionsState::setMenuOptions");
 }
 
 /*!
+ Method seting context menu options.
+ \param item the context menu is requested for.
+ \param flags related to \a item.
+ */
+void HsAllCollectionsState::setContextMenuOptions(HbAbstractViewItem *item, EntryFlags flags)
+{
+    Q_UNUSED(item)
+
+    HbAction *openAction = mContextMenu->addAction(hbTrId(
+        "txt_common_menu_open"));
+    openAction->setData(OpenContextAction);
+
+    // create context menu
+    HbAction *addShortcutAction = mContextMenu->addAction(hbTrId(
+                                      "txt_applib_menu_add_to_home_screen"));
+    addShortcutAction->setData(AddToHomeScreenContextAction);
+    HbAction *renameAction = NULL;
+    HbAction *deleteAction = NULL;
+
+    if ((flags & RemovableEntryFlag)) {
+        renameAction = mContextMenu->addAction(
+                           hbTrId("txt_common_menu_rename_item"));
+        renameAction->setData(RenameContextAction);
+        deleteAction = mContextMenu->addAction(hbTrId("txt_common_menu_delete"));
+        deleteAction->setData(DeleteContextAction);
+    }
+}
+
+/*!
  Destructor.
  */
 HsAllCollectionsState::~HsAllCollectionsState()
 {
-    mMenuView.setModel(NULL);
-    delete mAllCollectionsModel;
-}
-
-/*!
- Populates all folders
- */
-void HsAllCollectionsState::scrollToBeginning()
-{
-
-    mMenuView.listView()->scrollTo(
-        mAllCollectionsModel->index(0), HbAbstractItemView::PositionAtTop);
-}
-
-/*!
- Slot invoked when a state is entered.
- */
-
-
-void HsAllCollectionsState::stateEntered()
-{
-    qDebug("AllCollectionsState::stateEntered()");
-    HSMENUTEST_FUNC_ENTRY("HsAllCollectionsState::stateEntered");
-
-    mMainWindow.setCurrentView(mMenuView);
-    mMenuView.activate();
-
-    HSMENUTEST_FUNC_EXIT("HsAllCollectionsState::stateExited");
 }
 
 /*!
@@ -229,16 +139,11 @@
 */
 void HsAllCollectionsState::normalModeEntered()
 {
-    setMenuOptions();
-    connect(&mMainWindow, SIGNAL(viewIsReady()),
-        &mMainWindow, SLOT(saveActivity()),
-        Qt::UniqueConnection);
-    connect(&mMenuView,
+    HsBaseViewState::normalModeEntered();
+    connect(mMenuView.data(),
             SIGNAL(activated(QModelIndex)),
-            SLOT(listItemActivated(QModelIndex)));
-    connect(&mMenuView,
-            SIGNAL(longPressed(HbAbstractViewItem *, QPointF)),
-            SLOT(listItemLongPressed(HbAbstractViewItem *, QPointF)));
+            static_cast<HsBaseViewState*>(this),
+            SLOT(openCollection(QModelIndex)));
 }
 
 /*!
@@ -246,21 +151,9 @@
 */
 void HsAllCollectionsState::normalModeExited()
 {
-    mMenuView.view()->setMenu(NULL);
+
 }
 
-/*!
- Slot invoked when add mode is entered.
- */
-void HsAllCollectionsState::addModeEntered()
-{
-    connect(&mMenuView,
-            SIGNAL(activated(QModelIndex)),
-            SLOT(addActivated(QModelIndex)));
-    connect(&mMenuView,
-            SIGNAL(longPressed(HbAbstractViewItem *, QPointF)),
-            SLOT(addLongPressed(HbAbstractViewItem *, QPointF)));
-}
 
 /*!
  Slot invoked when a state is exited.
@@ -268,19 +161,7 @@
 void HsAllCollectionsState::stateExited()
 {
     HSMENUTEST_FUNC_ENTRY("HsAllCollectionsState::stateExited");
-    
-    disconnect(&mMainWindow, SIGNAL(viewIsReady()),
-               &mMainWindow, SLOT(saveActivity()));
-    
-    mMenuView.setSearchPanelVisible(false);
 
-    mMenuView.disconnect(this);
-
-    mMenuView.inactivate();
-
-    if (mContextMenu)
-        mContextMenu->close();
-    
     HsBaseViewState::stateExited();
 
     HSMENUTEST_FUNC_EXIT("HsAllCollectionsState::stateExited");
@@ -288,45 +169,16 @@
 }
 
 /*!
- Open task switcher.
- \retval true if operation is successful.
- */
-bool HsAllCollectionsState::openTaskSwitcher()
-{
-    return HsMenuService::launchTaskSwitcher();
-}
-
-/*!
- Slot connected to List widget in normal mode.
- \param index Model index of the activated item.
- */
-void HsAllCollectionsState::listItemActivated(const QModelIndex &index)
-{
-    HSMENUTEST_FUNC_ENTRY("HsAllCollectionsState::listItemActivated");
-    QVariant data = mAllCollectionsModel->data(index, CaItemModel::IdRole);
-    int id = data.toInt();
-    QString collectionType =
-        mAllCollectionsModel->data(index, CaItemModel::TypeRole).toString();
-    qDebug("AllCollectionsState::listItemActivated - MCS ID: %d",
-           data.toInt());
-
-    mMenuView.setSearchPanelVisible(false);
-
-    machine()->postEvent(HsMenuEventFactory::createOpenCollectionFromAppLibraryEvent(id,
-                         collectionType));
-    HSMENUTEST_FUNC_EXIT("HsAllCollectionsState::listItemActivated");
-}
-
-/*!
  Slot connected to List widget in add mode.
  \param index Model index of the activated item.
  */
 void HsAllCollectionsState::addActivated(const QModelIndex &index)
 {
+    mMenuView->disconnect(this);
     const int itemId = index.data(CaItemModel::IdRole).toInt();
     machine()->postEvent(
         HsMenuEventFactory::createAddToHomeScreenEvent(
-            itemId, mMenuMode.getHsMenuMode(), mMenuMode.getHsToken()));
+            itemId, mMenuMode->getHsMenuMode(), mMenuMode->getHsToken()));
 }
 
 /*!
@@ -339,57 +191,20 @@
         const QPointF &coords)
 {
     Q_UNUSED(coords);
+    mMenuView->disconnect(this);
     const int itemId = item->modelIndex().data(CaItemModel::IdRole).toInt();
     machine()->postEvent(
         HsMenuEventFactory::createAddToHomeScreenEvent(itemId,
-                mMenuMode.getHsMenuMode(), mMenuMode.getHsToken()));
+                mMenuMode->getHsMenuMode(), mMenuMode->getHsToken()));
 }
 
 /*!
- Slot connected to List widget in normal mode.
- Called when item long pressed.
- \param item View item.
- \param coords Press point coordinates.
- */
-void HsAllCollectionsState::listItemLongPressed(HbAbstractViewItem *item,
-        const QPointF &coords)
-{
-    HSMENUTEST_FUNC_ENTRY("HsAllCollectionsState::listItemLongPressed");
-
-    mContextMenu = new HbMenu;
-
-    // create context menu
-    HbAction *addShortcutAction = mContextMenu->addAction(hbTrId(
-                                      "txt_applib_menu_add_to_home_screen"));
-    addShortcutAction->setData(AddToHomeScreenContextAction);
-    HbAction *renameAction = NULL;
-    HbAction *deleteAction = NULL;
-
-    EntryFlags flags = item->modelIndex().data(CaItemModel::FlagsRole).value<
-                       EntryFlags> ();
-
-    if ((flags & RemovableEntryFlag)) {
-        renameAction = mContextMenu->addAction(
-                           hbTrId("txt_common_menu_rename_item"));
-        renameAction->setData(RenameContextAction);
-        deleteAction = mContextMenu->addAction(hbTrId("txt_common_menu_delete"));
-        deleteAction->setData(DeleteContextAction);
-    }
-
-    mContextModelIndex = item->modelIndex();
-    mContextMenu->setPreferredPos(coords);
-    mContextMenu->setAttribute(Qt::WA_DeleteOnClose);
-    mContextMenu->open(this, SLOT(contextMenuAction(HbAction*)));
-
-    HSMENUTEST_FUNC_EXIT("HsAllCollectionsState::listItemLongPressed");
-}
-
-/*!
- Handles context menu actions
+ Handles context menu actions.
+ \param action to be handled.
  */
 void HsAllCollectionsState::contextMenuAction(HbAction *action)
 {
-    HsContextAction command = 
+    HsContextAction command =
         static_cast<HsContextAction>(action->data().toInt());
 
     const int itemId = mContextModelIndex.data(CaItemModel::IdRole).toInt();
@@ -398,7 +213,9 @@
         case AddToHomeScreenContextAction:
             machine()->postEvent(
                 HsMenuEventFactory::createAddToHomeScreenEvent(
-                    itemId, mMenuMode.getHsMenuMode(), mMenuMode.getHsToken()));
+                    itemId,
+                    mMenuMode->getHsMenuMode(),
+                    mMenuMode->getHsToken()));
             break;
         case RenameContextAction:
             machine()->postEvent(
@@ -407,12 +224,15 @@
         case DeleteContextAction:
              machine()->postEvent(
                 HsMenuEventFactory::createDeleteCollectionEvent(itemId));
-            break;      
+            break;
+        case OpenContextAction:
+            openCollection(mContextModelIndex);
+            break;
         default:
             break;
     }
-                                    
-    mMenuView.setSearchPanelVisible(false);
+
+    mMenuView->hideSearchPanel();
 }
 
 /*!
@@ -433,7 +253,7 @@
     int topItemId(0);
 
     const QList<HbAbstractViewItem *> array =
-        mMenuView.listView()->visibleItems();
+        mMenuView->listView()->visibleItems();
 
     if (array.count() >= 1) {
         QModelIndex idx = array[0]->modelIndex();
@@ -441,45 +261,5 @@
     }
 
     machine()->postEvent(
-        HsMenuEventFactory::createArrangeCollectionEvent(topItemId));
-}
-
-/*!
- Menu custom sort action slot.
- */
-void HsAllCollectionsState::customMenuAction()
-{
-    HSMENUTEST_FUNC_ENTRY("HsAllCollectionsState::customMenuAction");
-    mSortAttribute = CustomHsSortAttribute;
-    setMenuOptions();
-    mAllCollectionsModel->setSort(mSortAttribute);
-    emit sortOrderChanged(mSortAttribute);
-    HSMENUTEST_FUNC_EXIT("HsAllCollectionsState::customMenuAction");
+        HsMenuEventFactory::createArrangeAllCollectionsEvent(topItemId));
 }
-
-/*!
- Menu ascending sort action slot.
- */
-void HsAllCollectionsState::ascendingMenuAction()
-{
-    HSMENUTEST_FUNC_ENTRY("HsAllCollectionsState::ascendingMenuAction");
-    mSortAttribute = AscendingNameHsSortAttribute;
-    setMenuOptions();
-    mAllCollectionsModel->setSort(mSortAttribute);
-    emit sortOrderChanged(mSortAttribute);
-    HSMENUTEST_FUNC_EXIT("HsAllCollectionsState::ascendingMenuAction");
-}
-
-/*!
- Menu descending sort action slot.
- */
-void HsAllCollectionsState::descendingMenuAction()
-{
-    HSMENUTEST_FUNC_ENTRY("HsAllCollectionsState::descendingMenuAction");
-    mSortAttribute = DescendingNameHsSortAttribute;
-    setMenuOptions();
-    mAllCollectionsModel->setSort(mSortAttribute);
-    emit sortOrderChanged(mSortAttribute);
-    HSMENUTEST_FUNC_EXIT("HsAllCollectionsState::descendingMenuAction");
-}
-

--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsapplibrarystate.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsapplibrarystate.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -14,18 +14,11 @@
  * Description: Menu Application Library state.
  *
  */
-#include <hbmainwindow.h>
-#include <hbview.h>
-#include <hbaction.h>
+
+#include <HbAction>
 #include <HbToolBar>
-#include <HbIcon>
-#include <hbinstance.h>
-#include <hblistview.h>
-#include <hbsearchpanel.h>
 #include <HbToolBarExtension>
 #include <HbStyleLoader>
-#include <hsmenueventtransition.h>
-
 
 #include "hstest_global.h"
 #include "hsapplibrarystate.h"
@@ -34,7 +27,7 @@
 #include "hscollectionstate.h"
 #include "hsinstalledappsstate.h"
 #include "hsoperatorhandler.h"
-#include "hsmenuview.h"
+#include "hsmenueventtransition.h"
 #include "hsmenumodetransition.h"
 
 
@@ -125,7 +118,7 @@
 
     mAllCollectionsState = new HsAllCollectionsState(mMenuViewBuilder, mMenuMode,
             mMainWindow, this);
-            
+
     QState *initialState = new QState(this);
     setInitialState(initialState);
 
@@ -142,12 +135,12 @@
             this);
 
     connect(mCollectionState, SIGNAL(entered()),SLOT(clearToolbarLatch()));
-    
+
     HsMenuEventTransition *openCollectionFromAppLibTransition =
         new HsMenuEventTransition(HsMenuEvent::OpenCollectionFromAppLibrary,
                                   this, mCollectionState);
     this->addTransition(openCollectionFromAppLibTransition);
-    
+
     //It is called from: HsDefaultRuntime::activityRequested(const QString &name)
     HsMenuEventTransition *openCollectionAfterActivityRequest =
             new HsMenuEventTransition(HsMenuEvent::OpenCollection,
@@ -180,11 +173,6 @@
 
     constructToolbar();
 
-    connect(mAllCollectionsState, SIGNAL(sortOrderChanged(HsSortAttribute)),
-            mAllAppsState, SLOT(collectionsSortOrder(HsSortAttribute)));
-    connect(mAllCollectionsState, SIGNAL(sortOrderChanged(HsSortAttribute)),
-            mCollectionState, SLOT(collectionsSortOrder(HsSortAttribute)));
-
     connect(mAllAppsState, SIGNAL(entered()),
             this, SLOT(allAppsStateEntered()));
 
@@ -195,7 +183,7 @@
 
     connect(mAllCollectionsState, SIGNAL(entered()),
             this, SLOT(allCollectionsStateEntered()));
-  
+
     HSMENUTEST_FUNC_EXIT("HsAppLibraryState::construct");
 }
 
@@ -209,19 +197,19 @@
     HSMENUTEST_FUNC_ENTRY("HsAppLibraryState::onEntry");
     QState::onEntry(event);
 
-    if (static_cast<HsMenuEvent *>(event)->operation() != 
+    if (static_cast<HsMenuEvent *>(event)->operation() !=
             HsMenuEvent::OpenCollectionFromAppLibrary)
         {
     // we are back from HS, scroll those views to top
         mAllAppsState->scrollToBeginning();
-        mAllCollectionsState->scrollToBeginning();        
+        mAllCollectionsState->scrollToBeginning();
         }
-    
+
     if (event->type() == HsMenuEvent::eventType()) {
         HsMenuEvent *menuEvent = static_cast<HsMenuEvent *>(event);
         QVariantMap data = menuEvent->data();
         mMenuMode.setHsMenuMode(
-            static_cast<HsMenuMode>(data.value(menuModeType()).toInt()), 
+            static_cast<HsMenuMode>(data.value(menuModeType()).toInt()),
             data.value(HOMESCREENDATA));
     } else {
         mMenuMode.setHsMenuMode(NormalHsMenuMode);
@@ -242,16 +230,14 @@
 
     HsOperatorHandler *const operatorHandler = new HsOperatorHandler(this);
 
-    const bool operatorActionAvailable = !operatorHandler->icon().isNull();
-
-    if (operatorActionAvailable) {
+    if (operatorHandler->oviStorePresent()
+            && operatorHandler->operatorStorePresent()) {
 
         //TODO HbToolBarExtension is not supported in docml currently
         //should be changed in future
         bool loaded = HbStyleLoader::registerFilePath(
                      ":/css/hsapplibrarystateplugin.css");
         Q_ASSERT(loaded);
-        HbAction *const operatorAction(mMenuViewBuilder.operatorAction());
 
         HbToolBarExtension *const extension(
             mMenuViewBuilder.toolBarExtension());
@@ -260,25 +246,31 @@
 
         extensionAction->setIcon(HbIcon("qtg_mono_store"));
 
-        operatorAction->setIcon(operatorHandler->icon());
+        HbAction *const operatorAction(
+                operatorHandler->prepareOperatorStoreAction(
+                        mMenuViewBuilder.operatorAction()));
         operatorAction->setText(hbTrId(operatorHandler->text().toLatin1()));
 
         //TODO: no locstring for ovi store currently
         mMenuViewBuilder.oviStoreAction()->setText("Ovi Store");
-
-        connect(mMenuViewBuilder.operatorAction(), SIGNAL(triggered()),
-                operatorHandler, SLOT(action()));
-
-        extension->addAction(mMenuViewBuilder.oviStoreAction());
-        extension->addAction(operatorAction);
-
-    } else {
+        if (operatorHandler->operatorStoreFirst()) {
+            extension->addAction(operatorAction);
+            extension->addAction(mMenuViewBuilder.oviStoreAction());
+        } else {
+            extension->addAction(mMenuViewBuilder.oviStoreAction());
+            extension->addAction(operatorAction);
+        }
+    } else if (operatorHandler->oviStorePresent()) {
         mMenuViewBuilder.toolBar()->addAction(
             mMenuViewBuilder.oviStoreAction());
+    } else if (operatorHandler->operatorStorePresent()) {
+        mMenuViewBuilder.toolBar()->addAction(
+            operatorHandler->prepareOperatorStoreAction(
+                    mMenuViewBuilder.operatorAction()));
     }
 
-
-    HbAction *const allCollectionsAction(mMenuViewBuilder.allCollectionsAction());
+    HbAction *const allCollectionsAction(
+            mMenuViewBuilder.allCollectionsAction());
 
     mAllAppsState->addTransition(
         allCollectionsAction, SIGNAL(triggered()), mAllCollectionsState);
@@ -320,12 +312,12 @@
 int HsAppLibraryState::oviStoreAction()
 {
     HSMENUTEST_FUNC_ENTRY("HsAppLibraryState::oviStoreAction");
-    
+
     CaEntry oviEntry;
     oviEntry.setEntryTypeName(applicationTypeName());
-    oviEntry.setAttribute( applicationUidEntryKey(), 
+    oviEntry.setAttribute( applicationUidEntryKey(),
                     QString::number(oviLauncherApplicationUid));
-    
+
     int result = CaService::instance()->executeCommand(oviEntry);
     if (result) {
         oviEntry.setEntryTypeName(urlTypeName());
@@ -333,7 +325,7 @@
                           QString("https://store.ovi.com/applications/"));
         result = CaService::instance()->executeCommand(oviEntry);
     }
-    
+
     HSMENUTEST_FUNC_EXIT("HsAppLibraryState::oviStoreAction");
     return result;
 }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsapplibstateutils.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,57 @@
+/*
+ * 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: Utils for application library state plugin.
+ *
+ */
+
+#include <caentry.h>
+
+#include "hsapplibstateutils.h"
+#include "hscontentservice.h"
+#include "hsapp_defs.h"
+
+/*!
+ \class HsAppLibStateUtils
+ \ingroup group_hsmenustateplugin
+ \brief Utils.
+ Utils for application library state plugin.
+ */
+
+/*!
+ Return true if given entry is cwrt widget and already on homescreen
+ */
+bool HsAppLibStateUtils::isCWRTWidgetOnHomeScreen(const CaEntry *entry)
+{
+    bool result = false;
+    if (entry->entryTypeName() == applicationTypeName() && 
+        entry->attribute(swTypeKey()) == HS_CWRT_APP_TYPE &&
+        entry->attribute(widgetUriAttributeName()) ==
+                HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE) {
+        QVariantHash preferences;
+        QMap<QString, QString> attributes = entry->attributes();
+        QMapIterator<QString, QString> i(attributes);
+        while (i.hasNext()) {
+            i.next();
+            QString key(i.key());
+            QString value(i.value());
+            if (key.contains(widgetParam())) {
+                preferences.insert(key.remove(widgetParam()),value);
+            }
+        }
+        int count(0);
+        HsContentService::instance()->widgets(HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE,preferences,count);
+        result = count > 0;
+    }
+    return result;
+}

--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsbaseviewstate.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsbaseviewstate.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -15,104 +15,122 @@
  *
  */
 
-#include <hbmessagebox.h>
+#include <QScopedPointer>
+#include <QStateMachine>
+#include <HbMessageBox>
 #include <HbParameterLengthLimiter>
-#include <hbaction.h>
+#include <HbAction>
+#include <HbMenu>
+#include <HbAbstractViewItem>
+#include <HbView>
+#include <HbListView>
+
 #include <canotifier.h>
 
 #include "hsbaseviewstate.h"
+#include "hsmenueventfactory.h"
+#include "hsmenudialogfactory.h"
+#include "hsmenuitemmodel.h"
+#include "hsmenumodetransition.h"
+#include "hsmenuentryremovedhandler.h"
+#include "hsmainwindow.h"
+
 
 /*!
  Constructor.
+ \param mainWindow main window wrapper object.
+ \param parent Owner.
  */
-HsBaseViewState::HsBaseViewState(
-    QState *parent):
+HsBaseViewState::HsBaseViewState(HsMainWindow &mainWindow, QState *parent):
     QState(parent),
-    mNotifier(0),
-    mMessageRelatedItemId(0),
-    mApplicationLaunchFailMessage(0)    
+    mApplicationLaunchFailMessage(0),
+    mModel(0),
+    mContextMenu(0),
+    mContextModelIndex(),
+    mBackKeyAction(0),
+    mMenuView(0),
+    mMenuMode(0),
+    mMainWindow(mainWindow)
 {
-    construct();
+    mBackKeyAction = new HbAction(Hb::BackNaviAction, this);
+    mViewOptions = new HbMenu;
 }
 
 /*!
- Constructs contained objects.
+ Constructor.
+ \param mainWindow main window wrapper object.
+ \param menuMode menu mode object.
+ \param parent Owner.
  */
-void HsBaseViewState::construct()
+HsBaseViewState::HsBaseViewState(HsMainWindow &mainWindow,
+    HsMenuModeWrapper& menuMode,
+    QState *parent):
+    QState(parent),
+    mApplicationLaunchFailMessage(0),
+    mModel(0),
+    mContextMenu(0),
+    mContextModelIndex(),
+    mBackKeyAction(0),
+    mMenuView(0),
+    mMenuMode(&menuMode),
+    mMainWindow(mainWindow)
 {
+    mBackKeyAction = new HbAction(Hb::BackNaviAction, this);
+    mViewOptions = new HbMenu;
+}
+/*!
+ Initialize contained objects.
+ \param menuViewBuilder object providing widgets for menu view.
+ \param stateContext state context of the view the builder
+     is to provide widgets for.
+ */
+void HsBaseViewState::initialize(HsMenuViewBuilder &menuViewBuilder,
+    HsStateContext stateContext)
+{
+    mMenuView.reset(new HsMenuView(menuViewBuilder, stateContext, mMainWindow));
+    mMenuView->view()->setNavigationAction(mBackKeyAction);
+    mMenuView->view()->setMenu(mViewOptions);
+
+    connect(this, SIGNAL(entered()),SLOT(stateEntered()));
+    connect(this, SIGNAL(exited()),SLOT(stateExited()));
 }
 
 /*!
  Creates and open application launch fail message.
  \param errorCode eroor code to display.
+ \param itemId id of the launched item.
  */
-void HsBaseViewState::createApplicationLaunchFailMessage(int errorCode,int itemId)
+void HsBaseViewState::createApplicationLaunchFailMessage(int errorCode,
+    int itemId)
 {
     QString message;
     message.append(
         HbParameterLengthLimiter("txt_applib_info_launching_the_application_failed").arg(
             errorCode));
-    
-    mMessageRelatedItemId = itemId;
 
     // create and show message box
-    mApplicationLaunchFailMessage = new HbMessageBox(HbMessageBox::MessageTypeInformation);
-    mApplicationLaunchFailMessage->setAttribute(Qt::WA_DeleteOnClose);
-
-    mApplicationLaunchFailMessage->setText(message);
+    mApplicationLaunchFailMessage = HsMenuDialogFactory().create(
+            message, HsMenuDialogFactory::Close);
 
-    mApplicationLaunchFailMessage->clearActions();
-    HbAction *mClosemAction = new HbAction(hbTrId("txt_common_button_close"),
-        mApplicationLaunchFailMessage);
-    mApplicationLaunchFailMessage->addAction(mClosemAction);
+    QScopedPointer<HsMenuEntryRemovedHandler> entryObserver(
+        new HsMenuEntryRemovedHandler(itemId, mApplicationLaunchFailMessage.data(), SLOT(close())));
 
-    mApplicationLaunchFailMessage->open(this, SLOT(applicationLaunchFailMessageFinished(HbAction*)));
-    
-    subscribeForMemoryCardRemove();
+    entryObserver.take()->setParent(mApplicationLaunchFailMessage.data());
+
+    mApplicationLaunchFailMessage->open();
 }
 
 /*!
- Subscribe for memory card remove.
+ Slot invoked when a state is entered.
  */
-void HsBaseViewState::subscribeForMemoryCardRemove()
-{
-    if (mMessageRelatedItemId !=0 ) {
-        CaNotifierFilter filter;
-        filter.setIds(QList<int>() << mMessageRelatedItemId);
-        mNotifier = CaService::instance()->createNotifier(filter);
-        mNotifier->setParent(this);
-        connect(mNotifier,
-            SIGNAL(entryChanged(CaEntry,ChangeType)),
-            SLOT(cleanUpApplicationLaunchFailMessage()));
-    }
-}
-
-/*!
- Clean up application launch fail message box.
- \retval void
- */
-void HsBaseViewState::cleanUpApplicationLaunchFailMessage()
+void HsBaseViewState::stateEntered()
 {
-    if (mApplicationLaunchFailMessage) {
-        mApplicationLaunchFailMessage->close();
-        mApplicationLaunchFailMessage = NULL;
-    }
-    if (mNotifier) {
-        delete mNotifier;
-        mNotifier = NULL;
-    }
-    mMessageRelatedItemId = 0;
-}
-
-/*!
- Action after closed application launch fail dialog.
- \param finishedAction chosen action.
- \retval void
- */
-void HsBaseViewState::applicationLaunchFailMessageFinished(HbAction*)
-{
-    mApplicationLaunchFailMessage = NULL;
-    cleanUpApplicationLaunchFailMessage();
+    qDebug("HsBaseViewState::stateEntered()");
+    HSMENUTEST_FUNC_ENTRY("HsBaseViewState::stateEntered");
+    mMenuView->activate();
+    connect(mMenuView.data(), SIGNAL(listViewChange()),
+            this, SLOT(closeContextMenu()));
+    HSMENUTEST_FUNC_EXIT("HsBaseViewState::stateEntered");
 }
 
 /*!
@@ -121,13 +139,206 @@
 void HsBaseViewState::stateExited()
 {
     HSMENUTEST_FUNC_ENTRY("HsBaseViewState::stateExited");
-    cleanUpApplicationLaunchFailMessage();
+
+    mMenuView->hideSearchPanel();
+    mMenuView->disconnect(this);
+
+    mMenuView->inactivate();
+    if (!mApplicationLaunchFailMessage.isNull()) {
+        mApplicationLaunchFailMessage->close();
+    }
+    closeContextMenu();
     HSMENUTEST_FUNC_EXIT("HsBaseViewState::stateExited");
 }
 
 /*!
+ Add mode entered.
+ */
+void HsBaseViewState::addModeEntered()
+{
+    mViewOptions = mMenuView->view()->takeMenu();
+    connect(mMenuView.data(),
+            SIGNAL(activated(QModelIndex)),
+            SLOT(addActivated(QModelIndex)));
+    connect(mMenuView.data(),
+            SIGNAL(longPressed(HbAbstractViewItem *, QPointF)),
+            SLOT(addLongPressed(HbAbstractViewItem *, QPointF)));
+}
+
+/*!
+ Add mode exited.
+ */
+void HsBaseViewState::addModeExited()
+{
+    mMenuView->view()->setMenu(mViewOptions);
+}
+
+/*!
+ Slot invoked when normal mode entered.
+ */
+void HsBaseViewState::normalModeEntered()
+{
+    setMenuOptions();
+    connect(mMenuView.data(),
+            SIGNAL(activated(QModelIndex)),
+            mMenuView.data(),
+            SLOT(hideSearchPanel()));
+    connect(mMenuView.data(),
+            SIGNAL(longPressed(HbAbstractViewItem *, QPointF)),
+            SLOT(showContextMenu(HbAbstractViewItem *, QPointF)));
+}
+
+/*!
  Destructor.
  */
 HsBaseViewState::~HsBaseViewState()
 {
+    delete mModel;
+	mViewOptions = mMenuView->view()->takeMenu();
+	delete mViewOptions;
 }
+
+/*!
+ Slot connected to List widget in normal mode.
+ \param index Model index of the activated item.
+ */
+void HsBaseViewState::launchItem(const QModelIndex &index)
+{
+    HSMENUTEST_FUNC_ENTRY("HsBaseViewState::launchItem");
+
+    QSharedPointer<const CaEntry> entry = mModel->entry(index);
+    if (!entry.isNull() && !(entry->flags() & UninstallEntryFlag)) {
+        if (entry->entryTypeName() == widgetTypeName()) {
+            machine()->postEvent(HsMenuEventFactory::createPreviewHSWidgetEvent(entry->id(),
+                entry->entryTypeName(), entry->attribute(widgetUriAttributeName()),
+                entry->attribute(widgetLibraryAttributeName())));
+            HsMenuService::touch(entry->id());
+        }
+        else {
+            int errCode = HsMenuService::executeAction(entry->id());
+            if (errCode != 0) {
+                createApplicationLaunchFailMessage(errCode, entry->id());
+            }
+        }
+    }
+    HSMENUTEST_FUNC_EXIT("HsBaseViewState::launchItem");
+}
+
+/*!
+ Slot connected to List widget in normal mode.
+ \param index Model index of the activated item.
+ */
+void HsBaseViewState::openCollection(const QModelIndex &index)
+{
+    HSMENUTEST_FUNC_ENTRY("HsBaseViewState::openCollection");
+    QVariant data = mModel->data(index, CaItemModel::IdRole);
+    int id = data.toInt();
+    QString collectionType = mModel->data(
+            index, CaItemModel::TypeRole).toString();
+    qDebug("HsBaseViewState::openCollection - MCS ID: %d", data.toInt());
+
+    machine()->postEvent(
+            HsMenuEventFactory::createOpenCollectionFromAppLibraryEvent(
+                    id, collectionType));
+    HSMENUTEST_FUNC_EXIT("HsBaseViewState::openCollection");
+}
+
+/*!
+ Slot connected to List widget in normal mode.
+ \param index Model index of the activated item.
+ */
+void HsBaseViewState::showContextMenu(HbAbstractViewItem *item, const QPointF &coords)
+{
+    HSMENUTEST_FUNC_ENTRY("HsBaseViewState::showContextMenu");
+
+    EntryFlags flags = item->modelIndex().data(
+            CaItemModel::FlagsRole).value<EntryFlags> ();
+
+    if (!(flags & UninstallEntryFlag)) {
+        mContextMenu = new HbMenu;
+        setContextMenuOptions(item,flags);
+        mContextModelIndex = item->modelIndex();
+        mContextMenu->setPreferredPos(coords);
+        mContextMenu->setAttribute(Qt::WA_DeleteOnClose);
+        mContextMenu->open(this, SLOT(contextMenuAction(HbAction*)));
+    }
+    HSMENUTEST_FUNC_EXIT("HsBaseViewState::showContextMenu");
+
+}
+
+/*!
+ Open task switcher.
+ \retval true if operation is successful.
+ */
+bool HsBaseViewState::openTaskSwitcher()
+{
+    return HsMenuService::launchTaskSwitcher();
+}
+
+/*!
+ Menu softkey back action slot
+ */
+void HsBaseViewState::openAppLibrary()
+{
+    machine()->postEvent(HsMenuEventFactory::createOpenAppLibraryEvent());
+}
+
+/*!
+ Check software updates.
+ \retval 0 if operation is successful.
+ */
+int HsBaseViewState::checkSoftwareUpdates()
+{
+    int errCode = HsMenuService::launchSoftwareUpdate();
+    if (errCode != 0){
+        createApplicationLaunchFailMessage(errCode,0);
+    }
+    return errCode;
+}
+
+/*!
+ close context menu
+ */
+void HsBaseViewState::closeContextMenu()
+{
+    if (mContextMenu) {
+        mContextMenu->close();
+    }    
+}
+/*!
+ Scrolls view to first item at top
+ */
+void HsBaseViewState::scrollToBeginning()
+{
+    mMenuView->listView()->scrollTo(
+            mModel->index(0), HbAbstractItemView::PositionAtTop);
+}
+
+/*!
+ Normal mode exited dummy implementation.
+ */
+void HsBaseViewState::normalModeExited()
+{
+}
+
+/*!
+ Defines transitions
+ */
+void HsBaseViewState::defineTransitions()
+{
+    QState *initialState = new QState(this);
+    setInitialState(initialState);
+
+    QState *addModeState = new QState(this);
+    connect(addModeState, SIGNAL(entered()),SLOT(addModeEntered()));
+    connect(addModeState, SIGNAL(exited()),SLOT(addModeExited()));
+
+    QState *normalModeState = new QState(this);
+    connect(normalModeState, SIGNAL(entered()),SLOT(normalModeEntered()));
+    connect(normalModeState, SIGNAL(exited()),SLOT(normalModeExited()));
+
+    initialState->addTransition(new HsMenuModeTransition(
+            *mMenuMode, NormalHsMenuMode, normalModeState));
+    initialState->addTransition(new HsMenuModeTransition(
+            *mMenuMode, AddHsMenuMode, addModeState));
+}

--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hscollectionstate.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hscollectionstate.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -15,30 +15,28 @@
  *
  */
 
-#include <qstatemachine.h>
-
+#include <QStateMachine>
+#include <HbAction>
+#include <HbView>
 #include <HbGroupBox>
 #include <HbListView>
 #include <HbPushButton>
-#include <hbview.h>
-#include <hbaction.h>
-#include <hbabstractviewitem.h>
-#include <hsmenueventfactory.h>
-#include <hbmenu.h>
-#include <hbinstance.h>
-#include <hbsearchpanel.h>
+#include <HbAbstractViewItem>
+#include <HbMenu>
 
+#include <cadefs.h>
+#include <caentry.h>
+#include <caitemmodel.h>
+
+#include "hsapp_defs.h"
 #include "hsmenuevent.h"
+#include "hsmenueventfactory.h"
 #include "hsmenuservice.h"
 #include "hsmenumodewrapper.h"
 #include "hsmenuitemmodel.h"
-#include "hsmenuviewbuilder.h"
-#include "cadefs.h"
-#include "caentry.h"
 #include "hscollectionstate.h"
 #include "hsaddappstocollectionstate.h"
-#include "hsapp_defs.h"
-#include "hsmainwindow.h"
+#include "hsapplibstateutils.h"
 
 /*!
  \class HsCollectionState
@@ -55,11 +53,6 @@
  */
 
 /*!
- \var HsCollectionState::mCollectionsSortAttribute
- All collections sort order.
- */
-
-/*!
  \var HsCollectionState::mCollectionId
  The id of the current collection.
  */
@@ -69,35 +62,6 @@
  The type of the current collection.
  */
 
-/*!
- \var HsCollectionState::mMenuView
- The List View widget.
- */
-
-/*!
- \var HsCollectionState::mSecondarySoftkeyAction
- Secondary Softkey action.
- Backstepping functionality.
- Own.
- */
-
-/*!
- \var HsCollectionState::mOldNavigationAction
- Old navigation icon.
- Not own.
- */
-
-/*!
- \var HsCollectionState::mCollectionModel
- Item Model for the List.
- Own.
- */
-
-/*!
- \var HsCollectionState::mOptions
- Options menu.
- Own.
- */
 
 /*!
   \fn void HsCollectionState::sortOrderChanged(SHsSortAttribute sortOrder);
@@ -114,24 +78,19 @@
 /*!
  Constructor.
  \param menuViewBuilder Menu view builder.
- \param menuMode reference to object representing menu mode (add mode on/add mode off).
+ \param menuMode menu mode object (add mode on/add mode off).
+ \param mainWindow main window wrapper.
  \param parent Owner.
 */
 HsCollectionState::HsCollectionState(HsMenuViewBuilder &menuViewBuilder,
                                      HsMenuModeWrapper &menuMode,
                                      HsMainWindow &mainWindow,
                                      QState *parent) :
-    HsBaseViewState(parent),
+    HsBaseViewState(mainWindow, menuMode, parent),
     mSortAttribute(LatestOnTopHsSortAttribute),
-    mCollectionsSortAttribute(CustomHsSortAttribute),
-    mCollectionId(-1),
-    mMenuView(menuViewBuilder, HsCollectionContext),
-    mMenuMode(menuMode),
-    mSecondarySoftkeyAction(new HbAction(Hb::BackNaviAction, this)),
-    mCollectionModel(0),
-    mOptions(0), mContextModelIndex(), mContextMenu(0),
-    mMainWindow(mainWindow)
+    mCollectionId(-1)
 {
+    initialize(menuViewBuilder, HsCollectionContext);
     construct();
 }
 
@@ -146,13 +105,6 @@
         parent() != 0 ? parent()->objectName() : QString("");
     setObjectName(parentName + "/collectionstate");
 
-    connect(this, SIGNAL(entered()),SLOT(stateEntered()));
-    connect(this, SIGNAL(exited()),SLOT(stateExited()));
-    
-    mMenuView.collectionButton()->setCheckable(true);   
-    makeConnect();
-    mMenuView.view()->setNavigationAction(mSecondarySoftkeyAction);
-
     HSMENUTEST_FUNC_EXIT("HsCollectionState::construct");
 }
 
@@ -161,11 +113,8 @@
  */
 HsCollectionState::~HsCollectionState()
 {
-    makeDisconnect();
-    mMenuView.inactivate();
-    mMenuView.setModel(NULL);
-    mMenuView.view()->setNavigationAction(NULL);
-    delete mCollectionModel;
+    mMenuView->inactivate();
+    mMenuView->view()->setNavigationAction(NULL);
 }
 
 
@@ -192,101 +141,89 @@
 /*!
  Slot invoked when a state is entered.
  */
-
-
 void HsCollectionState::stateEntered()
 {
     HSMENUTEST_FUNC_ENTRY("HsCollectionState::stateEntered");
-
-    mMainWindow.setCurrentView(mMenuView);
-    mMenuView.activate();
-
-    if (!mCollectionModel) {
-        mCollectionModel =
+    if (!mModel) {
+        mModel =
             HsMenuService::getCollectionModel(
                 mCollectionId, mSortAttribute, mCollectionType);
     }
-    
-    EntryFlags flags =
-        mCollectionModel->root().data(CaItemModel::FlagsRole).value<
-        EntryFlags> ();
+
+    handleEmptyChange(mModel->rowCount() == 0);
 
-    if (mCollectionModel->rowCount() == 0){
-        if (flags & RemovableEntryFlag){
-            mMenuView.setContext(HsCollectionContext,HsButtonContext);
-        } else {
-            mMenuView.setContext(HsCollectionContext,HsEmptyLabelContext);
-        }
-        mMenuView.disableSearch(true);
-    } else {
-        mMenuView.setContext(HsCollectionContext,HsItemViewContext);
-        mMenuView.disableSearch(false);
-    }
+    makeConnect();
+    
+    mMenuView->viewLabel()->setHeading(
+        mModel->root().data(CaItemModel::CollectionTitleRole).toString());
+
+    HsBaseViewState::stateEntered();
+    HSMENUTEST_FUNC_EXIT("HsCollectionState::stateEntered");
+}
 
-    connect(mCollectionModel, SIGNAL(modelReset()), SLOT(updateLabel()));
-    connect(mCollectionModel, SIGNAL(empty(bool)),this,
-            SLOT(handleEmptyChange(bool)));
-    connect(mCollectionModel, SIGNAL(empty(bool)),this,
-            SLOT(lockSearchButton(bool)));
-
-    mMenuView.setModel(mCollectionModel);
+/*!
+ Creates and installs menu options for the view
+ */
+void HsCollectionState::setMenuOptions()
+{
+    HSMENUTEST_FUNC_ENTRY("HsAllCollectionsState::setMenuOptions");
 
-    mMenuView.listView()->scrollTo(
-        mCollectionModel->index(0), HbAbstractItemView::PositionAtTop);
+    EntryFlags flags =
+        mModel->root().data(CaItemModel::FlagsRole).value<EntryFlags> ();
 
-    mMenuView.viewLabel()->setHeading(
-        mCollectionModel->root().data(Qt::DisplayRole).toString());
+    mViewOptions->clearActions();
 
-    if (!mOptions) {
-        mOptions = new HbMenu();
-        mOptions->addAction(hbTrId("txt_applib_opt_task_switcher"),
-                            this,
+    mViewOptions->addAction(hbTrId("txt_applib_opt_task_switcher"),
+                            static_cast<HsBaseViewState*>(this),
                             SLOT(openTaskSwitcher()));
 
-        if (flags & RemovableEntryFlag) {
-            mOptions->addAction(hbTrId("txt_applib_opt_add_content"), this,
-                                SLOT(addAppsAction()));
-        }
-
-        mOptions->addAction(hbTrId("txt_applib_opt_add_to_home_screen"),
-                            this, SLOT(addCollectionShortcutToHomeScreenAction()));
+    if (flags & RemovableEntryFlag) {
+        mViewOptions->addAction(hbTrId("txt_applib_opt_add_content"), this,
+                            SLOT(addAppsAction()));
+    }
 
-        if (flags & RemovableEntryFlag) {
-            mOptions->addAction(
-                hbTrId("txt_common_opt_rename_item"),
+    mViewOptions->addAction(hbTrId("txt_applib_opt_add_to_home_screen"),
+                        this, SLOT(addCollectionShortcutToHomeScreenAction()));
+
+    if (flags & RemovableEntryFlag) {
+        if (mModel->rowCount() > 0) {
+            mViewOptions->addAction(
+                hbTrId("txt_applib_opt_arrange"),
                 this,
-                SLOT(renameAction()));
-            mOptions->addAction(
-                hbTrId("txt_common_opt_delete"),
-                this,
-                SLOT(deleteAction()));
+                SLOT(createArrangeCollection()));
         }
-        if (mCollectionType == collectionDownloadedTypeName()) {
-            HbMenu *sortMenu = mOptions->addMenu(
-                                   hbTrId("txt_applib_opt_sort_by"));
-            //Grouped options are exclusive by default.
-            QActionGroup *sortGroup = new QActionGroup(mOptions);
-            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;
-            sortGroup->actions().at(defaultSortingPosition)->setChecked(true);
+        mViewOptions->addAction(
+            hbTrId("txt_common_opt_rename_item"),
+            this,
+            SLOT(renameAction()));
+        mViewOptions->addAction(
+            hbTrId("txt_common_opt_delete"),
+            this,
+            SLOT(deleteAction()));
+    }
+    if (mCollectionType == collectionDownloadedTypeName()) {
+        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);
         }
-
-        mOptions->setParent(this);
-        mMenuView.view()->setMenu(mOptions);
+        static const int defaultSortingPosition = 0;
+        sortGroup->actions().at(defaultSortingPosition)->setChecked(true);
     }
-    HSMENUTEST_FUNC_EXIT("HsCollectionState::stateEntered");
+    mMenuView->view()->setMenu(mViewOptions);
+    HSMENUTEST_FUNC_EXIT("HsAllCollectionsState::setMenuOptions");
 }
 
 /*!
@@ -295,29 +232,15 @@
 void HsCollectionState::stateExited()
 {
     HSMENUTEST_FUNC_ENTRY("HsCollectionState::stateExited");
-
-    mMenuView.inactivate();
-    mMenuView.setSearchPanelVisible(false);
-    mMenuView.disableSearch(false);
-    disconnect(mCollectionModel, SIGNAL(empty(bool)),this,
-               SLOT(handleEmptyChange(bool)));
-
-    disconnect(mCollectionModel, SIGNAL(empty(bool)),this,
-               SLOT(lockSearchButton(bool)));
+    mMenuView->disableSearch(false);
+    makeDisconnect();
 
-    disconnect(mCollectionModel, SIGNAL(modelReset()),
-                   this, SLOT(updateLabel()));
-    delete mCollectionModel;
-    mCollectionModel = NULL;
-    mOptions->close();
-    delete mOptions;
-    mOptions = NULL;
-    if (mContextMenu)
-        mContextMenu->close();
+    delete mModel;
+    mModel = NULL;
     this->mSortAttribute = NoHsSortAttribute;
-    
+
     HsBaseViewState::stateExited();
-    
+
     HSMENUTEST_FUNC_EXIT("HsCollectionState::stateExited");
     qDebug("CollectionState::stateExited()");
 }
@@ -327,16 +250,25 @@
  */
 void HsCollectionState::makeConnect()
 {
-    connect(mSecondarySoftkeyAction, SIGNAL(triggered()),
-            SLOT(backSteppingAction()));
-    connect(&mMenuView,
+    connect(mBackKeyAction, SIGNAL(triggered()),
+            static_cast<HsBaseViewState*>(this), SLOT(openAppLibrary()));
+    connect(mMenuView.data(),
+            SIGNAL(activated(QModelIndex)),
+            static_cast<HsBaseViewState*>(this),
+            SLOT(launchItem(QModelIndex)));
+    connect(mMenuView.data(),
             SIGNAL(activated(QModelIndex)),
-            SLOT(listItemActivated(QModelIndex)));
-    connect(&mMenuView,
+            mMenuView.data(),
+            SLOT(hideSearchPanel()));
+    connect(mMenuView.data(),
             SIGNAL(longPressed(HbAbstractViewItem *, QPointF)),
-            SLOT(listItemLongPressed(HbAbstractViewItem *, QPointF)));
-    connect(mMenuView.collectionButton(),
-            SIGNAL(toggled(bool)), this, SLOT(addAppsAction(bool)));
+            static_cast<HsBaseViewState*>(this),
+            SLOT(showContextMenu(HbAbstractViewItem *, QPointF)));
+    connect(mModel, SIGNAL(modelReset()), SLOT(updateLabel()));
+    connect(mModel, SIGNAL(empty(bool)),this,
+            SLOT(handleEmptyChange(bool)));
+    connect(mModel, SIGNAL(empty(bool)),this,
+            SLOT(lockSearchButton(bool)));
 }
 
 /*!
@@ -344,130 +276,29 @@
  */
 void HsCollectionState::makeDisconnect()
 {
-    disconnect(mMenuView.collectionButton(),
-            SIGNAL(toggled(bool)), this, SLOT(addAppsAction(bool)));
-
-    disconnect(mSecondarySoftkeyAction, SIGNAL(triggered()),
-               this, SLOT(backSteppingAction()));
-
-    disconnect(&mMenuView,
-               SIGNAL(activated(QModelIndex)),
-               this, SLOT(listItemActivated(QModelIndex)));
-
-    disconnect(&mMenuView,
-               SIGNAL(longPressed(HbAbstractViewItem *, QPointF)),
-               this, SLOT(listItemLongPressed(HbAbstractViewItem *, QPointF)));
-}
-
-/*!
- Open task switcher.
- \retval true if operation is successful.
- */
-bool HsCollectionState::openTaskSwitcher()
-{
-    return HsMenuService::launchTaskSwitcher();
-}
-
-/*!
- Slot connected to List widget.
- \param index Model index of the activated item.
- */
-void HsCollectionState::listItemActivated(const QModelIndex &index)
-{
-    HSMENUTEST_FUNC_ENTRY("HsCollectionState::listItemActivated");
-
-    QSharedPointer<const CaEntry> entry = mCollectionModel->entry(index);
-
-    if (entry->entryTypeName() == widgetTypeName()) {
-        EntryFlags flags = index.data(CaItemModel::FlagsRole).value<
-                               EntryFlags> ();
-        if (!(flags & UninstallEntryFlag)) {
-            machine()->postEvent(
-                HsMenuEventFactory::createPreviewHSWidgetEvent(
-                    entry->id(), entry->entryTypeName(), entry->attribute(
-                        widgetUriAttributeName()), entry->attribute(
-                        widgetLibraryAttributeName())));
-
-            const int itemId = index.data(CaItemModel::IdRole).toInt();
-            HsMenuService::touch(itemId);
-        }
-    } else {
-        QVariant data = mCollectionModel->data(index, CaItemModel::IdRole);
-        int errCode = HsMenuService::executeAction(data.toInt());
-        if (errCode != 0) {
-            createApplicationLaunchFailMessage(errCode,index.data(CaItemModel::IdRole).toInt());
-        }
-    }
-
-    mMenuView.setSearchPanelVisible(false);
-    HSMENUTEST_FUNC_EXIT("HsCollectionState::listItemActivated");
-}
+    disconnect(mBackKeyAction, SIGNAL(triggered()),
+               static_cast<HsBaseViewState*>(this), SLOT(openAppLibrary()));
 
-/*!
- Handles long-item-pressed event in all apps view by showing context menu
- \param item the event pertains to
- \param coords press point coordinates.
- \retval void
- */
-void HsCollectionState::listItemLongPressed(HbAbstractViewItem *item,
-        const QPointF &coords)
-{
-    HSMENUTEST_FUNC_ENTRY("HsCollectionState::listItemLongPressed");
-
-    EntryFlags flags = item->modelIndex().data(CaItemModel::FlagsRole).value<
-                       EntryFlags> ();
-
-    if (!(flags & UninstallEntryFlag)) {
-        // create context menu
-        mContextMenu = new HbMenu();
+    disconnect(mMenuView.data(),
+               SIGNAL(activated(QModelIndex)),
+               static_cast<HsBaseViewState*>(this),
+               SLOT(launchItem(QModelIndex)));
+    disconnect(mMenuView.data(),
+            SIGNAL(activated(QModelIndex)),
+            mMenuView.data(),
+            SLOT(hideSearchPanel()));
+    disconnect(mMenuView.data(),
+               SIGNAL(longPressed(HbAbstractViewItem *, QPointF)),
+               static_cast<HsBaseViewState*>(this),
+               SLOT(showContextMenu(HbAbstractViewItem *, QPointF)));
+    disconnect(mModel, SIGNAL(empty(bool)),this,
+               SLOT(handleEmptyChange(bool)));
 
-        HbAction *addShortcutAction = mContextMenu->addAction(hbTrId(
-                                          "txt_applib_menu_add_to_home_screen"));
-        addShortcutAction->setData(AddToHomeScreenContextAction);
-        HbAction *addToCollection = mContextMenu->addAction(hbTrId(
-                                        "txt_applib_menu_add_to_collection"));
-        addToCollection->setData(AddToCollectionContextAction);
-        HbAction *removeAction(NULL);
-        HbAction *uninstallAction(NULL);
-        HbAction *appSettingsAction(NULL);
-        HbAction *appDetailsAction(NULL);
-        // we do not add remove option in locked collection
-        // check conditions and hide irrelevant menu items
-        EntryFlags rootFlags =
-            mCollectionModel->root().data(CaItemModel::FlagsRole).value<
-            EntryFlags> ();
-
-        if (rootFlags & RemovableEntryFlag) {
-            removeAction = mContextMenu->addAction(
-                               hbTrId("txt_applib_menu_remove_from_collection"));
-            removeAction->setData(RemoveFromCollectionContextAction);
-        }
+    disconnect(mModel, SIGNAL(empty(bool)),this,
+               SLOT(lockSearchButton(bool)));
 
-        if ((flags & RemovableEntryFlag)) {
-            uninstallAction = mContextMenu->addAction(hbTrId("txt_common_menu_delete"));
-            uninstallAction->setData(UninstallContextAction);
-        }
-        QSharedPointer<const CaEntry> entry = mCollectionModel->entry(item->modelIndex());
-
-        if (!(entry->attribute(appSettingsPlugin()).isEmpty())) {
-            appSettingsAction = mContextMenu->addAction(hbTrId(
-                                                    "txt_common_menu_settings"));
-            appSettingsAction->setData(AppSettingContextAction);
-        }
-    
-        if (!(entry->attribute(componentIdAttributeName()).isEmpty()) &&
-                (flags & RemovableEntryFlag) ) {
-            appDetailsAction = mContextMenu->addAction(hbTrId(
-                                                    "txt_common_menu_details"));
-            appDetailsAction->setData(AppDetailsContextAction);
-        }
-        mContextModelIndex = item->modelIndex();
-        mContextMenu->setPreferredPos(coords);
-        mContextMenu->setAttribute(Qt::WA_DeleteOnClose);
-        mContextMenu->open(this, SLOT(contextMenuAction(HbAction*)));
-    }
-
-    HSMENUTEST_FUNC_EXIT("HsCollectionState::listItemLongPressed");
+    disconnect(mModel, SIGNAL(modelReset()),
+                   this, SLOT(updateLabel()));
 }
 
 /*!
@@ -475,7 +306,7 @@
  */
 void HsCollectionState::contextMenuAction(HbAction *action)
 {
-    HsContextAction command = 
+    HsContextAction command =
         static_cast<HsContextAction>(action->data().toInt());
 
     const int itemId = mContextModelIndex.data(CaItemModel::IdRole).toInt();
@@ -486,8 +317,8 @@
             break;
         case AddToCollectionContextAction:
             machine()->postEvent(
-                HsMenuEventFactory::createAddAppsFromCallectionViewEvent(
-                    mCollectionId, itemId, mCollectionsSortAttribute));
+                HsMenuEventFactory::createAddAppsFromCollectionViewEvent(
+                    mCollectionId, itemId));
             break;
         case UninstallContextAction:
             machine()->postEvent(
@@ -499,66 +330,88 @@
                 HsMenuEventFactory::createRemoveAppFromCollectionEvent(
                     itemId, mCollectionId));
             break;
-        case AppSettingContextAction: 
+        case AppSettingContextAction:
             machine()->postEvent(
                 HsMenuEventFactory::createAppSettingsViewEvent(itemId));
             break;
-        case AppDetailsContextAction: 
+        case AppDetailsContextAction:
             machine()->postEvent(
                 HsMenuEventFactory::createAppDetailsViewEvent(itemId));
-            break;                 
+            break;
+        case OpenContextAction:
+            launchItem(mContextModelIndex);
+            break;
         default:
             break;
     }
-                                    
-    mMenuView.setSearchPanelVisible(false);
+
+    mMenuView->hideSearchPanel();
 }
 
 /*!
- Handles button visibility
-  \param empty if true set empty text label or button to add entries to collection
+ Handler to be called when model becomes not empty or model becomes empty.
+  \param empty \a true when model becomes empty \a false otherwise.
  */
 void HsCollectionState::handleEmptyChange(bool empty)
 {
+
     EntryFlags flags =
-        mCollectionModel->root().data(CaItemModel::FlagsRole).value<
+        mModel->root().data(CaItemModel::FlagsRole).value<
         EntryFlags> ();
 
     if (empty){
         if (flags & RemovableEntryFlag){
-            mMenuView.setContext(HsCollectionContext,HsButtonContext);
+            mMenuView->reset(HsButtonContext);
+            connect(mMenuView->contentButton(),
+                    SIGNAL(toggled(bool)), this, SLOT(addAppsAction(bool)),
+                    Qt::UniqueConnection);
         } else {
-            mMenuView.setContext(HsCollectionContext,HsEmptyLabelContext);
+            mMenuView->reset(HsEmptyLabelContext);
         }
+
     } else {
-        mMenuView.setContext(HsCollectionContext,HsItemViewContext);
+        mMenuView->reset(HsItemViewContext);
+        mMenuView->setModel(mModel);
+        mMenuView->listView()->scrollTo(
+            mModel->index(0), HbAbstractItemView::PositionAtTop);
     }
+	
+    mMenuView->disableSearch(empty);
+    
+    mMenuView->activate();
+
+    setMenuOptions();
 }
 
 
 /*!
- Handles lock serch button
-  \param lock if true lock search button
+ Handles lock search button
+  \param lock if true lock search button.
  */
 void HsCollectionState::lockSearchButton(bool lock)
 {
-    mMenuView.disableSearch(lock);
+    mMenuView->disableSearch(lock);
 }
 
 
 /*!
  Menu add applications action slot
-   \param addApps if true create event for add enties to collection. Parametr use by toggled from HbPushButton
+   \param addApps if true create event for add enties to collection.
+   Parametr use by toggled from HbPushButton
  */
 void HsCollectionState::addAppsAction(bool addApps)
 {
     // Add applications
     if (addApps) {
-        mMenuView.collectionButton()->setChecked(false);
+
+        if (mMenuView->contentButton()) {
+            mMenuView->contentButton()->setChecked(false);
+        }
+
         machine()->postEvent(
-            HsMenuEventFactory::createAddAppsFromCallectionViewEvent(
+            HsMenuEventFactory::createAddAppsFromCollectionViewEvent(
                 mCollectionId));
-    }    
+    }
 }
 
 /*!
@@ -567,8 +420,8 @@
 void HsCollectionState::addCollectionShortcutToHomeScreenAction()
 {
     machine()->postEvent(HsMenuEventFactory::createAddToHomeScreenEvent(
-                             mCollectionId, mMenuMode.getHsMenuMode(), 
-                             mMenuMode.getHsToken()));
+                             mCollectionId, mMenuMode->getHsMenuMode(),
+                             mMenuMode->getHsToken()));
 }
 
 /*!
@@ -590,40 +443,85 @@
 }
 
 /*!
- Menu softkey back action slot
- */
-void HsCollectionState::backSteppingAction()
-{
-    machine()->postEvent(HsMenuEventFactory::createOpenAppLibraryEvent());
-}
-
-/*!
  Updates label
  */
 void HsCollectionState::updateLabel()
 {
     HSMENUTEST_FUNC_ENTRY("HsCollectionState::updateLabel");
-    if (mCollectionModel) {
-        mMenuView.viewLabel()->setHeading(
-            mCollectionModel->root().data(Qt::DisplayRole).toString());
+    if (mModel) {
+        mMenuView->viewLabel()->setHeading(
+            mModel->root().data(Qt::DisplayRole).toString());
     }
     HSMENUTEST_FUNC_EXIT("HsCollectionState::updateLabel");
 }
 
 /*!
   Triggers event so that a state adding to Home Screen is reached
-  \param index of an item to be added to homescreen
+  \param index of an item to be added to homescreen.
   \retval void
  */
 void HsCollectionState::addElementToHomeScreen(const QModelIndex &index)
 {
-    QSharedPointer<const CaEntry> entry = mCollectionModel->entry(index);
+    QSharedPointer<const CaEntry> entry = mModel->entry(index);
 
     QMap<QString, QString> attributes = entry->attributes();
 
     machine()->postEvent(
         HsMenuEventFactory::createAddToHomeScreenEvent(
-            entry->id(), mMenuMode.getHsMenuMode(), mMenuMode.getHsToken()));
+            entry->id(), mMenuMode->getHsMenuMode(), mMenuMode->getHsToken()));
+}
+
+/*!
+ Method setting context menu options.
+ */
+void HsCollectionState::setContextMenuOptions(HbAbstractViewItem *item, EntryFlags flags)
+{
+    HbAction *openAction = mContextMenu->addAction(hbTrId(
+        "txt_common_menu_open"));
+    openAction->setData(OpenContextAction);
+    HbAction *addToHomeScreenAction = mContextMenu->addAction(hbTrId(
+        "txt_applib_menu_add_to_home_screen"));
+    addToHomeScreenAction->setData(AddToHomeScreenContextAction);
+    HbAction *addToCollection = mContextMenu->addAction(hbTrId(
+        "txt_applib_menu_add_to_collection"));
+    addToCollection->setData(AddToCollectionContextAction);
+    HbAction *removeAction(NULL);
+    HbAction *uninstallAction(NULL);
+    HbAction *appSettingsAction(NULL);
+    HbAction *appDetailsAction(NULL);
+    // we do not add remove option in locked collection
+    // check conditions and hide irrelevant menu items
+    EntryFlags rootFlags =
+        mModel->root().data(CaItemModel::FlagsRole).value<
+        EntryFlags> ();
+
+    if (rootFlags & RemovableEntryFlag) {
+        removeAction = mContextMenu->addAction(
+                           hbTrId("txt_applib_menu_remove_from_collection"));
+        removeAction->setData(RemoveFromCollectionContextAction);
+    }
+
+    if ((flags & RemovableEntryFlag)) {
+        uninstallAction = mContextMenu->addAction(hbTrId("txt_common_menu_delete"));
+        uninstallAction->setData(UninstallContextAction);
+    }
+    QSharedPointer<const CaEntry> entry = mModel->entry(item->modelIndex());
+
+    if (!(entry->attribute(appSettingsPlugin()).isEmpty())) {
+        appSettingsAction = mContextMenu->addAction(hbTrId(
+                                                "txt_common_menu_settings"));
+        appSettingsAction->setData(AppSettingContextAction);
+    }
+
+    if (!(entry->attribute(componentIdAttributeName()).isEmpty()) &&
+            (flags & RemovableEntryFlag) ) {
+        appDetailsAction = mContextMenu->addAction(hbTrId(
+                                                "txt_common_menu_details"));
+        appDetailsAction->setData(AppDetailsContextAction);
+    }
+    
+    addToHomeScreenAction->setVisible(
+        !HsAppLibStateUtils::isCWRTWidgetOnHomeScreen(entry.data()));
 }
 
 /*!
@@ -633,7 +531,7 @@
 void HsCollectionState::latestOnTopMenuAction()
 {
     mSortAttribute = LatestOnTopHsSortAttribute;
-    mCollectionModel->setSort(mSortAttribute);
+    mModel->setSort(mSortAttribute);
     emit sortOrderChanged(mSortAttribute);
 }
 
@@ -644,16 +542,31 @@
 void HsCollectionState::oldestOnTopMenuAction()
 {
     mSortAttribute = OldestOnTopHsSortAttribute;
-    mCollectionModel->setSort(mSortAttribute);
+    mModel->setSort(mSortAttribute);
     emit sortOrderChanged(mSortAttribute);
 }
 
 /*!
-  Slot for setting all collections sort order
-  \param sortOrder all collections sort order
+  A Slot called when an arrange operation
+  is invoked for a static collection.
  */
-void HsCollectionState::collectionsSortOrder(
-    HsSortAttribute sortOrder)
+void HsCollectionState::createArrangeCollection()
 {
-    mCollectionsSortAttribute = sortOrder;
+    // Arrange collection via the Arrange view
+    int topItemId(0);
+
+    if (mMenuView->listView() != NULL) {
+        const QList<HbAbstractViewItem *> array =
+            mMenuView->listView()->visibleItems();
+
+        if (array.count() >= 1) {
+            QModelIndex idx = array[0]->modelIndex();
+            topItemId = idx.data(CaItemModel::IdRole).toInt();
+        }
+    }
+
+    machine()->postEvent(
+        HsMenuEventFactory::createArrangeCollectionEvent(
+            topItemId,
+            mCollectionId));
 }

--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsinstalledappsstate.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsinstalledappsstate.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -15,26 +15,23 @@
  *
  */
 
-#include <qstatemachine.h>
+#include <QStateMachine>
+#include <HbView>
 #include <HbGroupBox>
-#include <hbview.h>
-#include <hblistview.h>
-#include <hbaction.h>
-#include <hbmenu.h>
-#include <hbabstractviewitem.h>
-#include <hsmenueventfactory.h>
-#include <hbinstance.h>
+#include <HbListView>
+#include <HbAction>
+#include <HbMenu>
+#include <HbAbstractViewItem>
+
+#include <cadefs.h>
 #include <caentry.h>
-#include <hbsearchpanel.h>
 
+#include "hsapp_defs.h"
+#include "hsmenueventfactory.h"
 #include "hsmenuitemmodel.h"
-#include "hsmenuviewbuilder.h"
-#include "cadefs.h"
 #include "hsinstalledappsstate.h"
 #include "hsaddappstocollectionstate.h"
-#include "hsapp_defs.h"
 #include "hsmenumodetransition.h"
-#include "hsmainwindow.h"
 
 /*!
  \class HsInstalledAppsState
@@ -46,45 +43,17 @@
  */
 
 /*!
- \var HsInstalledAppsState::mMenuView
- The View widget.
- Own.
- */
-
-/*!
- \var HsInstalledAppsState::mInstalledAppsModel
- Item Model for the List.
- Own.
- */
-
-/*!
- \var HsInstalledAppsState::mSecondarySoftkeyAction
- Secondary Softkey action.
- Backstepping functionality.
- Own.
- */
-
-/*!
- \var HsInstalledAppsState::mOldNavigationAction
- Old navigation icon.
- Not own.
- */
-
-/*!
  Constructor.
  \param menuViewBuilder Menu view builder.
+ \param mainWindow main window wrapper.
  \param parent Owner.
  */
 HsInstalledAppsState::HsInstalledAppsState(HsMenuViewBuilder &menuViewBuilder,
         HsMainWindow &mainWindow,
         QState *parent):
-    HsBaseViewState(parent),
-    mMenuView(menuViewBuilder, HsInstalledAppsContext),
-    mInstalledAppsModel(0),
-    mSecondarySoftkeyAction(new HbAction(Hb::BackNaviAction, this)),
-    mMainWindow(mainWindow),
-    mContextModelIndex(),mContextMenu(0)
+    HsBaseViewState(mainWindow, parent)
 {
+    initialize(menuViewBuilder, HsInstalledAppsContext);
     construct();
 }
 
@@ -98,16 +67,8 @@
     const QString parentName =
         parent() != 0 ? parent()->objectName() : QString("");
     setObjectName(parentName + "/installedappsstate");
-    connect(this, SIGNAL(entered()),SLOT(stateEntered()));
-    connect(this, SIGNAL(exited()),SLOT(stateExited()));
 
-    connect(mSecondarySoftkeyAction, SIGNAL(triggered()),
-            SLOT(backAction()));
-    mMenuView.view()->
-    setNavigationAction(mSecondarySoftkeyAction);
-
-
-    setMenuOptions();
+    connect(mBackKeyAction, SIGNAL(triggered()), SLOT(openAppLibrary()));
 
     HSMENUTEST_FUNC_EXIT("HsInstalledAppsState::construct");
 }
@@ -118,26 +79,48 @@
 void HsInstalledAppsState::setMenuOptions()
 {
     HSMENUTEST_FUNC_ENTRY("HsInstalledAppsState::setMenuOptions");
-    HbMenu *const mOptions = new HbMenu();
-    mOptions->setParent(this);
+
+    mViewOptions->clearActions();
 
-    mOptions->addAction(hbTrId("txt_applib_opt_task_switcher"),
+    mViewOptions->addAction(hbTrId("txt_applib_opt_task_switcher"),
                         this, SLOT(openTaskSwitcher()));
+    mViewOptions->addAction(hbTrId("txt_applib_opt_installation_log"),
+                        this, SLOT(openInstallationLog()));
 
-    mMenuView.view()->setMenu(mOptions);
+    mMenuView->view()->setMenu(mViewOptions);
     HSMENUTEST_FUNC_EXIT("HsInstalledAppsState::setMenuOptions");
 }
 
 /*!
+ Method seting context menu options.
+ \param item the context menu is built for.
+ \param flags of the \item.
+ */
+void HsInstalledAppsState::setContextMenuOptions(HbAbstractViewItem *item, EntryFlags flags)
+{
+    HbAction *uninstallAction = mContextMenu->addAction(
+                                hbTrId("txt_common_menu_delete"));
+    HbAction *appDetailsAction(NULL);
+    uninstallAction->setData(UninstallContextAction);
+
+    QSharedPointer<const CaEntry> entry = mModel->entry(item->modelIndex());
+
+    if (!(entry->attribute(componentIdAttributeName()).isEmpty()) &&
+            (flags & RemovableEntryFlag) ) {
+        appDetailsAction = mContextMenu->addAction(hbTrId(
+                                                "txt_common_menu_details"));
+        appDetailsAction->setData(AppDetailsContextAction);
+    }
+}
+
+
+/*!
  Destructor.
  */
 HsInstalledAppsState::~HsInstalledAppsState()
 {
-    mMenuView.inactivate();
-    mMenuView.setModel(NULL);
-    mMenuView.view()->setNavigationAction(NULL);
-
-    delete mInstalledAppsModel;
+    mMenuView->inactivate();
+    mMenuView->view()->setNavigationAction(NULL);
 }
 
 /*!
@@ -149,32 +132,35 @@
     qDebug("AllAppsState::stateEntered()");
     HSMENUTEST_FUNC_ENTRY("HsInstalledAppsState::stateEntered");
 
-    mMainWindow.setCurrentView(mMenuView);
-    mMenuView.activate();
+    mMenuView->viewLabel()->setHeading(
+            hbTrId("txt_applib_subtitle_installed"));
 
-    if (!mInstalledAppsModel) {
-        mInstalledAppsModel
-        = HsMenuService::getInstalledModel(AscendingNameHsSortAttribute);
-        mMenuView.setModel(mInstalledAppsModel);
+    if (!mModel) {
+        mModel
+            = HsMenuService::getInstalledModel(AscendingNameHsSortAttribute);
     }
 
-    if (mInstalledAppsModel->rowCount() == 0){
-        mMenuView.setContext(HsInstalledAppsContext,HsEmptyLabelContext);
-        }
-
-    mMenuView.listView()->scrollTo(
-        mInstalledAppsModel->index(0));
+    if (mModel->rowCount() == 0) {
+        mMenuView->reset(HsEmptyLabelContext);
+    }
+    else {
+		mMenuView->reset(HsItemViewContext);
+        mMenuView->setModel(mModel);
+        mMenuView->listView()->scrollTo(
+            mModel->index(0));
+    }
+    
+    setMenuOptions();
 
-    connect(&mMenuView,
-            SIGNAL(activated(QModelIndex)),
-            SLOT(listItemActivated(QModelIndex)));
-    connect(&mMenuView,
+    connect(mMenuView.data(),
             SIGNAL(longPressed(HbAbstractViewItem *, QPointF)),
-            SLOT(listItemLongPressed(HbAbstractViewItem *, QPointF)));
+            SLOT(showContextMenu(HbAbstractViewItem *, QPointF)));
 
-    connect(mInstalledAppsModel, SIGNAL(empty(bool)),this,
+    connect(mModel, SIGNAL(empty(bool)),this,
             SLOT(setEmptyLabelVisibility(bool)));
 
+    HsBaseViewState::stateEntered();
+
     HSMENUTEST_FUNC_EXIT("HsInstalledAppsState::stateEntered");
 }
 
@@ -185,147 +171,66 @@
 {
     HSMENUTEST_FUNC_ENTRY("HsInstalledAppsState::stateExited");
 
-    disconnect(mInstalledAppsModel, SIGNAL(empty(bool)),this,
+    disconnect(mModel, SIGNAL(empty(bool)),this,
                SLOT(setEmptyLabelVisibility(bool)));
 
-    mMenuView.setSearchPanelVisible(false);
-
-    disconnect(&mMenuView,
-            SIGNAL(activated(QModelIndex)), this,
-            SLOT(listItemActivated(QModelIndex)));
-    disconnect(&mMenuView,
+    disconnect(mMenuView.data(),
             SIGNAL(longPressed(HbAbstractViewItem *, QPointF)), this,
-            SLOT(listItemLongPressed(HbAbstractViewItem *, QPointF)));
-
-    mMenuView.inactivate();
+            SLOT(showContextMenu(HbAbstractViewItem *, QPointF)));
 
-    if (mContextMenu)
-        mContextMenu->close();
-    
     HsBaseViewState::stateExited();
-    
+
     HSMENUTEST_FUNC_EXIT("HsInstalledAppsState::stateExited");
     qDebug("AllAppsState::stateExited()");
 }
 
 /*!
- Handles button visibility
+ Handles button visibility.
+ \param visibility indicates whether show or not to show 'empty' label.
  */
 void HsInstalledAppsState::setEmptyLabelVisibility(bool visibility)
 {
     if(visibility){
-        mMenuView.setContext(HsInstalledAppsContext,HsEmptyLabelContext);
+        mMenuView->reset(HsEmptyLabelContext);
     } else {
-        mMenuView.setContext(HsInstalledAppsContext,HsItemViewContext);
+        mMenuView->reset(HsItemViewContext);
+        mMenuView->setModel(mModel);
     }
-}
-
-/*!
- Open task switcher.
- \retval true if operation is successful.
- */
-bool HsInstalledAppsState::openTaskSwitcher()
-{
-    return HsMenuService::launchTaskSwitcher();
+    mMenuView->activate();
 }
 
 /*!
- Method invoked when a list item is activated.
- \param index indec of activated item.
+ Open installation log.
  */
-#ifdef COVERAGE_MEASUREMENT
-#pragma CTC SKIP
-#endif //COVERAGE_MEASUREMENT
-void HsInstalledAppsState::listItemActivated(const QModelIndex &/*index*/)
+void HsInstalledAppsState::openInstallationLog()
 {
-    //no implementation yet
+    machine()->postEvent(
+        HsMenuEventFactory::createInstallationLogEvent());
 }
-#ifdef COVERAGE_MEASUREMENT
-#pragma CTC ENDSKIP
-#endif //COVERAGE_MEASUREMENT
 
 /*!
- Handles long-item-pressed event in all apps view by showing context menu
- \param item the event pertains to
- \param coords press point coordinates.
- */
-#ifdef COVERAGE_MEASUREMENT
-#pragma CTC SKIP
-#endif //COVERAGE_MEASUREMENT
-void HsInstalledAppsState::listItemLongPressed(HbAbstractViewItem *item,
-        const QPointF &coords)
-{
-    HSMENUTEST_FUNC_ENTRY("HsInstalledAppsState::listItemLongPressed");
-
-    EntryFlags flags = item->modelIndex().data(
-                           CaItemModel::FlagsRole).value<EntryFlags> ();
-    if (!(flags & UninstallEntryFlag)) {
-        // create context menu
-        mContextMenu = new HbMenu();
-
-        HbAction *uninstallAction = mContextMenu->addAction(
-                                    hbTrId("txt_common_menu_delete"));
-        HbAction *appDetailsAction(NULL);
-        uninstallAction->setData(UninstallContextAction);
-    
-        QSharedPointer<const CaEntry> entry = mInstalledAppsModel->entry(item->modelIndex());
-    
-        if (!(entry->attribute(componentIdAttributeName()).isEmpty()) &&
-                (flags & RemovableEntryFlag) ) {
-            appDetailsAction = mContextMenu->addAction(hbTrId(
-                                                    "txt_common_menu_details"));
-            appDetailsAction->setData(AppDetailsContextAction);
-        }
-
-        mContextModelIndex = item->modelIndex();
-        mContextMenu->setPreferredPos(coords);
-        mContextMenu->setAttribute(Qt::WA_DeleteOnClose);
-        mContextMenu->open(this, SLOT(contextMenuAction(HbAction*)));
-    }
-    
-    
-    HSMENUTEST_FUNC_EXIT("HsInstalledAppsState::listItemLongPressed");
-}
-#ifdef COVERAGE_MEASUREMENT
-#pragma CTC ENDSKIP
-#endif //COVERAGE_MEASUREMENT
-
-/*!
- Handles context menu actions
+ Handles context menu actions.
+ \param action to handle.
  */
 void HsInstalledAppsState::contextMenuAction(HbAction *action)
-{    
-    HsContextAction command = 
+{
+    HsContextAction command =
             static_cast<HsContextAction>(action->data().toInt());
-    
+
     const int itemId = mContextModelIndex.data(CaItemModel::IdRole).toInt();
-    
+
     switch (command) {
         case UninstallContextAction:
             machine()->postEvent(
                 HsMenuEventFactory::createUninstallApplicationEvent(
                     itemId));
             break;
-        case AppDetailsContextAction: 
+        case AppDetailsContextAction:
             machine()->postEvent(
                 HsMenuEventFactory::createAppDetailsViewEvent(itemId));
-            break;            
+            break;
         default:
-            break;            
+            break;
     }
-    mMenuView.setSearchPanelVisible(false);
+    mMenuView->hideSearchPanel();
 }
-
-/*!
- Slot invoked when a back action is triggered.
- */
-#ifdef COVERAGE_MEASUREMENT
-#pragma CTC SKIP
-#endif //COVERAGE_MEASUREMENT
-void HsInstalledAppsState::backAction()
-{
-    machine()->postEvent(HsMenuEventFactory::createOpenAppLibraryEvent());
-}
-#ifdef COVERAGE_MEASUREMENT
-#pragma CTC ENDSKIP
-#endif //COVERAGE_MEASUREMENT

--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hslistviewitem.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hslistviewitem.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -16,20 +16,58 @@
  */
 
 #include <hbnamespace.h>
-#include <HbProgressBar>
-
+#include <HbAbstractItemView>
 #include <HbStyleLoader>
+#include <QPainter>
 #include <caitemmodel.h>
 #include "hsmenuitemmodel.h"
 
 #include "hslistviewitem.h"
 
+
+// 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.
+
+#ifdef COVERAGE_MEASUREMENT
+#pragma CTC SKIP
+#endif //COVERAGE_MEASUREMENT
+void HsProgressBar::paint(QPainter * painter, 
+        const QStyleOptionGraphicsItem * option, 
+        QWidget * widget)
+{
+    Q_UNUSED(widget)
+    QStyleOptionGraphicsItem pixmapOption(*option);
+    foreach (QGraphicsItem *child, childItems()) {
+        painter->save();            
+        painter->translate(child->pos());
+        pixmapOption.exposedRect = child->boundingRect();
+        child->paint(painter, &pixmapOption, 0);
+        
+        foreach (QGraphicsItem *child2, child->childItems()) {
+            if (child2->isVisible()) {
+                painter->save();            
+                painter->translate(child2->pos());
+                pixmapOption.exposedRect = child2->boundingRect();
+                child2->paint(painter, &pixmapOption, 0);
+                painter->restore(); 
+            }
+        }
+        painter->restore();
+    }
+}    
+#ifdef COVERAGE_MEASUREMENT
+#pragma CTC ENDSKIP
+#endif //COVERAGE_MEASUREMENT
+
+
 HsListViewItem::HsListViewItem(QGraphicsItem* parent) : 
     HbListViewItem(parent), progress(0), isProgress(false)
 {   
     setGraphicsSize(LargeIcon);
-    HbStyleLoader::registerFilePath(":/layout/hslistviewitem.css");
-    HbStyleLoader::registerFilePath(":/layout/hslistviewitem.widgetml");
+    if (this == prototype()) {
+        HbStyleLoader::registerFilePath(":/layout/hslistviewitem.css");        
+    }
 }
 
 HsListViewItem::~HsListViewItem()
@@ -44,32 +82,22 @@
 {
     HbListViewItem::updateChildItems();
 
-    // DisplayRoles
-    QVariant displayRole = modelIndex().data(Qt::DisplayRole);
-    QStringList stringList;
-    if (displayRole.isValid()) {
-        if (displayRole.canConvert<QString>()) {
-            stringList.append(displayRole.toString());
-        } else if (displayRole.canConvert<QStringList>()) {
-            stringList = displayRole.toStringList();
-        }
-    }
     EntryFlags flags = modelIndex().data(
         CaItemModel::FlagsRole).value<EntryFlags> ();
     isProgress = false;
     if (flags & UninstallEntryFlag) {
         isProgress = true;
         if (!progress) {
-            progress = new HbProgressBar(this);
+            progress = new HsProgressBar(this);
+            HbStyle::setItemName(progress, "progress"); 
             progress->setRange(0, 100);
+            HbEffect::disable(progress);  
             repolish();
         }
         int progresVal = modelIndex().data(
                 CaItemModel::UninstalRole).toInt();
         progress->setProgressValue(progresVal);
-        HbStyle::setItemName(progress, "progress");         
     } else if (progress) {       
-        HbStyle::setItemName(progress, "");
         delete progress;
         progress = 0;
         repolish();
@@ -91,6 +119,13 @@
 
 void HsListViewItem::polish(HbStyleParameters& params)
 {       
+    if (isProgress) {
+        HbStyleLoader::registerFilePath(":/layout/hslistviewitem.widgetml");
+    }
     HbListViewItem::setProperty("progress", isProgress);
     HbListViewItem::polish(params);   
+    if (isProgress) {
+        HbStyleLoader::unregisterFilePath(":/layout/hslistviewitem.widgetml");
+    }
 }
+

--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmainwindow.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmainwindow.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -21,11 +21,11 @@
 #include "hsmainwindow.h"
 #include "hsmenuview.h"
 
-#include <qservicemanager.h>
+
 /*!
  Constructor
  */
-QTM_USE_NAMESPACE
+
 
 
 /*
@@ -36,7 +36,7 @@
  */
 
 
-HsMainWindow::HsMainWindow() : mActivityClient(NULL)
+HsMainWindow::HsMainWindow() 
 {
 }
 
@@ -51,68 +51,14 @@
  Add the \menuView to first instance of HbMainWindow registered in HbInstance.
  \param view View to be added to HbMainWindow.
 */
-void HsMainWindow::setCurrentView(const HsMenuView &menuView)
+void HsMainWindow::setCurrentView(HbView *view)
 {
     HbMainWindow *const hbW(
         HbInstance::instance()->allMainWindows().value(0));
     
-    connect( hbW, SIGNAL(viewReady()), SIGNAL(viewIsReady()),
-        Qt::UniqueConnection );
-
-    HbView *const view = menuView.view();
-    
     if (!hbW->views().contains(view)) {
         hbW->addView(view);
     }
-    hbW->setCurrentView(view);
+    bool animate  = !hbW->isObscured();       
+    hbW->setCurrentView(view, animate);
 }
-
-
-/*!
- Grabs screenshot from actual main window
- \retval QPixmap& containing screenshot
-*/
-QPixmap HsMainWindow::grabScreenshot()
-	{
-	HbMainWindow *const hbW(
-	    HbInstance::instance()->allMainWindows().value(0));
-	return QPixmap::grabWidget(hbW, hbW->rect()); 
-	}
-
-/*!
- Saves applib activity with current view screenshot
-*/
-void HsMainWindow::saveActivity()
-{
-#ifdef Q_OS_SYMBIAN
-
-    if (!mActivityClient) {
-        QServiceManager serviceManager;
-        mActivityClient = serviceManager.loadInterface("com.nokia.qt.activities.ActivityClient");
-        if (!mActivityClient) {
-            qWarning("Cannot initialize critical com.nokia.qt.activities.ActivityClient service.");
-        }
-    }
-
-    if (mActivityClient) {
-        bool retok;
-        bool ok = QMetaObject::invokeMethod(mActivityClient, "removeActivity",
-            Q_RETURN_ARG(bool, retok), Q_ARG(QString, appLibActivity()));
-        if (!ok) {
-            qWarning("remove appLibActivity failed");
-        }
-
-        QVariant variant;
-        QVariantHash metadata;
-        metadata.insert("screenshot", grabScreenshot());
-
-        ok = QMetaObject::invokeMethod(mActivityClient, "addActivity", Q_RETURN_ARG(bool, retok),
-            Q_ARG(QString, appLibActivity() ), Q_ARG(QVariant, QVariant(variant)),
-            Q_ARG(QVariantHash, metadata));
-        if (!ok) {
-            qWarning("add appLibActivity failed");
-        }
-    }
-#endif//Q_OS_SYMBIAN   
-}
-

--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuview.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuview.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -28,14 +28,16 @@
 #include <HbToolBar>
 #include <HbView>
 #include <HbToolBarExtension>
-#include <HbStaticVkbHost>
+#include <HbShrinkingVkbHost>
 
 #include "hsallappsstate.h"
 #include "hsallcollectionsstate.h"
 #include "hscollectionstate.h"
+#include "hsmainwindow.h"
 #include "hsmenuitemmodel.h"
 #include "hsmenuview.h"
 #include "hslistviewitem.h"
+#include "hssearchview.h"
 
 /*!
     \class HsMenuView
@@ -49,43 +51,24 @@
 */
 
 /*!
- Constructor
 
- Builds UI objects
- Sets up signals connections.
+ Retrieves UI objects for a requested context and sets up signals' connections.
 
  \param builder Menu View builder.
- \param viewContext variable representing view context the view is to be prepared for.
+ \param stateContext Variable representing view context the view is to be prepared for.
+ \param mainWindow Object responsible for making a given view
+    a currently displayed view.
  */
-HsMenuView::HsMenuView(HsMenuViewBuilder &builder, HsViewContext viewContext):
-    mViewContext(viewContext),
+HsMenuView::HsMenuView(HsMenuViewBuilder &builder,
+                       HsStateContext stateContext,
+                       HsMainWindow &mainWindow):
     mBuilder(builder),
-    mProxyModel(new QSortFilterProxyModel(this)),
-    mView(NULL),
-    mListView(NULL),
-    mViewLabel(NULL),
-    mSearchListView(NULL),
-    mSearchPanel(NULL), 
-    mVkbHost(NULL)
+    mStateContext(stateContext),
+    mOperationalContext(HsItemViewContext),
+    mMainWindow(mainWindow),
+    mHsSearchView(new HsSearchView(mBuilder, mStateContext, mMainWindow))
 {
-    mBuilder.setOperationalContext(HsItemViewContext);
-    mBuilder.setViewContext(mViewContext);
-    mBuilder.build();
-
-    mView = mBuilder.currentView();
-    mListView = mBuilder.currentListView();
-
-    mViewLabel= mBuilder.currentViewLabel();
-
-    mCollectionButton = mBuilder.collectionButton();
-
-    mProxyModel->setFilterRole(CaItemModel::TextRole);
-    mProxyModel->setFilterKeyColumn(1);
-    mProxyModel->setSortRole(CaItemModel::TextRole);
-
-    mVkbHost = new HbStaticVkbHost(mView);
-    connect(mVkbHost, SIGNAL(keypadOpened()), this, SLOT(vkbOpened()));
-    connect(mVkbHost, SIGNAL(keypadClosed()), this, SLOT(vkbClosed()));
+    synchronizeCache();
 
     connect(mListView,
             SIGNAL(activated(QModelIndex)),
@@ -93,12 +76,16 @@
     connect(mListView,
             SIGNAL(longPressed(HbAbstractViewItem *, QPointF)),
             this, SIGNAL(longPressed(HbAbstractViewItem *, QPointF)));
+
+    connect(mHsSearchView.data(), SIGNAL(activated(QModelIndex)),
+            this, SIGNAL(activated(QModelIndex)));
+    connect(mHsSearchView.data(),
+            SIGNAL(longPressed(HbAbstractViewItem *, QPointF)),
+                        this, SIGNAL(longPressed(HbAbstractViewItem *, QPointF)));
 }
 
 /*!
- Destructor
-
- Disconnects signals.
+    Empty.
  */
 HsMenuView::~HsMenuView()
 {
@@ -106,105 +93,52 @@
 
 
 /*!
- Sets model for item view.
+ Sets model for list item view if available in current context otherwise
+ ingores the request.
 
  \param model Model the view is to represent in HsItemViewMode.
  */
-void HsMenuView::setModel(HsMenuItemModel *model)
+void HsMenuView::setModel(QAbstractItemModel *model)
 {
     HSMENUTEST_FUNC_ENTRY("HsMenuView::setModel");
 
-    if (mListView->model()) {
-        disconnect(mListView->model(),
-                   SIGNAL(scrollTo(int, QAbstractItemView::ScrollHint)),
-                   this,
-                   SLOT(scrollToRow(int, QAbstractItemView::ScrollHint)));
+    if (mListView != NULL) {
+        if (mListView->model()) {
+            disconnect(mListView->model(),
+                       SIGNAL(scrollTo(int, QAbstractItemView::ScrollHint)),
+                       this,
+                       SLOT(scrollToRow(int, QAbstractItemView::ScrollHint)));
+            disconnect(mListView->model(), SIGNAL(countChange()),
+                       this,
+                        SIGNAL(listViewChange()));
+        }
+
+        mListView->setItemPixmapCacheEnabled(true); // TODO: remove when enabled from default
+        mListView->setModel(model, new HsListViewItem());
+
+        if (mListView->model()) {
+            connect(mListView->model(),
+                    SIGNAL(scrollTo(int, QAbstractItemView::ScrollHint)),
+                    this,
+                    SLOT(scrollToRow(int, QAbstractItemView::ScrollHint)));
+            connect(mListView->model(), SIGNAL(countChange()),
+                    this,
+                    SIGNAL(listViewChange()));
+        }
     }
-    mListView->setModel(model);
-    mListView->setItemPrototype(new HsListViewItem());
-    if (mListView->model()) {
-        connect(mListView->model(),
-                SIGNAL(scrollTo(int, QAbstractItemView::ScrollHint)),
-                this,
-                SLOT(scrollToRow(int, QAbstractItemView::ScrollHint)));
-    }
+
     HSMENUTEST_FUNC_EXIT("HsMenuView::setModel");
 }
 
-
-/*!
-    Returns label appropriate for the view.
-    \return pointer to the label or NULL if the view has no label.
- */
-HbGroupBox *HsMenuView::viewLabel() const
-{
-    return mViewLabel;
-}
-
 /*!
-    \return first visible item index if any or default QModelIndex otherwise.
+ Returns model for list item view.
  */
-QModelIndex HsMenuView::firstVisibleItemIndex(const HbListView *view) const
-{
-    QModelIndex result;
-
-    const QList<HbAbstractViewItem *> array =
-        view->visibleItems();
-
-    if (array.count() >= 1) {
-        result = array[0]->modelIndex();
-    }
-    return result;
-}
-
-/*!
-    Makes the UI to show or hide view search panel.
-    When search panel is shown the view toolbar and status pane
-    are hidden until search panel is hidden.
-    \param visible When true search panel will be shown,
-     otherwise it will be hidden.
- */
-void HsMenuView::setSearchPanelVisible(bool visible)
+QAbstractItemModel *HsMenuView::model() const
 {
-    HSMENUTEST_FUNC_ENTRY("HsMenuView::setSearchPanelVisible");
-
-    if (visible) {
-
-        mSearchViewInitialIndex = firstVisibleItemIndex(mListView);
-
-        searchBegins();
-
-        connectSearchItemViewsSignals();
-        connectSearchPanelSignals();
-        
-    } else if (mSearchListView != NULL) {
-
-        mIndexToScrollAfterSearchDone =
-            firstVisibleItemIndex(mSearchListView);
-
-        disconnectSearchPanelSignals();
-        disconnectSearchItemViewsSignals();
-
-        searchFinished();
-    }
-    HSMENUTEST_FUNC_EXIT("HsMenuView::setSearchPanelVisible");
+    return mListView->model();
 }
 
 /*!
-    Makes the UI to show or hide view add collection button
-    \param visibility When true button will be shown,
-     otherwise it will be hidden.
- */
-void HsMenuView::setContext(HsViewContext viewContext,
-                            HsOperationalContext context)
-{
-    mBuilder.setViewContext(viewContext);
-    mBuilder.setOperationalContext(context);
-    mBuilder.build();
-}
-
-
-/*!
 \return View widget of the menu view.
  */
 HbView *HsMenuView::view() const
@@ -213,7 +147,8 @@
 }
 
 /*!
-\return List view widget of the menu view.
+\return List view widget of the menu view
+ if available in the context or NULL otherwise.
  */
 HbListView *HsMenuView::listView() const
 {
@@ -221,11 +156,22 @@
 }
 
 /*!
-\return Collection button
+    Returns label appropriate for the view.
+    \return Pointer to the label
+    if available in the context or NULL otherwise.
  */
-HbPushButton *HsMenuView::collectionButton() const
+HbGroupBox *HsMenuView::viewLabel() const
 {
-    return mCollectionButton;
+    return mViewLabel;
+}
+
+/*!
+\return Collection button
+ if available in the context or NULL otherwise.
+ */
+HbPushButton *HsMenuView::contentButton() const
+{
+    return mAddContentButton;
 }
 
 /*!
@@ -236,13 +182,10 @@
 {
     HSMENUTEST_FUNC_ENTRY("HsMenuView::showSearchPanel");
 
-    setSearchPanelVisible(true);
+    mHsSearchView->setSearchPanelVisible(true);
 
     HSMENUTEST_FUNC_EXIT("HsMenuView::showSearchPanel");
 }
-#ifdef COVERAGE_MEASUREMENT
-#pragma CTC SKIP
-#endif //COVERAGE_MEASUREMENT skipped: it doubles other method
 
 /*!
  Makes search panel invisible.
@@ -251,16 +194,15 @@
 void HsMenuView::hideSearchPanel()
 {
     HSMENUTEST_FUNC_ENTRY("HsMenuView::hideSearchPanel");
-    setSearchPanelVisible(false);
+
+    mHsSearchView->setSearchPanelVisible(false);
+
     HSMENUTEST_FUNC_EXIT("HsMenuView::hideSearchPanel");
 }
-#ifdef COVERAGE_MEASUREMENT
-#pragma CTC ENDSKIP
-#endif //COVERAGE_MEASUREMENT
 
 /*!
  Disable or enable search action button.
- \param disable If true action is disabled.
+ \param disable If true action gets disabled.
  */
 void HsMenuView::disableSearch(bool disable)
 {
@@ -268,7 +210,7 @@
 }
 
 /*!
- Scrolls item view to requested row.
+ Scrolls list item view to requested row.
  \param row The row which is to get at the position pointed by \a hint.
  \param hint Position in the view the row should be scrolled to.
   */
@@ -276,8 +218,10 @@
 {
     HSMENUTEST_FUNC_ENTRY("HsMenuView::scrollToRow");
 
-    mListView->scrollTo(mListView->model()->index(row, 0),
-                        convertScrollHint(hint));
+    if (mListView != NULL) {
+        mListView->scrollTo(
+            mListView->model()->index(row, 0), convertScrollHint(hint));
+    }
 
     HSMENUTEST_FUNC_EXIT("HsMenuView::scrollToRow");
 }
@@ -303,187 +247,19 @@
     }
 }
 
-/*
- Connects \a activated and \a longPressed signals coming from search list
- view to emit corresponding signal of this object with translated model index
-*/
-void HsMenuView::connectSearchItemViewsSignals()
-{
-    connect(mSearchListView, SIGNAL(activated(QModelIndex)),
-            this, SLOT(activatedProxySlot(QModelIndex)));
-    connect(mSearchListView, SIGNAL(longPressed(HbAbstractViewItem *, QPointF)),
-            this, SLOT(longPressedProxySlot(HbAbstractViewItem *, QPointF)));
-
-}
-
 /*!
- Disconnects \a activated and \a longPressed signals coming from list
- view from to emit corresponding signal
- of this object with translated model index.
-*/
-void HsMenuView::disconnectSearchItemViewsSignals()
-{
-    disconnect(mSearchListView, SIGNAL(activated(QModelIndex)),
-               this, SLOT(activatedProxySlot(QModelIndex)));
-    disconnect(mSearchListView, SIGNAL(longPressed(HbAbstractViewItem *, QPointF)),
-               this,
-               SLOT(longPressedProxySlot(HbAbstractViewItem *, QPointF)));
-}
-
-
-/*!
- Connects signals \a exitClicked and \a criteriaChanged emitted
- by search panel with handling slots of the object or its members.
-*/
-void HsMenuView::connectSearchPanelSignals()
-{
-    connect(mSearchPanel, SIGNAL(exitClicked()),
-            this, SLOT(hideSearchPanel()));
-    connect(mSearchPanel, SIGNAL(criteriaChanged(QString)),
-            this, SLOT(findItem(QString)));
-
-
-}
-
-/*!
- Disconnects signals \a exitClicked and \a criteriaChanged emitted
- by search panel from handling slots of the object or its members
- Scrolls view to state before connections.
-*/
-void HsMenuView::disconnectSearchPanelSignals()
-{
-    disconnect(mSearchPanel, SIGNAL(exitClicked()),
-               this, SLOT(hideSearchPanel()));
-
-    disconnect(mSearchPanel, SIGNAL(criteriaChanged(QString)),
-               this, SLOT(findItem(QString)));
-
-}
-
-
-/*!
- Looks up for item and if found scrolls to it.
- \param criteriaStr The item name to find.
- */
-void HsMenuView::findItem(QString criteriaStr)
-{
-    qDebug
-    () << QString("hsmenuview::findItem: %1").arg(criteriaStr);
-    HSMENUTEST_FUNC_ENTRY("hsmenuview::findItem");
-
-    if ("" != criteriaStr) {
-        mProxyModel->invalidate();
-        mProxyModel->setSourceModel(mListView->model());
-        mProxyModel->setFilterRegExp(QRegExp(
-                QString("(^|\\b)%1").arg(criteriaStr), Qt::CaseInsensitive));
-        mSearchListView->scrollTo(mProxyModel->index(0,0),
-                                  HbAbstractItemView::PositionAtTop);
-    } else {
-        mProxyModel->setFilterRegExp(QRegExp(QString(".*"),
-                                             Qt::CaseInsensitive, QRegExp::RegExp));
-
-        // scroll to first item in model
-        mSearchListView->scrollTo(
-            mProxyModel->index(0, 0),
-
-            HbAbstractItemView::PositionAtTop);
-    }
-    HSMENUTEST_FUNC_EXIT("hsmenuview::findItem");
-}
-
-/*!
- Makes the view display search panel with view representing search results.
- */
-void HsMenuView::searchBegins()
-{
-    HSMENUTEST_FUNC_ENTRY("hsmenuview::searchBegins");
-
-
-    mBuilder.setViewContext(mViewContext);
-    mBuilder.setOperationalContext(HsSearchContext);
-    mBuilder.build();
-    mSearchListView = mBuilder.currentListView();
-    mSearchPanel = mBuilder.currentSearchPanel();
-
-    mView->hideItems(Hb::AllItems);
-
-    mProxyModel->invalidate();
-    mProxyModel->setSourceModel(mListView->model());
-    mProxyModel->setFilterRegExp(QRegExp(QString(".*"), Qt::CaseInsensitive,
-                                         QRegExp::RegExp));
-    mSearchListView->setModel(mProxyModel);
-    mSearchListView->setItemPrototype(new HsListViewItem());
-    
-    mSearchListView->scrollTo(
-        mProxyModel->mapFromSource(mSearchViewInitialIndex),
-        HbAbstractItemView::PositionAtTop);
-    HSMENUTEST_FUNC_EXIT("hsmenuview::searchBegins");
-}
-
-/*!
-  Ensures view does not contain search related elements and is scrolled
-  to item chosen in search mode.
- */
-void HsMenuView::searchFinished()
-{
-    HSMENUTEST_FUNC_ENTRY("hsmenuview::searchFinished");
-    
-    mBuilder.setViewContext(mViewContext);
-    mBuilder.setOperationalContext(HsItemViewContext);
-    mBuilder.build();
-    mView->showItems(Hb::AllItems);
-
-    const QModelIndex indexToScroll =
-        mProxyModel->mapToSource(mIndexToScrollAfterSearchDone);
-
-    mListView->scrollTo(indexToScroll, HbAbstractItemView::PositionAtTop);
-
-    mSearchListView = NULL;
-    mSearchPanel = NULL;
-    vkbClosed();
-    HSMENUTEST_FUNC_EXIT("hsmenuview::searchFinished");
-}
-
-/*!
- Slot used to translate activated signal from proxy model to normal model.
- \param index representing an item activated in search list view.
- */
-void HsMenuView::activatedProxySlot(const QModelIndex &index)
-{
-    emit activated(mProxyModel->mapToSource(index));
-}
-
-/*!
- Slot used to forward 'long pressed' signal with item description transladed 
- from search view context to context of the view search was requested from. 
- */
-void HsMenuView::longPressedProxySlot(HbAbstractViewItem *item,
-                                      const QPointF &coords)
-{
-    /*
-      this is a kind of hack, introduced for reasons:
-      item object should be reusable later, but orbit (or qt) prevents setting
-      its index model to previous state
-      */
-    mSearchViewLongPressedIndex =
-        mProxyModel->mapToSource(item->modelIndex());
-    QScopedPointer<HbAbstractViewItem> itemNew(item->createItem());
-    itemNew->setModelIndex(mSearchViewLongPressedIndex);
-    emit longPressed(itemNew.data(), coords);
-}
-
-/*!
- Add the view to main window and search action with \a showSearchPanel
+ Add the view to main window and connect search action with \a showSearchPanel
  slot of the window.
  */
 void HsMenuView::activate()
 {
+    mMainWindow.setCurrentView(mView);
     connect(mBuilder.searchAction(), SIGNAL(triggered()),
-            this, SLOT(showSearchPanel()));
+            this, SLOT(showSearchPanel()), Qt::UniqueConnection);
 }
 
 /*!
- Disconnecs search action and \a showSearchPanel slot of the window.
+ Disconnects search action and disconnects \a showSearchPanel slot from the window.
  */
 void HsMenuView::inactivate()
 {
@@ -494,20 +270,55 @@
                this, SLOT(showSearchPanel()));
 }
 
-
 /*!
- change size of view when VKB is opened
+  Makes a new view to be activated. Ensure navigation action and view label
+  heading are preserved after reset.
+  \param operationalContext Context indicating which view to activate.
  */
-void HsMenuView::vkbOpened()
+void HsMenuView::reset(HsOperationalContext operationalContext)
 {
-    mView->setMaximumHeight(mVkbHost->applicationArea().height());   
+    QString viewLabelHeading;
+
+    // before changing context read current view label heading ...
+    synchronizeCache();
+
+    if (mBuilder.currentViewLabel() != 0) {
+        viewLabelHeading = mBuilder.currentViewLabel()->heading();
+    }
+    // ... and back-key action
+    HbAction *const backKeyAction(mView->navigationAction());
+
+    // now we can switch the context
+    mOperationalContext = operationalContext;
+    synchronizeCache();
+
+    if (mBuilder.currentViewLabel() != 0) {
+        mBuilder.currentViewLabel()->setHeading(viewLabelHeading);
+    }
+    mView->setNavigationAction(backKeyAction);
 }
 
 /*!
- change size of view when VKB is closed
+ Builder can be shared between many instances of HsMenuView
+ being in different contexts. Before using builder make sure
+ it is in context matching the current HsMenuView.
  */
-void HsMenuView::vkbClosed()
+
+void HsMenuView::switchBuilderContext()
 {
-     mView->setMaximumHeight(-1);   
+    mBuilder.setStateContext(mStateContext);
+    mBuilder.setOperationalContext(mOperationalContext);
 }
 
+/*!
+ Updates internal data references to widgets.
+ */
+void HsMenuView::synchronizeCache()
+{
+    switchBuilderContext();
+
+    mView = mBuilder.currentView();
+    mListView = mBuilder.currentListView();
+    mViewLabel = mBuilder.currentViewLabel();
+    mAddContentButton = mBuilder.currentAddContentButton();
+}

--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuviewbuilder.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuviewbuilder.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -21,8 +21,6 @@
 #include <HbAction>
 #include <HbGroupBox>
 #include <HbListView>
-#include <HbLineEdit>
-#include <HbSearchPanel>
 #include <HbPushButton>
 #include <HbToolBar>
 #include <HbView>
@@ -35,6 +33,26 @@
 #include "hsmenuviewbuilder.h"
 #include "hsmenustates_global.h"
 
+static const char* DOCUMENT_BASE_NAME_MAP
+        [InvalidStateContext][InvalidOperationalContext] =
+    /*HsItemViewContext,    HsButtonContext,    HsEmptyLabelContext*/
+{
+/*HsAllAppsContext*/        {"listview", "listview", "listview"},
+/*HsAllCollectionsContext*/ {"listview", "listview", "listview"},
+/*HsInstalledAppsContext*/  {"labeledlistview", "labeledlistview",
+        "emptylabeledview"},
+/*HsCollectionContext*/     {"labeledlistview", "addcontentlabeledview",
+        "emptylabeledview"}
+};
+
+static const QString DOCUMENT_NAME_PREFIX(QLatin1String(":/xml/"));
+static const QString DOCUMENT_NAME_EXT(QLatin1String(".docml"));
+static const QString COMMON_OBJECTS_DOCUMENT_BASE_NAME(
+        QLatin1String("common_objects"));
+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
@@ -48,158 +66,128 @@
 */
 
 
-/*!
-  Cleanup search text on showing search panel. Ensures vkb host instance
-  is appears on show and disappears on hide search panel.
-  
-  \param visible When true search panel is to show up,
-  hide otherwise.
- */
-void HsMenuViewBuilder::searchPanelVisibilityChange(bool visible)
-{
-    if (visible) {
 
-        HbLineEdit *const lineEdit(searchPanelLineEdit());
-
-        lineEdit->setText("");
-        lineEdit->setFocus();
-    } 
-
-}
 
 /*!
- \return pointer to the view resulting from last \a build call or NULL if 
+ \return Pointer to the view resulting from last \a build call or NULL if
  the \a build has not yet been called.
  Memory ownership is not changed.
  */
-HbView *HsMenuViewBuilder::currentView() const
+HbView *HsMenuViewBuilder::currentView()
 {
-    const QString VIEW_NAME =
-        mViewContextToStringMap[mViewContext]
-        + "View";
+    HbView *const view =
+        qobject_cast<HbView *>(currentLoader()->findWidget(VIEW_NAME));
 
-    HbView *const view =
-        qobject_cast<HbView *>(mDocumentLoader.findWidget(VIEW_NAME));
-
-    if (view != NULL && mViewContext != HsInstalledAppsContext) {
+    if (view != NULL && mStateContext != HsInstalledAppsContext) {
         view->setToolBar(mToolBar);
     }
     return view;
 }
 
 /*!
- \return pointer to list view resulting from last \a build call or NULL if 
+ \return Pointer to list view resulting from last \a build call or NULL if
  the \a build has not yet been called.
  The pointer is valid until the HsMenuViewBuilder instance is destroyed.
  Memory ownership is not changed.
  */
-HbListView *HsMenuViewBuilder::currentListView() const
+HbListView *HsMenuViewBuilder::currentListView()
 {
-    QString LIST_VIEW_NAME = mViewContextToStringMap[mViewContext];
-    if (mOperationalContext == HsSearchContext) {
-        LIST_VIEW_NAME.append(mOperationalContextToStringMap[mOperationalContext]);
-    }
-    LIST_VIEW_NAME.append("ListView");
+    HbListView *const listView =
+        qobject_cast<HbListView *>(
+                currentLoader()->findWidget(LIST_VIEW_NAME));
 
-    return qobject_cast<HbListView *>(
-               mDocumentLoader.findWidget(LIST_VIEW_NAME));
+    return listView;
 }
 
 /*!
- \return pointer to the view label resulting from last \a build call. It is 
+ \return Pointer to the view label 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.
+ */
+HbGroupBox *HsMenuViewBuilder::currentViewLabel()
+{
+    HbGroupBox *viewLabel =
+            qobject_cast<HbGroupBox *>(
+                    currentLoader()->findWidget(VIEW_LABEL_NAME));
+
+    return viewLabel;
+}
+
+/*!
+ \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.
  */
-HbGroupBox *HsMenuViewBuilder::currentViewLabel() const
+HbPushButton *HsMenuViewBuilder::currentAddContentButton()
 {
-    const QString LABEL_NAME = mViewContextToStringMap[mViewContext]
-                               + "Label";
-
-    return qobject_cast<HbGroupBox *>(
-               mDocumentLoader.findWidget(LABEL_NAME));
+    HbPushButton *pushButton =
+            qobject_cast<HbPushButton *>(currentLoader()->findWidget(
+                        ADD_CONTENT_BUTTON_NAME));
+    return pushButton;
 }
 
 /*!
- \return pointer to search panel.
- The pointer is valid until the HsMenuViewBuilder instance is destroyed.
- Memory ownership is not changed.
- */
-HbSearchPanel *HsMenuViewBuilder::currentSearchPanel() const
-{
-    return qobject_cast<HbSearchPanel *>(mDocumentLoader.findWidget(
-            SEARCH_PANEL_NAME));
-}
-
-/*!
- \return pointer to a button
- The pointer is valid until the HsMenuViewBuilder instance is destroyed.
- Memory ownership is not changed.
- */
-HbPushButton *HsMenuViewBuilder::collectionButton() const
-{
-    return qobject_cast<HbPushButton *>(mDocumentLoader.findWidget(
-            BUTTON_NAME));
-}
-
-/*!
- \return pointer to All Applications Action. Guaranteed to be not NULL.
+ \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.
  */
 HbAction *HsMenuViewBuilder::allAppsAction() const
 {
-    return qobject_cast<HbAction *>(mDocumentLoader.findObject(
+    return qobject_cast<HbAction *>(mCommonObjectsLoader->findObject(
                                         ALL_APPS_ACTION_NAME));
 }
 
 /*!
- \return pointer to All Collections Action. Guaranteed to be not NULL.
+ \return Pointer to All Collections Action. Guaranteed to be not NULL.
  The pointer is valid until the HsMenuViewBuilder instance is destroyed.
  Memory ownership is not changed.
  */
 HbAction *HsMenuViewBuilder::allCollectionsAction() const
 {
-    return qobject_cast<HbAction *>(mDocumentLoader.findObject(
+    return qobject_cast<HbAction *>(mCommonObjectsLoader->findObject(
                                         ALL_COLLECTIONS_ACTION_NAME));
 }
 
 /*!
- \return pointer to Search Action. Guaranteed to be not NULL.
+ \return Pointer to Search Action. Guaranteed to be not NULL.
  The pointer is valid until the HsMenuViewBuilder instance is destroyed.
  Memory ownership is not changed.
  */
 HbAction *HsMenuViewBuilder::searchAction() const
 {
-    return qobject_cast<HbAction *>(mDocumentLoader.findObject(
+    return qobject_cast<HbAction *>(mCommonObjectsLoader->findObject(
                                         SEARCH_ACTION_NAME));
 }
 
 /*!
- \return pointer to Ovi Store Action. Guaranteed to be not NULL.
+ \return Pointer to Ovi Store Action. Guaranteed to be not NULL.
  The pointer is valid until the HsMenuViewBuilder instance is destroyed.
  Memory ownership is not changed.
  */
 HbAction *HsMenuViewBuilder::oviStoreAction() const
 {
-    return qobject_cast<HbAction *>(mDocumentLoader.findObject(
+    return qobject_cast<HbAction *>(mCommonObjectsLoader->findObject(
                                         OVI_STORE_ACTION_NAME));
 }
 
 /*!
- \return pointer to Operator Action. Guaranteed to be not NULL.
+ \return Pointer to Operator Action. Guaranteed to be not NULL.
  The pointer is valid until the HsMenuViewBuilder instance is destroyed.
  Memory ownership is not changed.
  */
 HbAction *HsMenuViewBuilder::operatorAction() const
 {
-    return qobject_cast<HbAction *>(mDocumentLoader.findObject(
+    return qobject_cast<HbAction *>(mCommonObjectsLoader->findObject(
                                         OPERATOR_ACTION_NAME));
 }
 
 /*!
- \return pointer to the main view toolbar.
+ \return Pointer to the main view toolbar.
  The pointer is valid until the HsMenuViewBuilder instance is destroyed.
  Memory ownership is not changed.
  */
@@ -209,7 +197,7 @@
 }
 
 /*!
- \return pointer to the toolbar extension.
+ \return Pointer to the toolbar extension.
  The pointer is valid until the HsMenuViewBuilder instance is destroyed.
  Memory ownership is not changed.
  */
@@ -219,7 +207,7 @@
 }
 
 /*!
- \return action group for \a allAppsState and \a allCollectionsState action.
+ \return Action group for \a allAppsState and \a allCollectionsState action.
  */
 QActionGroup *HsMenuViewBuilder::toolBarActionGroup() const
 {
@@ -228,42 +216,35 @@
 
 /*!
  Reads docml configuration corresponding to current context.
+ \return Shared pointer to loader serving current context.
  */
-bool HsMenuViewBuilder::build()
+QSharedPointer<HbDocumentLoader> HsMenuViewBuilder::currentLoader()
 {
-    return readContextConfiguration(mViewContext, mOperationalContext);
+    if (!mLoaderMap.contains(context())) {
+        QSharedPointer<HbDocumentLoader> loader =
+                readContextConfiguration();
+        mLoaderMap.insert(context(), loader);
+    }
+
+    return mLoaderMap[context()];
 }
 
 
-
 /*!
- Constructor.
- Makes object be initialized with with hidden but existing
- search panel and view label.
+  Loads non-context sensitive objects.
  */
 HsMenuViewBuilder::HsMenuViewBuilder():
-    DOCUMENT_FILE_NAME(":/xml/applibrary.docml"),
     ALL_APPS_ACTION_NAME("allAppsAction"),
     ALL_COLLECTIONS_ACTION_NAME("allCollectionsAction"),
     SEARCH_ACTION_NAME("searchAction"),
     OVI_STORE_ACTION_NAME("oviStoreAction"),
     OPERATOR_ACTION_NAME("operatorAction"),
-    SEARCH_PANEL_NAME("searchPanel"),
-    BUTTON_NAME("collectionButton"),
-    TOOL_BAR_NAME("toolBar"),
     mToolBar(new HbToolBar),
     mToolBarExtension(new HbToolBarExtension),
-    mViewContext(HsAllAppsContext),
+    mStateContext(HsAllAppsContext),
     mOperationalContext(HsItemViewContext)
 {
-    init();
-
-    // parse common section and the one specified by view options
-    const bool result = parseSection();
-
-    Q_ASSERT_X(result,
-               "HsMenuViewBuilder::HsMenuViewBuilder()",
-               "construction failed");
+    mCommonObjectsLoader = parseDocument(COMMON_OBJECTS_DOCUMENT_BASE_NAME);
 
     mToolBar->addAction(allAppsAction());
     mToolBar->addAction(allCollectionsAction());
@@ -276,8 +257,7 @@
 }
 
 /*!
- Destructor.
- Deletes widgets owned by the Menu View Builder.
+ Deletes loaded objects.
  */
 HsMenuViewBuilder::~HsMenuViewBuilder()
 {
@@ -289,81 +269,43 @@
 /*!
  Parses requested docml file section and reflects its contents in the
  object state.
- \param sectionName Name of the section to parse.
- \retval \a true on success, \a false otherwise.
+ \param documentName Identifies document to parse.
+ \return Document loader instance containing parsed
+    objects for requested \documentName.
  */
-bool HsMenuViewBuilder::parseSection(const QString &sectionName)
+QSharedPointer<HbDocumentLoader> HsMenuViewBuilder::parseDocument(
+        const QString &documentBaseName)
 {
-    HSMENUTEST_FUNC_ENTRY("HsMenuViewBuilder::parseSection");
+    HSMENUTEST_FUNC_ENTRY("HsMenuViewBuilder::parseDocument");
 
     bool loadStatusOk = false;
+
+    QSharedPointer<HbDocumentLoader> loader(new HbDocumentLoader());
+
+    const QString documentFullName = DOCUMENT_NAME_PREFIX +
+                                     documentBaseName +
+                                     DOCUMENT_NAME_EXT;
     const QObjectList loadedObjects =
-        mDocumentLoader.load(DOCUMENT_FILE_NAME,
-                             sectionName,
-                             &loadStatusOk); 
+            loader->load(documentFullName, &loadStatusOk);
+
     mLoadedObjects |= loadedObjects.toSet();
 
     Q_ASSERT_X(loadStatusOk,
-               DOCUMENT_FILE_NAME.toLatin1().data(),
+               documentFullName.toLatin1().data(),
                "Error while loading docml file.");
 
-    HSMENUTEST_FUNC_EXIT("HsMenuViewBuilder::parseSection");
-
-    return loadStatusOk;
-}
-
-
-/*!
- \return Line edit of the searchPanel on success, NULL otherwise.
- */
-HbLineEdit *HsMenuViewBuilder::searchPanelLineEdit() const
-{
-    HSMENUTEST_FUNC_ENTRY("HsMenuViewBuilder::searchPanelLineEdit");
-
-    HbLineEdit *result(0);
-
-    foreach(QGraphicsItem *obj, currentSearchPanel()->childItems()) {
-
-        QGraphicsWidget *const widget = static_cast<QGraphicsWidget *>(obj);
-
-        if (widget != NULL) {
-
-            HbLineEdit *const lineEdit = qobject_cast<HbLineEdit *>(widget);
+    HSMENUTEST_FUNC_EXIT("HsMenuViewBuilder::parseDocument");
 
-            if (lineEdit != NULL) {
-                result = lineEdit;
-                break;
-            }
-        }
-    }
-    HSMENUTEST_FUNC_EXIT("HsMenuViewBuilder::searchPanelLineEdit");
-
-    return result;
-}
-
-/*!
-    Builds mapping between context and docml name buidling blocks.
- */
-void HsMenuViewBuilder::init()
-{
-    mViewContextToStringMap[HsAllAppsContext] = "allApps";
-    mViewContextToStringMap[HsAllCollectionsContext] = "allCollections";
-    mViewContextToStringMap[HsInstalledAppsContext] = "installedApps";
-    mViewContextToStringMap[HsCollectionContext] = "collection";
-    mOperationalContextToStringMap[HsItemViewContext] = "";
-    mOperationalContextToStringMap[HsSearchContext] = "Search";
-    mOperationalContextToStringMap[HsButtonContext] = "Button";
-    mOperationalContextToStringMap[HsEmptyLabelContext] = "EmptyLabel";
-
+    return loader;
 }
 
 /*!
  Sets view context. Not reflected in widgets returned by the builder
  until \a build is not run.
  */
-void HsMenuViewBuilder::setViewContext(HsViewContext viewContext)
+void HsMenuViewBuilder::setStateContext(HsStateContext stateContext)
 {
-    mViewContext = viewContext;
+    mStateContext = stateContext;
 }
 
 /*!
@@ -379,20 +321,23 @@
 /*!
  Reads configuration for requested context and ensures search panel and corresponding
  vkb host are managed properly.
+ \return Document loader with objects for current context.
  */
-bool HsMenuViewBuilder::readContextConfiguration(HsViewContext viewContext,
-        HsOperationalContext operationalContext)
+QSharedPointer<HbDocumentLoader> HsMenuViewBuilder::readContextConfiguration()
 {
-    const QString sectionName = mViewContextToStringMap[viewContext]
-        + mOperationalContextToStringMap[operationalContext] 
-        + "ViewDefinition";
+    const QLatin1String documentName(
+            DOCUMENT_BASE_NAME_MAP[mStateContext][mOperationalContext]);
 
-    const bool result = parseSection(sectionName);
+    QSharedPointer<HbDocumentLoader> loader =
+            parseDocument(QString(documentName));
 
-    if (currentSearchPanel()) {
-        searchPanelVisibilityChange(mOperationalContext == HsSearchContext);
-    }
-
-    return result;
+    return loader;
 }
 
+/*!
+ \return Current context.
+ */
+HsMenuViewBuilder::Context HsMenuViewBuilder::context() const
+{
+    return Context(mStateContext, mOperationalContext);
+}

--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsoperatorhandler.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsoperatorhandler.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -16,12 +16,18 @@
  */
 
 #include "hsoperatorhandler.h"
-#ifndef NO_QT_EXTENSIONS
-#include "hsoperatorhandler_p.h"
+
+#include <HbAction>
+
+#ifdef QT_EXTENSIONS
+    #include "hsoperatorhandler_p.h"
 #else
-#include <HbIcon>
+    #include <HbIcon>
 #endif
 
+
+
+
 /*!
     \class HsOperatorHandler
     \ingroup group_hsmenustateplugin
@@ -37,7 +43,7 @@
  */
 HsOperatorHandler::HsOperatorHandler(QObject *parent):
     QObject(parent),
-#ifndef NO_QT_EXTENSIONS
+#ifdef QT_EXTENSIONS
     m_q(new HsOperatorHandlerPrivate(this))
 #else
     m_q(0)
@@ -58,7 +64,7 @@
  */
 HbIcon HsOperatorHandler::icon()
 {
-#ifndef NO_QT_EXTENSIONS
+#ifdef QT_EXTENSIONS
     return m_q->icon();
 #else
     return HbIcon();
@@ -71,7 +77,7 @@
  */
 QString HsOperatorHandler::text()
 {
-#ifndef NO_QT_EXTENSIONS
+#ifdef QT_EXTENSIONS
     return m_q->text();
 #else
     return QString();
@@ -80,13 +86,64 @@
 
 
 /*!
- Open Operator application or related url
+ Open Operator application or related url action
  */
 void HsOperatorHandler::action()
 {
-#ifndef NO_QT_EXTENSIONS
+#ifdef QT_EXTENSIONS
     m_q->action();
 #endif
 }
 
+/*!
+ Returns Operator Store presence value predefined in Central Repositoryicon
+ \retval true if Operator Store should be present in toolbar
+ */
+bool HsOperatorHandler::operatorStorePresent()
+{
+#ifdef QT_EXTENSIONS
+    return m_q->operatorStorePresent();
+#else
+    return false;
+#endif
+}
 
+/*!
+ Returns Ovi Store presence value predefined in Central Repositoryicon
+ \retval true if Ovi Store should be present in toolbar
+ */
+bool HsOperatorHandler::oviStorePresent()
+{
+#ifdef QT_EXTENSIONS
+    return m_q->oviStorePresent();
+#else
+    return false;
+#endif
+}
+
+/*!
+ Returns if Operator Store should first in toolbar
+ \retval true if Operator Store should first in toolbar
+ */
+bool HsOperatorHandler::operatorStoreFirst()
+{
+#ifdef QT_EXTENSIONS
+    return m_q->operatorStoreFirst();
+#else
+    return false;
+#endif
+}
+
+/*!
+ Prepares HbAction for Operator Store
+ \param HbAction to prepare
+ \retval HbAction prepared action
+ */
+HbAction *HsOperatorHandler::prepareOperatorStoreAction(
+        HbAction *const operatorAction)
+{
+    operatorAction->setIcon(icon());
+    connect(operatorAction, SIGNAL(triggered()), this, SLOT(action()));
+    return operatorAction;
+}
+

--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsoperatorhandler_p.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsoperatorhandler_p.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -14,21 +14,27 @@
  * Description: hsoperatorhandler_p.cpp
  *
  */
-#ifndef NO_QT_EXTENSIONS
+#ifdef QT_EXTENSIONS
 
 #include <QDebug>
-#include <XQSettingsManager>
 #include <XQSettingsKey>
 #include "hsoperatorhandler_p.h"
 #include "hsmenuservice.h"
 #include "caentry.h"
 #include "caservice.h"
 
-const int AppLibUid         = 0x20022F97;
-const int IconId            = 0x00000001;
-const int OperatorAppUid    = 0x00000002;
-const int OperatorUrl       = 0x00000003;
-const int OperatorText      = 0x00000004;
+const int AppLibUid                 = 0x20022F97;
+const int IncludeOperatorStore      = 0x00000001;
+const int OperatorStoreType         = 0x00000002;
+const int OperatorStoreTitle        = 0x00000003;
+const int OperatorStoreURL          = 0x00000004;
+const int OperatorStoreIconSkinID   = 0x00000005;
+const int OperatorStoreApplication  = 0x00000006;
+const int OperatorStore1stPopUp     = 0x00000007;
+const int RemoveOviStore            = 0x00000008;
+const char *operatorStoreIconPath
+        = "z:/private/20022F35/customsvg/operatorstore.svg";
+
 
 // ======== MEMBER FUNCTIONS ========
 
@@ -38,9 +44,13 @@
  */
 HsOperatorHandlerPrivate::HsOperatorHandlerPrivate(QObject *parent):
     QObject(parent),
+    mOviStorePresent(false),
+    mOperatorStorePresent(false),
+    mStoreType(NoneType),
     mOperatorEntry(0),
     mIcon(),
-    mText()
+    mOperatorStoreTitle(),
+    mOperatorStoreFirst(false)
 {
     readCentralRepository();
 }
@@ -72,12 +82,39 @@
 }
 
 /*!
- Returns Operator icon predefined in Central Repositoryicon
- \retval icon
+ Returns Operator title text predefined in Central Repositoryicon
+ \retval text
  */
 QString HsOperatorHandlerPrivate::text()
 {
-    return mText;
+    return mOperatorStoreTitle;
+}
+
+/*!
+ Returns Ovi Store presence value predefined in Central Repositoryicon
+ \retval true if Ovi Store should be present in toolbar
+ */
+bool HsOperatorHandlerPrivate::oviStorePresent()
+{
+    return mOviStorePresent;
+}
+
+/*!
+ Returns Operator Store presence value predefined in Central Repositoryicon
+ \retval true if Operator Store should be present in toolbar
+ */
+bool HsOperatorHandlerPrivate::operatorStorePresent()
+{
+    return mOperatorStorePresent;
+}
+
+/*!
+ Returns if Operator Store should first in toolbar
+ \retval true if Operator Store should first in toolbar
+ */
+bool HsOperatorHandlerPrivate::operatorStoreFirst()
+{
+    return mOperatorStoreFirst;
 }
 
 /*!
@@ -87,41 +124,15 @@
  */
 HbIcon HsOperatorHandlerPrivate::createIcon(XQSettingsManager *crManager)
 {
-    qDebug("HsOperatorHandlerPrivate::createIcon");
-    HbIcon icon;
-
-    XQCentralRepositorySettingsKey iconKey(AppLibUid, IconId);
-    QVariant iconVarian = crManager->readItemValue(
-                              iconKey, XQSettingsManager::TypeString);
-
-    if (!iconVarian.isNull() && !iconVarian.toString().isEmpty()) {
-        qDebug() << "HsOperatorHandlerPrivate::createIcon"
-                 << iconVarian.toString();
-        icon = HbIcon(iconVarian.toString());
+    QVariant variant = getVariantFromKey(
+            crManager,
+            OperatorStoreIconSkinID,
+            XQSettingsManager::TypeString);
+    if (!variant.isNull() && !variant.toString().isEmpty()) {
+        return HbIcon(variant.toString());
+    } else {
+        return HbIcon(operatorStoreIconPath);
     }
-    return icon;
-}
-
-/*!
- Creates text based on Central Repository
- \param crManager settings manager
- \retval icon
- */
-QString HsOperatorHandlerPrivate::readText(XQSettingsManager *crManager)
-{
-    qDebug("HsOperatorHandlerPrivate::readText");
-    QString text;
-
-    XQCentralRepositorySettingsKey textKey(AppLibUid, OperatorText);
-    QVariant textVariant = crManager->readItemValue(
-                               textKey, XQSettingsManager::TypeString);
-
-    if (!textVariant.isNull() && textVariant.isValid()) {
-        qDebug() << "HsOperatorHandlerPrivate::createIcon"
-                 << textVariant.toString();
-        text = textVariant.toString();
-    }
-    return text;
 }
 
 /*!
@@ -132,19 +143,14 @@
 CaEntry *HsOperatorHandlerPrivate::createAppEntry(
     XQSettingsManager *crManager)
 {
-    qDebug("HsOperatorHandlerPrivate::createAppEntry");
-    XQCentralRepositorySettingsKey appUidKey(AppLibUid, OperatorAppUid);
-    QVariant appUidVariant = crManager->readItemValue(
-                                 appUidKey, XQSettingsManager::TypeString);
-
-    if (!appUidVariant.isNull() && !appUidVariant.toString().isEmpty()) {
-        qDebug() << "HsOperatorHandlerPrivate::createAppEntry"
-                 << appUidVariant.toString();
-
+    QVariant variant = getVariantFromKey(
+            crManager, OperatorStoreApplication, XQSettingsManager::TypeString);
+    if (!variant.isNull()) {
         CaEntry *operatorEntry = new CaEntry;
         operatorEntry->setEntryTypeName(applicationTypeName());
         operatorEntry->setAttribute(
-            applicationUidEntryKey(), appUidVariant.toString());
+            applicationUidEntryKey(), variant.toString());
+
         return operatorEntry;
     }
     return NULL;
@@ -158,20 +164,104 @@
 CaEntry *HsOperatorHandlerPrivate::createUrlEntry(
     XQSettingsManager *crManager)
 {
-    qDebug("HsOperatorHandlerPrivate::createUrlEntry");
-    CaEntry *operatorEntry = new CaEntry;
+    QVariant variant = getVariantFromKey(
+            crManager, OperatorStoreURL, XQSettingsManager::TypeString);
+    if (!variant.isNull()) {
+        CaEntry *operatorEntry = new CaEntry;
+        operatorEntry->setEntryTypeName(urlTypeName());
+        operatorEntry->setAttribute(urlEntryKey(), variant.toString());
+
+        return operatorEntry;
+    }
+    return NULL;
+}
+
 
-    XQCentralRepositorySettingsKey urlKey(AppLibUid, OperatorUrl);
-    QVariant urlVariant = crManager->readItemValue(
-                              urlKey, XQSettingsManager::TypeString);
+/*!
+ Generic function to get stores presence values
+ \param crManager settings manager
+ \param storePresenceKey store key(Ovi or Operator)
+ \retval entry
+ */
+bool HsOperatorHandlerPrivate::storeValue(
+        XQSettingsManager *crManager, int storePresenceKey)
+{
+    QVariant variant = getVariantFromKey(
+            crManager, storePresenceKey, XQSettingsManager::TypeInt);
+    if (!variant.isNull()) {
+        return bool(variant.toInt());
+    }
+    return false;
+}
+
+/*!
+ Generic function to get QVariant for CR key
+ \param crManager settings manager
+ \param crKey CR key
+ \param type type of QVariant to be returned
+ \retval QVariant
+ */
+QVariant HsOperatorHandlerPrivate::getVariantFromKey(
+        XQSettingsManager *crManager, int crKey, XQSettingsManager::Type type)
+{
+    XQCentralRepositorySettingsKey presenceKey(AppLibUid, crKey);
+    QVariant presenceVariant = crManager->readItemValue(
+            presenceKey, type);
 
-    if (!urlVariant.isNull() && !urlVariant.toString().isEmpty()) {
-        operatorEntry->setEntryTypeName(urlTypeName());
-        operatorEntry->setAttribute(urlEntryKey(), urlVariant.toString());
-        qDebug() << "HsOperatorHandlerPrivate::createUrlEntry"
-                 << urlVariant.toString();
+    if (presenceVariant.isValid()) {
+        qDebug() << "HsOperatorHandlerPrivate::storePresent"
+                 << presenceVariant.toInt();
+        return presenceVariant;
+    }
+    return QVariant();
+}
+
+/*!
+ Generic function to get store type(Url/App)
+ \param crManager settings manager
+ \retval HsStoreType store type
+ */
+HsOperatorHandlerPrivate::HsStoreType
+        HsOperatorHandlerPrivate::operatorStoreType(
+                XQSettingsManager *crManager)
+{
+    QVariant variant = getVariantFromKey(
+            crManager, OperatorStoreType, XQSettingsManager::TypeInt);
+    if (!variant.isNull()) {
+        return HsOperatorHandlerPrivate::HsStoreType(variant.toInt());
     }
-    return operatorEntry;
+    return NoneType;
+}
+
+/*!
+ Creates text based on Central Repository
+ \param crManager settings manager
+ \retval icon
+ */
+QString HsOperatorHandlerPrivate::operatorStoreTitle(XQSettingsManager *crManager)
+{
+    QVariant variant = getVariantFromKey(
+            crManager, OperatorStoreTitle, XQSettingsManager::TypeString);
+    if (!variant.isNull()) {
+        return variant.toString();
+    }
+    return QString();
+}
+
+/*!
+ Retrives information if Operator Store should first in toolbarbased
+ (from Central Repository)
+ \param crManager settings manager
+ \retval true if Operator Store should be first
+ */
+bool HsOperatorHandlerPrivate::operatorStoreFirst(XQSettingsManager *crManager)
+{
+    QVariant variant = getVariantFromKey(
+            crManager, OperatorStore1stPopUp, XQSettingsManager::TypeInt);
+    if (!variant.isNull()) {
+        return bool(variant.toInt());
+    }
+    return false;
 }
 
 /*!
@@ -180,12 +270,21 @@
 void HsOperatorHandlerPrivate::readCentralRepository()
 {
     XQSettingsManager *crManager = new XQSettingsManager;
+    //this key indicates that ovi store should be removed
+    mOviStorePresent = !storeValue(crManager, RemoveOviStore);
+    //this key indicates that operator store should be added
+    mOperatorStorePresent = storeValue(crManager, IncludeOperatorStore);
 
-    mIcon = createIcon(crManager);
-    mText = readText(crManager);
-    mOperatorEntry = createAppEntry(crManager);
-    if (!mOperatorEntry) {
-        mOperatorEntry = createUrlEntry(crManager);
+    if (mOperatorStorePresent) {
+        mStoreType = operatorStoreType(crManager);
+        if (mStoreType == ApplicationType) {
+            mOperatorEntry = createAppEntry(crManager);
+        } else {
+            mOperatorEntry = createUrlEntry(crManager);
+        }
+        mOperatorStoreTitle = operatorStoreTitle(crManager);
+        mOperatorStoreFirst = operatorStoreFirst(crManager);
+        mIcon = createIcon(crManager);
     }
     delete crManager;
 }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hssearchview.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,349 @@
+/*
+ * 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: hssearchview.cpp
+ *
+ */
+
+#include <QApplication>
+#include <QInputContext>
+#include <QSortFilterProxyModel>
+
+#include <HbGroupBox>
+#include <HbLineEdit>
+#include <HbListView>
+#include <HbAbstractViewItem>
+#include <HbView>
+#include <HbSearchPanel>
+
+#include <caitemmodel.h>
+
+#include "hslistviewitem.h"
+#include "hsmainwindow.h"
+#include "hssearchview.h"
+
+/*!
+  Set up proxy model for search.
+  \param builder Retrieves UI widgets.
+  \param stateContext Identifies the state where search starts from.
+  \param mainWindow Enables switching between originating and search view.
+ */
+HsSearchView::HsSearchView(HsMenuViewBuilder &builder,
+        HsStateContext stateContext, HsMainWindow &mainWindow) :
+    mProxyModel(new QSortFilterProxyModel(this)), mSearchView(NULL),
+    mSearchListView(NULL), mSearchPanel(NULL), mStateContext(stateContext),
+    mBuilder(builder), mMainWindow(mainWindow), mListView(NULL),
+    mVkbHost(NULL), mSearchViewBuilder(), mEmptyResultText(true)
+{
+    mProxyModel->setFilterRole(CaItemModel::TextRole);
+    mProxyModel->setFilterKeyColumn(1);
+    mProxyModel->setSortRole(CaItemModel::TextRole);
+}
+
+/*!
+  Empty.
+ */
+HsSearchView::~HsSearchView()
+{
+}
+
+/*!
+    Makes the UI to show or hide view search panel.
+    When search panel is shown the view toolbar and status pane
+    are hidden until search panel is hidden.
+    \param visible When true search panel will be shown,
+     otherwise it will be hidden.
+ */
+void HsSearchView::setSearchPanelVisible(bool visible)
+{
+    HSMENUTEST_FUNC_ENTRY("HsMenuView::setSearchPanelVisible");
+
+    if (visible && !isActive()) {
+        searchBegins();
+        connectSearchItemViewsSignals();
+        connectSearchPanelSignals();
+    } else if (isActive()) {
+        disconnectSearchPanelSignals();
+        disconnectSearchItemViewsSignals();
+        searchFinished();
+    }
+    HSMENUTEST_FUNC_EXIT("HsMenuView::setSearchPanelVisible");
+}
+
+/*!
+    \param view List view to operate on.
+    \return Index of F=first visible item of \a view if any
+    or default QModelIndex otherwise.
+ */
+QModelIndex HsSearchView::firstVisibleItemIndex(const HbListView *view) const
+{
+    const QList<HbAbstractViewItem *> array = view->visibleItems();
+    if (array.count()) {
+        return array[0]->modelIndex();
+    }
+    return QModelIndex();
+}
+
+/*!
+ Displays search panel with view representing search results.
+ */
+void HsSearchView::searchBegins()
+{
+    HSMENUTEST_FUNC_ENTRY("HsSearchView::searchBegins");
+
+    setOriginatingContext();
+
+    mListView = mBuilder.currentListView();
+    mSearchViewInitialIndex = firstVisibleItemIndex(mListView);
+
+    mProxyModel->invalidate();
+    mProxyModel->setSourceModel(mListView->model());
+    mProxyModel->setFilterRegExp(
+            QRegExp(QString(".*"), Qt::CaseInsensitive, QRegExp::RegExp));
+
+    mSearchView = mSearchViewBuilder.searchView();
+    mSearchListView = mSearchViewBuilder.searchListView();
+    mSearchPanel = mSearchViewBuilder.searchPanel();
+    initSearchPanel(*mSearchPanel);
+    mVkbHost.reset(new HbShrinkingVkbHost(mSearchView));
+
+    if (mBuilder.currentViewLabel()) {
+        mSearchViewBuilder.searchViewLabel()->setHeading(
+                mBuilder.currentViewLabel()->heading());
+        mSearchViewBuilder.setSearchLabledContext();
+    }
+
+    mSearchView->hideItems(Hb::AllItems);
+    mSearchListView->setModel(mProxyModel, new HsListViewItem());
+
+    mMainWindow.setCurrentView(mSearchView);
+
+    mSearchListView->scrollTo(
+        mProxyModel->mapFromSource(mSearchViewInitialIndex),
+        HbAbstractItemView::PositionAtTop);
+
+    setNoResultsVisibility();
+    HSMENUTEST_FUNC_EXIT("HsSearchView::searchBegins");
+}
+
+/*!
+ Handles button visibility.
+ \param visibility indicates whether show or not to show 'empty' label.
+ */
+void HsSearchView::setNoResultsVisibility()
+{
+    if (mProxyModel->rowCount() && mEmptyResultText) {
+        mSearchViewBuilder.loadViewListSection();
+        mEmptyResultText = false;
+    } else if (!mProxyModel->rowCount() && !mEmptyResultText) {
+        mSearchViewBuilder.loadViewEmptySection();
+        mEmptyResultText = true;
+    }
+}
+
+/*
+ Connects \a activated and \a longPressed signals coming from search list
+ view to emit corresponding signal of this object with translated model index.
+*/
+void HsSearchView::connectSearchItemViewsSignals()
+{
+    connect(mSearchListView, SIGNAL(activated(QModelIndex)),
+            this, SLOT(activatedProxySlot(QModelIndex)));
+    connect(mSearchListView, SIGNAL(longPressed(HbAbstractViewItem *, QPointF)),
+            this, SLOT(longPressedProxySlot(HbAbstractViewItem *, QPointF)));
+}
+
+/*!
+ Disconnects \a activated and \a longPressed signals coming from list
+ view from to emit corresponding signal
+ of this object with translated model index.
+*/
+void HsSearchView::disconnectSearchItemViewsSignals()
+{
+    disconnect(mSearchListView, SIGNAL(activated(QModelIndex)),
+            this, SLOT(activatedProxySlot(QModelIndex)));
+    disconnect(mSearchListView,
+            SIGNAL(longPressed(HbAbstractViewItem *, QPointF)),
+            this, SLOT(longPressedProxySlot(HbAbstractViewItem *, QPointF)));
+}
+
+
+/*!
+ Makes search panel invisible.
+ Equivalent to \a setSearchPanelVisible(false).
+ */
+void HsSearchView::hideSearchPanel()
+{
+    HSMENUTEST_FUNC_ENTRY("HsMenuView::hideSearchPanel");
+    setSearchPanelVisible(false);
+    HSMENUTEST_FUNC_EXIT("HsMenuView::hideSearchPanel");
+}
+
+/*!
+ Connects signals \a exitClicked and \a criteriaChanged emitted
+ by search panel with handling slots of the object or its members.
+*/
+void HsSearchView::connectSearchPanelSignals()
+{
+    connect(mProxyModel, SIGNAL(rowsInserted(QModelIndex, int, int)),
+            this, SLOT(setNoResultsVisibility()));
+    connect(mProxyModel, SIGNAL(rowsRemoved(QModelIndex, int, int)),
+            this, SLOT(setNoResultsVisibility()));
+    connect(mSearchPanel, SIGNAL(exitClicked()),
+            this, SLOT(hideSearchPanel()));
+    connect(mSearchPanel, SIGNAL(criteriaChanged(QString)),
+            this, SLOT(findItem(QString)));
+}
+
+/*!
+ Disconnects signals \a exitClicked and \a criteriaChanged emitted
+ by search panel from handling slots of the object or its members
+ Scrolls view to state before connections.
+*/
+void HsSearchView::disconnectSearchPanelSignals()
+{
+    mProxyModel->disconnect(this);
+    mSearchPanel->disconnect(this);
+}
+
+/*!
+  Scrolls originating view to first item matching search criteria.
+ */
+void HsSearchView::searchFinished()
+{
+    HSMENUTEST_FUNC_ENTRY("HsSearchView::searchFinished");
+
+    mIndexToScrollAfterSearchDone = firstVisibleItemIndex(mSearchListView);
+
+    setOriginatingContext();
+
+    mMainWindow.setCurrentView(mBuilder.currentView());
+
+    mListView->scrollTo(mProxyModel->mapToSource(
+            mIndexToScrollAfterSearchDone),
+            HbAbstractItemView::PositionAtTop);
+
+    HbVkbHost::detachHost(mSearchView);
+    mVkbHost.reset(NULL);
+    mSearchListView = NULL;
+    mSearchPanel = NULL;
+    mProxyModel->setSourceModel(NULL);
+    HSMENUTEST_FUNC_EXIT("HsSearchView::searchFinished");
+}
+
+/*!
+ Looks up for item and if found scrolls to it.
+ \param criteriaStr The item name to find.
+ */
+void HsSearchView::findItem(QString criteriaStr)
+{
+    qDebug() << "HsSearchView::findItem: " + criteriaStr;
+    HSMENUTEST_FUNC_ENTRY("HsSearchView::findItem");
+
+    mProxyModel->setFilterRegExp(
+            QRegExp("(^|\\b)" + criteriaStr, Qt::CaseInsensitive));
+
+    mSearchListView->scrollTo(
+            mProxyModel->index(0,0), HbAbstractItemView::PositionAtTop);
+
+    HSMENUTEST_FUNC_EXIT("HsSearchView::findItem");
+}
+
+/*!
+ Slot used to translate activated signal from proxy model to normal model.
+ \param index Represents an item activated in search list view.
+ */
+void HsSearchView::activatedProxySlot(const QModelIndex &index)
+{
+    emit activated(mProxyModel->mapToSource(index));
+}
+
+/*!
+ Slot used to forward 'long pressed' signal with item description transladed
+ from search view context to context of the view search was requested from.
+  \param item Long pressed item.
+  \param coords Coordinates of the long press action.
+ */
+void HsSearchView::longPressedProxySlot(
+        HbAbstractViewItem *item, const QPointF &coords)
+{
+    /*
+    this is a kind of hack, introduced for reasons:
+    item object should be reusable later, but orbit (or qt) prevents setting
+    its index model to previous state
+    */
+    mSearchViewLongPressedIndex = mProxyModel->mapToSource(
+            item->modelIndex());
+    QScopedPointer<HbAbstractViewItem> itemNew(item->createItem());
+    itemNew->setModelIndex(mSearchViewLongPressedIndex);
+    emit longPressed(itemNew.data(), coords);
+}
+
+/*!
+  Sets up search panel.
+
+ \param searchPanel Search panel to initialize.
+ */
+void HsSearchView::initSearchPanel(HbSearchPanel &searchPanel)
+{
+    HbLineEdit *const lineEdit(searchPanelLineEdit(searchPanel));
+
+    lineEdit->setText("");
+    lineEdit->setFocus();
+    lineEdit->setInputMethodHints(
+            Qt::ImhNoPredictiveText | Qt::ImhNoAutoUppercase);
+}
+
+/*!
+ \param searchPanel Search panel to operate on.
+ \return Line edit of the searchPanel on success, NULL otherwise.
+ */
+HbLineEdit *HsSearchView::searchPanelLineEdit(
+        HbSearchPanel &searchPanel) const
+{
+    HSMENUTEST_FUNC_ENTRY("HsSearchView::searchPanelLineEdit");
+
+    HbLineEdit *result(0);
+    foreach(QGraphicsItem *obj, searchPanel.childItems()) {
+        QGraphicsWidget *const widget = static_cast<QGraphicsWidget *>(obj);
+        if (widget != NULL) {
+            HbLineEdit *const lineEdit = qobject_cast<HbLineEdit *>(widget);
+            if (lineEdit != NULL) {
+                result = lineEdit;
+                break;
+            }
+        }
+    }
+    HSMENUTEST_FUNC_EXIT("HsSearchView::searchPanelLineEdit");
+
+    return result;
+}
+
+/*!
+  Sets the builder context to the one determined by \a mStateContext and
+  \a HsItemViewContext.
+ */
+void HsSearchView::setOriginatingContext()
+{
+    mBuilder.setStateContext(mStateContext);
+    mBuilder.setOperationalContext(HsItemViewContext);
+}
+
+/*!
+  \retval true when search view is already invoked, \a false otherwise.
+ */
+bool HsSearchView::isActive() const
+{
+    return mSearchListView != NULL;
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hssearchviewbuilder.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,151 @@
+/*
+ * 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: Search View Builder
+ *
+ */
+
+#include <HbSearchPanel>
+#include <HbView>
+#include <HbListView>
+#include <HbGroupBox>
+#include "hssearchviewbuilder.h"
+
+const char *searchDocmlFile           = ":/xml/searchview.docml";
+const char *searchViewLabeledList     = "searchViewLabeledList";
+const char *searchViewList            = "searchViewList";
+const char *searchViewLabeledEmpty    = "searchViewLabeledEmpty";
+const char *searchViewEmpty           = "searchViewEmpty";
+
+
+/*!
+    \class HsSearchViewBuilder
+    \ingroup group_hsmenustateplugin
+
+    \brief Search View Builder
+
+    Reads UI object from Application Library Search docml
+
+    \sa HsMenuView
+*/
+
+/*!
+ Constructor. Loads UI objects from docml.
+ */
+HsSearchViewBuilder::HsSearchViewBuilder() : mLoader(new HbDocumentLoader()),
+    mLabledContext(false)
+{
+    bool loadStatusOk(false);
+    mLoadedObjects =
+            mLoader->load(searchDocmlFile, &loadStatusOk).toSet();
+    Q_ASSERT(loadStatusOk);
+}
+
+/*!
+ Destructor. Deletes seto of loaded objects.
+ */
+HsSearchViewBuilder::~HsSearchViewBuilder()
+{
+    qDeleteAll(mLoadedObjects);
+}
+
+/*!
+ \return Pointer to the view.
+ Memory ownership is not changed.
+ */
+HbView *HsSearchViewBuilder::searchView()
+{
+    return qobject_cast<HbView *>(mLoader->findWidget("view"));
+}
+
+/*!
+ \return Pointer to list view.
+ The pointer is valid until the HsSearchViewBuilder instance is destroyed.
+ Memory ownership is not changed.
+ */
+HbListView *HsSearchViewBuilder::searchListView()
+{
+    return qobject_cast<HbListView *>(mLoader->findWidget("listView"));
+}
+
+/*!
+ \return Pointer to search panel.
+ The pointer is valid until the HsSearchViewBuilder instance is destroyed.
+ Memory ownership is not changed.
+ */
+HbSearchPanel *HsSearchViewBuilder::searchPanel()
+{
+    return qobject_cast<HbSearchPanel *>(mLoader->findWidget("searchPanel"));
+}
+
+/*!
+ \return Pointer to the view label.
+ The pointer is valid until the HsSearchViewBuilder instance is destroyed.
+ Memory ownership is not changed.
+ */
+HbGroupBox *HsSearchViewBuilder::searchViewLabel()
+{
+    return qobject_cast<HbGroupBox *>(mLoader->findWidget("label"));
+}
+
+/*!
+ Switches HsSearchViewBuilder to labeled view layout.
+ */
+void HsSearchViewBuilder::setSearchLabledContext()
+{
+    mLabledContext = true;
+}
+
+/*!
+ \return true if section was succesfull loaded.
+ Loads proper empty docml section.
+ */
+bool HsSearchViewBuilder::loadViewEmptySection()
+{
+    bool loadStatusOk(false);
+    if(mLabledContext) {
+        mLoadedObjects |= mLoader->load(
+                searchDocmlFile,
+                searchViewLabeledEmpty,
+                &loadStatusOk).toSet();
+    } else {
+        mLoadedObjects |= mLoader->load(
+                searchDocmlFile,
+                searchViewEmpty,
+                &loadStatusOk).toSet();
+    }
+    Q_ASSERT(loadStatusOk);
+    return loadStatusOk;
+}
+
+/*!
+ \return true if section was succesfull loaded.
+ Loads proper list docml section.
+ */
+bool HsSearchViewBuilder::loadViewListSection()
+{
+    bool loadStatusOk(false);
+    if(mLabledContext) {
+        mLoadedObjects |= mLoader->load(
+                searchDocmlFile,
+                searchViewLabeledList,
+                &loadStatusOk).toSet();
+    } else {
+        mLoadedObjects |= mLoader->load(
+                searchDocmlFile,
+                searchViewList,
+                &loadStatusOk).toSet();
+    }
+    Q_ASSERT(loadStatusOk);
+    return loadStatusOk;
+}

--- a/homescreenapp/stateplugins/hshomescreenstateplugin/hshomescreenstateplugin.pro	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hshomescreenstateplugin/hshomescreenstateplugin.pro	Wed Aug 18 09:40:07 2010 +0300
@@ -29,7 +29,7 @@
 HB += hbfeedback
 
 CONFIG += plugin hb mobility
-MOBILITY = serviceframework
+MOBILITY = serviceframework systeminfo
 
 PLUGIN_SUBDIR = /private/20022F35/plugins/stateplugins
 
@@ -39,7 +39,6 @@
         -lhsdomainmodel \
         -lhsmenuserviceprovider
 
-RESOURCES += hshomescreenstateplugin.qrc
 
 symbian: {
     TARGET.UID3 = 0x20022F41

--- a/homescreenapp/stateplugins/hshomescreenstateplugin/hshomescreenstateplugin.qrc	Tue Jul 06 14:06:53 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/" >           
-        <file alias="controllayer.docml">resource/controllayer.docml</file>
-    </qresource>    
-</RCC>

--- a/homescreenapp/stateplugins/hshomescreenstateplugin/inc/hsdocumentloader.h	Tue Jul 06 14:06:53 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +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:  Homescreen document loader class.
-*
-*/
-
-#ifndef HSDOCUMENTLOADER_H
-#define HSDOCUMENTLOADER_H
-
-#include <hbdocumentloader.h>
-#include "hstest_global.h"
-
-HOMESCREEN_TEST_CLASS(HomeScreenStatePluginTest)
-
-class HsDocumentLoader : public HbDocumentLoader
-{
-public:
-    HsDocumentLoader();
-    virtual ~HsDocumentLoader();
-
-public:
-    QObject *createObject(const QString &type, const QString &name);
-
-private:
-
-    Q_DISABLE_COPY(HsDocumentLoader)
-
-    HOMESCREEN_TEST_FRIEND_CLASS(HomeScreenStatePluginTest)
-};
-
-#endif

--- a/homescreenapp/stateplugins/hshomescreenstateplugin/inc/hsidlestate.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hshomescreenstateplugin/inc/hsidlestate.h	Wed Aug 18 09:40:07 2010 +0300
@@ -31,11 +31,11 @@
 
 class QGraphicsItem;
 class QGraphicsSceneMouseEvent;
-class QPropertyAnimation;
+
 class QGestureEvent;
 class HbAction;
 class HbContinuousFeedback;
-class HsIdleWidget;
+
 class HsTitleResolver;
 class QParallelAnimationGroup;
 class HbMenu;
@@ -44,6 +44,9 @@
 #endif
 
 class HsWidgetHost;
+class HsPage;
+class HsMessageBoxWrapper;
+
 
 class HsIdleState : public QState
 {
@@ -60,6 +63,7 @@
     void event_moveScene();
     void event_selectWallpaper();
     void event_addPage();
+    void event_preRemovePage();
     void event_removePage();
     void event_toggleConnection();
 
@@ -78,8 +82,6 @@
     void addPageToScene(int pageIndex);    
     void updateZoneAnimation();
     void showTrashBin();
-    void removeActivePage();
-    void deleteZoneAnimation();
     QList<QRectF> createInactiveWidgetRects();
     void updatePagePresentationToWidgetSnap();
     void resetSnapPosition();
@@ -117,6 +119,9 @@
     void action_moveScene_moveToNearestPage();
     void action_moveScene_disconnectGestureHandlers();    
     void action_addPage_addPage();
+    void action_preRemovePage_showQuery();
+    void action_preRemovePage_exit();
+    void action_removePage_startRemovePageAnimation();
     void action_removePage_removePage();
     void action_toggleConnection_toggleConnection();
     void action_idle_setupTitle();
@@ -136,18 +141,17 @@
     bool openTaskSwitcher();
     void zoneAnimationFinished();
     void pageChangeAnimationFinished();
-    void onRemovePageConfirmationOk();
     void onVerticalSnapLineTimerTimeout();
     void onHorizontalSnapLineTimerTimeout();
     void onActivePageChanged();
-
+   
 private:
     HbAction *mNavigationAction;
-    HsIdleWidget *mUiWidget;  
+    
     HsTitleResolver *mTitleResolver;
-    QPropertyAnimation *mZoneAnimation;
+  
     bool mAllowZoneAnimation;
-    QPropertyAnimation *mPageChangeAnimation;
+    
     HbContinuousFeedback *mContinuousFeedback;
     bool mTrashBinFeedbackAlreadyPlayed;    
     QPointF mPageHotSpot;
@@ -157,12 +161,13 @@
     QPointer<HbMenu> mSceneMenu;
     HsWidgetPositioningOnWidgetMove::Result mSnapResult;
     HsWidgetPositioningOnWidgetMove::Result mPreviousSnapResult;
-    qreal mSnapBorderGap;
     QTimer mVerticalSnapLineTimer;
-    QTimer mHorizontalSnapLineTimer;
+    QTimer mHorizontalSnapLineTimer; 
 #ifdef Q_OS_SYMBIAN    
     XQSettingsManager *mSettingsMgr;
 #endif    
+    HsMessageBoxWrapper *mMessageBoxWrapper;
+
     HOMESCREEN_TEST_FRIEND_CLASS(HomeScreenStatePluginTest)
 };

--- a/homescreenapp/stateplugins/hshomescreenstateplugin/inc/hsidlewidget.h	Tue Jul 06 14:06:53 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-#ifndef HSIDLEWIDGET_H
-#define HSIDLEWIDGET_H
-
-#include <HbWidget>
-
-#include "hstest_global.h"
-HOMESCREEN_TEST_CLASS(HomeScreenStatePluginTest)
-
-class HsPage;
-class HsTrashBinWidget;
-class HsPageIndicator;
-class HsSnapLine;
-
-class HsIdleWidget : public HbWidget
-{
-    Q_OBJECT
-    Q_PROPERTY(qreal sceneX READ sceneX WRITE setSceneX)
-
-public:
-    HsIdleWidget(QGraphicsItem *parent = 0);
-	~HsIdleWidget();
-
-    qreal sceneX() const;
-    void setSceneX(qreal x);
-
-    void setGeometry(const QRectF &rect);
-
-    void setActivePage(int index);
-    void insertPage(int index, HsPage *page);
-    void removePage(int index);
-
-    HbWidget *controlLayer() const { return mControlLayer; }
-    HbWidget *pageLayer() const { return mPageLayer; }
-    HbWidget *pageWallpaperLayer() const { return mPageWallpaperLayer; }
-    HbWidget *sceneLayer() const { return mSceneLayer; }
-
-    HsTrashBinWidget *trashBin() const { return mTrashBin; }
-    HsPageIndicator *pageIndicator() const { return mPageIndicator; }
-
-    qreal parallaxFactor() const;
-
-
-public slots:
-    void showTrashBin();
-    void showPageIndicator();
-
-    void showVerticalSnapLine(const QLineF &snapLine);	
-    void hideVerticalSnapLine();
-    void showHorizontalSnapLine(const QLineF &snapLine);
-    void hideHorizontalSnapLine();
-
-protected:
-    void polishEvent();
-
-private:
-    Q_DISABLE_COPY(HsIdleWidget)
-    void loadControlLayer();
-        
-private:
-    HbWidget *mControlLayer;
-    HbWidget *mPageLayer;
-    HbWidget *mPageWallpaperLayer;
-    HbWidget *mSceneLayer;
-
-    HsTrashBinWidget *mTrashBin;
-    HsPageIndicator *mPageIndicator;
-
-    HsSnapLine *mHorizontalSnapLine;
-    HsSnapLine *mVerticalSnapLine;
-
-    HOMESCREEN_TEST_FRIEND_CLASS(HomeScreenStatePluginTest)
-};
-
-#endif // HSIDLEWIDGET_H

--- a/homescreenapp/stateplugins/hshomescreenstateplugin/resource/controllayer.docml	Tue Jul 06 14:06:53 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="0.9">
-    <widget name="controlLayer" type="HbWidget">
-        <widget name="pageIndicator" type="HsPageIndicator">
-            <sizehint height="2.5un" type="PREFERRED"/>
-        </widget>
-        <widget name="trashBin" type="HsTrashBinWidget">
-            <sizehint type="PREFERRED" height="11un" width="11un"/>
-        </widget>
-        <layout type="anchor">
-            <anchoritem dst="pageIndicator" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
-            <anchoritem dst="pageIndicator" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
-            <anchoritem dst="pageIndicator" dstEdge="BOTTOM" spacing="-1un" src="" srcEdge="BOTTOM"/>
-            <anchoritem dst="trashBin" dstEdge="CENTERH" spacing="0un" src="" srcEdge="CENTERH"/>
-            <anchoritem dst="trashBin" dstEdge="BOTTOM" spacing="-1un" src="" srcEdge="BOTTOM"/>
-        </layout>
-    </widget>
-    <metadata activeUIState="Common ui state" display="NHD portrait" unit="un">
-        <uistate name="Common ui state" sections="#common"/>
-    </metadata>
-</hbdocument>

--- a/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsbackuprestorestate.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsbackuprestorestate.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -27,6 +27,7 @@
 #include "hsscene.h"
 #include "hsgui.h"
 
+
 /*!
     \class HsBackupRestoreState
     \ingroup group_hshomescreenstateplugin
@@ -95,12 +96,5 @@
 void HsBackupRestoreState::deleteIdleView()
 {
     // Delete idle view
-    QScopedPointer<HbView> idleView(HsGui::takeIdleView());
-
-    if (idleView){
-        HbAction *navigationAction(idleView->navigationAction());
-        idleView->setNavigationAction(0);
-        delete navigationAction;
-        HsScene::mainWindow()->removeView(idleView.data());
-    }
+    HsGui::instance()->cleanupIdleUi();
 }

--- a/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsdocumentloader.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +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:  Homescreen document loader class.
-*
-*/
-
-#include "hsdocumentloader.h"
-#include "hspageindicator.h"
-#include "hstrashbinwidget.h"
-#include "hsconfiguration.h"
-
-/*!
-    \class HsDocumentLoader
-    \ingroup group_hshomescreenstateplugin
-    \brief Homescreen document loader class.
-
-    Loads own widgets from docml.
-*/
-
-/*!
-    Constructor.
-*/
-HsDocumentLoader::HsDocumentLoader()
-    : HbDocumentLoader()
-{
-}
-
-/*!
-    Destructor.
-*/
-HsDocumentLoader::~HsDocumentLoader()
-{
-}
-
-/*!
-    Looks up an object which inherits class type and of which object name equals to name.
-    \a type type of the desired object.
-    \a name object name of the desired object.
-    */
-QObject *HsDocumentLoader::createObject(const QString &type, const QString &name)
-{
-    if (type == HsPageIndicator::staticMetaObject.className()) {
-        QObject *object = new HsPageIndicator(HSCONFIGURATION_GET(pageIndicatorSpacing));
-        object->setObjectName(name);
-        return object;
-    }
-    else if (type == HsTrashBinWidget::staticMetaObject.className()) {
-        QObject *object = new HsTrashBinWidget;
-        object->setObjectName(name);
-        return object;
-    }
-        
-    return HbDocumentLoader::createObject(type, name);
-}

--- a/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsidlestate.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsidlestate.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -42,7 +42,9 @@
 #include "hsdomainmodeldatastructures.h"
 #include "hsscene.h"
 #include "hspage.h"
+#include "hspagevisual.h"
 #include "hswidgethost.h"
+#include "hswidgethostvisual.h"
 #include "hswallpaper.h"
 #include "hswallpaperselectionstate.h"
 #include "hstrashbinwidget.h"
@@ -51,19 +53,15 @@
 #include "hshomescreenstatecommon.h"
 #include "hstitleresolver.h"
 #include "hsmenuservice.h"
+#include "hsconfiguration.h"
+#include "hsmessageboxwrapper.h"
+#include "hspropertyanimationwrapper.h"
 #include "hsgui.h"
-#include "hsconfiguration.h"
 
-// Helper macros for connecting state entry and exit actions.
-#define ENTRY_ACTION(state, action) \
-    connect(state, SIGNAL(entered()), SLOT(action()));
-#define EXIT_ACTION(state, action) \
-    connect(state, SIGNAL(exited()), SLOT(action()));
 
 namespace
 {
-    const char gApplicationLibraryIconName[] = "qtg_mono_applications_all";
-
+  
     //User adds a new page to home screen
     const char hsLocTextId_OptionsMenu_AddPage[] = "txt_homescreen_opt_add_page";
 
@@ -90,13 +88,15 @@
 
     //Text in confirmation dialog while removing page with content
     const char hsLocTextId_Confirmation_RemovePage[] = "txt_homescreen_info_page_and_content_will_be_remov";
-
-    //Button in confirmation dialog while removing page with content
-    const char hsLocTextId_ConfirmationButton_Ok[] = "txt_homescreen_button_ok";
+}
 
-    //Button in confirmation dialog while removing page with content
-    const char hsLocTextId_ConfirmationButton_Cancel[] = "txt_homescreen_button_cancel";
-}
+// Helper macros for connecting state entry and exit actions.
+#define ENTRY_ACTION(state, action) \
+    connect(state, SIGNAL(entered()), SLOT(action()));
+#define EXIT_ACTION(state, action) \
+    connect(state, SIGNAL(exited()), SLOT(action()));
+
+
 
 /*!
     \class HsIdleState
@@ -114,23 +114,22 @@
 */
 HsIdleState::HsIdleState(QState *parent)
   : QState(parent),
-    mNavigationAction(0), mUiWidget(0),
+    mNavigationAction(0), 
     mTitleResolver(0),
-    mZoneAnimation(0),
     mAllowZoneAnimation(false),
-    mPageChangeAnimation(0),
     mContinuousFeedback(0),
     mTrashBinFeedbackAlreadyPlayed(false),
     mDeltaX(0),
-    mSceneMenu(0),
-    mSnapBorderGap(0.0)
+    mSceneMenu(0)
 #ifdef Q_OS_SYMBIAN
     ,mSettingsMgr(0)
 #endif
+    ,mMessageBoxWrapper(0)
+    
 {
     setupStates();
     mTitleResolver = new HsTitleResolver(this);
-
+     
     // TODO: Uncomment when updated API available
     //mContinuousFeedback = new HbContinuousFeedback;
     //mContinuousFeedback->setContinuousEffect(HbFeedback::ContinuousSmooth);
@@ -145,7 +144,6 @@
 */
 HsIdleState::~HsIdleState()
 {
-    delete mZoneAnimation;
     // TODO: Uncomment when updated API available
     //delete mContinuousFeedback;
 }
@@ -231,6 +229,7 @@
     HsWallpaperSelectionState *state_wallpaperSelectionState =
         new HsWallpaperSelectionState(this);
     QState *state_addPage = new QState(this);
+    QState *state_preRemovePage = new QState(this);
     QState *state_removePage = new QState(this);
     QState *state_toggleConnection = new QState(this);
 
@@ -239,7 +238,7 @@
     state_waitInput->addTransition(
         this, SIGNAL(event_addPage()), state_addPage);
     state_waitInput->addTransition(
-        this, SIGNAL(event_removePage()), state_removePage);
+        this, SIGNAL(event_preRemovePage()), state_preRemovePage);
     state_waitInput->addTransition(
         this, SIGNAL(event_toggleConnection()), state_toggleConnection);
     state_waitInput->addTransition(
@@ -259,8 +258,15 @@
         state_wallpaperSelectionState, SIGNAL(event_waitInput()), state_waitInput);
 
     state_addPage->addTransition(state_waitInput);
+    
+    state_preRemovePage->addTransition(
+        this,SIGNAL(event_removePage()),state_removePage);
+    
+    state_preRemovePage->addTransition(
+        this,SIGNAL(event_waitInput()),state_waitInput);
 
-    state_removePage->addTransition(state_waitInput);
+    state_removePage->addTransition(
+        this,SIGNAL(event_waitInput()),state_waitInput);
 
     state_toggleConnection->addTransition(state_waitInput);
 
@@ -299,8 +305,12 @@
     EXIT_ACTION(state_moveScene, action_moveScene_disconnectGestureHandlers)
     
     ENTRY_ACTION(state_addPage, action_addPage_addPage)
+    
+    ENTRY_ACTION(state_preRemovePage, action_preRemovePage_showQuery)
+    EXIT_ACTION(state_preRemovePage, action_preRemovePage_exit);
 
-    ENTRY_ACTION(state_removePage, action_removePage_removePage)
+    ENTRY_ACTION(state_removePage, action_removePage_startRemovePageAnimation)
+    EXIT_ACTION(state_removePage, action_removePage_removePage)
 
     ENTRY_ACTION(state_toggleConnection, action_toggleConnection_toggleConnection)
 }
@@ -310,7 +320,7 @@
 */
 qreal HsIdleState::pageLayerXPos(int pageIndex) const
 {
-    return -pageIndex * HsScene::mainWindow()->layoutRect().width();
+    return -pageIndex * HsGui::instance()->layoutRect().width();
 }
 
 /*!
@@ -319,25 +329,31 @@
 */
 void HsIdleState::startPageChangeAnimation(int targetPageIndex, int duration)
 {
-    if (!mPageChangeAnimation) {
-        mPageChangeAnimation = new QPropertyAnimation(mUiWidget, "sceneX");        
+    HsPropertyAnimationWrapper *animation = HsGui::instance()->pageChangeAnimation();
+    if (animation->isRunning()) {
+        animation->stop();
+    }        
+    animation->disconnect(this);
+    animation->setEndValue(pageLayerXPos(targetPageIndex));
+    animation->setDuration(duration);
+    
+    if (abs(mDeltaX) < HSCONFIGURATION_GET(pageChangePanDistanceInPixels)) {
+        animation->setEasingCurve(HSCONFIGURATION_GET(bounceAnimationEasingCurve)); 
     }
-    else if (mPageChangeAnimation->state() != QAbstractAnimation::Stopped) {
-        mPageChangeAnimation->stop();
-    }        
-    
-    mPageChangeAnimation->setEndValue(pageLayerXPos(targetPageIndex));
-    mPageChangeAnimation->setDuration(duration);
-    connect(mPageChangeAnimation,
+    else {
+        animation->setEasingCurve(HSCONFIGURATION_GET(pageChangeAnimationEasingCurve));
+    }
+
+    connect(animation,
             SIGNAL(finished()),
             SLOT(pageChangeAnimationFinished()), 
             Qt::UniqueConnection);
-    mPageChangeAnimation->start();
+    animation->start();
     
     HbInstantFeedback::play(HSCONFIGURATION_GET(pageChangeFeedbackEffect));
     
-    mUiWidget->showPageIndicator();
-    mUiWidget->setActivePage(targetPageIndex);
+    HsGui::instance()->idleWidget()->showPageIndicator();
+    HsGui::instance()->idleWidget()->setActivePage(targetPageIndex);
 }
 
 /*!
@@ -358,25 +374,25 @@
         return;
     }
 
-    if (!mZoneAnimation) {
-        mZoneAnimation = new QPropertyAnimation(mUiWidget, "sceneX");
-    }
-
     int bounceEffect = HSCONFIGURATION_GET(bounceEffect);
+    
+    HsPropertyAnimationWrapper *pageCrawlingAnimation =
+        HsGui::instance()->pageCrawlingAnimation();
 
     if (isInLeftPageChangeZone()) {
-        mZoneAnimation->setEndValue(pageLayerXPos(scene->activePageIndex()) + bounceEffect);
+        pageCrawlingAnimation->setEndValue(pageLayerXPos(scene->activePageIndex()) + bounceEffect);
     } else {
-        mZoneAnimation->setEndValue(pageLayerXPos(scene->activePageIndex()) - bounceEffect);
+        pageCrawlingAnimation->setEndValue(pageLayerXPos(scene->activePageIndex()) - bounceEffect);
     }
-    mZoneAnimation->setDuration(duration);
-    mZoneAnimation->setDirection(QAbstractAnimation::Forward);
+    pageCrawlingAnimation->setDuration(duration);
+    pageCrawlingAnimation->setForward();
 
-    connect(mZoneAnimation,
+    connect(pageCrawlingAnimation,
             SIGNAL(finished()),
-            SLOT(zoneAnimationFinished()));
+            SLOT(zoneAnimationFinished()),
+            Qt::UniqueConnection);
     
-    mZoneAnimation->start();
+    pageCrawlingAnimation->start();
 }
 
 /*!
@@ -404,7 +420,7 @@
 */
 bool HsIdleState::isInRightPageChangeZone()
 {
-    qreal pageWidth = HsScene::mainWindow()->layoutRect().width();
+    qreal pageWidth = HsGui::instance()->layoutRect().width();
     return mWidgetHotSpot.x() > pageWidth - HSCONFIGURATION_GET(pageChangeZoneWidth);
 }
 
@@ -418,7 +434,7 @@
     HsPage *page = HsPage::createInstance(data);
     page->load();
     HsScene::instance()->addPage(page);
-    mUiWidget->insertPage(pageIndex, page);
+    HsGui::instance()->idleWidget()->insertPage(pageIndex, page);
 }
 
 /*!
@@ -426,26 +442,25 @@
 */
 void HsIdleState::updateZoneAnimation()
 {
-    if (isInPageChangeZone() && mAllowZoneAnimation) {
-        if (!mZoneAnimation && (!mPageChangeAnimation
-            || mPageChangeAnimation->state() == QAbstractAnimation::Stopped )) {
+    HsPropertyAnimationWrapper *pageCrawlingAnimation = 
+        HsGui::instance()->pageCrawlingAnimation();
+
+    if (!mAllowZoneAnimation) {
+        pageCrawlingAnimation->stop();
+    } else if (isInPageChangeZone()) {
+        // should we start it
+        if (!pageCrawlingAnimation->isRunning() &&
+            !HsGui::instance()->pageChangeAnimation()->isRunning()) {
             startPageChangeZoneAnimation(HSCONFIGURATION_GET(pageChangeZoneAnimationDuration));
-        }
-    } else if (mZoneAnimation && !isInPageChangeZone()) {
-        if (mZoneAnimation->state() == QAbstractAnimation::Running) {
-            if (mZoneAnimation->direction() == QAbstractAnimation::Forward) {
-                mZoneAnimation->setDuration(HSCONFIGURATION_GET(pageChangeZoneReverseAnimationDuration));
-                mZoneAnimation->setDirection(QAbstractAnimation::Backward);
-            }
-        } else {
-            // Out of the page change zone. Delete animation.
-            deleteZoneAnimation();
-        }
-    } else if (!isInPageChangeZone()) {
-        if (mZoneAnimation) {
-            mZoneAnimation->stop();
-        }
-    }
+        } 
+    } else if (pageCrawlingAnimation->isRunning()) {
+        // Not in zone, but still running     
+        if (pageCrawlingAnimation->isForward()){
+            // reverse
+            pageCrawlingAnimation->setDuration(HSCONFIGURATION_GET(pageChangeZoneReverseAnimationDuration));
+            pageCrawlingAnimation->setBackward();
+        } 
+    } 
 }
 
 /*!
@@ -453,87 +468,32 @@
 */
 void HsIdleState::showTrashBin()
 {
-    if (mUiWidget->trashBin()->isUnderMouse()) {
+    if (HsGui::instance()->idleWidget()->trashBin()->isUnderMouse()) {
         if (!mTrashBinFeedbackAlreadyPlayed) {
             HbInstantFeedback::play(HSCONFIGURATION_GET(widgetOverTrashbinFeedbackEffect));
             mTrashBinFeedbackAlreadyPlayed = true;
         }
-        mUiWidget->trashBin()->activate();
+        HsGui::instance()->idleWidget()->trashBin()->activate();
     } else {
-        mUiWidget->trashBin()->deactivate();
+        HsGui::instance()->idleWidget()->trashBin()->deactivate();
         mTrashBinFeedbackAlreadyPlayed = false;
     }
 
-    if (!mUiWidget->pageIndicator()->isAnimationRunning()) {
-        mUiWidget->showTrashBin();
+    if (!HsGui::instance()->idleWidget()->pageIndicator()->isAnimationRunning()) {
+        HsGui::instance()->idleWidget()->showTrashBin();
     }
 }
 
 /*!
-    Removes currently active page.
-*/
-void HsIdleState::removeActivePage()
-{
-    HsScene *scene = HsScene::instance();
-    HsPage *page = scene->activePage();
-
-    int pageIndex = scene->activePageIndex();
-
-    mUiWidget->removePage(pageIndex);
-    scene->removePage(page);
-    
-    if (page->wallpaper()) {
-        page->wallpaper()->remove();        
-    }
-    delete page;
-
-    pageIndex = pageIndex == 0 ? 0 : pageIndex - 1;
-    scene->setActivePageIndex(pageIndex);
-
-    startPageChangeAnimation(pageIndex, HSCONFIGURATION_GET(pageRemovedAnimationDuration));
-
-    mUiWidget->pageIndicator()->removeItem(pageIndex);
-    mUiWidget->setActivePage(pageIndex);
-    mUiWidget->showPageIndicator();
-}
-
-/*!
-    Deletes page change zone animation.
-*/
-void HsIdleState::deleteZoneAnimation()
-{
-    delete mZoneAnimation;
-    mZoneAnimation = NULL;
-}
-
-/*!
     If called for the first time, setups the idle view.
     Updates the soft key action and sets the idle view
     as the current view to the main window.
 */
 void HsIdleState::action_idle_setupView()
 {
-    HbView *idleView = HsGui::idleView();
-    if (!idleView) {
-        mUiWidget = new HsIdleWidget;
-        idleView = HsScene::mainWindow()->addView(mUiWidget);
-        idleView->setContentFullScreen();
+    HsGui::instance()->setupIdleUi();
+    connect(HsGui::instance(),SIGNAL(navigateToApplibrary()),SIGNAL(event_applicationLibrary()),Qt::UniqueConnection);
 
-        mNavigationAction = new HbAction(this);
-        mNavigationAction->setIcon(HbIcon(gApplicationLibraryIconName));
-        mNavigationAction->setObjectName("applib_navigation_action");
-        connect(mNavigationAction, SIGNAL(triggered()), SIGNAL(event_applicationLibrary()));
-        idleView->setNavigationAction(mNavigationAction);
-
-        HsGui::setIdleView(idleView);
-
-        if (mPageChangeAnimation) {
-            delete mPageChangeAnimation;
-            mPageChangeAnimation = NULL;
-        }
-    }
-
-    HsScene::mainWindow()->setCurrentView(idleView);
 }
 
 /*!
@@ -553,7 +513,7 @@
 void HsIdleState::onTitleChanged(QString title)
 {
     qDebug() << "HsIdleState::onTitleChanged() to title: " << title;
-    HsGui::idleView()->setTitle(title);
+    HsGui::instance()->idleView()->setTitle(title);
 }
 
 /*!
@@ -587,9 +547,6 @@
     mTitleResolver->disconnect(this);
 }
 
-#ifdef COVERAGE_MEASUREMENT
-#pragma CTC SKIP
-#endif //COVERAGE_MEASUREMENT
 /*!
 
 */
@@ -617,9 +574,6 @@
     mSceneMenu->setPreferredPos(mPageHotSpot);
     mSceneMenu->open();
 }
-#ifdef COVERAGE_MEASUREMENT
-#pragma CTC ENDSKIP
-#endif //COVERAGE_MEASUREMENT
 
 void HsIdleState::onPagePanStarted(QGestureEvent *event)
 {
@@ -636,11 +590,11 @@
 
     HsScene *scene = HsScene::instance();
     int bounceEffect = HSCONFIGURATION_GET(bounceEffect);
-    qreal x = qBound(pageLayerXPos(scene->pages().count() - 1) - bounceEffect / 2 / mUiWidget->parallaxFactor(),
+    qreal x = qBound(pageLayerXPos(scene->pages().count() - 1) - bounceEffect / 2 / HsGui::instance()->idleWidget()->parallaxFactor(),
                      pageLayerXPos(scene->activePageIndex()) + mDeltaX,
-                     pageLayerXPos(0) + (bounceEffect / 2 / mUiWidget->parallaxFactor()));
+                     pageLayerXPos(0) + (bounceEffect / 2 / HsGui::instance()->idleWidget()->parallaxFactor()));
 
-    mUiWidget->setSceneX(x);
+    HsGui::instance()->idleWidget()->setSceneX(x);
 }
  
 void HsIdleState::onPagePanFinished(QGestureEvent *event)
@@ -666,41 +620,42 @@
     
     mWidgetHotSpot = qobject_cast<HbTapAndHoldGesture *>(
         event->gesture(Qt::TapAndHoldGesture))->scenePosition();
-    mWidgetHotSpotOffset = mWidgetHotSpot - widget->pos();
+    mWidgetHotSpotOffset = mWidgetHotSpot - widget->visual()->pos();
     
     emit event_moveWidget();
 }
  
 void HsIdleState::onWidgetMoveUpdated(const QPointF &scenePos, HsWidgetHost *widget)
 {
-    HsScene *scene = HsScene::instance();
-    QRectF widgetRect = widget->geometry();
+    QRectF widgetRect = widget->visual()->geometry();
 
-    // Move widget to new position.
+    // Move widget to updated position.
     mWidgetHotSpot = scenePos;
-       
     widgetRect.moveTopLeft(mWidgetHotSpot - mWidgetHotSpotOffset);
 
-    // Widget can be moved over the pages left border.
+    // When moving widget can go over the pages left border.
     qreal lowerBoundX = -widgetRect.width();
-    HsPage *page = scene->activePage();
-    QRectF pageRect = HsGui::idleView()->rect();
-    // Widget can be moved over the pages right border.
+
+    // When moving widget can go over the pages right border.
+    QRectF pageRect = HsGui::instance()->idleView()->rect();
     qreal upperBoundX = pageRect.width();
 
+    // When moving widget can go under the chrome at the pages upper border.
     // Notice that chrome height is 64 pixels.
     qreal lowerBoundY = qreal(64) - widgetRect.height();
-    // Widget can be moved over the pages down border.
+
+    // When moving widget can go over the pages down border.
     qreal upperBoundY = pageRect.height();
 
     qreal widgetX = qBound(lowerBoundX, widgetRect.x(), upperBoundX);
     qreal widgetY = qBound(lowerBoundY, widgetRect.y(), upperBoundY);
+
     // If using ItemClipsChildrenToShape-flag in widgethost then
     // setPos does not update position here, however setGeometry does it, QT bug?
-    widget->setGeometry(widgetX, widgetY, widgetRect.width(), widgetRect.height());
+    widget->visual()->setGeometry(widgetX, widgetY, widgetRect.width(), widgetRect.height());
     
     if (HSCONFIGURATION_GET(isSnapEnabled)) {
-        mSnapResult = HsWidgetPositioningOnWidgetMove::instance()->run(widget->sceneBoundingRect());
+        mSnapResult = HsWidgetPositioningOnWidgetMove::instance()->run(widget->visual()->sceneBoundingRect());
 
         if (HSCONFIGURATION_GET(isSnapEffectsEnabled)) {
             if (mSnapResult.hasHorizontalSnap) {
@@ -720,11 +675,12 @@
         mPreviousSnapResult = mSnapResult;
     }
 
-
-    int bounceFeedbackEffectDistance = HSCONFIGURATION_GET(bounceFeedbackEffectDistance);
     // Handle effects:
     // User is indicated by a tactile feedback if he/she is trying to move
     // widget over the first or the last page.
+    HsScene *scene = HsScene::instance();
+    HsPage *page = scene->activePage();
+    int bounceFeedbackEffectDistance = HSCONFIGURATION_GET(bounceFeedbackEffectDistance);
     if( (page == scene->pages().first() && mWidgetHotSpot.x() < bounceFeedbackEffectDistance ) ||
         (page == scene->pages().last() && scene->pages().count() == HSCONFIGURATION_GET(maximumPageCount)
          && mWidgetHotSpot.x() > pageRect.width() - bounceFeedbackEffectDistance)) {
@@ -733,8 +689,7 @@
             //if (!mContinuousFeedback->isPlaying()) {
             //    mContinuousFeedback->play();
             //}
-        }
-        else /*if (mContinuousFeedback->isPlaying())*/ {
+        } else /*if (mContinuousFeedback->isPlaying())*/ {
             //mContinuousFeedback->stop();
         }
 
@@ -783,7 +738,7 @@
     QApplication::instance()->installEventFilter(scene);
     scene->activePage()->showWidgets();
     qreal x = pageLayerXPos(scene->activePageIndex());
-    mUiWidget->setSceneX(x);
+    HsGui::instance()->idleWidget()->setSceneX(x);
 }
 
 /*!
@@ -791,7 +746,7 @@
 */
 void HsIdleState::action_idle_connectOrientationChangeEventHandler()
 {
-    connect(HsScene::mainWindow(),
+    connect(HsGui::instance(),
         SIGNAL(orientationChanged(Qt::Orientation)),
         SLOT(action_idle_orientationChanged()));
 }
@@ -838,9 +793,10 @@
     HsScene *scene = HsScene::instance();
     QApplication::instance()->removeEventFilter(scene);
     scene->activePage()->hideWidgets();
-
+    
+    HsGui::instance()->disconnect(this,SIGNAL(event_applicationLibrary()));
     //Close options menu on view change
-    HsGui::idleView()->setMenu(NULL);
+    HsGui::instance()->idleView()->setMenu(NULL);
 
     //Close context menu on view change
     if (mSceneMenu) {
@@ -853,7 +809,7 @@
 */
 void HsIdleState::action_idle_disconnectOrientationChangeEventHandler()
 {
-    disconnect(HsScene::mainWindow(),
+    disconnect(HsGui::instance(),
         SIGNAL(orientationChanged(Qt::Orientation)),
         this, SLOT(action_idle_orientationChanged()));
 }
@@ -876,44 +832,39 @@
     HbMenu *menu = new HbMenu();
     menu->setObjectName("hs_menu");
     // Task switcher
-    HbAction *action = menu->addAction(hbTrId(hsLocTextId_OptionsMenu_TaskSwitcher),
+    menu->addAction(hbTrId(hsLocTextId_OptionsMenu_TaskSwitcher),
         this, SLOT(openTaskSwitcher()));
-    action->setObjectName("action_open_task_switcher");
+    
     // Add content
-    action = menu->addAction(hbTrId(hsLocTextId_ContextMenu_AddContent),
+    menu->addAction(hbTrId(hsLocTextId_ContextMenu_AddContent),
         this, SLOT(onAddContentFromOptionsMenuActionTriggered()));
-    action->setObjectName("action_add_content");
     // Add page
     if (scene->pages().count() < HSCONFIGURATION_GET(maximumPageCount)) {
-        action = menu->addAction(hbTrId(hsLocTextId_OptionsMenu_AddPage),
+        menu->addAction(hbTrId(hsLocTextId_OptionsMenu_AddPage),
             this, SIGNAL(event_addPage()));
-        action->setObjectName("action_add_page");
-
+    
     }
 
     // Change wallpaper
-    action = menu->addAction(hbTrId(hsLocTextId_ContextMenu_ChangeWallpaper),
+    menu->addAction(hbTrId(hsLocTextId_ContextMenu_ChangeWallpaper),
         this, SIGNAL(event_selectWallpaper()));
-    action->setObjectName("action_change_wallpaper");
+    
     // Remove page
     if (scene->activePage()->isRemovable()) {
-        action = menu->addAction(hbTrId(hsLocTextId_OptionsMenu_RemovePage),
-            this, SIGNAL(event_removePage()));
-        action->setObjectName("action_remove_page"); 
+        menu->addAction(hbTrId(hsLocTextId_OptionsMenu_RemovePage),
+            this, SIGNAL(event_preRemovePage()));
     }
 
     // Online / Offline
     if (scene->isOnline()) {
-        action = menu->addAction(hbTrId(hsLocTextId_OptionsMenu_HsToOffline),
+        menu->addAction(hbTrId(hsLocTextId_OptionsMenu_HsToOffline),
             this, SIGNAL(event_toggleConnection()));
-        action->setObjectName("action_to_offline");
     } else {
-        action = menu->addAction(hbTrId(hsLocTextId_OptionsMenu_HsToOnline),
+        menu->addAction(hbTrId(hsLocTextId_OptionsMenu_HsToOnline),
             this, SIGNAL(event_toggleConnection()));
-        action->setObjectName("action_to_online");
     }
 
-    HsGui::idleView()->setMenu(menu);
+    HsGui::instance()->idleView()->setMenu(menu);
 }
 
 void HsIdleState::action_waitInput_connectGestureHandlers()
@@ -962,9 +913,9 @@
 {
     HsWidgetHost *widget = HsScene::instance()->activeWidget();
     Q_ASSERT(widget);
-    widget->setParentItem(mUiWidget->controlLayer());
+    widget->visual()->setParentItem(HsGui::instance()->idleWidget()->controlLayer());
 
-    mUiWidget->showTrashBin();
+    HsGui::instance()->idleWidget()->showTrashBin();
 }
 
 /*!
@@ -1001,16 +952,13 @@
 void HsIdleState::action_moveWidget_setWidgetSnap()
 {
     if (HSCONFIGURATION_GET(isSnapEnabled)) {
-        mSnapBorderGap = HSCONFIGURATION_GET(snapBorderGap);
 
         QVariantHash snapConfiguration;
         snapConfiguration[SNAPENABLED] = QString::number(HSCONFIGURATION_GET(isSnapEnabled));
         snapConfiguration[SNAPFORCE] = QString::number(HSCONFIGURATION_GET(snapForce));
         snapConfiguration[SNAPGAP] = QString::number(HSCONFIGURATION_GET(snapGap));
-        snapConfiguration[SNAPBORDERGAP] = mSnapBorderGap;
         HsWidgetPositioningOnWidgetMove::instance()->setConfiguration(snapConfiguration);
 
-
         updatePagePresentationToWidgetSnap();
 
         connect(HsScene::instance(), SIGNAL(activePageChanged()),
@@ -1045,7 +993,7 @@
         if (widget == activeWidget) {
            continue;
         }
-        QRectF widgetRect = widget->geometry();
+        QRectF widgetRect = widget->visual()->geometry();
         incativeWidgetRects.append(widgetRect);
     }
     return incativeWidgetRects;
@@ -1056,18 +1004,20 @@
 */
 void HsIdleState::action_moveWidget_reparentToPage()
 {
-    if (mZoneAnimation
-        && mZoneAnimation->state() == QAbstractAnimation::Running
-        && mZoneAnimation->direction() == QAbstractAnimation::Forward) {
-        mZoneAnimation->setDuration(HSCONFIGURATION_GET(pageChangeZoneReverseAnimationDuration));
-        mZoneAnimation->setDirection(QAbstractAnimation::Backward);
+    HsPropertyAnimationWrapper *pageCrawlingAnimation =
+        HsGui::instance()->pageCrawlingAnimation();
+    if (pageCrawlingAnimation->isRunning()&& 
+        pageCrawlingAnimation->isForward()) {
+
+        pageCrawlingAnimation->setDuration(HSCONFIGURATION_GET(pageChangeZoneReverseAnimationDuration));
+        pageCrawlingAnimation->setBackward();
     }
 
     HsScene *scene = HsScene::instance();
     HsPage *page = scene->activePage();
     HsWidgetHost *widget = scene->activeWidget();
 
-    if (mUiWidget->trashBin()->isUnderMouse()) {
+    if (HsGui::instance()->idleWidget()->trashBin()->isUnderMouse()) {
         HbInstantFeedback::play(HSCONFIGURATION_GET(widgetDropToTrashbinFeedbackEffect));
         widget->page()->removeWidget(widget);
         widget->remove();
@@ -1076,17 +1026,15 @@
         if (widget->page() != page) {
             widget->page()->removeWidget(widget);
             page->addExistingWidget(widget);
-            if (HsScene::orientation() == Qt::Horizontal) {
+            if (HsGui::instance()->orientation() == Qt::Horizontal) {
                 widget->removePresentation(Qt::Vertical);
             } else {
                 widget->removePresentation(Qt::Horizontal);
             }
         }
 
-        QRectF widgetRect = widget->geometry();
-        QRectF pageRect = page->rect();
-
         //Set the snap position of the widget and save the position
+        QRectF widgetRect = widget->visual()->geometry();
         if (mSnapResult.hasHorizontalSnap) {
             widgetRect.moveLeft(mSnapResult.horizontalSnapPosition);
         }
@@ -1094,23 +1042,16 @@
             widgetRect.moveTop(mSnapResult.verticalSnapPosition);
         }
 
-        //if snapBorderGap is defined, the widget is bounded in the rectangle which is smaller by snapBorderGap on all sides
-        qreal widgetX = qBound(qreal(0) + mSnapBorderGap, widgetRect.x(), (pageRect.width() - mSnapBorderGap) - widgetRect.width());
-        qreal widgetY = qBound(qreal(64) + mSnapBorderGap, widgetRect.y(), (pageRect.height() - mSnapBorderGap) - widgetRect.height());
-
-        // play feedback effect if user drops widget between pages and it needs to be repositioned back to original page
-        if( widgetX != widgetRect.x() || widgetY != widgetRect.y()) {
-            HbInstantFeedback::play(HSCONFIGURATION_GET(widgetRepositionFeedbackEffect));
-        }
-        widget->setPos(widgetX, widgetY);
+        QPointF adjustedWidgetPosition = page->adjustedWidgetPosition(widgetRect);
+        widget->visual()->setPos(adjustedWidgetPosition);
 
         widget->savePresentation();
         page->updateZValues();
     }
 
-    widget->setParentItem(HsScene::instance()->activePage());
+    widget->visual()->setParentItem(HsScene::instance()->activePage()->visual());
 
-    mUiWidget->showPageIndicator();
+    HsGui::instance()->idleWidget()->showPageIndicator();
 }
 
 /*!
@@ -1181,7 +1122,7 @@
 void HsIdleState::action_moveScene_moveToNearestPage()
 {
     QList<HsPage *> pages = HsScene::instance()->pages();
-    QSizeF pageSize = pages.first()->size();
+    QSizeF pageSize = pages.first()->visual()->size();
 
     int pageIndex = HsScene::instance()->activePageIndex();
 
@@ -1193,6 +1134,17 @@
 
     HsScene::instance()->setActivePageIndex(pageIndex);
 
+    HsPage *page = HsScene::instance()->activePage();
+    if (page) {
+        QList<HsWidgetHost *> widgets = page->newWidgets();
+        if (!widgets.isEmpty()) {
+            foreach (HsWidgetHost *widget, widgets) {
+                widget->startWidget();
+            }
+        }
+    page->layoutNewWidgets();
+    }
+
     startPageChangeAnimation(pageIndex, HSCONFIGURATION_GET(pageChangeAnimationDuration));
 }
 
@@ -1212,8 +1164,74 @@
     addPageToScene(pageIndex);
     scene->setActivePageIndex(pageIndex);
     startPageChangeAnimation(pageIndex, HSCONFIGURATION_GET(newPageAddedAnimationDuration));
-    mUiWidget->pageIndicator()->addItem(pageIndex);
-    mUiWidget->showPageIndicator();
+    HsGui::instance()->idleWidget()->pageIndicator()->addItem(pageIndex);
+    HsGui::instance()->idleWidget()->showPageIndicator();
+}
+
+/*!
+    Displays a confirmation query before page is removed if there are widgets on page 
+*/
+void HsIdleState::action_preRemovePage_showQuery()
+{
+    HsScene *scene = HsScene::instance();
+    HsPage *page = scene->activePage();
+
+    if (!page->widgets().isEmpty()) {
+        if (!mMessageBoxWrapper) {
+            mMessageBoxWrapper = new HsMessageBoxWrapper(this);
+            mMessageBoxWrapper->setHeader(hbTrId(hsLocTextId_Title_RemovePage));
+            mMessageBoxWrapper->setQueryText(hbTrId(hsLocTextId_Confirmation_RemovePage));
+            connect(mMessageBoxWrapper,SIGNAL(accepted()),SIGNAL(event_removePage())); 
+            connect(mMessageBoxWrapper,SIGNAL(rejected()),SIGNAL(event_waitInput())); 
+        }
+        mMessageBoxWrapper->show();
+    } else {
+        // Empty page can be removed without confirmation
+        emit event_removePage();
+    }
+}
+
+/*!
+    Make sure confirmation query gets closed if user exits preRemovePage state e.g. by pressing application key
+*/
+void HsIdleState::action_preRemovePage_exit()
+{
+    if (mMessageBoxWrapper) {
+        mMessageBoxWrapper->close();
+    }
+}
+
+/*!
+    Start remove page animation.
+*/
+void HsIdleState::action_removePage_startRemovePageAnimation()
+{
+    HsScene *scene = HsScene::instance();
+   
+    int pageToRemoveIndex = scene->activePageIndex();
+    bool isLastPage(scene->activePage() == scene->pages().last());
+    
+    int nextPageIndex(pageToRemoveIndex);
+    nextPageIndex++;
+    if (isLastPage) {
+        nextPageIndex--; 
+    }
+    HsPropertyAnimationWrapper *animation = HsGui::instance()->pageChangeAnimation();
+    if (animation->isRunning()) {
+        animation->stop();
+    }
+    animation->disconnect(this);
+    connect(animation,
+            SIGNAL(finished()),
+            SIGNAL(event_waitInput()), 
+            Qt::UniqueConnection);
+    animation->setEndValue(pageLayerXPos(nextPageIndex));
+    animation->setDuration(HSCONFIGURATION_GET(pageRemovedAnimationDuration));
+   
+    animation->start();
+    
+    HbInstantFeedback::play(HSCONFIGURATION_GET(pageChangeFeedbackEffect));
+    
 }
 
 /*!
@@ -1221,30 +1239,26 @@
 */
 void HsIdleState::action_removePage_removePage()
 {
+    HsIdleWidget *idleWidget = HsGui::instance()->idleWidget();
+    HsPropertyAnimationWrapper *animation = HsGui::instance()->pageChangeAnimation();
     HsScene *scene = HsScene::instance();
-    HsPage *page = scene->activePage();
-
-    if (!page->widgets().isEmpty()) {
-#ifndef HOMESCREEN_TEST //We don't want to test message box.
-        //Confirm removal of page having content
-        HbMessageBox *box = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
-        box->setAttribute(Qt::WA_DeleteOnClose);
-        box->setHeadingWidget(new HbLabel
-                                (hbTrId(hsLocTextId_Title_RemovePage)));
-        box->setText(hbTrId(hsLocTextId_Confirmation_RemovePage));
+    HsPage *pageToRemove = scene->activePage();
 
-        QAction *buttonOk = box->actions().at(0);
-        //We are keen only from OK button. Cancel is not connected to any slot.
-        connect(buttonOk, SIGNAL(triggered()), SLOT(onRemovePageConfirmationOk()));
-       
-        box->open();
-#endif // HOMESCREEN_TEST
-    } else {
-        // Empty page can be removed without confirmation
-        removeActivePage();
+    if (animation->isRunning()) {
+        animation->stop();
     }
+    // remove from ui
+    idleWidget->removePage(pageToRemove->pageIndex());
+    idleWidget->showPageIndicator();
+    // update data model
+    scene->removePage(pageToRemove);
+    // Take new active page (previous was removed) and move scene to right position
+    qreal x = pageLayerXPos(scene->activePageIndex());
+    idleWidget->setSceneX(x);
+    // delete it   
+    pageToRemove->deleteLater();
+   
 }
-
 /*!
     Toggles the homescreen online/offline state.
 */
@@ -1277,8 +1291,8 @@
 {
     HsScene *scene = HsScene::instance();
     int pageIndex = scene->activePageIndex();
-
-    if (mZoneAnimation->direction() == QAbstractAnimation::Forward) {
+    HsGui *gui(HsGui::instance());
+    if (gui->pageCrawlingAnimation()->isForward()) {
         if (isInLeftPageChangeZone() &&
             0 < pageIndex) {
             --pageIndex;
@@ -1289,18 +1303,16 @@
         if (pageIndex == scene->pages().count()) {
             if (pageIndex < HSCONFIGURATION_GET(maximumPageCount)) {
                 addPageToScene(pageIndex);
-                mUiWidget->showPageIndicator();
-                mUiWidget->pageIndicator()->addItem(pageIndex);
+                gui->idleWidget()->showPageIndicator();
+                gui->idleWidget()->pageIndicator()->addItem(pageIndex);
             }
         }
         scene->setActivePageIndex(pageIndex);
         startPageChangeAnimation(pageIndex, HSCONFIGURATION_GET(pageChangeAnimationDuration));
     } else {
         scene->setActivePageIndex(pageIndex);
-        mUiWidget->setActivePage(pageIndex);
+        gui->idleWidget()->setActivePage(pageIndex);
     }
-
-    deleteZoneAnimation();
 }
 
 /*!
@@ -1311,23 +1323,16 @@
     updateZoneAnimation();
 }
 
-/*!
-    Handles the close of remove page confirmation dialog for page having content.
-*/
-void HsIdleState::onRemovePageConfirmationOk()
-{
-    removeActivePage();
-}
 
 /*!
     Provides the page presentation to the Widget Snap algorithm
 */
 void HsIdleState::updatePagePresentationToWidgetSnap()
 {
-    QRectF containerRect = HsScene::instance()->activePage()->rect();
-    containerRect.setTop(qreal(64));
+    QRectF containerRect = HsScene::instance()->activePage()->contentGeometry();
     HsWidgetHost *activeWidget = HsScene::instance()->activeWidget();
-    HsWidgetPositioningOnWidgetMove::instance()->setPagePresentation(containerRect, createInactiveWidgetRects(), activeWidget->geometry());
+    HsWidgetPositioningOnWidgetMove::instance()->setPagePresentation(
+        containerRect, createInactiveWidgetRects(), activeWidget->visual()->geometry());
 }
 
 /*!
@@ -1356,7 +1361,7 @@
         //the line will be shown when the timer expires.
         //If timer has already expired, just show the line, which is redrawn to new geometry.
         if (!mVerticalSnapLineTimer.isActive()) {
-            mUiWidget->showVerticalSnapLine(mSnapResult.verticalSnapLine);
+            HsGui::instance()->idleWidget()->showVerticalSnapLine(mSnapResult.verticalSnapLine);
         }
     }
 }
@@ -1366,7 +1371,7 @@
 */
 void HsIdleState::onVerticalSnapLineTimerTimeout()
 {
-    mUiWidget->showVerticalSnapLine(mSnapResult.verticalSnapLine);
+    HsGui::instance()->idleWidget()->showVerticalSnapLine(mSnapResult.verticalSnapLine);
 }
 
 /*!
@@ -1374,7 +1379,7 @@
 */
 void HsIdleState::hideVerticalLine()
 {
-    mUiWidget->hideVerticalSnapLine();
+    HsGui::instance()->idleWidget()->hideVerticalSnapLine();
     mVerticalSnapLineTimer.stop();
 }
 
@@ -1389,7 +1394,7 @@
     }
     else {
         if (!mHorizontalSnapLineTimer.isActive()) {
-            mUiWidget->showHorizontalSnapLine(mSnapResult.horizontalSnapLine);
+            HsGui::instance()->idleWidget()->showHorizontalSnapLine(mSnapResult.horizontalSnapLine);
         }
     }
 }
@@ -1399,7 +1404,7 @@
 */
 void HsIdleState::onHorizontalSnapLineTimerTimeout()
 {
-    mUiWidget->showHorizontalSnapLine(mSnapResult.horizontalSnapLine);
+    HsGui::instance()->idleWidget()->showHorizontalSnapLine(mSnapResult.horizontalSnapLine);
 }
 
 /*!
@@ -1407,7 +1412,7 @@
 */
 void HsIdleState::hideHorizontalLine()
 {
-    mUiWidget->hideHorizontalSnapLine();
+    HsGui::instance()->idleWidget()->hideHorizontalSnapLine();
     mHorizontalSnapLineTimer.stop();
 }
 
@@ -1419,3 +1424,5 @@
     updatePagePresentationToWidgetSnap();
     resetSnapPosition();
 }
+
+

--- a/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsidlewidget.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,405 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#include <QApplication>
-#include <QGraphicsSceneMouseEvent>
-#include <QGraphicsLinearLayout>
-#include <QDir>
-
-#include <HbMainWindow>
-#include <HbVkbHost>
-
-#include "hsidlewidget.h"
-#include "hsscene.h"
-#include "hspage.h"
-#include "hswidgethost.h"
-#include "hswallpaper.h"
-#include "hstrashbinwidget.h"
-#include "hspageindicator.h"
-#include "hsdocumentloader.h"
-#include "hsconfiguration.h"
-#include "hsapp_defs.h"
-#include "hssnapline.h"
-
-namespace
-{
-    const char gControlLayerDocmlName[] = "controllayer.docml";
-    const char gControlLayerName[]      = "controlLayer";
-    const char gTrashBinName[]          = "trashBin";
-    const char gPageIndicatorName[]     = "pageIndicator";
-}
-
-/*!
-    \class HsIdleWidget
-    \ingroup group_hshomescreenstateplugin
-    \brief View part of the home screen idle state.
-
-    Maintains the idle view ui layers and takes care of
-    receiving user input and communicating it to the idle
-    state for further processing.
-*/
-
-/*!
-    Constructs a new idle widget with the given \a parent.
-*/
-HsIdleWidget::HsIdleWidget(QGraphicsItem *parent)
-  : HbWidget(parent),
-    mControlLayer(0), mPageLayer(0), mPageWallpaperLayer(0),
-    mSceneLayer(0),
-    mTrashBin(0), mPageIndicator(0),
-    mHorizontalSnapLine(0), mVerticalSnapLine(0)
-{
-    setFlag(ItemHasNoContents);
-
-    loadControlLayer();
-
-    QGraphicsLinearLayout *linearLayout = 0;
-
-    linearLayout = new QGraphicsLinearLayout(Qt::Horizontal);
-    linearLayout->setContentsMargins(0, 0, 0, 0);
-    linearLayout->setSpacing(0);
-    mPageLayer = new HbWidget(this);
-    mPageLayer->setLayout(linearLayout);
-    mPageLayer->setZValue(2);
-    
-    linearLayout = new QGraphicsLinearLayout(Qt::Horizontal);
-    linearLayout->setContentsMargins(0, 0, 0, 0);
-    linearLayout->setSpacing(0);
-    mPageWallpaperLayer = new HbWidget(this);
-    mPageWallpaperLayer->setLayout(linearLayout);
-    mPageWallpaperLayer->setZValue(1);
-    
-    linearLayout = new QGraphicsLinearLayout(Qt::Horizontal);
-    linearLayout->setContentsMargins(0, 0, 0, 0);
-    linearLayout->setSpacing(0);
-    mSceneLayer = new HbWidget(this);
-    mSceneLayer->setLayout(linearLayout);
-    mSceneLayer->setZValue(0);
-}
-
-/*!
-    Destroys this idle widget.
-*/
-HsIdleWidget::~HsIdleWidget()
-{
-    QList<HsPage *> pages = HsScene::instance()->pages();
-    foreach (HsPage *page, pages) {
-        page->setParentItem(0);
-        if (page->scene()) {
-            page->scene()->removeItem(page);
-        }
-        HsWallpaper *pageWallpaper = page->wallpaper();
-        if (pageWallpaper) {
-            pageWallpaper->setParentItem(0);
-            if (pageWallpaper->scene()) {
-                pageWallpaper->scene()->removeItem(pageWallpaper);
-            }
-        }
-    }
-
-    HsWallpaper *sceneWallpaper = HsScene::instance()->wallpaper();
-    if (sceneWallpaper) {
-        sceneWallpaper->setParentItem(0);
-        if (sceneWallpaper->scene()) {
-            sceneWallpaper->scene()->removeItem(sceneWallpaper);
-        }
-    }
-}
-
-qreal HsIdleWidget::sceneX() const
-{
-    return mPageLayer->x();
-}
-
-void HsIdleWidget::setSceneX(qreal x)
-{
-    if (HSCONFIGURATION_GET(sceneType) == HsConfiguration::SceneWallpaper) {
-        mPageLayer->setX(x);
-        mSceneLayer->setX((parallaxFactor() * x) - HSCONFIGURATION_GET(bounceEffect) / 2);
-    } else {
-        mPageLayer->setX(x);
-        mPageWallpaperLayer->setX(x);
-    }
-}
-
-/*!
-    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(HsScene::instance()->mainWindow()->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);
-    }
-}
-
-/*!
-    Sets the active page \a index to the page
-    indicator.
-*/
-void HsIdleWidget::setActivePage(int index)
-{
-    mPageIndicator->setActiveItemIndex(index);
-}
-
-/*!
-    Inserts the given \a page at index position
-    \a index in the page layer.
-*/
-void HsIdleWidget::insertPage(int index, HsPage *page)
-{
-    QGraphicsLinearLayout *layout =
-        static_cast<QGraphicsLinearLayout *>(mPageLayer->layout());
-    layout->insertItem(index, page);
-    mPageLayer->resize(
-        layout->count() * size().width(), size().height());
-
-    if (HSCONFIGURATION_GET(sceneType) == HsConfiguration::PageWallpapers) {
-        QGraphicsLinearLayout *layout =
-            static_cast<QGraphicsLinearLayout *>(mPageWallpaperLayer->layout());
-        layout->insertItem(index, page->wallpaper());
-        mPageWallpaperLayer->resize(
-            layout->count() * size().width(), size().height());
-    }
-}
-
-/*!
-    Removes the page at index position
-    \a index in the page layer.
-*/
-void HsIdleWidget::removePage(int index)
-{
-    QGraphicsLinearLayout *layout =
-        static_cast<QGraphicsLinearLayout *>(mPageLayer->layout());
-    layout->removeAt(index);
-    mPageLayer->resize(
-        layout->count() * size().width(), size().height());
-
-    if (HSCONFIGURATION_GET(sceneType) == HsConfiguration::PageWallpapers) {
-        QGraphicsLinearLayout *layout =
-            static_cast<QGraphicsLinearLayout *>(mPageWallpaperLayer->layout());
-        layout->removeAt(index);
-        mPageWallpaperLayer->resize(
-            layout->count() * size().width(), size().height());
-    }
-}
-
-/*!
-    \fn HsIdleWidget::controlLayer() const
-
-    Returns the control layer.
-*/
-
-/*!
-    \fn HsIdleWidget::pageLayer() const
-
-    Returns the page layer.
-*/
-
-/*!
-    \fn HsIdleWidget::sceneLayer() const
-
-    Returns the scene layer.
-*/
-
-/*!
-    \fn HsIdleWidget::trashBin() const
-
-    Returns the trashbin widget.
-*/
-
-/*!
-    \fn HsIdleWidget::pageIndicator() const
-
-    Returns the page indicator widget.
-*/
-
-/*!
-    Sets the trashbin visible and hides the page indicator.
-*/
-void HsIdleWidget::showTrashBin()
-{
-    mPageIndicator->hide();
-    mTrashBin->show();
-}
-
-/*!
-    Sets the page indicator visible and hides the trashbin.
-*/
-void HsIdleWidget::showPageIndicator()
-{
-    mTrashBin->hide();
-    mTrashBin->deactivate();
-    mPageIndicator->setSpacing(HSCONFIGURATION_GET(pageIndicatorSpacing)); // for usability optimization widget, can be removed later on
-    mPageIndicator->setVisible(1 < mPageIndicator->itemCount());
-}
-
-/*!
-    Shows the Vertical snapping lines showing the guidance
-*/
-void HsIdleWidget::showVerticalSnapLine(const QLineF &snapLine)
-{
-    QVariantHash snapConfiguration;
-    snapConfiguration[SNAPLINEFADEINDURATION] = QString::number(HSCONFIGURATION_GET(snapLineFadeInDuration));
-    snapConfiguration[SNAPLINEFADEOUTDURATION] = QString::number(HSCONFIGURATION_GET(snapLineFadeOutDuration));
-
-    mVerticalSnapLine->setConfiguration(snapConfiguration);
-    mVerticalSnapLine->showLine(snapLine);
-}
-
-/*!
-    Shows the Horizontal snapping lines showing the guidance
-*/
-void HsIdleWidget::showHorizontalSnapLine(const QLineF &snapLine)
-{
-    QVariantHash snapConfiguration;
-    snapConfiguration[SNAPLINEFADEINDURATION] = QString::number(HSCONFIGURATION_GET(snapLineFadeInDuration));
-    snapConfiguration[SNAPLINEFADEOUTDURATION] = QString::number(HSCONFIGURATION_GET(snapLineFadeOutDuration));
-
-    mHorizontalSnapLine->setConfiguration(snapConfiguration);
-    mHorizontalSnapLine->showLine(snapLine);
-}
-
-/*!
-    Hides the Vertical snapping line showing the guidance
-*/
-void HsIdleWidget::hideVerticalSnapLine()
-{
-    mVerticalSnapLine->hideLine();
-}
-
-/*!
-    Hides the Horizontal snapping line showing the guidance
-*/
-void HsIdleWidget::hideHorizontalSnapLine()
-{
-    mHorizontalSnapLine->hideLine();
-}
-
-/*!
-    Reimplements QGraphicsWidget::polishEvent().
-*/
-void HsIdleWidget::polishEvent()
-{
-    HsScene *scene = HsScene::instance();
-    Q_ASSERT(scene);
-
-    QGraphicsLinearLayout *pageLayout = 
-        static_cast<QGraphicsLinearLayout *>(mPageLayer->layout());
-
-    QList<HsPage *> pages = scene->pages();
-
-    foreach (HsPage *page, pages) {
-        pageLayout->addItem(page);
-        if (HSCONFIGURATION_GET(sceneType) == HsConfiguration::PageWallpapers) {
-            QGraphicsLinearLayout *pageWallpaperLayout = 
-                static_cast<QGraphicsLinearLayout *>(mPageWallpaperLayer->layout());
-            pageWallpaperLayout->addItem(page->wallpaper());
-        }
-    }
-   if (HSCONFIGURATION_GET(sceneType) == HsConfiguration::SceneWallpaper) {
-        QGraphicsLinearLayout *sceneLayout = 
-            static_cast<QGraphicsLinearLayout *>(mSceneLayer->layout());
-    	HsWallpaper *wallpaper = HsScene::instance()->wallpaper();
-        sceneLayout->addItem(wallpaper);
-    }
-           
-    mPageIndicator->initialize(pages.count(), scene->activePageIndex());    
-    showPageIndicator();
-
-    HsScene::mainWindow()->scene()->installEventFilter(this);
-}
-
-/*!
-    Loads the control layer declared in a docml file.
-*/
-void HsIdleWidget::loadControlLayer()
-{
-    HsDocumentLoader loader;
-    bool loaded = false;
-
-#ifndef Q_OS_SYMBIAN
-    QString path = QDir::currentPath();
-#else
-    QString path = "c:";
-#endif
-
-    QString file = path + "/hsresources/" + gControlLayerDocmlName;
-    QString fallbackPath = QString(":/") + gControlLayerDocmlName;
-
-    if (QFile::exists(file)) {
-        loader.load(file, &loaded);
-        if (!loaded) {
-            loader.load(fallbackPath, &loaded);
-        }
-    } else {
-        loader.load(fallbackPath, &loaded);
-    }
-
-    if (loaded) {
-        mControlLayer = qobject_cast<HbWidget *>(loader.findWidget(gControlLayerName));
-        mControlLayer->setZValue(3);
-        mControlLayer->setParentItem(this);
-
-        mTrashBin = qobject_cast<HsTrashBinWidget *>(loader.findWidget(gTrashBinName));
-        mTrashBin->setZValue(1e6);
-
-        mPageIndicator = qobject_cast<HsPageIndicator *>(loader.findWidget(gPageIndicatorName));
-        mPageIndicator->setZValue(1e6);
-
-
-        mHorizontalSnapLine = new HsSnapLine(mControlLayer);
-        mHorizontalSnapLine->setZValue(10);
-
-        mVerticalSnapLine = new HsSnapLine(mControlLayer);
-        mVerticalSnapLine->setZValue(10);
-    } else {
-        // TODO: Handle error.
-    }
-}
-
-qreal HsIdleWidget::parallaxFactor() const
-{   
-    qreal clw = mControlLayer->size().width();
-    qreal slw = mSceneLayer->size().width() - HSCONFIGURATION_GET(bounceEffect);
-    int n = HsScene::instance()->pages().count();
-    if (n < 2) {
-        return 1;
-    } else {
-        return (slw - clw) / ((n - 1) * clw);
-    }
-}

--- a/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsloadscenestate.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsloadscenestate.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -15,13 +15,15 @@
 *
 */
 
-#include <HbMainWindow>
+#include "hsloadscenestate.h"
+#include "hsscene.h"
+#include "hsgui.h"
+
 #ifdef Q_OS_SYMBIAN
 #include <XQSettingsManager>
 #include <startupdomainpskeys.h>
 #endif
-#include "hsloadscenestate.h"
-#include "hsscene.h"
+
 
 /*!
     \class HsLoadSceneState
@@ -121,7 +123,7 @@
 void HsLoadSceneState::showUi()
 {
     qDebug() << "HsLoadSceneState::showUi";
-    HsScene::mainWindow()->raise();
-    HsScene::mainWindow()->show();
+  
+    HsGui::instance()->show();
     emit event_history();
 }

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/hsmenuworkerstateplugin.pro	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/hsmenuworkerstateplugin.pro	Wed Aug 18 09:40:07 2010 +0300
@@ -31,7 +31,7 @@
 DEPENDPATH += ./inc \
     ./src
 INCLUDEPATH += ./inc \
-    ../../serviceproviders\hsmenuserviceprovider\inc \
+    ../../serviceproviders/hsmenuserviceprovider/inc \
     ../../hsutils/inc \
     ../../hsdomainmodel/inc

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/hsmenuworkerstateplugin.qrc	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/hsmenuworkerstateplugin.qrc	Wed Aug 18 09:40:07 2010 +0300
@@ -5,5 +5,7 @@
         <file alias="hsarrangedialog.docml">resource/hsarrangedialog.docml</file>
         <file alias="hsdetailsdialog.docml">resource/hsdetailsdialog.docml</file>
         <file alias="hsuninstalldialog.docml">resource/hsuninstalldialog.docml</file>
+        <file alias="hsinstallationlogdialog.docml">resource/hsinstallationlogdialog.docml</file>
+        <file alias="hscollectionslistdialog.docml">resource/hscollectionslistdialog.docml</file>
     </qresource>
 </RCC>

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsaddappstocollectionstate.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsaddappstocollectionstate.h	Wed Aug 18 09:40:07 2010 +0300
@@ -25,10 +25,11 @@
 HS_STATES_TEST_CLASS(MenuStatesTest)
 
 class QStandardItemModel;
+class QModelIndex;
 class HbAction;
 class HsAppsCheckList;
 class HsCollectionNameDialog;
-class HsCollectionsListDialog;
+class HbDialog;
 
 class HsAddAppsToCollectionState: public QState
 {
@@ -54,11 +55,9 @@
 
     void transitToSaveState(const QString &collectionName);
 
-    void transitToAppsCheckListState(const QString &collectionName);
-
     void transitToSaveState(int collectionId);
 
-    void transitToAppsCheckListState(int collectionId);
+    void transitToSelectCollectionState();
 
     void transitToNewCollectionState();
 
@@ -85,6 +84,8 @@
     void cleanData();
 
     void selectApplicationsDone(const QList<int> &appList);
+    
+    void collectionSelected(const QModelIndex &modelIndex);
 
 private slots:
 
@@ -105,6 +106,8 @@
     void construct();
 
     void createStates();
+    
+    QStandardItemModel *standardItemModel(int collectionId);
 
 private:
 
@@ -128,14 +131,13 @@
 
     HsSortAttribute mApplicationsSortAttribute;
 
-    HsSortAttribute mCollectionsSortAttribute;
-
     HsAppsCheckList *mAppsCheckList;
 
     HsCollectionNameDialog *mEditorDialog;
 
-    HsCollectionsListDialog *mListDialog;
+    HbDialog *mListDialog; // not owned
 
+    QStandardItemModel *mModel; // delete with dialog
 };
 
 #endif /* ADDAPPSTOCOLLECTIONSTATE_H */

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsaddtohomescreenstate.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsaddtohomescreenstate.h	Wed Aug 18 09:40:07 2010 +0300
@@ -27,12 +27,14 @@
 
 HS_STATES_TEST_CLASS(MenuStatesTest)
 
+class QAction;
 class HbAction;
 class HbMessageBox;
 class CaEntry;
 class CaNotifier;
 class HsContentService;
 
+
 class HsAddToHomeScreenState: public  QState
 {
     Q_OBJECT
@@ -52,8 +54,6 @@
     void cleanUp();
 
     void messageWidgetCorruptedFinished(HbAction* finishedAction);
-    
-    void memoryCardRemoved();
 
 signals:
 
@@ -71,7 +71,6 @@
 
     void logActionResult(QString operationName, int entryId,
                          bool operationSucceded);
-    void subscribeForMemoryCardRemove();
 
 private:
 
@@ -82,12 +81,10 @@
 
     HbMessageBox *mCorruptedMessage;
 
-    HbAction *mConfirmAction;
+    QAction *mConfirmAction;
     
     HsMenuMode mMenuMode;
     
-    CaNotifier *mNotifier;
-    
     QVariant mToken;
 
 };

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsappschecklist.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsappschecklist.h	Wed Aug 18 09:40:07 2010 +0300
@@ -20,13 +20,12 @@
 
 #include <QModelIndexList>
 #include <hsmenuservice.h>
-#include "hbmainwindow.h"
 
 #include "hsmenustates_global.h"
 HS_STATES_TEST_CLASS(MenuStatesTest)
 
 //forward declarations
-class HbView;
+class HbDialog;
 class HbAction;
 class HbListView;
 class QStandardItemModel;
@@ -56,32 +55,28 @@
 
 protected slots:
 
-    void selectApplicationsDone();
+    void appsSelectionDialogFinished(HbAction* finishedAction);
+
+    void selectedItemsChanged();
 
 private:
 
     void constructControls();
 
-    HbMainWindow *mainWindow() const;
-
     QList<int> getSortedItemsList(const QModelIndexList &modelIndexList);
 
 private:
 
-    HbView *mView;
+    HbDialog *mAppsSelectDialog;
 
-    HbView *mPreviousView;
+    HbAction *mActionConfirm; // delete with dialog
 
-    HbAction *mActionConfirm;
+    HbListView *mListView; // delete with dialog
 
-    HbListView *mListView;
-
-    HsMenuItemModel *mModel;
+    HsMenuItemModel *mModel; // delete with dialog
 
     HsSortAttribute mSortAttribute;
 
-    QObjectList mLoadedObjects;
-
 };
 
 #endif /* APPSCHECKLIST_H */

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsarrangestate.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsarrangestate.h	Wed Aug 18 09:40:07 2010 +0300
@@ -15,8 +15,8 @@
  *
  */
 
-#ifndef ARRANGE_H
-#define ARRANGE_H
+#ifndef HSARRANGESTATE_H
+#define HSARRANGESTATE_H
 
 #include <QState>
 #include <QVariant>
@@ -76,15 +76,17 @@
     HsMenuItemModel *mItemModel;
 
     int mTopItemId;
+    
+    int mCollectionId;
 
     QModelIndex mTopModelIndex;
 
-    QList<int> mCollIdList;
+    QList<int> mCollItemIdList;
 
-    QList<int> mArrangedCollIdList;
+    QList<int> mArrangedCollItemIdList;
     
     QObjectList mObjectList;
 
 };
 
-#endif /* ARRANGE_H_ */
+#endif /* HSARRANGESTATE_H */

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hscollectionnamedialog.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hscollectionnamedialog.h	Wed Aug 18 09:40:07 2010 +0300
@@ -35,9 +35,9 @@
 
     virtual ~HsCollectionNameDialog();
 
-    void open(QObject* receiver, const char* member );
-    
-    QString newName(const QString &name, bool addLastName = false);
+    void open(QObject* receiver, const char* member);
+
+    QString uniqueCollectionName() const;
 
 protected:
     void closeEvent( QCloseEvent * event );
@@ -47,6 +47,10 @@
 
     void makeDisconnect();
 
+    QString suggestedCollectionName(const QString &name);
+
+    QString generateUniqueCollectionName(const QString &name) const;
+
 private slots:
 
     void onTextChanged(const QString &text);
@@ -58,13 +62,12 @@
     /*
      * Collections names list from data model.
      */
-    QStringList mCollectionsNames;
+    QStringList mOtherCollectionsNames;
 
     /*
-     * Last found collection name.
+     * Already suggested names.
      */
-    QString mLastCollectionName;
-
+    QStringList mSuggestedNames;
 };
 
 #endif /* HS_INPUT_DIALOG_H */

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hscollectionslistdialog.h	Tue Jul 06 14:06:53 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:
- *
- */
-
-#ifndef HS_LIST_DIALOG_H
-#define HS_LIST_DIALOG_H
-
-#include <HbSelectionDialog>
-#include <hsmenuservice.h>
-
-#include "hsmenustates_global.h"
-HS_STATES_TEST_CLASS(MenuStatesTest)
-class QStandardItemModel;
-
-class HsCollectionsListDialog: public HbSelectionDialog
-{
-    Q_OBJECT
-
-    HS_STATES_TEST_FRIEND_CLASS(MenuStatesTest)
-
-public:
-
-    HsCollectionsListDialog(HsSortAttribute sortOrder,
-                            int collectionId = 0);
-
-    virtual ~HsCollectionsListDialog();
-
-    void open(QObject* receiver, const char* member );
-
-    int getItemId();
-
-protected:
-    void closeEvent( QCloseEvent * event );
-
-private:
-
-    void makeConnect();
-
-    void makeDisconnect();
-
-    QStandardItemModel *standartItemModel(HsSortAttribute sortOrder,
-                                          int collectionId);
-
-    void insertNewCollectionItem(QStandardItemModel *model);
-
-private:
-
-    QStandardItemModel *mModel;
-
-    int mItemId;
-};
-
-#endif /* HS_LIST_DIALOG_H */

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsdeletecollectionitemstate.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsdeletecollectionitemstate.h	Wed Aug 18 09:40:07 2010 +0300
@@ -23,6 +23,7 @@
 #include "hsmenustates_global.h"
 HS_STATES_TEST_CLASS(MenuStatesTest)
 
+class QAction;
 class HbAction;
 class HbMessageBox;
 class HsShortcutService;
@@ -66,7 +67,7 @@
 
     HbMessageBox *mDeleteMessage; // deletes itself automatically on close
 
-    HbAction *mConfirmAction; // child for mDeleteMessage
+    QAction *mConfirmAction; // child for mDeleteMessage
 
 };

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsdeletecollectionstate.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsdeletecollectionstate.h	Wed Aug 18 09:40:07 2010 +0300
@@ -23,6 +23,7 @@
 #include "hsmenustates_global.h"
 HS_STATES_TEST_CLASS(MenuStatesTest)
 
+class QAction;
 class HbAction;
 class HbMessageBox;
 class HsMenuService;
@@ -60,7 +61,7 @@
 private:
     int mItemId;
     HbMessageBox *mDeleteMessage; // deletes itself automatically on close
-    HbAction *mConfirmAction; // child for mDeleteMessage
+    QAction *mConfirmAction; // child for mDeleteMessage
 };
 
 #endif //HSDELETECOLLECTIONSTATE_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsinstallationlogstate.h	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,65 @@
+/*
+ * 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 HSINSTALLATIONLOGSTATE_H
+#define HSINSTALLATIONLOGSTATE_H
+
+#include <QState>
+
+#include "hsmenustates_global.h"
+HS_STATES_TEST_CLASS(MenuStatesTest)
+
+class HbDialog;
+
+class HsInstallationLogState: public QState
+{
+    Q_OBJECT
+
+    HS_STATES_TEST_FRIEND_CLASS(MenuStatesTest)
+
+public:
+
+    HsInstallationLogState(QState *parent = 0);
+
+    virtual ~HsInstallationLogState();
+
+protected:
+
+    void onEntry(QEvent *event);
+    void onExit(QEvent *event);
+
+private slots:
+
+    void stateExited();
+    void cleanUp();
+
+signals:
+
+    void exit();
+
+private:
+
+    void construct();
+    void createInstallationLogDialog();
+
+private:
+    
+    HbDialog* mInstalationLogDialog;
+
+};
+
+#endif //HSINSTALLATIONLOGSTATE_H

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsmenustates_global.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsmenustates_global.h	Wed Aug 18 09:40:07 2010 +0300
@@ -60,6 +60,16 @@
 static const char *const HS_UNINSTALL_DIALOG_CONFIRMATION_ACTION ="qtl_dialog_softkey_2_left";
 static const char *const HS_UNINSTALL_DIALOG_CONFIRMATION_DIALOG_ICON ="icon";
 
+static const char *const HS_INSTALLATION_LOG_DIALOG_LAYOUT =":/xml/hsinstallationlogdialog.docml";
+static const char *const HS_INSTALLATION_LOG_DIALOG_NAME="installation_log_dialog";
+static const char *const HS_INSTALLATION_LOG_DIALOG_LOG_LABEL="log_label";
+
+static const char *const HS_COLLECTION_DIALOG_LAYOUT =":/xml/hscollectionslistdialog.docml";
+static const char *const HS_COLLECTION_DIALOG_NAME="collection_list_dialog";
+static const char *const HS_COLLECTION_DIALOG_LIST_VIEW="listView";
+static const char *const HS_COLLECTION_DIALOG_CREATE_NEW_ACTION="qtl_dialog_softkey_2_left";
+static const char *const HS_COLLECTION_DIALOG_CANCEL_ACTION="qtl_dialog_softkey_2_right";
+
 
 /*!
  To enable logging of function entry and exit use the following flag for qmake:

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hspreviewhswidgetstate.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hspreviewhswidgetstate.h	Wed Aug 18 09:40:07 2010 +0300
@@ -20,15 +20,19 @@
 #define HSPREVIEWHSWIDGETSTATE_H
 
 #include <QState>
+#include <QVariant>
 
 #include "hsmenustates_global.h"
+#include "hsmenuentryremovedhandler.h"
+
 HS_STATES_TEST_CLASS(MenuStatesTest)
 
+class QAction;
+class HbAction;
 class CaEntry;
 class HbDialog;
 class HsWidgetHost;
 class CaNotifier;
-class HbAction;
 class HbScrollArea;
 class HbMessageBox;
 
@@ -49,7 +53,7 @@
     void previewDialogFinished(HbAction* finishedAction);
 
     void messageWidgetCorruptedFinished(HbAction* finishedAction);
-
+    
     void onEntry(QEvent *event);
 
     void cleanUp();
@@ -60,22 +64,23 @@
 private:
 
     void showMessageWidgetCorrupted();
-
-    void subscribeForMemoryCardRemove();
     
     HbDialog* buildPreviewDialog(const CaEntry& entry) const;
 
 private:
     
     HbDialog *mPreviewDialog;
-
-    CaNotifier *mNotifier;
-
-    QScopedPointer<HsWidgetHost> mWidget;
-
+    QScopedPointer<HsMenuEntryRemovedHandler> mEntryObserver;
     int mEntryId;
 
     HbMessageBox *mCorruptedMessage;
+
+    QAction *mConfirmRemovalAction;
+    QAction *mAddToHomescreenAction;
+    
+    QVariant mToken;
+    
+    QString mUri;
 };

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsuninstallitemstate.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsuninstallitemstate.h	Wed Aug 18 09:40:07 2010 +0300
@@ -23,6 +23,7 @@
 #include "hsmenustates_global.h"
 HS_STATES_TEST_CLASS(MenuStatesTest)
 
+class QAction;
 class HbAction;
 class HbMessageBox;
 class HsShortcutService;
@@ -72,20 +73,17 @@
     
     void createUninstallMessage();
     void createUninstallJavaMessage();
-    void subscribeForMemoryCardRemove();
+    void createSimpleUninstallJavaMessage();
 
 private:
 
     int mItemId;
     
-    CaNotifier *mNotifier;
-
     HbMessageBox *mUninstallMessage; // deletes itself automatically on close
     HbDialog *mUninstallJavaMessage;
-    QObjectList mObjectList;
     UninstallDialogType mDialogType;
 
-    HbAction *mConfirmAction; // child for mConfirmMessage
+    QAction *mConfirmAction; // child for mConfirmMessage
 
 };

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsviewappdetailsstate.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsviewappdetailsstate.h	Wed Aug 18 09:40:07 2010 +0300
@@ -18,16 +18,20 @@
 #ifndef HSVIEWAPPDETAILSSTATE_H_
 #define HSVIEWAPPDETAILSSTATE_H_
 
+
 #include <QState>
 #include <QVariant>
 
 #include "hsmenustates_global.h"
+#include "casoftwareregistry.h"
 HS_STATES_TEST_CLASS(MenuStatesTest)
 
 class HbListWidget;
 class HsMenuItemModel;
 class HbDialog;
 class CaNotifier;
+class HbDocumentLoader;
+
 
 class HsViewAppDetailsState: public QState
 {
@@ -56,15 +60,13 @@
 private:
 
     void construct();
-    void subscribeForMemoryCardRemove(int entryId);
+    void setFieldPresentation(QString key,
+            CaSoftwareRegistry::DetailMap &detailMap,
+            HbDocumentLoader &loader);
 
 private:
 
     HbDialog *mDialog;
-    
-    QObjectList mObjectList;
-    
-    CaNotifier *mNotifier;
 };
 
 #endif /* HSVIEWAPPDETAILSSTATE_H_ */

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsviewappsettingsstate.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsviewappsettingsstate.h	Wed Aug 18 09:40:07 2010 +0300
@@ -43,12 +43,8 @@
 
     virtual ~HsViewAppSettingsState();
     
-private slots:
-    
-    void settingsDone();
-    
 signals:
-        void initialize(const QString &aUid);      
+    void initialize(const QString &aUid);      
     void exit();
 
 protected:
@@ -61,8 +57,6 @@
     void construct();
     
     HbMainWindow *mainWindow() const; 
-    
-    void subscribeForMemoryCardRemove(int entryId);
 
 private:
 
@@ -71,9 +65,6 @@
     HbView *mPreviousView;
     
     HbAction *mActionConfirm;
-    
-    CaNotifier *mNotifier;
-
 };

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsappchecklist.docml	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsappchecklist.docml	Wed Aug 18 09:40:07 2010 +0300
@@ -1,17 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="0.9">
-    <widget name="view" type="HbView">
-        <widget name="listView" role="HbView:widget" type="HbListView">
+<hbdocument version="1.1">
+    <object name="aps_dialog_softkey_2_left" type="HbAction">
+        <string name="role" value="HbDialog:primaryAction"/>
+        <string locid="txt_common_button_ok" name="text"/>
+    </object>
+    <object name="aps_dialog_softkey_2_right" type="HbAction">
+        <string name="role" value="HbDialog:secondaryAction"/>
+        <string locid="txt_common_button_cancel" name="text"/>
+    </object>
+    <widget name="applications_selection_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="aps_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_select_items" name="plainText"/>
+            <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-primary)"/>
+        </widget>
+        <widget name="listView" role="HbDialog:contentWidget" type="HbListView">
             <widget name="listViewItemPrototype" role="HbAbstractView:prototype" type="HbListViewItem">
                 <enums name="graphicsSize" value="LargeIcon"/>
             </widget>
             <enums name="selectionMode" value="MultiSelection"/>
-            <bool name="visible" value="TRUE"/>
-            <string name="orientation" value="Horizontal"/>
+            <real name="z" value="1"/>
+            <contentsmargins bottom="var(hb-param-margin-gene-popup-list)" left="var(hb-param-margin-gene-popup-list)" right="var(hb-param-margin-gene-popup-list)" top="var(hb-param-margin-gene-popup-list)"/>
         </widget>
-        <string locid="txt_applib_title_select_applications" name="title"/>
+        <ref object="aps_dialog_softkey_2_left" role="HbWidget:addAction"/>
+        <ref object="aps_dialog_softkey_2_right" role="HbWidget:addAction"/>
     </widget>
-    <metadata activeUIState="Common ui state" display="NHD portrait" unit="un">
+    <metadata activeUIState="Common ui state" display="NHD-3.2-inch_portrait" unit="un">
         <uistate name="Common ui state" sections="#common"/>
+        <dummydata objectName="listView" section="#common" value="app_list_template5"/>
     </metadata>
 </hbdocument>

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsarrangedialog.docml	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsarrangedialog.docml	Wed Aug 18 09:40:07 2010 +0300
@@ -3,9 +3,9 @@
     <widget name="arrange_dialog" type="HbDialog">
         <enums name="dismissPolicy" value="HbPopup::NoDismiss"/>
         <object name="qtl_dialog_softkey_left" type="HbAction">
-			<string name="role" value="HbDialog:primaryAction"/>
-			<string locid="txt_common_button_ok" name="text"/>
-		</object>
+            <string name="role" value="HbDialog:primaryAction"/>
+            <string locid="txt_common_button_ok" name="text"/>
+        </object>
         <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)"/>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hscollectionslistdialog.docml	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument version="1.1">
+    <object name="qtl_dialog_softkey_2_left" type="HbAction">
+        <string locid="txt_applib_button_create_new" name="text"/>
+    </object>
+    <object name="qtl_dialog_softkey_2_right" type="HbAction">
+        <string locid="txt_common_button_cancel" name="text"/>
+    </object>
+    <widget name="collection_list_dialog" type="HbDialog">
+        <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_add_to" name="plainText"/>
+            <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-primary)"/>
+        </widget>
+        <widget name="listView" role="HbDialog:contentWidget" type="HbListView">
+            <widget name="qtl_list_pri" role="HbAbstractView:prototype" type="HbListViewItem">
+                <enums name="graphicsSize" value="LargeIcon"/>
+            </widget>
+            <enums name="selectionMode" value="SingleSelection"/>
+            <real name="z" value="1"/>
+            <contentsmargins bottom="var(hb-param-margin-gene-popup-list)" left="var(hb-param-margin-gene-popup-list)" right="var(hb-param-margin-gene-popup-list)" top="var(hb-param-margin-gene-popup-list)"/>
+        </widget>
+        <ref object="qtl_dialog_softkey_2_left" role="HbWidget:addAction"/>
+        <ref object="qtl_dialog_softkey_2_right" role="HbWidget:addAction"/>
+    </widget>
+    <metadata activeUIState="Common ui state" display="NHD-3.2-inch_portrait" unit="un">
+        <uistate name="Common ui state" sections="#common"/>
+        <dummydata objectName="listView" section="#common" value="app_list_template1"/>
+    </metadata>
+</hbdocument>

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsdetailsdialog.docml	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsdetailsdialog.docml	Wed Aug 18 09:40:07 2010 +0300
@@ -5,9 +5,8 @@
         <string locid="txt_common_button_ok" name="text" value="Ok"/>
     </object>
     <widget name="details_dialog" type="HbDialog">
-        <enums name="dismissPolicy" value="HbPopup::NoDismiss"/>
-    	
         <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)"/>
@@ -17,63 +16,62 @@
         <widget name="scrollArea" role="HbDialog:contentWidget" type="HbScrollArea">
             <widget name="scrollAreaContents" role="HbScrollArea:contents" type="HbWidget">
                 <widget name="_name" type="HbLabel">
-                    <sizehint height="expr(var(hb-param-text-height-secondary))" type="PREFERRED"/>
                     <string locid="txt_applib_dialog_name" name="plainText" value="Name:"/>
                     <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                    <enums name="textWrapping" value="TextWordWrap"/>
                 </widget>
                 <widget name="name" type="HbLabel">
-                    <sizehint height="expr(var(hb-param-text-height-secondary))" type="PREFERRED"/>
                     <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                    <enums name="textWrapping" value="TextWordWrap"/>
                 </widget>
                 <widget name="_version" type="HbLabel">
-                    <sizehint height="expr(var(hb-param-text-height-secondary))" type="PREFERRED"/>
                     <string locid="txt_applib_dialog_version" name="plainText" value="Version:"/>
                     <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                    <enums name="textWrapping" value="TextWordWrap"/>
                 </widget>
                 <widget name="version" type="HbLabel">
-                    <sizehint height="expr(var(hb-param-text-height-secondary))" type="PREFERRED"/>
                     <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                    <enums name="textWrapping" value="TextWordWrap"/>
                 </widget>
                 <widget name="_vendor" type="HbLabel">
-                    <sizehint height="expr(var(hb-param-text-height-secondary))" type="PREFERRED"/>
                     <string locid="txt_applib_dialog_supplier" name="plainText" value="Supplier:"/>
                     <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                    <enums name="textWrapping" value="TextWordWrap"/>
                 </widget>
                 <widget name="vendor" type="HbLabel">
-                    <sizehint height="expr(var(hb-param-text-height-secondary))" type="PREFERRED"/>
                     <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                    <enums name="textWrapping" value="TextWordWrap"/>
                 </widget>
                 <widget name="_driveInfo" type="HbLabel">
-                    <sizehint height="expr(var(hb-param-text-height-secondary))" type="PREFERRED"/>
                     <string locid="txt_applib_dialog_memory_in_use" name="plainText" value="Memory in use:"/>
                     <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                    <enums name="textWrapping" value="TextWordWrap"/>
                 </widget>
                 <widget name="driveInfo" type="HbLabel">
-                    <sizehint height="expr(var(hb-param-text-height-secondary))" type="PREFERRED"/>
+                    <string locid="txt_applib_dialog_1_device_memory" name="plainText" value="%1 Device memory"/>
                     <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
-                    <string locid="txt_applib_dialog_1_device_memory" name="plainText" value="%1 Device memory"/>
+                    <enums name="textWrapping" value="TextWordWrap"/>
                 </widget>
                 <widget name="_size" type="HbLabel">
-                    <sizehint height="expr(var(hb-param-text-height-secondary))" type="PREFERRED"/>
                     <string locid="txt_applib_dialog_size" name="plainText" value="Size:"/>
                     <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                    <enums name="textWrapping" value="TextWordWrap"/>
                 </widget>
                 <widget name="size" type="HbLabel">
-                    <sizehint height="expr(var(hb-param-text-height-secondary))" type="PREFERRED"/>
+                    <string locid="txt_applib_dialog_l1_kb" name="plainText" value="%L1 KB"/>
                     <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
-                    <string locid="txt_applib_dialog_l1_kb" name="plainText" value="%L1 KB"/>
+                    <enums name="textWrapping" value="TextWordWrap"/>
                 </widget>
                 <widget name="_type" type="HbLabel">
-                    <sizehint height="expr(var(hb-param-text-height-secondary))" type="PREFERRED"/>
                     <string locid="txt_applib_dialog_format" name="plainText" value="Format:"/>
                     <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                    <enums name="textWrapping" value="TextWordWrap"/>
                 </widget>
                 <widget name="type" type="HbLabel">
-                    <sizehint height="expr(var(hb-param-text-height-secondary))" type="PREFERRED"/>
                     <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                    <enums name="textWrapping" value="TextWordWrap"/>
                 </widget>
-                <sizehint type="PREFERRED" width="expr(var(hb-param-screen-width) )"/>
-                <layout orientation="Vertical" spacing="2px" type="linear">
+                <layout orientation="Vertical" spacing="var(hb-param-margin-gene-middle-vertical)" type="linear">
                     <linearitem itemname="_name"/>
                     <linearitem itemname="name"/>
                     <linearitem itemname="_version"/>
@@ -91,7 +89,123 @@
         </widget>
         <ref object="qtl_dialog_softkey_left" role="HbWidget:addAction"/>
     </widget>
-    <metadata activeUIState="Common ui state" display="NHD-3.2-inch_portrait" unit="un">
+    <section name="detailsDialogForJavaApplication">
+        <widget name="details_dialog" type="HbDialog">
+            <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>
+            <widget name="scrollArea" role="HbDialog:contentWidget" type="HbScrollArea">
+                <widget name="scrollAreaContents" role="HbScrollArea:contents" type="HbWidget">
+                    <widget name="_name" type="HbLabel">
+                        <string locid="txt_applib_dialog_name" name="plainText" value="Name:"/>
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                        <enums name="textWrapping" value="TextWordWrap"/>
+                    </widget>
+                    <widget name="name" type="HbLabel">
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                        <enums name="textWrapping" value="TextWordWrap"/>
+                    </widget>
+                    <widget name="_version" type="HbLabel">
+                        <string locid="txt_applib_dialog_version" name="plainText" value="Version:"/>
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                        <enums name="textWrapping" value="TextWordWrap"/>
+                    </widget>
+                    <widget name="version" type="HbLabel">
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                        <enums name="textWrapping" value="TextWordWrap"/>
+                    </widget>
+                    <widget name="_vendor" type="HbLabel">
+                        <string locid="txt_applib_dialog_supplier" name="plainText" value="Supplier:"/>
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                        <enums name="textWrapping" value="TextWordWrap"/>
+                    </widget>
+                    <widget name="vendor" type="HbLabel">
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                        <enums name="textWrapping" value="TextWordWrap"/>
+                    </widget>
+                    <widget name="_driveInfo" type="HbLabel">
+                        <string locid="txt_applib_dialog_memory_in_use" name="plainText" value="Memory in use:"/>
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                        <enums name="textWrapping" value="TextWordWrap"/>
+                    </widget>
+                    <widget name="driveInfo" type="HbLabel">
+                        <string locid="txt_applib_dialog_1_device_memory" name="plainText" value="%1 Device memory"/>
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                        <enums name="textWrapping" value="TextWordWrap"/>
+                    </widget>
+                    <widget name="_protectiondomain" type="HbLabel">
+                        <string locid="txt_applib_dialog_protection_domain" name="plainText" value="Protection domain:"/>
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                        <enums name="textWrapping" value="TextWordWrap"/>
+                    </widget>
+                    <widget name="protectiondomain" type="HbLabel">
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                        <enums name="textWrapping" value="TextWordWrap"/>
+                    </widget>
+                    <widget name="_size" type="HbLabel">
+                        <string locid="txt_applib_dialog_size" name="plainText" value="Size:"/>
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                        <enums name="textWrapping" value="TextWordWrap"/>
+                    </widget>
+                    <widget name="size" type="HbLabel">
+                        <string locid="txt_applib_dialog_l1_kb" name="plainText" value="%L1 KB"/>
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                        <enums name="textWrapping" value="TextWordWrap"/>
+                    </widget>
+                    <widget name="_type" type="HbLabel">
+                        <string locid="txt_applib_dialog_format" name="plainText" value="Format:"/>
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                        <enums name="textWrapping" value="TextWordWrap"/>
+                    </widget>
+                    <widget name="type" type="HbLabel">
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                        <enums name="textWrapping" value="TextWordWrap"/>
+                    </widget>
+                    <widget name="_description" type="HbLabel">
+                        <string locid="txt_applib_dialog_description" name="plainText" value="Description:"/>
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                    </widget>
+                    <widget name="description" type="HbLabel">
+                        <enums name="textWrapping" value="TextWordWrap"/>
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                    </widget>
+                    <sizehint type="PREFERRED" width="expr(var(hb-param-screen-width) )"/>
+                    <layout orientation="Vertical" spacing="var(hb-param-margin-gene-middle-vertical)" type="linear">
+                        <linearitem itemname="_name"/>
+                        <linearitem itemname="name"/>
+                        <linearitem itemname="_version"/>
+                        <linearitem itemname="version"/>
+                        <linearitem itemname="_vendor"/>
+                        <linearitem itemname="vendor"/>
+                        <linearitem itemname="_driveInfo"/>
+                        <linearitem itemname="driveInfo"/>
+                        <linearitem itemname="_protectiondomain"/>
+                        <linearitem itemname="protectiondomain"/>
+                        <linearitem itemname="_size"/>
+                        <linearitem itemname="size"/>
+                        <linearitem itemname="_type"/>
+                        <linearitem itemname="type"/>
+                        <linearitem itemname="_description"/>
+                        <linearitem itemname="description"/>
+                    </layout>
+                </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">
         <uistate name="Common ui state" sections="#common"/>
+        <uistate name="Java dialog" sections="#common detailsDialogForJavaApplication"/>
     </metadata>
 </hbdocument>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsinstallationlogdialog.docml	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument version="1.1">
+    <object name="qtl_dialog_softkey_left" type="HbAction">
+        <string name="role" value="HbDialog:primaryAction"/>
+        <string locid="txt_common_button_close" name="text"/>
+    </object>
+    <widget name="installation_log_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_installation_logs" name="plainText"/>
+            <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-primary)"/>
+        </widget>
+        <widget name="scrollArea" role="HbDialog:contentWidget" type="HbScrollArea">
+            <widget name="scrollAreaContents" role="HbScrollArea:contents" type="HbWidget">
+                <widget name="log_label" type="HbLabel">
+                    <enums name="textWrapping" value="TextWordWrap"/>
+                    <enums name="alignment" value="AlignLeft|AlignTop|AlignLeading"/>
+                    <sizehint type="PREFERRED" width="expr(var(hb-param-screen-width) )"/>
+                    <string name="plainText" value=""/>
+                    <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                </widget>
+                <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
+                <sizehint type="PREFERRED" width="expr(var(hb-param-screen-width) )"/>
+                <layout orientation="Vertical" spacing="var(hb-param-margin-gene-popup)" type="linear">
+                    <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)"/>
+                    <linearitem itemname="log_label"/>
+                </layout>
+            </widget>
+        </widget>
+        <ref object="qtl_dialog_softkey_left" role="HbWidget:addAction"/>
+    </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/hsmenuworkerstateplugin/resource/hswidgetpreviewdialog.docml	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hswidgetpreviewdialog.docml	Wed Aug 18 09:40:07 2010 +0300
@@ -11,21 +11,20 @@
         <widget name="label" role="HbDialog:headingWidget" type="HbLabel"/>
         <widget name="container" role="HbDialog:contentWidget" type="HbWidget">
             <widget name="icon_box" type="HbLabel">
-                <enums name="alignment" value="AlignHCenter|AlignTop"/>
+                <enums name="alignment" value="AlignAbsolute|AlignVCenter|AlignHCenter"/>
                 <enums name="aspectRatioMode" value="KeepAspectRatio"/>
-                <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Minimum" verticalStretch="0"/>
-                <sizehint height="32un" type="PREFERRED"/>
-                <sizehint height="var(hb-param-text-height-secondary)" type="MINIMUM" width="32un"/>
-                <contentsmargins bottom="0un" left="0un" right="0un" top="expr(var(hb-param-margin-gene-popup) )"/>
-                <sizehint type="MAXIMUM" width="32un"/>
+                <sizehint height="var(hb-param-text-height-secondary)" type="MINIMUM"/>
+                <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
                 <string locid="txt_applib_info_no_preview_available" name="plainText"/>
                 <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
             </widget>
+            
             <real name="z" value="0"/>
-            <layout orientation="Horizontal" type="linear">
-                <stretchitem stretchfactor="1"/>
-                <linearitem itemname="icon_box"/>
-                <stretchitem stretchfactor="1"/>
+           <layout type="anchor">
+                <anchoritem dst="icon_box" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+                <anchoritem dst="icon_box" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
+                <anchoritem dst="icon_box" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+                <anchoritem dst="icon_box" dstEdge="BOTTOM" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="BOTTOM"/>
             </layout>
         </widget>
         <ref object="add_to_homescreen" role="HbWidget:addAction"/>

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsaddappstocollectionstate.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsaddappstocollectionstate.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -15,6 +15,10 @@
  *
  */
 
+#include <HbDocumentLoader>
+#include <HbDialog>
+#include <HbListView>
+#include <QStandardItemModel>
 #include <qfinalstate.h>
 #include <QDebug>
 #include <hsmenuservice.h>
@@ -25,8 +29,8 @@
 #include "hsaddappstocollectionstate.h"
 #include "hsmenuevent.h"
 #include "hscollectionnamedialog.h"
-#include "hscollectionslistdialog.h"
 #include "hsappschecklist.h"
+#include "hsmenuitemmodel.h"
 
 /*!
  \class HsAddAppsToCollectionState
@@ -133,24 +137,16 @@
  */
 
 /*!
- \fn void HsAddAppsToCollectionState::transitToAppsCheckListState(const QString &collectionName);
- Signal emitted when collection name is selected - version to trigger
- transition to mAppCheckListState.
- \param collectionName name of collection.
- */
-
-/*!
  \fn void void HsAddAppsToCollectionState::transitToSaveState(int collectionId);
  Signal emitted when collection id is selected.
  \param collectionId id of collection.
  */
 
 /*!
- \fn void HsAddAppsToCollectionState::transitToAppsCheckListState(int collectionId);
- Signal emitted when collection name is selected - version to trigger
- transition to mAppCheckListState.
- \param collectionId id of collection.
- */
+ \fn void HsAddAppsToCollectionState::transitToSelectCollectionState();
+ Signal emitted after close multiselection list when CollectionActionType is ViaAllViewOptionMenuType   
+ transition to mSelectCollectionState.
+  */
 
 /*!
  \fn void HsAddAppsToCollectionState::transitToNewCollectionState();
@@ -179,15 +175,13 @@
     mShowConfirmation(0), mInitialState(0), mSelectCollectionState(0),
     mNewCollectionState(0), mAppsCheckListState(0), mActionType(
         NoActionType), mApplicationsSortAttribute(NoHsSortAttribute),
-    mCollectionsSortAttribute(NoHsSortAttribute), mAppsCheckList(0),
-    mEditorDialog(0), mListDialog(0)
+    mAppsCheckList(0), mEditorDialog(0), mListDialog(0), mModel(0)
 {
     construct();
 }
 
 /*!
  Destructor.
-
  */
 HsAddAppsToCollectionState::~HsAddAppsToCollectionState()
 {
@@ -238,10 +232,6 @@
             SLOT(setCollectionId(int)));
     connect(this, SIGNAL(transitToSaveState(QString)),
             SLOT(setCollectionName(QString)));
-    connect(this, SIGNAL(transitToAppsCheckListState(int)),
-            SLOT(setCollectionId(int)));
-    connect(this, SIGNAL(transitToAppsCheckListState(QString)),
-            SLOT(setCollectionName(QString)));
     connect(this, SIGNAL(transitToSaveState(QList<int>)),
             SLOT(setAppList(QList<int>)));
 
@@ -250,28 +240,29 @@
     // Add a specific item to a collection via collection specific menu.
     // Adding a new collection via the Collections view.
     mSelectCollectionState->addTransition(this,
-    		SIGNAL(transitToNewCollectionState()), mNewCollectionState);
+            SIGNAL(transitToNewCollectionState()), mNewCollectionState);
     mSelectCollectionState->addTransition(this,
-    		SIGNAL(transitToSaveState(int)), saveState);
+            SIGNAL(transitToSaveState(int)), saveState);
     mNewCollectionState->addTransition(this,
-    		SIGNAL(transitToSaveState(QString)), saveState);
+            SIGNAL(transitToSaveState(QString)), saveState);
 
     // Add one/many applications to an existing/a new collection
     // via the All view options menu.
-    // Add items to a collection via the collection's view options menu.
+    // Add items to a collection via the collection's view options menu.    
     mSelectCollectionState->addTransition(this,
-    		SIGNAL(transitToAppsCheckListState(int)), mAppsCheckListState);
+            SIGNAL(transitToSaveState(int)), saveState);
     mNewCollectionState->addTransition(this,
-    		SIGNAL(transitToAppsCheckListState(QString)), mAppsCheckListState);
+            SIGNAL(transitToSaveState(QString)), saveState);
     mAppsCheckListState->addTransition(this,
-    		SIGNAL(transitToSaveState(QList<int>)), saveState);
-
+                    SIGNAL(transitToSaveState(QList<int>)), saveState);
     mSelectCollectionState->addTransition(this,
-    		SIGNAL(transitToFinalState()),finalState);
+            SIGNAL(transitToFinalState()),finalState);
     mNewCollectionState->addTransition(this,
-    		SIGNAL(transitToFinalState()), finalState);
+            SIGNAL(transitToFinalState()), finalState);
     mAppsCheckListState->addTransition(this,
-    		SIGNAL(transitToFinalState()), finalState);
+            SIGNAL(transitToSelectCollectionState()), mSelectCollectionState);
+    mAppsCheckListState->addTransition(this,
+            SIGNAL(transitToFinalState()), finalState);
 
     //transition to final state after save
     saveState->addTransition(finalState);
@@ -330,27 +321,19 @@
 
     mApplicationsSortAttribute = static_cast<HsSortAttribute>(data.value(
                                      appSortOrderKey()).toInt());
-    mCollectionsSortAttribute = static_cast<HsSortAttribute>(data.value(
-                                    collectionSortOrderKey()).toInt());
 
     const int itemId = data.value(itemIdKey()).toInt();
     mCollectionId = data.value(collectionIdKey()).toInt();
 
-    if (itemId && (mCollectionsSortAttribute != NoHsSortAttribute
-                   || mCollectionId)) {
-        //add selected app item form allAppView or collectionView
+    if (itemId) {
+        //add selected app item from allAppView or collectionView
         mAppList.append(itemId);
-
         mInitialState->addTransition(mSelectCollectionState);
-
         mShowConfirmation = true;
-    } else if (mApplicationsSortAttribute != NoHsSortAttribute
-               && mCollectionsSortAttribute != NoHsSortAttribute) {
+    } else if (mApplicationsSortAttribute != NoHsSortAttribute) {
         //add apps from allAppView options menu
         mActionType = ViaAllViewOptionMenuType;
-
-        mInitialState->addTransition(mSelectCollectionState);
-
+        mInitialState->addTransition(mAppsCheckListState);
         mShowConfirmation = true;
     } else if (mCollectionId) {
         //add apps from collectionView options menu
@@ -406,22 +389,18 @@
 }
 
 
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void HsAddAppsToCollectionState::editorDialogFinished(HbAction* finishedAction)
+/*!
+ Slot invoked when editor dialog with name of created collection is finished.
+ */
+void HsAddAppsToCollectionState::editorDialogFinished(
+        HbAction* finishedAction)
 {
     if (finishedAction == mEditorDialog->actions().value(0)) {
-        QString newName(mEditorDialog->newName(mEditorDialog->value().toString(), true));
-        if (mActionType == ViaAllViewOptionMenuType) {
-            qDebug("HsAddAppsToCollectionState::newCollection() "
-                   "- emit collectionNameSelectedCl(newName)");
-            emit transitToAppsCheckListState(newName);
-        } else {
-            qDebug("HsAddAppsToCollectionState::newCollection() "
-                   "- emit collectionNameSelected(newName)");
-            emit transitToSaveState(newName);
-        }
+        QString newName(
+                mEditorDialog->uniqueCollectionName());
+        qDebug("HsAddAppsToCollectionState::newCollection() "
+               "- emit collectionNameSelectedCl(newName)");
+        emit transitToSaveState(newName);
     } else {
         qDebug(
             "HsAddAppsToCollectionState::newCollection() - emit cancel()");
@@ -437,36 +416,76 @@
 {
     qDebug("HsAddAppsToCollectionState::selectCollection()");
     HSMENUTEST_FUNC_ENTRY("HsAddAppsToCollectionState::selectCollection");
-    mListDialog = new HsCollectionsListDialog(mCollectionsSortAttribute,
-                                                       mCollectionId);
-    mListDialog->open(this, SLOT(listDialogFinished(HbAction*)));
+    
+    HbDocumentLoader loader;
+    bool loadStatusOk = false;
+    loader.load(HS_COLLECTION_DIALOG_LAYOUT, &loadStatusOk);
+    Q_ASSERT_X(loadStatusOk, HS_COLLECTION_DIALOG_LAYOUT,
+           "Error while loading docml file.");
+
+    mListDialog = qobject_cast<HbDialog*>(
+        loader.findWidget(HS_COLLECTION_DIALOG_NAME));
+    
+    HbListView *listView = qobject_cast<HbListView*>(
+        loader.findWidget(HS_COLLECTION_DIALOG_LIST_VIEW));
+    
+    HbAction* createNewCollection = 
+            qobject_cast<HbAction*>(loader.findObject(
+            HS_COLLECTION_DIALOG_CREATE_NEW_ACTION));
+    
+    HbAction* cancel = qobject_cast<HbAction*>(loader.findObject(
+            HS_COLLECTION_DIALOG_CANCEL_ACTION));
+    
+    if (mListDialog != NULL) {
+        mListDialog->setTimeout(HbPopup::NoTimeout);
+        mListDialog->setAttribute(Qt::WA_DeleteOnClose, true);
+        
+        createNewCollection->setParent(mListDialog);
+        cancel->setParent(mListDialog);
+        
+        mModel = standardItemModel(mCollectionId);
+        mModel->setParent(mListDialog);
+        listView->setModel(mModel);
+        
+        connect(listView, SIGNAL(activated(const QModelIndex &)),
+                this, SLOT(collectionSelected(const QModelIndex &)));
+        
+        mListDialog->open(this, SLOT(listDialogFinished(HbAction*)));
+    }
+    
     HSMENUTEST_FUNC_EXIT("HsAddAppsToCollectionState::selectCollection");
 }
 
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
+/*!
+ Slot invoked when collection list dialog is finished
+ */
 void HsAddAppsToCollectionState::listDialogFinished(HbAction* finishedAction)
 {
-    if (finishedAction != mListDialog->actions().value(0)) {
-        int itemId = mListDialog->getItemId();
-        if (itemId) {
-            if (mActionType == ViaAllViewOptionMenuType) {
-                qDebug("emit collectionSelectedCl(%d)", itemId);
-                emit transitToAppsCheckListState(itemId);
-            } else {
-                qDebug("emit collectionSelected(%d)", itemId);
-                emit transitToSaveState(itemId);
-            }
-        } else {
-            qDebug("emit createNewCollection()");
-            emit transitToNewCollectionState();
-        }
-    } else {
+    if (finishedAction == mListDialog->actions().value(0)) {
+        qDebug("emit createNewCollection()");
+        emit transitToNewCollectionState();
+	} else if (finishedAction == mListDialog->actions().value(1)) {
         qDebug("emit cancel()");
         emit transitToFinalState();
-    }
+	}
+    
     mListDialog = NULL; // set to null since this will be deleted after close
+    mModel = NULL;// set to null since this will be deleted with dialog
+}
+
+/*!
+ Slot invoked when collection is selected
+  \param modelIndex Index of selected item.
+ */
+void HsAddAppsToCollectionState::collectionSelected(
+        const QModelIndex &modelIndex)
+{
+    int selectedCollection = mModel->data(
+            modelIndex, CaItemModel::IdRole).toInt();
+    mListDialog->close();
+    
+    qDebug("emit collectionSelected(%d)", selectedCollection);
+    emit transitToSaveState(selectedCollection);
 }
 
 /*!
@@ -479,9 +498,9 @@
     HSMENUTEST_FUNC_ENTRY("HsAddAppsToCollectionState::showMessageAppsAdded");
     HbNotificationDialog *notificationDialog = new HbNotificationDialog();
     notificationDialog->setAttribute(Qt::WA_DeleteOnClose);
-    notificationDialog->setTitle(hbTrId(
-                                     "txt_applib_dpopinfo_added_to_collection_1") .arg(
-                                     HsMenuService::getName(id)));
+    notificationDialog->setTitle(
+            hbTrId("txt_applib_dpophead_added_to_collection_1") .arg(
+                    HsMenuService::getName(id)));
     notificationDialog->show();
     mShowConfirmation = false;
     HSMENUTEST_FUNC_EXIT("HsAddAppsToCollectionState::showMessageAppsAdded");
@@ -527,9 +546,6 @@
 /*!
  Slot invoked when apps checklist state is entered.
  */
-#ifdef COVERAGE_MEASUREMENT
-#pragma CTC SKIP
-#endif //COVERAGE_MEASUREMENT
 void HsAddAppsToCollectionState::appsCheckListState()
 {
     qDebug("HsAddAppsToCollectionState::appsCheckListState()");
@@ -544,29 +560,60 @@
     mAppsCheckList->showAppsCheckboxList(mApplicationsSortAttribute);
     HSMENUTEST_FUNC_EXIT("HsAddAppsToCollectionState::appsCheckListState");
 }
-#ifdef COVERAGE_MEASUREMENT
-#pragma CTC ENDSKIP
-#endif //COVERAGE_MEASUREMENT
 /*!
  Slot connected trrigger action of secondary soft key of check list box.
  It is called when done button is selected.
  */
-#ifdef COVERAGE_MEASUREMENT
-#pragma CTC SKIP
-#endif //COVERAGE_MEASUREMENT
 void HsAddAppsToCollectionState::selectApplicationsDone(
     const QList<int> &appList)
 {
     if (appList.count()) {
         qDebug("AppsCheckListState::selectApplicationsDone() "
                "- emit appsSelected(mAppList)");
-        emit transitToSaveState(appList);
+        if (mActionType == ViaAllViewOptionMenuType) {
+            setAppList(appList);
+            emit transitToSelectCollectionState();
+        } else {
+            emit transitToSaveState(appList);
+        }
     } else {
         qDebug(
             "AppsCheckListState::selectApplicationsDone() - emit cancel()");
         emit transitToFinalState();
     }
 }
-#ifdef COVERAGE_MEASUREMENT
-#pragma CTC ENDSKIP
-#endif //COVERAGE_MEASUREMENT
+/*!
+ Creates standard item model.
+ \param collectionId id of collection to remove from model.
+ \return QStandardItemModel - caller takes ownership.
+ */
+QStandardItemModel *HsAddAppsToCollectionState::standardItemModel(
+    int collectionId)
+{
+    HSMENUTEST_FUNC_ENTRY("HsListDialog::standartItemModel");
+    QScopedPointer<HsMenuItemModel> caModel(
+        HsMenuService::getAllCollectionsModel());
+    caModel->setSecondLineVisibility(true);
+    QStandardItemModel *model = new QStandardItemModel(this);
+    QList<QStandardItem *> items;
+    for (int row = 0; row < caModel->rowCount(); row++) {
+        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),
+                CaItemModel::IdRole), CaItemModel::IdRole);
+            standardItem->setData(caModel->data(caModel->index(row, 0),
+                Qt::DisplayRole), Qt::DisplayRole);
+            standardItem->setData(caModel->data(caModel->index(row, 0),
+                Qt::DecorationRole), Qt::DecorationRole);
+            items << standardItem;
+        }
+    }
+    model->insertColumn(0, items);
+
+    HSMENUTEST_FUNC_EXIT("HsListDialog::standartItemModel");
+    return model;
+}

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsaddtohomescreenstate.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsaddtohomescreenstate.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -17,13 +17,14 @@
 
 #include <qstatemachine.h>
 #include <hblabel.h>
-#include <hsiwidgetprovider.h>
 #include <hsshortcutservice.h>
 #include <hscontentservice.h>
 #include <hbmessagebox.h>
 #include <hbaction.h>
 #include <hbnotificationdialog.h>
 #include <hsmenueventfactory.h>
+#include "hsmenudialogfactory.h"
+#include "hsmenuentryremovedhandler.h"
 
 #include "hsaddtohomescreenstate.h"
 #include "hsmenuevent.h"
@@ -56,8 +57,7 @@
 HsAddToHomeScreenState::HsAddToHomeScreenState(QState *parent) :
     QState(parent), 
     mCorruptedMessage(NULL), mConfirmAction(NULL),
-    mMenuMode(NormalHsMenuMode),
-    mNotifier(0)
+    mMenuMode(NormalHsMenuMode)
 {
     setObjectName("/AddToHomeScreenState");
     
@@ -140,7 +140,6 @@
     params[HOMESCREENDATA] = mToken;
     bool success = contentService.createWidget(params);
     if (!success) {
-        subscribeForMemoryCardRemove();
         showMessageWidgetCorrupted();
     } else {
         emit exit();
@@ -163,21 +162,16 @@
 {
     HSMENUTEST_FUNC_ENTRY("HsCollectionState::showMessageWidgetCorrupted");
 
-    mCorruptedMessage = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
-    mCorruptedMessage->setAttribute(Qt::WA_DeleteOnClose);
-
-    QString message(hbTrId("txt_applib_dialog_file_corrupted_unable_to_use_wi"));
-    mCorruptedMessage->setText(message);
-
-    mCorruptedMessage->clearActions();
-    mConfirmAction = new HbAction(hbTrId("txt_common_button_ok"), 
-                                  mCorruptedMessage);
-    mCorruptedMessage->addAction(mConfirmAction);
-
-    HbAction *secondaryAction = new HbAction(
-            hbTrId("txt_common_button_cancel"), mCorruptedMessage);
-    mCorruptedMessage->addAction(secondaryAction);
-
+    mCorruptedMessage = HsMenuDialogFactory().create(
+            hbTrId("txt_applib_dialog_file_corrupted_unable_to_use_wi"));
+    mConfirmAction = mCorruptedMessage->actions().value(0);
+    
+    QScopedPointer<HsMenuEntryRemovedHandler> entryObserver(
+        new HsMenuEntryRemovedHandler(mEntryId, 
+            mCorruptedMessage, SLOT(close())));
+    
+    entryObserver.take()->setParent(mCorruptedMessage); 
+    
     mCorruptedMessage->open(this, SLOT(messageWidgetCorruptedFinished(HbAction*)));
 
     HSMENUTEST_FUNC_EXIT("HsCollectionState::showMessageWidgetCorrupted");
@@ -190,7 +184,7 @@
 void HsAddToHomeScreenState::messageWidgetCorruptedFinished
         (HbAction* finishedAction)
 {
-    if (finishedAction == mConfirmAction) {
+    if (static_cast<QAction*>(finishedAction) == mConfirmAction) {
         HsMenuService::executeAction(mEntryId, removeActionIdentifier());
     }
     emit exit();
@@ -198,6 +192,7 @@
         machine()->postEvent(
             HsMenuEventFactory::createOpenHomeScreenEvent());
     }
+    mConfirmAction = NULL;
 }
 
 
@@ -208,19 +203,11 @@
 void HsAddToHomeScreenState::cleanUp()
 {
     // Close popups if App key was pressed
-    if (mCorruptedMessage) {
-        disconnect(mCorruptedMessage, SIGNAL(finished(HbAction*)),
-                   this, SLOT(messageWidgetCorruptedFinished(HbAction*)));
+    if (mCorruptedMessage != NULL) {
         mCorruptedMessage->close();
         mCorruptedMessage = NULL;
     }
     
-    disconnect(mNotifier,
-               SIGNAL(entryChanged(CaEntry,ChangeType)),
-               this, SLOT(memoryCardRemoved()));
-
-    delete mNotifier;
-    mNotifier = NULL;
     mToken = NULL;
 }
 
@@ -317,32 +304,6 @@
     }
 }
 
-/*!
- Subscribe for memory card remove.
- \retval void
- */
-void HsAddToHomeScreenState::subscribeForMemoryCardRemove()
-{
-    CaNotifierFilter filter;
-    QList<int> entryIds;
-    entryIds.append(mEntryId);
-    filter.setIds(entryIds);
-    mNotifier = CaService::instance()->createNotifier(filter);
-    mNotifier->setParent(this);
-    connect(mNotifier,
-            SIGNAL(entryChanged(CaEntry,ChangeType)),
-            SLOT(memoryCardRemoved()));
-}
+
 
-/*!
- Memory card with instaled widget was removed.
- \retval void
- */
-void HsAddToHomeScreenState::memoryCardRemoved()
-{
-    if (mCorruptedMessage) {
-        mCorruptedMessage->close();
-        mCorruptedMessage = NULL;
-    }
-    // exit not needed, it is called after dialog closed
-}
+

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsappschecklist.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsappschecklist.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -17,7 +17,7 @@
 
 #include <hbaction.h>
 #include <hbinstance.h>
-#include <hbview.h>
+#include <hbdialog.h>
 #include <hblistview.h>
 #include <hbdocumentloader.h>
 #include <hsmenuservice.h>
@@ -81,7 +81,7 @@
  \retval void
  */
 HsAppsCheckList::HsAppsCheckList() :
-    mView(0), mPreviousView(0), mActionConfirm(0), mListView(0), mModel(0),
+    mAppsSelectDialog(0), mActionConfirm(0), mListView(0), mModel(0),
     mSortAttribute(AscendingNameHsSortAttribute)
 {
 }
@@ -101,16 +101,10 @@
 void HsAppsCheckList::cleanUp()
 {
     //clean up
+    if (mAppsSelectDialog) {
+        mAppsSelectDialog->close();
+    }
 
-    qDeleteAll(mLoadedObjects);
-    mLoadedObjects.clear();
-    mListView = NULL;
-    mView = NULL;
-
-    delete mActionConfirm;
-    mActionConfirm = NULL;
-    delete mModel;
-    mModel = NULL;
     mSortAttribute = AscendingNameHsSortAttribute;
 }
 
@@ -127,9 +121,6 @@
  Shows check box list with all application.
  \param sortAttribute order to sort applications.
  */
-#ifdef COVERAGE_MEASUREMENT
-#pragma CTC SKIP
-#endif //COVERAGE_MEASUREMENT
 void HsAppsCheckList::showAppsCheckboxList(HsSortAttribute sortOrder)
 {
     HSMENUTEST_FUNC_ENTRY("HsAppsCheckList::showAppsCheckboxList");
@@ -139,84 +130,81 @@
     // fills model with data
     // constucts controls such as checklist
     constructControls();
-
-    // Add mListView to main window
-    HbMainWindow *hbMainWindow = mainWindow();
+    
+    if (mAppsSelectDialog) {
+        mAppsSelectDialog->setTimeout(HbPopup::NoTimeout);
+        mAppsSelectDialog->setAttribute(Qt::WA_DeleteOnClose);
+        mAppsSelectDialog->open(this,
+            SLOT(appsSelectionDialogFinished(HbAction*)));
+    }
 
-    // add confirm action
-    mView->setNavigationAction(mActionConfirm);
-
-    hbMainWindow->addView(mView);
-    // record the current view in order to activate it once done
-    mPreviousView = hbMainWindow->currentView();
-    hbMainWindow->setCurrentView(mView);
-    hbMainWindow->show();
     HSMENUTEST_FUNC_EXIT("HsAppsCheckList::showAppsCheckboxList");
 }
-#ifdef COVERAGE_MEASUREMENT
-#pragma CTC ENDSKIP
-#endif //COVERAGE_MEASUREMENT
+
 /*!
  Construct contrlos.
  */
 void HsAppsCheckList::constructControls()
 {
     HSMENUTEST_FUNC_ENTRY("HsAppsCheckList::constructControls");
-    if (!mActionConfirm) {
-        mActionConfirm = new HbAction(Hb::ConfirmNaviAction, mView);
-        connect(mActionConfirm, SIGNAL(triggered()),SLOT(selectApplicationsDone()));
-    }
+
+    bool loadStatusOk = false;
+    HbDocumentLoader loader;
+    loader.load(HS_APP_CHECK_LIST_LAYOUT, &loadStatusOk);
 
-    if (!mView) { // it implies that mListView is NULL as well
-        bool loadStatusOk = false;
+    Q_ASSERT_X(loadStatusOk,
+                HS_APP_CHECK_LIST_LAYOUT,
+               "Error while loading docml file.");
 
-        HbDocumentLoader loader;
-        mLoadedObjects = loader.load(HS_APP_CHECK_LIST_LAYOUT, &loadStatusOk);
+    static const QString APPS_SELECTION_DIALOG("applications_selection_dialog");
+    mAppsSelectDialog =
+        qobject_cast<HbDialog *>(loader.findWidget(APPS_SELECTION_DIALOG));
 
-        Q_ASSERT_X(loadStatusOk,
-                    HS_APP_CHECK_LIST_LAYOUT,
-                   "Error while loading docml file.");
+    if (mAppsSelectDialog) {
+        static const QString LIST_VIEW_WIDGET("listView");
+        mListView = qobject_cast<HbListView *> (loader.findWidget(
+            LIST_VIEW_WIDGET));
+        mModel->setParent(mAppsSelectDialog);
+        mListView->setModel(mModel);
 
-        static const QString VIEW_WIDGET_NAME("view");
-        mView = qobject_cast<HbView *> (loader.findWidget(VIEW_WIDGET_NAME));
-        mView->setParent(this);
+        connect(mListView,SIGNAL(activated(const QModelIndex&) ),this
+                ,SLOT(selectedItemsChanged()));
+        connect(mModel,SIGNAL(rowsRemoved(const QModelIndex&, int,int)),
+        		this, SLOT(selectedItemsChanged()));
 
-        static const QString LIST_VIEW_WIDGET_NAME("listView");
-        mListView = qobject_cast<HbListView *> (loader.findWidget(
-                LIST_VIEW_WIDGET_NAME));
-        mListView->setModel(mModel);
+        // add confirm action
+        static const QString HS_APPS_SELECTION_DIALOG_CONFIRMATION_ACTION
+                ("aps_dialog_softkey_2_left");
+        mActionConfirm = qobject_cast<HbAction*>(loader.findObject(
+                        HS_APPS_SELECTION_DIALOG_CONFIRMATION_ACTION));
+        mActionConfirm->setEnabled(false);
+        mAppsSelectDialog->actions()[0]->setParent(mAppsSelectDialog);
+        mAppsSelectDialog->actions()[1]->setParent(mAppsSelectDialog);
     }
     HSMENUTEST_FUNC_EXIT("HsAppsCheckList::constructControls");
 }
 
 /*!
- Slot connected trrigger action of secondary soft key of check list box.
- It is called when done button is selected.
+ Action after closed application selection dialog.
+ \param finishedAction chosen action.
+ \retval void
  */
-#ifdef COVERAGE_MEASUREMENT
-#pragma CTC SKIP
-#endif //COVERAGE_MEASUREMENT
-void HsAppsCheckList::selectApplicationsDone()
+void HsAppsCheckList::appsSelectionDialogFinished(HbAction* finishedAction)
 {
-    HSMENUTEST_FUNC_ENTRY("HsAppsCheckList::selectApplicationsDone");
-    // Remove mListView from main window and restore previous view.
-    HbMainWindow *hbMainWindow = mainWindow();
-    hbMainWindow->setCurrentView(mPreviousView);
-    hbMainWindow->removeView(mView);
-    
-    QItemSelectionModel *itemSelectionModel = mListView->selectionModel();
+    HSMENUTEST_FUNC_ENTRY("HsAppsCheckList::appsSelectionDialogFinished");
     QList<int> itemsList;
-    if (itemSelectionModel) {
-        QModelIndexList modelIndexList =
-            itemSelectionModel->selectedIndexes();
-        itemsList = getSortedItemsList(modelIndexList);
+    if (finishedAction == mActionConfirm) {
+        QItemSelectionModel *itemSelectionModel = mListView->selectionModel();
+        if (itemSelectionModel) {
+            QModelIndexList modelIndexList =
+                itemSelectionModel->selectedIndexes();
+            itemsList = getSortedItemsList(modelIndexList);
+        }
     }
+    mAppsSelectDialog = NULL;
     emit commit(itemsList);
-    HSMENUTEST_FUNC_EXIT("HsAppsCheckList::selectApplicationsDone");
+    HSMENUTEST_FUNC_EXIT("HsAppsCheckList::appsSelectionDialogFinished");
 }
-#ifdef COVERAGE_MEASUREMENT
-#pragma CTC ENDSKIP
-#endif //COVERAGE_MEASUREMENT
 
 /*!
  Returns list with selected items ids.
@@ -251,16 +239,13 @@
 }
 
 /*!
- Returns pointer to tha main window.
- \return Pointer to the main window.
+ Slot activated then user select or unselect item
  */
-#ifdef COVERAGE_MEASUREMENT
-#pragma CTC SKIP
-#endif //COVERAGE_MEASUREMENT
-HbMainWindow *HsAppsCheckList::mainWindow() const
+void HsAppsCheckList::selectedItemsChanged()
 {
-    return HbInstance::instance()->allMainWindows().value(0);
+    if (mListView->selectionModel()->hasSelection()) {
+        mActionConfirm->setEnabled(true);
+    } else {
+        mActionConfirm->setEnabled(false);
+    }
 }
-#ifdef COVERAGE_MEASUREMENT
-#pragma CTC ENDSKIP
-#endif //COVERAGE_MEASUREMENT

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsarrangestate.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsarrangestate.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -78,7 +78,7 @@
  */
 HsArrangeState::HsArrangeState(QState *parent) :
     QState(parent), mDialog(0), mEntriesList(0), 
-    mItemModel(0)
+    mItemModel(0),mCollectionId(0)
 {
     construct();
 }
@@ -119,9 +119,10 @@
     HSMENUTEST_FUNC_ENTRY("HsArrangeState::save");
 
     getArrangedEntriesIds(listWidget);
-    if (mArrangedCollIdList != mCollIdList) {
+    if (mArrangedCollItemIdList != mCollItemIdList) {
         HsMenuService::organizeCollection(
-            HsMenuService::allCollectionsId(), mArrangedCollIdList);
+            mCollectionId,
+            mArrangedCollItemIdList);
     }
 
     HSMENUTEST_FUNC_EXIT("HsArrangeState::save");
@@ -156,9 +157,22 @@
     mDialog = qobject_cast<HbDialog*>(
             loader.findWidget(HS_ARRANGE_DIALOG_NAME));
 
-    if (mEntriesList != NULL && mDialog != NULL) {
+    if (mEntriesList && mDialog) {
+        switch (menuEvent->operation()) {
+        case HsMenuEvent::ArrangeCollection:
+            mCollectionId = data.value(collectionIdKey()).toInt();
+            mItemModel = HsMenuService::getCollectionModel(
+                mCollectionId,
+                NoHsSortAttribute);
+            break;
+        case HsMenuEvent::ArrangeAllCollections:
+            mCollectionId = HsMenuService::allCollectionsId();
+            mItemModel = HsMenuService::getAllCollectionsModel();
+            break;
+        default:
+            break;
+        }
 
-        mItemModel = HsMenuService::getAllCollectionsModel();
         // as we copy the model contents to the list widget
         // we do not need the model to auto update
         mItemModel->setAutoUpdate(false);
@@ -171,7 +185,7 @@
         mEntriesList->setArrangeMode(true);
     
         mDialog->setTimeout(HbPopup::NoTimeout);
-        mDialog->setAttribute(Qt::WA_DeleteOnClose, true);
+        mDialog->setAttribute(Qt::WA_DeleteOnClose);
 
         mDialog->setPreferredSize(
             HbInstance::instance()->allMainWindows().at(0)->size());
@@ -201,7 +215,8 @@
 {
     HSMENUTEST_FUNC_ENTRY("HsArrangeState::stateExited");
     if (mDialog) {
-        disconnect(mDialog, SIGNAL(finished(HbAction*)), this, SLOT(arrangeDialogFinished(HbAction*)));
+        disconnect(mDialog, SIGNAL(finished(HbAction*)),
+        this, SLOT(arrangeDialogFinished(HbAction*)));
         mDialog->close();
         mDialog = NULL;
     }
@@ -212,8 +227,8 @@
     delete mItemModel;
     mItemModel = NULL;
 
-    mArrangedCollIdList.clear();
-    mCollIdList.clear();
+    mArrangedCollItemIdList.clear();
+    mCollItemIdList.clear();
 
     HSMENUTEST_FUNC_EXIT("HsArrangeState::stateExited");
     qDebug("HsArrangeState::stateExited()");
@@ -235,7 +250,7 @@
         int itemId = mItemModel->data(idx, CaItemModel::IdRole).toInt();
         widgetItem->setData(mItemModel->data(idx, CaItemModel::IdRole),
                             CaItemModel::IdRole);
-        mCollIdList.append(itemId);
+        mCollItemIdList.append(itemId);
         widgetItem->setData(mItemModel->data(idx, Qt::DisplayRole),
                             Qt::DisplayRole);
         widgetItem->setData(mItemModel->data(idx, Qt::DecorationRole),
@@ -259,6 +274,6 @@
     for (int i(0); i < listWidget.count(); ++i) {
         HbListWidgetItem *widgetItem = listWidget.item(i);
         QVariant entryId = widgetItem->data(CaItemModel::IdRole);
-        mArrangedCollIdList.append(entryId.toInt());
+        mArrangedCollItemIdList.append(entryId.toInt());
     }
 }

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionnamedialog.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionnamedialog.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -54,16 +54,22 @@
 HsCollectionNameDialog::HsCollectionNameDialog(const int &itemId)
 {
     HSMENUTEST_FUNC_ENTRY("HsInputDialog::HsInputDialog");
-    mCollectionsNames = HsMenuService::getCollectionNames();
+    mOtherCollectionsNames = HsMenuService::getCollectionNames();
+
+
     setInputMode(HbInputDialog::TextInput);
     setPromptText(hbTrId("txt_applib_title_collection_name"));
     lineEdit()->setMaxLength(qMaxStrLength);
     if (itemId) {
-        setValue(HsMenuService::getName(itemId));
-        mCollectionsNames.removeOne(value().toString());
+        const QString currentCollectionName(
+                HsMenuService::getName(itemId));
+        setValue(currentCollectionName);
+        mOtherCollectionsNames.removeOne(currentCollectionName);
+        mSuggestedNames << currentCollectionName;
     } else {
         setValue(hbTrId("txt_applib_dialog_entry_collection"));
     }
+
     HSMENUTEST_FUNC_EXIT("HsInputDialog::HsInputDialog");
 }
 
@@ -72,8 +78,8 @@
  */
 HsCollectionNameDialog::~HsCollectionNameDialog()
 {
-    mCollectionsNames.clear();
-    mLastCollectionName.clear();
+    mOtherCollectionsNames.clear();
+    mSuggestedNames.clear();
 }
 
 /*!
@@ -95,6 +101,16 @@
 }
 
 /*!
+  \return User input if it is unique collection name or an unique collection name being
+  a combination of user name and a suffix matching following regular expression:
+  "\([0-9][1-9]\)|\([1-9][0-9]+\)"
+ */
+QString HsCollectionNameDialog::uniqueCollectionName() const
+{
+    return generateUniqueCollectionName(value().toString());
+}
+
+/*!
     \reimp 
     Disconnects signals and calls base class impl. which emits finished(HbAction*) 
  */
@@ -106,41 +122,50 @@
 }
 
 /*!
- * Gets new collection's name.
- \param name name of collection.
- \param addLastName true
- if last found name is need to add to validation
- \retval new collection name.
+  \param name Input string which is to be basename
+    of resulting unique collection name.
+  \return Unique collection name.
  */
-QString HsCollectionNameDialog::newName(const QString &name,
-                                        bool addLastName)
+QString HsCollectionNameDialog::generateUniqueCollectionName(
+        const QString &name) const
 {
     HSMENUTEST_FUNC_ENTRY("HsInputDialog::newName");
+
     QString newName(name);
-    int numToAppend(1);
-    if (addLastName && mLastCollectionName.length() > 0
-            && !mCollectionsNames.contains(mLastCollectionName)) {
-        mCollectionsNames << mLastCollectionName;
+
+    unsigned int numToAppend(1);
+
+    while (mOtherCollectionsNames.contains(newName)) {
+        newName =
+                name
+                + QString("(%1)").arg(numToAppend, 2, 10, QLatin1Char('0'));
+        numToAppend++;
     }
-    while (mCollectionsNames.contains(newName)) {
+
+    HSMENUTEST_FUNC_EXIT("HsInputDialog::newName");
+    return newName;
+}
+/*!
+  \param name Input string which is to be basename
+    for suggested collection name.
+  \return Unique collection name if it was not yet proposed during lifetime of the dialog
+   or \a name otherwise.
+ */
+QString HsCollectionNameDialog::suggestedCollectionName(const QString &name)
+{
+    HSMENUTEST_FUNC_ENTRY("HsInputDialog::processInput");
+
+    QString newName = generateUniqueCollectionName(name);
+
+    if (mSuggestedNames.contains(newName)) {
         newName = name;
-        newName.append("(");
-        if (numToAppend < 10) {
-            newName.append("0");
-        }
-        newName.append(QString::number(numToAppend));
-        newName.append(")");
-        numToAppend++;
-        if (!addLastName) {
-            if (mLastCollectionName.length() > 0
-                    && !mCollectionsNames.contains(mLastCollectionName)) {
-                mCollectionsNames << mLastCollectionName;
-            }
-            mCollectionsNames.removeOne(name);
-            mLastCollectionName = name;
-        }
     }
-    HSMENUTEST_FUNC_EXIT("HsInputDialog::newName");
+
+    if (newName != name) {
+        mSuggestedNames << newName;
+    }
+
+    HSMENUTEST_FUNC_EXIT("HsInputDialog::validate");
     return newName;
 }
 
@@ -184,7 +209,7 @@
         actions()[0]->setEnabled(true);
     }
 
-    QString newText = newName(text);
+    QString newText = suggestedCollectionName(text);
     if (newText != text) {
         makeDisconnect();
         lineEdit()->setText(newText);

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionnamestate.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionnamestate.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -111,7 +111,7 @@
 void HsCollectionNameState::dialogFinished(HbAction* finishedAction)
 {
     if (finishedAction == mCollectionNameDialog->actions().value(0)) {
-        QString newName(mCollectionNameDialog->newName(mCollectionNameDialog->value().toString(), true));
+        QString newName(mCollectionNameDialog->uniqueCollectionName());
         if (mItemId) {
             if (newName != HsMenuService::getName(mItemId)) {
                 HsMenuService::renameCollection(mItemId, newName);

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionslistdialog.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,182 +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: Hs list dialog
- *
- */
-
-#include <HbAction>
-#include <HbLabel>
-#include <QDebug>
-#include <QStandardItemModel>
-
-#include <hsmenuservice.h>
-#include <hsmenuitemmodel.h>
-#include "hscollectionslistdialog.h"
-
-/*!
- \class HsCollectionsListDialog
- \ingroup group_hsworkerstateplugin
- \brief Hs List Dialog
- Hs List Dialog
- */
-
-/*!
- \var HsCollectionsListDialog::mModel
- Model.
- */
-
-/*!
- \var HsCollectionsListDialog::mItemId
- Selected item id.
- */
-
-/*!
- \fn void HsCollectionsListDialog::makeConnect();
- Connects edit line signals to slots.
-*/
-
-/*!
- \fn void HsCollectionsListDialog::makeDisconnect();
- Disconnects edit line signals from slots.
- */
-
-/*!
- Constructor
- \param sortOrder sort order.
- \param collectionId collectionId id of collection
- to remove from list.
- \retval void
- */
-HsCollectionsListDialog::HsCollectionsListDialog(HsSortAttribute sortOrder,
-        int collectionId) :
-    HbSelectionDialog(), mItemId(0)
-{
-    clearActions();
-    HbAction *cancelAction = new HbAction(hbTrId("txt_common_button_cancel"), this);
-    addAction(cancelAction);
-
-    setHeadingWidget(new HbLabel(hbTrId("txt_applib_title_add_to")));
-    // it must be single selection, although it shows checkboxes -
-    // it is Orbit defect and will be fixed in next release
-    setSelectionMode(HbAbstractItemView::SingleSelection);
-    mModel = standartItemModel(sortOrder, collectionId);
-    setModel(mModel);
-}
-
-/*!
- Destructor
- */
-HsCollectionsListDialog::~HsCollectionsListDialog()
-{
-    delete mModel;
-}
-
-/*!
- Executes dialog.
- \retval Selected action.
- */
-void HsCollectionsListDialog::open(QObject* receiver, const char* member)
-{
-    this->setAttribute(Qt::WA_DeleteOnClose);
-    HbSelectionDialog::open(receiver, member);
-}
-
-/*!
-    \reimp
-    Disconnects signals and calls base class impl. which emits finished(HbAction*)
- */
-void HsCollectionsListDialog::closeEvent ( QCloseEvent * event )
-{
-    qDebug("HsCollectionsListDialog::closeEvent");
-    HbAction *closingAction = qobject_cast<HbAction *>(sender());
-
-    if (closingAction != actions().value(0)) {
-        QModelIndexList modlist = selectedModelIndexes();
-        if (modlist.count()) {
-            mItemId
-            = mModel-> data(modlist[0], CaItemModel::IdRole).toInt();
-        }
-    }
-
-    HbDialog::closeEvent(event); // emits finished(HbAction*)
-}
-
-/*!
- Creates standard item model.
- \param sortOrder sort order.
- \param collectionId id of collection to remove from model.
- \return QStandardItemModel - caller takes ownership.
- */
-QStandardItemModel *HsCollectionsListDialog::standartItemModel(
-    HsSortAttribute sortOrder, int collectionId)
-{
-    HSMENUTEST_FUNC_ENTRY("HsListDialog::standartItemModel");
-    QScopedPointer<HsMenuItemModel> caModel(
-        HsMenuService::getAllCollectionsModel(sortOrder));
-    caModel->setSecondLineVisibility(false);
-    QStandardItemModel *model = new QStandardItemModel(this);
-    QList<QStandardItem *> items;
-    for (int row = 0; row < caModel->rowCount(); row++) {
-        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),
-                                                CaItemModel::IdRole), CaItemModel::IdRole);
-            standardItem->setData(caModel->data(caModel->index(row, 0),
-                                                Qt::DisplayRole), Qt::DisplayRole);
-            standardItem->setData(caModel->data(caModel->index(row, 0),
-                                                Qt::DecorationRole), Qt::DecorationRole);
-            items << standardItem;
-        }
-    }
-    model->insertColumn(0, items);
-
-    insertNewCollectionItem(model);
-    HSMENUTEST_FUNC_EXIT("HsListDialog::standartItemModel");
-    return model;
-}
-
-/*!
- Inserts "new collection" item into model.
- \param model a model.
- */
-void HsCollectionsListDialog::insertNewCollectionItem(
-    QStandardItemModel *model)
-{
-    HSMENUTEST_FUNC_ENTRY("HsListDialog::insertNewCollectionItem");
-    QStandardItem *standardItem = new QStandardItem();
-    standardItem->setData(0, CaItemModel::IdRole);
-    standardItem->setData(hbTrId("txt_applib_list_new_collection"),
-                          Qt::DisplayRole);
-
-    standardItem->setData(HbIcon(defaultCollectionIconId()),
-                          Qt::DecorationRole);
-
-    QList<QStandardItem *> items;
-    items << standardItem;
-    model->insertRow(0, items);
-    HSMENUTEST_FUNC_EXIT("HsListDialog::insertNewCollectionItem");
-}
-
-/*!
- Gets selected item id.
- \retval Selected item id.
- */
-int HsCollectionsListDialog::getItemId()
-{
-    return mItemId;
-}

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsdeletecollectionitemstate.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsdeletecollectionitemstate.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -15,12 +15,13 @@
  *
  */
 
-#include <hbmessagebox.h>
+#include <HbMessageBox>
 #include <hbaction.h>
 #include <HbParameterLengthLimiter>
 #include <hsmenuservice.h>
 #include <hsmenueventfactory.h>
 
+#include "hsmenudialogfactory.h"
 #include "hsdeletecollectionitemstate.h"
 #include "hsmenuevent.h"
 
@@ -86,18 +87,8 @@
             HsMenuService::getName(mItemId)));
 
     // create and show message box
-    mDeleteMessage = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
-    mDeleteMessage->setAttribute(Qt::WA_DeleteOnClose);
-
-    mDeleteMessage->setText(message);
-
-    mDeleteMessage->clearActions();
-    mConfirmAction = new HbAction(hbTrId("txt_common_button_ok"), mDeleteMessage);
-    mDeleteMessage->addAction(mConfirmAction);
-
-    HbAction *secondaryAction = new HbAction(hbTrId("txt_common_button_cancel"), mDeleteMessage);
-    mDeleteMessage->addAction(secondaryAction);
-
+    mDeleteMessage = HsMenuDialogFactory().create(message);
+    mConfirmAction = mDeleteMessage->actions().value(0);
     mDeleteMessage->open(this, SLOT(deleteMessageFinished(HbAction*)));
 
     HSMENUTEST_FUNC_EXIT("HsDeleteCollectionItemState::onEntry");
@@ -110,10 +101,11 @@
  */
 void HsDeleteCollectionItemState::deleteMessageFinished(HbAction* finishedAction)
 {
-    if (finishedAction == mConfirmAction) {
+    if (static_cast<QAction*>(finishedAction) == mConfirmAction) {
         HsMenuService::removeApplicationFromCollection(mItemId, mCollectionId);
     }
     emit exit();
+    mConfirmAction = NULL;
 }
 
 /*!

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsdeletecollectionstate.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsdeletecollectionstate.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -16,7 +16,7 @@
  */
 
 #include <QStateMachine>
-#include <hbmessagebox.h>
+#include <HbMessageBox>
 #include <hbaction.h>
 #include <hsmenuservice.h>
 #include <HbParameterLengthLimiter>
@@ -24,6 +24,7 @@
 #include <hsmenueventfactory.h>
 
 #include "hsdeletecollectionstate.h"
+#include "hsmenudialogfactory.h"
 #include "hsmenuevent.h"
 
 /*!
@@ -91,19 +92,10 @@
     }
 
     // create and show message box
-    mDeleteMessage = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
-    mDeleteMessage->setAttribute(Qt::WA_DeleteOnClose);
-
-    mDeleteMessage->setText(message);
+    mDeleteMessage = HsMenuDialogFactory().create(message);
+    mConfirmAction = mDeleteMessage->actions().value(0);
+    mDeleteMessage->open(this, SLOT(deleteMessageFinished(HbAction*)));
 
-    mDeleteMessage->clearActions();
-    mConfirmAction = new HbAction(hbTrId("txt_common_button_ok"), mDeleteMessage);
-    mDeleteMessage->addAction(mConfirmAction);
-
-    HbAction *secondaryAction = new HbAction(hbTrId("txt_common_button_cancel"), mDeleteMessage);
-    mDeleteMessage->addAction(secondaryAction);
-
-    mDeleteMessage->open(this, SLOT(deleteMessageFinished(HbAction*)));
     HSMENUTEST_FUNC_EXIT("HsDeleteCollectionState::onEntry");
 }
 
@@ -113,12 +105,13 @@
 //
 void HsDeleteCollectionState::deleteMessageFinished(HbAction* finishedAction)
 {
-    if (finishedAction == mConfirmAction) {
+    if (static_cast<QAction*>(finishedAction) == mConfirmAction) {
         HsMenuService::removeCollection(mItemId);
         machine()->postEvent(
         HsMenuEventFactory::createCollectionDeletedEvent());
     }
     emit exit();
+    mConfirmAction = NULL;
 }
 
 /*!
@@ -129,7 +122,6 @@
 {
     // Close messagebox if App key was pressed
     if (mDeleteMessage) {
-        disconnect(mDeleteMessage, SIGNAL(finished(HbAction*)), this, SLOT(deleteMessageFinished(HbAction*)));
         mDeleteMessage->close();
         mDeleteMessage = NULL;
     }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsinstallationlogstate.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,169 @@
+/*
+ * 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 <HbDocumentLoader>
+#include <HbLabel>
+#include <HbMessageBox>
+#include <QAction>
+#include <hsmenuservice.h>
+#include <casoftwareregistry.h>
+
+#include "hsinstallationlogstate.h"
+
+/*!
+ \class HsInstallationLogState
+ \ingroup group_hsworkerstateplugin
+ \brief Uninstall Item State.
+ Deletes app from collection.
+ */
+
+/*!
+ Constructor.
+ \param parent Parent state.
+ */
+HsInstallationLogState::HsInstallationLogState(QState *parent) :
+    QState(parent),
+    mInstalationLogDialog(NULL)
+{
+    construct();
+}
+
+/*!
+ Destructor.
+ */
+HsInstallationLogState::~HsInstallationLogState()
+{
+    cleanUp(); // in case of throw
+}
+
+/*!
+ Constructs contained objects.
+ */
+void HsInstallationLogState::construct()
+{
+    setObjectName("/InstallationLogState");
+    if (this->parent()) {
+        setObjectName(this->parent()->objectName() + objectName());
+    }
+    connect(this, SIGNAL(exited()), SLOT(cleanUp()));
+}
+
+/*!
+ Sets entry event.
+ \param event entry event.
+ */
+void HsInstallationLogState::onEntry(QEvent *event)
+{
+    HSMENUTEST_FUNC_ENTRY("HsInstallationLogState::onEntry");
+    QState::onEntry(event);
+    qDebug("HsInstallationLogState::onEntry()");
+    
+    createInstallationLogDialog();
+
+    HSMENUTEST_FUNC_EXIT("HsInstallationLogState::onEntry");
+}
+
+/*!
+ Invoked on exiting state
+ */
+void HsInstallationLogState::onExit(QEvent *event)
+{
+    QState::onExit(event);
+}
+
+/*!
+ Create installation log dialog.
+ \retval void
+ */
+void HsInstallationLogState::createInstallationLogDialog()
+{
+    QList<CaSoftwareRegistry::DetailMap> detailsList =
+        CaSoftwareRegistry::create()->retrieveLogEntries();
+    
+    HbDocumentLoader loader;
+    bool loadStatusOk = false;
+    loader.load(HS_INSTALLATION_LOG_DIALOG_LAYOUT, &loadStatusOk);
+    Q_ASSERT_X(loadStatusOk, HS_INSTALLATION_LOG_DIALOG_LAYOUT,
+           "Error while loading docml file.");
+
+    mInstalationLogDialog = qobject_cast<HbDialog*>(
+        loader.findWidget(HS_INSTALLATION_LOG_DIALOG_NAME));
+    
+    if (mInstalationLogDialog != NULL) {
+        mInstalationLogDialog->actions()[0]->setParent(mInstalationLogDialog);
+        mInstalationLogDialog->setTimeout(HbPopup::NoTimeout);
+        mInstalationLogDialog->setAttribute(Qt::WA_DeleteOnClose, true);
+    
+        HbLabel* logList;
+        QString applicationsList;
+        QString listElement("%1 (%2)\n%3 - ");
+        QString applicationName;
+        QString version;
+        QString date;
+        QString type;
+        QString installed(hbTrId("txt_applib_dialog_installed"));
+        QString removed(hbTrId("txt_applib_dialog_removed"));
+        QString newLine("\n");
+    
+        logList = qobject_cast<HbLabel*>(
+                loader.findWidget(HS_INSTALLATION_LOG_DIALOG_LOG_LABEL));
+
+        for (int i=0; i<detailsList.count(); i++) {
+            applicationName = detailsList[i].value(CaSoftwareRegistry::componentNameKey());
+            version = detailsList[i].value(CaSoftwareRegistry::componentVersionKey());
+            date = detailsList[i].value(CaSoftwareRegistry::componentTimeKey());
+            QString localListElement(listElement);
+            localListElement = localListElement.arg(applicationName).arg(version).arg(date);
+            type = detailsList[i].value(CaSoftwareRegistry::componentOperationTypeKey());
+            if ((type.compare(CaSoftwareRegistry::componentInstallValue()) == 0) ||
+                (type.compare(CaSoftwareRegistry::componentUpgradeValue()) == 0)) {
+                localListElement = localListElement + installed;
+                applicationsList = applicationsList + localListElement +
+                        newLine + newLine;
+            } else if (type.compare(CaSoftwareRegistry::componentUninstallValue()) == 0) {
+                localListElement = localListElement + removed;
+                applicationsList = applicationsList + localListElement + 
+                        newLine + newLine;
+            }
+        }
+
+        applicationsList.chop(2 * newLine.size());
+        logList->setPlainText(applicationsList);
+    
+        mInstalationLogDialog->open(this, SLOT(stateExited()));
+    }
+}
+
+void HsInstallationLogState::stateExited()
+{
+    mInstalationLogDialog = NULL;
+    emit exit();
+}
+
+/*!
+ Slot launched after state has exited and in destructor.
+ \retval void
+ */
+void HsInstallationLogState::cleanUp()
+{
+    // Close popups if App key was pressed
+    if (mInstalationLogDialog) {
+        mInstalationLogDialog->close();
+        mInstalationLogDialog = NULL;
+    }
+}
+

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsmenuworkerstate.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsmenuworkerstate.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -28,6 +28,7 @@
 #include "hspreviewhswidgetstate.h"
 #include "hsviewappsettingsstate.h"
 #include "hsviewappdetailsstate.h"
+#include "hsinstallationlogstate.h"
 
 /*!
  \class HsMenuWorkerState
@@ -79,7 +80,9 @@
     createChildState<HsUninstallItemState> (
         HsMenuEvent::UninstallApplication);
     createChildState<HsArrangeState> (HsMenuEvent::ArrangeCollection);
+    createChildState<HsArrangeState> (HsMenuEvent::ArrangeAllCollections);
 
+    
     // create a new child state based on the template
     HsCollectionNameState *newChildState = new HsCollectionNameState(this);
     // create a transition to the new child state which will be triggered by
@@ -95,7 +98,8 @@
     mInitialState->addTransition(createCollectionTransition);
     // set a transition to the initial state after child processing finished
     newChildState->addTransition(newChildState, SIGNAL(exit()), mInitialState);
-
+    connect(this, SIGNAL(reset()), newChildState, SIGNAL(exit()));
+    
     HsAddAppsToCollectionState *addAppsToCollectionState =
         new HsAddAppsToCollectionState(this);
     // create a transition to the new child state which will be triggered by
@@ -108,9 +112,12 @@
     addAppsToCollectionState->addTransition(addAppsToCollectionState,
                                             SIGNAL(finished()), mInitialState);
     connect(this, SIGNAL(reset()), addAppsToCollectionState, SIGNAL(finished()));
+    
+    
     createChildState<HsPreviewHSWidgetState> (HsMenuEvent::PreviewHSWidget);
     createChildState<HsViewAppSettingsState> (HsMenuEvent::ShowAppSettings);
     createChildState<HsViewAppDetailsState> (HsMenuEvent::ShowAppDetails);
+    createChildState<HsInstallationLogState> (HsMenuEvent::ShowInstallationLog);
 
     HSMENUTEST_FUNC_EXIT("HsMenuWorkerState::construct");
 }

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hspreviewhswidgetstate.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hspreviewhswidgetstate.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -15,7 +15,6 @@
  *
 */
 
-
 #include <hblabel.h>
 #include <hbmessagebox.h>
 #include <qstatemachine.h>
@@ -35,10 +34,12 @@
 #include "hswidgethost.h"
 #include "hspreviewhswidgetstate.h"
 #include "hsmenuevent.h"
+#include "hsmenudialogfactory.h"
 #include "hsapp_defs.h"
 #include "hsscene.h"
 #include "hspage.h"
 
+
 #include "canotifier.h"
 #include "canotifierfilter.h"
 #include "caservice.h"
@@ -63,10 +64,12 @@
 HsPreviewHSWidgetState::HsPreviewHSWidgetState(QState *parent) :
     QState(parent),
     mPreviewDialog(0),
-    mNotifier(0),
-    mWidget(0),
     mEntryId(0),
-    mCorruptedMessage(0)
+    mCorruptedMessage(0),
+    mConfirmRemovalAction(0),
+    mAddToHomescreenAction(0),
+    mToken(),
+    mUri()
 {
     setObjectName("/HsPreviewHSWidgetState");
     if (this->parent()) {
@@ -100,34 +103,27 @@
     HSMENUTEST_FUNC_ENTRY("HsPreviewHSWidgetState::onEntry");
     QState::onEntry(event);
     HsMenuEvent *menuEvent = static_cast<HsMenuEvent *>(event);
+   
     QVariantMap data = menuEvent->data();
-
     mEntryId = data.value(itemIdKey()).toInt();
-
-    QVariantHash widgetData;
-    widgetData.insert(LIBRARY, data.value(widgetLibraryAttributeName()).toString());
-    widgetData.insert(URI, data.value(widgetUriAttributeName()).toString());
-
-    mWidget.reset(
-        HsContentService::instance()->createWidgetForPreview(widgetData));
-
-    if (!mWidget.isNull()) {
+    mToken = data.value(HOMESCREENDATA);
+    
         
-        QSharedPointer<CaEntry> entry = 
-            CaService::instance()->getEntry(mEntryId);
-        
-        mPreviewDialog = buildPreviewDialog(*entry);
+    QSharedPointer<CaEntry> entry =
+        CaService::instance()->getEntry(mEntryId);
+    mUri = entry->attribute(widgetUriAttributeName());
+    mPreviewDialog = buildPreviewDialog(*entry);
+    mAddToHomescreenAction = mPreviewDialog->actions().value(0);
+    
+    if (mPreviewDialog != NULL) {
+        // Launch popup asyncronously
         
-        if (mPreviewDialog != NULL) {
-            subscribeForMemoryCardRemove();
-            // Launch popup asyncronously
-            mPreviewDialog->open(this, SLOT(previewDialogFinished(HbAction*)));    
-        }
-    } else {
-        subscribeForMemoryCardRemove();
-        showMessageWidgetCorrupted();
+        mEntryObserver.reset(
+            new HsMenuEntryRemovedHandler(mEntryId, this, SIGNAL(exit())));
+        
+        mPreviewDialog->open(this, SLOT(previewDialogFinished(HbAction*)));
     }
-
+    
     HSMENUTEST_FUNC_EXIT("HsPreviewHSWidgetState::onEntry");
 }
 
@@ -137,29 +133,19 @@
  */
 void HsPreviewHSWidgetState::cleanUp()
 {
-    // Close popups if App key was pressed or memory card removed
-    if (mPreviewDialog) {
-        disconnect(mPreviewDialog, SIGNAL(finished(HbAction*)), 
-            this, SLOT(previewDialogFinished(HbAction*)));
-        mPreviewDialog->close();
+    if (mPreviewDialog != NULL) {
+        mPreviewDialog->disconnect();
+        mPreviewDialog ->close();
         mPreviewDialog = NULL;
     }
-
-    if (mCorruptedMessage) {
-        disconnect(mCorruptedMessage, SIGNAL(finished(HbAction*)), 
-            this, SLOT(messageWidgetCorruptedFinished(HbAction*)));
+    
+    if (mCorruptedMessage != NULL) {
+        mCorruptedMessage->disconnect();
         mCorruptedMessage->close();
         mCorruptedMessage = NULL;
     }
-
-    mWidget.reset();
-
-    disconnect(mNotifier,
-               SIGNAL(entryChanged(CaEntry,ChangeType)),
-               this, SIGNAL(exit()));
-
-    delete mNotifier;
-    mNotifier = NULL;
+    
+    mToken = NULL;
 }
 
 /*!
@@ -168,38 +154,30 @@
  */
 void HsPreviewHSWidgetState::previewDialogFinished(HbAction* finishedAction)
 {
-    if (finishedAction == mPreviewDialog->actions().value(0)) {
+    mPreviewDialog = NULL;
+
+    if (finishedAction == mAddToHomescreenAction) {
 
-        HsScene::instance()->activePage()->addNewWidget(
-            mWidget.take()); // ownership transferred
-        HbNotificationDialog *notificationDialog = new HbNotificationDialog();
-        notificationDialog->setAttribute(Qt::WA_DeleteOnClose);
-        notificationDialog->setTitle(hbTrId(
-                                     "txt_applib_dpophead_added_to_homescreen") );
-        notificationDialog->show();
+        QVariantHash widgetData;
+        widgetData[URI] = mUri;
+        widgetData[HOMESCREENDATA] = mToken;
+        
+        bool success = HsContentService::instance()->createWidget(widgetData);
+        
+        if (success) {
+            HbNotificationDialog *notificationDialog = new HbNotificationDialog();
+            notificationDialog->setAttribute(Qt::WA_DeleteOnClose);
+            notificationDialog->setTitle(hbTrId("txt_applib_dpophead_added_to_homescreen"));
+            notificationDialog->show();
+            emit exit();
+        }
+        else {
+            showMessageWidgetCorrupted();            
+        }
     } else {
-            mWidget->remove();
-            mWidget.take();   
-            mWidget.reset();
+        emit exit();
     }
-    emit exit();
-}
-
-/*!
- Subscribe for memory card remove.
- \retval void
- */
-void HsPreviewHSWidgetState::subscribeForMemoryCardRemove()
-{
-    CaNotifierFilter filter;
-    QList<int> entryIds;
-    entryIds.append(mEntryId);
-    filter.setIds(entryIds);
-    mNotifier = CaService::instance()->createNotifier(filter);
-    mNotifier->setParent(this);
-    connect(mNotifier,
-            SIGNAL(entryChanged(CaEntry,ChangeType)),
-            SIGNAL(exit()));
+    mAddToHomescreenAction = 0;
 }
 
 /*!
@@ -210,20 +188,13 @@
 {
     HSMENUTEST_FUNC_ENTRY("HsCollectionState::showMessageWidgetCorrupted");
 
-    mCorruptedMessage = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
-    mCorruptedMessage->setAttribute(Qt::WA_DeleteOnClose);
-
-    QString message(hbTrId("txt_applib_dialog_file_corrupted_unable_to_use_wi"));
-    mCorruptedMessage->setText(message);
+    mCorruptedMessage = HsMenuDialogFactory().create(
+            hbTrId("txt_applib_dialog_file_corrupted_unable_to_use_wi"));
 
-    mCorruptedMessage->clearActions();
-    HbAction *primaryAction = new HbAction(hbTrId("txt_common_button_ok"), mCorruptedMessage);
-    mCorruptedMessage->addAction(primaryAction);
+    mConfirmRemovalAction = mCorruptedMessage->actions().value(0);
+    mCorruptedMessage
+        ->open(this, SLOT(messageWidgetCorruptedFinished(HbAction*)));
 
-    HbAction *secondaryAction = new HbAction(hbTrId("txt_common_button_cancel"), mCorruptedMessage);
-    mCorruptedMessage->addAction(secondaryAction);
-
-    mCorruptedMessage->open(this, SLOT(messageWidgetCorruptedFinished(HbAction*)));
     HSMENUTEST_FUNC_EXIT("HsCollectionState::showMessageWidgetCorrupted");
 }
 
@@ -233,10 +204,14 @@
  */
 void HsPreviewHSWidgetState::messageWidgetCorruptedFinished(HbAction* finishedAction)
 {
-    if (finishedAction == mCorruptedMessage->actions().value(0)) {
+    mCorruptedMessage = NULL;
+	
+    if (static_cast<QAction*>(finishedAction) == mConfirmRemovalAction) {
         HsMenuService::executeAction(mEntryId, removeActionIdentifier());
     }
     emit exit();
+    
+    mConfirmRemovalAction = NULL;
 }
 
 /*!
@@ -260,7 +235,7 @@
     HbLabel *const iconBox =
         qobject_cast<HbLabel*>(
             loader.findWidget(HS_WIDGET_PREVIEW_ICON_BOX_NAME));
-    
+
     loadStatusOk = loadStatusOk && (previewDialog != NULL)
         && (headingLabel != NULL) && (iconBox != NULL);
     
@@ -269,8 +244,8 @@
            "Cannot initialize widgets based on docml file.");
     
     if (loadStatusOk) {
-        previewDialog->actions()[0]->setParent(previewDialog);
-        previewDialog->actions()[1]->setParent(previewDialog);
+        previewDialog->actions().value(0)->setParent(previewDialog);
+        previewDialog->actions().value(1)->setParent(previewDialog);
         
         previewDialog->setTimeout(HbPopup::NoTimeout);
         previewDialog->setAttribute(Qt::WA_DeleteOnClose, true);
@@ -283,6 +258,8 @@
         if (!previewImageName.isEmpty()) {
             const HbIcon previewImage(previewImageName);
             if (previewImage.size().isValid()) {
+                iconBox->setMinimumHeight(previewImage.height());
+                iconBox->setMaximumHeight(previewImage.height());
                 iconBox->setIcon(previewImage);
             }
         }

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsuninstallitemstate.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsuninstallitemstate.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -24,7 +24,7 @@
 #include <HbListView>
 #include <HbParameterLengthLimiter>
 
-
+#include <QScopedPointer>
 #include <QStandardItemModel>
 #include <QStandardItem>
 #include <casoftwareregistry.h>
@@ -33,7 +33,8 @@
 
 #include "hsuninstallitemstate.h"
 #include "hsmenuevent.h"
-
+#include "hsmenudialogfactory.h"
+#include "hsmenuentryremovedhandler.h"
 /*!
  \class HsUninstallItemState
  \ingroup group_hsworkerstateplugin
@@ -48,7 +49,6 @@
 HsUninstallItemState::HsUninstallItemState(QState *parent) :
     QState(parent),
     mItemId(0),
-    mNotifier(NULL),
     mUninstallMessage(NULL),
     mUninstallJavaMessage(NULL),
     mConfirmAction(NULL)
@@ -74,6 +74,7 @@
         setObjectName(this->parent()->objectName() + objectName());
     }
     connect(this, SIGNAL(exited()), SLOT(cleanUp()));
+    
 }
 
 /*!
@@ -98,9 +99,7 @@
         // other
         createUninstallMessage();
     }
-    
-    subscribeForMemoryCardRemove();
-
+        
     HSMENUTEST_FUNC_EXIT("HsUninstallItemState::onEntry");
 }
 
@@ -111,9 +110,12 @@
  */
 void HsUninstallItemState::uninstallMessageFinished(HbAction* finishedAction)
 {
-    if (finishedAction == mConfirmAction) {
+    if (static_cast<QAction*>(finishedAction) == mConfirmAction) {
         HsMenuService::executeAction(mItemId, removeActionIdentifier());
     }
+    mConfirmAction = NULL;
+    mUninstallMessage = NULL;
+	mUninstallJavaMessage = NULL;
     emit exit();
 }
 
@@ -163,19 +165,6 @@
     return retval;
 }
 
-/*!
- Subscribe for memory card remove.
- */
-void HsUninstallItemState::subscribeForMemoryCardRemove()
-{
-    CaNotifierFilter filter;
-    filter.setIds(QList<int>() << mItemId);
-    mNotifier = CaService::instance()->createNotifier(filter);
-    mNotifier->setParent(this);
-    connect(mNotifier,
-        SIGNAL(entryChanged(CaEntry,ChangeType)),
-        SIGNAL(exit()));
-}
 
 /*!
  Slot launched after state has exited and in destructor.
@@ -184,21 +173,16 @@
 void HsUninstallItemState::cleanUp()
 {
     // Close messagebox if App key was pressed
-    if (mUninstallMessage) {
-        disconnect(mUninstallMessage, SIGNAL(finished(HbAction*)),
-            this, SLOT(uninstallMessageFinished(HbAction*)));
+    if (mUninstallMessage != NULL) {
         mUninstallMessage->close();
         mUninstallMessage = NULL;
     }
     
-    if (mUninstallJavaMessage) {
-        disconnect(mUninstallJavaMessage, SIGNAL(finished(HbAction*)), this, SLOT(uninstallMessageFinished(HbAction*)));
+    if (mUninstallJavaMessage != NULL) {
         mUninstallJavaMessage->close();
         mUninstallJavaMessage = NULL;
     }
 
-    delete mNotifier;
-    mNotifier = NULL;
     mConfirmAction = NULL;
     mItemId = 0;
 }
@@ -226,19 +210,40 @@
     }
 
     // create and show message box
-    mUninstallMessage = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
-    mUninstallMessage->setAttribute(Qt::WA_DeleteOnClose);
-
-    mUninstallMessage->setText(message);
+    mUninstallMessage = HsMenuDialogFactory().create(message);
+    mConfirmAction = mUninstallMessage->actions().value(0);
+    
+    QScopedPointer<HsMenuEntryRemovedHandler> entryObserver(
+        new HsMenuEntryRemovedHandler(mItemId, this, SIGNAL(exit())));
+    entryObserver.take()->setParent(mUninstallMessage);
+    
+    mUninstallMessage->open(this, SLOT(uninstallMessageFinished(HbAction*)));
+}
 
-    mUninstallMessage->clearActions();
-    mConfirmAction = new HbAction(hbTrId("txt_common_button_ok"),
-            mUninstallMessage);
-    mUninstallMessage->addAction(mConfirmAction);
+/*!
+ Method create uninstall confirmation message.
+ Used for java applications without deletion confirmation
+ and with midlet name equal to app name
+ \retval void
+ */
+void HsUninstallItemState::createSimpleUninstallJavaMessage()
+{
+    QString message;
+    message.append(
+        HbParameterLengthLimiter("txt_applib_dialog_1_will_be_removed_from_phone_c").arg(
+            HsMenuService::getName(mItemId)));
 
-    HbAction *secondaryAction = new HbAction(hbTrId("txt_common_button_cancel"),
-            mUninstallMessage);
-    mUninstallMessage->addAction(secondaryAction);
+    // create and show message box
+    mUninstallMessage = HsMenuDialogFactory().create(message);
+    
+    QSharedPointer<CaEntry> entry = CaService::instance()->getEntry(mItemId);
+    HbIcon icon = entry->makeIcon();
+    mUninstallMessage->setIcon(icon);
+    mConfirmAction = mUninstallMessage->actions().value(0);
+
+    QScopedPointer<HsMenuEntryRemovedHandler> entryObserver(
+        new HsMenuEntryRemovedHandler(mItemId, this, SIGNAL(exit())));
+    entryObserver.take()->setParent(mUninstallMessage);
 
     mUninstallMessage->open(this, SLOT(uninstallMessageFinished(HbAction*)));
 }
@@ -251,7 +256,7 @@
 {
     HbDocumentLoader loader;
     bool loadStatusOk = false;
-    mObjectList = loader.load(HS_UNINSTALL_DIALOG_LAYOUT, &loadStatusOk);
+    loader.load(HS_UNINSTALL_DIALOG_LAYOUT, &loadStatusOk);
     
     Q_ASSERT_X(loadStatusOk,
             HS_UNINSTALL_DIALOG_LAYOUT,
@@ -263,70 +268,80 @@
     getApplicationsNames(componentName, applicationsNames, detailsMessage);
     
     QString section;
-    if (applicationsNames.isEmpty() && detailsMessage.isEmpty()) {
-        mDialogType = UninstallDialogDefinition01;
-        section = QString("uninstallDialogDefinition01");
-        mObjectList = loader.load(
-                HS_UNINSTALL_DIALOG_LAYOUT, section, &loadStatusOk);
-    } else if ( (!applicationsNames.isEmpty()) && (!detailsMessage.isEmpty())) {
-        mDialogType = UninstallDialogDefinition02;
-        section = QString("uninstallDialogDefinition02");
-        mObjectList = loader.load(
+    if (applicationsNames.isEmpty() && detailsMessage.isEmpty()) {        
+        createSimpleUninstallJavaMessage();        
+    }
+    else {
+        if ( (!applicationsNames.isEmpty()) && (!detailsMessage.isEmpty())) {
+            mDialogType = UninstallDialogDefinition02;
+            section = QString("uninstallDialogDefinition02");
+            loader.load(
                 HS_UNINSTALL_DIALOG_LAYOUT, section, &loadStatusOk);
-    } else if ( (!applicationsNames.isEmpty() && detailsMessage.isEmpty())) {
-        mDialogType = UninstallDialogDefinition03;
-        section = QString("uninstallDialogDefinition03");
-        mObjectList = loader.load(
+        }
+        else if ( (!applicationsNames.isEmpty() && detailsMessage.isEmpty())) {
+            mDialogType = UninstallDialogDefinition03;
+            section = QString("uninstallDialogDefinition03");
+            loader.load(
                 HS_UNINSTALL_DIALOG_LAYOUT, section, &loadStatusOk);
-    } else if (applicationsNames.isEmpty()  && (!detailsMessage.isEmpty())) {
-        mDialogType = UninstallDialogDefinition04;
-        section = QString("uninstallDialogDefinition04");
-        mObjectList = loader.load(
+        }
+        else if (applicationsNames.isEmpty() && (!detailsMessage.isEmpty())) {
+            mDialogType = UninstallDialogDefinition04;
+            section = QString("uninstallDialogDefinition04");
+            loader.load(
                 HS_UNINSTALL_DIALOG_LAYOUT, section, &loadStatusOk);
-    }
- 
-    mUninstallJavaMessage = 
-        qobject_cast<HbDialog*>(
+        }
+
+        mUninstallJavaMessage = qobject_cast<HbDialog*>(
             loader.findWidget(HS_UNINSTALL_DIALOG_NAME));
-    
-    HbLabel* iconLabel = 
-        qobject_cast<HbLabel*>(
-            loader.findWidget(HS_UNINSTALL_DIALOG_CONFIRMATION_DIALOG_ICON));
-    QSharedPointer<CaEntry> entry2 = CaService::instance()->getEntry(mItemId);
-    HbIcon icon = entry2->makeIcon();
-    iconLabel->setIcon(icon);
-    
-    HbLabel* textLabel = 
-        qobject_cast<HbLabel*>(
-            loader.findWidget(HS_UNINSTALL_DIALOG_CONFIRMATION_DIALOG_LABEL));
-    textLabel->setPlainText(textLabel->plainText().arg(componentName));
-    
-    HbLabel* detailsUninstalLabel;
-    if ((mDialogType == UninstallDialogDefinition02) ||
-        (mDialogType == UninstallDialogDefinition04)) {
-        detailsUninstalLabel= qobject_cast<HbLabel*>(
-                loader.findWidget(HS_UNINSTALL_DIALOG_DELETE_LABEL));
-        detailsUninstalLabel->setPlainText(detailsMessage);
-    }
+
+        if (mUninstallJavaMessage) {
+            mUninstallJavaMessage->setAttribute(Qt::WA_DeleteOnClose);
+            mUninstallJavaMessage->setTimeout(HbPopup::NoTimeout);
+            mUninstallJavaMessage->actions()[0]->setParent(mUninstallJavaMessage);
+            mUninstallJavaMessage->actions()[1]->setParent(mUninstallJavaMessage);
+
+            HbLabel* iconLabel =
+            qobject_cast<HbLabel*>(
+                loader.findWidget(HS_UNINSTALL_DIALOG_CONFIRMATION_DIALOG_ICON));
+            QSharedPointer<CaEntry> entry2 = CaService::instance()->getEntry(mItemId);
+            HbIcon icon = entry2->makeIcon();
+            iconLabel->setIcon(icon);
+
+            HbLabel* textLabel =
+            qobject_cast<HbLabel*>(
+                loader.findWidget(HS_UNINSTALL_DIALOG_CONFIRMATION_DIALOG_LABEL));
+            textLabel->setPlainText(textLabel->plainText().arg(componentName));
 
-    HbLabel* listView;
-    QString applicationsList;
-    QString newLine("\n");
-    if ((mDialogType == UninstallDialogDefinition02) ||
-        (mDialogType == UninstallDialogDefinition03)) {
-        listView = qobject_cast<HbLabel*>(
-                loader.findWidget(HS_UNINSTALL_DIALOG_LIST_VIEW_LABEL));
+            HbLabel* detailsUninstalLabel;
+            if ((mDialogType == UninstallDialogDefinition02) ||
+                (mDialogType == UninstallDialogDefinition04)) {
+                detailsUninstalLabel= qobject_cast<HbLabel*>(
+                    loader.findWidget(HS_UNINSTALL_DIALOG_DELETE_LABEL));
+                detailsUninstalLabel->setPlainText(detailsMessage);
+            }
 
-        for (int i=0; i<applicationsNames.count(); i++) {
-            applicationsList = applicationsList + applicationsNames[i] + newLine;
+            HbLabel* listView;
+            QString applicationsList;
+            QString newLine("\n");
+            if ((mDialogType == UninstallDialogDefinition02) ||
+                (mDialogType == UninstallDialogDefinition03)) {
+                listView = qobject_cast<HbLabel*>(
+                    loader.findWidget(HS_UNINSTALL_DIALOG_LIST_VIEW_LABEL));
+
+                for (int i=0; i<applicationsNames.count(); i++) {
+                    applicationsList = applicationsList + applicationsNames[i] + newLine;
+                }
+                listView->setPlainText(applicationsList);
+            }
+
+            mConfirmAction = qobject_cast<HbAction*>(loader.findObject(
+                    HS_UNINSTALL_DIALOG_CONFIRMATION_ACTION));
+        
+            QScopedPointer<HsMenuEntryRemovedHandler> entryObserver(
+                new HsMenuEntryRemovedHandler(mItemId, this, SIGNAL(exit())));
+            entryObserver.take()->setParent(mUninstallJavaMessage);
+            
+            mUninstallJavaMessage->open(this, SLOT(uninstallMessageFinished(HbAction*)));
         }
-        listView->setPlainText(applicationsList);
     }
-
-    mUninstallJavaMessage->setAttribute(Qt::WA_DeleteOnClose);
-    mUninstallJavaMessage->setTimeout(HbPopup::NoTimeout);
-    mConfirmAction = qobject_cast<HbAction*>(loader.findObject(
-            HS_UNINSTALL_DIALOG_CONFIRMATION_ACTION));
-    
-    mUninstallJavaMessage->open(this, SLOT(uninstallMessageFinished(HbAction*)));
 }

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsviewappdetailsstate.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsviewappdetailsstate.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -16,6 +16,7 @@
 */
 
 #include <QDebug>
+#include <QScopedPointer>
 #include <HbDialog>
 #include <HbDocumentLoader>
 #include <HbLabel>
@@ -30,14 +31,17 @@
 #include "hsviewappdetailsstate.h"
 #include "hsmenuevent.h"
 #include "hsmenuitemmodel.h"
+#include "hsmenuentryremovedhandler.h"
 
+static const char *const HS_VIEWAPPDETAILS_JAVA_DIALOG_SECTION_NAME=
+        "detailsDialogForJavaApplication";
 
 /*!
  Constructor.
- @param parent Parent state.
+ /param parent Parent state.
  */
 HsViewAppDetailsState::HsViewAppDetailsState(QState *parent) :
-    QState(parent), mDialog(0), mNotifier(0)
+    QState(parent), mDialog(0)
 {
     construct();
 }
@@ -47,9 +51,7 @@
  */
 HsViewAppDetailsState::~HsViewAppDetailsState()
 {
-    if (mDialog) {
-        delete mDialog;
-    }
+    delete mDialog;
 }
 
 /*!
@@ -58,7 +60,7 @@
 void HsViewAppDetailsState::construct()
 {
     HSMENUTEST_FUNC_ENTRY("HsViewAppDetailsState::construct");
-        
+
     setObjectName("/ViewAppDetailsState");
     if (this->parent()) {
         setObjectName(this->parent()->objectName() + objectName());
@@ -75,61 +77,102 @@
     QState::onEntry(event);
     HsMenuEvent *menuEvent = static_cast<HsMenuEvent *>(event);
     QVariantMap data = menuEvent->data();
-    
+
     const int entryId = data.value(itemIdKey()).toInt();
-    QSharedPointer<const CaEntry> entry 
+    QSharedPointer<const CaEntry> entry
         = CaService::instance()->getEntry(entryId);
     const int componentId = entry->attribute(
         componentIdAttributeName()).toInt();
     
     QSharedPointer<CaSoftwareRegistry> scr = CaSoftwareRegistry::create();
     CaSoftwareRegistry::DetailMap detailMap = scr->entryDetails(componentId);
+
+    QString appType = entry->attribute(swTypeKey());
+
+    
+    //TODO: Should we display something In that case?
+    if (detailMap.size() < 1){
+        stateExited();
+        return;
+    }
     
     HbDocumentLoader loader;
     bool loadStatusOk = false;
-    mObjectList = loader.load(HS_DETAILS_DIALOG_LAYOUT, &loadStatusOk);
+    loader.load(HS_DETAILS_DIALOG_LAYOUT, &loadStatusOk);
     Q_ASSERT_X(loadStatusOk, HS_DETAILS_DIALOG_LAYOUT,
            "Error while loading docml file.");
 
+    if (!appType.compare(javaSwType())) {
+        QString section = QString(HS_VIEWAPPDETAILS_JAVA_DIALOG_SECTION_NAME);
+        loader.load(HS_DETAILS_DIALOG_LAYOUT,
+                                  section, &loadStatusOk);
+    }
+
     mDialog = qobject_cast<HbDialog*>(
         loader.findWidget(HS_DETAILS_DIALOG_NAME));
-    mDialog->actions()[0]->setParent(mDialog);
-    
-    subscribeForMemoryCardRemove(entryId);
-    
-    HbLabel* nameLabel = qobject_cast<HbLabel*>(
-        loader.findWidget(CaSoftwareRegistry::componentNameKey()));
-    HbLabel* versionLabel = qobject_cast<HbLabel*>(
-        loader.findWidget(CaSoftwareRegistry::componentVersionKey()));
-    HbLabel* supplierLabel = qobject_cast<HbLabel*>(
-        loader.findWidget(CaSoftwareRegistry::componentVendorKey()));
-    HbLabel* memoryLabel = qobject_cast<HbLabel*>(
-        loader.findWidget(CaSoftwareRegistry::componentDriveInfoKey()));
-    HbLabel* sizeLabel = qobject_cast<HbLabel*>(
-        loader.findWidget(CaSoftwareRegistry::componentSizeKey()));
-    HbLabel* typeLabel = qobject_cast<HbLabel*>(
-        loader.findWidget(CaSoftwareRegistry::componentTypeKey()));    
-    
-    nameLabel->setPlainText(
-        detailMap[CaSoftwareRegistry::componentNameKey()]);
-    versionLabel->setPlainText(
-        detailMap[CaSoftwareRegistry::componentVersionKey()]);
-    supplierLabel->setPlainText(
-        detailMap[CaSoftwareRegistry::componentVendorKey()]);
-    memoryLabel->setPlainText(
-            detailMap[CaSoftwareRegistry::componentDriveInfoKey()]);
-    sizeLabel->setPlainText(
-        detailMap[CaSoftwareRegistry::componentSizeKey()]);
 
-    typeLabel->setPlainText(
-        detailMap[CaSoftwareRegistry::componentTypeKey()]);
-    
     if (mDialog != NULL) {
         mDialog->setTimeout(HbPopup::NoTimeout);
         mDialog->setAttribute(Qt::WA_DeleteOnClose, true);
-        mDialog->open(this, SLOT(stateExited())); 
+        mDialog->actions()[0]->setParent(mDialog);
+        
+        setFieldPresentation(CaSoftwareRegistry::componentNameKey(),
+            detailMap, loader);
+        setFieldPresentation(CaSoftwareRegistry::componentVersionKey(),
+            detailMap, loader);
+        setFieldPresentation(CaSoftwareRegistry::componentVendorKey(),
+            detailMap, loader);
+        setFieldPresentation(CaSoftwareRegistry::componentDriveInfoKey(),
+            detailMap, loader);
+        setFieldPresentation(CaSoftwareRegistry::componentSizeKey(),
+            detailMap, loader);
+        setFieldPresentation(CaSoftwareRegistry::componentTypeKey(),
+            detailMap, loader);
+
+        if (!appType.compare(javaSwType())) {
+            setFieldPresentation(CaSoftwareRegistry::componentDescriptionKey(),
+                detailMap, loader);
+            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();
     }
-    HSMENUTEST_FUNC_EXIT("HsViewAppDetailsState::onEntry");    
+    HSMENUTEST_FUNC_EXIT("HsViewAppDetailsState::onEntry");
+}
+
+/*!
+ Extracting label from loader and set content of data field.
+ Hide label if the is no data to display.
+ \param key detail key.
+ \param detailMap detail map.
+ \param loader session to document loader
+ \retval void
+ */
+void HsViewAppDetailsState::setFieldPresentation(QString key,
+        CaSoftwareRegistry::DetailMap &detailMap,
+        HbDocumentLoader &loader)
+{
+    HbLabel* dataLabel = qobject_cast<HbLabel*>(
+                loader.findWidget(key));
+    QString data = detailMap[key];
+    if (data.isEmpty()) {
+        dataLabel->setVisible(false);
+        dataLabel->setMaximumHeight(0);
+        HbLabel* titleLabel = qobject_cast<HbLabel*>(
+            loader.findWidget(QString("_") + key));
+        titleLabel->setVisible(false);
+        titleLabel->setMaximumHeight(0);
+    } else {
+        dataLabel->setPlainText(data);
+    }
 }
 
 /*!
@@ -138,7 +181,6 @@
 void HsViewAppDetailsState::stateExited()
 {
     HSMENUTEST_FUNC_ENTRY("HsViewAppDetailsState::stateExited");
-    mDialog = NULL;
     emit exit();
     HSMENUTEST_FUNC_EXIT("HsViewAppDetailsState::stateExited");
     qDebug("HsViewAppDetailsState::stateExited()");
@@ -152,26 +194,9 @@
     QState::onExit(event);
     // Close popups if App key was pressed or
     // memory card removed
-    if (mDialog) {
+    if (mDialog != NULL) {
         mDialog->close();
+        mDialog = NULL;
     }
-    mDialog = NULL;
 }
 
-/*!
- Subscribe for memory card remove.
- \param entryId: entry id.
- \retval void
- */
-void HsViewAppDetailsState::subscribeForMemoryCardRemove(int entryId)
-{
-    CaNotifierFilter filter;
-    QList<int> entryIds;
-    entryIds.append(entryId);
-    filter.setIds(entryIds);
-    mNotifier = CaService::instance()->createNotifier(filter);
-    mNotifier->setParent(this);
-    connect(mNotifier,
-            SIGNAL(entryChanged(CaEntry,ChangeType)),
-            SIGNAL(exit()));
-}

--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsviewappsettingsstate.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsviewappsettingsstate.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -14,7 +14,7 @@
 * Description:  Menu Application Library state.
  *
 */
-
+#include <QScopedPointer>
 #include <hbmainwindow.h>
 #include <hbview.h>
 #include <hbinstance.h>
@@ -26,6 +26,7 @@
 #include "hsapp_defs.h"
 #include "hsmenuevent.h"
 #include "hsviewappsettingsstate.h"
+#include "hsmenuentryremovedhandler.h"
 #include "caentry.h"
 #include "canotifier.h"
 #include "canotifierfilter.h"
@@ -64,9 +65,7 @@
         QState(parent),
         mView(0), 
         mPreviousView(0), 
-        mActionConfirm(0),
-        mNotifier(0)
-        
+        mActionConfirm(0)
 {
     construct();
 }
@@ -87,9 +86,6 @@
  */
 HsViewAppSettingsState::~HsViewAppSettingsState()
 {
-    if (mNotifier) {
-        delete mNotifier;
-    }    
 }
 
 /*!
@@ -109,16 +105,20 @@
     QSharedPointer<const CaEntry> entry = CaService::instance()->getEntry(entryId);    
     
     QString pluginPath;
-    pluginPath = pluginPath.append("/resource/qt/plugins/appsettings/").append(entry->attribute(appSettingsPlugin())).append(".qtplugin");
+    pluginPath = pluginPath.append("/resource/qt/plugins/appsettings/")
+        .append(entry->attribute(appSettingsPlugin())).append(".qtplugin");
     QPluginLoader loader(pluginPath);
     mView = qobject_cast<HbView *>(loader.instance()); 
     
     mActionConfirm = new HbAction(Hb::ConfirmNaviAction, mView);
-    connect(mActionConfirm, SIGNAL(triggered()),SLOT(settingsDone()));
+    connect(mActionConfirm, SIGNAL(triggered()), SIGNAL(exit()));
     
-    if(mView)
-        {    
-        subscribeForMemoryCardRemove(entryId);
+    if (mView) {    
+        QScopedPointer<HsMenuEntryRemovedHandler> entryObserver(
+            new HsMenuEntryRemovedHandler(entryId, this, SIGNAL(exit())));
+        
+        entryObserver.take()->setParent(mView);
+        
         QObject::connect(this, SIGNAL(initialize(QString)), mView, SLOT(initialize(QString)));        
         mView->setParent(this);
         emit initialize(entry->attribute(applicationUidEntryKey()));        
@@ -132,7 +132,7 @@
         mPreviousView = hbMainWindow->currentView();
         hbMainWindow->setCurrentView(mView);
         hbMainWindow->show();
-        }
+    }
 
     
     HSMENUTEST_FUNC_EXIT("HsViewAppSettingsState::onEntry");
@@ -155,32 +155,6 @@
 #endif //COVERAGE_MEASUREMENT
 
 
-/*!
- Invoked when plugin view exits
- */
-void HsViewAppSettingsState::settingsDone()
-{
-    emit exit();
-}
-
-/*!
- Subscribe for memory card remove.
- \param entryId: entry id.
- \retval void
- */
-void HsViewAppSettingsState::subscribeForMemoryCardRemove(int entryId)
-{
-    CaNotifierFilter filter;
-    QList<int> entryIds;
-    entryIds.append(entryId);
-    filter.setIds(entryIds);
-    mNotifier = CaService::instance()->createNotifier(filter);
-    mNotifier->setParent(this);
-    connect(mNotifier,
-            SIGNAL(entryChanged(CaEntry,ChangeType)),
-            SLOT(settingsDone()));
-}
-
 void HsViewAppSettingsState::onExit(QEvent *event)
 {
     
@@ -189,12 +163,7 @@
     HbMainWindow *hbMainWindow = mainWindow();
     hbMainWindow->setCurrentView(mPreviousView);
     hbMainWindow->removeView(mView);
-    disconnect(mNotifier,
-               SIGNAL(entryChanged(CaEntry,ChangeType)),
-               this,
-               SLOT(settingsDone()));
-    delete mNotifier;
-    mNotifier = NULL;
+
     
     delete mActionConfirm;
     mActionConfirm = NULL;

--- a/homescreenapp/widgetplugins/hsclockwidgetplugin/hsclockwidgetplugin.pro	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/widgetplugins/hsclockwidgetplugin/hsclockwidgetplugin.pro	Wed Aug 18 09:40:07 2010 +0300
@@ -38,7 +38,7 @@
     
 }
 
-win32:include(hsclockwidgetplugin_win.pri)
+!symbian:include(hsclockwidgetplugin_win.pri)
 symbian:include(hsclockwidgetplugin_symbian.pri)
 
 RESOURCES = hsclockwidgetplugin.qrc

--- a/homescreenapp/widgetplugins/hsclockwidgetplugin/inc/hsanalogclockwidget.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/widgetplugins/hsclockwidgetplugin/inc/hsanalogclockwidget.h	Wed Aug 18 09:40:07 2010 +0300
@@ -25,7 +25,7 @@
 HOMESCREEN_TEST_CLASS(TestClockWidget)
 
 class HbIconItem;
-class HbTouchArea;
+class QGestureEvent;
 
 class HsAnalogClockWidget : public HbWidget
 {
@@ -35,7 +35,6 @@
     explicit HsAnalogClockWidget(QGraphicsItem *parent = 0);
     ~HsAnalogClockWidget();
 
-    bool eventFilter(QObject *watched, QEvent *event);
     QRectF boundingRect() const;
     QPainterPath shape() const;
 
@@ -47,19 +46,18 @@
 
 protected:
     void resizeEvent(QGraphicsSceneResizeEvent *event);
+    void gestureEvent(QGestureEvent *event);
 
 private:
     Q_DISABLE_COPY(HsAnalogClockWidget)
     void createPrimitives();
     void updatePrimitives();
-    void handleMouseReleaseEvent(QGraphicsSceneMouseEvent *event);
 
 private:
     HbIconItem *mBackground;
     HbIconItem *mHourHand;
     HbIconItem *mMinuteHand;
     HbIconItem *mSecondHand;
-    HbTouchArea *mTouchArea;
 
     HOMESCREEN_TEST_FRIEND_CLASS(TestClockWidget)
 };

--- a/homescreenapp/widgetplugins/hsclockwidgetplugin/inc/hsdigitalclockwidget.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/widgetplugins/hsclockwidgetplugin/inc/hsdigitalclockwidget.h	Wed Aug 18 09:40:07 2010 +0300
@@ -26,7 +26,7 @@
 
 class HbFrameItem;
 class HbIconItem;
-class HbTouchArea;
+class QGestureEvent;
 
 class HsDigitalClockWidget : public HbWidget
 {
@@ -36,7 +36,6 @@
     explicit HsDigitalClockWidget(bool useAmPm = true, QGraphicsItem *parent = 0);
     ~HsDigitalClockWidget();
 
-    bool eventFilter(QObject *watched, QEvent *event);
     QPainterPath shape() const;
 signals:
     void clockTapped();
@@ -47,12 +46,12 @@
 
 protected:
     void resizeEvent(QGraphicsSceneResizeEvent *event);
+    void gestureEvent(QGestureEvent *event);
 
 private:
     Q_DISABLE_COPY(HsDigitalClockWidget)
     void createPrimitives();
     void updatePrimitives();
-    void handleMouseReleaseEvent(QGraphicsSceneMouseEvent *event);
 
 private:
     HbFrameItem *mBackground;
@@ -63,7 +62,6 @@
     HbIconItem *mDigit5;
     HbIconItem *mDigit6;
     HbIconItem *mAmPm;
-    HbTouchArea *mTouchArea;
     bool mUseAmPm;
     QMap<QChar, QString> mDigitMap;

--- a/homescreenapp/widgetplugins/hsclockwidgetplugin/resource/hsanalogclockwidget.css	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/widgetplugins/hsclockwidgetplugin/resource/hsanalogclockwidget.css	Wed Aug 18 09:40:07 2010 +0300
@@ -25,7 +25,3 @@
   fixed-height: 25.0un;
   zvalue: 1;
 }
-
-HsAnalogClockWidget::toucharea {  
-  zvalue: 4;
-}
\ No newline at end of file

--- a/homescreenapp/widgetplugins/hsclockwidgetplugin/resource/hsanalogclockwidget.widgetml	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/widgetplugins/hsclockwidgetplugin/resource/hsanalogclockwidget.widgetml	Wed Aug 18 09:40:07 2010 +0300
@@ -21,10 +21,6 @@
         <meshitem src="second_hand" srcEdge="LEFT" dst="" dstEdge="LEFT" />
         <meshitem src="second_hand" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
 
-        <meshitem src="toucharea" srcEdge="TOP" dst="" dstEdge="TOP" />
-        <meshitem src="toucharea" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-        <meshitem src="toucharea" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-        <meshitem src="toucharea" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
     </layout>
 
 </hbwidget>

--- a/homescreenapp/widgetplugins/hsclockwidgetplugin/resource/hsdigitalclockwidget.css	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/widgetplugins/hsclockwidgetplugin/resource/hsdigitalclockwidget.css	Wed Aug 18 09:40:07 2010 +0300
@@ -65,6 +65,3 @@
   zvalue: 2;
 }
 
-HsDigitalClockWidget::toucharea {  
-  zvalue: 4;
-}

--- a/homescreenapp/widgetplugins/hsclockwidgetplugin/resource/hsdigitalclockwidget.widgetml	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/widgetplugins/hsclockwidgetplugin/resource/hsdigitalclockwidget.widgetml	Wed Aug 18 09:40:07 2010 +0300
@@ -27,10 +27,6 @@
         <meshitem src="digit6" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
         <meshitem src="digit6" srcEdge="LEFT" dst="digit5" dstEdge="RIGHT" />
 
-        <meshitem src="toucharea" srcEdge="TOP" dst="" dstEdge="TOP" />
-        <meshitem src="toucharea" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-        <meshitem src="toucharea" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-        <meshitem src="toucharea" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
     </layout>
     
 </hbwidget>

--- a/homescreenapp/widgetplugins/hsclockwidgetplugin/resource/qtg_graf_hswidget_preview_clock.svg	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/widgetplugins/hsclockwidgetplugin/resource/qtg_graf_hswidget_preview_clock.svg	Wed Aug 18 09:40:07 2010 +0300
@@ -1,49 +1,161 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="224px" height="140px" viewBox="0 0 224 140">
-<rect fill="#FFFFFF" width="224" height="140"/>
-<rect x="57" y="14.619" fill="none" width="110" height="110"/>
-<circle fill="none" stroke="#404040" stroke-width="3.5" stroke-opacity="0.4" cx="111.999" cy="69.618" r="54.053"/>
-<circle fill="none" stroke="#404040" stroke-width="1.4883" stroke-opacity="0.4" cx="111.999" cy="69.617" r="54.069"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="21.02" y1="206.9834" x2="21.02" y2="98.1177" gradientTransform="matrix(1 0 0 -1 90.98 221.9902)">
-<stop offset="0" style="stop-color:#DBDBDB"/>
-<stop offset="0" style="stop-color:#C1C1C1"/>
-<stop offset="0.53" style="stop-color:#DBDBDB"/>
-<stop offset="0.53" style="stop-color:#C1C1C1"/>
-<stop offset="1" style="stop-color:#A8A8A8"/>
+<svg baseProfile="tiny" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="320px" height="210px" viewBox="-9 14 320 210">
+<path fill-opacity="0.4" stroke-opacity="0.4" d="M150.999,188.197c-38.155,0-69.195-31.039-69.195-69.195  c0-38.154,31.04-69.196,69.195-69.196c38.155,0,69.194,31.042,69.194,69.196C220.193,157.158,189.154,188.197,150.999,188.197  L150.999,188.197z"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="336.9785" y1="-63.1782" x2="336.9785" y2="-201.4114" gradientTransform="matrix(1 0 0 -1 -185.98 -13.5195)">
+<stop offset="0" style="stop-color:#DCDCDC"/>
+<stop offset="0.6" style="stop-color:#C0C0C0"/>
+<stop offset="1" style="stop-color:#A7A7A7"/>
 </linearGradient>
-<circle fill="url(#SVGID_1_)" cx="111.999" cy="69.619" r="53.991"/>
-<circle fill="none" stroke="#FFFFFF" stroke-width="1.1" stroke-opacity="0.4" cx="111.999" cy="69.619" r="53.728"/>
-<circle fill="none" stroke="#E6E6E6" stroke-width="2.3" cx="111.999" cy="69.618" r="48.839"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="21.02" y1="201.0898" x2="21.02" y2="104.9416" gradientTransform="matrix(1 0 0 -1 90.98 221.9902)">
+<circle fill="url(#SVGID_1_)" cx="150.999" cy="119.002" r="68.555"/>
+<path fill-opacity="0.4" stroke-opacity="0.4" fill="#FFFFFF" d="M150.999,50.447c-37.862,0-68.556,30.691-68.556,68.555  c0,37.861,30.693,68.555,68.556,68.555c37.862,0,68.556-30.693,68.556-68.555C219.555,81.139,188.861,50.447,150.999,50.447z   M150.999,186.916c-37.448,0-67.914-30.467-67.914-67.914c0-37.449,30.466-67.915,67.914-67.915  c37.446,0,67.914,30.466,67.914,67.915C218.913,156.449,188.445,186.916,150.999,186.916z"/>
+<path fill="#E5E5E5" d="M150.999,181.791c-34.622,0-62.789-28.166-62.789-62.789s28.167-62.789,62.789-62.789  s62.788,28.166,62.788,62.789S185.621,181.791,150.999,181.791L150.999,181.791z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="336.9795" y1="-194.0273" x2="336.9795" y2="-71.0137" gradientTransform="matrix(1 0 0 -1 -185.98 -13.5195)">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.4121" style="stop-color:#DCDCDC"/>
+<stop offset="0.9455" style="stop-color:#CBCBCB"/>
+<stop offset="1" style="stop-color:#CBCBCB"/>
+</linearGradient>
+<circle fill="url(#SVGID_2_)" cx="150.999" cy="119.001" r="61.507"/>
+<path fill-opacity="0.5" stroke-opacity="0.5" d="M150.999,57.494c-33.971,0-61.508,27.538-61.508,61.508  c0,33.969,27.537,61.506,61.508,61.506c33.97,0,61.508-27.537,61.508-61.506C212.507,85.032,184.969,57.494,150.999,57.494z   M150.999,179.875c-33.565,0-60.874-27.307-60.874-60.873c0-33.565,27.309-60.873,60.874-60.873  c33.565,0,60.876,27.308,60.876,60.873C211.875,152.568,184.564,179.875,150.999,179.875z"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="336.9795" y1="-186.9824" x2="336.9795" y2="-78.0605" gradientTransform="matrix(1 0 0 -1 -185.98 -13.5195)">
+<stop offset="0" style="stop-color:#B4B4B4"/>
+<stop offset="1" style="stop-color:#A0A0A0"/>
+</linearGradient>
+<circle fill="url(#SVGID_3_)" cx="150.999" cy="119.002" r="54.461"/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="336.9785" y1="-79.3413" x2="336.9785" y2="-185.6992" gradientTransform="matrix(1 0 0 -1 -185.98 -13.5195)">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.56" style="stop-color:#CCCCCC"/>
-<stop offset="1" style="stop-color:#E6E6E6"/>
-</linearGradient>
-<circle fill="url(#SVGID_2_)" cx="111.999" cy="69.618" r="48.44"/>
-<circle fill="none" stroke="#000000" stroke-opacity="0.5" cx="111.999" cy="69.617" r="48.157"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="40.4355" y1="184.1553" x2="40.4355" y2="156.1365" gradientTransform="matrix(1 0 0 -1 90.98 221.9902)">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#B3B3B3"/>
+<stop offset="0.9455" style="stop-color:#CBCBCB"/>
+<stop offset="1" style="stop-color:#CBCBCB"/>
 </linearGradient>
-<path fill="url(#SVGID_3_)" fill-opacity="0.5" d="M120.316,66.446c-3.05,0-4.729-1.768-4.729-4.977V50.475  c0-3.331,2.766-4.513,5.135-4.513h0.222c0.198,0,0.215-0.002,0.375-0.007l0.13-0.005c1.279-0.044,2.646-0.969,2.644-3.433  c-0.001-2.085,0.564-3.615,1.682-4.544c0.958-0.795,2.099-0.961,2.889-0.961c0.558,0,0.952,0.083,0.968,0.089  c11.037,1.901,16.931,11.18,17.581,17.158c0.188,1.701-0.431,3.575-1.609,4.889c-0.792,0.879-2.201,1.928-4.439,1.928  c-3.351,0-4.679,1.155-5.387,2.025l-0.2,0.249c-0.919,1.159-2.459,3.097-5.764,3.097H120.316z"/>
-<path fill="#B3B3B3" fill-opacity="0.4" d="M147.211,54.258c-0.65-5.978-6.544-15.256-17.581-17.158  c-0.016-0.005-0.41-0.089-0.968-0.089c-0.789,0-1.931,0.166-2.889,0.961c-1.117,0.93-1.683,2.459-1.682,4.544  c0.002,2.463-1.364,3.389-2.644,3.433l-0.13,0.005c-0.16,0.005-0.179,0.007-0.375,0.007h-0.222c-2.369,0-5.135,1.182-5.135,4.513  v10.995c0,3.209,1.68,4.977,4.729,4.977h9.495c3.305,0,4.845-1.938,5.764-3.097l0.2-0.249c0.708-0.87,2.036-2.025,5.387-2.025  c2.238,0,3.647-1.049,4.439-1.928C146.78,57.833,147.398,55.959,147.211,54.258z M141.162,60.571c-3.538,0-4.989,1.242-5.777,2.211  c-0.919,1.13-2.279,3.16-5.572,3.16c-3.295,0-5.888,0-9.496,0c-3.604,0-4.224-2.559-4.224-4.473c0-1.914,0-10.995,0-10.995  c0-2.97,2.403-4.009,4.629-4.009c0.503,0,0.382,0.002,0.746-0.01c1.671-0.059,3.134-1.298,3.13-3.939  c-0.003-6.013,4.927-4.923,4.927-4.923c10.858,1.872,16.565,11.015,17.187,16.72C147,56.975,145.119,60.571,141.162,60.571z"/>
-<ellipse fill="#FFFFFF" fill-opacity="0.25" cx="111.999" cy="44.893" rx="32.798" ry="22.203"/>
-<path fill="#808080" d="M107.654,32.983h-0.033l-1.853,1.001l-0.28-1.1l2.329-1.246h1.229v10.659h-1.393V32.983z M111.702,42.298  v-0.885l1.133-1.099c2.722-2.591,3.969-3.968,3.969-5.575c0-1.084-0.51-2.084-2.101-2.084c-0.966,0-1.771,0.493-2.263,0.903  l-0.458-1.017c0.723-0.608,1.786-1.083,3.001-1.083c2.296,0,3.264,1.575,3.264,3.1c0,1.968-1.427,3.56-3.673,5.724l-0.835,0.787  v0.034h4.772v1.197L111.702,42.298L111.702,42.298z M75.029,73.937c0.311,0.034,0.673,0,1.164-0.048  c0.837-0.115,1.625-0.442,2.231-1.034c0.704-0.641,1.213-1.576,1.41-2.82h-0.049c-0.59,0.723-1.443,1.13-2.527,1.13  c-1.901,0-3.131-1.441-3.131-3.263c0-2.018,1.46-3.788,3.642-3.788c2.18,0,3.525,1.755,3.525,4.51c0,2.325-0.787,3.969-1.836,4.983  c-0.819,0.807-1.951,1.295-3.101,1.427c-0.523,0.081-0.983,0.098-1.327,0.081V73.937L75.029,73.937z M75.554,67.82  c0,1.33,0.803,2.261,2.051,2.261c0.967,0,1.722-0.474,2.099-1.112c0.082-0.147,0.13-0.297,0.13-0.542  c0-1.82-0.671-3.214-2.197-3.214C76.424,65.213,75.554,66.294,75.554,67.82z M133.846,30.986l-0.46,0.788  c0.039,0.02,0.109,0.059,0.209,0.116c0.316,0.186,0.512,0.41,0.581,0.676c0.073,0.266,0.017,0.559-0.17,0.878  c-0.212,0.362-0.462,0.578-0.75,0.648c-0.289,0.068-0.624-0.009-1.003-0.231c-0.221-0.126-0.431-0.294-0.644-0.503l0.22-0.375  l0.005,0.002c0.221,0.223,0.401,0.376,0.545,0.459c0.213,0.125,0.4,0.161,0.568,0.11c0.165-0.051,0.317-0.196,0.454-0.435  c0.122-0.208,0.158-0.399,0.108-0.57c-0.049-0.171-0.188-0.322-0.411-0.453c-0.154-0.09-0.315-0.173-0.477-0.25l0.898-1.544  l1.641,0.957l-0.214,0.367L133.846,30.986z M148.161,48.604l-0.345,0.194l-1.077-1.89l0.345-0.194l0.382,0.672l2.389-1.36  l-0.537-0.585l0.345-0.195l0.834,0.775l0.178,0.31l-2.877,1.638L148.161,48.604z M151.886,48.442  c0.187,0.329,0.212,0.645,0.073,0.946c-0.137,0.302-0.503,0.622-1.096,0.958c-0.648,0.37-1.139,0.536-1.469,0.496  c-0.327-0.037-0.586-0.223-0.775-0.555c-0.167-0.291-0.214-0.556-0.144-0.792c0.067-0.236,0.206-0.444,0.416-0.622  c0.212-0.179,0.483-0.364,0.817-0.554c0.579-0.331,1.042-0.478,1.378-0.443C151.427,47.914,151.694,48.101,151.886,48.442z   M148.971,50.08c0.084,0.146,0.225,0.206,0.427,0.182c0.203-0.026,0.58-0.195,1.13-0.508c0.528-0.299,0.847-0.527,0.954-0.681  c0.107-0.154,0.121-0.302,0.041-0.444c-0.075-0.128-0.179-0.193-0.316-0.195c-0.137-0.002-0.293,0.036-0.466,0.115  c-0.176,0.08-0.405,0.2-0.692,0.363c-0.566,0.322-0.907,0.562-1.024,0.717C148.907,49.784,148.888,49.935,148.971,50.08z   M148.192,90.153l-0.374-0.211l1.084-1.914l0.234,0.136c0.222,0.125,0.398,0.274,0.529,0.451c0.127,0.175,0.222,0.353,0.279,0.535  c0.06,0.183,0.112,0.402,0.161,0.655c0.056,0.308,0.117,0.515,0.18,0.625c0.066,0.108,0.148,0.187,0.243,0.239  c0.163,0.096,0.314,0.121,0.447,0.081c0.134-0.042,0.249-0.15,0.349-0.326c0.106-0.185,0.187-0.436,0.238-0.756l0.002-0.005  l0.384,0.218c-0.07,0.326-0.18,0.619-0.328,0.884c-0.184,0.325-0.396,0.531-0.632,0.62c-0.238,0.086-0.496,0.053-0.772-0.103  c-0.156-0.089-0.288-0.214-0.396-0.377c-0.108-0.157-0.201-0.447-0.274-0.864c-0.046-0.232-0.087-0.419-0.126-0.556  c-0.038-0.14-0.095-0.271-0.165-0.389c-0.073-0.122-0.171-0.223-0.294-0.298L148.192,90.153z M150.175,93.316  c-0.186,0.329-0.445,0.511-0.775,0.549c-0.328,0.035-0.789-0.115-1.384-0.45c-0.65-0.368-1.042-0.705-1.179-1.006  c-0.136-0.306-0.11-0.62,0.079-0.954c0.166-0.29,0.366-0.468,0.606-0.53c0.239-0.059,0.487-0.047,0.75,0.043  c0.26,0.09,0.559,0.227,0.893,0.417c0.581,0.329,0.944,0.648,1.086,0.959C150.393,92.65,150.368,92.974,150.175,93.316z   M147.274,91.653c-0.081,0.145-0.061,0.299,0.064,0.459s0.463,0.396,1.012,0.709c0.53,0.301,0.889,0.454,1.075,0.469  c0.188,0.012,0.322-0.05,0.402-0.19c0.072-0.132,0.075-0.255,0.005-0.371c-0.065-0.119-0.179-0.234-0.337-0.343  c-0.157-0.108-0.378-0.243-0.666-0.408c-0.565-0.32-0.948-0.49-1.141-0.513C147.495,91.445,147.356,91.508,147.274,91.653z   M133.36,105.639l-0.236-0.355l1.831-1.213l0.149,0.224c0.138,0.214,0.227,0.427,0.266,0.643c0.034,0.213,0.038,0.415,0.008,0.603  c-0.034,0.189-0.082,0.407-0.157,0.658c-0.089,0.298-0.127,0.51-0.118,0.637c0.009,0.128,0.043,0.237,0.103,0.326  c0.105,0.159,0.227,0.25,0.363,0.273c0.139,0.024,0.291-0.018,0.461-0.13c0.177-0.116,0.362-0.307,0.555-0.565l0.004-0.003  l0.241,0.364c-0.209,0.26-0.44,0.473-0.691,0.642c-0.311,0.205-0.593,0.294-0.845,0.262c-0.253-0.026-0.468-0.174-0.641-0.44  c-0.1-0.148-0.162-0.319-0.185-0.514c-0.022-0.19,0.025-0.489,0.147-0.895c0.064-0.227,0.114-0.412,0.141-0.553  c0.028-0.14,0.037-0.282,0.029-0.422c-0.01-0.14-0.051-0.271-0.128-0.4L133.36,105.639z M133.727,108.782l-0.503-0.763  c-0.036,0.027-0.102,0.072-0.198,0.136c-0.305,0.203-0.595,0.275-0.863,0.225c-0.271-0.055-0.509-0.235-0.713-0.542  c-0.23-0.352-0.315-0.669-0.248-0.961c0.064-0.289,0.28-0.554,0.651-0.799c0.208-0.139,0.453-0.256,0.733-0.354l0.241,0.362h-0.003  c-0.301,0.104-0.518,0.199-0.654,0.289c-0.205,0.137-0.322,0.289-0.348,0.459c-0.029,0.173,0.033,0.373,0.184,0.604  c0.133,0.202,0.291,0.318,0.467,0.348c0.175,0.034,0.371-0.023,0.589-0.167c0.147-0.101,0.295-0.206,0.435-0.319l0.986,1.489  l-1.581,1.045l-0.234-0.352L133.727,108.782z M92.177,108.299c-0.42-0.237-0.706-0.345-0.858-0.319  c-0.154,0.027-0.28,0.129-0.38,0.308c-0.089,0.153-0.113,0.297-0.076,0.422c0.039,0.125,0.142,0.235,0.309,0.33  c0.146,0.084,0.37,0.161,0.676,0.24l0.004,0.002l-0.215,0.379c-0.307-0.085-0.568-0.191-0.785-0.314  c-0.327-0.188-0.536-0.391-0.624-0.616c-0.09-0.224-0.059-0.468,0.089-0.731c0.103-0.179,0.241-0.31,0.414-0.382  c0.171-0.077,0.366-0.089,0.582-0.04c-0.18-0.148-0.284-0.318-0.316-0.51c-0.033-0.193,0.009-0.39,0.123-0.588  c0.186-0.327,0.42-0.518,0.704-0.572c0.284-0.057,0.617,0.024,0.997,0.239c0.229,0.133,0.445,0.299,0.646,0.502l-0.211,0.373  l-0.003-0.004c-0.241-0.228-0.441-0.39-0.603-0.48c-0.196-0.11-0.368-0.145-0.521-0.102c-0.154,0.042-0.287,0.158-0.396,0.357  c-0.12,0.208-0.146,0.394-0.083,0.551c0.065,0.159,0.312,0.358,0.735,0.599L92.177,108.299z M88.768,107.63l0.454-0.796  c-0.041-0.019-0.111-0.056-0.211-0.113c-0.319-0.18-0.516-0.403-0.59-0.67c-0.075-0.264-0.02-0.557,0.162-0.879  c0.208-0.366,0.455-0.585,0.743-0.656c0.287-0.072,0.622,0,1.008,0.219c0.218,0.126,0.434,0.292,0.647,0.496l-0.214,0.377  l-0.004-0.002c-0.226-0.22-0.408-0.371-0.552-0.452c-0.213-0.122-0.402-0.158-0.567-0.104c-0.166,0.052-0.315,0.199-0.453,0.438  c-0.12,0.211-0.154,0.403-0.103,0.574c0.052,0.17,0.192,0.318,0.417,0.445c0.156,0.09,0.316,0.174,0.481,0.246l-0.882,1.554  l-1.648-0.938L87.664,107L88.768,107.63z M75.081,91.36l0.363-0.218l0.195,0.326l0.694-0.411l0.34,0.572l-0.696,0.413l0.756,1.271  l-0.347,0.207l-2.214-0.028l-0.694-0.009l-0.319-0.54l2.114-1.257L75.081,91.36z M76.107,93.087l-0.492-0.828l-1.392,0.828H76.107z   M72.124,91.238c-0.196-0.323-0.227-0.641-0.094-0.944c0.133-0.303,0.492-0.63,1.078-0.979c0.642-0.381,1.128-0.556,1.458-0.524  c0.329,0.035,0.592,0.213,0.789,0.543c0.171,0.287,0.225,0.554,0.159,0.788c-0.064,0.238-0.201,0.449-0.407,0.632  c-0.207,0.182-0.475,0.371-0.806,0.568c-0.575,0.341-1.031,0.499-1.369,0.468C72.591,91.759,72.321,91.575,72.124,91.238z   M75.004,89.547c-0.085-0.146-0.229-0.2-0.431-0.175c-0.202,0.031-0.574,0.207-1.117,0.531c-0.521,0.31-0.835,0.542-0.941,0.699  c-0.104,0.157-0.116,0.304-0.033,0.443c0.076,0.128,0.183,0.191,0.319,0.191c0.137,0,0.293-0.043,0.466-0.126  c0.172-0.083,0.399-0.208,0.685-0.376c0.558-0.333,0.896-0.58,1.009-0.735C75.075,89.841,75.09,89.689,75.004,89.547z   M69.072,69.765l0.425-0.007l0.007,0.378l0.809-0.014l0.012,0.665l-0.809,0.016l0.029,1.478l-0.405,0.009l-1.911-1.122l-0.599-0.35  l-0.011-0.624l2.461-0.047L69.072,69.765z M69.112,71.773l-0.02-0.964l-1.618,0.031L69.112,71.773z M67.031,68.535l0.915-0.018  c-0.004-0.048-0.007-0.126-0.009-0.24c-0.009-0.367,0.083-0.65,0.273-0.85c0.19-0.198,0.468-0.302,0.839-0.311  c0.42-0.008,0.735,0.094,0.944,0.305c0.208,0.209,0.317,0.537,0.326,0.977c0.004,0.253-0.028,0.521-0.096,0.812l-0.433,0.007V69.21  c0.075-0.304,0.11-0.538,0.106-0.7c-0.004-0.247-0.072-0.429-0.201-0.544c-0.128-0.115-0.333-0.169-0.608-0.164  c-0.242,0.005-0.425,0.073-0.544,0.205c-0.119,0.133-0.178,0.328-0.171,0.587c0.002,0.179,0.014,0.359,0.034,0.538l-1.786,0.037  l-0.037-1.898l0.425-0.008L67.031,68.535z M154.084,69.496h-0.396l0.006-2.177l0.395,0.001l-0.001,0.774l2.747,0.006l-0.175-0.774  l0.394,0.001l0.341,1.087v0.356l-3.31-0.008L154.084,69.496z M156.935,70.862l-0.912-0.002c0.003,0.042,0.004,0.121,0.004,0.236  c0,0.368-0.1,0.649-0.294,0.845c-0.193,0.196-0.475,0.291-0.846,0.291c-0.421,0-0.732-0.108-0.936-0.324  c-0.203-0.213-0.305-0.544-0.305-0.984c0.001-0.251,0.037-0.521,0.113-0.807h0.434v0.005c-0.081,0.305-0.122,0.537-0.122,0.702  c-0.001,0.247,0.062,0.429,0.188,0.546c0.128,0.116,0.328,0.178,0.605,0.178c0.242,0.001,0.426-0.063,0.549-0.193  c0.123-0.128,0.185-0.324,0.186-0.581c0-0.18-0.008-0.359-0.023-0.539l1.785,0.003l-0.005,1.896l-0.425-0.001L156.935,70.862z   M72.231,48.142l0.789,0.462c0.02-0.041,0.058-0.11,0.116-0.209c0.185-0.316,0.411-0.511,0.677-0.582  c0.266-0.073,0.558-0.015,0.877,0.171c0.363,0.212,0.579,0.462,0.647,0.75c0.07,0.289-0.008,0.624-0.23,1.005  c-0.126,0.217-0.294,0.431-0.503,0.643l-0.375-0.219l0.003-0.003c0.221-0.222,0.375-0.404,0.458-0.546  c0.125-0.212,0.161-0.402,0.109-0.567c-0.05-0.167-0.195-0.318-0.434-0.458c-0.209-0.122-0.399-0.158-0.57-0.108  c-0.17,0.05-0.322,0.189-0.452,0.412c-0.091,0.155-0.174,0.314-0.251,0.479l-1.542-0.9l0.957-1.639l0.366,0.213L72.231,48.142z   M73.423,45.179c0.191-0.329,0.452-0.508,0.783-0.54c0.33-0.032,0.789,0.124,1.377,0.467c0.646,0.377,1.034,0.717,1.168,1.022  c0.129,0.303,0.1,0.62-0.094,0.951c-0.168,0.29-0.373,0.463-0.612,0.522c-0.239,0.057-0.488,0.041-0.748-0.051  c-0.261-0.093-0.558-0.235-0.889-0.429c-0.579-0.337-0.936-0.66-1.073-0.972C73.198,45.839,73.226,45.515,73.423,45.179z   M76.302,46.879c0.085-0.146,0.065-0.299-0.058-0.461c-0.122-0.162-0.457-0.402-1.004-0.721c-0.524-0.307-0.88-0.468-1.067-0.484  c-0.188-0.017-0.321,0.045-0.405,0.186c-0.074,0.128-0.078,0.253-0.011,0.372c0.067,0.121,0.178,0.235,0.334,0.347  c0.156,0.111,0.376,0.25,0.663,0.416c0.561,0.328,0.939,0.505,1.132,0.527C76.078,47.083,76.218,47.022,76.302,46.879z   M88.294,31.414l0.452,0.793c0.038-0.025,0.105-0.065,0.206-0.122c0.318-0.181,0.611-0.236,0.877-0.165  c0.266,0.071,0.491,0.267,0.674,0.589c0.208,0.365,0.27,0.69,0.184,0.974c-0.085,0.285-0.32,0.534-0.705,0.753  c-0.219,0.126-0.471,0.227-0.756,0.304l-0.215-0.376l0.004-0.002c0.304-0.081,0.528-0.161,0.671-0.244  c0.214-0.121,0.34-0.267,0.379-0.436s-0.01-0.373-0.146-0.612c-0.12-0.211-0.266-0.337-0.439-0.379  c-0.175-0.043-0.373,0.001-0.599,0.128c-0.156,0.089-0.308,0.186-0.458,0.288l-0.883-1.551l1.648-0.938l0.21,0.368L88.294,31.414z   M90.74,30.021l0.454,0.795c0.035-0.026,0.105-0.067,0.204-0.124c0.319-0.181,0.612-0.235,0.878-0.165  c0.268,0.071,0.492,0.267,0.673,0.589c0.208,0.365,0.269,0.69,0.185,0.974c-0.086,0.284-0.32,0.535-0.704,0.753  c-0.22,0.125-0.472,0.227-0.757,0.305l-0.215-0.377l0.004-0.002c0.303-0.081,0.526-0.161,0.669-0.242  c0.214-0.122,0.34-0.268,0.379-0.436c0.039-0.169-0.01-0.373-0.146-0.612c-0.12-0.211-0.268-0.337-0.441-0.38  c-0.172-0.042-0.373,0.001-0.598,0.129c-0.155,0.088-0.308,0.185-0.457,0.288l-0.883-1.552l1.65-0.939l0.209,0.37L90.74,30.021z   M114.219,113.636c-0.485,0.002-0.787,0.053-0.905,0.15c-0.119,0.099-0.179,0.249-0.178,0.452c0,0.181,0.049,0.314,0.146,0.405  c0.095,0.09,0.237,0.134,0.428,0.134c0.167,0,0.405-0.04,0.71-0.127l0.004,0.002l0.002,0.433c-0.309,0.077-0.591,0.116-0.84,0.116  c-0.376,0.002-0.659-0.07-0.848-0.224c-0.19-0.15-0.285-0.376-0.286-0.68c0-0.206,0.055-0.389,0.17-0.538  c0.113-0.149,0.275-0.258,0.487-0.319c-0.23-0.039-0.407-0.137-0.529-0.288c-0.122-0.152-0.185-0.344-0.186-0.57  c0-0.377,0.108-0.66,0.326-0.848c0.221-0.188,0.549-0.285,0.989-0.287c0.26,0,0.532,0.041,0.807,0.116l0.001,0.43h-0.005  c-0.324-0.079-0.576-0.12-0.761-0.119c-0.225,0-0.39,0.057-0.502,0.17c-0.116,0.114-0.17,0.283-0.17,0.507  c0.003,0.242,0.069,0.415,0.204,0.521c0.135,0.104,0.447,0.155,0.935,0.153L114.219,113.636z M110.583,115.208  c-0.381,0.002-0.667-0.134-0.861-0.399c-0.195-0.27-0.292-0.745-0.295-1.428c-0.001-0.747,0.097-1.251,0.292-1.521  c0.195-0.268,0.485-0.402,0.867-0.402c0.334-0.003,0.588,0.087,0.759,0.264c0.171,0.178,0.283,0.403,0.336,0.671  c0.051,0.273,0.08,0.6,0.08,0.982c0.001,0.671-0.097,1.144-0.296,1.417C111.268,115.069,110.974,115.208,110.583,115.208z   M110.593,111.864c-0.167,0-0.292,0.097-0.369,0.285c-0.077,0.188-0.115,0.601-0.115,1.229c0.003,0.609,0.043,0.999,0.125,1.169  c0.081,0.169,0.202,0.256,0.364,0.256c0.148-0.002,0.256-0.062,0.326-0.18c0.069-0.118,0.112-0.275,0.129-0.463  c0.017-0.192,0.025-0.453,0.025-0.783c-0.002-0.65-0.042-1.066-0.119-1.243C110.882,111.956,110.76,111.864,110.593,111.864z   M110.625,24.026c0.381,0.001,0.667,0.138,0.859,0.408c0.193,0.27,0.29,0.746,0.287,1.425c0,0.749-0.101,1.256-0.299,1.523  c-0.196,0.266-0.486,0.398-0.869,0.397c-0.335,0-0.587-0.09-0.758-0.268c-0.17-0.178-0.281-0.402-0.331-0.673  c-0.053-0.272-0.078-0.6-0.077-0.984c0.001-0.668,0.102-1.141,0.302-1.416C109.94,24.163,110.235,24.025,110.625,24.026z   M110.602,27.37c0.167,0,0.29-0.092,0.368-0.281c0.078-0.188,0.119-0.598,0.12-1.231c0.002-0.606-0.037-0.995-0.118-1.166  c-0.081-0.17-0.202-0.255-0.364-0.255c-0.148,0-0.257,0.058-0.327,0.177c-0.069,0.117-0.113,0.272-0.13,0.463  c-0.02,0.19-0.028,0.451-0.029,0.78c0,0.65,0.036,1.065,0.113,1.245C110.312,27.28,110.434,27.37,110.602,27.37z M113.441,24.033  c0.381,0.001,0.668,0.136,0.859,0.406c0.193,0.27,0.289,0.747,0.287,1.427c-0.001,0.748-0.103,1.254-0.299,1.522  c-0.197,0.266-0.484,0.398-0.869,0.397c-0.335,0-0.586-0.09-0.759-0.268c-0.17-0.177-0.281-0.402-0.332-0.673  s-0.075-0.601-0.075-0.984c0.002-0.668,0.102-1.14,0.302-1.415C112.756,24.17,113.052,24.031,113.441,24.033z M113.417,27.376  c0.168,0.001,0.292-0.092,0.37-0.281c0.075-0.188,0.117-0.599,0.119-1.23c0-0.607-0.039-0.996-0.117-1.167  c-0.08-0.168-0.2-0.254-0.365-0.256c-0.147,0-0.257,0.059-0.327,0.178c-0.069,0.117-0.116,0.271-0.131,0.462  c-0.019,0.19-0.028,0.451-0.03,0.781c-0.001,0.65,0.038,1.064,0.116,1.244C113.127,27.287,113.251,27.376,113.417,27.376z   M141.838,73.309c0.41,0.246,1.343,0.654,2.361,0.654c1.839,0,2.427-1.162,2.41-2.066c-0.017-1.493-1.359-2.132-2.755-2.132h-0.805  v-1.083h0.805c1.048,0,2.378-0.54,2.378-1.803c0-0.853-0.541-1.606-1.871-1.606c-0.852,0-1.67,0.377-2.131,0.705l-0.393-1.049  c0.572-0.41,1.654-0.821,2.804-0.821c2.098,0,3.05,1.248,3.05,2.543c0,1.114-0.672,2.049-1.967,2.525v0.032  c1.314,0.246,2.363,1.232,2.378,2.724c0,1.705-1.343,3.198-3.886,3.198c-1.195,0-2.245-0.376-2.771-0.722L141.838,73.309z   M114.606,97.213c-0.293-0.015-0.672,0.016-1.083,0.083c-2.279,0.359-3.458,1.998-3.706,3.772h0.033  c0.508-0.691,1.411-1.248,2.591-1.248c1.887,0,3.214,1.377,3.214,3.442c0,1.969-1.327,3.772-3.558,3.772  c-2.263,0-3.754-1.771-3.754-4.542c0-2.097,0.737-3.755,1.804-4.805c0.885-0.869,2.066-1.409,3.409-1.572  c0.427-0.068,0.79-0.081,1.05-0.081L114.606,97.213L114.606,97.213z M114.195,103.363c0-1.525-0.869-2.446-2.196-2.446  c-0.869,0-1.689,0.525-2.083,1.314c-0.082,0.162-0.147,0.361-0.147,0.621c0.017,1.757,0.836,3.068,2.362,3.068  C113.361,105.921,114.195,104.887,114.195,103.363z"/>
-<path fill="#666666" d="M112.504,30.561h-1.008v-1.201h1.008V30.561z M111.494,109.877h1.01v-1.2h-1.01V109.877z M152.258,70.124  v-1.012h-1.2v1.012H152.258z M71.742,69.112v1.01h1.201v-1.01H71.742z M92.309,34.5l-0.875,0.506l0.6,1.04l0.876-0.505L92.309,34.5z   M131.689,104.736l0.874-0.507l-0.598-1.04l-0.874,0.506L131.689,104.736z M147.118,49.926l-0.507-0.874l-1.038,0.6l0.504,0.875  L147.118,49.926z M76.882,89.308l0.505,0.874l1.04-0.598l-0.505-0.874L76.882,89.308z M77.389,49.051l-0.505,0.875l1.039,0.6  l0.505-0.874L77.389,49.051z M146.611,90.184l0.506-0.873l-1.041-0.601l-0.504,0.874L146.611,90.184z M132.566,35.007l-0.875-0.505  l-0.599,1.041l0.874,0.504L132.566,35.007z M91.433,104.229l0.873,0.505l0.602-1.039l-0.875-0.506L91.433,104.229z"/>
-<path fill="#808080" d="M107.395,26.71l-0.172,0.018l-0.177-1.677l0.173-0.018L107.395,26.71z M116.783,114.203l0.17-0.017  l-0.177-1.68l-0.172,0.018L116.783,114.203z M156.584,64.837l-0.017-0.172l-1.679,0.177l0.018,0.172L156.584,64.837z M67.416,74.4  l0.017,0.173l1.677-0.178l-0.017-0.173L67.416,74.4z M102.585,25.777l-0.17,0.035l0.35,1.65l0.17-0.037L102.585,25.777z   M121.415,113.459l0.169-0.035l-0.351-1.651l-0.171,0.038L121.415,113.459z M155.841,60.204l-0.036-0.17l-1.65,0.351l0.037,0.17  L155.841,60.204z M68.159,79.034l0.036,0.169l1.65-0.351l-0.037-0.172L68.159,79.034z M98.054,27.002l-0.166,0.054l0.521,1.604  l0.166-0.053L98.054,27.002z M125.946,112.236l0.164-0.055l-0.519-1.605l-0.167,0.055L125.946,112.236z M154.618,55.671  l-0.056-0.165l-1.604,0.522l0.055,0.165L154.618,55.671z M69.383,83.564l0.054,0.165l1.604-0.521l-0.054-0.166L69.383,83.564z   M93.676,28.693l-0.158,0.071l0.686,1.541l0.159-0.07L93.676,28.693z M130.324,110.544l0.159-0.072l-0.687-1.54l-0.159,0.072  L130.324,110.544z M152.925,51.294l-0.071-0.159l-1.541,0.686l0.072,0.159L152.925,51.294z M71.074,87.942l0.07,0.159l1.542-0.685  l-0.071-0.161L71.074,87.942z M86.558,34.762l-0.139,0.102l-0.993-1.365l0.141-0.102L86.558,34.762z M138.434,105.84l0.139-0.103  l-0.991-1.365l-0.14,0.103L138.434,105.84z M148.222,43.185l-0.103-0.14l-1.364,0.992l0.101,0.14L148.222,43.185z M75.779,96.052  l0.102,0.139l1.364-0.991l-0.102-0.139L75.779,96.052z M81.925,36.358l-0.128,0.116l1.129,1.253l0.128-0.116L81.925,36.358z   M142.075,102.879l0.128-0.115l-1.127-1.255l-0.131,0.115L142.075,102.879z M145.262,39.544l-0.116-0.129l-1.255,1.128l0.115,0.129  L145.262,39.544z M78.74,99.692l0.116,0.128l1.253-1.126l-0.117-0.131L78.74,99.692z M78.613,39.685l-0.117,0.128l1.255,1.128  l0.116-0.128L78.613,39.685z M145.386,99.554l0.117-0.131l-1.255-1.127l-0.115,0.128L145.386,99.554z M141.935,36.232l-0.131-0.116  l-1.127,1.254l0.128,0.116L141.935,36.232z M82.065,103.006l0.129,0.115l1.128-1.255l-0.128-0.114L82.065,103.006z M75.668,43.338  l-0.103,0.14l1.364,0.993l0.103-0.141L75.668,43.338z M148.331,95.899l0.103-0.144l-1.365-0.989l-0.1,0.14L148.331,95.899z   M138.281,33.286l-0.142-0.102l-0.992,1.365l0.141,0.102L138.281,33.286z M85.72,105.949l0.14,0.102l0.992-1.364l-0.141-0.1  L85.72,105.949z M72.538,52.152l-0.071,0.159l-1.541-0.687l0.072-0.158L72.538,52.152z M153.003,87.771l0.069-0.157l-1.541-0.687  l-0.071,0.159L153.003,87.771z M130.152,28.617l-0.156-0.072l-0.688,1.542l0.16,0.07L130.152,28.617z M93.847,110.62l0.158,0.071  l0.686-1.54l-0.159-0.073L93.847,110.62z M69.324,55.851l-0.054,0.166l1.604,0.52l0.054-0.165L69.324,55.851z M154.674,83.384  l0.056-0.163l-1.605-0.522l-0.056,0.164L154.674,83.384z M125.767,26.943l-0.165-0.055l-0.521,1.605l0.164,0.054L125.767,26.943z   M98.233,112.292l0.165,0.056l0.52-1.605l-0.165-0.055L98.233,112.292z M68.12,60.388l-0.037,0.169l1.651,0.352l0.036-0.17  L68.12,60.388z M155.879,78.849l0.038-0.171l-1.651-0.349l-0.036,0.172L155.879,78.849z M121.229,25.738l-0.17-0.036l-0.35,1.65  l0.172,0.036L121.229,25.738z M102.769,113.498l0.17,0.038l0.351-1.653l-0.17-0.035L102.769,113.498z M67.396,65.023l-0.02,0.174  l1.678,0.176l0.019-0.173L67.396,65.023z M156.604,74.212l0.018-0.174l-1.676-0.175l-0.02,0.171L156.604,74.212z M116.593,25.014  l-0.173-0.019l-0.174,1.678l0.171,0.02L116.593,25.014z M107.405,114.222l0.175,0.019l0.175-1.675l-0.173-0.02L107.405,114.222z"/>
-<polygon fill-opacity="0.4" points="120.303,64.168 90.39,94.083 87.194,94.245 87.549,91.215 117.451,61.313 "/>
-<polygon points="117.451,62.029 119.592,64.17 90.17,93.589 87.766,93.711 88.029,91.446 "/>
-<polygon fill-opacity="0.4" points="108.156,62.206 130.577,84.627 130.383,88.182 126.997,88.183 104.588,65.773 "/>
-<polygon fill="#1A1A1A" points="105.301,65.773 108.156,62.919 130.082,84.847 129.849,87.609 127.229,87.701 "/>
-<path fill-opacity="0.4" d="M108.789,66.406c1.771-1.771,4.65-1.77,6.423,0.001c1.769,1.771,1.769,4.65,0,6.422  c-1.772,1.77-4.651,1.771-6.423,0C107.018,71.058,107.018,68.178,108.789,66.406L108.789,66.406z"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="-297.3677" y1="401.4014" x2="-297.3677" y2="393.2246" gradientTransform="matrix(-0.7071 0.7071 0.7071 0.7071 -379.2077 -1.0529)">
+<path fill="url(#SVGID_4_)" d="M150.999,172.18c-29.323,0-53.179-23.854-53.179-53.178c0-29.323,23.855-53.18,53.179-53.18  c29.323,0,53.179,23.857,53.179,53.18C204.178,148.325,180.322,172.18,150.999,172.18L150.999,172.18z"/>
+<circle fill="#C8C8C8" cx="150.999" cy="119.002" r="1.922"/>
+<path fill="none" d="M150.999,172.18c-29.323,0-53.179-23.854-53.179-53.178c0-29.323,23.855-53.18,53.179-53.18  c29.323,0,53.179,23.857,53.179,53.18C204.178,148.325,180.322,172.18,150.999,172.18L150.999,172.18z"/>
+<circle fill="#646464" cx="150.999" cy="69.026" r="1.923"/>
+<path fill="#646464" d="M147.145,73.971h-0.028l-1.643,0.887l-0.248-0.975l2.065-1.104h1.09v9.45h-1.236V73.971z"/>
+<path fill="#646464" d="M150.738,82.229v-0.786l1.002-0.975c2.412-2.295,3.52-3.517,3.52-4.942c0-0.96-0.451-1.847-1.861-1.847  c-0.856,0-1.57,0.438-2.005,0.801l-0.41-0.9c0.642-0.539,1.587-0.96,2.662-0.96c2.035,0,2.894,1.395,2.894,2.747  c0,1.744-1.265,3.155-3.256,5.074l-0.741,0.697v0.03h4.23v1.061H150.738z"/>
+<circle fill="#646464" cx="175.986" cy="75.723" r="1.922"/>
+<circle fill="#646464" cx="194.277" cy="94.014" r="1.921"/>
+<circle fill="#646464" cx="200.975" cy="119.002" r="1.922"/>
+<path fill="#646464" d="M191.912,122.219c0.357,0.215,1.171,0.572,2.061,0.572c1.6,0,2.113-1.016,2.102-1.803  c-0.014-1.301-1.188-1.859-2.402-1.859h-0.699v-0.943h0.699c0.915,0,2.074-0.473,2.074-1.573c0-0.743-0.473-1.401-1.633-1.401  c-0.743,0-1.459,0.329-1.858,0.613l-0.344-0.914c0.5-0.357,1.444-0.715,2.446-0.715c1.83,0,2.66,1.087,2.66,2.217  c0,0.971-0.588,1.788-1.717,2.202v0.028c1.145,0.215,2.061,1.072,2.072,2.375c0,1.486-1.172,2.789-3.391,2.789  c-1.043,0-1.957-0.33-2.416-0.629L191.912,122.219z"/>
+<path fill="#646464" d="M194.277,142.066c1.063,0,1.924,0.861,1.924,1.924c0,1.059-0.861,1.922-1.924,1.922  c-1.062,0-1.922-0.863-1.922-1.922C192.355,142.928,193.217,142.066,194.277,142.066z"/>
+<rect x="183.879" y="133.423" transform="matrix(0.5006 -0.8657 0.8657 0.5006 -27.6308 229.1995)" fill="#646464" width="1.923" height="10.251"/>
+<path fill="#646464" d="M175.986,160.359c1.063,0,1.922,0.863,1.922,1.922c0,1.063-0.859,1.924-1.922,1.924  s-1.924-0.861-1.924-1.924C174.063,161.223,174.924,160.359,175.986,160.359z"/>
+<rect x="169.591" y="147.724" transform="matrix(0.8657 -0.5006 0.5006 0.8657 -53.609 105.9139)" fill="#646464" width="1.923" height="10.254"/>
+<circle fill="#646464" cx="150.998" cy="168.978" r="1.923"/>
+<path fill="#646464" d="M153.275,156.805c-0.258-0.016-0.588,0.014-0.944,0.068c-1.992,0.316-3.023,1.75-3.237,3.295h0.027  c0.445-0.602,1.233-1.088,2.264-1.088c1.648,0,2.809,1.203,2.809,3.008c0,1.719-1.159,3.293-3.107,3.293  c-1.977,0-3.28-1.545-3.28-3.967c0-1.834,0.645-3.279,1.574-4.197c0.775-0.758,1.807-1.23,2.979-1.373  c0.373-0.061,0.688-0.07,0.918-0.07v1.031H153.275z M152.917,162.174c0-1.332-0.758-2.131-1.919-2.131  c-0.758,0-1.474,0.457-1.819,1.145c-0.07,0.144-0.128,0.314-0.128,0.543c0.014,1.533,0.73,2.679,2.063,2.679  C152.188,164.408,152.917,163.508,152.917,162.174z"/>
+<circle fill="#646464" cx="126.012" cy="162.281" r="1.922"/>
+<rect x="130.504" y="147.719" transform="matrix(0.8652 0.5015 -0.5015 0.8652 94.3752 -45.32)" fill="#646464" width="1.924" height="10.25"/>
+<rect x="169.748" y="79.205" transform="matrix(0.8657 0.5006 -0.5006 0.8657 65.1487 -74.1317)" fill="#646464" width="1.923" height="10.25"/>
+<path fill="#646464" d="M107.72,142.066c1.061,0,1.921,0.861,1.921,1.924c0,1.059-0.86,1.922-1.921,1.922  c-1.062,0-1.923-0.863-1.923-1.922C105.797,142.928,106.658,142.066,107.72,142.066z"/>
+<rect x="116.19" y="133.411" transform="matrix(0.5003 0.8659 -0.8659 0.5003 178.5003 -32.2056)" fill="#646464" width="1.922" height="10.254"/>
+<rect x="184.436" y="93.813" transform="matrix(0.5003 0.8658 -0.8658 0.5003 178.2984 -111.0867)" fill="#646464" width="1.923" height="10.252"/>
+<circle fill="#646464" cx="101.023" cy="119.002" r="1.922"/>
+<path fill="#646464" d="M106.139,122.797c0.273,0.027,0.591,0,1.023-0.044c0.735-0.101,1.428-0.39,1.96-0.907  c0.621-0.563,1.067-1.385,1.241-2.479h-0.044c-0.519,0.635-1.269,0.993-2.22,0.993c-1.673,0-2.754-1.268-2.754-2.868  c0-1.773,1.283-3.33,3.2-3.33s3.099,1.544,3.099,3.965c0,2.047-0.69,3.487-1.613,4.381c-0.721,0.709-1.715,1.142-2.725,1.255  c-0.462,0.072-0.866,0.088-1.168,0.072L106.139,122.797L106.139,122.797z M106.6,117.42c0,1.168,0.707,1.99,1.803,1.99  c0.85,0,1.514-0.42,1.846-0.98c0.071-0.131,0.115-0.261,0.115-0.477c0-1.6-0.592-2.825-1.933-2.825  C107.363,115.128,106.6,116.079,106.6,117.42z"/>
+<circle fill="#646464" cx="107.72" cy="94.014" r="1.921"/>
+<rect x="116.202" y="94.334" transform="matrix(-0.5006 0.8657 -0.8657 -0.5006 261.918 47.8307)" fill="#646464" width="1.922" height="10.251"/>
+<circle fill="#646464" cx="126.012" cy="75.722" r="1.923"/>
+<rect x="130.503" y="80.027" transform="matrix(-0.8659 0.5002 -0.5002 -0.8659 287.8932 93.1373)" fill="#646464" width="1.922" height="10.252"/>
+<rect x="144.655" y="59.73" transform="matrix(-0.9946 0.1039 -0.1039 -0.9946 295.5698 107.9097)" fill="#646464" width="0.639" height="3.844"/>
+<rect x="156.703" y="174.428" transform="matrix(-0.9943 0.1067 -0.1067 -0.9943 331.9748 334.9315)" fill="#646464" width="0.64" height="3.846"/>
+<rect x="138.682" y="60.684" transform="matrix(-0.9782 0.2075 -0.2075 -0.9782 287.9719 94.9994)" fill="#646464" width="0.64" height="3.844"/>
+<rect x="162.672" y="173.466" transform="matrix(-0.977 0.2131 -0.2131 -0.977 359.6113 312.0218)" fill="#646464" width="0.642" height="3.845"/>
+<rect x="132.859" y="62.234" transform="matrix(-0.9512 0.3085 -0.3085 -0.9512 279.6555 84.1022)" fill="#646464" width="0.643" height="3.844"/>
+<rect x="168.492" y="171.929" transform="matrix(-0.9505 0.3107 -0.3107 -0.9505 383.2836 286.6476)" fill="#646464" width="0.638" height="3.846"/>
+<rect x="127.219" y="64.404" transform="matrix(-0.9141 0.4054 -0.4054 -0.9141 271.0186 75.246)" fill="#646464" width="0.643" height="3.843"/>
+<rect x="174.138" y="169.753" transform="matrix(-0.9139 0.4059 -0.4059 -0.9139 403.5764 257.7682)" fill="#646464" width="0.64" height="3.841"/>
+<rect x="116.787" y="70.428" transform="matrix(-0.8096 0.587 -0.587 -0.8096 254.3857 62.1845)" fill="#646464" width="0.641" height="3.845"/>
+<rect x="184.572" y="163.727" transform="matrix(-0.8098 0.5867 -0.5867 -0.8098 431.8035 191.3113)" fill="#646464" width="0.639" height="3.844"/>
+<rect x="112.089" y="74.227" transform="matrix(-0.7441 0.6681 -0.6681 -0.7441 246.9279 57.7112)" fill="#646464" width="0.642" height="3.844"/>
+<rect x="189.259" y="159.939" transform="matrix(-0.7427 0.6696 -0.6696 -0.7427 438.7674 155.124)" fill="#646464" width="0.642" height="3.845"/>
+<rect x="107.82" y="78.497" transform="matrix(-0.6691 0.7431 -0.7431 -0.6691 240.262 53.8664)" fill="#646464" width="0.64" height="3.843"/>
+<rect x="193.507" y="155.676" transform="matrix(-0.6696 0.7427 -0.7427 -0.6696 440.6693 119.1786)" fill="#646464" width="0.642" height="3.846"/>
+<rect x="104.032" y="83.187" transform="matrix(-0.5869 0.8097 -0.8097 -0.5869 234.5073 50.5697)" fill="#646464" width="0.642" height="3.843"/>
+<rect x="197.331" y="150.964" transform="matrix(-0.587 0.8096 -0.8096 -0.587 437.4468 82.6123)" fill="#646464" width="0.641" height="3.845"/>
+<rect x="98" y="93.625" transform="matrix(-0.4074 0.9132 -0.9132 -0.4074 225.6352 44.6846)" fill="#646464" width="0.64" height="3.844"/>
+<rect x="203.359" y="140.543" transform="matrix(-0.4078 0.9131 -0.9131 -0.4078 416.8253 14.5954)" fill="#646464" width="0.642" height="3.844"/>
+<rect x="95.833" y="99.264" transform="matrix(-0.3066 0.9518 -0.9518 -0.3066 221.9467 40.688)" fill="#646464" width="0.64" height="3.845"/>
+<rect x="205.522" y="134.9" transform="matrix(-0.3116 0.9502 -0.9502 -0.3116 399.9991 -16.1291)" fill="#646464" width="0.639" height="3.844"/>
+<rect x="94.271" y="105.085" transform="matrix(-0.2072 0.9783 -0.9783 -0.2072 218.8786 36.6457)" fill="#646464" width="0.641" height="3.845"/>
+<rect x="207.09" y="129.056" transform="matrix(-0.2087 0.978 -0.978 -0.2087 378.7904 -44.5298)" fill="#646464" width="0.641" height="3.845"/>
+<rect x="93.335" y="111.049" transform="matrix(-0.1022 0.9948 -0.9948 -0.1022 215.6073 31.3552)" fill="#646464" width="0.64" height="3.845"/>
+<rect x="208.031" y="123.119" transform="matrix(-0.1098 0.994 -0.994 -0.1098 355.5052 -68.328)" fill="#646464" width="0.641" height="3.843"/>
+<rect x="93.33" y="123.116" transform="matrix(0.1052 0.9944 -0.9944 0.1052 208.1383 18.7487)" fill="#646464" width="0.64" height="3.844"/>
+<rect x="208.037" y="111.046" transform="matrix(0.1008 0.9949 -0.9949 0.1008 299.7495 -105.7131)" fill="#646464" width="0.639" height="3.844"/>
+<rect x="94.28" y="129.078" transform="matrix(0.2049 0.9788 -0.9788 0.2049 203.4314 11.5621)" fill="#646464" width="0.639" height="3.842"/>
+<rect x="207.083" y="105.067" transform="matrix(0.2079 0.9782 -0.9782 0.2079 268.9449 -118.1214)" fill="#646464" width="0.639" height="3.846"/>
+<rect x="95.837" y="134.894" transform="matrix(0.3087 0.9512 -0.9512 0.3087 196.6118 3.123)" fill="#646464" width="0.641" height="3.845"/>
+<rect x="205.527" y="99.265" transform="matrix(0.3066 0.9518 -0.9518 0.3066 239.0479 -125.7694)" fill="#646464" width="0.64" height="3.844"/>
+<rect x="98.001" y="140.536" transform="matrix(0.4078 0.9131 -0.9131 0.4078 188.2951 -5.4151)" fill="#646464" width="0.642" height="3.844"/>
+<rect x="203.38" y="93.62" transform="matrix(0.4061 0.9138 -0.9138 0.4061 208.2778 -129.4044)" fill="#646464" width="0.64" height="3.845"/>
+<rect x="104.025" y="150.966" transform="matrix(0.5873 0.8094 -0.8094 0.5873 166.8141 -21.3547)" fill="#646464" width="0.642" height="3.845"/>
+<rect x="197.325" y="83.182" transform="matrix(0.586 0.8103 -0.8103 0.586 150.7878 -124.9214)" fill="#646464" width="0.64" height="3.843"/>
+<rect x="107.839" y="155.664" transform="matrix(0.6707 0.7417 -0.7417 0.6707 152.4944 -28.3337)" fill="#646464" width="0.64" height="3.843"/>
+<rect x="193.534" y="78.483" transform="matrix(0.6704 0.742 -0.742 0.6704 123.557 -117.3383)" fill="#646464" width="0.641" height="3.846"/>
+<rect x="112.101" y="159.932" transform="matrix(0.7439 0.6683 -0.6683 0.7439 136.9672 -33.6781)" fill="#646464" width="0.64" height="3.843"/>
+<rect x="189.271" y="74.219" transform="matrix(0.7413 0.6712 -0.6712 0.7413 100.1464 -107.548)" fill="#646464" width="0.64" height="3.846"/>
+<rect x="116.771" y="163.73" transform="matrix(0.8102 0.5862 -0.5862 0.8102 119.3294 -37.1933)" fill="#646464" width="0.643" height="3.846"/>
+<rect x="184.58" y="70.434" transform="matrix(0.8087 0.5882 -0.5882 0.8087 77.9324 -94.9199)" fill="#646464" width="0.64" height="3.845"/>
+<rect x="127.237" y="169.758" transform="matrix(0.9128 0.4084 -0.4084 0.9128 81.2365 -37.1244)" fill="#646464" width="0.641" height="3.843"/>
+<rect x="174.128" y="64.385" transform="matrix(0.9128 0.4083 -0.4083 0.9128 42.2816 -65.4531)" fill="#646464" width="0.64" height="3.844"/>
+<rect x="132.858" y="171.933" transform="matrix(0.9515 0.3078 -0.3078 0.9515 59.9693 -32.5487)" fill="#646464" width="0.641" height="3.843"/>
+<rect x="168.491" y="62.239" transform="matrix(0.9508 0.3098 -0.3098 0.9508 28.1799 -49.1374)" fill="#646464" width="0.637" height="3.845"/>
+<rect x="138.683" y="173.483" transform="matrix(0.979 0.204 -0.204 0.979 38.7088 -24.6697)" fill="#646464" width="0.641" height="3.844"/>
+<rect x="162.676" y="60.67" transform="matrix(0.9778 0.2097 -0.2097 0.9778 16.7533 -32.7942)" fill="#646464" width="0.64" height="3.845"/>
+<rect x="144.665" y="174.417" transform="matrix(0.9949 0.1009 -0.1009 0.9949 18.5261 -13.7246)" fill="#646464" width="0.639" height="3.848"/>
+<rect x="156.703" y="59.731" transform="matrix(0.9943 0.1071 -0.1071 0.9943 7.504 -16.4585)" fill="#646464" width="0.638" height="3.844"/>
+<path fill="#646464" d="M149.543,58.717c0.483,0,0.847,0.17,1.094,0.514c0.247,0.342,0.368,0.945,0.368,1.812  c0,0.948-0.124,1.593-0.374,1.931c-0.249,0.34-0.617,0.508-1.103,0.508c-0.426,0-0.747-0.111-0.964-0.338  c-0.217-0.223-0.357-0.508-0.424-0.852c-0.065-0.344-0.098-0.762-0.098-1.249c0-0.849,0.125-1.448,0.379-1.799  C148.674,58.893,149.048,58.717,149.543,58.717z M149.522,62.963c0.213,0,0.368-0.119,0.468-0.359  c0.099-0.238,0.148-0.76,0.148-1.562c0-0.772-0.051-1.267-0.152-1.482c-0.104-0.214-0.257-0.323-0.464-0.323  c-0.188,0-0.326,0.075-0.414,0.225c-0.089,0.15-0.146,0.348-0.167,0.588c-0.021,0.243-0.033,0.572-0.033,0.993  c0,0.825,0.049,1.353,0.147,1.581C149.153,62.848,149.31,62.963,149.522,62.963z"/>
+<path fill="#646464" d="M152.801,58.717c0.48,0,0.846,0.17,1.092,0.514c0.246,0.342,0.369,0.945,0.369,1.812  c0,0.948-0.125,1.593-0.373,1.931c-0.25,0.34-0.617,0.508-1.104,0.508c-0.428,0-0.747-0.111-0.965-0.338  c-0.217-0.223-0.357-0.508-0.424-0.852c-0.065-0.344-0.098-0.762-0.098-1.249c0-0.849,0.126-1.448,0.379-1.799  S152.303,58.717,152.801,58.717z M152.777,62.963c0.213,0,0.369-0.119,0.468-0.359c0.099-0.238,0.146-0.76,0.146-1.562  c0-0.772-0.05-1.267-0.15-1.482c-0.102-0.214-0.258-0.323-0.465-0.323c-0.188,0-0.326,0.075-0.414,0.225s-0.145,0.348-0.164,0.588  c-0.022,0.243-0.034,0.572-0.034,0.993c0,0.825,0.05,1.353,0.147,1.581C152.409,62.848,152.564,62.963,152.777,62.963z"/>
+<path fill="#646464" d="M98.354,90.792l1.006,0.579c0.024-0.05,0.072-0.139,0.147-0.266c0.23-0.402,0.517-0.65,0.854-0.742  c0.338-0.093,0.71-0.023,1.116,0.213c0.463,0.266,0.737,0.582,0.826,0.947c0.09,0.366-0.008,0.791-0.288,1.278  c-0.159,0.274-0.371,0.548-0.634,0.817l-0.478-0.276l0.004-0.005c0.281-0.283,0.474-0.515,0.578-0.695  c0.156-0.272,0.202-0.513,0.137-0.723c-0.065-0.209-0.25-0.4-0.554-0.576c-0.267-0.154-0.51-0.199-0.726-0.135  c-0.218,0.064-0.409,0.24-0.574,0.526c-0.113,0.196-0.219,0.399-0.314,0.607l-1.965-1.134l1.205-2.086l0.467,0.27L98.354,90.792z"/>
+<path fill="#646464" d="M99.691,87.299c0.24-0.417,0.57-0.646,0.99-0.689c0.419-0.041,1.004,0.154,1.753,0.588  c0.823,0.474,1.317,0.902,1.487,1.289c0.168,0.387,0.132,0.787-0.111,1.209c-0.213,0.369-0.472,0.592-0.775,0.665  c-0.304,0.076-0.622,0.057-0.951-0.06c-0.332-0.115-0.707-0.295-1.131-0.539c-0.734-0.424-1.191-0.834-1.368-1.227  C99.408,88.141,99.443,87.729,99.691,87.299z M103.357,89.441c0.106-0.186,0.08-0.381-0.076-0.586  c-0.157-0.203-0.584-0.508-1.279-0.91c-0.668-0.385-1.121-0.588-1.359-0.607c-0.238-0.019-0.409,0.061-0.512,0.238  c-0.094,0.164-0.098,0.32-0.013,0.473c0.087,0.151,0.228,0.298,0.427,0.438c0.198,0.141,0.479,0.314,0.841,0.524  c0.716,0.414,1.196,0.633,1.443,0.663C103.074,89.702,103.25,89.625,103.357,89.441z"/>
+<path fill="#646464" d="M93.864,118.926h0.538v0.48h1.027v0.844h-1.027v1.879h-0.514l-2.398-1.469l-0.751-0.458v-0.796h3.125  V118.926z M93.864,121.475v-1.225H91.81L93.864,121.475z"/>
+<path fill="#646464" d="M91.303,117.632h1.161c-0.005-0.057-0.008-0.157-0.008-0.306c0-0.465,0.124-0.821,0.37-1.071  c0.245-0.249,0.604-0.374,1.072-0.374c0.535,0,0.932,0.137,1.191,0.41c0.259,0.272,0.389,0.688,0.389,1.248  c0,0.32-0.047,0.661-0.141,1.026h-0.55v-0.005c0.102-0.387,0.152-0.684,0.152-0.893c0-0.313-0.081-0.545-0.242-0.693  c-0.162-0.148-0.418-0.225-0.769-0.225c-0.308,0-0.54,0.083-0.695,0.248c-0.156,0.164-0.234,0.413-0.234,0.74  c0,0.229,0.012,0.457,0.032,0.686h-2.269v-2.408h0.539v1.617H91.303z"/>
+<path fill="#646464" d="M101.485,147.51l0.466-0.27l0.241,0.418l0.889-0.516l0.422,0.731l-0.89,0.515l0.938,1.625l-0.442,0.256  l-2.813-0.068l-0.88-0.023l-0.397-0.688l2.707-1.566L101.485,147.51z M102.76,149.717l-0.611-1.059l-1.781,1.027L102.76,149.717z"/>
+<path fill="#646464" d="M97.89,147.586c-0.241-0.418-0.274-0.82-0.102-1.205c0.174-0.385,0.635-0.791,1.385-1.225  c0.821-0.473,1.44-0.688,1.859-0.643c0.419,0.047,0.749,0.28,0.992,0.7c0.213,0.369,0.275,0.705,0.188,1.004  c-0.086,0.3-0.262,0.563-0.526,0.791c-0.267,0.229-0.609,0.47-1.032,0.712c-0.734,0.424-1.317,0.614-1.747,0.571  C98.477,148.25,98.139,148.012,97.89,147.586z M101.576,145.48c-0.105-0.185-0.287-0.26-0.543-0.226  c-0.256,0.031-0.732,0.25-1.428,0.651c-0.668,0.386-1.071,0.679-1.207,0.871c-0.136,0.197-0.151,0.388-0.048,0.563  c0.093,0.164,0.228,0.246,0.402,0.246c0.175,0.002,0.372-0.047,0.591-0.149c0.222-0.101,0.514-0.256,0.877-0.465  c0.715-0.412,1.146-0.72,1.294-0.918C101.664,145.855,101.684,145.666,101.576,145.48z"/>
+<path fill="#646464" d="M124.009,170.736c-0.531-0.309-0.894-0.443-1.089-0.41c-0.194,0.029-0.356,0.16-0.485,0.383  c-0.113,0.195-0.147,0.373-0.099,0.533s0.178,0.303,0.388,0.422c0.185,0.109,0.47,0.213,0.857,0.313l0.005,0.004l-0.274,0.478  c-0.388-0.112-0.721-0.246-0.995-0.403c-0.414-0.238-0.677-0.502-0.787-0.789c-0.112-0.285-0.072-0.595,0.12-0.929  c0.132-0.229,0.308-0.392,0.528-0.481c0.22-0.097,0.467-0.105,0.738-0.041c-0.227-0.191-0.359-0.408-0.397-0.654  c-0.038-0.244,0.016-0.492,0.16-0.742c0.239-0.412,0.54-0.652,0.899-0.723c0.361-0.066,0.781,0.037,1.265,0.318  c0.289,0.163,0.561,0.379,0.813,0.637l-0.271,0.473l-0.005-0.004c-0.304-0.293-0.558-0.498-0.761-0.615  c-0.247-0.143-0.467-0.188-0.662-0.137c-0.195,0.055-0.362,0.205-0.508,0.451c-0.152,0.266-0.188,0.498-0.106,0.699  c0.082,0.2,0.391,0.457,0.926,0.766L124.009,170.736z"/>
+<path fill="#646464" d="M119.964,170.016l0.581-1.006c-0.052-0.025-0.14-0.074-0.268-0.146c-0.402-0.231-0.649-0.518-0.742-0.854  c-0.094-0.338-0.021-0.711,0.212-1.119c0.269-0.459,0.584-0.736,0.95-0.826c0.364-0.09,0.791,0.011,1.276,0.289  c0.276,0.16,0.55,0.371,0.819,0.638l-0.277,0.475l-0.005-0.004c-0.283-0.28-0.516-0.474-0.695-0.578  c-0.271-0.155-0.513-0.198-0.722-0.135c-0.211,0.063-0.402,0.25-0.578,0.551c-0.154,0.269-0.199,0.511-0.134,0.726  c0.064,0.221,0.24,0.41,0.525,0.574c0.197,0.112,0.4,0.221,0.608,0.317l-1.134,1.963l-2.086-1.207l0.27-0.467L119.964,170.016z"/>
+<path fill="#646464" d="M153.499,177.301c-0.614,0-0.996,0.061-1.149,0.186c-0.152,0.125-0.229,0.316-0.229,0.578  c0,0.226,0.063,0.396,0.184,0.513s0.305,0.174,0.547,0.174c0.213,0,0.512-0.056,0.896-0.162h0.008v0.552  c-0.393,0.1-0.748,0.146-1.064,0.146c-0.478,0-0.838-0.097-1.075-0.285c-0.24-0.194-0.36-0.481-0.36-0.864  c0-0.269,0.072-0.496,0.217-0.685c0.144-0.188,0.349-0.326,0.619-0.404c-0.292-0.051-0.516-0.176-0.672-0.366  c-0.155-0.193-0.233-0.437-0.233-0.728c0-0.478,0.14-0.834,0.418-1.074c0.276-0.237,0.695-0.358,1.252-0.358  c0.334,0,0.678,0.049,1.026,0.146v0.543h-0.006c-0.41-0.101-0.731-0.151-0.966-0.151c-0.284,0-0.497,0.071-0.643,0.217  c-0.144,0.145-0.213,0.356-0.213,0.643c0,0.305,0.084,0.525,0.254,0.658c0.174,0.135,0.568,0.201,1.188,0.201V177.301  L153.499,177.301z"/>
+<path fill="#646464" d="M149.197,179.285c-0.482,0-0.845-0.17-1.092-0.514c-0.245-0.34-0.367-0.943-0.367-1.81  c0-0.948,0.122-1.594,0.373-1.933c0.249-0.34,0.616-0.51,1.103-0.51c0.426,0,0.747,0.111,0.964,0.338  c0.218,0.228,0.358,0.511,0.424,0.854c0.065,0.347,0.098,0.761,0.098,1.248c0,0.851-0.125,1.451-0.377,1.799  C150.068,179.111,149.694,179.285,149.197,179.285z M149.22,175.041c-0.213,0-0.369,0.121-0.468,0.359  c-0.098,0.236-0.147,0.76-0.147,1.563c0,0.771,0.05,1.266,0.153,1.482c0.102,0.217,0.256,0.322,0.463,0.322  c0.188,0,0.325-0.072,0.414-0.226c0.088-0.149,0.145-0.349,0.166-0.588c0.021-0.242,0.033-0.574,0.033-0.992  c0-0.828-0.051-1.353-0.147-1.582C149.587,175.154,149.433,175.041,149.22,175.041z"/>
+<path fill="#646464" d="M179.164,167.535l-0.273-0.469l2.418-1.396l0.17,0.295c0.164,0.283,0.258,0.559,0.287,0.836  c0.027,0.275,0.014,0.531-0.039,0.766c-0.054,0.238-0.136,0.515-0.248,0.822c-0.135,0.369-0.201,0.639-0.199,0.799  c0.002,0.158,0.037,0.299,0.104,0.418c0.12,0.209,0.268,0.334,0.441,0.379c0.171,0.039,0.369-0.002,0.59-0.131  c0.234-0.137,0.484-0.358,0.75-0.676l0.005-0.002l0.278,0.482c-0.285,0.313-0.598,0.564-0.928,0.756  c-0.412,0.238-0.773,0.326-1.09,0.27c-0.316-0.055-0.576-0.26-0.781-0.608c-0.112-0.197-0.176-0.416-0.189-0.664  c-0.016-0.246,0.068-0.623,0.252-1.125c0.104-0.281,0.176-0.513,0.227-0.688c0.047-0.178,0.069-0.354,0.068-0.533  c-0.002-0.18-0.043-0.352-0.131-0.518L179.164,167.535z"/>
+<path fill="#646464" d="M179.66,171.387l-0.58-1.006c-0.046,0.029-0.135,0.084-0.26,0.156c-0.402,0.232-0.773,0.307-1.112,0.215  c-0.338-0.088-0.626-0.334-0.86-0.74c-0.266-0.463-0.348-0.873-0.24-1.236c0.104-0.356,0.399-0.68,0.887-0.961  c0.277-0.16,0.599-0.291,0.96-0.389l0.274,0.475l-0.006,0.004c-0.386,0.104-0.666,0.207-0.849,0.314  c-0.271,0.155-0.431,0.342-0.479,0.555c-0.045,0.215,0.017,0.475,0.192,0.779c0.153,0.266,0.341,0.426,0.562,0.479  s0.474-0.004,0.761-0.17c0.196-0.111,0.389-0.236,0.577-0.369l1.135,1.965l-2.087,1.203l-0.269-0.465L179.66,171.387z"/>
+<path fill="#646464" d="M199.659,146.943l-0.47-0.271l1.395-2.416l0.295,0.171c0.283,0.161,0.504,0.356,0.666,0.577  c0.162,0.226,0.281,0.453,0.352,0.685c0.072,0.231,0.139,0.512,0.196,0.836c0.067,0.389,0.146,0.652,0.228,0.791  s0.182,0.242,0.302,0.311c0.209,0.121,0.397,0.156,0.569,0.107c0.168-0.051,0.317-0.187,0.445-0.408  c0.135-0.236,0.239-0.557,0.311-0.961l0.004-0.006l0.482,0.279c-0.094,0.414-0.233,0.786-0.427,1.12  c-0.235,0.41-0.506,0.669-0.81,0.779c-0.303,0.108-0.629,0.062-0.979-0.142c-0.198-0.112-0.362-0.272-0.497-0.479  c-0.136-0.206-0.25-0.574-0.345-1.102c-0.052-0.297-0.103-0.531-0.147-0.707c-0.049-0.176-0.117-0.342-0.207-0.498  c-0.092-0.152-0.213-0.281-0.369-0.381L199.659,146.943z"/>
+<path fill="#646464" d="M202.305,150.705c-0.24,0.414-0.57,0.645-0.99,0.688c-0.418,0.041-1.002-0.154-1.752-0.586  c-0.821-0.475-1.317-0.904-1.485-1.291c-0.17-0.385-0.132-0.787,0.11-1.209c0.213-0.369,0.471-0.59,0.774-0.664  c0.304-0.076,0.622-0.057,0.95,0.06c0.332,0.114,0.708,0.295,1.131,0.541c0.734,0.422,1.191,0.834,1.371,1.226  C202.59,149.861,202.555,150.273,202.305,150.705z M198.641,148.564c-0.107,0.182-0.082,0.375,0.075,0.582  c0.157,0.205,0.582,0.51,1.278,0.912c0.669,0.385,1.122,0.588,1.357,0.604c0.238,0.02,0.41-0.059,0.516-0.238  c0.094-0.162,0.096-0.318,0.012-0.471c-0.086-0.15-0.227-0.297-0.426-0.438c-0.199-0.142-0.48-0.314-0.844-0.521  c-0.715-0.414-1.195-0.637-1.44-0.664C198.922,148.301,198.746,148.377,198.641,148.564z"/>
+<path fill="#646464" d="M119.518,68.245l0.58,1.005c0.047-0.032,0.134-0.084,0.26-0.156c0.404-0.232,0.773-0.307,1.113-0.217  c0.337,0.09,0.626,0.336,0.859,0.742c0.268,0.463,0.348,0.873,0.241,1.236c-0.105,0.359-0.401,0.682-0.888,0.963  c-0.276,0.156-0.596,0.289-0.959,0.389l-0.275-0.477l0.006-0.004c0.387-0.102,0.668-0.207,0.848-0.312  c0.272-0.155,0.431-0.341,0.479-0.558c0.049-0.214-0.015-0.472-0.19-0.775c-0.154-0.266-0.341-0.428-0.562-0.479  c-0.22-0.055-0.474,0.003-0.759,0.168c-0.197,0.113-0.39,0.237-0.578,0.371l-1.133-1.965l2.085-1.205l0.27,0.465L119.518,68.245z"/>
+<path fill="#646464" d="M122.338,66.618l0.58,1.004c0.046-0.031,0.134-0.083,0.259-0.156c0.403-0.232,0.774-0.306,1.113-0.216  c0.339,0.088,0.626,0.336,0.86,0.742c0.267,0.463,0.348,0.873,0.24,1.234c-0.104,0.361-0.401,0.682-0.887,0.963  c-0.276,0.16-0.596,0.29-0.958,0.391l-0.276-0.475l0.006-0.006c0.385-0.104,0.668-0.207,0.849-0.312  c0.271-0.157,0.431-0.343,0.479-0.558c0.048-0.214-0.015-0.474-0.19-0.775c-0.155-0.269-0.342-0.429-0.562-0.479  c-0.221-0.055-0.473,0.002-0.76,0.166c-0.197,0.114-0.39,0.238-0.577,0.371l-1.135-1.965l2.087-1.203l0.269,0.464L122.338,66.618z"/>
+<path fill="#646464" d="M207.07,118.969h-0.502v-2.763h0.502v0.982h3.49l-0.227-0.982h0.501l0.435,1.378v0.455h-4.201  L207.07,118.969L207.07,118.969z"/>
+<path fill="#646464" d="M210.693,120.371h-1.16c0.005,0.057,0.008,0.158,0.008,0.304c0,0.466-0.123,0.821-0.369,1.073  c-0.246,0.248-0.604,0.373-1.074,0.373c-0.533,0-0.93-0.137-1.188-0.408c-0.262-0.271-0.391-0.689-0.391-1.251  c0-0.317,0.047-0.659,0.143-1.026h0.55v0.007c-0.104,0.386-0.153,0.684-0.153,0.894c0,0.312,0.082,0.543,0.242,0.692  c0.162,0.148,0.416,0.225,0.768,0.225c0.31,0,0.543-0.083,0.697-0.249c0.155-0.164,0.232-0.411,0.232-0.739  c0-0.228-0.012-0.457-0.031-0.685h2.268v2.407h-0.539v-1.617H210.693z"/>
+<path fill="#646464" d="M180.623,67.174l-0.58,1.006c0.053,0.023,0.141,0.072,0.266,0.146c0.402,0.233,0.652,0.519,0.744,0.855  c0.094,0.339,0.021,0.712-0.213,1.117c-0.267,0.462-0.584,0.737-0.949,0.827c-0.365,0.087-0.791-0.008-1.275-0.289  c-0.276-0.158-0.549-0.371-0.816-0.634l0.275-0.478l0.007,0.004c0.28,0.28,0.515,0.474,0.694,0.578  c0.271,0.156,0.511,0.201,0.722,0.136c0.21-0.065,0.401-0.25,0.577-0.552c0.152-0.268,0.199-0.51,0.134-0.729  c-0.065-0.215-0.24-0.406-0.524-0.57c-0.197-0.114-0.399-0.22-0.609-0.315l1.135-1.965l2.086,1.203l-0.268,0.468L180.623,67.174z"/>
+<path fill="#646464" d="M199.538,90.932l-0.433,0.25l-1.383-2.392l0.434-0.25l0.492,0.851l3.023-1.746l-0.688-0.738l0.437-0.25  l1.065,0.977l0.226,0.393l-3.639,2.101L199.538,90.932z"/>
+<path fill="#646464" d="M204.107,90.42c0.242,0.418,0.274,0.816,0.102,1.202c-0.173,0.384-0.634,0.792-1.385,1.226  c-0.819,0.475-1.441,0.688-1.859,0.641c-0.416-0.047-0.748-0.28-0.99-0.701c-0.213-0.366-0.275-0.703-0.189-1.002  c0.088-0.3,0.264-0.566,0.527-0.795c0.267-0.228,0.609-0.465,1.031-0.709c0.734-0.425,1.318-0.615,1.748-0.572  S203.859,89.99,204.107,90.42z M200.42,92.523c0.105,0.185,0.288,0.26,0.545,0.225c0.256-0.031,0.732-0.25,1.428-0.652  c0.67-0.385,1.07-0.678,1.207-0.871c0.135-0.197,0.151-0.386,0.049-0.564c-0.094-0.162-0.229-0.245-0.402-0.246  c-0.174-0.002-0.372,0.049-0.592,0.15c-0.223,0.102-0.514,0.256-0.877,0.467c-0.715,0.412-1.146,0.719-1.295,0.917  C200.335,92.148,200.313,92.34,200.42,92.523z"/>
+<circle fill="none" cx="150.999" cy="119.001" r="61.507"/>
+<rect x="81.162" y="49.164" fill="none" width="139.674" height="139.676"/>
+<rect x="81.165" y="49.164" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -39.9185 141.6281)" fill="none" width="139.672" height="139.672"/>
+<path fill-opacity="0.4" d="M166.857,135.764c-0.252,0.25-0.654,0.25-0.903,0.004l-50.748-50.75c-0.248-0.248-0.247-0.65,0.003-0.9  l0.906-0.906c0.25-0.25,0.654-0.252,0.901-0.006l50.751,50.75c0.246,0.248,0.246,0.651-0.006,0.899L166.857,135.764z"/>
+<rect x="140.849" y="73.605" transform="matrix(0.7067 -0.7075 0.7075 0.7067 -35.968 132.2127)" fill="#FFFFFF" width="1.281" height="71.77"/>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="354.7988" y1="-95.1782" x2="354.7988" y2="-130.7611" gradientTransform="matrix(1 0 0 -1 -185.98 -13.5195)">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.9455" style="stop-color:#CBCBCB"/>
+<stop offset="1" style="stop-color:#CBCBCB"/>
+</linearGradient>
+<path display="none" fill="url(#SVGID_5_)" d="M154.729,117.99c-3.874,0-6.007-2.244-6.007-6.319v-13.96  c0-4.23,3.511-5.73,6.517-5.73h0.287c0.248,0,0.271-0.002,0.472-0.01l0.164-0.006c1.626-0.056,3.36-1.23,3.358-4.359  c-0.002-2.646,0.717-4.59,2.139-5.769c1.215-1.011,2.662-1.222,3.664-1.222c0.71,0,1.21,0.107,1.229,0.112  c14.013,2.417,21.496,14.197,22.324,21.788c0.235,2.158-0.549,4.537-2.044,6.206c-1.003,1.117-2.794,2.45-5.637,2.45  c-4.256,0-5.939,1.467-6.84,2.57l-0.254,0.317c-1.168,1.472-3.125,3.933-7.32,3.933L154.729,117.99L154.729,117.99z"/>
+<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="354.7988" y1="-131.1069" x2="354.7988" y2="-94.4508" gradientTransform="matrix(1 0 0 -1 -185.98 -13.5195)">
+<stop offset="0" style="stop-color:#B4B4B4"/>
+<stop offset="1" style="stop-color:#A0A0A0"/>
+</linearGradient>
+<path display="none" fill="url(#SVGID_6_)" d="M188.876,102.516c-0.828-7.591-8.312-19.371-22.323-21.788  c-0.021-0.005-0.521-0.112-1.23-0.112c-1.002,0-2.449,0.211-3.664,1.222c-1.422,1.179-2.141,3.122-2.139,5.769  c0.002,3.129-1.732,4.304-3.358,4.359l-0.164,0.006c-0.2,0.008-0.224,0.01-0.472,0.01h-0.287c-3.006,0-6.517,1.5-6.517,5.73v13.96  c0,4.075,2.134,6.319,6.007,6.319h12.054c4.194,0,6.151-2.461,7.319-3.931l0.254-0.317c0.898-1.104,2.586-2.57,6.842-2.57  c2.842,0,4.632-1.333,5.636-2.45C188.326,107.053,189.111,104.674,188.876,102.516z M181.193,110.531  c-4.494,0-6.334,1.576-7.336,2.807c-1.164,1.436-2.895,4.014-7.076,4.014s-7.477,0-12.055,0c-4.579,0-5.365-3.25-5.365-5.681  c0-2.429,0-13.96,0-13.96c0-3.771,3.05-5.091,5.876-5.091c0.639,0,0.482,0.002,0.947-0.015c2.119-0.072,3.977-1.645,3.975-4.998  c-0.006-7.635,6.253-6.255,6.253-6.255c13.789,2.379,21.036,13.987,21.825,21.231C188.607,105.965,186.218,110.531,181.193,110.531z  "/>
+<rect x="81.163" y="49.163" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 173.6274 309.9154)" fill="none" width="139.672" height="139.671"/>
+<polygon fill-opacity="0.4" points="161.545,112.082 123.561,150.064 119.503,150.271 119.953,146.424 157.92,108.457 "/>
+<polygon points="157.92,109.363 160.639,112.082 123.281,149.438 120.229,149.594 120.563,146.719 "/>
+<rect x="81.162" y="49.164" transform="matrix(-0.7071 0.7071 -0.7071 -0.7071 341.915 96.3727)" fill="none" width="139.673" height="139.671"/>
+<polygon fill-opacity="0.4" points="146.12,109.589 174.588,138.059 174.344,142.57 170.041,142.572 141.589,114.119 "/>
+<polygon fill="#1A1A1A" points="142.495,114.119 146.12,110.495 173.962,138.336 173.665,141.844 170.337,141.963 "/>
+<path fill-opacity="0.4" d="M146.924,114.924c2.247-2.25,5.905-2.248,8.154,0c2.248,2.248,2.248,5.905,0,8.152  c-2.249,2.249-5.906,2.251-8.154,0.002C144.675,120.829,144.675,117.17,146.924,114.924L146.924,114.924z"/>
+<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="-3819.5313" y1="-1695.1787" x2="-3819.5313" y2="-1684.7993" gradientTransform="matrix(-0.7071 0.7071 -0.7071 -0.7071 -3744.7813 1624.7996)">
 <stop offset="0" style="stop-color:#999999"/>
 <stop offset="0.31" style="stop-color:#4D4D4D"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
-<circle fill="url(#SVGID_4_)" cx="112" cy="69.618" r="4.088"/>
-<path fill="#E6E6E6" d="M109.432,67.049c1.417-1.416,3.72-1.417,5.138,0c1.417,1.416,1.416,3.721,0,5.138  c-1.417,1.415-3.722,1.416-5.138,0.001C108.015,70.772,108.015,68.464,109.432,67.049L109.432,67.049z"/>
-<path fill="#595959" d="M126.015,58.987l-0.303-1.292h-1.688l-0.315,1.292h-1.268l1.737-6.196h1.705l1.623,6.196H126.015z   M125.541,56.892l-0.665-2.917l-0.681,2.917H125.541z"/>
-<path fill="#595959" d="M133.559,52.791v6.196h-1.389v-4.111l-1.071,2.095h-0.512l-1.072-2.095v4.111h-1.397v-6.196h1.226l1.5,2.93  l1.497-2.93H133.559z"/>
+<circle fill="url(#SVGID_7_)" cx="151" cy="119" r="5.19"/>
+<path fill="#E6E6E6" d="M147.739,115.738c1.798-1.797,4.725-1.799,6.525,0c1.797,1.799,1.797,4.725-0.002,6.524  c-1.798,1.799-4.726,1.799-6.523,0C145.939,120.463,145.941,117.537,147.739,115.738L147.739,115.738z"/>
+<rect fill="none" width="302" height="238"/>
 </svg>

--- a/homescreenapp/widgetplugins/hsclockwidgetplugin/src/hsanalogclockwidget.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/widgetplugins/hsclockwidgetplugin/src/hsanalogclockwidget.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -20,7 +20,7 @@
 
 #include <HbStyleLoader>
 #include <HbIconItem>
-#include <HbTouchArea>
+#include <HbTapGesture>
 #include <HbInstantFeedback>
 
 #include "hsconfiguration.h"
@@ -38,12 +38,13 @@
 HsAnalogClockWidget::HsAnalogClockWidget(QGraphicsItem *parent)
     : HbWidget(parent),
       mBackground(0), mHourHand(0), mMinuteHand(0), 
-      mSecondHand(0), mTouchArea(0)
+      mSecondHand(0)
 {
     HbStyleLoader::registerFilePath(":/hsanalogclockwidget.widgetml");
     HbStyleLoader::registerFilePath(":/hsanalogclockwidget.css");
 
     createPrimitives();
+    grabGesture(Qt::TapGesture);
 }
 
 /*!
@@ -53,28 +54,27 @@
 {
     HbStyleLoader::unregisterFilePath(":/hsanalogclockwidget.widgetml");
     HbStyleLoader::unregisterFilePath(":/hsanalogclockwidget.css");
-    mTouchArea->removeEventFilter(this);
 }
 
-/*!
-    Filters touch area events.
-*/
-bool HsAnalogClockWidget::eventFilter(QObject *watched, QEvent *event)
+#ifdef COVERAGE_MEASUREMENT
+#pragma CTC SKIP
+#endif //COVERAGE_MEASUREMENT
+void HsAnalogClockWidget::gestureEvent(QGestureEvent *event)
 {
-    Q_UNUSED(watched)
+    HbTapGesture *gesture = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture));
+    if (gesture) {
+        if (gesture->state() == Qt::GestureFinished) {
+            if (gesture->tapStyleHint() == HbTapGesture::Tap) {
+                    HbInstantFeedback::play(HSCONFIGURATION_GET(clockWidgetTapFeedbackEffect));
+                    emit clockTapped();                
+            }
+        }
+    }
+}
+#ifdef COVERAGE_MEASUREMENT
+#pragma CTC ENDSKIP
+#endif //COVERAGE_MEASUREMENT
 
-    switch (event->type()) {
-        case QEvent::GraphicsSceneMousePress:
-            return true;
-        case QEvent::GraphicsSceneMouseRelease:
-            handleMouseReleaseEvent(static_cast<QGraphicsSceneMouseEvent *>(event));
-            return true;
-        default:
-            break;
-    }
-
-    return false;
-}
 
 /*!
     Return bounding rect
@@ -130,10 +130,6 @@
 
     mSecondHand = new HbIconItem(QLatin1String("qtg_graf_clock_day_sec"), this);
     HbStyle::setItemName(mSecondHand, QLatin1String("second_hand"));
-
-    mTouchArea = new HbTouchArea(this);
-    mTouchArea->installEventFilter(this);    
-    HbStyle::setItemName(mTouchArea, QLatin1String("toucharea"));
 }
 
 /*!
@@ -160,17 +156,3 @@
     mSecondHand->setTransformOriginPoint(originPoint);
     mSecondHand->setRotation(s);
 }
-
-/*!
-    \internal
-*/
-void HsAnalogClockWidget::handleMouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-    if (!contains(event->pos())) {
-        return;
-    }
-
-    HbInstantFeedback::play(HSCONFIGURATION_GET(clockWidgetTapFeedbackEffect));
-
-    emit clockTapped();
-}

--- a/homescreenapp/widgetplugins/hsclockwidgetplugin/src/hsdigitalclockwidget.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/widgetplugins/hsclockwidgetplugin/src/hsdigitalclockwidget.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -22,10 +22,11 @@
 #include <HbIconItem>
 #include <HbFrameItem>
 #include <HbFrameDrawer>
-#include <HbTouchArea>
+#include <HbTapGesture>
 #include <HbInstantFeedback>
 
 #include "hsdigitalclockwidget.h"
+#include "hsconfiguration.h"
 
 /*!
     \class HsDigitalClockWidget
@@ -41,7 +42,7 @@
     mBackground(0),
     mDigit1(0), mDigit2(0), mDigit3(0),
     mDigit4(0), mDigit5(0), mDigit6(0),
-    mAmPm(0), mTouchArea(0), mUseAmPm(useAmPm)
+    mAmPm(0), mUseAmPm(useAmPm)
 {
     HbStyleLoader::registerFilePath(":/hsdigitalclockwidget.widgetml");
     HbStyleLoader::registerFilePath(":/hsdigitalclockwidget.css");
@@ -69,6 +70,7 @@
     mDigitMap.insert(QChar('9'), QString(":/clock_widget_nine.svg"));
 
     createPrimitives();
+    grabGesture(Qt::TapGesture);
 }
 
 /*!
@@ -78,28 +80,26 @@
 {
     HbStyleLoader::unregisterFilePath(":/hsdigitalclockwidget.widgetml");
     HbStyleLoader::unregisterFilePath(":/hsdigitalclockwidget.css");
-    mTouchArea->removeEventFilter(this);
 }
 
-/*!
-    Filters touch area events.
-*/
-bool HsDigitalClockWidget::eventFilter(QObject *watched, QEvent *event)
+#ifdef COVERAGE_MEASUREMENT
+#pragma CTC SKIP
+#endif //COVERAGE_MEASUREMENT
+void HsDigitalClockWidget::gestureEvent(QGestureEvent *event)
 {
-    Q_UNUSED(watched)
-
-    switch (event->type()) {
-        case QEvent::GraphicsSceneMousePress:
-            return true;
-        case QEvent::GraphicsSceneMouseRelease:
-            handleMouseReleaseEvent(static_cast<QGraphicsSceneMouseEvent *>(event));
-            return true;
-        default:
-            break;
+    HbTapGesture *gesture = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture));
+    if (gesture) {
+        if (gesture->state() == Qt::GestureFinished) {
+            if (gesture->tapStyleHint() == HbTapGesture::Tap) {
+                    HbInstantFeedback::play(HSCONFIGURATION_GET(clockWidgetTapFeedbackEffect));
+                    emit clockTapped();                
+            }
+        }
     }
-
-    return false;
 }
+#ifdef COVERAGE_MEASUREMENT
+#pragma CTC ENDSKIP
+#endif //COVERAGE_MEASUREMENT
 
 /*!
     Return shape
@@ -202,10 +202,6 @@
         mAmPm = new HbIconItem(QLatin1String(":/clock_widget_am.svg"), this);
         HbStyle::setItemName(mAmPm, QLatin1String("ampm"));
     }
-
-    mTouchArea = new HbTouchArea(this);
-    mTouchArea->installEventFilter(this);
-    HbStyle::setItemName(mTouchArea, QLatin1String("toucharea"));
 }
 
 /*!
@@ -248,17 +244,3 @@
         }
     }
 }
-
-/*!
-    \internal
-*/
-void HsDigitalClockWidget::handleMouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-    if (!contains(event->pos())) {
-        return;
-    }
-
-    HbInstantFeedback::play(HbFeedback::BasicItem);
-
-    emit clockTapped();
-}

--- a/homescreenapp/widgetplugins/hsshortcutwidgetplugin/inc/hsshortcutwidget.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/widgetplugins/hsshortcutwidgetplugin/inc/hsshortcutwidget.h	Wed Aug 18 09:40:07 2010 +0300
@@ -28,7 +28,7 @@
 class HbFrameItem;    
 class HbIconItem;
 class HbTextItem;
-class HbTouchArea;
+class QGestureEvent;
 class CaEntry;
 
 class HsShortcutWidget : public HbWidget
@@ -51,8 +51,6 @@
     QString text() const;
     void setText(const QString& textItem);
 
-    bool eventFilter(QObject *watched, QEvent *event);
-
 signals:
     void finished();
     void setPreferences(const QStringList &names);
@@ -62,12 +60,13 @@
     void onShow();
     void onHide();
 
+protected:
+    void gestureEvent(QGestureEvent *event);
+
 private:
     Q_DISABLE_COPY(HsShortcutWidget)
-
-    void handleMousePressEvent(QGraphicsSceneMouseEvent *event);
-    void handleMouseMoveEvent(QGraphicsSceneMouseEvent *event);
-    void handleMouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+    
+    void launch();
             
     void createPrimitives();
     void updateContent(const CaEntry &caEntry);
@@ -85,8 +84,7 @@
     HbFrameItem *mBackground;
     HbIconItem *mIcon;
     HbTextItem *mText;
-    HbTouchArea *mTouchArea;
-    
+        
     int mCaEntryId;
     QString mUid;
     EntryRole mCaEntryRole;

--- a/homescreenapp/widgetplugins/hsshortcutwidgetplugin/resource/hsshortcutwidget.css	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/widgetplugins/hsshortcutwidgetplugin/resource/hsshortcutwidget.css	Wed Aug 18 09:40:07 2010 +0300
@@ -54,7 +54,3 @@
 	color: var(qtc_hs_list_item_title_normal);
 	zvalue: 2;
 }
-
-HsShortcutWidget::toucharea {  
-  zvalue: 3;
-}

--- a/homescreenapp/widgetplugins/hsshortcutwidgetplugin/resource/hsshortcutwidget.widgetml	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/widgetplugins/hsshortcutwidgetplugin/resource/hsshortcutwidget.widgetml	Wed Aug 18 09:40:07 2010 +0300
@@ -10,12 +10,7 @@
     <meshitem src="icon" srcEdge="CENTERH" dst="" dstEdge="CENTERH" />
     
     <meshitem src="text" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-    <meshitem src="text" srcEdge="CENTERH" dst="" dstEdge="CENTERH" />  
-    
-    <meshitem src="toucharea" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="toucharea" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="toucharea" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="toucharea" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />  
+    <meshitem src="text" srcEdge="CENTERH" dst="" dstEdge="CENTERH" />
   </layout>
   
   <layout name="icon_shortcut" type="mesh">    
@@ -25,12 +20,7 @@
     <meshitem src="background" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
     
     <meshitem src="icon" srcEdge="CENTERV" dst="" dstEdge="CENTERV" />
-    <meshitem src="icon" srcEdge="CENTERH" dst="" dstEdge="CENTERH" /> 
-    
-    <meshitem src="toucharea" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="toucharea" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="toucharea" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="toucharea" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+    <meshitem src="icon" srcEdge="CENTERH" dst="" dstEdge="CENTERH" />
   </layout>
   
 </hbwidget>

--- a/homescreenapp/widgetplugins/hsshortcutwidgetplugin/src/hsshortcutwidget.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/homescreenapp/widgetplugins/hsshortcutwidgetplugin/src/hsshortcutwidget.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -22,8 +22,8 @@
 #include <HbFrameDrawer>
 #include <HbIconItem>
 #include <HbTextItem>
-#include <HbTouchArea>
 #include <HbInstantFeedback>
+#include <HbTapGesture>
 
 #include "hsshortcutwidget.h"
 #include "hsshortcutservice.h"
@@ -47,9 +47,11 @@
 */
 HsShortcutWidget::HsShortcutWidget(QGraphicsItem *parent, Qt::WindowFlags flags)
   : HbWidget(parent, flags),
-    mBackground(0), mIcon(0), mText(0), mTouchArea(0),
+    mBackground(0), mIcon(0), mText(0),
     mCaEntryId(-1), mCaEntryRole(ItemEntryRole)
 {
+    grabGesture(Qt::TapGesture);
+
     HbStyleLoader::registerFilePath(":/hsshortcutwidget.widgetml");
     HbStyleLoader::registerFilePath(":/hsshortcutwidget.css");
 
@@ -120,33 +122,6 @@
 }
 
 /*!
-    Filters touch area events.
-*/
-bool HsShortcutWidget::eventFilter(QObject *watched, QEvent *event)
-{
-    Q_UNUSED(watched)
-
-    switch (event->type()) {
-        case QEvent::GraphicsSceneMousePress:
-            handleMousePressEvent(static_cast<QGraphicsSceneMouseEvent *>(event));
-            return true;
-        case QEvent::GraphicsSceneMouseMove:
-            handleMouseMoveEvent(static_cast<QGraphicsSceneMouseEvent *>(event));
-            return true;
-        case QEvent::GraphicsSceneMouseRelease:
-            handleMouseReleaseEvent(static_cast<QGraphicsSceneMouseEvent *>(event));
-            return true;
-        case QEvent::UngrabMouse:
-            setBackgroundToNormal();
-            return true;
-        default:
-            break;
-    }
-
-    return false;
-}
-
-/*!
     Initializes this widget.
 */
 void HsShortcutWidget::onInitialize()
@@ -204,37 +179,42 @@
 }
 
 /*!
-    \internal
+    \internal  
 */
-void HsShortcutWidget::handleMousePressEvent(QGraphicsSceneMouseEvent *event)
+#ifdef COVERAGE_MEASUREMENT
+#pragma CTC SKIP
+#endif //COVERAGE_MEASUREMENT
+void HsShortcutWidget::gestureEvent(QGestureEvent *event)
 {
-    Q_UNUSED(event)
-    setBackgroundToPressed();
+    HbTapGesture *gesture = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture));
+    if (gesture) {
+        switch (gesture->state()) {
+            case Qt::GestureStarted:
+                setBackgroundToPressed();
+                break;            
+            case Qt::GestureCanceled:
+                setBackgroundToNormal();
+                break;
+            case Qt::GestureFinished:
+                setBackgroundToNormal();
+                if (gesture->tapStyleHint() == HbTapGesture::Tap) {
+                    launch();
+                }
+                break;
+            default:
+                break;
+        }
+    }
 }
+#ifdef COVERAGE_MEASUREMENT
+#pragma CTC ENDSKIP
+#endif //COVERAGE_MEASUREMENT
 
 /*!
     \internal
 */
-void HsShortcutWidget::handleMouseMoveEvent(QGraphicsSceneMouseEvent *event)
+void HsShortcutWidget::launch()
 {
-    if (contains(event->pos())) {
-        setBackgroundToPressed();
-    } else {
-        setBackgroundToNormal();
-    }
-}
-
-/*!
-    \internal
-*/
-void HsShortcutWidget::handleMouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-    setBackgroundToNormal();
-
-    if (!contains(event->pos())) {
-        return;
-    }
-
     HbInstantFeedback::play(HSCONFIGURATION_GET(shortcutWidgetTapFeedbackEffect));
     
     if (mCaEntryRole == ItemEntryRole) {
@@ -267,12 +247,6 @@
     if (HSCONFIGURATION_GET(isShortcutLabelVisible) && !mText ) {
         mText = new HbTextItem(this);
         HbStyle::setItemName(mText, QLatin1String("text"));
-        }
-    // Touch Area
-    if (!mTouchArea) {
-        mTouchArea = new HbTouchArea(this);
-        mTouchArea->installEventFilter(this);
-        HbStyle::setItemName(mTouchArea, QLatin1String("toucharea"));
     }
 }
 
@@ -350,6 +324,3 @@
         emit finished();
     }
 }
-
-
-

--- a/screensaver/bwins/screensavermodelu.def	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/bwins/screensavermodelu.def	Wed Aug 18 09:40:07 2010 +0300
@@ -54,4 +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)

--- a/screensaver/common.pri	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/common.pri	Wed Aug 18 09:40:07 2010 +0300
@@ -129,7 +129,7 @@
 }
 }
 
-!exists($${EPOCROOT}epoc32/include/mw/XQSettingsManager) {
+!symbian {
     DEFINES += NO_QT_EXTENSIONS
 }

--- a/screensaver/devicedialogplugins/snsrdevicedialogplugin/inc/snsrdevicedialog.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/devicedialogplugins/snsrdevicedialogplugin/inc/snsrdevicedialog.h	Wed Aug 18 09:40:07 2010 +0300
@@ -23,18 +23,17 @@
 
 
 
-
+#include "screensaver.h"
 #include "snsrtest_global.h"
 
 class Screensaver;
 class SnsrUserActivityServiceInterface;
 class QGraphicsLinearLayout;
 class XQSettingsManager;
+class HbIndicatorInterface;
 
 SCREENSAVER_TEST_CLASS(T_SnsrDeviceDialogPlugin)
 
-class HbIndicatorInterface;
-
 
 class SnsrDeviceDialog: public HbPopup, public HbDeviceDialogInterface
 {
@@ -55,6 +54,8 @@
     };
     
     static const char *dataKeyUnlock;
+    static const char *dataKeySwitchLights;
+    static const char *dataKeySwitchLowPower;
 
 public: // methods
 
@@ -77,6 +78,7 @@
     void screensaverFaulted();
     void changeLayout(Qt::Orientation);
     void requestUnlock();
+    void requestScreenMode(Screensaver::ScreenPowerMode mode);
     // slots for signals emitted by HbIndicatorPluginManager
     void indicatorsActivated(const QList<HbIndicatorInterface*> &activatedIndicators);
     void indicatorActivated(HbIndicatorInterface *activatedIndicator);

--- a/screensaver/devicedialogplugins/snsrdevicedialogplugin/snsrdevicedialogplugin.pro	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/devicedialogplugins/snsrdevicedialogplugin/snsrdevicedialogplugin.pro	Wed Aug 18 09:40:07 2010 +0300
@@ -29,7 +29,7 @@
     TARGET.CAPABILITY = CAP_ECOM_PLUGIN
     
     include(snsrdevicedialogplugin_exports_to_rom.pri)
-    exists($${EPOCROOT}epoc32/include/mw/XQSettingsManager):LIBS += -lxqsettingsmanager
+    LIBS += -lxqsettingsmanager
 
     pluginstub.sources = snsrdevicedialogplugin.dll
     pluginstub.path = /resource/plugins/devicedialogs

--- a/screensaver/devicedialogplugins/snsrdevicedialogplugin/src/snsrdevicedialog.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/devicedialogplugins/snsrdevicedialogplugin/src/snsrdevicedialog.cpp	Wed Aug 18 09:40:07 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"
@@ -15,22 +15,20 @@
 *
 */
 
-#include <HbMainWindow>
 #include <QGraphicsLinearLayout>
+#include <QGraphicsSceneResizeEvent>
 #include <QPainter>
 #include <QDebug>
+#include <QServiceManager>
+#include <QServiceFilter>
+#include <QServiceInterfaceDescriptor>
+#include <XQSettingsManager>
+#include <HbMainWindow>
 #include <HbIndicatorInterface>
 
-#include <qservicemanager.h>
-#include <qservicefilter.h>
-#include <qserviceinterfacedescriptor.h>
-
 #include <screensaver.h>
-
+#include <screensaverdomaincrkeys.h>
 #include "snsrdevicedialog.h"
-#include <screensaverdomaincrkeys.h>
-#include <xqsettingsmanager.h> 
-
 
 const char *gBigClockInterfaceName = "com.nokia.screensaver.ISnsrBigClockScreensaver";
 
@@ -43,6 +41,8 @@
 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,7 +52,10 @@
     \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), 
+        m_setManager(0)
 {
     qDebug("SnsrDeviceDialog::SnsrDeviceDialog()");
 
@@ -76,6 +79,10 @@
         SLOT(changeView(QGraphicsWidget*)));
     connect(mScreensaver, SIGNAL(faulted()),
         SLOT(screensaverFaulted()));
+    connect( mScreensaver, SIGNAL(unlockRequested()),
+        SLOT(requestUnlock()) );
+    connect( mScreensaver, SIGNAL(screenPowerModeRequested(Screensaver::ScreenPowerMode)),
+        SLOT(requestScreenMode(Screensaver::ScreenPowerMode)) );
     
     mScreensaver->initialize();
 
@@ -83,10 +90,10 @@
 
     setDismissPolicy(HbPopup::NoDismiss);
     setTimeout(HbPopup::NoTimeout);
+    
+    mainWindow()->setAutomaticOrientationEffectEnabled(false);
 
     setDeviceDialogParameters( parameters );
-    
-    connect( mScreensaver, SIGNAL(unlockRequested()), SLOT(requestUnlock()) );
 }
 
 /*!
@@ -123,18 +130,19 @@
         
     // Check initial view from repository
     if (viewType == ViewTypeInitial ) {
-    XQSettingsManager::Error error;
+        XQSettingsManager::Error error;
         int startupView = 0; 
-        XQSettingsKey settingsKey( XQSettingsKey::TargetCentralRepository, 
+        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).toUInt();
+        if (m_setManager) {
+            startupView = m_setManager->readItemValue(settingsKey, XQSettingsManager::TypeInt).toInt();
             error = m_setManager->error();
-            if (error == XQSettingsManager::NoError)
+            if (error == XQSettingsManager::NoError) {
                 viewType = startupView;
+            }
             delete m_setManager;
-         }
+        }
     }
 
     switch (viewType) {
@@ -253,11 +261,17 @@
     
     if (mLayout->count()) {
         mLayout->removeAt(0);
-    }    
+    }
     if (widget) {
         widget->show();
         mLayout->addItem(widget);
+
+        if ( isVisible() ) {
+           changeLayout( mainWindow()->orientation() );
+        }
     }
+    
+
 }
 
 /*!
@@ -280,6 +294,10 @@
     QRectF rect = mainWindow()->layoutRect();
     setMinimumSize( rect.size() );
     setPreferredPos( QPointF(0,0) );
+    QGraphicsSceneResizeEvent sceneResize;
+    sceneResize.setNewSize( rect.size() );
+    event( &sceneResize );
+    mScreensaver->updateLayout();
 }
 
 /*!
@@ -291,6 +309,37 @@
     data.insert(dataKeyUnlock, 1);
     emit deviceDialogData(data);
 }
+
+/*!
+    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.

--- a/screensaver/devicedialogplugins/snsrdevicedialogplugin/src/snsrdevicedialogplugin.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/devicedialogplugins/snsrdevicedialogplugin/src/snsrdevicedialogplugin.cpp	Wed Aug 18 09:40:07 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"
@@ -122,7 +122,7 @@
     Q_UNUSED(deviceDialogType)
 
     info->group = SecurityGroup;
-    info->flags = NoDeviceDialogFlags;
+    info->flags = ReceiveIndicatorStatus;
     info->priority = DefaultPriority;
 
     return true;

--- a/screensaver/eabi/screensavermodelu.def	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/eabi/screensavermodelu.def	Wed Aug 18 09:40:07 2010 +0300
@@ -53,4 +53,5 @@
 	_ZN11Screensaver26handleDeactivatedIndicatorEP20HbIndicatorInterface @ 52 NONAME
 	_ZN11Screensaver26onHandleActivatedIndicatorEP20HbIndicatorInterface @ 53 NONAME
 	_ZN11Screensaver28onHandleDeactivatedIndicatorEP20HbIndicatorInterface @ 54 NONAME
+	_ZN11Screensaver24screenPowerModeRequestedENS_15ScreenPowerModeE @ 55 NONAME

--- a/screensaver/screensavermodel/inc/screensaver.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/screensavermodel/inc/screensaver.h	Wed Aug 18 09:40:07 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"
@@ -42,10 +42,20 @@
 
 public:
 
+    Q_ENUMS(ScreenPowerMode)
+    
+    enum ScreenPowerMode {
+        ScreenModeOff = 0,
+        ScreenModeLowPower,
+        ScreenModeFullPower
+    };
+    
     Screensaver(QObject *parent = 0);
     virtual ~Screensaver();
 
     ScreensaverState currentState();
+    virtual void getActiveScreenRows(int *firstActiveRow, int *lastActiveRow) = 0;
+    virtual void updateLayout() = 0;
 
 public slots:
 
@@ -80,6 +90,7 @@
     void faulted();
     void viewChanged(QGraphicsWidget *widget);
     void unlockRequested();
+    void screenPowerModeRequested(Screensaver::ScreenPowerMode mode);
 
 private:

--- a/screensaver/screensavermodel/src/screensaver.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/screensavermodel/src/screensaver.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -108,6 +108,19 @@
  */
 
 /*!
+    \fn void Screensaver::unlockRequested()
+
+    This signal is emitted if screensaver wants the device to be unlocked.
+ */
+
+/*!
+    \fn void Screensaver::screenPowerModeRequested(ScreenPowerMode mode)
+
+    This signal is emitted when screensaver wants to switch the power
+    mode of the screen, or update the visible area in power save mode.
+ */
+
+/*!
     Returns the state that the Screensaver is currently in.
     \return The current state.
  */
@@ -117,6 +130,26 @@
 }
 
 /*!
+    \fn virtual void getActiveScreenRows(int *firstActiveRow, int *lastActiveRow) = 0
+
+    Inherited screensavers must implement this function to return the rows where 
+    the screensaver wants to draw graphics. This is called when screen is set to the
+    power save mode. The values returned do not matter in case the screensaver doesn't
+    ask for power save mode.
+    Note that the returned rows should reflect the rows in the natural orientation
+    of the screen device. That is, if default orientation of the screen is portrait,
+    then the return value in landscape mode must reflect the columns between which
+    the graphics are drawn.
+ */
+
+/*!
+    \fn virtual void updateLayout() = 0
+
+    Inherited screensavers must implement this function to reload the screen layout
+    for the current screen orientation.
+ */
+
+/*!
     Initializes the Screensaver
  */
 void Screensaver::initialize()

--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/inc/snsranalogclockcontainer.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/inc/snsranalogclockcontainer.h	Wed Aug 18 09:40:07 2010 +0300
@@ -22,7 +22,7 @@
 
 SCREENSAVER_TEST_CLASS(T_SnsrBigClockScreensaverPlugin)
 
-class HbLabel;
+class SnsrLabel;
 class SnsrAnalogClockWidget;
 class SnsrSwipeWidget;
 
@@ -38,15 +38,18 @@
 public slots:
 
     virtual void update();
-    virtual void changeLayout(Qt::Orientation orientation);
 
 public: // from base classes
 
     virtual int updateIntervalInMilliseconds();
 
+protected: // from base classes
+
+    virtual void loadWidgets();
+
 private: // data
 
-    HbLabel *mDateLabel;
+    SnsrLabel *mDateLabel;
     SnsrAnalogClockWidget *mAnalogClockWidget;
     SnsrSwipeWidget *mSwipeWidget;

--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/inc/snsrbigclockcontainer.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/inc/snsrbigclockcontainer.h	Wed Aug 18 09:40:07 2010 +0300
@@ -42,22 +42,26 @@
 public slots:
 
     virtual void update() = 0;
-    virtual void changeLayout(Qt::Orientation orientation) = 0;
+    virtual void changeLayout(Qt::Orientation orientation);
     
 public:
     
+    void setIndicatorModel(SnsrIndicatorModel &model);
+    virtual void getActiveScreenRows(int *firstActiveRow, int *lastActiveRow);
+    virtual bool isOrientationLocked();
     virtual int updateIntervalInMilliseconds() = 0;
-    void initIndicators(SnsrIndicatorModel &model);
 
 protected:
 
+    virtual void loadWidgets() = 0;
     virtual void changeEvent(QEvent * event);
     QPointF randomPosition(const QRectF &rect);
     QPointF nextRandomPosition(const QPointF &curPos, QPointF &destPos, const QRectF &containerRect);
-
+    void initIndicatorWidget();
+    void resetIndicatorConnections();
+    
 private:
 
-    void resetIndicatorConnections();
     void setBackgroundColor(); 
     void paint(
             QPainter *painter,
@@ -68,6 +72,7 @@
 signals:
 
     void unlockRequested();
+    void activeAreaMoved();
 
 protected:

--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/inc/snsrbigclockscreensaver.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/inc/snsrbigclockscreensaver.h	Wed Aug 18 09:40:07 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"
@@ -28,6 +28,7 @@
 class HbMainWindow;
 class SnsrBigClockContainer;
 class SnsrIndicatorModel;
+class XQSettingsManager;
 
 class SnsrBigClockScreensaver : public Screensaver
 {
@@ -60,7 +61,12 @@
     virtual void onHandleActiveIndicators(const QList<HbIndicatorInterface*> &activeIndicators);
     virtual void onHandleActivatedIndicator(HbIndicatorInterface *activatedIndicator);
     virtual void onHandleDeactivatedIndicator(HbIndicatorInterface *deactivatedIndicator);
+    virtual void getActiveScreenRows(int *firstActiveRow, int *lastActiveRow);
+    virtual void updateLayout();
 
+private slots:
+
+    void updateActiveAreaForLowPower();
 
 private:
 
@@ -68,7 +74,8 @@
     HbMainWindow *mMainWindow;
     SnsrBigClockContainer *mCurrentContainer;
     SnsrIndicatorModel *mIndicatorModel;
-    
+    XQSettingsManager *m_setManager;
+
     SCREENSAVER_TEST_FRIEND_CLASS(T_SnsrBigClockScreensaverPlugin)
 
 };

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/inc/snsrblankcontainer.h	Wed Aug 18 09:40:07 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:  Container for blank screen.
+*
+*/
+
+#ifndef SNSRBLANKCONTAINER_H
+#define SNSRBLANKCONTAINER_H
+
+#include "snsrbigclockcontainer.h"
+
+//SCREENSAVER_TEST_CLASS(T_SnsrBigClockScreensaverPlugin)
+
+class SnsrBlankContainer : public SnsrBigClockContainer
+{
+    Q_OBJECT
+
+public:
+
+    SnsrBlankContainer();
+    ~SnsrBlankContainer();
+
+public slots:
+
+    virtual void update();
+
+public: // from base classes
+
+    virtual int updateIntervalInMilliseconds();
+
+protected: // from base classes
+
+    virtual void loadWidgets();
+
+private:
+
+//    SCREENSAVER_TEST_FRIEND_CLASS(T_SnsrBigClockScreensaverPlugin)
+};
+
+#endif // SNSRBLANKCONTAINER_H

--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/inc/snsrdigitalclockcontainer.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/inc/snsrdigitalclockcontainer.h	Wed Aug 18 09:40:07 2010 +0300
@@ -22,7 +22,7 @@
 
 SCREENSAVER_TEST_CLASS(T_SnsrBigClockScreensaverPlugin)
 
-class HbLabel;
+class SnsrLabel;
 class SnsrSwipeWidget;
 
 class SnsrDigitalClockContainer : public SnsrBigClockContainer
@@ -37,17 +37,20 @@
 public slots:
 
     virtual void update();
-    virtual void changeLayout(Qt::Orientation orientation);
 
 public: // from base classes
 
     virtual int updateIntervalInMilliseconds();
 
+protected: // from base classes
+
+    virtual void loadWidgets();
+
 private: // data
 
-    HbLabel *mTimeLabel;
-    HbLabel *mAmPmLabel;
-    HbLabel *mDateLabel;
+    SnsrLabel *mTimeLabel;
+    SnsrLabel *mAmPmLabel;
+    SnsrLabel *mDateLabel;
     SnsrSwipeWidget *mSwipeWidget;
 
     SCREENSAVER_TEST_FRIEND_CLASS(T_SnsrBigClockScreensaverPlugin)

--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/inc/snsroledanalogclockcontainer.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/inc/snsroledanalogclockcontainer.h	Wed Aug 18 09:40:07 2010 +0300
@@ -23,7 +23,7 @@
 SCREENSAVER_TEST_CLASS(T_SnsrBigClockScreensaverPlugin)
 
 class SnsrOledClockWidget;
-class HbLabel;
+class SnsrLabel;
 
 class SnsrOledAnalogClockContainer : public SnsrBigClockContainer
 {
@@ -37,19 +37,24 @@
 public slots:
 
     virtual void update();
-    virtual void changeLayout(Qt::Orientation orientation);
     void updatePosition();
 
 public: // from base classes
 
     virtual int updateIntervalInMilliseconds();
+    virtual void getActiveScreenRows(int *firstActiveRow, int *lastActiveRow);
+    virtual bool isOrientationLocked();
+
+protected: // from base classes
+
+    virtual void loadWidgets();
 
 private:
 
     QGraphicsWidget *mClockContainer;
     
     SnsrOledClockWidget *mOledClockWidget;
-    HbLabel *mDateLabel;
+    SnsrLabel *mDateLabel;
     
     QPointF mDestPosition;
     bool mInitialize;

--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/inc/snsroleddigitalclockcontainer.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/inc/snsroleddigitalclockcontainer.h	Wed Aug 18 09:40:07 2010 +0300
@@ -20,9 +20,11 @@
 
 #include "snsrbigclockcontainer.h"
 
+
 SCREENSAVER_TEST_CLASS(T_SnsrBigClockScreensaverPlugin)
 
-class HbLabel;
+class SnsrLabel;
+class SnsrOledTimeLabel;
 
 class SnsrOledDigitalClockContainer : public SnsrBigClockContainer
 {
@@ -36,21 +38,26 @@
 public slots:
 
     virtual void update();
-    virtual void changeLayout(Qt::Orientation orientation);
     void updatePosition();
 
 public: // from base classes
 
     virtual int updateIntervalInMilliseconds();
+    virtual void getActiveScreenRows(int *firstActiveRow, int *lastActiveRow);
+    virtual bool isOrientationLocked();
+    
+protected: // from base classes
+
+    virtual void loadWidgets();
 
 private:
 
     QGraphicsWidget *mClockContainer;
 
-    HbLabel *mTimeLabel;
-    HbLabel *mDateLabel;
-    HbLabel *mAmPmLabel;
-
+    SnsrLabel *mAmPmLabel;
+    SnsrOledTimeLabel *mTimeLabel;
+    SnsrLabel *mDateLabel;
+    
     QPointF mDestPosition;
     bool mInitialize;

--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaveranalog.docml	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaveranalog.docml	Wed Aug 18 09:40:07 2010 +0300
@@ -10,16 +10,16 @@
             </widget>
             <widget name="indicatorWidget" type="SnsrIndicatorWidget">
                 <sizehint height="2.5un" type="PREFERRED"/>
-                <sizehint width="0" type="MINIMUM"/>
+                <sizehint width="2.5un" type="MINIMUM"/>
                 <sizepolicy horizontalPolicy="Expanding" verticalPolicy="Preferred"/>
                 <real name="z" value="2"/>
             </widget>
             <widget name="dateLabel" type="SnsrLabel">
                 <real name="z" value="3"/>
                 <sizepolicy horizontalPolicy="Expanding" verticalPolicy="Preferred"/>
-                <sizehint height="5.8209un" type="PREFERRED"/>
-                <sizehint width="0un" type="MINIMUM"/>
-                <fontspec name="fontSpec" role="Secondary" textheight="30"/>
+                <sizehint height="var(hb-param-text-height-tiny)" type="PREFERRED"/>
+                <sizehint width="1.0un" type="MINIMUM"/>
+                <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-tiny)"/>
                 <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
             </widget>
             <layout type="anchor">

--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaverdigital.docml	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaverdigital.docml	Wed Aug 18 09:40:07 2010 +0300
@@ -3,9 +3,9 @@
     <widget name="view" type="HbView">
         <widget name="mainContainer" role="HbView:widget" type="HbWidget">
             <sizehint height="var(hb-param-screen-height)" type="PREFERRED" width="var(hb-param-screen-width)"/>
-            <contentsmargins bottom="var(hb-param-margin-gene-screen)" left="var(hb-param-margin-gene-screen)" right="var(hb-param-margin-gene-screen)" top="var(hb-param-margin-gene-screen)"/>
+            <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="amPmLabel" type="SnsrLabel">
-                <sizehint type="MINIMUM" width="0"/>
+                <sizehint type="MINIMUM" width="1.0un"/>
                 <sizehint height="var(hb-param-text-height-primary)" type="PREFERRED"/>
                 <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
                 <real name="z" value="1"/>
@@ -13,7 +13,7 @@
                 <string name="alignment" value="AlignVCenter|AlignLeft"/>
              </widget>
             <widget name="timeLabel" type="SnsrLabel">
-                <sizehint type="MINIMUM" width="0un"/>
+                <sizehint type="MINIMUM" width="1.0un"/>
                 <sizehint height="14.7un" type="PREFERRED"/>
                 <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
                 <real name="z" value="2"/>
@@ -21,13 +21,13 @@
                 <string name="alignment" value="AlignVCenter|AlignHCenter"/>
              </widget>
              <widget name="indicatorWidget" type="SnsrIndicatorWidget">
-                <sizehint type="MINIMUM" width="0"/>
+                <sizehint type="MINIMUM" width="2.5un"/>
                 <sizehint height="2.5un" type="PREFERRED"/>
                 <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
                 <real name="z" value="3"/>
               </widget>
               <widget name="dateLabel" type="SnsrLabel">
-                <sizehint type="MINIMUM" width="0"/>
+                <sizehint type="MINIMUM" width="1.0un"/>
                 <sizehint height="var(hb-param-text-height-tiny)" type="PREFERRED"/>
                 <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
                 <real name="z" value="4"/>
@@ -35,7 +35,7 @@
                 <string name="alignment" value="AlignVCenter|AlignHCenter"/>
              </widget>
              <layout type="anchor">
-                <anchoritem dst="amPmLabel" dstEdge="BOTTOM" spacing="1.0un" src="timeLabel" srcEdge="TOP"/>
+                <anchoritem dst="amPmLabel" dstEdge="BOTTOM" spacing="-0.5un" src="timeLabel" srcEdge="TOP"/>
                 <anchoritem dst="amPmLabel" dstEdge="LEFT" spacing="0" src="timeLabel" srcEdge="LEFT"/>
                 <anchoritem dst="timeLabel" dstEdge="TOP" spacing="26.4un" src="" srcEdge="TOP"/>
                 <anchoritem dst="timeLabel" dstEdge="CENTERH" spacing="0" src="" srcEdge="CENTERH"/>
@@ -45,12 +45,14 @@
                 <anchoritem dst="dateLabel" dstEdge="CENTERH" spacing="0" src="timeLabel" srcEdge="CENTERH"/>
             </layout>
         </widget>
-        <string name="title" value=""/>
+        <string name="title" value="View"/>
     </widget>
     <section name="landscape">
-        <widget name="mainContainer" type="HbWidget">
+        <widget name="mainContainer" role="HbView:widget" type="HbWidget">
+            <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)"/>
             <layout type="anchor">
-                <anchoritem dst="amPmLabel" dstEdge="BOTTOM" spacing="1.0un" src="timeLabel" srcEdge="TOP"/>
+                <anchoritem dst="amPmLabel" dstEdge="BOTTOM" spacing="-0.5un" src="timeLabel" srcEdge="TOP"/>
                 <anchoritem dst="amPmLabel" dstEdge="LEFT" spacing="0" src="timeLabel" srcEdge="LEFT"/>
                 <anchoritem dst="timeLabel" dstEdge="TOP" spacing="17.3un" src="" srcEdge="TOP"/>
                 <anchoritem dst="timeLabel" dstEdge="CENTERH" spacing="0" src="" srcEdge="CENTERH"/>

--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaveroledanalog.docml	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaveroledanalog.docml	Wed Aug 18 09:40:07 2010 +0300
@@ -2,15 +2,17 @@
 <hbdocument version="0.9">
     <widget name="view" type="HbView">
         <widget name="mainContainer" role="HbView:widget" type="HbWidget">
+            <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="49.5un" type="PREFERRED" width="45un"/>
+                <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"/>
                 <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="0" type="MINIMUM"/>
+                    <sizehint width="2.5un" type="MINIMUM"/>
                     <sizepolicy horizontalPolicy="Expanding" verticalPolicy="Preferred"/>
                     <real name="z" value="2"/>
                 </widget>
@@ -18,7 +20,7 @@
                     <real name="z" value="3"/>
                     <sizepolicy horizontalPolicy="Expanding" verticalPolicy="Preferred"/>
                     <sizehint height="var(hb-param-text-height-tiny)" type="PREFERRED"/>
-                    <sizehint width="0un" type="MINIMUM"/>
+                    <sizehint width="1.0un" type="MINIMUM"/>
                     <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-tiny)"/>
                     <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
                 </widget>
@@ -33,14 +35,22 @@
             </widget>
             <layout type="anchor">
                 <anchoritem dst="clockContainer" dstEdge="CENTERH" spacing="0" src="" srcEdge="CENTERH"/>
-                <anchoritem dst="clockContainer" dstEdge="CENTERV" spacing="0" src="" srcEdge="CENTERV"/>
+                <anchoritem dst="clockContainer" dstEdge="TOP" spacing="22un" src="" srcEdge="TOP"/>
             </layout>
         </widget>
         <string name="title" value="View"/>
     </widget>
     <section name="landscape">
+        <widget name="mainContainer" role="HbView:widget" type="HbWidget">
+            <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)"/>
+            <layout type="anchor">
+                <anchoritem dst="clockContainer" dstEdge="CENTERH" spacing="0" src="" srcEdge="CENTERH"/>
+                <anchoritem dst="clockContainer" dstEdge="TOP" spacing="3.3un" src="" srcEdge="TOP"/>
+            </layout>
+        </widget>
     </section>
-    <metadata activeUIState="landscape" display="NHD portrait" unit="un">
+    <metadata activeUIState="Common ui state" display="NHD portrait" unit="un">
         <uistate name="Common ui state" sections="#common"/>
         <uistate name="landscape" sections="#common landscape"/>
     </metadata>

--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaveroleddigital.docml	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaveroleddigital.docml	Wed Aug 18 09:40:07 2010 +0300
@@ -2,18 +2,21 @@
 <hbdocument version="0.9">
     <widget name="view" type="HbView">
         <widget name="mainContainer" role="HbView:widget" type="HbWidget">
-        <sizehint height="var(hb-param-screen-height)" type="PREFERRED" width="var(hb-param-screen-width)"/>
+            <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"/>
+                <real name="z" value="1"/>
                 <widget name="amPmLabel" type="SnsrLabel">
-                    <sizehint type="MINIMUM" width="0"/>
+                    <sizehint type="MINIMUM" width="1.0un"/>
                     <sizehint height="var(hb-param-text-height-primary)" type="PREFERRED"/>
                     <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
                     <real name="z" value="1"/>
                     <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-primary)"/>
                     <string name="alignment" value="AlignVCenter|AlignLeft"/>
                 </widget>
-                <widget name="timeLabel" type="SnsrLabel">
-                    <sizehint type="MINIMUM" width="0un"/>
+                <widget name="oledTimeLabel" type="SnsrOledTimeLabel">
+                    <sizehint type="MINIMUM" width="1.0un"/>
                     <sizehint height="14.7un" type="PREFERRED"/>
                     <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
                     <real name="z" value="2"/>
@@ -21,40 +24,47 @@
                     <string name="alignment" value="AlignVCenter|AlignHCenter"/>
                 </widget>
                 <widget name="indicatorWidget" type="SnsrIndicatorWidget">
-                    <sizehint type="MINIMUM" width="0"/>
+                    <sizehint type="MINIMUM" width="2.5un"/>
                     <sizehint height="2.5un" type="PREFERRED"/>
                     <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
                     <real name="z" value="3"/>
                 </widget>
                 <widget name="dateLabel" type="SnsrLabel">
-                    <sizehint type="MINIMUM" width="0"/>
+                    <sizehint type="MINIMUM" width="1.0un"/>
                     <sizehint height="var(hb-param-text-height-tiny)" type="PREFERRED"/>
                     <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
                     <real name="z" value="4"/>
                     <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-tiny)"/>
                     <string name="alignment" value="AlignVCenter|AlignHCenter"/>
                 </widget>
-                <sizehint height="expr(var(hb-param-text-height-primary)+(1.0un)+(14.7un)+var(hb-param-margin-gene-top)+(2.5un)+var(hb-param-margin-gene-bottom)+var(hb-param-text-height-tiny))" type="PREFERRED" width="45un"/>
-                <real name="z" value="1"/>
                 <layout type="anchor">
                     <anchoritem dst="amPmLabel" dstEdge="TOP" spacing="0" src="" srcEdge="TOP"/>
-                    <anchoritem dst="amPmLabel" dstEdge="LEFT" spacing="0" src="timeLabel" srcEdge="LEFT"/>
-                    <anchoritem dst="timeLabel" dstEdge="TOP" spacing="1.0un" src="amPmLabel" srcEdge="BOTTOM"/>
-                    <anchoritem dst="timeLabel" dstEdge="CENTERH" spacing="0" src="" srcEdge="CENTERH"/>
-                    <anchoritem dst="indicatorWidget" dstEdge="TOP" spacing="var(hb-param-margin-gene-top)" src="timeLabel" srcEdge="BOTTOM"/>
-                    <anchoritem dst="indicatorWidget" dstEdge="CENTERH" spacing="0" src="timeLabel" srcEdge="CENTERH"/>
+                    <anchoritem dst="amPmLabel" dstEdge="LEFT" spacing="0" src="oledTimeLabel" srcEdge="LEFT"/>
+                    <anchoritem dst="oledTimeLabel" dstEdge="TOP" spacing="0.5un" src="amPmLabel" srcEdge="BOTTOM"/>
+                    <anchoritem dst="oledTimeLabel" dstEdge="CENTERH" spacing="0" src="" srcEdge="CENTERH"/>      
+                    <anchoritem dst="indicatorWidget" dstEdge="TOP" spacing="var(hb-param-margin-gene-top)" src="oledTimeLabel" srcEdge="BOTTOM"/>
+                    <anchoritem dst="indicatorWidget" dstEdge="CENTERH" spacing="0" src="oledTimeLabel" srcEdge="CENTERH"/>
                     <anchoritem dst="dateLabel" dstEdge="TOP" spacing="var(hb-param-margin-gene-bottom)" src="indicatorWidget" srcEdge="BOTTOM"/>
-                    <anchoritem dst="dateLabel" dstEdge="CENTERH" spacing="0" src="timeLabel" srcEdge="CENTERH"/>
+                    <anchoritem dst="dateLabel" dstEdge="CENTERH" spacing="0" src="oledTimeLabel" srcEdge="CENTERH"/>
                 </layout>
             </widget>
             <layout type="anchor">
-                <anchoritem dst="clockContainer" dstEdge="TOP" spacing="1un" src="" srcEdge="TOP"/>
+                <anchoritem dst="clockContainer" dstEdge="TOP" spacing="expr((26.4un)-var(hb-param-text-height-primary)-(0.5un))" src="" srcEdge="TOP"/>
                 <anchoritem dst="clockContainer" dstEdge="CENTERH" spacing="0un" src="" srcEdge="CENTERH"/>
             </layout>
         </widget>
-        <string name="title" value=""/>
+        <string name="title" value="View"/>
     </widget>
-    <section name="landscape"/>
+    <section name="landscape">
+        <widget name="mainContainer" role="HbView:widget" type="HbWidget">
+            <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)"/>
+            <layout type="anchor">
+                <anchoritem dst="clockContainer" dstEdge="CENTERH" spacing="0" src="" srcEdge="CENTERH"/>
+                <anchoritem dst="clockContainer" dstEdge="TOP" spacing="expr((17.3un)-var(hb-param-text-height-primary)-(0.5un))" src="" srcEdge="TOP"/>
+            </layout>
+        </widget>
+    </section>
     <metadata activeUIState="Common ui state" display="NHD portrait" unit="un">
         <uistate name="Common ui state" sections="#common"/>
         <uistate name="landscape" sections="#common landscape"/>

--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/inc/snsranalogclockwidget.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/inc/snsranalogclockwidget.h	Wed Aug 18 09:40:07 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/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/inc/snsroledclockwidget.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/inc/snsroledclockwidget.h	Wed Aug 18 09:40:07 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"
@@ -53,6 +53,9 @@
     HbIconItem *mClockHourHand;
     HbIconItem *mClockMinuteHand;
     // TODO: not known yet what label (or any) is shown in clock face (day or am/pm or none)
+    // If some label will be put onto the clock face, then it's color must come
+    // from theme and is most propably different than SnsrLabel uses (=text/icon color
+    // used in screensaver in general
     //HbIconItem *mClockDateFrame;
     //SnsrLabel *mClockDateLabel;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/inc/snsroledtimelabel.h	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,53 @@
+/*
+* 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: Time label for oled digital clock.
+*
+*/
+
+#ifndef SNSROLEDTIMELABEL_H
+#define SNSROLEDTIMELABEL_H
+
+#include <HbTextItem>
+#include "snsrtest_global.h"
+
+SCREENSAVER_TEST_CLASS(T_SnsrClockWidgets)
+
+class SnsrOledTimeLabel : public HbTextItem
+{
+    Q_OBJECT
+
+    Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment)
+    
+public:
+    
+    SnsrOledTimeLabel(QGraphicsItem *parent = 0);
+    ~SnsrOledTimeLabel();
+    
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+
+protected:
+    
+    virtual void changeEvent(QEvent *event);
+
+private:
+
+    void setThemedTextColor();
+    
+private:
+        
+    Q_DISABLE_COPY(SnsrOledTimeLabel)
+    SCREENSAVER_TEST_FRIEND_CLASS(T_SnsrClockWidgets)
+};
+    
+#endif //  SNSROLEDTIMELABEL_H

--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/src/snsranalogclockwidget.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/src/snsranalogclockwidget.cpp	Wed Aug 18 09:40:07 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/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/src/snsroledclockwidget.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/src/snsroledclockwidget.cpp	Wed Aug 18 09:40:07 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"
@@ -131,9 +131,12 @@
     Q_ASSERT( mClockHourHand && mClockMinuteHand /*&& mClockDateLabel */);
     
     // Calculate angles for clock hands.
+    // Use granularity of one minute so that minute hand is always exactly
+    // on some minute and not between minutes. OLED clock is not updated more
+    // frequently than once per minute and using finer granularity would cause
+    // the minute hand to be always between even minutes.
     QTime time = QTime::currentTime();
-    qreal s = 6 * time.second();
-    qreal m = 6 * (time.minute() + s/360);
+    qreal m = 6 * time.minute();
     qreal h = 30 * ((time.hour() % 12) + m/360);
     
     int x = mClockHourHand->preferredSize().width()/2;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/src/snsroledtimelabel.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,141 @@
+/*
+* 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: Time label for oled digital clock.
+*
+*/
+
+#include "snsroledtimelabel.h"
+
+#include <hbevent.h>
+#include <hbcolorscheme.h>
+#include <QPainter>
+
+
+const QString snsrForegroundColorRole("snsrforeground");
+
+/*!
+    \class SnsrOledTimeLabel
+    \ingroup group_snsrbigclockscreensaverprovider
+    \brief Screensaver oled digital clock's time label
+ */
+
+/*!
+    Constructs a new SnsrOledTimeLabel.
+    \param parent Parent object.
+ */
+
+SnsrOledTimeLabel::SnsrOledTimeLabel(QGraphicsItem *parent)
+    : HbTextItem(parent)
+{
+    setThemedTextColor();
+    
+    setMinimumLines( 1 );
+    setMaximumLines( 1 );
+    setAlignment(Qt::AlignCenter);
+    
+    // as we do own painting, must disable the flag that is enabled
+    // by default due to performance optimatizations.
+    setFlag(QGraphicsItem::ItemHasNoContents,false);
+}
+
+SnsrOledTimeLabel::~SnsrOledTimeLabel()
+{
+}
+
+/*!
+    \reimp
+    We want to draw only the outlines of the time label text and thus
+    text is drawn here with QPainterPath and pen (no brush) which seems to be the
+    only way to accomplish this. 
+    Base class's Paint method must not be called!
+    We use base class only to get the bounding rect inside which to draw the text
+    (boundingRect has been adjusted to current text, font, alignment etc.)
+ */
+void SnsrOledTimeLabel::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+    
+    // TODO: changes needed for mirrored layout and/or other than latin digits??
+    
+    painter->save();   //saves the painter state.
+    
+    QPainterPath path;
+    
+    QRectF boundingRect = this->boundingRect();   
+    QString timeText = this->text();
+    QFont font = this->font();
+
+    // As painterPath takes the left end of the text's baseline as 
+    // a parameter we must calculate that point from boundingRect's bottom left 
+    // so that font's descent (and baseline (=1)) are taken into account. 
+    // We want to center the text horizontally too. The logic
+    // is basically the same as used inside the base class for drawing the text
+    // within boundingRect.
+    QPointF leftEndOfBaseline(0,0);  // for painterPath
+    QFontMetrics fontMetrics(font);
+    int descent = fontMetrics.descent();
+    int width = fontMetrics.width(timeText);   
+    leftEndOfBaseline.setY(boundingRect.bottomLeft().y() - descent -1);
+    leftEndOfBaseline.setX((boundingRect.width() - width) / 2 ); // centerH
+    
+    path.addText(leftEndOfBaseline, font, timeText);  
+    
+    painter->setFont(font);
+
+    QPen newPen = painter->pen();
+    newPen.setWidth( 1 ); // TODO: is this width ok?
+    newPen.setColor(this->textColor());
+    painter->setPen(newPen);
+    
+    painter->setBrush(QBrush(Qt::NoBrush));
+
+  //  painter->setLayoutDirection ( layoutDirection() ); // TODO: needed or not?
+    
+    painter->setRenderHint(QPainter::Antialiasing, true); // TODO: use or not?
+    
+    painter->drawPath(path);
+    
+    // Must restore the painter or the whole UI will be messed up!
+    painter->restore();
+
+}
+
+/*!
+    \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/snsrindicatormodel.h	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/inc/snsrindicatormodel.h	Wed Aug 18 09:40:07 2010 +0300
@@ -42,6 +42,8 @@
     void handleActivatedIndicator(HbIndicatorInterface *activatedIndicator);
     void handleDeactivatedIndicator(HbIndicatorInterface *deactivatedIndicator);
     
+    void handleUpdatedIndicator();
+    
     void initializeIndicatorWidget();
 
     /*
@@ -53,15 +55,18 @@
 
     void indicatorsUpdated(const QList<SnsrIndicatorInfo> &activeIndicators);
     void allIndicatorsDeactivated();
-   
+
 private:
 
-    void addIndicator(const SnsrIndicatorInfo &indicatorInfo);
-
+    bool addIndicator(const SnsrIndicatorInfo &indicatorInfo);
+    bool isIndicatorAlreadyAdded(const SnsrIndicatorInfo &indicatorInfo) const;
+    
     bool findAndRemoveIndicator(const SnsrIndicatorInfo &indicatorInfo);
-    
+   
     bool showIndicatorInScreensaver(const HbIndicatorInterface &indicatorInterface,
                                     SnsrIndicatorInfo &indicatorInfo);
+    
+    void connectToIndicatorsUpdateSignal(const HbIndicatorInterface &indicatorInterface);
 
     bool anyActiveIndicators() const;

--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/resource/snsrindicatorwidget.widgetml	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/resource/snsrindicatorwidget.widgetml	Wed Aug 18 09:40:07 2010 +0300
@@ -1,16 +1,16 @@
 <hbwidget version="0.1">
   <layout name="indicatorlayout" type="mesh">
-    <meshitem src="icon1" srcEdge="TOP" dst="" dstEdge="TOP" />
+    <meshitem src="icon1" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
     <meshitem src="icon1" srcEdge="LEFT" dst="" dstEdge="LEFT" />   
-    <meshitem src="icon2" srcEdge="TOP" dst="" dstEdge="TOP" />
+    <meshitem src="icon2" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
     <meshitem src="icon2" srcEdge="LEFT" dst="icon1" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-middle-horizontal)" />   
-    <meshitem src="icon3" srcEdge="TOP" dst="" dstEdge="TOP" />
+    <meshitem src="icon3" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
     <meshitem src="icon3" srcEdge="LEFT" dst="icon2" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-middle-horizontal)" />   
-    <meshitem src="icon4" srcEdge="TOP" dst="" dstEdge="TOP" />
+    <meshitem src="icon4" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
     <meshitem src="icon4" srcEdge="LEFT" dst="icon3" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-middle-horizontal)" />   
-    <meshitem src="icon5" srcEdge="TOP" dst="" dstEdge="TOP" />
+    <meshitem src="icon5" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
     <meshitem src="icon5" srcEdge="LEFT" dst="icon4" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-middle-horizontal)" />
-    <meshitem src="icon6" srcEdge="TOP" dst="" dstEdge="TOP" />
+    <meshitem src="icon6" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
     <meshitem src="icon6" srcEdge="LEFT" dst="icon5" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-middle-horizontal)" />
   </layout>  
 </hbwidget>
\ No newline at end of file

--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/src/snsrindicatormodel.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/src/snsrindicatormodel.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -29,10 +29,10 @@
     \brief Model for handling indicator data.
  */
 
-// TODO: what is the type string of silent indicator? couldn't
+// TODO: what is the final type string of silent indicator? couldn't
 // find it in wk22 -> workaround solution: assume that it contains
-// substring "silent"
-const char *gSilentIndicatorTypeString = "silent";
+// substring "silence" like in their demo app.
+const char *gSilentIndicatorTypeString = "silence";
 const char *gOfflineIndicatorTypeString = "offline";
 
 
@@ -80,6 +80,7 @@
         if (activatedIndicator 
             && showIndicatorInScreensaver(*activatedIndicator,indicatorInfo)) {
             addIndicator(indicatorInfo);
+            connectToIndicatorsUpdateSignal(*activatedIndicator);
             addedAny = true;
         }
     }
@@ -89,12 +90,6 @@
     if (addedAny) {
         emitChangeSignal();
     }
-    
-    // TODO: no we need to listen to update signals?
-    // used for changing icon?
-    /* //connect indicator's update signal
-     QObject::connect(activatedIndicator, SIGNAL(dataChanged()),
-                      this, SLOT(indicatorUpdated()));*/
 }
 
 /*!
@@ -107,8 +102,10 @@
     SnsrIndicatorInfo indicatorInfo;
     if (activatedIndicator
         && showIndicatorInScreensaver(*activatedIndicator,indicatorInfo)) {
-        addIndicator(indicatorInfo);
-        emitChangeSignal();
+        if (addIndicator(indicatorInfo)) {
+            connectToIndicatorsUpdateSignal(*activatedIndicator);
+            emitChangeSignal();
+        }
     }
 }
 
@@ -132,6 +129,35 @@
 }
 
 /*!
+    Called when some universal indicator updates its data by
+    emitting dataChanged signal. 
+    We listen to this signal because at least the silent indicator plugin demo 
+    uses this method to inform the clients when it gets deactivated/activated 
+    once it has been activated once by setting its icon path to empty/valid string.
+    Don't know if this is going to be the final solution as it's unconventional (?) 
+    but let's be prepared also to this kind of approach. 
+ */
+void SnsrIndicatorModel::handleUpdatedIndicator()
+{
+    HbIndicatorInterface* indicator =
+        qobject_cast<HbIndicatorInterface*>(sender());
+    if (!indicator) {
+        return;
+    }
+    
+    // If indicator's icon path was set to empty string, then treat it
+    // like it were deactivated. And if not empty, then it's active again.
+    if (indicator->indicatorData(
+            HbIndicatorInterface::MonoDecorationNameRole).toString().isEmpty()) {
+        handleDeactivatedIndicator(indicator);
+    }
+    else {
+        handleActivatedIndicator(indicator);
+    }
+    
+}
+
+/*!
     Sends a signal with a list of all currently active indicators.
     No signal is sent if there are no active indicators currently.
  */
@@ -175,24 +201,50 @@
     Add the indicator into this model. Handle here the order in which
     indicators are shown in screensaver: notification indicators should be
     shown in the same order as shown in statusbar, that is in reversed
-    chronological order. Silent indicator should always be the right-most.
+    chronological order. Silent indicator should always be the right-most one.
+    /retval true if indicator was added (not found already in the listings)
  */
-void SnsrIndicatorModel::addIndicator(const SnsrIndicatorInfo &indicatorInfo)
+bool SnsrIndicatorModel::addIndicator(const SnsrIndicatorInfo &indicatorInfo)
 {
-    // info from pattern library - todo: remove
-    //Indicators are displayed inside of each group in reversed chronological order 
-    // according to the arrival time; the indicator that appeared most recently is placed on top of the group.
+    // To be on the safe side, check that the indicator doesn't already
+    // exists in the active indicator listings.
+    bool added(false);
+    
+    // Use prepend to keep the list in reversed chronological order
+    if (indicatorInfo.category == HbIndicatorInterface::NotificationCategory
+        && !isIndicatorAlreadyAdded(indicatorInfo)) {
+        mNotificationIndicators.prepend(indicatorInfo);
+        added = true;
+    }
+    else if (indicatorInfo.category == HbIndicatorInterface::SettingCategory
+             && !isIndicatorAlreadyAdded(indicatorInfo)) {
+        mSettingIndicators.append(indicatorInfo);
+        added = true;
+    }
+    
+    return added;
+}
 
-    //Status bar indicators follow the same order; the most recent notification indicator (4) is on the left 
-    // and similarly the most recent settings indicator (5) is on the right.
-
-    // use prepend to keep the list in reversed chronological order
-    if (indicatorInfo.category == HbIndicatorInterface::NotificationCategory) {
-        mNotificationIndicators.prepend(indicatorInfo);
+/*!
+    Check whether the indicator is already added in the active 
+    indicator listing.
+    /retval true if indicator is already added; false if not.
+ */
+bool SnsrIndicatorModel::isIndicatorAlreadyAdded(const SnsrIndicatorInfo &indicatorInfo) const
+{
+    bool alreadyExits(false);
+    
+    const QList<SnsrIndicatorInfo> &indicatorList = 
+        indicatorInfo.category == HbIndicatorInterface::NotificationCategory 
+        ? mNotificationIndicators : mSettingIndicators;
+    
+    for (int i = 0; i < indicatorList.size(); ++i) {
+        if (indicatorList.at(i).type == indicatorInfo.type) {
+            alreadyExits = true;
+            break;
+        }
     }
-    else {
-        mSettingIndicators.append(indicatorInfo);
-    }
+    return alreadyExits;
 }
 
 /*!
@@ -254,7 +306,7 @@
              && !iconPath.isEmpty()
              // TODO: what is the type string of silent indicator? couldn't
              // find it in wk22 -> workaround solution: assume that it contains
-             // substring "silent"
+             // substring "silence" like in their demo app.
              // && type == gSilentIndicatorTypeString ) { 
              && typeString.contains(gSilentIndicatorTypeString, Qt::CaseInsensitive)) {  
         show = true;
@@ -272,6 +324,27 @@
 }
 
 /*!
+   Start listening to indicator's dataChanged signals.
+   /parameter indicator whose dataChanged signal we want to listen
+ */
+void SnsrIndicatorModel::connectToIndicatorsUpdateSignal(const HbIndicatorInterface &indicatorInterface)
+{
+    // Connect to silent indicator's dataChanged signal as it seems to 
+    // use unconventional method (demo at least) to inform when
+    // it's get deactivated/activated: dataChanged signal is emitted and
+    // icon path is set to empty string/valid string.
+    // It's assumed that we don't need to listen to other indicators
+    // as we are not interested e.g. when primary/secondary texts change etc.
+    
+    // NOTE: do NOT disconnect the indicator signal anywhere explicitly here
+    // or we won't get activation/deactivation messages.
+    if (indicatorInterface.indicatorType().contains(gSilentIndicatorTypeString, Qt::CaseInsensitive)) {
+        QObject::connect( &indicatorInterface, SIGNAL(dataChanged()),
+                          this, SLOT(handleUpdatedIndicator()));
+    }
+}
+
+/*!
    Check whether there is any active indicator currently.
    /retval true if there is at least one indicator to show
  */

--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsranalogclockcontainer.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsranalogclockcontainer.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -21,12 +21,13 @@
 #include <QTime>
 #include <QGraphicsLinearLayout>
 
-#include <hblabel.h>
-#include <hbextendedlocale.h>
+#include <HbExtendedLocale>
+#include <HbMainWindow>
 
 #include "snsranalogclockwidget.h"
 #include "snsrindicatorwidget.h"
 #include "snsrswipewidget.h"
+#include "snsrlabel.h"
 
 /*!
     \class SnsrAnalogClockContainer
@@ -61,41 +62,8 @@
     mDateLabel(0),
     mAnalogClockWidget(0)/*,
     mSwipeWidget(0)*/
-    {
+{
     SCREENSAVER_TEST_FUNC_ENTRY("SnsrAnalogClockContainer::SnsrAnalogClockContainer")
-
-    bool ok(true);
-
-    // load analog clock
-    qDebug() << gAnalogLayoutDocml;
-    mDocumentObjects = mDocumentLoader.load(gAnalogLayoutDocml, &ok);
-    Q_ASSERT_X(ok, gAnalogLayoutDocml, "Invalid DocML file.");
-    if (ok) {
-        mMainView = mDocumentLoader.findWidget(gMainViewName);
-        mDateLabel = qobject_cast<HbLabel *>(
-            mDocumentLoader.findWidget(gDateLabelName));
-        mAnalogClockWidget = qobject_cast<SnsrAnalogClockWidget *>(
-            mDocumentLoader.findWidget(gAnalogClockWidgetName));
-        mIndicatorWidget = qobject_cast<SnsrIndicatorWidget *>(
-            mDocumentLoader.findWidget(gIndicatorWidgetName));
-        //We don't implement swipe widget at this poin
-        /*mSwipeWidget = qobject_cast<SnsrSwipeWidget *>(
-            mDocumentLoader.findWidget(gSwipeWidgetName));*/
-        
-        Q_ASSERT_X(
-                mMainView && mDateLabel && mAnalogClockWidget &&
-                mIndicatorWidget /*&& mSwipeWidget*/,
-                gAnalogLayoutDocml, "Objects not found in DocML file."
-                );
-        
-        //connect( mSwipeWidget, SIGNAL(swipeDownDetected()), SIGNAL(unlockRequested()) );
-
-        mIndicatorWidget->setLayoutType(SnsrIndicatorWidget::IndicatorsCentered);
-        
-        mBackgroundContainerLayout->addItem(mMainView);
- //       mSwipeWidget->start();
-    }
-
     SCREENSAVER_TEST_FUNC_EXIT("SnsrAnalogClockContainer::SnsrAnalogClockContainer")
 }
 
@@ -104,6 +72,7 @@
  */
 SnsrAnalogClockContainer::~SnsrAnalogClockContainer()
 {
+    resetIndicatorConnections();
     //mDateLabel, mAnalogClockWidget - deleted by the parent
 }
 
@@ -131,43 +100,57 @@
     SCREENSAVER_TEST_FUNC_EXIT("SnsrAnalogClockContainer::update")
 }
 
-/*!
-    Changes screensaver layout basing on orientation changes.
-    \param orientation Current orientation.
- */
-void SnsrAnalogClockContainer::changeLayout(Qt::Orientation orientation)
-{
-    SCREENSAVER_TEST_FUNC_ENTRY("SnsrAnalogClockContainer::changeLayout")
-
-    bool ok(false);
-    if (mCurrentOrientation != orientation) {
-        mCurrentOrientation = orientation;
-
-        // hide controls to avoid screen flickering
-        mMainView->hide();
-
-        QString sectionToLoad("");
-        if (mCurrentOrientation == Qt::Horizontal) {
-            sectionToLoad = gLandscapeSectionName;
-        }
-        qDebug() << "loading: " << gAnalogLayoutDocml << ", section: " << sectionToLoad;
-        mDocumentLoader.load(gAnalogLayoutDocml, sectionToLoad, &ok);
-        // view is rebuilt and ready to show
-        update();
-        mMainView->show();
-        Q_ASSERT_X(ok, gAnalogLayoutDocml, "Invalid section in DocML file.");
-    }
-    // update anyway - this is needed in situations when screensaver goes to
-    // foreground but layout change did not occur
-    if (!ok) {
-        update();
-    }
-
-    SCREENSAVER_TEST_FUNC_EXIT("SnsrAnalogClockContainer::changeLayout")
-}
-
 int SnsrAnalogClockContainer::updateIntervalInMilliseconds()
 {
     return 1000;
 }
 
+void SnsrAnalogClockContainer::loadWidgets()
+{
+    bool ok(true);
+
+    // reset widget pointers, any previous widgets are already deleted by now
+    mMainView = 0;
+    mDateLabel = 0;
+    mAnalogClockWidget = 0;
+    mIndicatorWidget = 0;
+    
+    // load widgets from docml
+    qDebug() << gAnalogLayoutDocml;
+    mDocumentObjects = mDocumentLoader.load(gAnalogLayoutDocml, &ok);
+    Q_ASSERT_X(ok, gAnalogLayoutDocml, "Invalid DocML file.");
+    if (ok) {
+        mMainView = mDocumentLoader.findWidget(gMainViewName);
+        mDateLabel = qobject_cast<SnsrLabel *>(
+            mDocumentLoader.findWidget(gDateLabelName));
+        mAnalogClockWidget = qobject_cast<SnsrAnalogClockWidget *>(
+            mDocumentLoader.findWidget(gAnalogClockWidgetName));
+        mIndicatorWidget = qobject_cast<SnsrIndicatorWidget *>(
+            mDocumentLoader.findWidget(gIndicatorWidgetName));
+        //We don't implement swipe widget at this poin
+        /*mSwipeWidget = qobject_cast<SnsrSwipeWidget *>(
+            mDocumentLoader.findWidget(gSwipeWidgetName));*/
+        
+        Q_ASSERT_X(
+                mMainView && mDateLabel && mAnalogClockWidget &&
+                mIndicatorWidget /*&& mSwipeWidget*/,
+                gAnalogLayoutDocml, "Objects not found in DocML file."
+                );
+        
+        // In case of landscape layout, read also the landscape delta section
+        if ( mCurrentOrientation == Qt::Horizontal ) {
+            qDebug() << "loading: " << gAnalogLayoutDocml << ", section: " << gLandscapeSectionName;
+            mDocumentLoader.load(gAnalogLayoutDocml, gLandscapeSectionName, &ok);
+            Q_ASSERT_X(ok, gAnalogLayoutDocml, "Invalid section in DocML file.");
+        }
+
+        initIndicatorWidget();
+        mIndicatorWidget->setLayoutType(SnsrIndicatorWidget::IndicatorsCentered);
+        
+        mBackgroundContainerLayout->addItem(mMainView);
+
+        //connect( mSwipeWidget, SIGNAL(swipeDownDetected()), SIGNAL(unlockRequested()) );
+        //mSwipeWidget->start();
+    }
+}
+

--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrbigclockcontainer.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrbigclockcontainer.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -22,11 +22,9 @@
 #include <QTime>
 #include <QGraphicsLinearLayout>
 
-#include <hblabel.h>
-#include <hbevent.h>
-#include <hbcolorscheme.h>
-
-#include <qsysteminfo.h>
+#include <HbEvent>
+#include <HbColorScheme>
+#include <HbMainWindow>
 
 #include "snsrbigclockcontainer.h"
 #include "snsrindicatorwidget.h"
@@ -41,7 +39,6 @@
 const QString snsrBackgroundColorRole("snsrbackground");
 const int gStep(5);
 
-QTM_USE_NAMESPACE
 
 /*!
     Constructs a new SnsrBigClockContainer.
@@ -55,7 +52,7 @@
     mCurrentOrientation(-1)
 {
     setBackgroundColor();
-    mBackgroundContainerLayout = new QGraphicsLinearLayout(Qt::Vertical);
+    mBackgroundContainerLayout = new QGraphicsLinearLayout(Qt::Vertical, this);
     setLayout(mBackgroundContainerLayout);
     qsrand(QTime::currentTime().msec());
 }
@@ -64,9 +61,7 @@
     Destructs the class.
  */
 SnsrBigClockContainer::~SnsrBigClockContainer()
-{
-    resetIndicatorConnections();
-    
+{    
     // e.g. mIndicatorWidget gets deleted during these calls
     mDocumentLoader.reset();
     qDeleteAll(mDocumentObjects);
@@ -83,10 +78,74 @@
  */
 
 /*!
-    \fn virtual void changeLayout(Qt::Orientation orientation) = 0;
+    Changes screensaver layout based on orientation changes.
+    \param orientation Current orientation.
+ */
+void SnsrBigClockContainer::changeLayout(Qt::Orientation orientation)
+{
+    SCREENSAVER_TEST_FUNC_ENTRY("SnsrBigClockContainer::changeLayout")
+
+    if (mCurrentOrientation != orientation) {
+        mCurrentOrientation = orientation;
+        
+        // delete any old widgets
+        if ( mBackgroundContainerLayout->count() ) {
+            mBackgroundContainerLayout->removeAt(0);
+        }
+        mDocumentLoader.reset();
+        qDeleteAll(mDocumentObjects);
+        mDocumentObjects.clear();
+
+        // reload widgets from docml
+        loadWidgets();
+    }
+    mBackgroundContainerLayout->setGeometry( mainWindow()->layoutRect() );
+    update();
+
+    SCREENSAVER_TEST_FUNC_EXIT("SnsrBigClockContainer::changeLayout")
+}
 
-    Slot for members update in container when orientation changed.
+/*!
+    Set used indicator model that is owned by the screensaver class. 
+    Model's life cycle must be the same as screensaver's so that indicators'
+    status data can be kept in memory and one can receive updates. 
+    This method should be called when the current container is set.
+ */
+void SnsrBigClockContainer::setIndicatorModel(SnsrIndicatorModel &model)
+{
+    mIndicatorModel = &model;
+}
+
+/*!
+    @copydoc Screensaver::getActiveScreenRows()
  */
+void SnsrBigClockContainer::getActiveScreenRows(int *firstActiveRow, int *lastActiveRow)
+{
+    // This default implementation return the whole area of the
+    // container. Inherited low power mode containers can and should
+    // return smaller area which just barely encloses all the content.
+    if ( mMainContainer ) {
+        QRect mainRect = mMainContainer->rect().toRect();
+        if ( mCurrentOrientation == Qt::Vertical ) {
+            *firstActiveRow = mainRect.top();
+            *lastActiveRow = mainRect.bottom();
+        }
+        else {
+            *firstActiveRow = mainRect.left();
+            *lastActiveRow = mainRect.right();
+        }
+    }
+}
+
+/*!
+    Tell if this container wants to lock the screen orientation.
+    Default implementation in not locked but inherited classes may
+    override this.
+ */
+bool SnsrBigClockContainer::isOrientationLocked()
+{
+    return false;
+}
 
 /*!
     \fn virtual int updateIntervalInMilliseconds() = 0;
@@ -96,22 +155,16 @@
  */
 
 /*!
-    Set used indicator model and do necessary initializations to show currently
-    active indicators.
+    \fn virtual int loadWidgets() = 0;
+
+    Concrete inherited container classes must implement this to instantiate
+    all the widgets shown in the container. The base class calls this
+    method when screen layuot is changed. The old widgets are already 
+    deleted by the base class before this is called. Also changing the visible
+    container is treated as a layout change, and results in call to this method.
+    Thus, inherited containers don't have to load their widgets yet in their
+    constructors.
  */
-void SnsrBigClockContainer::initIndicators(SnsrIndicatorModel &model)
-{
-    mIndicatorModel = &model;
-    if (mIndicatorWidget) {
-        connect(mIndicatorModel, SIGNAL(indicatorsUpdated(QList<SnsrIndicatorInfo>)),
-                mIndicatorWidget, SLOT(showIndicators(QList<SnsrIndicatorInfo>)));
-                
-        connect(mIndicatorModel, SIGNAL(allIndicatorsDeactivated()),
-                mIndicatorWidget, SLOT(removeAllIndicators()));
-        
-        mIndicatorModel->initializeIndicatorWidget();
-    }
-}
 
 /*!
     \reimp
@@ -229,15 +282,35 @@
 }
 
 /*!
+    Do necessary initializations to show currently active indicators.
+    Should be called after the indicator widget is created.
+ */
+void SnsrBigClockContainer::initIndicatorWidget()
+{
+    Q_ASSERT(mIndicatorModel && mIndicatorWidget);
+    
+    connect(mIndicatorModel, SIGNAL(indicatorsUpdated(QList<SnsrIndicatorInfo>)),
+            mIndicatorWidget, SLOT(showIndicators(QList<SnsrIndicatorInfo>)));
+                
+    connect(mIndicatorModel, SIGNAL(allIndicatorsDeactivated()),
+            mIndicatorWidget, SLOT(removeAllIndicators()));
+        
+    mIndicatorModel->initializeIndicatorWidget();
+}
+
+/*!
     Disconnect connections between indicator model and widget.
+    Should be called before deleting the indicator widget.
  */
 void SnsrBigClockContainer::resetIndicatorConnections()
-{
-    disconnect(mIndicatorModel, SIGNAL(indicatorsUpdated(QList<SnsrIndicatorInfo>)),
-               mIndicatorWidget, SLOT(showIndicators(QList<SnsrIndicatorInfo>)));
-    
-    disconnect(mIndicatorModel, SIGNAL(allIndicatorsDeactivated()),
-               mIndicatorWidget, SLOT(removeAllIndicators()));
+{   
+    if (mIndicatorWidget && mIndicatorModel) {
+        disconnect(mIndicatorModel, SIGNAL(indicatorsUpdated(QList<SnsrIndicatorInfo>)),
+                   mIndicatorWidget, SLOT(showIndicators(QList<SnsrIndicatorInfo>)));
+        
+        disconnect(mIndicatorModel, SIGNAL(allIndicatorsDeactivated()),
+                   mIndicatorWidget, SLOT(removeAllIndicators()));
+    }
 }
 
 /*!

--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrbigclockscreensaver.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrbigclockscreensaver.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -24,14 +24,16 @@
 #include <QDebug>
 #include <QTime>
 #include <QTimer>
+#include <XQSettingsManager> 
+#include <HbInstance>
+#include <HbMainWindow>
 
-#include <hbinstance.h>
-#include <hbmainwindow.h>
-
+#include <screensaverdomaincrkeys.h>
 #include "snsranalogclockcontainer.h"
 #include "snsrdigitalclockcontainer.h"
 #include "snsroledanalogclockcontainer.h"
 #include "snsroleddigitalclockcontainer.h"
+#include "snsrblankcontainer.h"
 #include "snsrindicatormodel.h"
 
 /*!
@@ -40,15 +42,14 @@
     \brief Screensaver with big digital clock.
  */
 
-const int gTimeInterval(100);
-
 /*!
     Constructs a new SnsrBigClockScreensaver.
  */
 SnsrBigClockScreensaver::SnsrBigClockScreensaver() :
     mMainWindow(0),
     mCurrentContainer(0),
-    mIndicatorModel(0)
+    mIndicatorModel(0),
+    m_setManager(0)
 {
     mMainWindow = HbInstance::instance()->allMainWindows().at(0);
     // for nice looking clock hand transformations
@@ -64,6 +65,7 @@
  */
 SnsrBigClockScreensaver::~SnsrBigClockScreensaver()
 {
+    mMainWindow->unsetOrientation( /*animate*/false );
     // mCurrentContainer, mIndicatorModel - deleted by the parent
 }
 
@@ -86,6 +88,8 @@
 
     removeCurrentContainer();
 
+    emit screenPowerModeRequested( Screensaver::ScreenModeFullPower );
+    
     SnsrBigClockContainer* newContainer( 0 );
     if (clockFormat() == ClockFormatAnalog) {
         newContainer = new SnsrAnalogClockContainer();
@@ -95,7 +99,7 @@
     }
 
     setCurrentContainer( newContainer );
-
+    
     SCREENSAVER_TEST_FUNC_EXIT("SnsrBigClockScreensaver::onForeground")
     return true;
 }
@@ -111,13 +115,34 @@
     removeCurrentContainer();
     
     SnsrBigClockContainer* newContainer( 0 );
-    if (clockFormat() == ClockFormatAnalog) {
-        newContainer = new SnsrOledAnalogClockContainer();
+        
+    // Check ScreensaverStatus from repository
+    XQSettingsManager::Error error;
+    int screensaverOn = 1; 
+    XQCentralRepositorySettingsKey settingsKey(
+            KCRUidScreensaverSettings.iUid, KScreensaverStatus ); // TUid as same repository used in control panel via Symbian APIs 
+    m_setManager = new XQSettingsManager(this);
+    if (m_setManager) {
+        screensaverOn = m_setManager->readItemValue(settingsKey, XQSettingsManager::TypeInt).toInt();
+        error = m_setManager->error();
+        if (error != XQSettingsManager::NoError) {
+            qDebug("Error reading value from XQSettingsManager.. error = %d", error);
+        }
+        delete m_setManager;
+    }
+    
+    if (screensaverOn) {
+        if (clockFormat() == ClockFormatAnalog) {
+            newContainer = new SnsrOledAnalogClockContainer();
+        }
+        else {
+            newContainer = new SnsrOledDigitalClockContainer();
+        }
     }
     else {
-        newContainer = new SnsrOledDigitalClockContainer();
+        newContainer = new SnsrBlankContainer();
     }
-
+    
     setCurrentContainer( newContainer );
 
     SCREENSAVER_TEST_FUNC_EXIT("SnsrBigClockScreensaver::onPartialForeground")
@@ -196,6 +221,46 @@
     mIndicatorModel->handleDeactivatedIndicator(deactivatedIndicator);
 }
 
+/*!
+    @copydoc Screensaver::getActiveScreenRows
+ */
+void SnsrBigClockScreensaver::getActiveScreenRows(int *firstActiveRow, int *lastActiveRow)
+{
+    if ( mCurrentContainer ) {
+        mCurrentContainer->getActiveScreenRows( firstActiveRow, lastActiveRow );
+    }
+    else {
+        qWarning() << "No current container when active rows queried.";
+    }
+}
+
+/*!
+    @copydoc Screensaver::updateLayout
+ */
+void SnsrBigClockScreensaver::updateLayout()
+{
+    if ( mCurrentContainer ) {
+        if ( mCurrentContainer->isOrientationLocked() ) {
+            mMainWindow->setOrientation( mMainWindow->orientation(), /*animate*/false );
+        }
+        else {
+            mMainWindow->unsetOrientation( /*animate*/false );
+        }
+        mCurrentContainer->changeLayout( mMainWindow->orientation() );
+    }
+    else {
+        qWarning() << "No current container when updateLayout called.";
+    }
+}
+
+/*!
+    Update the area visible in the power save screen mode. Power save mode gets
+    also activated on call if not already active.
+ */
+void SnsrBigClockScreensaver::updateActiveAreaForLowPower()
+{
+    emit screenPowerModeRequested( Screensaver::ScreenModeLowPower );
+}
 
 /*!
     Determines the curent clock format settings.
@@ -223,38 +288,41 @@
 {
     if ( mCurrentContainer ) {
         disconnect(
-            mMainWindow, SIGNAL(orientationChanged(Qt::Orientation)),
-            mCurrentContainer, SLOT(changeLayout(Qt::Orientation))
-            );
-        disconnect(
             &mTimer, SIGNAL(timeout()),
             mCurrentContainer, SLOT(update())
             );
         disconnect( 
             mCurrentContainer, SIGNAL(unlockRequested()), 
             this, SIGNAL(unlockRequested()) );
-        mTimer.stop();
+        if (mTimer.timerId()!= -1) {
+            mTimer.stop();
+        }
         emit viewChanged(0);
         
         delete mCurrentContainer;
         mCurrentContainer = 0;
     }
+    
+    mMainWindow->unsetOrientation( /*animate*/false );
 }
 
 void SnsrBigClockScreensaver::setCurrentContainer( SnsrBigClockContainer* newContainer )
 {
     mCurrentContainer = newContainer;
-    connect(
-            mMainWindow, SIGNAL(orientationChanged(Qt::Orientation)),
-            mCurrentContainer, SLOT(changeLayout(Qt::Orientation))
-        );
+    mCurrentContainer->setParent(this);
     connect( &mTimer, SIGNAL(timeout()), mCurrentContainer, SLOT(update()) );
     connect( mCurrentContainer, SIGNAL(unlockRequested()), SIGNAL(unlockRequested()) );
+    connect( mCurrentContainer, SIGNAL(activeAreaMoved()), SLOT(updateActiveAreaForLowPower()) );
 
-    mCurrentContainer->initIndicators(*mIndicatorModel);
+    mCurrentContainer->setIndicatorModel(*mIndicatorModel);
+
+    int updateInterval = mCurrentContainer->updateIntervalInMilliseconds(); 
+    // blankcontainer is empty one, don't start timer with -1 return value
+    if ( updateInterval != -1) {
+        mTimer.start(updateInterval);
+    }
     
-    mCurrentContainer->changeLayout(mMainWindow->orientation());
-    mTimer.start( mCurrentContainer->updateIntervalInMilliseconds() );
+    
     emit viewChanged(mCurrentContainer);
 }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrblankcontainer.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -0,0 +1,57 @@
+/*
+* 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 "snsrblankcontainer.h"
+
+/*!
+    \class SnsrBlankContainer
+    \ingroup group_snsrbigclockscreensaverplugin
+    \brief Container used for preparing layout for blank screen.
+ */
+
+/*!
+    Constructs a new SnsrBlankContainer.
+ */
+SnsrBlankContainer::SnsrBlankContainer() :
+    SnsrBigClockContainer()
+{
+}
+
+/*!
+    Destructs the class.
+ */
+SnsrBlankContainer::~SnsrBlankContainer()
+{
+}
+
+void SnsrBlankContainer::update()
+{
+    // nothing to do
+}
+
+int SnsrBlankContainer::updateIntervalInMilliseconds()
+{
+    // don't start timer
+    return -1;
+}
+
+void SnsrBlankContainer::loadWidgets()
+{
+    // nothing to do as we have no visual components
+}
+
+// end of file

--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrdigitalclockcontainer.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrdigitalclockcontainer.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -21,11 +21,12 @@
 #include <QTime>
 #include <QGraphicsLinearLayout>
 
-#include <hblabel.h>
-#include <hbextendedlocale.h>
+#include <HbExtendedLocale>
+#include <HbMainWindow>
 
 #include "snsrswipewidget.h"
 #include "snsrindicatorwidget.h"
+#include "snsrlabel.h"
 
 /*!
     \class SnsrDigitalClockContainer
@@ -66,41 +67,6 @@
     mSwipeWidget(0)*/
 {
     SCREENSAVER_TEST_FUNC_ENTRY("SnsrDigitalClockContainer::SnsrDigitalClockContainer")
-
-    bool ok(false);
-    // load digital clock
-    qDebug() << gDigitalLayoutDocml;
-    mDocumentObjects = mDocumentLoader.load(gDigitalLayoutDocml, &ok);
-    Q_ASSERT_X(ok, gDigitalLayoutDocml, "Invalid DocML file.");
-
-    if (ok) {
-        mMainView = mDocumentLoader.findWidget(gMainViewName);
-        mDateLabel = qobject_cast<HbLabel *>(
-                mDocumentLoader.findWidget(gDateLabelName));
-        mTimeLabel = qobject_cast<HbLabel *>(
-                mDocumentLoader.findWidget(gTimeLabelName));
-        mAmPmLabel = qobject_cast<HbLabel *>(
-                mDocumentLoader.findWidget(gAmPmLabelName));
-        mIndicatorWidget = qobject_cast<SnsrIndicatorWidget *>(
-                mDocumentLoader.findWidget(gIndicatorWidgetName));
-        // implement swipewidget later on
-        /*mSwipeWidget = qobject_cast<SnsrSwipeWidget *>(
-                mDocumentLoader.findWidget(gSwipeWidgetName));*/
-
-        Q_ASSERT_X(
-                mMainView && mDateLabel && mTimeLabel && mAmPmLabel &&
-                mIndicatorWidget /*&& mSwipeWidget*/,
-                gDigitalLayoutDocml, "Objects not found in DocML file."
-                );
-        
-        //connect( mSwipeWidget, SIGNAL(swipeDownDetected()), SIGNAL(unlockRequested()) );
-
-        mIndicatorWidget->setLayoutType(SnsrIndicatorWidget::IndicatorsCentered);
-        
-        mBackgroundContainerLayout->addItem(mMainView);
- //       mSwipeWidget->start();
-    }
-
     SCREENSAVER_TEST_FUNC_EXIT("SnsrDigitalClockContainer::SnsrDigitalClockContainer")
 }
 
@@ -109,6 +75,7 @@
  */
 SnsrDigitalClockContainer::~SnsrDigitalClockContainer()
 {
+    resetIndicatorConnections();
     //mTimeLabel, mAmPmLabel, mDateLabel - deleted by the parent
 }
 
@@ -130,7 +97,8 @@
     mTimeLabel->setPlainText(
         HbExtendedLocale().format(QTime::currentTime(), gTimeFormatStr)
         );
-    // if clock type is 24, this will return an empty string.
+    
+    // if clock type is 24h, this will return an empty string.
     mAmPmLabel->setPlainText(
         HbExtendedLocale().format(QTime::currentTime(), gAmPmFormatStr)
         );
@@ -151,44 +119,60 @@
     SCREENSAVER_TEST_FUNC_EXIT("SnsrDigitalClockContainer::update")
 }
 
-/*!
-    Changes screensaver layout basing on orientation changes.
-    \param orientation Current orientation.
- */
-void SnsrDigitalClockContainer::changeLayout(Qt::Orientation orientation)
-{
-    SCREENSAVER_TEST_FUNC_ENTRY("SnsrDigitalClockContainer::changeLayout")
-
-    bool ok(false);
-    if (mCurrentOrientation != orientation) {
-        mCurrentOrientation = orientation;
-
-        // hide controls to avoid screen flickering
-        mMainView->hide();
-
-        QString sectionToLoad("");
-        if (mCurrentOrientation == Qt::Horizontal) {
-            sectionToLoad = gLandscapeSectionName;
-        }
-        qDebug() << "loading: " << gDigitalLayoutDocml << ", section: "
-                << sectionToLoad;
-        mDocumentLoader.load(gDigitalLayoutDocml, sectionToLoad, &ok);
-        // view is rebuilt and ready to show
-        update();
-        mMainView->show();
-        Q_ASSERT_X(ok, gDigitalLayoutDocml, "Invalid section in DocML file.");
-    }
-    // update anyway - this is needed in situations when screensaver goes to
-    // foreground but layout change did not occur
-    if (!ok) {
-        update();
-    }
-
-    SCREENSAVER_TEST_FUNC_EXIT("SnsrDigitalClockContainer::changeLayout")
-}
-
 int SnsrDigitalClockContainer::updateIntervalInMilliseconds()
 {
     return 1000;
 }
 
+void SnsrDigitalClockContainer::loadWidgets()
+{
+    // reset widget pointers, any previous widgets are already deleted by now
+    mMainView = 0;
+    mDateLabel = 0;
+    mTimeLabel = 0;
+    mAmPmLabel = 0;
+    mIndicatorWidget = 0;
+    
+    // load widgets from docml
+    bool ok(false);
+    qDebug() << gDigitalLayoutDocml;
+    mDocumentObjects = mDocumentLoader.load(gDigitalLayoutDocml, &ok);
+    Q_ASSERT_X(ok, gDigitalLayoutDocml, "Invalid DocML file.");
+
+    if (ok) {
+        mMainView = mDocumentLoader.findWidget(gMainViewName);
+        mDateLabel = qobject_cast<SnsrLabel *>(
+                mDocumentLoader.findWidget(gDateLabelName));
+        mTimeLabel = qobject_cast<SnsrLabel *>(
+                mDocumentLoader.findWidget(gTimeLabelName));
+        mAmPmLabel = qobject_cast<SnsrLabel *>(
+                mDocumentLoader.findWidget(gAmPmLabelName));
+        mIndicatorWidget = qobject_cast<SnsrIndicatorWidget *>(
+                mDocumentLoader.findWidget(gIndicatorWidgetName));
+        // implement swipewidget later on
+        /*mSwipeWidget = qobject_cast<SnsrSwipeWidget *>(
+                mDocumentLoader.findWidget(gSwipeWidgetName));*/
+
+        Q_ASSERT_X(
+                mMainView && mDateLabel && mTimeLabel && mAmPmLabel &&
+                mIndicatorWidget /*&& mSwipeWidget*/,
+                gDigitalLayoutDocml, "Objects not found in DocML file."
+                );
+
+        // In case of landscape layout, read also the landscape delta section
+        if ( mCurrentOrientation == Qt::Horizontal ) {
+            qDebug() << "loading: " << gDigitalLayoutDocml << ", section: " << gLandscapeSectionName;
+            mDocumentLoader.load(gDigitalLayoutDocml, gLandscapeSectionName, &ok);
+            Q_ASSERT_X(ok, gDigitalLayoutDocml, "Invalid section in DocML file.");
+        }
+
+        mIndicatorWidget->setLayoutType(SnsrIndicatorWidget::IndicatorsCentered);
+        initIndicatorWidget();
+        
+        mBackgroundContainerLayout->addItem(mMainView);
+
+        //connect( mSwipeWidget, SIGNAL(swipeDownDetected()), SIGNAL(unlockRequested()) );
+        //mSwipeWidget->start();
+    }
+}
+

--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrdocumentloader.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrdocumentloader.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -21,6 +21,7 @@
 #include "snsroledclockwidget.h"
 #include "snsrlabel.h"
 #include "snsrindicatorwidget.h"
+#include "snsroledtimelabel.h"
 #include "snsrswipewidget.h"
 
 /*!
@@ -28,11 +29,11 @@
     \ingroup group_snsrbigclockscreensaverplugin
     \brief Custom screensaver docml layout loader.
 
-    Used mainly to create the analog clock widget from docml.
+    Used to create the widgets from docml.
  */
 
 /*!
-    Creates the analog clock.
+    Creates the requested widget.
     \param type Static type name.
     \param name Object name.
     \retval Created object.
@@ -63,6 +64,12 @@
         return object;
     }
 
+    if (type == SnsrOledTimeLabel::staticMetaObject.className()) {
+        QObject *object = new SnsrOledTimeLabel();
+        object->setObjectName(name);
+        return object;
+    }
+    
     /* Add swipeWidget implementation later on
      
      if (type == SnsrSwipeWidget::staticMetaObject.className()) {

--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsroledanalogclockcontainer.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsroledanalogclockcontainer.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -21,11 +21,12 @@
 #include <QGraphicsLinearLayout>
 #include <QTimer>
 #include <QTime>
-#include <hblabel.h>
-#include <hbextendedlocale.h>
+#include <HbExtendedLocale>
+#include <HbMainWindow>
 
 #include "snsroledclockwidget.h"
 #include "snsrindicatorwidget.h"
+#include "snsrlabel.h"
 
 /*!
     \class SnsrOledAnalogClockContainer
@@ -57,34 +58,6 @@
     mDateLabel(0), mDestPosition(QPointF()), mInitialize(false)
 {
     SCREENSAVER_TEST_FUNC_ENTRY("SnsrOledAnalogClockContainer::SnsrOledAnalogClockContainer")
-
-    bool ok(false);
-    qDebug() << gOledAnalogLayoutDocml;
-
-    // load oled analog clock
-    mDocumentObjects = mDocumentLoader.load(gOledAnalogLayoutDocml, &ok);
-    Q_ASSERT_X(ok, gOledAnalogLayoutDocml, "Invalid DocML file.");
-    if (ok) {
-        mMainView = mDocumentLoader.findWidget(gMainViewName);
-        mMainContainer = mDocumentLoader.findWidget(gMainContainerName);
-        mClockContainer = mDocumentLoader.findWidget(gClockContainerName);
-        mOledClockWidget = qobject_cast<SnsrOledClockWidget *>(
-              mDocumentLoader.findWidget(gOledAnalogClockWidgetName));
-        mDateLabel = qobject_cast<HbLabel *>(
-              mDocumentLoader.findWidget(gDateLabelName));
-        mIndicatorWidget = qobject_cast<SnsrIndicatorWidget *>(
-              mDocumentLoader.findWidget(gIndicatorWidgetName));
-        Q_ASSERT_X(
-                mMainView && mMainContainer && mClockContainer
-                && mOledClockWidget && mDateLabel && mIndicatorWidget,
-                gOledAnalogLayoutDocml, "Objects not found in DocML file."
-                );
-        
-        mIndicatorWidget->setLayoutType(SnsrIndicatorWidget::IndicatorsCentered);
-        
-        mBackgroundContainerLayout->addItem(mMainView);
-    }
-
     SCREENSAVER_TEST_FUNC_EXIT("SnsrOledAnalogClockContainer::SnsrOledAnalogClockContainer")
 }
 
@@ -93,6 +66,7 @@
  */
 SnsrOledAnalogClockContainer::~SnsrOledAnalogClockContainer()
 {
+    resetIndicatorConnections();
     //mOledClockWidget etc - deleted by the parent
 }
 
@@ -106,9 +80,14 @@
     // Container must have a valid size to enable calculating the 
     // destination position for the clock.
     if ( containerSize.width() > 0 && containerSize.height() > 0 ) {
-        containerSize -= mClockContainer->boundingRect().size();
+        containerSize -= mClockContainer->size();
         QRectF containerRect( mMainContainer->pos(), containerSize );
         if ( mInitialize ) {
+            // disconnect container from parent layout,
+            // connected container resets its position to the one defined in docml
+            // after label text updates
+            mClockContainer->setParentLayoutItem(0);
+
             QPointF clockPos = nextRandomPosition( mClockContainer->pos(), mDestPosition, containerRect );
             mClockContainer->setPos( clockPos );
         }
@@ -116,6 +95,8 @@
             mDestPosition = randomPosition( containerRect );
             mInitialize = true;
         }
+        // the active area of power save mode needs to be updated when clock container is moved
+        emit activeAreaMoved();
     }
 }
 
@@ -143,57 +124,86 @@
     // position
     updatePosition();
     
-    // TODO: Currently, both time and position are updated 10 times per second.
-    // These should happen only once per minute in the power save mode.
-
     SCREENSAVER_TEST_FUNC_EXIT("SnsrOledAnalogClockContainer::update")
 }
 
-/*!
-    Changes screensaver layout basing on orientation changes.
-    \param orientation Current orientation.
- */
-void SnsrOledAnalogClockContainer::changeLayout(Qt::Orientation orientation)
-{
-    SCREENSAVER_TEST_FUNC_ENTRY("SnsrOledAnalogClockContainer::changeLayout")
-
-    bool ok(false);
-    if (mCurrentOrientation != orientation) {
-        mCurrentOrientation = orientation;
-        // hide controls to avoid screen flickering
-        mMainView->hide();
-
-        QString sectionToLoad("");
-        if (mCurrentOrientation == Qt::Horizontal) {
-            sectionToLoad = gLandscapeSectionName;
-        }
-        qDebug() << "loading: " << gOledAnalogLayoutDocml << ", section: " << sectionToLoad;
-        mDocumentLoader.load(gOledAnalogLayoutDocml, sectionToLoad, &ok);
-        Q_ASSERT_X(ok, gOledAnalogLayoutDocml, "Invalid section in DocML file.");
-
-        // disconnect container from parent layout,
-        // connected container resets its position to the one defined in docml
-        // after label text updates
-        mClockContainer->setParentLayoutItem(0);
-
-        update();
-
-        // view is rebuilt and ready to show
-        mMainView->show();
-    }
-
-    // update anyway - this is needed in situations when screensaver goes to
-    // foreground but layout change did not occur
-    if (!ok) {
-        update();
-    }
-
-    SCREENSAVER_TEST_FUNC_EXIT("SnsrOledAnalogClockContainer::changeLayout")
-}
-
 int SnsrOledAnalogClockContainer::updateIntervalInMilliseconds()
 {
     return 60*1000;
 }
 
+/*!
+    @copydoc SnsrBigClockContainer::getActiveScreenRows()
+ */
+void SnsrOledAnalogClockContainer::getActiveScreenRows(int *firstActiveRow, int *lastActiveRow)
+{
+    if ( mClockContainer ) {
+        QRect clockRect( mClockContainer->pos().toPoint(), 
+                         mClockContainer->size().toSize() );
+        if ( mCurrentOrientation == Qt::Vertical ) {
+            *firstActiveRow = clockRect.top();
+            *lastActiveRow = clockRect.bottom() + 1;
+        }
+        else {
+            *firstActiveRow = clockRect.left();
+            *lastActiveRow = clockRect.right() + 1;
+        }
+    }
+}
+
+/*!
+    Orientation is locked in power save mode as sensors are off anyway,
+    at least after some timeout.
+ */
+bool SnsrOledAnalogClockContainer::isOrientationLocked()
+{
+    return true;
+}
+
+void SnsrOledAnalogClockContainer::loadWidgets()
+{
+    bool ok(true);
+
+    // reset widget pointers, any previous widgets are already deleted by now
+    mMainView = 0;
+    mMainContainer = 0;
+    mClockContainer = 0;
+    mOledClockWidget = 0;
+    mDateLabel = 0;
+    mIndicatorWidget = 0;
+    
+    // load widgets from docml
+    qDebug() << gOledAnalogLayoutDocml;
+    mDocumentObjects = mDocumentLoader.load(gOledAnalogLayoutDocml, &ok);
+    Q_ASSERT_X(ok, gOledAnalogLayoutDocml, "Invalid DocML file.");
+    if (ok) {
+        mMainView = mDocumentLoader.findWidget(gMainViewName);
+        mMainContainer = mDocumentLoader.findWidget(gMainContainerName);
+        mClockContainer = mDocumentLoader.findWidget(gClockContainerName);
+        mOledClockWidget = qobject_cast<SnsrOledClockWidget *>(
+              mDocumentLoader.findWidget(gOledAnalogClockWidgetName));
+        mDateLabel = qobject_cast<SnsrLabel *>(
+              mDocumentLoader.findWidget(gDateLabelName));
+        mIndicatorWidget = qobject_cast<SnsrIndicatorWidget *>(
+              mDocumentLoader.findWidget(gIndicatorWidgetName));
+        Q_ASSERT_X(
+                mMainView && mMainContainer && mClockContainer
+                && mOledClockWidget && mDateLabel && mIndicatorWidget,
+                gOledAnalogLayoutDocml, "Objects not found in DocML file."
+                );
+        
+        // In case of landscape layout, read also the landscape delta section
+        if ( mCurrentOrientation == Qt::Horizontal ) {
+            qDebug() << "loading: " << gOledAnalogLayoutDocml << ", section: " << gLandscapeSectionName;
+            mDocumentLoader.load(gOledAnalogLayoutDocml, gLandscapeSectionName, &ok);
+            Q_ASSERT_X(ok, gOledAnalogLayoutDocml, "Invalid section in DocML file.");
+        }
+
+        mIndicatorWidget->setLayoutType(SnsrIndicatorWidget::IndicatorsCentered);
+        initIndicatorWidget();
+        
+        mBackgroundContainerLayout->addItem(mMainView);
+    }
+}
+
 // end of file

--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsroleddigitalclockcontainer.cpp	Tue Jul 06 14:06:53 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsroleddigitalclockcontainer.cpp	Wed Aug 18 09:40:07 2010 +0300
@@ -22,10 +22,14 @@
 #include <QTime>
 #include <QTimer>
 
-#include <hblabel.h>
-#include <hbextendedlocale.h>
+
+#include <HbExtendedLocale>
+#include <HbMainWindow>
 
+#include "snsrlabel.h"
 #include "snsrindicatorwidget.h"
+#include "snsroledtimelabel.h"
+
 
 /*!
     \class SnsrOledDigitalClockContainer
@@ -41,7 +45,7 @@
 extern const char *gMainContainerName;
 extern const char *gClockContainerName;
 
-extern const char *gTimeLabelName;
+extern const char *gOledTimeLabelName = "oledTimeLabel";
 extern const char *gAmPmLabelName;
 extern const char *gDateLabelName;
 
@@ -54,46 +58,16 @@
 extern const char *gIndicatorWidgetName;
 
 
+
 /*!
     Constructs a new SnsrOledDigitalClockContainer.
  */
 SnsrOledDigitalClockContainer::SnsrOledDigitalClockContainer() :
-    SnsrBigClockContainer(), mClockContainer(0), mTimeLabel(0),
-    mDateLabel(0), mAmPmLabel(0), mDestPosition(QPointF()), mInitialize(false)
+    SnsrBigClockContainer(), mClockContainer(0), mAmPmLabel(0),
+    mTimeLabel(0), mDateLabel(0), mDestPosition(QPointF()),
+    mInitialize(false)
 {
     SCREENSAVER_TEST_FUNC_ENTRY("SnsrOledDigitalClockContainer::SnsrOledDigitalClockContainer")
-
-    bool ok(false);
-    qDebug() << gOledDigitalLayoutDocml;
-
-    // load digital clock
-    mDocumentObjects = mDocumentLoader.load(gOledDigitalLayoutDocml, &ok);
-    Q_ASSERT_X(ok, gOledDigitalLayoutDocml, "Invalid DocML file.");
-
-    if (ok) {
-        mMainView = mDocumentLoader.findWidget(gMainViewName);
-        mMainContainer = mDocumentLoader.findWidget(gMainContainerName);
-        mClockContainer = mDocumentLoader.findWidget(gClockContainerName);
-        mDateLabel = qobject_cast<HbLabel *>(
-                mDocumentLoader.findWidget(gDateLabelName));
-        mTimeLabel = qobject_cast<HbLabel *>(
-                mDocumentLoader.findWidget(gTimeLabelName));
-        mAmPmLabel = qobject_cast<HbLabel *>(
-                mDocumentLoader.findWidget(gAmPmLabelName));
-        mIndicatorWidget = qobject_cast<SnsrIndicatorWidget *>(
-                mDocumentLoader.findWidget(gIndicatorWidgetName));
-        Q_ASSERT_X(
-                mMainView && mMainContainer && mClockContainer 
-                && mDateLabel && mTimeLabel && mAmPmLabel
-                && mIndicatorWidget,
-                gOledDigitalLayoutDocml, "Objects not found in DocML file."
-                );
-
-        mIndicatorWidget->setLayoutType(SnsrIndicatorWidget::IndicatorsCentered);
-        
-        mBackgroundContainerLayout->addItem(mMainView);
-    }
-
     SCREENSAVER_TEST_FUNC_EXIT("SnsrOledDigitalClockContainer::SnsrOledDigitalClockContainer")
 }
 
@@ -102,6 +76,7 @@
  */
 SnsrOledDigitalClockContainer::~SnsrOledDigitalClockContainer()
 {
+    resetIndicatorConnections();
     //mTimeLabel, mAmPmLabel, mDateLabel, mMoveTimer - deleted by the parent
 }
 
@@ -118,6 +93,11 @@
         containerSize -= mClockContainer->boundingRect().size();
         QRectF containerRect( mMainContainer->pos(), containerSize );
         if ( mInitialize ) {
+            // disconnect container from parent layout,
+            // connected container resets its position to the one defined in docml
+            // after label text updates
+            mClockContainer->setParentLayoutItem(0);
+
             QPointF clockPos = nextRandomPosition( mClockContainer->pos(), mDestPosition, containerRect );
             mClockContainer->setPos( clockPos );
         }
@@ -125,6 +105,8 @@
             mDestPosition = randomPosition( containerRect );
             mInitialize = true;
         }
+        // the active area of power save mode needs to be updated when clock container is moved
+        emit activeAreaMoved();
     }
 }
 
@@ -136,9 +118,11 @@
     SCREENSAVER_TEST_FUNC_ENTRY("SnsrOledDigitalClockContainer::update")
 
     // time
-    mTimeLabel->setPlainText(
+    mTimeLabel->setText(
         HbExtendedLocale().format(QTime::currentTime(), gTimeFormatStr)
         );
+    
+    // if clock type is 24h, this will return an empty string.
     mAmPmLabel->setPlainText(
         HbExtendedLocale().format(QTime::currentTime(), gAmPmFormatStr)
         );
@@ -161,48 +145,87 @@
     SCREENSAVER_TEST_FUNC_EXIT("SnsrOledDigitalClockContainer::update")
 }
 
-/*!
-    Changes screensaver layout basing on orientation changes.
-    \param orientation Current orientation.
- */
-void SnsrOledDigitalClockContainer::changeLayout(Qt::Orientation orientation)
-{
-    SCREENSAVER_TEST_FUNC_ENTRY("SnsrOledDigitalClockContainer::changeLayout")
-
-    if (mCurrentOrientation != orientation) {
-        mCurrentOrientation = orientation;
-
-        // hide controls to avoid screen flickering
-        mMainView->hide();
-
-        QString sectionToLoad("");
-        if (mCurrentOrientation == Qt::Horizontal) {
-            sectionToLoad = gLandscapeSectionName;
-        }
-        qDebug() << "loading: " << gOledDigitalLayoutDocml << ", section: "
-            << sectionToLoad;
-        bool ok(false);
-        mDocumentLoader.load(gOledDigitalLayoutDocml, sectionToLoad, &ok);
-        Q_ASSERT_X(ok, gOledDigitalLayoutDocml, "Invalid section in DocML file.");
-
-        // disconnect container from parent layout,
-        // connected container resets its position to the one defined in docml
-        // after label text updates
-        mClockContainer->setParentLayoutItem(0);
-
-        // update labels before showing the view
-        update();
-
-        // view is rebuilt and ready to show
-        mMainView->show();
-    }
-
-    SCREENSAVER_TEST_FUNC_EXIT("SnsrOledDigitalClockContainer::changeLayout")
-}
-
 int SnsrOledDigitalClockContainer::updateIntervalInMilliseconds()
 {
     return 60*1000;
 }
 
+/*!
+    @copydoc SnsrBigClockContainer::getActiveScreenRows()
+ */
+void SnsrOledDigitalClockContainer::getActiveScreenRows(int *firstActiveRow, int *lastActiveRow)
+{
+    if ( mClockContainer ) {
+        QRect clockRect( mClockContainer->pos().toPoint(), 
+                         mClockContainer->size().toSize() );
+        if ( mCurrentOrientation == Qt::Vertical ) {
+            *firstActiveRow = clockRect.top();
+            *lastActiveRow = clockRect.bottom() + 1;
+        }
+        else {
+            *firstActiveRow = clockRect.left();
+            *lastActiveRow = clockRect.right() + 1;
+        }
+    }
+}
+
+/*!
+    Orientation is locked in power save mode as sensors are off anyway,
+    at least after some timeout.
+ */
+bool SnsrOledDigitalClockContainer::isOrientationLocked()
+{
+    return true;
+}
+
+void SnsrOledDigitalClockContainer::loadWidgets()
+{
+    // reset widget pointers, any previous widgets are already deleted by now
+    mMainView = 0;
+    mMainContainer = 0;
+    mClockContainer = 0;
+    mDateLabel = 0;
+    mTimeLabel = 0;
+    mAmPmLabel = 0;
+    mIndicatorWidget = 0;
+    
+    // load widgets from docml
+    bool ok(false);
+    qDebug() << gOledDigitalLayoutDocml;
+    mDocumentObjects = mDocumentLoader.load(gOledDigitalLayoutDocml, &ok);
+    Q_ASSERT_X(ok, gOledDigitalLayoutDocml, "Invalid DocML file.");
+
+    if (ok) {
+        mMainView = mDocumentLoader.findWidget(gMainViewName);
+        mMainContainer = mDocumentLoader.findWidget(gMainContainerName);
+        mClockContainer = mDocumentLoader.findWidget(gClockContainerName);
+        mDateLabel = qobject_cast<SnsrLabel *>(
+                mDocumentLoader.findWidget(gDateLabelName));
+        mTimeLabel = qobject_cast<SnsrOledTimeLabel *>(
+                mDocumentLoader.findWidget(gOledTimeLabelName));
+        mAmPmLabel = qobject_cast<SnsrLabel *>(
+                mDocumentLoader.findWidget(gAmPmLabelName));
+        mIndicatorWidget = qobject_cast<SnsrIndicatorWidget *>(
+                mDocumentLoader.findWidget(gIndicatorWidgetName));
+        Q_ASSERT_X(
+                mMainView && mMainContainer && mClockContainer 
+                && mDateLabel && mTimeLabel && mAmPmLabel
+                && mIndicatorWidget,
+                gOledDigitalLayoutDocml, "Objects not found in DocML file."
+                );
+
+        // In case of landscape layout, read also the landscape delta section
+        if ( mCurrentOrientation == Qt::Horizontal ) {
+            qDebug() << "loading: " << gOledDigitalLayoutDocml << ", section: " << gLandscapeSectionName;
+            mDocumentLoader.load(gOledDigitalLayoutDocml, gLandscapeSectionName, &ok);
+            Q_ASSERT_X(ok, gOledDigitalLayoutDocml, "Invalid section in DocML file.");
+        }
+
+        mIndicatorWidget->setLayoutType(SnsrIndicatorWidget::IndicatorsCentered);
+        initIndicatorWidget();
+               
+        mBackgroundContainerLayout->addItem(mMainView);
+    }
+}
+
 // end of file

author	Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
	Wed, 18 Aug 2010 09:40:07 +0300
changeset 77	4b195f3bea29
parent 61	2b1b11a301d2
child 85	35368b604b28