--- a/homescreenapp/examples/batterywidgetplugin/batterywidgetplugin.pro	Fri Sep 17 08:27:54 2010 +0300
+++ b/homescreenapp/examples/batterywidgetplugin/batterywidgetplugin.pro	Mon Oct 04 00:07:25 2010 +0300
@@ -46,6 +46,8 @@
         
     DEPLOYMENT += plugins \
                   widgetResources
+                  
+    MMP_RULES += SMPSAFE
 } 
 
 win32: {

--- a/homescreenapp/examples/contentpublishclient/contentpublishclient.pro	Fri Sep 17 08:27:54 2010 +0300
+++ b/homescreenapp/examples/contentpublishclient/contentpublishclient.pro	Mon Oct 04 00:07:25 2010 +0300
@@ -43,6 +43,8 @@
     
     DEPLOYMENT += testwallpaperimages
     
+    MMP_RULES += SMPSAFE
+    
 } else {
     error("Only Symbian supported!")
 }
\ No newline at end of file

--- a/homescreenapp/examples/helloworldwidgetplugin/helloworldwidgetplugin.pro	Fri Sep 17 08:27:54 2010 +0300
+++ b/homescreenapp/examples/helloworldwidgetplugin/helloworldwidgetplugin.pro	Mon Oct 04 00:07:25 2010 +0300
@@ -49,6 +49,8 @@
 
     BLD_INF_RULES.prj_exports += \
       "./rom/helloworldwidgetplugin.iby  CORE_APP_LAYER_IBY_EXPORT_PATH(helloworldwidgetplugin.iby)" 
+      
+   MMP_RULES += SMPSAFE
 }
 
 win32: {

--- a/homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin.pro	Fri Sep 17 08:27:54 2010 +0300
+++ b/homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin.pro	Mon Oct 04 00:07:25 2010 +0300
@@ -53,6 +53,8 @@
     BLD_INF_RULES.prj_exports += \
       "./rom/localisedhellowidgetplugin.iby            CORE_APP_LAYER_IBY_EXPORT_PATH(localisedhellowidgetplugin.iby)" \
       "./rom/localisedhellowidgetpluginresources.iby   LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(localisedhellowidgetpluginresources.iby)"
+      
+      MMP_RULES += SMPSAFE
 }
 
 win32: {

--- a/homescreenapp/examples/localisedhellowidgetplugin/sis/localisedhellowidgetplugin.pkg	Fri Sep 17 08:27:54 2010 +0300
+++ b/homescreenapp/examples/localisedhellowidgetplugin/sis/localisedhellowidgetplugin.pkg	Mon Oct 04 00:07:25 2010 +0300
@@ -41,5 +41,5 @@
 "/epoc32/data/z/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.png"      - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.png"
 "/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin.qm"      		                 - "!:/resource/qt/translations/localisedhellowidgetplugin.qm"
 "/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin_fi.qm"                           - "!:/resource/qt/translations/localisedhellowidgetplugin_fi.qm"
+"/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin_en.qm"     	                 - "!:/resource/qt/translations/localisedhellowidgetplugin_en.qm"  
 "/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin_en_us.qm"      	                 - "!:/resource/qt/translations/localisedhellowidgetplugin_en_us.qm"
-"/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin_en_gb.qm"     	                 - "!:/resource/qt/translations/localisedhellowidgetplugin_en_gb.qm"  

--- a/homescreenapp/examples/minibrowserwidgetplugin/minibrowserwidgetplugin.pro	Fri Sep 17 08:27:54 2010 +0300
+++ b/homescreenapp/examples/minibrowserwidgetplugin/minibrowserwidgetplugin.pro	Mon Oct 04 00:07:25 2010 +0300
@@ -48,6 +48,8 @@
         
     DEPLOYMENT += plugins \
                   widgetResources
+                  
+    MMP_RULES += SMPSAFE
 }
 
 win32: {

--- a/homescreenapp/hsapplication/conf/confml/CI_homescreendb.confml	Fri Sep 17 08:27:54 2010 +0300
+++ b/homescreenapp/hsapplication/conf/confml/CI_homescreendb.confml	Mon Oct 04 00:07:25 2010 +0300
@@ -117,7 +117,9 @@
       <confml:Configuration><confml:key>isSnapEffectsEnabled</confml:key><confml:value>true</confml:value></confml:Configuration>
       <confml:Configuration><confml:key>sceneType</confml:key><confml:value>PageWallpapers</confml:value></confml:Configuration>
       <confml:Configuration><confml:key>bounceAnimationEasingCurve</confml:key><confml:value>Linear</confml:value></confml:Configuration>
-      <confml:Configuration><confml:key>pageChangeAnimationEasingCurve</confml:key><confml:value>Linear</confml:value></confml:Configuration>      
+      <confml:Configuration><confml:key>pageChangeAnimationEasingCurve</confml:key><confml:value>Linear</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>widgetOrganizerAnchorDistance</confml:key><confml:value>5</confml:value></confml:Configuration>
+      <confml:Configuration><confml:key>widgetOrganizerSearchSequence</confml:key><confml:value>SearchRowByRow</confml:value></confml:Configuration>
     </confml:HomeScreenDbSettings>
   </confml:data>
 </confml:configuration>

--- a/homescreenapp/hsapplication/conf/confml/homescreendb.confml	Fri Sep 17 08:27:54 2010 +0300
+++ b/homescreenapp/hsapplication/conf/confml/homescreendb.confml	Mon Oct 04 00:07:25 2010 +0300
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:confml="http://www.s60.com/xml/confml/2" xsi:schemaLocation="http://www.s60.com/xml/confml/2 http://www.s60.com/xml/confml/1#//confml2" name="HomeScreen database settings">
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="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"/>
@@ -117,7 +117,9 @@
       <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>      
+      <Configuration><key>pageChangeAnimationEasingCurve</key><value>Linear</value></Configuration>
+      <Configuration><key>widgetOrganizerAnchorDistance</key><value>5</value></Configuration>       
+      <Configuration><key>widgetOrganizerSearchSequence</key><value>SearchRowByRow</value></Configuration> 
     </HomeScreenDbSettings>
   </data>
 </configuration>

--- a/homescreenapp/hsapplication/hsapplication.pro	Fri Sep 17 08:27:54 2010 +0300
+++ b/homescreenapp/hsapplication/hsapplication.pro	Mon Oct 04 00:07:25 2010 +0300
@@ -27,8 +27,6 @@
 
 fute:DEFINES += FUTE
 
-new_short:DEFINES += HSWIDGETORGANIZER_ALGORITHM
-
 DEPENDPATH += . \
               ./inc \
               ./src
@@ -58,9 +56,11 @@
     include(hsapplication_exports_to_rom.pri)    
 
     CONFIG += service
-    LIBS +=  -lxqservice -lxqserviceutil -lXQKeyCapture -lxqtelephonyservice
+    LIBS +=  -lxqservice -lxqserviceutil -lXQKeyCapture
   
     SERVICE.FILE = ipc_service_conf.xml
+    
+    MMP_RULES += SMPSAFE
 }
 
 !symbian: {

--- a/homescreenapp/hsapplication/inc/hsstatemachine.h	Fri Sep 17 08:27:54 2010 +0300
+++ b/homescreenapp/hsapplication/inc/hsstatemachine.h	Mon Oct 04 00:07:25 2010 +0300
@@ -54,7 +54,6 @@
 private:
     Q_DISABLE_COPY(HsStateMachine)
 
-    void startDialer();
     void registerAnimations();
     void createStatePublisher();
     void createContentServiceParts();
@@ -71,11 +70,10 @@
 private:
     HsContentService *mContentService;	
 	
-	bool mHomeScreenActive;
-	bool mIdleStateActive;
+    bool mHomeScreenActive;
+    bool mIdleStateActive;
     bool mEndKeyCaptured;
-    bool mSendKeyCaptured;
-
+    
 	QValueSpacePublisher *mPublisher;
 	
 #ifdef Q_OS_SYMBIAN

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

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

--- a/homescreenapp/hsapplication/src/hsstatemachine.cpp	Fri Sep 17 08:27:54 2010 +0300
+++ b/homescreenapp/hsapplication/src/hsstatemachine.cpp	Mon Oct 04 00:07:25 2010 +0300
@@ -46,13 +46,6 @@
 #include "hstest_global.h"
 #include "hswidgetpositioningonwidgetmove.h"
 
-#ifdef Q_OS_SYMBIAN
-#include <xqappmgr.h>
-#include <xqcallinfo.h>
-#include <logsservices.h>
-#include <xqrequestinfo.h>
-#endif // Q_OS_SYMBIAN
-
 QTM_USE_NAMESPACE
 #define hbApp qobject_cast<HbApplication*>(qApp)
 
@@ -87,7 +80,6 @@
       mHomeScreenActive(false),
       mIdleStateActive(false),
       mEndKeyCaptured(false),
-      mSendKeyCaptured(false),
       mPublisher(NULL)
 #ifdef Q_OS_SYMBIAN
 	  ,keyCapture()
@@ -110,14 +102,13 @@
             
     HsWidgetPositioningOnOrientationChange::setInstance(
         new HsAdvancedWidgetPositioningOnOrientationChange);
-#ifdef HSWIDGETORGANIZER_ALGORITHM
-    HsWidgetPositioningOnWidgetAdd::setInstance(
-        new HsWidgetOrganizer);
-#else
-    HsWidgetPositioningOnWidgetAdd::setInstance(
-        new HsAnchorPointInBottomRight);
-#endif
-
+        
+    HsWidgetPositioningOnWidgetAdd *widgetOrganizer =
+        new HsWidgetOrganizer(HSCONFIGURATION_GET(snapGap),
+                              HSCONFIGURATION_GET(widgetOrganizerSearchSequence));
+        
+    HsWidgetPositioningOnWidgetAdd::setInstance(widgetOrganizer);
+        
     HsWidgetPositioningOnWidgetMove::setInstance(
         new HsSnapToLines);
 
@@ -178,83 +169,14 @@
     }
         
     bool result =  QStateMachine::eventFilter(watched, event);    
-
+  
     if (event->type() == QEvent::KeyPress ) {
-        QKeyEvent* ke = static_cast<QKeyEvent *>(event);
-        int key = ke->key();
-
-        if (key == Qt::Key_Home ) {
-            result = true;
-        }
-        else if (key == Qt::Key_Yes ) {
-            result = true;
-            if (mSendKeyCaptured == false && mHomeScreenActive == true) {
-                mSendKeyCaptured = true;
-                startDialer();                
-            }
-        }
+        QKeyEvent* ke = static_cast<QKeyEvent *>(event);                 
+        result = (ke->key() == Qt::Key_Home);
     }
     return result;
 }
 
-#ifdef COVERAGE_MEASUREMENT
-#pragma CTC SKIP
-#endif //COVERAGE_MEASUREMENT
-/*!
-    \fn void HsStateMachine::startDialer()
-    Starts Dialer application
-*/
-void HsStateMachine::startDialer()
-    {
-    // copy-paste code from dialer widget
-#ifdef Q_OS_SYMBIAN
-    qDebug("HsStateMachine::startDialer()");
-            
-    QList<CallInfo> calls;
-    QScopedPointer<XQCallInfo> callInfo(XQCallInfo::create());
-    callInfo->getCalls(calls);
-    QList<QVariant> args;
-    QString service;
-    QString interface;
-    QString operation;
-
-    if (0 < calls.count()) {
-        qDebug("HS: call ongoing, bring Telephone to foreground");
-        service = "phoneui";
-        interface = "com.nokia.symbian.IStart";
-        operation = "start(int)";
-        int openDialer(0);
-        args << openDialer;
-    } else {
-        qDebug("HS: no calls, open Dialer");
-        service = "logs";
-        interface = "com.nokia.symbian.ILogsView";
-        operation = "show(QVariantMap)";
-        QVariantMap map;
-        map.insert("view_index", QVariant(int(LogsServices::ViewAll)));
-        map.insert("show_dialpad", QVariant(true));
-        map.insert("dialpad_text", QVariant(QString()));
-        args.append(QVariant(map));
-    }
-
-    XQApplicationManager appManager;
-    QScopedPointer<XQAiwRequest> request(appManager.create(service, interface, operation, false));
-    if (request == NULL) {
-        return;
-    }
-    request->setArguments(args);
-    XQRequestInfo info;
-    info.setForeground(true);
-    request->setInfo(info);
-    bool ret = request->send();
-    qDebug("HS: request sent successfully:", ret);
-#endif
-}
-
-#ifdef COVERAGE_MEASUREMENT
-#pragma CTC ENDSKIP
-#endif //COVERAGE_MEASUREMENT
-
 /*!
     Registers framework animations.
 */
@@ -420,6 +342,13 @@
                                       idleState, collectionStates[0]);
         idleState->addTransition(idleToCollectionTransition);
     }
+	// show after install is opened from applibrary via idlestate
+	if (collectionStates.count()) {
+        HsMenuEventTransition *idleToCollectionTransition =
+            new HsMenuEventTransition(HsMenuEvent::OpenCollectionFromAppLibrary,
+                                      idleState, collectionStates[0]);
+        idleState->addTransition(idleToCollectionTransition);
+    }
 
     guiRootState->setInitialState(loadSceneState);
     setInitialState(guiRootState);
@@ -454,7 +383,6 @@
         mPublisher->setValue(HsStatePSKeySubPath, EHomeScreenApplicationBackground | EHomeScreenApplicationLibraryViewActive);
         captureEndKey(false);
     }
-    mSendKeyCaptured = false;
 }
 
 /*!
@@ -499,9 +427,16 @@
 void HsStateMachine::activityRequested(const QString &name) 
 {
     if (name == Hs::groupAppLibRecentView) {
-        this->postEvent(
-            HsMenuEventFactory::createOpenCollectionEvent(0,
-            Hs::collectionDownloadedTypeName));
+        if (mHomeScreenActive) {
+            this->postEvent(
+                HsMenuEventFactory::createOpenCollectionEvent(0,
+                Hs::collectionDownloadedTypeName));
+        }
+        else {
+            this->postEvent(
+                HsMenuEventFactory::createOpenCollectionFromAppLibraryEvent(0,
+                Hs::collectionDownloadedTypeName));
+        }
     } else if (name == Hs::activityHsIdleView) {
         emit event_toIdle();
     } else if (name == Hs::activityAppLibMainView) {

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/tsrc/t_hsapplication/installs_symbian.pri	Mon Oct 04 00:07:25 2010 +0300
@@ -0,0 +1,21 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+
+export.sources = ./../mockstateplugins/resource/*.xml
+export.path = ./hsresources/plugins/stateplugins
+pluginstub.sources = ./../mockstateplugins/qmakepluginstubs/mockstateplugins.dll
+pluginstub.path = ./hsresources/plugins/stateplugins
+DEPLOYMENT += export pluginstub

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/tsrc/t_hsapplication/installs_win32.pri	Mon Oct 04 00:07:25 2010 +0300
@@ -0,0 +1,34 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+
+testfiles.path = ../../../../../../bin/hstests/
+testfiles.files = ./debug/t_hsdefaultruntimeplugin.exe
+
+mockdll.path = ../../../../../../bin/hstests/hsresources/plugins/stateplugins
+mockdll.files += ./debug/hsresources/plugins/stateplugins/*.dll \
+                 ./debug/hsresources/plugins/stateplugins/*.xml
+
+compos.path = ../../../../../../bin/hstests/
+compos.files = ../../../../../../bin/debug/hsdomainmodel.dll \
+               ../../../../../../bin/debug/hsutils.dll \
+               ../../../../../../bin/debug/caclient.dll
+
+compos2.path = ./debug
+compos2.files = ../../../../../../bin/debug/hsdomainmodel.dll \                
+                ../../../../../../bin/debug/hsutils.dll \
+                ../../../../../../bin/debug/caclient.dll
+
+INSTALLS += testfiles mockdll compos compos2

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/tsrc/t_hsapplication/mockstateplugins/inc/mockapplibrarystate.h	Mon Oct 04 00:07:25 2010 +0300
@@ -0,0 +1,36 @@
+/*
+* 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 <QState>
+#include <QObject>
+
+class MockAppLibraryState: public QState
+{
+
+Q_OBJECT
+
+public:
+
+    MockAppLibraryState(QState* parent = 0):QState(parent)
+    {
+
+    }
+
+signals:
+    void toHomescreenState();
+};
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/tsrc/t_hsapplication/mockstateplugins/inc/mockbackuprestorestate.h	Mon Oct 04 00:07:25 2010 +0300
@@ -0,0 +1,29 @@
+/*
+* 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 <QState>
+
+class MockBackupRestoreState: public QState
+{
+    Q_OBJECT
+
+public:
+    MockBackupRestoreState(QState* parent = 0) : QState(parent) {}
+
+signals:
+    void event_loadScene();
+
+};

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/tsrc/t_hsapplication/mockstateplugins/inc/mockidlestate.h	Mon Oct 04 00:07:25 2010 +0300
@@ -0,0 +1,37 @@
+/*
+* 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 <QState>
+#include <QObject>
+
+class MockIdleState: public QState
+{
+
+Q_OBJECT
+
+public:
+
+    MockIdleState(QState* parent = 0):QState(parent)
+    {
+
+    }
+
+signals:
+    void menuEvent();
+
+};
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/tsrc/t_hsapplication/mockstateplugins/inc/mockloadscenestate.h	Mon Oct 04 00:07:25 2010 +0300
@@ -0,0 +1,36 @@
+/*
+* 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 <QState>
+#include <QObject>
+
+class MockLoadSceneState: public QState
+{
+
+Q_OBJECT
+
+public:
+
+    MockLoadSceneState(QState* parent = 0):QState(parent)
+    {
+
+    }
+
+signals:
+    void idleEvent();
+};
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/tsrc/t_hsapplication/mockstateplugins/inc/mockmenuworkerstate.h	Mon Oct 04 00:07:25 2010 +0300
@@ -0,0 +1,33 @@
+/*
+* 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 <QState>
+#include <QObject>
+
+class MockMenuWorkerState: public QState
+{
+
+Q_OBJECT
+
+public:
+
+    MockMenuWorkerState(QState* parent = 0):QState(parent)
+    {
+
+    }
+};
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/tsrc/t_hsapplication/mockstateplugins/inc/mockrootstate.h	Mon Oct 04 00:07:25 2010 +0300
@@ -0,0 +1,33 @@
+/*
+* 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 <QState>
+#include <QObject>
+
+class MockRootState: public QState
+{
+    Q_OBJECT
+
+public:
+    MockRootState(QState* parent = 0) : QState(parent)
+    {
+        
+    }
+
+signals:
+    void event_backupRestore();
+
+};

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/tsrc/t_hsapplication/mockstateplugins/inc/mockstateplugins.h	Mon Oct 04 00:07:25 2010 +0300
@@ -0,0 +1,37 @@
+/*
+* 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:  Mocked runtime provider.
+*
+*/
+
+#ifndef MOCKSTATEPLUGINS_H
+#define MOCKSTATEPLUGINS_H
+
+#include <QObject>
+#include <qserviceplugininterface.h>
+
+QTM_USE_NAMESPACE
+
+class MockStatePlugins : public QObject, public QServicePluginInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(QtMobility::QServicePluginInterface)
+
+public:
+    QObject *createInstance(const QServiceInterfaceDescriptor &descriptor,
+                            QServiceContext *context,
+                            QAbstractSecuritySession *session);
+};
+
+#endif //MOCKSTATEPLUGINS_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/tsrc/t_hsapplication/mockstateplugins/installs_win32.pri	Mon Oct 04 00:07:25 2010 +0300
@@ -0,0 +1,21 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+
+testfiles.path = ../t_hsapplicationexe/debug/hsresources/plugins/stateplugins
+testfiles.files += ./debug/*.dll \
+                   ./resource/*.xml
+
+INSTALLS += testfiles

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/tsrc/t_hsapplication/mockstateplugins/mockstateplugins.pri	Mon Oct 04 00:07:25 2010 +0300
@@ -0,0 +1,18 @@
+#
+# 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/*.h
+SOURCES += ./src/*.cpp

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/tsrc/t_hsapplication/mockstateplugins/mockstateplugins.pro	Mon Oct 04 00:07:25 2010 +0300
@@ -0,0 +1,43 @@
+#
+# 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 mobility
+MOBILITY = serviceframework
+
+#DEFINES += HSRUNTIMEMODEL_TEST
+
+DEPENDPATH += .\
+              ./src \
+              ./inc
+
+INCLUDEPATH += .\
+               ./inc
+
+symbian: {
+
+CONFIG += symbian_test
+
+TARGET.UID3 = 0x20022F4C
+TARGET.CAPABILITY = CAP_APPLICATION AllFiles
+TARGET.EPOCHEAPSIZE = 0x20000 0x1000000 // 128kB - 16MB
+TARGET.EPOCALLOWDLLDATA=1
+
+MMP_RULES += SMPSAFE
+}
+
+include(mockstateplugins.pri)
+win32:include(installs_win32.pri)
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/tsrc/t_hsapplication/mockstateplugins/resource/mockstateplugins.xml	Mon Oct 04 00:07:25 2010 +0300
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<service>
+    <name>mockstateplugins</name>
+    <filepath>mockstateplugins</filepath>
+    <description>Mocked Homescreen State Plugins</description>
+    <interface>
+        <name>com.nokia.homescreen.state.HsLoadSceneState</name>
+        <version>1.1</version>
+        <description>Mocked test implementation for homescreen's state</description>
+        <capabilities></capabilities>
+    </interface>
+    <interface>
+        <name>com.nokia.homescreen.state.HsIdleState</name>
+        <version>1.1</version>
+        <description>Mocked test implementation for homescreen's state</description>
+        <capabilities></capabilities>
+    </interface>
+    <interface>
+        <name>com.nokia.homescreen.state.HsAppLibraryState</name>
+        <version>1.1</version>
+        <description>Mocked test implementation for homescreen's state</description>
+        <capabilities></capabilities>
+    </interface>
+    <interface>
+        <name>com.nokia.homescreen.state.HsMenuWorkerState</name>
+        <version>1.1</version>
+        <description>Mocked test implementation for homescreen's state</description>
+        <capabilities></capabilities>
+    </interface>
+    <interface>
+        <name>com.nokia.homescreen.state.HsRootState</name>
+        <version>1.1</version>
+        <description>Mocked test implementation for homescreen's state</description>
+        <capabilities></capabilities>
+    </interface>
+    <interface>
+        <name>com.nokia.homescreen.state.HsBackupRestoreState</name>
+        <version>1.1</version>
+        <description>Mocked test implementation for homescreen's state</description>
+        <capabilities></capabilities>
+    </interface>
+</service>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/tsrc/t_hsapplication/mockstateplugins/src/mockstateplugins.cpp	Mon Oct 04 00:07:25 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:  Mocked runtime plugin.
+*
+*/
+
+#include <qserviceinterfacedescriptor.h>
+#include <qabstractsecuritysession.h>
+#include <qservicecontext.h>
+
+#include "mockstateplugins.h"
+#include "mockloadscenestate.h"
+#include "mockidlestate.h"
+#include "mockapplibrarystate.h"
+#include "mockmenuworkerstate.h"
+#include "mockrootstate.h"
+#include "mockbackuprestorestate.h"
+
+QObject *MockStatePlugins::createInstance(const QServiceInterfaceDescriptor &descriptor,
+                                                QServiceContext *context,
+                                                QAbstractSecuritySession *session)
+{
+    Q_UNUSED(context);
+    Q_UNUSED(session);
+
+    if (descriptor.interfaceName() == "com.nokia.homescreen.state.HsLoadSceneState") {
+        return new MockLoadSceneState();
+    } else if (descriptor.interfaceName() == "com.nokia.homescreen.state.HsIdleState") {
+        return new MockIdleState();
+    } else if (descriptor.interfaceName() == "com.nokia.homescreen.state.HsAppLibraryState") {
+        return new MockAppLibraryState();
+    } else if (descriptor.interfaceName() == "com.nokia.homescreen.state.HsMenuWorkerState") {
+        return new MockMenuWorkerState();
+    } else if (descriptor.interfaceName() == "com.nokia.homescreen.state.HsRootState") {
+        return new MockRootState();
+    } else if (descriptor.interfaceName() == "com.nokia.homescreen.state.HsBackupRestoreState") {
+        return new MockBackupRestoreState();
+    } else {
+        return 0;
+    }
+}
+
+Q_EXPORT_PLUGIN2(mockstateplugins, MockStatePlugins)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/tsrc/t_hsapplication/sis/t_hsapplication.pkg	Mon Oct 04 00:07:25 2010 +0300
@@ -0,0 +1,40 @@
+;
+; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+; Language
+&EN
+
+; SIS header: name, uid, version
+#{"t_hsapplication"},(0x20022F5F),1,0,0
+
+; Localised Vendor name
+%{"Nokia"}
+
+; Unique Vendor name
+:"Nokia"
+
+; Supports S60 5th Edition
+[0x1028315F], 0, 0, 0, {"S60ProductID"}
+
+; HS application's unittest
+"/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"
+
+;Mocked test plugin
+"/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"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/tsrc/t_hsapplication/sis/t_hsapplication_sisx.bat	Mon Oct 04 00:07:25 2010 +0300
@@ -0,0 +1,30 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@echo off
+
+if exist t_hsapplication.sisx del t_hsapplication.sisx
+
+makesis t_hsapplication.pkg
+signsis t_hsapplication.sis t_hsapplication.sisx ../../../../internal/sis/rd.cer ../../../../internal/sis/rd-key.pem
+
+if exist t_hsapplication.sisx (
+echo t_hsapplication.sisx creation SUCCEEDED
+del t_hsapplication.sis
+)
+
+if not exist t_hsapplication.sisx (
+echo t_hsapplication.sisx creation FAILED
+)
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/tsrc/t_hsapplication/t_hsapplication.pro	Mon Oct 04 00:07:25 2010 +0300
@@ -0,0 +1,21 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+
+TEMPLATE = subdirs
+SUBDIRS  = mockstateplugins \
+           t_hsapplicationexe
+
+CONFIG  += ordered

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/tsrc/t_hsapplication/t_hsapplicationexe/inc/t_hsapplication.h	Mon Oct 04 00:07:25 2010 +0300
@@ -0,0 +1,81 @@
+/*
+* 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:  Test class for homescreen::core
+*
+*/
+
+
+#include <QtTest/QtTest>
+
+class HbMainWindow;
+
+/**
+* @test Test class for homescreen::hsapplication modules.
+*/
+class t_hsapplication : public QObject
+{
+    Q_OBJECT
+
+private slots:
+
+    /**
+     * initialize
+     */
+    void initTestCase();
+    void cleanupTestCase();
+
+#ifdef Q_OS_SYMBIAN
+    /**
+     * hsrecoverymanager.cpp
+     */
+    void testHsRecoveryManagerConstruction();
+    void testHsRecoveryManagerCrashCount();
+    void testHsRecoveryManagerRestoreRomDatabase();
+    void testHsRecoveryManagerExecute();
+#endif
+
+    /**
+     * hshomescreen.cpp
+     */
+    void testCreateHomescreen();
+    void testHomescreenStart();
+    void testHomescreenStop();
+    void testOnRuntimeStarted();
+    void testOnRuntimeStopped();
+    void testEventFilter();
+    
+    /**
+     * hshomescreenclientserviceprovider.cpp
+     */    
+#ifdef Q_OS_SYMBIAN     
+    void testCreateClientServiceProvider();
+    void testAddWidget();
+    void testSetWallpaper();
+    void testWidgetComponentDescriptor();
+    void testWidgetUninstalled();
+#endif    
+
+  /**
+	 * HsStateMachine
+	 */
+   void testConstruction();
+	 void testStartStop();
+	 void testOnIdleStateEntered();
+	 void testOnIdleStateExited();
+	 void testRuntimeEventFilter();
+   void testActivityRequested();
+
+private:
+    HbMainWindow *mWindow;
+};

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/tsrc/t_hsapplication/t_hsapplicationexe/installs_symbian.pri	Mon Oct 04 00:07:25 2010 +0300
@@ -0,0 +1,20 @@
+#
+# 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:
+#
+export.sources = ./../mockstateplugins/resource/*.xml
+export.path = ./hsresources/plugins/stateplugins
+pluginstub.sources = ./../mockstateplugins/qmakepluginstubs/mockstateplugins.dll
+pluginstub.path = ./hsresources/plugins/stateplugins
+DEPLOYMENT += export pluginstub
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/tsrc/t_hsapplication/t_hsapplicationexe/installs_win32.pri	Mon Oct 04 00:07:25 2010 +0300
@@ -0,0 +1,34 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+
+testexe.path = ../../../../../../bin/hstests/
+testexe.files = ./debug/t_hsapplicationexe.exe
+
+mockdll.path = ../../../../../../bin/hstests/hsresources/plugins/stateplugins
+mockdll.files += ./debug/hsresources/plugins/stateplugins/*.dll \
+                            ./debug/hsresources/plugins/stateplugins/*.xml
+                            
+compos.path = ../../../../../../bin/hstests/
+compos.files = ../../../../../../bin/debug/hsdomainmodel.dll \
+               ../../../../../../bin/debug/hsutils.dll \
+               ../../../../../../bin/debug/caclient.dll
+
+compos2.path = ./debug
+compos2.files = ../../../../../../bin/debug/hsdomainmodel.dll \                
+                ../../../../../../bin/debug/hsutils.dll \
+                ../../../../../../bin/debug/caclient.dll                            
+
+INSTALLS += testexe mockdll compos compos2

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/tsrc/t_hsapplication/t_hsapplicationexe/src/hsconfiguration_mock.cpp	Mon Oct 04 00:07:25 2010 +0300
@@ -0,0 +1,132 @@
+/*
+* 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 <HbDeviceProfile>
+
+#include "hsconfiguration.h"
+
+HsConfiguration::HsConfiguration(QObject *parent)
+  : QObject(parent),
+    mBounceEffect(20),
+    mPageChangeAnimationDuration(200),
+    mPageChangeZoneAnimationDuration(800),
+    mPageChangeZoneReverseAnimationDuration(200),
+    mPageRemovedAnimationDuration(200),
+    mNewPageAddedAnimationDuration(200),
+    mWidgetDragEffectDuration(200),
+    mWidgetDropEffectDuration(200),
+    mDefaultPageId(1),
+    mMaximumPageCount(8),
+    mIsShortcutLabelVisible(true),
+    mBounceFeedbackEffectDistance(3),
+    mPageChangeZoneWidth(60),
+    mPageIndicatorSpacing(8),
+    mMaximumWidgetHeight(39),
+    mMaximumWidgetWidth(48),
+    mMinimumWidgetHeight(8.75),
+    mMinimumWidgetWidth(8.75),
+    mPageChangePanDistance(17.91),
+    mPageChangeFeedbackEffect(HbFeedback::Sensitive),
+    mWidgetPickFeedbackEffect(HbFeedback::ItemPick),
+    mWidgetDropFeedbackEffect(HbFeedback::ItemDrop),
+    mWidgetRepositionFeedbackEffect(HbFeedback::BounceEffect),
+    mWidgetOverTrashbinFeedbackEffect(HbFeedback::ItemMoveOver),
+    mWidgetDropToTrashbinFeedbackEffect(HbFeedback::ItemDrop),
+    mShortcutWidgetTapFeedbackEffect(HbFeedback::BasicItem),
+    mWidgetMoveBlockedFeedbackEffect(HbFeedback::Basic),
+    mClockWidgetTapFeedbackEffect(HbFeedback::BasicItem),
+    mWidgetSnappingFeedbackEffect(HbFeedback::ItemMoveOver),
+    mIsSnapEnabled(true),
+    mSnapTimeout(100),
+    mSnapForce(30),
+    mSnapGap(6),
+    mPageMargin(0),
+    mSnapLineFadeInDuration(200),
+    mSnapLineFadeOutDuration(100),
+    mIsSnapEffectsEnabled(true),    
+    mSceneType(PageWallpapers),
+    mBounceAnimationEasingCurve(QEasingCurve::Linear),
+    mPageChangeAnimationEasingCurve(QEasingCurve::Linear)
+{    
+}
+
+HsConfiguration::~HsConfiguration()
+{
+}
+
+QSizeF HsConfiguration::minimumWidgetSizeInUnits() const
+{
+    return QSizeF(mMinimumWidgetWidth, mMinimumWidgetHeight);
+}
+
+QSizeF HsConfiguration::maximumWidgetSizeInUnits() const
+{
+    return QSizeF(mMaximumWidgetWidth, mMaximumWidgetHeight);
+}
+
+QSizeF HsConfiguration::minimumWidgetSizeInPixels() const
+{
+    HbDeviceProfile profile;
+    qreal factor = profile.unitValue();
+    return factor * minimumWidgetSizeInUnits();
+}
+
+QSizeF HsConfiguration::maximumWidgetSizeInPixels() const
+{
+    HbDeviceProfile profile;
+    qreal factor = profile.unitValue();
+    return factor * maximumWidgetSizeInUnits();
+}
+
+bool HsConfiguration::load()
+{
+    return true;
+}
+
+bool HsConfiguration::importFromFile(const QString &path)
+{
+    Q_UNUSED(path);
+    return true;
+}
+
+bool HsConfiguration::exportToFile(const QString &path)
+{
+    Q_UNUSED(path);
+    return true;
+}
+
+HsConfiguration *HsConfiguration::instance()
+{
+    return mInstance;
+}
+
+HsConfiguration *HsConfiguration::takeInstance()
+{
+    HsConfiguration *instance = mInstance;
+    mInstance = 0;
+    return instance;
+}
+
+void HsConfiguration::setInstance(HsConfiguration *instance)
+{
+    if (mInstance != instance) {
+        delete mInstance;
+        mInstance = instance;
+    }
+}
+
+HsConfiguration *HsConfiguration::mInstance(0);

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/tsrc/t_hsapplication/t_hsapplicationexe/src/hscontentservice_mock.cpp	Mon Oct 04 00:07:25 2010 +0300
@@ -0,0 +1,59 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include "hscontentservice.h"
+
+HsContentService::HsContentService(QObject *parent): QObject(parent) {}
+
+HsContentService::~HsContentService() {}
+
+HsContentService *HsContentService::instance() {
+    static HsContentService service;
+    return &service;
+}
+bool HsContentService::createWidget(const QVariantHash &params)
+{
+    Q_UNUSED(params);
+    return true;
+}
+
+HsWidgetHost *HsContentService::createWidgetForPreview(const QVariantHash &params)
+{
+    Q_UNUSED(params);
+    return 0;
+}
+
+bool HsContentService::addWidget(const QString &uri, const QVariantHash &preferences,
+                                 const QVariant &homescreenData)
+{
+    Q_UNUSED(preferences);
+    Q_UNUSED(homescreenData);
+    if (!uri.isEmpty()) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+void HsContentService::emitWidgetRemoved(const QString &uri, const QVariantHash &preferences)
+{
+    Q_UNUSED(uri);
+    Q_UNUSED(preferences);
+}
+
+void HsContentService::widgetStartFaulted()
+{
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/homescreenapp/hsapplication/tsrc/t_hsapplication/t_hsapplicationexe/src/hsgui_mock.cpp	Mon Oct 04 00:07:25 2010 +0300
@@ -0,0 +1,140 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#include <HbInstance>
+#include <HbMainWindow>
+#include <HbView>
+#include <HbMenu>
+#include <HbAction>
+
+#include "hsgui.h"
+#include "hsscene.h"
+#include "hsconfiguration.h"
+
+namespace {
+      const char gApplicationLibraryIconName[] = "qtg_mono_applications_all";
+}
+
+/*!
+    \class HsGui
+    \ingroup group_hsdomainmodel
+    \brief Represents a view in the framework.
+    HsGui includes common UI components for Home screen.
+*/
+
+HsGui *HsGui::mInstance(0);
+
+struct HsGuiImpl
+{
+    HbView *mIdleView;
+    HbMainWindow *mWindow;
+    HbAction *mNavigationAction;
+};
+
+
+
+HsGui::~HsGui()
+{
+    if (mImpl->mNavigationAction) {
+        delete mImpl->mNavigationAction;
+    }
+
+    delete mImpl;
+}
+
+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()
+{
+    
+}
+
+void HsGui::cleanupIdleUi()
+{
+    if (mImpl->mIdleView) {
+        mImpl->mIdleView->setNavigationAction(0);
+        delete mImpl->mNavigationAction;
+        mImpl->mNavigationAction = 0;
+        
+        mImpl->mWindow->removeView(mImpl->mIdleView);
+        delete mImpl->mIdleView;
+        mImpl->mIdleView = 0;
+
+        // This gets deleted when mImpl->mIdleView is deleted
+        // so just nullify.
+    }
+    
+}
+
+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;
+}
+
+QRectF HsGui::layoutRect() const
+{
+    return mImpl->mWindow->layoutRect();
+}
+
+void HsGui::show()
+{
+    mImpl->mWindow->raise();
+    mImpl->mWindow->show();
+}
+
+HsGui::HsGui(QObject *parent):
+    QObject(parent),mImpl(new HsGuiImpl)
+{
+    mImpl->mIdleView = 0;
+    mImpl->mNavigationAction = 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/hsapplication/tsrc/t_hsapplication/t_hsapplicationexe/src/hspage_mock.cpp	Mon Oct 04 00:07:25 2010 +0300
@@ -0,0 +1,457 @@
+/*
+* 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 <HbInstance>
+
+#include "hsdomainmodeldatastructures.h"
+#include "hsgui.h"
+#include "hspage.h"
+#include "hspagevisual.h"
+#include "hspagetoucharea.h"
+#include "hspagenewwidgetlayout.h"
+#include "hsscene.h"
+#include "hswidgethost.h"
+#include "hswidgethostvisual.h"
+#include "hswallpaper.h"
+#include "hswidgetpositioningonwidgetadd.h"
+#include "hswidgetpositioningonorientationchange.h"
+#include "hsconfiguration.h"
+
+
+/*!
+    \class HsPage
+    \ingroup group_hsdomainmodel
+    \brief Represents a page in the framework.
+    HsPage contains group of widgets. HsPage can have a wallpaper.
+*/
+
+/*!
+    Constructor.
+
+    \a parent Owner.
+    \a aFlags Window flags.
+*/
+HsPage::HsPage(QObject* parent)
+    : QObject(parent),
+      mDatabaseId(-1),
+      mPageVisual(new HsPageVisual), 
+      mWallpaper(0),
+      mRemovable(true),
+      mPageMargin(0.0)
+{
+    //Page margin
+    mPageMargin = HSCONFIGURATION_GET(pageMargin);
+    connect(HsConfiguration::instance(), SIGNAL(propertyChanged(QString)), SLOT(onPageMarginChanged(QString)));
+}
+
+/*!
+    Destructor.
+*/
+HsPage::~HsPage()
+{
+    delete mWallpaper;
+}
+
+/*!
+    Returns the database id.
+*/
+int HsPage::databaseId() const
+{
+    return mDatabaseId;
+}
+
+/*!
+    Sets the database id to \a id.
+*/
+void HsPage::setDatabaseId(int id)
+{
+    mDatabaseId = id;
+}
+
+/*!
+    Loads widgets.
+*/
+bool HsPage::load()
+{
+    if (HSCONFIGURATION_GET(sceneType) == HsConfiguration::PageWallpapers) {
+        mWallpaper = new HsPageWallpaper(this);
+    }
+
+    HsWidgetHost *widget = new HsWidgetHost(-1);
+    mWidgets.append(widget);
+    connectWidget(widget);
+    widget->setPage(this);
+    widget->visual()->setParentItem(this->visual());
+    widget->startWidget();
+    return true;
+}
+
+/*!
+    Return wallpaper.
+*/
+HsWallpaper *HsPage::wallpaper() const
+{
+    return mWallpaper;
+}
+/*!
+    Add given existing \a widgetHost to a page. Returns true if successful
+*/
+bool HsPage::addExistingWidget(HsWidgetHost *widgetHost)
+{
+    if (!widgetHost) {
+        return false;
+    }
+
+    if (mWidgets.contains(widgetHost)) {
+        return true;
+    }
+
+    if (!widgetHost->setPage(this)) {
+        return false;
+    }
+
+    connectWidget(widgetHost);
+    mWidgets << widgetHost;
+    widgetHost->visual()->setParentItem(this->visual());
+
+    return true;
+ }
+
+/*!
+    Remove given \a widgetHost from a page. Widget is not deleted.
+    Returns true if successful
+*/
+bool HsPage::removeWidget(HsWidgetHost *widgetHost)
+{
+    if (!widgetHost || !widgetHost->setPage(0)) {
+        return false;
+    }
+
+    disconnectWidget(widgetHost);
+    mWidgets.removeOne(widgetHost);
+    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.
+*/
+QList<HsWidgetHost *> HsPage::newWidgets()
+{
+    return mNewWidgets;
+}
+
+/*!
+    Adds new widget into a page. Returns true if successfull.
+*/
+bool HsPage::addNewWidget(HsWidgetHost* widgetHost, const QPointF &touchPoint)
+{
+    Q_UNUSED(touchPoint)
+    if (!widgetHost || mWidgets.contains(widgetHost)) {
+        return false;
+    }
+
+    if (mNewWidgets.contains(widgetHost)) {
+        return true;
+    }
+
+    HsWidgetPresentationData presentation;
+    presentation.orientation = Qt::Vertical;
+    if (!widgetHost->getPresentation(presentation)) {
+        presentation.orientation = Qt::Vertical;
+        presentation.setPos(QPointF());
+        presentation.zValue = 0;
+        widgetHost->savePresentation(presentation);
+    }
+
+    widgetHost->visual()->hide();
+    widgetHost->visual()->setPos(presentation.x, presentation.y);
+    widgetHost->visual()->setZValue(presentation.zValue);
+
+    connectWidget(widgetHost);
+    mNewWidgets << widgetHost;
+
+    return true;
+}
+
+/*!
+    Layouts all the new widgets
+*/
+void HsPage::layoutNewWidgets()
+{
+    if (mNewWidgets.isEmpty()) {
+        return;
+    }
+
+    updateZValues();
+    HsWidgetHost *widget = 0;
+    for (int i = 0; i < mNewWidgets.count(); ++i) {
+        widget = mNewWidgets.at(i);
+//Not used in mock        newWidgetLayout->addItem(widget);
+        widget->setPage(this);
+        widget->visual()->setParentItem(visual());
+        widget->showWidget();
+        widget->visual()->show();
+    }
+    mWidgets << mNewWidgets;
+    mNewWidgets.clear();
+}
+
+/*!
+    Clears new widgets list and resets layout.
+*/
+void HsPage::resetNewWidgets()
+{
+    mNewWidgets.clear();
+}
+
+/*!
+    Remove page and all it's contained widgets from database
+*/
+bool HsPage::deleteFromDatabase()
+{
+	//Not used in mock
+    return true;
+}
+
+/*!
+    Return list of widgets belonging to a page
+*/
+QList<HsWidgetHost *> HsPage::widgets() const
+{
+    return mWidgets;
+}
+
+/*!
+    Returns true if the page can be removed. Otherwise,
+    returns false.
+*/
+bool HsPage::isRemovable() const
+{
+    return mRemovable;
+}
+
+/*!
+    Sets removable flag to \a removable.
+*/
+void HsPage::setRemovable(bool removable)
+{
+    mRemovable = removable;
+}
+
+/*!
+    Return true if page is default page.
+*/
+bool HsPage::isDefaultPage() const
+{
+    return mDatabaseId == HSCONFIGURATION_GET(defaultPageId);
+}
+
+/*!
+    Return true if page is active page.
+*/
+bool HsPage::isActivePage() const
+{
+    return this == HsScene::instance()->activePage();
+}
+
+/*!
+    Create page into database and return instance of a new page.
+*/
+HsPage *HsPage::createInstance(const HsPageData &pageData)
+{
+    Q_UNUSED(pageData);
+    HsPage *page = new HsPage;
+    return page;
+}
+
+/*!
+    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(Qt::Vertical);
+}
+
+/*!
+    Returns rect of rectangular where widgets are allowed to be placed in the page.
+*/
+QRectF HsPage::contentGeometry(Qt::Orientation orientation)
+{
+    QRectF pageRect = QRectF(0, 0, 360.0, 640.0);
+
+    //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(Qt::Vertical);
+}
+
+/*!
+    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;
+}
+
+/*!
+    Calls onShow() for contained widgets.
+*/
+void HsPage::showWidgets()
+{
+}
+
+/*!
+    Calls onHide() for contained widgets.
+*/
+void HsPage::hideWidgets()
+{
+}
+
+/*!
+    Propagate online state to widgets.
+*/
+void HsPage::setOnline(bool online)
+{
+    foreach (HsWidgetHost *widget, mNewWidgets) {
+        widget->setOnline(online);
+    }
+    foreach (HsWidgetHost *widget, mWidgets) {
+        widget->setOnline(online);
+    }
+}
+
+/*!
+    Update widgets z-values and persist those. Active widget has top most
+    z-value.
+*/
+void HsPage::updateZValues()
+{
+}
+
+/*!
+    Return this page's index.
+*/
+int HsPage::pageIndex()
+{
+    return HsScene::instance()->pages().indexOf(this);
+}
+/*!
+    Utility to connect widget signals to page.
+*/
+void HsPage::connectWidget(HsWidgetHost *widget)
+{
+    connect(widget, SIGNAL(finished()), SLOT(onWidgetFinished()));
+    connect(widget, SIGNAL(faulted()), SLOT(onWidgetFaulted()));
+    connect(widget, SIGNAL(resized()), SLOT(onWidgetResized()));
+    connect(widget, SIGNAL(available()), SLOT(onWidgetAvailable()));
+    connect(widget, SIGNAL(unavailable()), SLOT(onWidgetUnavailable()));
+}
+/*!
+    Disconnect widget signals from page
+*/
+void HsPage::disconnectWidget(HsWidgetHost *widget)
+{
+    widget->disconnect(this);
+}
+/*!
+    Disconnect and remove widget
+*/
+void HsPage::onWidgetFinished()
+{
+    HsWidgetHost *widget = qobject_cast<HsWidgetHost *>(sender());
+
+    // It can be in new widget list if we haven't layouted it yet
+    // or layouted new widget and widget list
+    if (!mNewWidgets.removeOne(widget)) {
+        mWidgets.removeOne(widget);
+    }
+
+    disconnectWidget(widget);
+    widget->remove();
+}
+/*!
+    Remove widget if it faulted
+*/
+void HsPage::onWidgetFaulted()
+{
+    onWidgetFinished();
+}
+
+/*!
+    Calculates new widget position on page when widget size changes. If page has layout then there are new widgets
+    and we use layout to calculate new widget positions.
+*/
+void HsPage::onWidgetResized()
+{
+}
+/*!
+    Show widget if it came available
+*/
+void HsPage::onWidgetAvailable()
+{
+}
+/*!
+    Update internal bookkeeping and hide widget
+*/
+void HsPage::onWidgetUnavailable()
+{
+}
+
+/*!
+    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)
+{
+    Q_UNUSED(orientation)
+}
+
+void HsPage::onPageMarginChanged(const QString &value)
+{
+    Q_UNUSED(value)
+}
+
+HsPageVisual *HsPage::visual() const
+{
+    return mPageVisual;
+}