txt_localisedhellowidgetplugin_dblist_hello_world

# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1274953568 -10800 # Node ID 4785f57bf3d4c842c75f642d6eeca6052b16665b # Parent 23b5d6a29ccec670bb97f89effac4c4dbe2a884e Revision: 201019 Kit: 2010121 diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/common.pri --- a/homescreenapp/common.pri Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/common.pri Thu May 27 12:46:08 2010 +0300 @@ -138,7 +138,7 @@ } } -!exists($${EPOCROOT}epoc32/include/mw/XQSettingsManager) { +!exists($${EPOCROOT}epoc32/include/platform/mw/XQSettingsManager) { DEFINES += NO_QT_EXTENSIONS } diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/inc/localisedhellowidget.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/localisedhellowidgetplugin/inc/localisedhellowidget.h Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,55 @@ +/* +* 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 HELLOWORLDWIDGET_H +#define HELLOWORLDWIDGET_H + +#include + + +class HbPushButton; +class QGraphicsPixmapItem; +class HbIconItem; + +class LocalisedHelloWidget : public HbWidget +{ + Q_OBJECT + Q_PROPERTY(QString rootPath READ rootPath WRITE setRootPath) +public: + LocalisedHelloWidget(QGraphicsItem *parent = 0, Qt::WindowFlags flags = 0); + ~LocalisedHelloWidget(); + +public: + QString rootPath()const; + void setRootPath(const QString &rootPath); +public slots: + void onInitialize(); + void onShow(); + void onHide(); +private slots: + void onButtonPressed(); + +private: + Q_DISABLE_COPY(LocalisedHelloWidget) + + HbPushButton *mButton; + QString mText; + QString mRootPath; + HbIconItem *mIcon; +}; + +#endif // HELLOWORLDWIDGET_H diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/inc/localisedhellowidgetplugin.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/localisedhellowidgetplugin/inc/localisedhellowidgetplugin.h Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,36 @@ +/* +* 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 localised home screen widget +* +*/ + +#ifndef LOCALISEDHELLOWIDGETPLUGIN_H +#define LOCALISEDHELLOWIDGETPLUGIN_H + +#include +#include + +QTM_USE_NAMESPACE +class LocalisedHelloWidgetPlugin : public QObject, public QServicePluginInterface +{ + Q_OBJECT + Q_INTERFACES(QtMobility::QServicePluginInterface) + +public: + QObject *createInstance(const QServiceInterfaceDescriptor &descriptor, + QServiceContext *context, + QAbstractSecuritySession *session); +}; + +#endif // LOCALISEDHELLOWIDGETPLUGIN_H diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin.qm Binary file homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin.qm has changed diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin.ts Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,46 @@ + + + + + + Text in widget's button when widget pressed + Hello world text + Hello world text + + localisedhellowidgetplugin + button + lo + False + + + Hello World description in application library + Home screen example widget + Home screen example widget + + localisedhellowidgetplugin + dblist_1_val + lo + False + + + Hello World title in application library + Hello world + Hello world + + localisedhellowidgetplugin + dblist_1 + lo + False + + + Text in widget's button + Hello world + Hello world + + localisedhellowidgetplugin + button + lo + False + + + diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_gb.qm Binary file homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_gb.qm has changed diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_gb.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_gb.ts Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,46 @@ + + + + + + Text in widget's button when widget pressed + Hello world text + Hello world text + + localisedhellowidgetplugin + button + lo + False + + + Hello World description in application library + Home screen example widget + Home screen example widget + + localisedhellowidgetplugin + dblist_1_val + lo + False + + + Hello World title in application library + Hello world + Hello world + + localisedhellowidgetplugin + dblist_1 + lo + False + + + Text in widget's button + Hello world + Hello world + + localisedhellowidgetplugin + button + lo + False + + + diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_us.qm Binary file homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_us.qm has changed diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_us.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_us.ts Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,46 @@ + + + + + + Text in widget's button when widget pressed + Hello world text + Hi dude text + + localisedhellowidgetplugin + button + lo + False + + + Hello World description in application library + Home screen example widget + Home screen example widget + + localisedhellowidgetplugin + dblist_1_val + lo + False + + + Hello World title in application library + Hello world + Hi dude + + localisedhellowidgetplugin + dblist_1 + lo + False + + + Text in widget's button + Hello world + Hi dude + + localisedhellowidgetplugin + button + lo + False + + + diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_fi.qm Binary file homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_fi.qm has changed diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_fi.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_fi.ts Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,46 @@ + + + + + + Text in widget's button when widget pressed + Hello world text + Moi kaikki! + + localisedhellowidgetplugin + button + lo + False + + + Hello World description in application library + Home screen example widget + Kotiruudun esimerkki vimpain + + localisedhellowidgetplugin + dblist_1_val + lo + False + + + Hello World title in application library + Hello world + Hei maailma + + localisedhellowidgetplugin + dblist_1 + lo + False + + + Text in widget's button + Hello world + Hei maailma + + localisedhellowidgetplugin + button + lo + False + + + diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin.pro --- a/homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin.pro Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin.pro Thu May 27 12:46:08 2010 +0300 @@ -14,6 +14,58 @@ # Description: Example of home screen widget # -TEMPLATE = subdirs -SUBDIRS = localisedhellowidgetplugin \ - localisedhellowidgetplugininstaller +TEMPLATE = lib +CONFIG += plugin mobility hb +MOBILITY = serviceframework + +HEADERS += ./inc/*.h +SOURCES += ./src/*.cpp + +INCLUDEPATH += ./inc + +symbian: { + + INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE + + TARGET.UID3 = 0x20022F80 + TARGET.EPOCALLOWDLLDATA=1 + TARGET.CAPABILITY = ALL -TCB + + DESTDIR = /private/20022F35/import/widgetregistry/20022F80 + + plugins.path = $${DESTDIR} + plugins.sources = $${TARGET}.dll + + widgetResources.path = $${DESTDIR} + widgetResources.sources += resource/$${TARGET}.xml + widgetResources.sources += resource/$${TARGET}.manifest + widgetResources.sources += resource/$${TARGET}.png + + localisedFiles.path = /resource/qt/translations + localisedFiles.sources += ./locales/*.qm + + DEPLOYMENT += plugins \ + widgetResources \ + localisedFiles +} + +win32: { + + CONFIG(debug, debug|release) { + SUBDIRPART = debug + } else { + SUBDIRPART = release + } + + PLUGIN_SUBDIR = /private/20022F35/import/widgetregistry/20022F80 + + DESTDIR = $$PWD/../../../../bin/$${SUBDIRPART}/$${PLUGIN_SUBDIR} + + manifest.path = $${DESTDIR} + manifest.files = ./resource/*.manifest ./resource/*.xml ./resource/*.png + + widgetLocalisation.path = $$PWD/../../../../bin/$${SUBDIRPART}/resource/qt/translations + widgetLocalisation.files += ./locales/*.qm + + INSTALLS += manifest widgetLocalisation +} diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/inc/localisedhellowidget.h --- a/homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/inc/localisedhellowidget.h Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +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: Example of home screen widget -* -*/ - -#ifndef HELLOWORLDWIDGET_H -#define HELLOWORLDWIDGET_H - -#include - - -class HbPushButton; -class QGraphicsPixmapItem; -class HbIconItem; - -class LocalisedHelloWidget : public HbWidget -{ - Q_OBJECT - Q_PROPERTY(QString rootPath READ rootPath WRITE setRootPath) -public: - LocalisedHelloWidget(QGraphicsItem *parent = 0, Qt::WindowFlags flags = 0); - ~LocalisedHelloWidget(); - -public: - QRectF boundingRect() const; - QPainterPath shape() const; - - QString rootPath()const; - void setRootPath(const QString &rootPath); -public slots: - void onInitialize(); - void onShow(); - void onHide(); -private slots: - void onButtonPressed(); - -private: - Q_DISABLE_COPY(LocalisedHelloWidget) - - HbPushButton *mButton; - QString mText; - QString mRootPath; - HbIconItem *mIcon; -}; - -#endif // HELLOWORLDWIDGET_H diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/inc/localisedhellowidgetplugin.h --- a/homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/inc/localisedhellowidgetplugin.h Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +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: Example of localised home screen widget -* -*/ - -#ifndef LOCALISEDHELLOWIDGETPLUGIN_H -#define LOCALISEDHELLOWIDGETPLUGIN_H - -#include -#include - -QTM_USE_NAMESPACE -class LocalisedHelloWidgetPlugin : public QObject, public QServicePluginInterface -{ - Q_OBJECT - Q_INTERFACES(QtMobility::QServicePluginInterface) - -public: - QObject *createInstance(const QServiceInterfaceDescriptor &descriptor, - QServiceContext *context, - QAbstractSecuritySession *session); -}; - -#endif // LOCALISEDHELLOWIDGETPLUGIN_H diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/locales/localisedhellowidgetplugin.qm Binary file homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/locales/localisedhellowidgetplugin.qm has changed diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/locales/localisedhellowidgetplugin.ts --- a/homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/locales/localisedhellowidgetplugin.ts Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ - - - - - - Hello World title - Hello World - Hello World - - helloview - title - he - False - - - Hello text - Hello! - Hello! - - helloview - info - he - False - - - diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_gb.qm Binary file homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_gb.qm has changed diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_gb.ts --- a/homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_gb.ts Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ - - - - - - Hello World title - Hello World - Hello World - - helloview - title - he - False - - - Hello text - Hello! - How do you do! - - helloview - info - he - False - - - diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_us.qm Binary file homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_us.qm has changed diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_us.ts --- a/homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_en_us.ts Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ - - - - - - Hello World title - Hello World - Hi World - - helloview - title - he - False - - - Hello text - Hello! - Hi dude! - - helloview - info - he - False - - - diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_fi.qm Binary file homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_fi.qm has changed diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_fi.ts --- a/homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/locales/localisedhellowidgetplugin_fi.ts Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ - - - - - - Hello World title - Hello World - Hei maa! - - helloview - title - he - False - - - Hello text - Hello! - No moro! - - helloview - info - he - False - - - diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/localisedhellowidgetplugin.pro --- a/homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/localisedhellowidgetplugin.pro Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,71 +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: Example of home screen widget -# - -TEMPLATE = lib -CONFIG += plugin mobility hb -MOBILITY = serviceframework - -HEADERS += ./inc/*.h -SOURCES += ./src/*.cpp - -INCLUDEPATH += ./inc - -symbian: { - - INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE - - TARGET.UID3 = 0x20022F80 - TARGET.EPOCALLOWDLLDATA=1 - TARGET.CAPABILITY = ALL -TCB - - DESTDIR = /private/20022F35/import/widgetregistry/20022F80 - - plugins.path = $${DESTDIR} - plugins.sources = $${TARGET}.dll - - widgetResources.path = $${DESTDIR} - widgetResources.sources += resource/$${TARGET}.xml - widgetResources.sources += resource/$${TARGET}.manifest - widgetResources.sources += resource/$${TARGET}.png - - localisedFiles.path = /resource/qt/translations - localisedFiles.sources += ./locales/*.qm - - DEPLOYMENT += plugins \ - widgetResources \ - localisedFiles -} - -win32: { - - CONFIG(debug, debug|release) { - SUBDIRPART = debug - } else { - SUBDIRPART = release - } - - PLUGIN_SUBDIR = /private/20022F35/import/widgetregistry/20022F80 - - DESTDIR = $$PWD/../../../../../bin/$${SUBDIRPART}/$${PLUGIN_SUBDIR} - - manifest.path = $${DESTDIR} - manifest.files = ./resource/*.manifest ./resource/*.xml ./resource/*.png - - widgetLocalisation.path = $$PWD/../../../../../bin/$${SUBDIRPART}/resource/qt/translations - widgetLocalisation.files += ./locales/*.qm - - INSTALLS += manifest widgetLocalisation -} diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/resource/localisedhellowidgetplugin.manifest --- a/homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/resource/localisedhellowidgetplugin.manifest Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ - - - - diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/resource/localisedhellowidgetplugin.png Binary file homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/resource/localisedhellowidgetplugin.png has changed diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/resource/localisedhellowidgetplugin.xml --- a/homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/resource/localisedhellowidgetplugin.xml Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ - - - localisedhellowidgetplugin - localisedhellowidgetplugin - Example widget - - com.nokia.symbian.IHomeScreenWidget - 1.0 - Example of localised widget - - localisedhellowidgetplugin.png - Hello - - diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/resource/localisedhellowidgetplugin.xml_for_sisx --- a/homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/resource/localisedhellowidgetplugin.xml_for_sisx Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ - - - localisedhellowidgetplugin - c:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.qtplugin - Localisation example widget - - com.nokia.symbian.IHomeScreenWidget - 1.0 - Example of localised widget - - localisedhellowidgetplugin.png - Hello - - diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/src/localisedhellowidget.cpp --- a/homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/src/localisedhellowidget.cpp Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,121 +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: Example of home screen widget -* -*/ - -#include -#include -#include -#include -#include -#include -#include "localisedhellowidget.h" - -/*! - \ingroup group_helloworld_widget - \class LocalisedHelloWidget - \brief Example implementation for home screen widget. - - LocalisedHelloWidget derived from the HbWidget and implements - needed functions for the home screen widget. -*/ - -/*! - Constructs a widget which is a child of \a parent, with widget flags set to \a flags. -*/ -LocalisedHelloWidget::LocalisedHelloWidget(QGraphicsItem* parent, Qt::WindowFlags flags) - : HbWidget(parent, flags),mIcon(0) -{ - QGraphicsLinearLayout* layout = new QGraphicsLinearLayout(Qt::Vertical); - setPreferredSize(200,100); - setLayout(layout); - mButton = new HbPushButton(); - layout->addItem(mButton); - - connect(mButton,SIGNAL(pressed()),SLOT(onButtonPressed())); - - - -} - -/*! - Destructor -*/ -LocalisedHelloWidget::~LocalisedHelloWidget() -{ - -} - -/*! - Return bounding rect -*/ -QRectF LocalisedHelloWidget::boundingRect() const -{ - return childrenBoundingRect(); -} - -/*! - Return shape -*/ -QPainterPath LocalisedHelloWidget::shape() const -{ - QPainterPath path; - path.addRect(boundingRect()); - return path; -} -QString LocalisedHelloWidget::rootPath()const -{ - return mRootPath; -} - -void LocalisedHelloWidget::setRootPath(const QString &rootPath) -{ - mRootPath = rootPath; -} - -void LocalisedHelloWidget::onInitialize() -{ - // localisation can be used now - mText = hbTrId("localisedhellowidgetplugin_txt_helloview_info_hello"); - mButton->setText(hbTrId("localisedhellowidgetplugin_txt_helloview_title_hello_world")); - // roothPath is set thus we can use it - QString iconPath = QDir::toNativeSeparators(mRootPath + "/localisedhellowidgetplugin.png"); - mIcon = new HbIconItem(iconPath); - static_cast(layout())->addItem(mIcon); - - -} - -/*! - Called when widget is shown in the home screen -*/ -void LocalisedHelloWidget::onShow() -{ -} - -/*! - Called when widget is hidden from the home screen -*/ -void LocalisedHelloWidget::onHide() -{ -} - -void LocalisedHelloWidget::onButtonPressed() -{ - QString tmp = mButton->text(); - mButton->setText(mText); - mText = tmp; -} - diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/src/localisedhellowidgettplugin.cpp --- a/homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugin/src/localisedhellowidgettplugin.cpp Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,146 +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: Example of localised home screen widget -* -*/ - -#include -#include -#include - -#include "localisedhellowidgetplugin.h" -#include "localisedhellowidget.h" - -/** - @page page_creating_widget_plugin Creating Home Screen Widget Plugin - - Widgets are exposed to the home screen through QT Service Framework. - Widget plugins are implemented according to - Qt service framework plugin model. - - See @ref page_nativewidgetmodel for the instructions how to create widget for the home screen. - - The steps to create a widget plugin are: -

Declare a plugin class that inherits from QObject and from the \c QServicePluginInterface interface. - -
Use the Q_INTERFACES() macro to tell Qt's meta-object system about the \c QServicePluginInterface interface. - -
Export the plugin using the Q_EXPORT_PLUGIN2() macro. - -
Build the plugin using an suitable .pro file. See @ref page_deploying_widget_plugin -

- - An example (full example source code can be found from section @ref page_nativewidgetmodel): - - Each widget plugin has a XML file that allows searching widgets through QT service framework without first loading it. - The XML file contains information on widgets inside the plugin: - - \li \c name The name of the plugin binary. - \li \c filepath The absolute path and name of plugin without suffix - \li \c interface name Uniquely identifies the widget. - \li \c title Widget's human-readable name. - \li \c iconuri URI of the widget's icon image file. - - Example: XML for a widget plugin. - - @code - - - helloworldwidgetplugin - helloworldwidgetplugin - Example widget - - com.nokia.symbian.IHomeScreenWidget - 1.0 - Example of home screen widget - - helloworldwidgetplugin.png - HelloWorld - - - @endcode -*/ - -/** - @page page_deploying_widget_plugin Deploying Home Screen Widget Plugin - - Widget's binaries and xml file(s) must be deployed to correct folders on emulator and in target. - Below are the needed .pro file for the \c helloworldwidgetplugin. - - For example: - - @code - # helloworldwidgetplugin.pro - - TEMPLATE = lib - CONFIG += plugin mobility hb - MOBILITY = serviceframework - - HEADERS += ./inc/ .h - SOURCES += ./src/ .cpp - - DESTDIR = $${EPOCROOT}epoc32/data/c/private/20022F35/import/widgetregistry/20022F7E - - INCLUDEPATH += ./inc - - symbian: { - INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE - - TARGET.UID3 = 0x20022F7E - 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}.png - - DEPLOYMENT += plugins \ - widgetResources - } - - @endcode - - For detailed information on DEPLOYMENT macro, see here. -*/ - -/*! - \ingroup group_helloworld_widget - \class HelloWorldWidgetPlugin - \brief Example implementation for home screen widget plugin. -*/ - -/*! - Initialize plugin for hello world widget. Contains necessary information about - the hello world widget that it can be loaded through QT Service Framework. -*/ -QObject *LocalisedHelloWidgetPlugin::createInstance(const QServiceInterfaceDescriptor &descriptor, - QServiceContext *context, - QAbstractSecuritySession *session) -{ - Q_UNUSED(context); - Q_UNUSED(session); - - if (descriptor.interfaceName() == QLatin1String("com.nokia.symbian.IHomeScreenWidget")) { - return new LocalisedHelloWidget(); - } else { - return 0; - } -} - -Q_EXPORT_PLUGIN2(localisedhellowidgetplugin, LocalisedHelloWidgetPlugin) diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugininstaller/localisedhellowidgetplugininstaller.cpp --- a/homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugininstaller/localisedhellowidgetplugininstaller.cpp Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +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: Example of home screen widget -* -*/ - -#include -#include -#include - -QTM_USE_NAMESPACE - -const char xml[] = "C:/data/widgets/servicefw/localisedhellowidgetplugin.xml"; - -int main(int argc, char *argv[]) -{ - QCoreApplication app(argc, argv); - - QServiceManager s; - - if (QFile::exists(xml)) { - s.addService(xml); - } else { - s.removeService("localisedhellowidgetplugin"); - } -} diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugininstaller/localisedhellowidgetplugininstaller.pro --- a/homescreenapp/examples/localisedhellowidgetplugin/localisedhellowidgetplugininstaller/localisedhellowidgetplugininstaller.pro Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +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: Example of home screen widget -# - -TEMPLATE = app - -QT = core -CONFIG += no_icon - -CONFIG += mobility -MOBILITY = serviceframework - -SOURCES += localisedhellowidgetplugininstaller.cpp - -symbian { - TARGET.CAPABILITY = ALL -TCB -} diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/resource/localisedhellowidgetplugin.manifest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/localisedhellowidgetplugin/resource/localisedhellowidgetplugin.manifest Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,10 @@ + + + localisedhellowidgetplugin + txt_localisedhellowidgetplugin_dblist_hello_world_title + txt_localisedhellowidgetplugin_dblist_hello_world_desc + localisedhellowidgetplugin.png + false + localisedhellowidgetplugin.xml + + diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/resource/localisedhellowidgetplugin.png Binary file homescreenapp/examples/localisedhellowidgetplugin/resource/localisedhellowidgetplugin.png has changed diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/resource/localisedhellowidgetplugin.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/localisedhellowidgetplugin/resource/localisedhellowidgetplugin.xml Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,10 @@ + + + localisedhellowidgetplugin + localisedhellowidgetplugin + + com.nokia.symbian.IHomeScreenWidget + 1.0 + + + diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/sis/localisedhellowidgetplugin.pkg --- a/homescreenapp/examples/localisedhellowidgetplugin/sis/localisedhellowidgetplugin.pkg Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/examples/localisedhellowidgetplugin/sis/localisedhellowidgetplugin.pkg Thu May 27 12:46:08 2010 +0300 @@ -33,15 +33,16 @@ [0x102752AE],0,0,0,{"S60ProductID"} [0x1028315F],0,0,0,{"S60ProductID"} -"/epoc32/release/armv5/urel/localisedhellowidgetplugin.dll" - "!:/sys/bin/localisedhellowidgetplugin.dll" -"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.qtplugin" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.qtplugin" -"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.manifest" -"../localisedhellowidgetplugin/resource/localisedhellowidgetplugin.xml_for_sisx" - "C:/data/widgets/servicefw/localisedhellowidgetplugin.xml" -"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.png" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.png" +"../resource/localisedhellowidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.manifest",FM,"application/hs-widget-uninstall+xml",RR,RW -"/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin.qm" - "!:/resource/qt/translations/localisedhellowidgetplugin.qm" -"/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin_fi.qm" - "!:/resource/qt/translations/localisedhellowidgetplugin_fi.qm" -"/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin_en_us.qm" - "!:/resource/qt/translations/localisedhellowidgetplugin_en_us.qm" -"/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin_en_gb.qm" - "!:/resource/qt/translations/localisedhellowidgetplugin_en_gb.qm" +"/epoc32/release/armv5/urel/localisedhellowidgetplugin.dll" - "!:/sys/bin/localisedhellowidgetplugin.dll" +"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.qtplugin" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.qtplugin" +"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.manifest" +"../resource/localisedhellowidgetplugin.xml" - "!:/data/widgets/servicefw/localisedhellowidgetplugin.xml" +"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.png" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.png" -"/epoc32/release/armv5/urel/localisedhellowidgetplugininstaller.exe" - "!:/sys/bin/localisedhellowidgetplugininstaller.exe", FR, RB, RW +"/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin.qm" - "!:/resource/qt/translations/localisedhellowidgetplugin.qm" +"/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin_fi.qm" - "!:/resource/qt/translations/localisedhellowidgetplugin_fi.qm" +"/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin_en_us.qm" - "!:/resource/qt/translations/localisedhellowidgetplugin_en_us.qm" +"/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin_en_gb.qm" - "!:/resource/qt/translations/localisedhellowidgetplugin_en_gb.qm" + diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/sis/localisedhellowidgetplugin_winscw.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/localisedhellowidgetplugin/sis/localisedhellowidgetplugin_winscw.pkg Thu May 27 12:46:08 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: +; + +; Language +&EN + +; SIS header: name, uid, version +#{"localisedhellowidgetplugin"},(0x20022F80),1,0,0 + +; Localised Vendor name +%{"Vendor"} + +; Unique Vendor name +:"Vendor" + +; Manual PKG pre-rules from PRO files +; Default HW/platform dependencies +[0x101F7961],0,0,0,{"S60ProductID"} +[0x102032BE],0,0,0,{"S60ProductID"} +[0x102752AE],0,0,0,{"S60ProductID"} +[0x1028315F],0,0,0,{"S60ProductID"} + +"../resource/localisedhellowidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.manifest",FM,"application/hs-widget-uninstall+xml",RR,RW + +"/epoc32/release/winscw/udeb/localisedhellowidgetplugin.dll" - "!:/sys/bin/localisedhellowidgetplugin.dll" +"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.qtplugin" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.qtplugin" +"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.manifest" +"../resource/localisedhellowidgetplugin.xml" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.xml" +"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.png" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.png" + +"/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin.qm" - "!:/resource/qt/translations/localisedhellowidgetplugin.qm" +"/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin_fi.qm" - "!:/resource/qt/translations/localisedhellowidgetplugin_fi.qm" +"/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin_en_us.qm" - "!:/resource/qt/translations/localisedhellowidgetplugin_en_us.qm" +"/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin_en_gb.qm" - "!:/resource/qt/translations/localisedhellowidgetplugin_en_gb.qm" + diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/src/localisedhellowidget.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/localisedhellowidgetplugin/src/localisedhellowidget.cpp Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,115 @@ +/* +* 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 +#include +#include +#include +#include +#include +#include "localisedhellowidget.h" + +/*! + \ingroup group_helloworld_widget + \class LocalisedHelloWidget + \brief Example implementation for home screen widget. + + LocalisedHelloWidget derived from the HbWidget and implements + needed functions for the home screen widget to demonstrate widget localisation. +*/ + +/*! + Constructs a widget which is a child of \a parent, with widget flags set to \a flags. +*/ +LocalisedHelloWidget::LocalisedHelloWidget(QGraphicsItem* parent, Qt::WindowFlags flags) + : HbWidget(parent, flags),mIcon(0) +{ + QGraphicsLinearLayout* layout = new QGraphicsLinearLayout(Qt::Vertical); + setPreferredSize(200,100); + setLayout(layout); + mButton = new HbPushButton(); + layout->addItem(mButton); + + connect(mButton,SIGNAL(pressed()),SLOT(onButtonPressed())); +} + +/*! + Destructor +*/ +LocalisedHelloWidget::~LocalisedHelloWidget() +{ + +} + +/*! + Root path for widget's resources +*/ +QString LocalisedHelloWidget::rootPath()const +{ + return mRootPath; +} + +/*! + Set's widget root path as \a rootPath +*/ +void LocalisedHelloWidget::setRootPath(const QString &rootPath) +{ + mRootPath = rootPath; +} + +/*! + Called when widget is initialized +*/ +void LocalisedHelloWidget::onInitialize() +{ + // localisation can be used now + mText = hbTrId("txt_localisedhellowidgetplugin_button_hello_world2"); + QString testing = hbTrId("txt_localisedhellowidgetplugin_button_hello_world2"); + testing = hbTrId("txt_localisedhellowidgetplugin_button_hello_world1"); + testing = hbTrId("txt_localisedhellowidgetplugin_dblist_hello_world_title"); + testing = hbTrId("txt_localisedhellowidgetplugin_dblist_hello_world_desc"); + mButton->setText(hbTrId("txt_localisedhellowidgetplugin_button_hello_world1")); + // roothPath is set thus we can use it + QString iconPath = QDir::toNativeSeparators(mRootPath + "/localisedhellowidgetplugin.png"); + mIcon = new HbIconItem(iconPath); + static_cast(layout())->addItem(mIcon); +} + +/*! + Called when widget is shown in the home screen +*/ +void LocalisedHelloWidget::onShow() +{ +} + +/*! + Called when widget is hidden from the home screen +*/ +void LocalisedHelloWidget::onHide() +{ +} + +/*! + Called when button is pressed, toggles between two localised strings. +*/ +void LocalisedHelloWidget::onButtonPressed() +{ + QString tmp = mButton->text(); + mButton->setText(mText); + mText = tmp; +} + diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/localisedhellowidgetplugin/src/localisedhellowidgettplugin.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/localisedhellowidgetplugin/src/localisedhellowidgettplugin.cpp Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,146 @@ +/* +* 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 localised home screen widget +* +*/ + +#include +#include +#include + +#include "localisedhellowidgetplugin.h" +#include "localisedhellowidget.h" + +/** + @page page_creating_widget_plugin Creating Home Screen Widget Plugin + + Widgets are exposed to the home screen through QT Service Framework. + Widget plugins are implemented according to + Qt service framework plugin model. + + See @ref page_nativewidgetmodel for the instructions how to create widget for the home screen. + + The steps to create a widget plugin are: +

Declare a plugin class that inherits from QObject and from the \c QServicePluginInterface interface. + +
Use the Q_INTERFACES() macro to tell Qt's meta-object system about the \c QServicePluginInterface interface. + +
Export the plugin using the Q_EXPORT_PLUGIN2() macro. + +
Build the plugin using an suitable .pro file. See @ref page_deploying_widget_plugin +

+ + An example (full example source code can be found from section @ref page_nativewidgetmodel): + + Each widget plugin has a XML file that allows searching widgets through QT service framework without first loading it. + The XML file contains information on widgets inside the plugin: + + \li \c name The name of the plugin binary. + \li \c filepath The absolute path and name of plugin without suffix + \li \c interface name Uniquely identifies the widget. + \li \c title Widget's human-readable name. + \li \c iconuri URI of the widget's icon image file. + + Example: XML for a widget plugin. + + @code + + + helloworldwidgetplugin + helloworldwidgetplugin + Example widget + + com.nokia.symbian.IHomeScreenWidget + 1.0 + Example of home screen widget + + helloworldwidgetplugin.png + HelloWorld + + + @endcode +*/ + +/** + @page page_deploying_widget_plugin Deploying Home Screen Widget Plugin + + Widget's binaries and xml file(s) must be deployed to correct folders on emulator and in target. + Below are the needed .pro file for the \c helloworldwidgetplugin. + + For example: + + @code + # helloworldwidgetplugin.pro + + TEMPLATE = lib + CONFIG += plugin mobility hb + MOBILITY = serviceframework + + HEADERS += ./inc/ .h + SOURCES += ./src/ .cpp + + DESTDIR = $${EPOCROOT}epoc32/data/c/private/20022F35/import/widgetregistry/20022F7E + + INCLUDEPATH += ./inc + + symbian: { + INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE + + TARGET.UID3 = 0x20022F7E + 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}.png + + DEPLOYMENT += plugins \ + widgetResources + } + + @endcode + + For detailed information on DEPLOYMENT macro, see here. +*/ + +/*! + \ingroup group_helloworld_widget + \class HelloWorldWidgetPlugin + \brief Example implementation for home screen widget plugin. +*/ + +/*! + Initialize plugin for hello world widget. Contains necessary information about + the hello world widget that it can be loaded through QT Service Framework. +*/ +QObject *LocalisedHelloWidgetPlugin::createInstance(const QServiceInterfaceDescriptor &descriptor, + QServiceContext *context, + QAbstractSecuritySession *session) +{ + Q_UNUSED(context); + Q_UNUSED(session); + + if (descriptor.interfaceName() == QLatin1String("com.nokia.symbian.IHomeScreenWidget")) { + return new LocalisedHelloWidget(); + } else { + return 0; + } +} + +Q_EXPORT_PLUGIN2(localisedhellowidgetplugin, LocalisedHelloWidgetPlugin) diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/pannablewidgetplugin/inc/pannablewidget.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/pannablewidgetplugin/inc/pannablewidget.h Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,41 @@ +/* +* 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 PANNABLEWIDGET_H +#define PANNABLEWIDGET_H + +#include + +class PannableWidget : public HbWidget +{ + Q_OBJECT + +public: + PannableWidget(QGraphicsItem *parent = 0, Qt::WindowFlags flags = 0); + ~PannableWidget(); + + Q_INVOKABLE bool isPannable(QGraphicsSceneMouseEvent *event); +public slots: + void onShow(); + void onHide(); +private: + QGraphicsItem *findChildItemByName(QGraphicsItem *item, const QString &name); +private: + Q_DISABLE_COPY(PannableWidget) +}; + +#endif // PANNABLEWIDGET_H diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/pannablewidgetplugin/inc/pannablewidgetplugin.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/pannablewidgetplugin/inc/pannablewidgetplugin.h Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,36 @@ +/* +* 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 PANNABLEWIDGETPLUGIN_H +#define PANNABLEWIDGETPLUGIN_H + +#include +#include + +QTM_USE_NAMESPACE +class PannableWidgetPlugin : public QObject, public QServicePluginInterface +{ + Q_OBJECT + Q_INTERFACES(QtMobility::QServicePluginInterface) + +public: + QObject *createInstance(const QServiceInterfaceDescriptor &descriptor, + QServiceContext *context, + QAbstractSecuritySession *session); +}; + +#endif // PANNABLEWIDGETPLUGIN_H diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/pannablewidgetplugin/pannablewidgetplugin.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/pannablewidgetplugin/pannablewidgetplugin.pro Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,64 @@ +# +# 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 + +HEADERS += ./inc/*.h +SOURCES += ./src/*.cpp + +INCLUDEPATH += ./inc + +symbian: { + + DESTDIR = /private/20022F35/import/widgetregistry/20022F7C + INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE + + TARGET.UID3 = 0x20022F7C + 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}.png + + DEPLOYMENT += plugins \ + widgetResources +} + +win32: { + + CONFIG(debug, debug|release) { + SUBDIRPART = debug + } else { + SUBDIRPART = release + } + + PLUGIN_SUBDIR = /private/20022F35/import/widgetregistry/20022F7C + + DESTDIR = $$PWD/../../../../bin/$${SUBDIRPART}/$${PLUGIN_SUBDIR} + + manifest.path = $${DESTDIR} + manifest.files = ./resource/*.manifest ./resource/*.xml ./resource/*.png + + INSTALLS += manifest + +} diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/pannablewidgetplugin/resource/pannablewidgetplugin.manifest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/pannablewidgetplugin/resource/pannablewidgetplugin.manifest Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,9 @@ + + + pannablewidgetplugin + Pannable widget + Home screen example widget + pannablewidgetplugin.png + false + pannablewidgetplugin.xml + diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/pannablewidgetplugin/resource/pannablewidgetplugin.png Binary file homescreenapp/examples/pannablewidgetplugin/resource/pannablewidgetplugin.png has changed diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/pannablewidgetplugin/resource/pannablewidgetplugin.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/pannablewidgetplugin/resource/pannablewidgetplugin.xml Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,12 @@ + + + pannablewidgetplugin + pannablewidgetplugin + Example widget + + com.nokia.symbian.IHomeScreenWidget + 1.0 + Example of home screen widget + + + diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/pannablewidgetplugin/sis/pannablewidgetplugin.bat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/pannablewidgetplugin/sis/pannablewidgetplugin.bat Thu May 27 12:46:08 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 pannablewidgetplugin.sisx del pannablewidgetplugin.sisx + +makesis pannablewidgetplugin.pkg +signsis pannablewidgetplugin.sis pannablewidgetplugin.sisx ../../../sis/rd.cer ../../../sis/rd-key.pem + +if exist pannablewidgetplugin.sisx ( +echo pannablewidgetplugin.sisx creation SUCCEEDED +del pannablewidgetplugin.sis +) + +if not exist pannablewidgetplugin.sisx ( +echo pannablewidgetplugin.sisx creation FAILED +) \ No newline at end of file diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/pannablewidgetplugin/sis/pannablewidgetplugin.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/pannablewidgetplugin/sis/pannablewidgetplugin.pkg Thu May 27 12:46:08 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 +#{"pannablewidgetplugin"},(0x20022F7C),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/pannablewidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F7C/pannablewidgetplugin.manifest",FM,"application/hs-widget-uninstall+xml",RR,RW + +"/epoc32/release/armv5/urel/pannablewidgetplugin.dll" - "!:/sys/bin/pannablewidgetplugin.dll" +"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F7C/pannablewidgetplugin.qtplugin" - "!:/private/20022F35/import/widgetregistry/20022F7C/pannablewidgetplugin.qtplugin" +"../resource/pannablewidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F7C/pannablewidgetplugin.manifest" +"../resource/pannablewidgetplugin.xml" - "!:/private/20022F35/import/widgetregistry/20022F7C/pannablewidgetplugin.xml" +"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F7C/pannablewidgetplugin.png" - "!:/private/20022F35/import/widgetregistry/20022F7C/pannablewidgetplugin.png" + diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/pannablewidgetplugin/sis/pannablewidgetplugin_winscw.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/pannablewidgetplugin/sis/pannablewidgetplugin_winscw.pkg Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,43 @@ +; +; 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 +#{"pannablewidgetplugin"},(0x20022F7C),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/pannablewidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F7C/pannablewidgetplugin.manifest",FM,"application/hs-widget-uninstall+xml",RR,RW + +"/epoc32/release/winscw/udeb/pannablewidgetplugin.dll" - "!:/sys/bin/pannablewidgetplugin.dll" +"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F7C/pannablewidgetplugin.qtplugin" - "!:/private/20022F35/import/widgetregistry/20022F7C/pannablewidgetplugin.qtplugin" +"../resource/pannablewidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F7C/pannablewidgetplugin.manifest" +"../resource/pannablewidgetplugin.xml" - "!:/private/20022F35/import/widgetregistry/20022F7C/pannablewidgetplugin.xml" +"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F7C/pannablewidgetplugin.png" - "!:/private/20022F35/import/widgetregistry/20022F7C/pannablewidgetplugin.png" diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/pannablewidgetplugin/src/pannablewidget.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/pannablewidgetplugin/src/pannablewidget.cpp Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,132 @@ +/* +* 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 + +#include +#include +#include +#include +#include +#include "pannablewidget.h" + + + +/*! + \ingroup group_pannablewidget + \class PannableWidget + \brief Example implementation for pannable home screen widget. + + Pannable widget demostrates usage of horizontal pan gesture instead of Home Screen using it for + page change. + + To enable horizontal pan gesture widget need to implement isPannable() function. Widget should return true if pannable item's + pan region contains event position. +*/ + + +const int ItemName = 0xfffe; + +/*! + Constructs a widget which is a child of \a parent, with widget flags set to \a flags. +*/ +PannableWidget::PannableWidget(QGraphicsItem* parent, Qt::WindowFlags flags) + : HbWidget(parent, flags) +{ + QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Vertical); + layout->setContentsMargins(0.0, 0.0, 0.0, 0.0); + setLayout(layout); + + HbPushButton *button = new HbPushButton("Jenson Button"); + button->setPreferredSize(QSizeF(200.0,20.0)); + layout->addItem(button); + + HbSlider *slider = new HbSlider(Qt::Horizontal); + slider->setData(ItemName,QLatin1String("slider")); + slider->setRange(0,10); + slider->setValue(5); + layout->addItem(slider); + + + QGraphicsRectItem *background = new QGraphicsRectItem(); + background->setBrush(QBrush(QColor(0x9acd32))); + setBackgroundItem(background); + + resize(200.0, 100.0); + background->setRect(rect()); + +} + +/*! + Destructor +*/ +PannableWidget::~PannableWidget() +{ +} +/*! + Called by Home Screen when pan event is recognized. Given \a event + can be used to check whether pannable item contains event position. +*/ +bool PannableWidget::isPannable(QGraphicsSceneMouseEvent *event) +{ + bool ret(false); + // Take position in scene coordinates + QPointF position = event->buttonDownScenePos(Qt::LeftButton); + // find pannable item + QGraphicsItem* item = findChildItemByName(this,"slider"); + // check whether it is event is inside it + if (item && item->sceneBoundingRect().contains(position)) { + ret = true; + } + return ret; +} +/*! + Find \a item childs by given \a name. Uses recursion. +*/ +QGraphicsItem *PannableWidget::findChildItemByName(QGraphicsItem *item, const QString &name) +{ + if (!item) return NULL; + + QList children = item->childItems(); + foreach (QGraphicsItem *child, children) { + if(name == child->data(ItemName).toString()) { + return child; + } + } + // do recursive search + foreach (QGraphicsItem *child, children) { + QGraphicsItem* itemFromChild = findChildItemByName(child,name); + if (itemFromChild) { + return itemFromChild; + } + } + return NULL; +} + + +/*! + Called when widget is shown in the home screen +*/ +void PannableWidget::onShow() +{ +} + +/*! + Called when widget is hidden from the home screen +*/ +void PannableWidget::onHide() +{ +} diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/examples/pannablewidgetplugin/src/pannablewidgetplugin.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/pannablewidgetplugin/src/pannablewidgetplugin.cpp Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,60 @@ +/* +* 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 +#include +#include + +#include "pannablewidgetplugin.h" +#include "pannablewidget.h" + +/** + @page page_creating_pannable_widget Creating pannable Home Screen Widget Plugin + + When widget need to use horizontal pan gesture itself, e.g when slider is used + it must implement bool isPannable(QGraphicsMouseEvent *) function. + + Home Screen will call this when it recognize a pan gesture on a widget. + By default, horizontal pan gesture is used to switch pages, but if isPannable() + returns true, event is not filtered by Home Screen. +*/ + +/*! + \ingroup group_pannablewidget + \class PannableWidgetPlugin + \brief Example implementation for home screen widget plugin. +*/ + +/*! + Initialize plugin for pannable widget. Contains necessary information about + the pannable widget that it can be loaded through QT Service Framework. +*/ +QObject *PannableWidgetPlugin::createInstance(const QServiceInterfaceDescriptor &descriptor, + QServiceContext *context, + QAbstractSecuritySession *session) +{ + Q_UNUSED(context); + Q_UNUSED(session); + + if (descriptor.interfaceName() == QLatin1String("com.nokia.symbian.IHomeScreenWidget")) { + return new PannableWidget(); + } else { + return 0; + } +} + +Q_EXPORT_PLUGIN2(pannablewidgetplugin, PannableWidgetPlugin) diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsapplication/conf/base/confml/homescreendb.confml --- a/homescreenapp/hsapplication/conf/base/confml/homescreendb.confml Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/hsapplication/conf/base/confml/homescreendb.confml Thu May 27 12:46:08 2010 +0300 @@ -38,6 +38,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -92,6 +128,42 @@ 10 21 32 + + 1 + 1 + 30.0 + 6.0 + 0.0 + 500 + + + Sensitive + ItemPick + ItemDrop + BounceEffect + ItemMoveOver + ItemDrop + BasicItem + Basic + BasicItem + ItemMoveOver + + + 20 + 16 + 500 + 500 + 60 + 8 + 200 + 800 + 200 + 200 + 700 + 200 + 200 + 3 + \ No newline at end of file diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsapplication/conf/base/implml/homescreendb_templates/create.sql --- a/homescreenapp/hsapplication/conf/base/implml/homescreendb_templates/create.sql Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/hsapplication/conf/base/implml/homescreendb_templates/create.sql Thu May 27 12:46:08 2010 +0300 @@ -38,3 +38,43 @@ widgetId INTEGER, UNIQUE(widgetId, key) ON CONFLICT REPLACE, FOREIGN KEY(widgetId) REFERENCES Widgets(id) ON DELETE CASCADE); + +DROP TABLE IF EXISTS SnapConfiguration; +CREATE TABLE SnapConfiguration ( + snappingEnabled INTEGER, + showEffects INTEGER, + snapForce REAL, + snapGap REAL, + borderGap REAL, + timeout INTEGER); + +DROP TABLE IF EXISTS FeedbackConfiguration; +CREATE TABLE FeedbackConfiguration ( + pageChangeFeedbackType TEXT, + widgetPickFeedbackType TEXT, + widgetDropFeedbackType TEXT, + widgetRepositionFeedbackType TEXT, + widgetOverTrashbinFeedbackType TEXT, + widgetDropToTrashbinFeedbackType TEXT, + shortcutWidgetTapFeedbackType TEXT, + widgetMoveBlockedFeedbackType TEXT, + clockWidgetTapFeedbackType TEXT, + widgetSnappingFeedbackType TEXT); + +DROP TABLE IF EXISTS GeneralConfiguration; +CREATE TABLE GeneralConfiguration ( + bounceEffect INTEGER, + tapAndHoldDistance REAL, + widgetTapAndHoldTimeout INTEGER, + sceneTapAndHoldTimeout INTEGER, + pageChangeZoneWidth REAL, + pageIndicatorSpacing REAL, + pageChangeAnimationDuration INTEGER, + pageChangeZoneAnimationDuration INTEGER, + pageChangeZoneReverseAnimationDuration INTEGER, + pageRemovedAnimationDuration INTEGER, + newPageAddedAnimationDuration INTEGER, + widgetDragEffectDuration INTEGER, + widgetDropEffectDuration INTEGER, + boundaryFeedbackEffectDistance INTEGER); + \ No newline at end of file diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsapplication/conf/base/implml/homescreendb_templates/fill.sql --- a/homescreenapp/hsapplication/conf/base/implml/homescreendb_templates/fill.sql Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/hsapplication/conf/base/implml/homescreendb_templates/fill.sql Thu May 27 12:46:08 2010 +0300 @@ -39,3 +39,40 @@ INSERT INTO WidgetPreferences (key, value, widgetId) VALUES ('{{key}}', '{{value}}', {{widgetId}}); {% endfor %} + +{%- set snappingEnabled = feat_tree.HomeScreenDbSettings.SnapConfiguration.snappingEnabled._value -%} +{%- set showEffects = feat_tree.HomeScreenDbSettings.SnapConfiguration.showEffects._value -%} +{%- set snapForce = feat_tree.HomeScreenDbSettings.SnapConfiguration.snapForce._value -%} +{%- set snapGap = feat_tree.HomeScreenDbSettings.SnapConfiguration.snapGap._value -%} +{%- set borderGap = feat_tree.HomeScreenDbSettings.SnapConfiguration.borderGap._value -%} +{%- set timeout = feat_tree.HomeScreenDbSettings.SnapConfiguration.timeout._value -%} +INSERT INTO SnapConfiguration (snappingEnabled, showEffects, snapForce, snapGap, borderGap, timeout) VALUES ({{snappingEnabled}}, {{showEffects}}, {{snapForce}}, {{snapGap}}, {{borderGap}}, {{timeout}}); + +{%- set bounceEffect = feat_tree.HomeScreenDbSettings.GeneralConfiguration.bounceEffect._value -%} +{%- set tapAndHoldDistance = feat_tree.HomeScreenDbSettings.GeneralConfiguration.tapAndHoldDistance._value -%} +{%- set widgetTapAndHoldTimeout = feat_tree.HomeScreenDbSettings.GeneralConfiguration.widgetTapAndHoldTimeout._value -%} +{%- set sceneTapAndHoldTimeout = feat_tree.HomeScreenDbSettings.GeneralConfiguration.sceneTapAndHoldTimeout._value -%} +{%- set pageChangeZoneWidth = feat_tree.HomeScreenDbSettings.GeneralConfiguration.pageChangeZoneWidth._value -%} +{%- set pageIndicatorSpacing = feat_tree.HomeScreenDbSettings.GeneralConfiguration.pageIndicatorSpacing._value -%} +{%- set pageChangeAnimationDuration = feat_tree.HomeScreenDbSettings.GeneralConfiguration.pageChangeAnimationDuration._value -%} +{%- set pageChangeZoneAnimationDuration = feat_tree.HomeScreenDbSettings.GeneralConfiguration.pageChangeZoneAnimationDuration._value -%} +{%- set pageChangeZoneReverseAnimationDuration = feat_tree.HomeScreenDbSettings.GeneralConfiguration.pageChangeZoneReverseAnimationDuration._value -%} +{%- set pageRemovedAnimationDuration = feat_tree.HomeScreenDbSettings.GeneralConfiguration.pageRemovedAnimationDuration._value -%} +{%- set newPageAddedAnimationDuration = feat_tree.HomeScreenDbSettings.GeneralConfiguration.newPageAddedAnimationDuration._value -%} +{%- set widgetDragEffectDuration = feat_tree.HomeScreenDbSettings.GeneralConfiguration.widgetDragEffectDuration._value -%} +{%- set widgetDropEffectDuration = feat_tree.HomeScreenDbSettings.GeneralConfiguration.widgetDropEffectDuration._value -%} +{%- set boundaryFeedbackEffectDistance = feat_tree.HomeScreenDbSettings.GeneralConfiguration.boundaryFeedbackEffectDistance._value -%} +INSERT INTO GeneralConfiguration (bounceEffect, tapAndHoldDistance, widgetTapAndHoldTimeout, sceneTapAndHoldTimeout, pageChangeZoneWidth, pageIndicatorSpacing, pageChangeAnimationDuration, pageChangeZoneAnimationDuration, pageChangeZoneReverseAnimationDuration, pageRemovedAnimationDuration, newPageAddedAnimationDuration, widgetDragEffectDuration, widgetDropEffectDuration, boundaryFeedbackEffectDistance ) VALUES ({{bounceEffect}}, {{tapAndHoldDistance}}, {{widgetTapAndHoldTimeout}}, {{widgetTapAndHoldTimeout}}, {{pageChangeZoneWidth}}, {{pageIndicatorSpacing}}, {{pageChangeAnimationDuration}}, {{pageChangeZoneAnimationDuration}}, {{pageChangeZoneReverseAnimationDuration}}, {{pageRemovedAnimationDuration}}, {{newPageAddedAnimationDuration}}, {{widgetDragEffectDuration}}, {{widgetDropEffectDuration}}, {{boundaryFeedbackEffectDistance}}); + +{%- set pageChangeFeedbackType = feat_tree.HomeScreenDbSettings.FeedbackConfiguration.pageChangeFeedbackType._value -%} +{%- set widgetPickFeedbackType = feat_tree.HomeScreenDbSettings.FeedbackConfiguration.widgetPickFeedbackType._value -%} +{%- set widgetDropFeedbackType = feat_tree.HomeScreenDbSettings.FeedbackConfiguration.widgetDropFeedbackType._value -%} +{%- set widgetRepositionFeedbackType = feat_tree.HomeScreenDbSettings.FeedbackConfiguration.widgetRepositionFeedbackType._value -%} +{%- set widgetOverTrashbinFeedbackType = feat_tree.HomeScreenDbSettings.FeedbackConfiguration.widgetOverTrashbinFeedbackType._value -%} +{%- set widgetDropToTrashbinFeedbackType = feat_tree.HomeScreenDbSettings.FeedbackConfiguration.widgetDropToTrashbinFeedbackType._value -%} +{%- set shortcutWidgetTapFeedbackType = feat_tree.HomeScreenDbSettings.FeedbackConfiguration.shortcutWidgetTapFeedbackType._value -%} +{%- set widgetMoveBlockedFeedbackType = feat_tree.HomeScreenDbSettings.FeedbackConfiguration.widgetMoveBlockedFeedbackType._value -%} +{%- set clockWidgetTapFeedbackType = feat_tree.HomeScreenDbSettings.FeedbackConfiguration.clockWidgetTapFeedbackType._value -%} +{%- set widgetSnappingFeedbackType = feat_tree.HomeScreenDbSettings.FeedbackConfiguration.widgetSnappingFeedbackType._value -%} +INSERT INTO FeedbackConfiguration (pageChangeFeedbackType, widgetPickFeedbackType, widgetDropFeedbackType, widgetRepositionFeedbackType, widgetOverTrashbinFeedbackType, widgetDropToTrashbinFeedbackType, shortcutWidgetTapFeedbackType, widgetMoveBlockedFeedbackType, clockWidgetTapFeedbackType, widgetSnappingFeedbackType) VALUES ('{{pageChangeFeedbackType}}', '{{widgetPickFeedbackType}}', '{{widgetDropFeedbackType}}', '{{widgetRepositionFeedbackType}}', '{{widgetOverTrashbinFeedbackType}}', '{{widgetDropToTrashbinFeedbackType}}', '{{shortcutWidgetTapFeedbackType}}', '{{widgetMoveBlockedFeedbackType}}', '{{clockWidgetTapFeedbackType}}', '{{widgetSnappingFeedbackType}}'); + diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsapplication/hsapplication_fallbacktheme.qrc --- a/homescreenapp/hsapplication/hsapplication_fallbacktheme.qrc Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/hsapplication/hsapplication_fallbacktheme.qrc Thu May 27 12:46:08 2010 +0300 @@ -62,16 +62,5 @@ themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_t.svg themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_tl.svg themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_tr.svg - - themes/icons/hbdefault/scalable/qtg_anim_longtap_0.svg - themes/icons/hbdefault/scalable/qtg_anim_longtap_1.svg - themes/icons/hbdefault/scalable/qtg_anim_longtap_2.svg - themes/icons/hbdefault/scalable/qtg_anim_longtap_3.svg - themes/icons/hbdefault/scalable/qtg_anim_longtap_4.svg - themes/icons/hbdefault/scalable/qtg_anim_longtap_5.svg - themes/icons/hbdefault/scalable/qtg_anim_longtap_6.svg - themes/icons/hbdefault/scalable/qtg_anim_longtap_7.svg - themes/icons/hbdefault/scalable/qtg_anim_longtap_8.svg - themes/icons/hbdefault/scalable/qtg_anim_longtap_9.svg diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsapplication/resource_s60/homescreen.db Binary file homescreenapp/hsapplication/resource_s60/homescreen.db has changed diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsapplication/resource_win/homescreen.db Binary file homescreenapp/hsapplication/resource_win/homescreen.db has changed diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsapplication/src/hshomescreenclientserviceprovider.cpp --- a/homescreenapp/hsapplication/src/hshomescreenclientserviceprovider.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/hsapplication/src/hshomescreenclientserviceprovider.cpp Thu May 27 12:46:08 2010 +0300 @@ -28,8 +28,7 @@ #include "hsdatabase.h" #include "hswallpaperhelper.h" #include "hswidgetcomponentregistry.h" - -#define HSBOUNDARYEFFECT 20 // amount of extra pixels in wallpaper width reserved for boundary effect +#include "hsconfiguration.h" namespace { @@ -100,8 +99,10 @@ QString landscapePath = HsWallpaper::wallpaperPath( Qt::Horizontal, QString(), fileExtension); - QRect portraitRect = QRect(0, 0, (2 * 360) + HSBOUNDARYEFFECT, 640); - QRect landscapeRect = QRect(0, 0, (2 * 640) + HSBOUNDARYEFFECT, 360); + int bounceEffect = HsConfiguration::bounceEffect(); + + QRect portraitRect = QRect(0, 0, (2 * 360) + bounceEffect, 640); + QRect landscapeRect = QRect(0, 0, (2 * 640) + bounceEffect, 360); QRect sourceRect; // left empty to signal we want to use full size image as source QImage portraitImage = HsWallpaperHelper::processImage(fileName, diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsapplication/themes/icons/hbdefault/scalable/qtg_anim_longtap_0.svg --- a/homescreenapp/hsapplication/themes/icons/hbdefault/scalable/qtg_anim_longtap_0.svg Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1316 +0,0 @@ - - - - - - - - - - -]> - diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsapplication/themes/icons/hbdefault/scalable/qtg_anim_longtap_1.svg --- a/homescreenapp/hsapplication/themes/icons/hbdefault/scalable/qtg_anim_longtap_1.svg Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ - - - diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsapplication/themes/icons/hbdefault/scalable/qtg_anim_longtap_2.svg --- a/homescreenapp/hsapplication/themes/icons/hbdefault/scalable/qtg_anim_longtap_2.svg Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ - - - diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsapplication/themes/icons/hbdefault/scalable/qtg_anim_longtap_3.svg --- a/homescreenapp/hsapplication/themes/icons/hbdefault/scalable/qtg_anim_longtap_3.svg Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ - - - diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsapplication/themes/icons/hbdefault/scalable/qtg_anim_longtap_4.svg --- a/homescreenapp/hsapplication/themes/icons/hbdefault/scalable/qtg_anim_longtap_4.svg Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ - - - diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsapplication/themes/icons/hbdefault/scalable/qtg_anim_longtap_5.svg --- a/homescreenapp/hsapplication/themes/icons/hbdefault/scalable/qtg_anim_longtap_5.svg Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ - - - diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsapplication/themes/icons/hbdefault/scalable/qtg_anim_longtap_6.svg --- a/homescreenapp/hsapplication/themes/icons/hbdefault/scalable/qtg_anim_longtap_6.svg Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ - - - diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsapplication/themes/icons/hbdefault/scalable/qtg_anim_longtap_7.svg --- a/homescreenapp/hsapplication/themes/icons/hbdefault/scalable/qtg_anim_longtap_7.svg Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ - - - diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsapplication/themes/icons/hbdefault/scalable/qtg_anim_longtap_8.svg --- a/homescreenapp/hsapplication/themes/icons/hbdefault/scalable/qtg_anim_longtap_8.svg Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ - - - diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsapplication/themes/icons/hbdefault/scalable/qtg_anim_longtap_9.svg --- a/homescreenapp/hsapplication/themes/icons/hbdefault/scalable/qtg_anim_longtap_9.svg Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,44 +0,0 @@ - - - diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsdomainmodel/hsdomainmodel.pri --- a/homescreenapp/hsdomainmodel/hsdomainmodel.pri Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/hsdomainmodel/hsdomainmodel.pri Thu May 27 12:46:08 2010 +0300 @@ -19,25 +19,37 @@ ./inc/hsdatabase.h \ ./inc/hsdomainmodel_global.h \ ./inc/hspage.h \ + ./inc/hsgui.h \ ./inc/hsscene.h \ ./inc/hsshortcutservice.h \ ./inc/hsshortcutservice_p.h \ ./inc/hswallpaper.h \ ./inc/hswidgethost.h \ ./inc/hswidgetcomponentregistry.h \ - ./inc/hswidgetcomponent.h \ - ./inc/hswidgetcomponentdescriptor.h + ./inc/hswidgetcomponent.h \ + ./inc/hswidgetcomponentdescriptor.h \ + ./inc/hsbackuprestoreobserver.h \ + ./inc/hsconfiguration.h SOURCES += ./src/hscontentservice.cpp \ ./src/hsdatabase.cpp \ ./src/hspage.cpp \ + ./src/hsgui.cpp \ ./src/hsscene.cpp \ ./src/hsshortcutservice.cpp \ ./src/hswallpaper.cpp \ ./src/hswidgethost.cpp \ ./src/hswidgetcomponentregistry.cpp \ - ./src/hswidgetcomponent.cpp \ - ./src/hswidgetcomponentdescriptor.cpp + ./src/hswidgetcomponent.cpp \ + ./src/hswidgetcomponentdescriptor.cpp \ + ./src/hsbackuprestoreobserver.cpp \ + ./src/hsconfiguration.cpp + +symbian: { +HEADERS += ./inc/hsbackuprestoreobserver_p.h \ + ./inc/hsbackuprestoreactivecallback.h +SOURCES += ./src/hsbackuprestoreactivecallback.cpp +} diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsdomainmodel/hsdomainmodel.pro --- a/homescreenapp/hsdomainmodel/hsdomainmodel.pro Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/hsdomainmodel/hsdomainmodel.pro Thu May 27 12:46:08 2010 +0300 @@ -42,6 +42,7 @@ symbian: { TARGET.UID3 = 0x20022F38 + LIBS += -lxqsettingsmanager -labclient } win32:{ QT += network diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsdomainmodel/inc/hsbackuprestoreactivecallback.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsdomainmodel/inc/hsbackuprestoreactivecallback.h Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,210 @@ +/* +* 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 the License "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: Home screen active callback in HsBackupRestoreObserver. +* +*/ + + +#ifndef HSBACKUPRESTOREACTIVECALLBACK_H +#define HSBACKUPRESTOREACTIVECALLBACK_H + +#include // CBase +#include + +class HsBackupRestoreObserver; + +/** + * Home screen active callback in backup/restore. + * + * @lib hsdomainmodel + * @since S60 ^4 + */ +NONSHARABLE_CLASS(CHsBURActiveCallback) : public CBase, + public conn::MActiveBackupDataClient + { +public: + + IMPORT_C static CHsBURActiveCallback* NewL(HsBackupRestoreObserver* observer); + + virtual ~CHsBURActiveCallback(); + +// new functions + +// from base class MActiveBackupDataClient + + /** + * This method informs the active backup data client that all + * snapshots have been supplied. If the client has not + * received a snapshot then it should perform a base backup + */ + virtual void AllSnapshotsSuppliedL(); + + /** + * This method receives all or part of a snapshot of data to allow + * calculation of an incremental backup. The snapshot is one that + * was previously supplied by the data owner. The snapshot data + * should be read from the location supplied. The snapshot data may + * be larger than the location supplied in which case the routine + * will be called repeatedly until all data has been supplied. + * + * Snapshot data will also be supplied as part of a restore operation + * + * @param aDrive the drive being backed up + * @param aBuffer a pointer to the base of the location from whence + * data can be copied. + * @param aLastSection ETrue if this is the last section of snapshot + * data, else EFalse. + */ + virtual void ReceiveSnapshotDataL( + TDriveNumber aDrive, TDesC8& aBuffer, TBool aLastSection); + + /** + * This method returns the expected size of backup data that will be + * supplied. If an incremental backup is underway then this method + * then this method will not be called until after + * ReceiveSnapshotDataL(). The size data will be used for the purpose + * of tracking progess during a backup. If it is inaccurate then the + * user may see irregular progress but the actual backup data will + * not be affected so it is acceptable to return an estimated value. + * + * @param aDrive the drive being backed up. + * @return the size of the data that will be returned + */ + virtual TUint GetExpectedDataSize(TDriveNumber aDrive); + + /** + * This method returns a snapshot of data to accompany a backup. The + * snapshot is expected to contain details on files / data being + * backed up. The format of the snapshot is only meaningful to the + * data owner. The snapshot will be supplied if the data owner is + * asked for an incremental backup and for a restore operation. The + * snapshot data should be copied to the location supplied. + * + * The snapshot data may be larger than the location supplied in + * which case the routine will be called repeatedly until all data + * has been retrieved. + * + * @param aDrive the drive being backed up + * @param aBuffer a pointer to the base of the location where data + * can be copied. + * @param aFinished on return ETrue if all data has been returned + * for this drive, else EFalse. + */ + virtual void GetSnapshotDataL( + TDriveNumber aDrive, TPtr8& aBuffer, TBool& aFinished); + + /** + * This method prepares the implementor to return backup data. It + * will be followed by a sequence of calls to request the actual + * data. + * + * @param aDrive the drive being backed up. + */ + virtual void InitialiseGetBackupDataL(TDriveNumber aDrive); + + /** + * This method requests a section of backup data. + * InitialiseGetBackupDataL() will have been called previously to + * specify the drive concerned. The data returned may be base or + * incremental depending on the type of backup and the capability of + * the data owner. + * + * @param aBuffer a pointer to the base of the location where data + * can be copied. + * @param aFinished on return ETrue if all data has been returned + * for this drive, else EFalse. + */ + virtual void GetBackupDataSectionL(TPtr8& aBuffer, TBool& aFinished); + + /** + * This method prepares the implementor to receive base restore data + * for a drive. It will be followed by a sequence of calls to supply + * the actual data. + * + * @param aDrive the drive being restored. + */ + virtual void InitialiseRestoreBaseDataL(TDriveNumber aDrive); + + /** + * This method receives a section of base restore data. + * InitialiseRestoreBaseDataL() will have been called previously to + * specify the drive concerned. + * + * @param aBuffer a pointer to the base of the location whence data + * can be read. + * @param aFinished ETrue if all data has been returned for this + * drive, else EFalse. + */ + virtual void RestoreBaseDataSectionL(TDesC8& aBuffer, TBool aFinished); + + /** + * This method prepares the implementor to receive incremental + * restore data for a drive. It will be followed by a sequence + * of calls to supply the actual data. If multiple increments + * are supplied then this methid will be called before each increment + * + * @param aDrive the drive being restored. + */ + virtual void InitialiseRestoreIncrementDataL(TDriveNumber aDrive); + + /** + * This method receives a section of increment restore data. + * InitialiseRestoreIncrementDataL() will have been called + * previously to specify the drive concerned. + * + * @param aBuffer a pointer to the base of the location whence data + * can be read. + * @param aFinished ETrue if all data has been returned for this + * increment, else EFalse. + */ + virtual void RestoreIncrementDataSectionL(TDesC8& aBuffer, TBool aFinished); + + /** + * This method is called when all data to be restored has been + * supplied. + * + * @param aDrive the drive being restored. + */ + virtual void RestoreComplete(TDriveNumber aDrive); + + /** + * This method is called if copying of data is terminated prematurely + * to allow the implementor to tidy up. The same method applies to + * all types of data and to backup and restore. + */ + virtual void TerminateMultiStageOperation(); + + /** + * Gets a 32-bit checksum for its private data. + * This routine is for test purposes. It must be implemented but an + * invariant checksum value can be provided. Some tests may cause + * checksum values to be compared. + * + * @param aDrive the drive containing data being checksummed + * @return the 32-bit checksum + */ + virtual TUint GetDataChecksum(TDriveNumber aDrive); + +private: + CHsBURActiveCallback(HsBackupRestoreObserver* observer); + + void ConstructL(); + +private: // data + // Bacup/Restore observer. Not own. + HsBackupRestoreObserver *iObserver; + }; + +#endif // HSBACKUPRESTOREACTIVECALLBACK_H + diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsdomainmodel/inc/hsbackuprestoreobserver.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsdomainmodel/inc/hsbackuprestoreobserver.h Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,75 @@ +/* +* 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: Backup/Restore observer. +* +*/ + +#ifndef HSBACKUPRESTOREOBSERVER_H +#define HSBACKUPRESTOREOBSERVER_H + +#include +#include "hsdomainmodel_global.h" +#include "hstest_global.h" + +HOMESCREEN_TEST_CLASS(TestRuntimeServices) + +#ifdef Q_OS_SYMBIAN +class HsBackupRestoreObserverPrivate; +#endif //Q_OS_SYMBIAN + +class HSDOMAINMODEL_EXPORT HsBackupRestoreObserver : public QObject +{ + Q_OBJECT + +public: + static HsBackupRestoreObserver *instance(); + ~HsBackupRestoreObserver(); + + void backupRestoreStarted(); + void backupRestoreComplited(); + + void readyForBUR(); + bool checkBUR(); + +signals: + void event_backupRestoreStarted(); + void event_backupRestoreComplited(); + +private: + HsBackupRestoreObserver(QObject *parent = 0); + Q_DISABLE_COPY(HsBackupRestoreObserver) + +private: + +#ifdef Q_OS_SYMBIAN + /** + * mD pointer to HsBackupRestoreObserverPrivate + * Owned by HsBackupRestoreObserver object, instantiated in + * constructor. + */ + HsBackupRestoreObserverPrivate *mD; +#endif //Q_OS_SYMBIAN + + bool mBUROngoing; + + static QScopedPointer mInstance; +#ifdef Q_OS_SYMBIAN + friend class HsBackupRestoreObserverPrivate; +#endif //Q_OS_SYMBIAN + HOMESCREEN_TEST_FRIEND_CLASS(TestRuntimeServices) +}; + +#endif // HSBACKUPRESTOREOBSERVER_H + +// End of File diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsdomainmodel/inc/hsbackuprestoreobserver_p.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsdomainmodel/inc/hsbackuprestoreobserver_p.h Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,79 @@ +/* +* 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: Active object for Backup/Restore observer. +* +*/ + +#ifndef HSBACKUPRESTOREOBSERVER_P_H +#define HSBACKUPRESTOREOBSERVER_P_H + +#include +#include +#include + +class CHsBURActiveCallback; +class HsBackupRestoreObserver; + +using namespace conn; + +class HsBackupRestoreObserverPrivate : public QObject +{ + Q_OBJECT + +public: + + /** + * Creates an instance of CCPServerBURListener implementation. + * @param aCallBack Pointer to observer interface. + */ + HsBackupRestoreObserverPrivate (HsBackupRestoreObserver* observer, + QObject *parent = 0); + + /** + * Destructor. + */ + virtual ~HsBackupRestoreObserverPrivate(); + + void readyForBUR(); + +public slots: + void handleKeyChange(XQSettingsKey key, const QVariant &value); + +private: + /** + * mQ pointer to HsBackupRestoreObserver + * Owned by HsBackupRestoreObserver object, instantiated in + * constructor. + */ + HsBackupRestoreObserver *mQ; + + /** + * Callback interface for widget's active data owner. + * Own. + */ + CHsBURActiveCallback *mCallBack; + + /** + * Active backup client. + * Own. + */ + conn::CActiveBackupClient *mActiveBackupClient; + + /** + * Last state of BUR: either backup or restore or normal or unset + */ + conn::TBURPartType mLastType; +}; + +#endif //HSBACKUPRESTOREOBSERVER_P_H diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsdomainmodel/inc/hsconfiguration.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsdomainmodel/inc/hsconfiguration.h Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,137 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#ifndef HSCONFIGURATION_H +#define HSCONFIGURATION_H + +#include + +#include "hsdomainmodel_global.h" +#include + +class HsGeneralConfiguration; +class HsFeedbackConfiguration; +class HsSnapConfiguration; +class HsDatabase; +class HsConfiguration; + +class HSDOMAINMODEL_EXPORT HsConfiguration +{ + +public: + static void loadConfiguration(); + + static inline int bounceEffect() { return mBounceEffect; }; + static inline int tapAndHoldDistance() { return mTapAndHoldDistance; }; + static inline int widgetTapAndHoldTimeout() { return mWidgetTapAndHoldTimeout; }; + static inline int sceneTapAndHoldTimeout() { return mSceneTapAndHoldTimeout; }; + static inline int pageChangeZoneWidth() { return mPageChangeZoneWidth; }; + static inline int pageIndicatorSpacing() { return mPageIndicatorSpacing; }; + static inline int pageChangeAnimationDuration() { return mPageChangeAnimationDuration; }; + static inline int pageChangeZoneAnimationDuration() { return mPageChangeZoneAnimationDuration; }; + static inline int pageChangeZoneReverseAnimationDuration() { return mPageChangeZoneReverseAnimationDuration; }; + static inline int pageRemovedAnimationDuration() { return mPageRemovedAnimationDuration; }; + static inline int newPageAddedAnimationDuration() { return mNewPageAddedAnimationDuration; }; + static inline int widgetDragEffectDuration() { return mWidgetDragEffectDuration; }; + static inline int widgetDropEffectDuration() { return mWidgetDropEffectDuration; }; + static inline int bounceFeedbackEffectDistance() { return mBounceFeedbackEffectDistance; }; + + static inline HbFeedback::InstantEffect pageChangeFeedbackType() { return mPageChangeFeedbackType; }; + static inline HbFeedback::InstantEffect widgetPickFeedbackType() { return mWidgetPickFeedbackType; }; + static inline HbFeedback::InstantEffect widgetDropFeedbackType() { return mWidgetDropFeedbackType; }; + static inline HbFeedback::InstantEffect widgetRepositionFeedbackType() { return mWidgetRepositionFeedbackType; }; + static inline HbFeedback::InstantEffect widgetOverTrashbinFeedbackType() { return mWidgetOverTrashbinFeedbackType; }; + static inline HbFeedback::InstantEffect widgetDropToTrashbinFeedbackType() { return mWidgetDropToTrashbinFeedbackType; }; + static inline HbFeedback::InstantEffect shortcutWidgetTapFeedbackType() { return mShortcutWidgetTapFeedbackType; }; + static inline HbFeedback::InstantEffect widgetMoveBlockedFeedbackType() { return mWidgetMoveBlockedFeedbackType; }; + static inline HbFeedback::InstantEffect clockWidgetTapFeedbackType() { return mClockWidgetTapFeedbackType; }; + static inline HbFeedback::InstantEffect widgetSnappingFeedbackType() { return mWidgetSnappingFeedbackType; }; + + static inline bool snapEnabled() { return mSnapEnabled; }; + static inline qreal snapForce() { return mSnapForce; }; + static inline qreal snapGap() { return mSnapGap; }; + static inline qreal snapBorderGap() { return mSnapBorderGap; }; + static inline int snapTimeout() { return mSnapTimeout; }; + + // setters should be removed before code is released to SF + static void setBounceEffect(int bounceEffect) { mBounceEffect = bounceEffect; }; + static void setTapAndHoldDistance(int tapAndHoldDistance) { mTapAndHoldDistance = tapAndHoldDistance; }; + static void setWidgetTapAndHoldTimeout(int tapAndHoldTimeout) { mWidgetTapAndHoldTimeout = tapAndHoldTimeout; }; + static void setSceneTapAndHoldTimeout(int tapAndHoldTimeout) { mSceneTapAndHoldTimeout = tapAndHoldTimeout; }; + static void setPageChangeZoneWidth(int pageChangeZoneWidth) { mPageChangeZoneWidth = pageChangeZoneWidth; }; + static void setPageIndicatorSpacing(int pageIndicatorSpacing) { mPageIndicatorSpacing = pageIndicatorSpacing; }; + static void setPageChangeAnimationDuration(int pageChangeAnimationDuration) { mPageChangeAnimationDuration = pageChangeAnimationDuration; }; + static void setPageChangeZoneAnimationDuration(int pageChangeZoneAnimationDuration) { mPageChangeZoneAnimationDuration = pageChangeZoneAnimationDuration; }; + static void setPageChangeZoneReverseAnimationDuration(int pageChangeZoneReverseAnimationDuration) { mPageChangeZoneReverseAnimationDuration = pageChangeZoneReverseAnimationDuration; }; + static void setPageRemovedAnimationDuration(int pageRemovedAnimationDuration) { mPageRemovedAnimationDuration = pageRemovedAnimationDuration; }; + static void setNewPageAddedAnimationDuration(int newPageAddedAnimationDuration) { mNewPageAddedAnimationDuration = newPageAddedAnimationDuration; }; + static void setWidgetDragEffectDuration(int widgetDragEffectDuration) { mWidgetDragEffectDuration = widgetDragEffectDuration; }; + static void setWidgetDropEffectDuration(int widgetDropEffectDuration) { mWidgetDropEffectDuration = widgetDropEffectDuration; }; + static void setBounceFeedbackEffectDistance(int bounceFeedbackEffectDistance) { mBounceFeedbackEffectDistance = bounceFeedbackEffectDistance; }; + + static void setPageChangeFeedbackType(HbFeedback::InstantEffect pageChangeFeedbackType ) { mPageChangeFeedbackType = pageChangeFeedbackType; }; + static void setWidgetPickFeedbackType(HbFeedback::InstantEffect widgetPickFeedbackType ) { mWidgetPickFeedbackType = widgetPickFeedbackType; }; + static void setWidgetDropFeedbackType(HbFeedback::InstantEffect widgetDropFeedbackType ) { mWidgetDropFeedbackType = widgetDropFeedbackType; }; + static void setWidgetRepositionFeedbackType(HbFeedback::InstantEffect widgetRepositionFeedbackType ) { mWidgetRepositionFeedbackType = widgetRepositionFeedbackType; }; + static void setWidgetOverTrashbinFeedbackType(HbFeedback::InstantEffect widgetOverTrashbinFeedbackType ) { mWidgetOverTrashbinFeedbackType = widgetOverTrashbinFeedbackType; }; + static void setWidgetDropToTrashbinFeedbackType(HbFeedback::InstantEffect widgetDropToTrashbinFeedbackType ) { mWidgetDropToTrashbinFeedbackType = widgetDropToTrashbinFeedbackType; }; + static void setShortcutWidgetTapFeedbackType(HbFeedback::InstantEffect shortcutWidgetTapFeedbackType ) { mShortcutWidgetTapFeedbackType = shortcutWidgetTapFeedbackType; }; + static void setWidgetMoveBlockedFeedbackType(HbFeedback::InstantEffect widgetMoveBlockedFeedbackType ) { mWidgetMoveBlockedFeedbackType = widgetMoveBlockedFeedbackType; }; + static void setClockWidgetTapFeedbackType(HbFeedback::InstantEffect clockWidgetTapFeedbackType ) { mClockWidgetTapFeedbackType = clockWidgetTapFeedbackType; }; + static void setWidgetSnappingFeedbackType(HbFeedback::InstantEffect widgetSnappingFeedbackType ) { mWidgetSnappingFeedbackType = widgetSnappingFeedbackType; }; + + static void setSnapEnabled(bool snapEnabled) { mSnapEnabled = snapEnabled; }; + static void setSnapForce(qreal snapForce) { mSnapForce = snapForce; }; + static void setSnapGap(qreal snapGap) { mSnapGap = snapGap; }; + static void setSnapBorderGap(qreal snapBorderGap) { mSnapBorderGap = snapBorderGap; }; + static void setSnapTimeout(int snapTimeout) { mSnapTimeout = snapTimeout; }; + +private: + static int mBounceEffect; + static int mTapAndHoldDistance; + static int mWidgetTapAndHoldTimeout; + static int mSceneTapAndHoldTimeout; + static int mPageChangeZoneWidth; + static int mPageIndicatorSpacing; + static int mPageChangeAnimationDuration; + static int mPageChangeZoneAnimationDuration; + static int mPageChangeZoneReverseAnimationDuration; + static int mPageRemovedAnimationDuration; + static int mNewPageAddedAnimationDuration; + static int mWidgetDragEffectDuration; + static int mWidgetDropEffectDuration; + static int mBounceFeedbackEffectDistance; + + static HbFeedback::InstantEffect mPageChangeFeedbackType; + static HbFeedback::InstantEffect mWidgetPickFeedbackType; + static HbFeedback::InstantEffect mWidgetDropFeedbackType; + static HbFeedback::InstantEffect mWidgetRepositionFeedbackType; + static HbFeedback::InstantEffect mWidgetOverTrashbinFeedbackType; + static HbFeedback::InstantEffect mWidgetDropToTrashbinFeedbackType; + static HbFeedback::InstantEffect mShortcutWidgetTapFeedbackType; + static HbFeedback::InstantEffect mWidgetMoveBlockedFeedbackType; + static HbFeedback::InstantEffect mClockWidgetTapFeedbackType; + static HbFeedback::InstantEffect mWidgetSnappingFeedbackType; + + static bool mSnapEnabled; + static qreal mSnapForce; + static qreal mSnapGap; + static qreal mSnapBorderGap; + static int mSnapTimeout; +}; + +#endif // HSCONFIGURATION_H diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsdomainmodel/inc/hsdatabase.h --- a/homescreenapp/hsdomainmodel/inc/hsdatabase.h Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/hsdomainmodel/inc/hsdatabase.h Thu May 27 12:46:08 2010 +0300 @@ -24,10 +24,15 @@ #include "hsdomainmodel_global.h" +#include + class HsSceneData; class HsPageData; class HsWidgetData; class HsWidgetPresentationData; +class HsGeneralConfiguration; +class HsFeedbackConfiguration; +class HsSnapConfiguration; class HSDOMAINMODEL_EXPORT HsDatabase : public QObject { @@ -75,9 +80,11 @@ bool widgetPreferences(int widgetId, QVariantHash &data); bool widgetPreference(int widgetId, const QString &key, QVariant &value); bool setWidgetPreferences(int widgetId, const QVariantHash &data); + + bool generalConfiguration(HsGeneralConfiguration &data); + bool feedbackConfiguration(HsFeedbackConfiguration &data); + bool snapConfiguration(HsSnapConfiguration &data); - void setDataBaseBlocked(bool blocked); - bool getDataBaseBlocked(); public: static void setInstance(HsDatabase *instance); static HsDatabase *instance(); @@ -92,7 +99,6 @@ QString mDatabaseName; static QScopedPointer mInstance; - bool mBlocked; }; #endif // HSDATABASE_H diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsdomainmodel/inc/hsdomainmodeldatastructures.h --- a/homescreenapp/hsdomainmodel/inc/hsdomainmodeldatastructures.h Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/hsdomainmodel/inc/hsdomainmodeldatastructures.h Thu May 27 12:46:08 2010 +0300 @@ -20,6 +20,7 @@ #include #include "hsdomainmodel_global.h" +#include class HSDOMAINMODEL_EXPORT HsSceneData { @@ -86,4 +87,169 @@ int widgetId; }; +class HSDOMAINMODEL_EXPORT HsGeneralConfiguration +{ +public: + int bounceEffect; // pixels, bounce effect reservation, half in left side and half in right side of wallpaper + int tapAndHoldDistance; // pixels + int widgetTapAndHoldTimeout; // ms, duration of long press before action is triggered on widget + int sceneTapAndHoldTimeout; // ms, duration of long press before action is triggered on background + int pageChangeZoneWidth; // pixels + int pageIndicatorSpacing; // pixels + int pageChangeAnimationDuration; // ms, this is how long page change animation takes + int pageChangeZoneAnimationDuration; // ms, this is how long crawling is done before page is actually changed + int pageChangeZoneReverseAnimationDuration; // ms, animation duration back to starting position when crawling ends before page is changed + int pageRemovedAnimationDuration; // ms + int newPageAddedAnimationDuration; // ms + int widgetDragEffectDuration; // ms + int widgetDropEffectDuration; // ms + int boundaryFeedbackEffectDistance; // pixels, when widget is moved within n pixels from first page right border or + // n pixels from last page's left border, feedback effect is played +}; + +class HSDOMAINMODEL_EXPORT HsFeedbackConfiguration +{ +public: + HbFeedback::InstantEffect feedbackFromString(QString feedback) + { + if (feedback == "Basic") { + return HbFeedback::Basic; + } + else if (feedback == "Sensitive") { + return HbFeedback::Sensitive; + } + else if (feedback == "BasicButton") { + return HbFeedback::BasicButton; + } + else if (feedback == "SensitiveButton") { + return HbFeedback::SensitiveButton; + } + else if (feedback == "BasicKeypad") { + return HbFeedback::BasicKeypad; + } + else if (feedback == "SensitiveKeypad") { + return HbFeedback::SensitiveKeypad; + } + else if (feedback == "BasicSlider") { + return HbFeedback::BasicSlider; + } + else if (feedback == "SensitiveSlider") { + return HbFeedback::SensitiveSlider; + } + else if (feedback == "BasicKeypad") { + return HbFeedback::BasicKeypad; + } + else if (feedback == "BasicSlider") { + return HbFeedback::BasicSlider; + } + else if (feedback == "SensitiveSlider") { + return HbFeedback::SensitiveSlider; + } + else if (feedback == "BasicItem") { + return HbFeedback::BasicItem; + } + else if (feedback == "SensitiveItem") { + return HbFeedback::SensitiveItem; + } + else if (feedback == " ItemScroll") { + return HbFeedback::ItemScroll; + } + else if (feedback == "ItemPick") { + return HbFeedback::ItemPick; + } + else if (feedback == "ItemDrop") { + return HbFeedback::ItemDrop; + } + else if (feedback == "ItemMoveOver") { + return HbFeedback::ItemMoveOver; + } + else if (feedback == "BounceEffect") { + return HbFeedback::BounceEffect; + } + else if (feedback == "Checkbox") { + return HbFeedback::Checkbox; + } + else if (feedback == "MultipleCheckbox") { + return HbFeedback::MultipleCheckbox; + } + else if (feedback == "Editor") { + return HbFeedback::Editor; + } + else if (feedback == "TextSelection") { + return HbFeedback::TextSelection; + } + else if (feedback == "BlankSelection") { + return HbFeedback::BlankSelection; + } + else if (feedback == "LineSelection") { + return HbFeedback::LineSelection; + } + else if (feedback == "EmptyLineSelection") { + return HbFeedback::EmptyLineSelection; + } + else if (feedback == "PopUp") { + return HbFeedback::PopUp; + } + else if (feedback == "PopupOpen") { + return HbFeedback::PopupOpen; + } + else if (feedback == "PopupClose") { + return HbFeedback::PopupClose; + } + else if (feedback == "Flick") { + return HbFeedback::Flick; + } + else if (feedback == "StopFlick") { + return HbFeedback::StopFlick; + } + else if (feedback == "MultitouchActivate") { + return HbFeedback::MultitouchActivate; + } + else if (feedback == "RotateStep") { + return HbFeedback::RotateStep; + } + else if (feedback == "PositiveTacticon") { + return HbFeedback::PositiveTacticon; + } + else if (feedback == "NeutralTacticon") { + return HbFeedback::NeutralTacticon; + } + else if (feedback == "NegativeTacticon") { + return HbFeedback::NegativeTacticon; + } + else if (feedback == "NumberOfInstantFeedbacks") { + return HbFeedback::NumberOfInstantFeedbacks; + } + else if (feedback == "InstantUser") { + return HbFeedback::InstantUser; + } + else if (feedback == "InstantMaxUser") { + return HbFeedback::InstantMaxUser; + } + return HbFeedback::None; + } + +public: + HbFeedback::InstantEffect pageChangeFeedbackType; + HbFeedback::InstantEffect widgetPickFeedbackType; + HbFeedback::InstantEffect widgetDropFeedbackType; + HbFeedback::InstantEffect widgetRepositionFeedbackType; + HbFeedback::InstantEffect widgetOverTrashbinFeedbackType; + HbFeedback::InstantEffect widgetDropToTrashbinFeedbackType; + HbFeedback::InstantEffect shortcutWidgetTapFeedbackType; + HbFeedback::InstantEffect widgetMoveBlockedFeedbackType; + HbFeedback::InstantEffect clockWidgetTapFeedbackType; + HbFeedback::InstantEffect widgetSnappingFeedbackType; +}; + +class HSDOMAINMODEL_EXPORT HsSnapConfiguration +{ +public: + bool snappingEnabled; // variable to tell if snapping is enabled or not + qreal snapForce; // this is the distance at which the widget starts being attracted to the line + qreal snapGap; // the gap at which the objects settle into from each other when they snap + qreal borderGap; // (the gap from the border edges when the widget settles on the edges of the page + int timeout; // time in milliseconds after which the snapping line will be shown +}; + #endif // HSDOMAINMODELDATASTRUCTURES_H diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsdomainmodel/inc/hsgui.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsdomainmodel/inc/hsgui.h Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,47 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#ifndef HSVIEW_H +#define HSVIEW_H + +#include + +#include "hsdomainmodel_global.h" +#include "hstest_global.h" + +HOMESCREEN_TEST_CLASS(HomeScreenStatePluginTest) + +class HbView; +class HbMainWindow; + +class HSDOMAINMODEL_EXPORT HsGui +{ +public: + HsGui(); + ~HsGui(); + static HbView *idleView(); + static HbView *takeIdleView(); + static void setIdleView(HbView *idleView); + static HbMainWindow *mainWindow(); + +private: + static QPointer mIdleView; + HOMESCREEN_TEST_FRIEND_CLASS(HomeScreenStatePluginTest) +}; + +Q_DECLARE_METATYPE(HsGui*) +#endif //HSVIEW_H diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsdomainmodel/inc/hspage.h --- a/homescreenapp/hsdomainmodel/inc/hspage.h Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/hsdomainmodel/inc/hspage.h Thu May 27 12:46:08 2010 +0300 @@ -30,15 +30,16 @@ class HSDOMAINMODEL_EXPORT HsPage : public HbWidget { - Q_OBJECT + Q_OBJECT + Q_PROPERTY(int pageIndex READ pageIndex) public: HsPage(QGraphicsItem *parent = 0); - ~HsPage(); + ~HsPage(); int databaseId() const; void setDatabaseId(int id); - + bool load(); bool addExistingWidget(HsWidgetHost *widgetHost); @@ -50,10 +51,10 @@ bool deleteFromDatabase(); QList widgets() const; - + bool isRemovable() const; void setRemovable(bool removable); - + static HsPage *createInstance(const HsPageData &pageData); public slots: @@ -63,6 +64,8 @@ void updateZValues(); + int pageIndex(); + private: void connectWidget(HsWidgetHost *widget); void disconnectWidget(HsWidgetHost *widget); @@ -72,12 +75,12 @@ void onWidgetResized(HsWidgetHost *widget); private: - int mDatabaseId; + int mDatabaseId; bool mRemovable; QList mWidgets; QList mNewWidgets; - + HOMESCREEN_TEST_FRIEND_CLASS(TestRuntimeServices) }; - + #endif diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsdomainmodel/inc/hswidgethost.h --- a/homescreenapp/hsdomainmodel/inc/hswidgethost.h Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/hsdomainmodel/inc/hswidgethost.h Thu May 27 12:46:08 2010 +0300 @@ -28,11 +28,8 @@ #include "hsdomainmodel_global.h" #include "hstest_global.h" - -class HbIconItem; class HsPage; - HOMESCREEN_TEST_CLASS(TestRuntimeServices) class HSDOMAINMODEL_EXPORT HsWidgetHost : public HbWidget @@ -81,12 +78,12 @@ HsWidgetPresentationData widgetPresentation(Qt::Orientation orientation); bool loadWidgetPresentation(); bool deleteWidgetPresentation(Qt::Orientation orientation); - + bool isPannable(QGraphicsSceneMouseEvent *event); signals: void widgetFinished(HsWidgetHost *widget); void widgetError(HsWidgetHost *widget); void widgetResized(HsWidgetHost *widget); - + public slots: void initializeWidget(); void showWidget(); @@ -96,15 +93,12 @@ void startDragEffect(); void startDropEffect(); - - void startTapAndHoldAnimation(); - void stopTapAndHoldAnimation(); - + protected: - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) { Q_UNUSED(event) } - void mouseMoveEvent(QGraphicsSceneMouseEvent *event) { Q_UNUSED(event) } - void mousePressEvent(QGraphicsSceneMouseEvent *event) { Q_UNUSED(event) } - void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { Q_UNUSED(event) } + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event); + void mouseMoveEvent(QGraphicsSceneMouseEvent *event); + void mousePressEvent(QGraphicsSceneMouseEvent *event); + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); bool eventFilter(QObject *obj, QEvent *event); private: @@ -132,12 +126,11 @@ QMetaMethod mOnUninitializeMethod; QMetaProperty mIsOnlineProperty; QMetaProperty mRootPathProperty; + QMetaMethod mIsPannable; State mState; QString mUri; int mDatabaseId; - HbIconItem *mTapAndHoldIcon; - HOMESCREEN_TEST_FRIEND_CLASS(TestRuntimeServices) }; diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsdomainmodel/src/hsbackuprestoreactivecallback.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsdomainmodel/src/hsbackuprestoreactivecallback.cpp Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,204 @@ +/* +* 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 the License "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: Active callback for Backup/Restore observer. +* +*/ + + +// INCLUDE FILES +#include + +#include "hsbackuprestoreactivecallback.h" +#include "hsbackuprestoreobserver.h" + +// CONSTANTS + +// ======== MEMBER FUNCTIONS ======== + +// --------------------------------------------------------------------------- +// +// --------------------------------------------------------------------------- +// +CHsBURActiveCallback* CHsBURActiveCallback::NewL(HsBackupRestoreObserver* observer) +{ + CHsBURActiveCallback* self = + new( ELeave ) CHsBURActiveCallback(observer); + CleanupStack::PushL( self ); + self->ConstructL(); + CleanupStack::Pop( self ); + + return self; +} + +// --------------------------------------------------------------------------- +// Destructor +// --------------------------------------------------------------------------- +// +CHsBURActiveCallback::~CHsBURActiveCallback() +{ +} + +// --------------------------------------------------------------------------- +// Inform that all data has been backed up or restored. +// --------------------------------------------------------------------------- +// +void CHsBURActiveCallback::AllSnapshotsSuppliedL() +{ + // No implementation needed. Must not leave +} + +// --------------------------------------------------------------------------- +// Not supported. +// --------------------------------------------------------------------------- +// +void CHsBURActiveCallback::ReceiveSnapshotDataL( + TDriveNumber /*aDrive*/, TDesC8& /*aBuffer*/, TBool /*aLastSection*/) +{ + // No implementation needed + User::Leave( KErrNotSupported ); +} + +// --------------------------------------------------------------------------- +// Make a guess about data size. +// --------------------------------------------------------------------------- +// +TUint CHsBURActiveCallback::GetExpectedDataSize( + TDriveNumber /*aDrive*/) +{ + // No implementation needed + return 0; +} + +// --------------------------------------------------------------------------- +// Not supported. +// --------------------------------------------------------------------------- +// +void CHsBURActiveCallback::GetSnapshotDataL( + TDriveNumber /*aDrive*/, TPtr8& /*aBuffer*/, TBool& /*aFinished*/) +{ + // No implementation needed + User::Leave( KErrNotSupported ); +} + +// --------------------------------------------------------------------------- +// Initialize for backup. +// --------------------------------------------------------------------------- +// +void CHsBURActiveCallback::InitialiseGetBackupDataL( + TDriveNumber /*aDrive*/) +{ + iObserver->backupRestoreStarted(); +} + +// --------------------------------------------------------------------------- +// --------------------------------------------------------------------------- +// +void CHsBURActiveCallback::GetBackupDataSectionL( + TPtr8& /*aBuffer*/, TBool& aFinished) +{ + // No data for active backup + aFinished = ETrue; +} + +// --------------------------------------------------------------------------- +// Initialize restore. +// --------------------------------------------------------------------------- +// +void CHsBURActiveCallback::InitialiseRestoreBaseDataL( + TDriveNumber /*aDrive*/ ) +{ + // No implementation needed + User::Leave( KErrNotSupported ); +} + +// --------------------------------------------------------------------------- +// Run state machine for restore. Receive stream from BUR engine and turn it +// to file(s). +// --------------------------------------------------------------------------- +// +void CHsBURActiveCallback::RestoreBaseDataSectionL( + TDesC8& /*aBuffer*/, TBool /*aFinished*/ ) +{ + // No implementation needed + User::Leave( KErrNotSupported ); +} + +// --------------------------------------------------------------------------- +// Incremental restoration is not supported. +// --------------------------------------------------------------------------- +// +void CHsBURActiveCallback::InitialiseRestoreIncrementDataL( + TDriveNumber /*aDrive*/) +{ + // No implementation needed + User::Leave( KErrNotSupported ); +} + +// --------------------------------------------------------------------------- +// Incremental restoration is not supported. +// --------------------------------------------------------------------------- +// +void CHsBURActiveCallback::RestoreIncrementDataSectionL( + TDesC8& /*aBuffer*/, TBool /*aFinished*/) +{ + // No implementation needed + User::Leave( KErrNotSupported ); +} + +// --------------------------------------------------------------------------- +// Called when restore is complete - sets data back to initial state. +// --------------------------------------------------------------------------- +// +void CHsBURActiveCallback::RestoreComplete(TDriveNumber /*aDrive*/) +{ + // No implementation needed +} + +// --------------------------------------------------------------------------- +// Tidy up when operation is over. +// --------------------------------------------------------------------------- +// +void CHsBURActiveCallback::TerminateMultiStageOperation() +{ + // No implementation needed +} + +// --------------------------------------------------------------------------- +// +// --------------------------------------------------------------------------- +// +TUint CHsBURActiveCallback::GetDataChecksum(TDriveNumber /*aDrive*/) +{ + // No implementation needed + return 0; +} + +// --------------------------------------------------------------------------- +// C++ constructor. +// --------------------------------------------------------------------------- +// +CHsBURActiveCallback::CHsBURActiveCallback(HsBackupRestoreObserver* observer) +{ + iObserver = observer; +} + +// --------------------------------------------------------------------------- +// 2nd phase constructor. +// --------------------------------------------------------------------------- +// +void CHsBURActiveCallback::ConstructL() +{ +} + +// End of file diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsdomainmodel/src/hsbackuprestoreobserver.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsdomainmodel/src/hsbackuprestoreobserver.cpp Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,200 @@ +/* +* 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: Home screen Backup/Restore observer. +* +*/ + + +#include "hsdatabase.h" +#include "hsbackuprestoreobserver.h" +#ifdef Q_OS_SYMBIAN +#include +#include +#include +#include "hsbackuprestoreactivecallback.h" +#include "hsbackuprestoreobserver_p.h" + +/*! + Constructs a new observer with the given \a parent object. +*/ +HsBackupRestoreObserverPrivate::HsBackupRestoreObserverPrivate(HsBackupRestoreObserver *observer, + QObject *parent): + QObject(parent), + mQ(observer), + mCallBack(NULL), + mActiveBackupClient(NULL), + mLastType(conn::EBURNormal) +{ + XQPublishAndSubscribeSettingsKey backupRestoreKey(KUidSystemCategory.iUid, KUidBackupRestoreKey); + XQSettingsManager *sm = new XQSettingsManager(this); + + connect(sm,SIGNAL(valueChanged(XQSettingsKey, const QVariant &)), this, + SLOT(handleKeyChange(XQSettingsKey, const QVariant &))); + sm->startMonitoring(backupRestoreKey); +} + +/*! + Destructor. +*/ +HsBackupRestoreObserverPrivate::~HsBackupRestoreObserverPrivate() +{ + disconnect(sender(), SIGNAL(valueChanged(XQSettingsKey, const QVariant &)), + this, SLOT(handleKeyChange(XQSettingsKey, const QVariant&))); + delete mCallBack; + delete mActiveBackupClient; +} + +/*! + Informs active backup client, when Home screen is ready for backup/restore. +*/ +void HsBackupRestoreObserverPrivate::readyForBUR() +{ + mActiveBackupClient->ConfirmReadyForBURL( KErrNone ); +} + +/*! + \fn HsBackupRestoreObserverPrivate::handleKeyChange() + + Handles the key change. Creates active backup client and + informs client about backup/restore state change. +*/ + +void HsBackupRestoreObserverPrivate::handleKeyChange(XQSettingsKey key, const QVariant &value) +{ + conn::TBURPartType type = static_cast< conn::TBURPartType > + ( value.toInt() & conn::KBURPartTypeMask ); + + // Test if the device is going into backup or restore mode, and we are + // required to participate. + if ( key.key() == KUidBackupRestoreKey && + (( type == conn::EBURBackupFull || type == conn::EBURRestoreFull ) || + ( type == conn::EBURBackupPartial || type == conn::EBURRestorePartial )) ) + { + if ( !mCallBack ) + { + mCallBack = CHsBURActiveCallback::NewL(mQ); + } + + if ( !mActiveBackupClient ) + { + mActiveBackupClient = conn::CActiveBackupClient::NewL( mCallBack ); + + if ( ( type == conn::EBURBackupPartial || + type == conn::EBURRestorePartial ) && + !mActiveBackupClient->DoesPartialBURAffectMeL() ) + { + delete mCallBack; + mCallBack = NULL; + delete mActiveBackupClient; + mActiveBackupClient = NULL; + return; + } + mQ->backupRestoreStarted(); + } + } + else + { + if ( key.key() == KUidBackupRestoreKey && type == conn::EBURNormal ) + { + if ( (mLastType == conn::EBURBackupFull || mLastType == conn::EBURBackupPartial) || + (mLastType == conn::EBURRestorePartial || mLastType == conn::EBURRestoreFull) ) + { + mQ->backupRestoreComplited(); + } + // delete once back to normal. + delete mCallBack; + mCallBack = NULL; + delete mActiveBackupClient; + mActiveBackupClient = NULL; + } + } + + mLastType = type; +} +#endif //Q_OS_SYMBIAN + +/*! + Singleton. +*/ +HsBackupRestoreObserver *HsBackupRestoreObserver::instance() +{ + if (!mInstance) { + mInstance.reset(new HsBackupRestoreObserver); + } + return mInstance.data(); +} + +/*! + Constructs a new observer with the given \a parent object. +*/ +HsBackupRestoreObserver::HsBackupRestoreObserver(QObject *parent) + : QObject(parent), + mBUROngoing(false) +{ +#ifdef Q_OS_SYMBIAN + mD = new HsBackupRestoreObserverPrivate(this); +#endif //Q_OS_SYMBIAN +} + +/*! + Destructor. +*/ +HsBackupRestoreObserver::~HsBackupRestoreObserver() +{ +#ifdef Q_OS_SYMBIAN + delete mD; +#endif //Q_OS_SYMBIAN +} + +/*! + Called when backup/restore is started. +*/ +void HsBackupRestoreObserver::backupRestoreStarted() +{ + mBUROngoing = true; + emit event_backupRestoreStarted(); +} + +/*! + Called when backup/restore is completed. +*/ +void HsBackupRestoreObserver::backupRestoreComplited() +{ + mBUROngoing = false; + emit event_backupRestoreComplited(); +} + +/*! + Called when Home screen is ready for backup/restore. +*/ +void HsBackupRestoreObserver::readyForBUR() +{ +#ifdef Q_OS_SYMBIAN + mD->readyForBUR(); +#endif //Q_OS_SYMBIAN +} + +/*! + Returns true if bacup/restore is ongoing. +*/ +bool HsBackupRestoreObserver::checkBUR() +{ + return mBUROngoing; +} +/*! + Points to the observer instance. +*/ +QScopedPointer HsBackupRestoreObserver::mInstance(0); + +// End of File diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsdomainmodel/src/hsconfiguration.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsdomainmodel/src/hsconfiguration.cpp Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,111 @@ +/* +* 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 "hsconfiguration.h" +#include "hsdomainmodeldatastructures.h" +#include "hsdatabase.h" + +#include + +/*! + Loads configuration data from database. +*/ +void HsConfiguration::loadConfiguration() +{ + HsDatabase *db = HsDatabase::instance(); + + HsGeneralConfiguration generalConfiguration; + if (db->generalConfiguration(generalConfiguration)) { + mBounceEffect = generalConfiguration.bounceEffect; + mTapAndHoldDistance = generalConfiguration.tapAndHoldDistance; + mWidgetTapAndHoldTimeout = generalConfiguration.widgetTapAndHoldTimeout; + mSceneTapAndHoldTimeout = generalConfiguration.sceneTapAndHoldTimeout; + mPageChangeZoneWidth = generalConfiguration.pageChangeZoneWidth; + mPageIndicatorSpacing = generalConfiguration.pageIndicatorSpacing; + mPageChangeAnimationDuration = generalConfiguration.pageChangeAnimationDuration; + mPageChangeZoneAnimationDuration = generalConfiguration.pageChangeZoneAnimationDuration; + mPageChangeZoneReverseAnimationDuration = generalConfiguration.pageChangeZoneReverseAnimationDuration; + mPageRemovedAnimationDuration = generalConfiguration.pageRemovedAnimationDuration; + mNewPageAddedAnimationDuration = generalConfiguration.newPageAddedAnimationDuration; + mWidgetDragEffectDuration = generalConfiguration.widgetDragEffectDuration; + mWidgetDropEffectDuration = generalConfiguration.widgetDropEffectDuration; + mBounceFeedbackEffectDistance = generalConfiguration.boundaryFeedbackEffectDistance; + } else { + Q_ASSERT_X(1, "Configuration", "Homescreen configuration could not be loaded from database"); + } + + HsFeedbackConfiguration feedbackConfiguration; + if (db->feedbackConfiguration(feedbackConfiguration)) { + mBounceFeedbackEffectDistance = 3; + mPageChangeFeedbackType = feedbackConfiguration.pageChangeFeedbackType; + mWidgetPickFeedbackType = feedbackConfiguration.widgetPickFeedbackType; + mWidgetDropFeedbackType = feedbackConfiguration.widgetDropFeedbackType; + mWidgetRepositionFeedbackType = feedbackConfiguration.widgetRepositionFeedbackType; + mWidgetOverTrashbinFeedbackType = feedbackConfiguration.widgetOverTrashbinFeedbackType; + mWidgetDropToTrashbinFeedbackType = feedbackConfiguration.widgetDropToTrashbinFeedbackType; + mShortcutWidgetTapFeedbackType = feedbackConfiguration.shortcutWidgetTapFeedbackType; + mWidgetMoveBlockedFeedbackType = feedbackConfiguration.widgetMoveBlockedFeedbackType; + mClockWidgetTapFeedbackType = feedbackConfiguration.clockWidgetTapFeedbackType; + mWidgetSnappingFeedbackType = feedbackConfiguration.widgetSnappingFeedbackType; + } else { + Q_ASSERT_X(1, "Configuration", "Homescreen feedback cnfiguration could not be loaded from database"); + } + + HsSnapConfiguration snapConfiguration; + if (db->snapConfiguration(snapConfiguration)) { + mSnapEnabled = snapConfiguration.snappingEnabled; + mSnapForce = snapConfiguration.snapForce; + mSnapGap = snapConfiguration.snapGap; + mSnapBorderGap = snapConfiguration.borderGap; + mSnapTimeout = snapConfiguration.timeout; + } else { + Q_ASSERT_X(1, "Configuration", "Homescreen snap configuration could not be loaded from database"); + } +} + +// static member variables initilized here, these values will be used if fetching from database fails +int HsConfiguration::mBounceEffect = 20; +int HsConfiguration::mTapAndHoldDistance = 16; +int HsConfiguration::mWidgetTapAndHoldTimeout = 500; +int HsConfiguration::mSceneTapAndHoldTimeout = 500; +int HsConfiguration::mPageChangeZoneWidth = 60; +int HsConfiguration::mPageIndicatorSpacing = 8; +int HsConfiguration::mPageChangeAnimationDuration = 200; +int HsConfiguration::mPageChangeZoneAnimationDuration = 800; +int HsConfiguration::mPageChangeZoneReverseAnimationDuration = 200; +int HsConfiguration::mPageRemovedAnimationDuration = 200; +int HsConfiguration::mNewPageAddedAnimationDuration = 700; +int HsConfiguration::mWidgetDragEffectDuration = 200; +int HsConfiguration::mWidgetDropEffectDuration = 200; +int HsConfiguration::mBounceFeedbackEffectDistance = 3; + +HbFeedback::InstantEffect HsConfiguration::mPageChangeFeedbackType = HbFeedback::None; +HbFeedback::InstantEffect HsConfiguration::mWidgetPickFeedbackType = HbFeedback::None; +HbFeedback::InstantEffect HsConfiguration::mWidgetDropFeedbackType = HbFeedback::None; +HbFeedback::InstantEffect HsConfiguration::mWidgetRepositionFeedbackType = HbFeedback::None; +HbFeedback::InstantEffect HsConfiguration::mWidgetOverTrashbinFeedbackType = HbFeedback::None; +HbFeedback::InstantEffect HsConfiguration::mWidgetDropToTrashbinFeedbackType = HbFeedback::None; +HbFeedback::InstantEffect HsConfiguration::mShortcutWidgetTapFeedbackType = HbFeedback::None; +HbFeedback::InstantEffect HsConfiguration::mWidgetMoveBlockedFeedbackType = HbFeedback::None; +HbFeedback::InstantEffect HsConfiguration::mClockWidgetTapFeedbackType = HbFeedback::None; +HbFeedback::InstantEffect HsConfiguration::mWidgetSnappingFeedbackType = HbFeedback::None; + +bool HsConfiguration::mSnapEnabled = false; +qreal HsConfiguration::mSnapForce = 0; +qreal HsConfiguration::mSnapGap = 0; +qreal HsConfiguration::mSnapBorderGap = 0; +int HsConfiguration::mSnapTimeout = 0; + diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsdomainmodel/src/hsdatabase.cpp --- a/homescreenapp/hsdomainmodel/src/hsdatabase.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/hsdomainmodel/src/hsdatabase.cpp Thu May 27 12:46:08 2010 +0300 @@ -23,6 +23,7 @@ #include "hsdatabase.h" #include "hsdomainmodeldatastructures.h" +#include "hsbackuprestoreobserver.h" namespace { @@ -52,8 +53,7 @@ Constructs a new database with the given \a parent object. */ HsDatabase::HsDatabase(QObject *parent) - : QObject(parent), - mBlocked(false) + : QObject(parent) { } @@ -103,7 +103,8 @@ */ bool HsDatabase::open() { - if (mBlocked) { + HsBackupRestoreObserver *brObserver = HsBackupRestoreObserver::instance(); + if (brObserver->checkBUR()) { return false; } @@ -759,20 +760,105 @@ } /*! - Sets the database blocked or unblocked. + */ -void HsDatabase::setDataBaseBlocked(bool blocked) +bool HsDatabase::generalConfiguration(HsGeneralConfiguration &data) { - mBlocked = blocked; + if (!checkConnection()) { + return false; + } + + QSqlQuery query(QSqlDatabase::database(mConnectionName)); + + QString statement = + "SELECT bounceEffect, tapAndHoldDistance, widgetTapAndHoldTimeout, sceneTapAndHoldTimeout, " + "pageChangeZoneWidth, " + "pageIndicatorSpacing, pageChangeAnimationDuration, pageChangeZoneAnimationDuration, " + "pageChangeZoneReverseAnimationDuration, " + "pageRemovedAnimationDuration, newPageAddedAnimationDuration, widgetDragEffectDuration, " + "widgetDropEffectDuration, boundaryFeedbackEffectDistance " + "FROM GeneralConfiguration"; + + if (query.prepare(statement) && query.exec() && query.next()) { + data.bounceEffect = query.value(0).toInt(); + data.tapAndHoldDistance = query.value(1).toInt(); + data.widgetTapAndHoldTimeout = query.value(2).toInt(); + data.sceneTapAndHoldTimeout = query.value(3).toInt(); + data.pageChangeZoneWidth = query.value(4).toInt(); + data.pageIndicatorSpacing = query.value(5).toInt(); + data.pageChangeAnimationDuration = query.value(6).toInt(); + data.pageChangeZoneAnimationDuration = query.value(7).toInt(); + data.pageChangeZoneReverseAnimationDuration = query.value(8).toInt(); + data.pageRemovedAnimationDuration = query.value(9).toInt(); + data.newPageAddedAnimationDuration = query.value(10).toInt(); + data.widgetDragEffectDuration = query.value(11).toInt(); + data.widgetDropEffectDuration = query.value(12).toInt(); + data.boundaryFeedbackEffectDistance = query.value(13).toInt(); + return true; + } + + return false; } /*! - Returns is the database blocked. - Return value true if blocked. + */ -bool HsDatabase::getDataBaseBlocked() +bool HsDatabase::feedbackConfiguration(HsFeedbackConfiguration &data) { - return mBlocked; + if (!checkConnection()) { + return false; + } + + QSqlQuery query(QSqlDatabase::database(mConnectionName)); + + QString statement = + "SELECT pageChangeFeedbackType, widgetPickFeedbackType, widgetDropFeedbackType, " + "widgetRepositionFeedbackType, widgetOverTrashbinFeedbackType, widgetDropToTrashbinFeedbackType, " + "shortcutWidgetTapFeedbackType, widgetMoveBlockedFeedbackType, clockWidgetTapFeedbackType, " + "widgetSnappingFeedbackType " + "FROM FeedbackConfiguration"; + + if (query.prepare(statement) && query.exec() && query.next()) { + data.pageChangeFeedbackType = data.feedbackFromString(query.value(0).toString()); + data.widgetPickFeedbackType = data.feedbackFromString(query.value(1).toString()); + data.widgetDropFeedbackType = data.feedbackFromString(query.value(2).toString()); + data.widgetRepositionFeedbackType = data.feedbackFromString(query.value(3).toString()); + data.widgetOverTrashbinFeedbackType = data.feedbackFromString(query.value(4).toString()); + data.widgetDropToTrashbinFeedbackType = data.feedbackFromString(query.value(5).toString()); + data.shortcutWidgetTapFeedbackType = data.feedbackFromString(query.value(6).toString()); + data.widgetMoveBlockedFeedbackType = data.feedbackFromString(query.value(7).toString()); + data.clockWidgetTapFeedbackType = data.feedbackFromString(query.value(8).toString()); + data.widgetSnappingFeedbackType = data.feedbackFromString(query.value(9).toString()); + return true; + } + + return false; +} + +bool HsDatabase::snapConfiguration(HsSnapConfiguration &data) +{ + if (!checkConnection()) { + return false; + } + + QSqlQuery query(QSqlDatabase::database(mConnectionName)); + + QString statement = + "SELECT snappingEnabled, snapForce, snapGap, borderGap, timeout " + "FROM SnapConfiguration"; + + if (query.prepare(statement) && query.exec() && query.next()) { + data.snappingEnabled = false; + if (query.value(0).toInt() == 1) { + data.snappingEnabled = true; + } + data.snapForce = query.value(1).toReal(); + data.snapGap = query.value(2).toReal(); + data.borderGap = query.value(3).toReal(); + data.timeout = query.value(4).toInt(); + return true; + } + return false; } /*! diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsdomainmodel/src/hsgui.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsdomainmodel/src/hsgui.cpp Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,87 @@ +/* +* 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 +#include +#include "hsgui.h" + +/*! + \class HsGui + \ingroup group_hsutils + \brief Represents a view in the framework. + HsGui includes common UI components for Home screen. +*/ + +/*! + Constructor +*/ +HsGui::HsGui() +{ +} + +/*! + Destructor. +*/ +HsGui::~HsGui() +{ +} + +/*! + Returns idle view. +*/ +HbView *HsGui::idleView() +{ + return mIdleView.data(); +} + +/*! + 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 *view = mIdleView; + mIdleView = 0; + return view; +} + +/*! + Sets the idle view instance. The existing instance + will be deleted. +*/ +void HsGui::setIdleView(HbView *idleView) +{ + if (mIdleView != idleView) { + HbView *oldView = mIdleView; + mIdleView = idleView; + delete oldView; + } +} + +/*! + Return main window. +*/ +HbMainWindow *HsGui::mainWindow() +{ + return hbInstance->allMainWindows().first(); +} + +/*! + Points to the view instance. +*/ +QPointer HsGui::mIdleView(0); diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsdomainmodel/src/hspage.cpp --- a/homescreenapp/hsdomainmodel/src/hspage.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/hsdomainmodel/src/hspage.cpp Thu May 27 12:46:08 2010 +0300 @@ -99,6 +99,9 @@ connectWidget(widget.data()); widget->setPage(this); widget->initializeWidget(); + if (widget->state() != HsWidgetHost::Initialized) { + continue; + } widget->showWidget(); mWidgets.append(widget.data()); widget->setParentItem(this); @@ -345,6 +348,11 @@ } } +int HsPage::pageIndex() +{ + return HsScene::instance()->pages().indexOf(this); +} + void HsPage::connectWidget(HsWidgetHost *widget) { connect(widget, SIGNAL(widgetFinished(HsWidgetHost*)), diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsdomainmodel/src/hswallpaper.cpp --- a/homescreenapp/hsdomainmodel/src/hswallpaper.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/hsdomainmodel/src/hswallpaper.cpp Thu May 27 12:46:08 2010 +0300 @@ -56,7 +56,7 @@ mLImagePath = landscapeImagePath; mPImagePath = portraitImagePath; mOrientation = HsScene::orientation(); - + if (mOrientation == Qt::Horizontal) { setLandscapeImage(mLImagePath, true); } else { @@ -90,7 +90,7 @@ if (mPImagePath != wallpaperPath(Qt::Vertical)) { QFile::remove(mPImagePath); mPImagePath.clear(); - } + } return true; } @@ -100,7 +100,7 @@ static QString directory = QDir::toNativeSeparators("c:/private/20022f35/wallpapers/"); #else - static QString directory = + static QString directory = QDir::toNativeSeparators(QDir::currentPath() + "/private/20022f35/wallpapers/"); #endif @@ -124,4 +124,4 @@ } else { mIconItem->setIcon(HbIcon(QIcon(mPImagePath))); } -} \ No newline at end of file +} diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsdomainmodel/src/hswidgethost.cpp --- a/homescreenapp/hsdomainmodel/src/hswidgethost.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/hsdomainmodel/src/hswidgethost.cpp Thu May 27 12:46:08 2010 +0300 @@ -70,8 +70,7 @@ mWidget(0), mPage(0), mState(Unloaded), - mDatabaseId(databaseId), - mTapAndHoldIcon(0) + mDatabaseId(databaseId) { setFlags(QGraphicsItem::ItemClipsChildrenToShape); @@ -147,7 +146,8 @@ setProperty("isOnline", mIsOnlineProperty); setProperty("rootPath", mRootPathProperty); - + + setMethod("isPannable(QGraphicsSceneMouseEvent*)", mIsPannable); setMethod("onInitialize()", mOnInitializeMethod); setMethod("onUninitialize()", mOnUninitializeMethod); @@ -362,24 +362,38 @@ return db->deleteWidgetPresentation(mDatabaseId, key); } - +/*! + Check wheter widget uses pan gestures + Return true if successfull. +*/ +bool HsWidgetHost::isPannable(QGraphicsSceneMouseEvent *event) +{ + bool ret(false); + mIsPannable.invoke(mWidget,Q_RETURN_ARG(bool,ret),Q_ARG(QGraphicsSceneMouseEvent *,event)); + return ret; +} /*! \fn void HsWidgetHost::widgetFinished() - This signal is emitten after the contained widget + This signal is emitted after the contained widget reported is completion. */ /*! \fn void HsWidgetHost::widgetError() - This signal is emitten after the contained widget + This signal is emitted after the contained widget reported an error. */ /*! \fn void HsWidgetHost::widgetResized() - This signal is emitten after the contained widget + This signal is emitted after the contained widget sends a resize event. */ +/*! + \fn void HsWidgetHost::mousePressEventIgnored() + This signal is emitted if managed widget ignores mouse press event + +*/ /*! Calls the widget's onInitialize() slot if the @@ -397,7 +411,10 @@ setOnline(HsScene::instance()->isOnline()); mOnInitializeMethod.invoke(mWidget); - mState = Initialized; + if (mState != Finished && + mState != Faulted) { + mState = Initialized; + } } /*! @@ -514,26 +531,34 @@ animationGroup->start(QAbstractAnimation::DeleteWhenStopped); } - /*! - Starts the tap-and-hold animation. + Overwritten to stop event propogation */ -void HsWidgetHost::startTapAndHoldAnimation() -{ - mTapAndHoldIcon = new HbIconItem("tapandhold_animation"); - mTapAndHoldIcon->setZValue(1e6); - mTapAndHoldIcon->setParentItem(this); +void HsWidgetHost::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) +{ + Q_UNUSED(event) +} +/*! + Overwritten to stop event propogation +*/ +void HsWidgetHost::mouseMoveEvent(QGraphicsSceneMouseEvent *event) +{ + Q_UNUSED(event) } - /*! - Stops the tap-and-hold animation. + Overwritten to stop event propogation */ -void HsWidgetHost::stopTapAndHoldAnimation() -{ - delete mTapAndHoldIcon; - mTapAndHoldIcon = 0; +void HsWidgetHost::mousePressEvent(QGraphicsSceneMouseEvent *event) +{ + Q_UNUSED(event) + } - +/*! + Overwritten to stop event propogation +*/ +void HsWidgetHost::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { + Q_UNUSED(event) +} /*! Filters resize events from widgets and resizes inside max/min size boundaries if needed. */ @@ -660,6 +685,7 @@ */ void HsWidgetHost::onFinished() { + mState = Finished; emit widgetFinished(this); } diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsutils/inc/hsmenuevent.h --- a/homescreenapp/hsutils/inc/hsmenuevent.h Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/hsutils/inc/hsmenuevent.h Thu May 27 12:46:08 2010 +0300 @@ -47,6 +47,7 @@ CreateCollection, PreviewHSWidget, ShowAppSettings, + ShowAppDetails, Unknown }; diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsutils/inc/hsmenueventfactory.h --- a/homescreenapp/hsutils/inc/hsmenueventfactory.h Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/hsutils/inc/hsmenueventfactory.h Thu May 27 12:46:08 2010 +0300 @@ -79,7 +79,9 @@ const QString &library = QString() ); - static QEvent *createAppSettingsViewEvent(int entryId); + static QEvent *createAppSettingsViewEvent(int entryId); + + static QEvent *createAppDetailsViewEvent(int entryId); static QEvent *createUnknownEvent(); diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsutils/inc/hspageindicator.h --- a/homescreenapp/hsutils/inc/hspageindicator.h Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/hsutils/inc/hspageindicator.h Thu May 27 12:46:08 2010 +0300 @@ -32,7 +32,7 @@ Q_OBJECT public: - HsPageIndicator(QGraphicsItem *parent = 0); + HsPageIndicator(qreal spacing, QGraphicsItem *parent = 0); ~HsPageIndicator(); void initialize(int itemCount, int activeItemIndex); @@ -47,6 +47,8 @@ bool isAnimationRunning() const; + void setSpacing(qreal spacing); + private: Q_DISABLE_COPY(HsPageIndicator) void layoutItems(); @@ -54,6 +56,7 @@ private: QList mItems; int mActiveItemIndex; + qreal mSpacing; HOMESCREEN_TEST_FRIEND_CLASS(t_hsUtils) }; diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsutils/inc/hswallpaperimagereader.h --- a/homescreenapp/hsutils/inc/hswallpaperimagereader.h Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/hsutils/inc/hswallpaperimagereader.h Thu May 27 12:46:08 2010 +0300 @@ -18,12 +18,15 @@ #ifndef HSWALLPAPERIMAGEREADER_H #define HSWALLPAPERIMAGEREADER_H -#include +#include #include #include "hsutils_global.h" -class HSUTILS_EXPORT HsWallpaperImageReader : public QObject +#include "hstest_global.h" +HOMESCREEN_TEST_CLASS(t_hsUtils) + +class HSUTILS_EXPORT HsWallpaperImageReader : public QThread { Q_OBJECT @@ -32,31 +35,33 @@ ~HsWallpaperImageReader(); void setSourcePath(const QString &sourcePath); - QString getSourcePath() const; + QString sourcePath() const; void setSourceRect(const QRect &sourceRect); - QRect getSourceRect() const; + QRect sourceRect() const; void setTargetRect(const QRect &targetRect); - QRect getTargetRect() const; + QRect targetRect() const; void setCenterTarget(bool center); - bool getCenterTarget(); - QImage getProcessedImage() const; + bool centerTarget(); + QImage processedImage() const; + +signals: + void processingFinished(); + +protected: + void run(); private: Q_DISABLE_COPY(HsWallpaperImageReader) -signals: - void processingFinished(); - -public slots: - void processImage(); - private: QString mSourcePath; + QRect mSourceRect; QRect mTargetRect; - QRect mSourceRect; bool mCenterTarget; + QString mKey; + QImage mProcessedImage; - QImage mProcessedImage; + HOMESCREEN_TEST_FRIEND_CLASS(t_hsUtils) }; #endif // HSWALLPAPERIMAGEREADER_H diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsutils/src/hsimagefetcherclient.cpp --- a/homescreenapp/hsutils/src/hsimagefetcherclient.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/hsutils/src/hsimagefetcherclient.cpp Thu May 27 12:46:08 2010 +0300 @@ -76,6 +76,10 @@ mReq = mAppMgr.create(gFetcherInterface, gFetcherOperation, false); if (mReq) { + QList args; + args << QVariantMap(); + args << QVariant(); + mReq->setArguments(args); // Connect signals once connect(mReq, SIGNAL(requestOk(const QVariant&)), this, SLOT(handleOk(const QVariant&))); connect(mReq, SIGNAL(requestError(int,const QString&)), this, SLOT(handleError(int,const QString&))); diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsutils/src/hsmenueventfactory.cpp --- a/homescreenapp/hsutils/src/hsmenueventfactory.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/hsutils/src/hsmenueventfactory.cpp Thu May 27 12:46:08 2010 +0300 @@ -265,6 +265,19 @@ } /*! + Creates an HsMenuEvent::ShowAppDetails event. + \param entryId Id of an item. + \return Event for view the Application Settings. +*/ +QEvent *HsMenuEventFactory::createAppDetailsViewEvent(int entryId) +{ + QVariantMap params; + params.insert(itemIdKey(), entryId); + + return new HsMenuEvent(HsMenuEvent::ShowAppDetails, params); +} + +/*! Creates an HsMenuEvent::Unknown event. \return Unknown event. diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsutils/src/hspageindicator.cpp --- a/homescreenapp/hsutils/src/hspageindicator.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/hsutils/src/hspageindicator.cpp Thu May 27 12:46:08 2010 +0300 @@ -23,9 +23,10 @@ /*! */ -HsPageIndicator::HsPageIndicator(QGraphicsItem *parent) +HsPageIndicator::HsPageIndicator(qreal spacing, QGraphicsItem *parent) : HbWidget(parent), - mActiveItemIndex(-1) + mActiveItemIndex(-1), + mSpacing(spacing) { } @@ -46,18 +47,18 @@ mItems.clear(); mActiveItemIndex = -1; - if (itemCount < 1 || activeItemIndex < 0 || + if (itemCount < 1 || activeItemIndex < 0 || itemCount <= activeItemIndex) { return; } for (int i = 0; i < itemCount; ++i) { mItems << new HsPageIndicatorItem(i == activeItemIndex); - } + } mActiveItemIndex = activeItemIndex; layoutItems(); } - + /*! */ @@ -80,7 +81,7 @@ mItems[i]->setActive(i == activeItemIndex); } } - + /*! */ @@ -107,7 +108,7 @@ */ void HsPageIndicator::removeItem(int activeItemIndex) -{ +{ if (activeItemIndex < 0 || itemCount() - 1 <= activeItemIndex) { return; } @@ -133,12 +134,23 @@ { QGraphicsLinearLayout *layout = new QGraphicsLinearLayout; layout->setContentsMargins(0, 0, 0, 0); - layout->setSpacing(8); + layout->setSpacing(mSpacing); layout->addStretch(); foreach (HsPageIndicatorItem *item, mItems) { item->setPreferredSize(preferredHeight(), preferredHeight()); layout->addItem(item); - } + } layout->addStretch(); setLayout(layout); } + +/*! + +*/ +void HsPageIndicator::setSpacing(qreal spacing) +{ + QGraphicsLinearLayout *linearLayout = static_cast(layout()); + if (linearLayout) { + linearLayout->setSpacing(spacing); + } +} diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsutils/src/hswallpaperimagereader.cpp --- a/homescreenapp/hsutils/src/hswallpaperimagereader.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/hsutils/src/hswallpaperimagereader.cpp Thu May 27 12:46:08 2010 +0300 @@ -24,7 +24,7 @@ Constructor. */ HsWallpaperImageReader::HsWallpaperImageReader(QObject *parent): - QObject(parent), + QThread(parent), mCenterTarget(false) { @@ -49,7 +49,7 @@ /*! Returns image source path */ -QString HsWallpaperImageReader::getSourcePath() const +QString HsWallpaperImageReader::sourcePath() const { return mSourcePath; } @@ -65,7 +65,7 @@ /*! Returns source rect */ -QRect HsWallpaperImageReader::getSourceRect() const +QRect HsWallpaperImageReader::sourceRect() const { return mSourceRect; } @@ -81,7 +81,7 @@ /*! Returns target rect */ -QRect HsWallpaperImageReader::getTargetRect() const +QRect HsWallpaperImageReader::targetRect() const { return mTargetRect; } @@ -97,7 +97,7 @@ /*! Returns target centering */ -bool HsWallpaperImageReader::getCenterTarget() +bool HsWallpaperImageReader::centerTarget() { return mCenterTarget; } @@ -105,7 +105,7 @@ /*! Returns processed image */ -QImage HsWallpaperImageReader::getProcessedImage() const +QImage HsWallpaperImageReader::processedImage() const { return mProcessedImage; } @@ -117,10 +117,10 @@ Pass empty set sourceRect to empty to use full size source image as starting point. Returns processed image or null image if operation fails. */ -void HsWallpaperImageReader::processImage() +void HsWallpaperImageReader::run() { QImageReader imageReader(mSourcePath); - + QRect tempTargetRect = mTargetRect; QRect tempSourceRect = mSourceRect; @@ -130,7 +130,7 @@ // If sourceRect not defined, uses full size image as source. tempSourceRect.setRect(0, 0, sourceSize.width(), sourceSize.height()); } - sourceSize.scale(tempTargetRect.width(), tempTargetRect.height(), + sourceSize.scale(tempTargetRect.width(), tempTargetRect.height(), Qt::KeepAspectRatioByExpanding); imageReader.setScaledSize(sourceSize); @@ -142,5 +142,4 @@ } else { mProcessedImage = QImage(); } - emit processingFinished(); } diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hswidgetuninstaller/inc/hswidgetcomponentparser.h --- a/homescreenapp/hswidgetuninstaller/inc/hswidgetcomponentparser.h Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/hswidgetuninstaller/inc/hswidgetcomponentparser.h Thu May 27 12:46:08 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" @@ -11,9 +11,10 @@ * * Contributors: * -* Description: +* Description: * */ + #ifndef HSWIDGETCOMPONENTPARSER_H #define HSWIDGETCOMPONENTPARSER_H diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/inc/hsapp_defs.h --- a/homescreenapp/inc/hsapp_defs.h Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/inc/hsapp_defs.h Thu May 27 12:46:08 2010 +0300 @@ -45,6 +45,7 @@ inline const QString packageTypeName(); inline const QString appSettingsPlugin(); inline const QString groupNameAttributeName(); +inline const QString componentIdAttributeName(); // Sort attribute enum HsSortAttribute { @@ -68,7 +69,8 @@ AppSettingContextAction, RenameContextAction, DeleteContextAction, - RemoveFromCollectionContextAction + RemoveFromCollectionContextAction, + AppDetailsContextAction }; diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/inc/hsapp_defs.inl --- a/homescreenapp/inc/hsapp_defs.inl Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/inc/hsapp_defs.inl Thu May 27 12:46:08 2010 +0300 @@ -271,5 +271,22 @@ return key; } +/*! + \return applibrary activate name to open downloaded +*/ +inline const QString groupAppLibRecentView() +{ + static const QString key("AppLibRecentView"); + return key; +} + +/*! + \return application componentID atribute name +*/ +inline const QString componentIdAttributeName() +{ + static const QString key("component_id"); + return key; +} #endif diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/runtimeplugins/hsdefaultruntimeplugin/hsdefaultruntimeplugin.pri --- a/homescreenapp/runtimeplugins/hsdefaultruntimeplugin/hsdefaultruntimeplugin.pri Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/runtimeplugins/hsdefaultruntimeplugin/hsdefaultruntimeplugin.pri Thu May 27 12:46:08 2010 +0300 @@ -18,10 +18,3 @@ ./inc/hsdefaultruntimeplugin.h SOURCES += ./src/hsdefaultruntime.cpp \ ./src/hsdefaultruntimeplugin.cpp - -symbian: { -HEADERS += ./inc/hsbackuprestoreobserver.h \ - ./inc/hsbackuprestoreactivecallback.h -SOURCES += ./src/hsbackuprestoreobserver.cpp \ - ./src/hsbackuprestoreactivecallback.cpp -} diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/runtimeplugins/hsdefaultruntimeplugin/hsdefaultruntimeplugin.pro --- a/homescreenapp/runtimeplugins/hsdefaultruntimeplugin/hsdefaultruntimeplugin.pro Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/runtimeplugins/hsdefaultruntimeplugin/hsdefaultruntimeplugin.pro Thu May 27 12:46:08 2010 +0300 @@ -18,8 +18,6 @@ CONFIG += plugin hb mobility MOBILITY = serviceframework publishsubscribe -RESOURCES += hsdefaultruntimeplugin.qrc - PLUGIN_SUBDIR = /private/20022F35/plugins/runtimeplugins include (../../common.pri) @@ -37,7 +35,7 @@ symbian: { TARGET.UID3 = 0x20022F3E - LIBS += -lxqkeycapture -labclient + LIBS += -lxqkeycapture } diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/runtimeplugins/hsdefaultruntimeplugin/hsdefaultruntimeplugin.qrc --- a/homescreenapp/runtimeplugins/hsdefaultruntimeplugin/hsdefaultruntimeplugin.qrc Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ - - - resource/tapandhold.axml - - diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/runtimeplugins/hsdefaultruntimeplugin/inc/hsbackuprestoreactivecallback.h --- a/homescreenapp/runtimeplugins/hsdefaultruntimeplugin/inc/hsbackuprestoreactivecallback.h Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,217 +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 the License "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: Home screen active callback in HsBackupRestoreObserver. -* -*/ - - -#ifndef HSBACKUPRESTOREACTIVECALLBACK_H -#define HSBACKUPRESTOREACTIVECALLBACK_H - -#include // CBase -#include - - -/** - * Home screen active callback in backup/restore. - * - * @lib widgetbackuprestore.exe - * @since S60 ^4 - */ -NONSHARABLE_CLASS(CHsBRActiveCallback) : public CBase, - public conn::MActiveBackupDataClient - { -public: - - IMPORT_C static CHsBRActiveCallback* NewL(); - - virtual ~CHsBRActiveCallback(); - - void FinishBackupRestore(); - - void StartRestore(); - -// new functions - -// from base class MActiveBackupDataClient - - /** - * This method informs the active backup data client that all - * snapshots have been supplied. If the client has not - * received a snapshot then it should perform a base backup - */ - virtual void AllSnapshotsSuppliedL(); - - /** - * This method receives all or part of a snapshot of data to allow - * calculation of an incremental backup. The snapshot is one that - * was previously supplied by the data owner. The snapshot data - * should be read from the location supplied. The snapshot data may - * be larger than the location supplied in which case the routine - * will be called repeatedly until all data has been supplied. - * - * Snapshot data will also be supplied as part of a restore operation - * - * @param aDrive the drive being backed up - * @param aBuffer a pointer to the base of the location from whence - * data can be copied. - * @param aLastSection ETrue if this is the last section of snapshot - * data, else EFalse. - */ - virtual void ReceiveSnapshotDataL( - TDriveNumber aDrive, TDesC8& aBuffer, TBool aLastSection); - - /** - * This method returns the expected size of backup data that will be - * supplied. If an incremental backup is underway then this method - * then this method will not be called until after - * ReceiveSnapshotDataL(). The size data will be used for the purpose - * of tracking progess during a backup. If it is inaccurate then the - * user may see irregular progress but the actual backup data will - * not be affected so it is acceptable to return an estimated value. - * - * @param aDrive the drive being backed up. - * @return the size of the data that will be returned - */ - virtual TUint GetExpectedDataSize(TDriveNumber aDrive); - - /** - * This method returns a snapshot of data to accompany a backup. The - * snapshot is expected to contain details on files / data being - * backed up. The format of the snapshot is only meaningful to the - * data owner. The snapshot will be supplied if the data owner is - * asked for an incremental backup and for a restore operation. The - * snapshot data should be copied to the location supplied. - * - * The snapshot data may be larger than the location supplied in - * which case the routine will be called repeatedly until all data - * has been retrieved. - * - * @param aDrive the drive being backed up - * @param aBuffer a pointer to the base of the location where data - * can be copied. - * @param aFinished on return ETrue if all data has been returned - * for this drive, else EFalse. - */ - virtual void GetSnapshotDataL( - TDriveNumber aDrive, TPtr8& aBuffer, TBool& aFinished); - - /** - * This method prepares the implementor to return backup data. It - * will be followed by a sequence of calls to request the actual - * data. - * - * @param aDrive the drive being backed up. - */ - virtual void InitialiseGetBackupDataL(TDriveNumber aDrive); - - /** - * This method requests a section of backup data. - * InitialiseGetBackupDataL() will have been called previously to - * specify the drive concerned. The data returned may be base or - * incremental depending on the type of backup and the capability of - * the data owner. - * - * @param aBuffer a pointer to the base of the location where data - * can be copied. - * @param aFinished on return ETrue if all data has been returned - * for this drive, else EFalse. - */ - virtual void GetBackupDataSectionL(TPtr8& aBuffer, TBool& aFinished); - - /** - * This method prepares the implementor to receive base restore data - * for a drive. It will be followed by a sequence of calls to supply - * the actual data. - * - * @param aDrive the drive being restored. - */ - virtual void InitialiseRestoreBaseDataL(TDriveNumber aDrive); - - /** - * This method receives a section of base restore data. - * InitialiseRestoreBaseDataL() will have been called previously to - * specify the drive concerned. - * - * @param aBuffer a pointer to the base of the location whence data - * can be read. - * @param aFinished ETrue if all data has been returned for this - * drive, else EFalse. - */ - virtual void RestoreBaseDataSectionL(TDesC8& aBuffer, TBool aFinished); - - /** - * This method prepares the implementor to receive incremental - * restore data for a drive. It will be followed by a sequence - * of calls to supply the actual data. If multiple increments - * are supplied then this methid will be called before each increment - * - * @param aDrive the drive being restored. - */ - virtual void InitialiseRestoreIncrementDataL(TDriveNumber aDrive); - - /** - * This method receives a section of increment restore data. - * InitialiseRestoreIncrementDataL() will have been called - * previously to specify the drive concerned. - * - * @param aBuffer a pointer to the base of the location whence data - * can be read. - * @param aFinished ETrue if all data has been returned for this - * increment, else EFalse. - */ - virtual void RestoreIncrementDataSectionL(TDesC8& aBuffer, TBool aFinished); - - /** - * This method is called when all data to be restored has been - * supplied. - * - * @param aDrive the drive being restored. - */ - virtual void RestoreComplete(TDriveNumber aDrive); - - /** - * This method is called if copying of data is terminated prematurely - * to allow the implementor to tidy up. The same method applies to - * all types of data and to backup and restore. - */ - virtual void TerminateMultiStageOperation(); - - /** - * Gets a 32-bit checksum for its private data. - * This routine is for test purposes. It must be implemented but an - * invariant checksum value can be provided. Some tests may cause - * checksum values to be compared. - * - * @param aDrive the drive containing data being checksummed - * @return the 32-bit checksum - */ - virtual TUint GetDataChecksum(TDriveNumber aDrive); - -private: - - CHsBRActiveCallback(); - - void ConstructL(); - - void CloseDataBaseConnection(); - - void OpenDataBaseConnection(); - -private: // data - - }; - -#endif // HSBACKUPRESTOREACTIVECALLBACK_H - diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/runtimeplugins/hsdefaultruntimeplugin/inc/hsbackuprestoreobserver.h --- a/homescreenapp/runtimeplugins/hsdefaultruntimeplugin/inc/hsbackuprestoreobserver.h Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,112 +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 HSBACKUPRESTOREOBSERVER_H -#define HSBACKUPRESTOREOBSERVER_H - -#include -#include -#include - -class CHsBRActiveCallback; - -NONSHARABLE_CLASS(CHsBackupRestoreObserver) : public CActive - { - -public: - - /** - * Creates an instance of CCPServerBURListener implementation. - * @param aCallBack Pointer to observer interface. - */ - static CHsBackupRestoreObserver* NewL(); - - /** - * Destructor. - */ - virtual ~CHsBackupRestoreObserver(); - -private: - /** - * Constructor. - * @param aCallBack Pointer to observer interface. - */ - CHsBackupRestoreObserver(); - - /** - * Symbian 2nd phase constructor. - */ - void ConstructL(); - - /** - * Handles changes in backup state. - */ - void HandleBackupStateL( const TInt aValue ); - - /** - * Subsribes notifications of backup/restore p&s key. - */ - void SubscribePSKey(); - -private: - /** - * From CActive. - */ - void DoCancel(); - - /** - * From CActive. - */ - void RunL(); - - /** - * From CActive. - */ - TInt RunError( TInt aError ); - -private: - /** - * User side interface to Publish & Subscribe. - */ - RProperty iProperty; - - /** - * Callback interface for widget's active data owner. - * Own. - */ - CHsBRActiveCallback* iCallBack; - - /** - * Active backup client. - * Own. - */ - conn::CActiveBackupClient* iActiveBackupClient; - - /** - * Last state of BUR: either backup or restore or normal or unset - */ - TInt iLastType; - - /** - * Interface for notifying changes in Backup and Restore. - * Not own. - */ - //MBURListenerCallback* iCallback; - - }; - -#endif // HSBACKUPRESTOREOBSERVER_H -// End of File \ No newline at end of file diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/runtimeplugins/hsdefaultruntimeplugin/inc/hsdefaultruntime.h --- a/homescreenapp/runtimeplugins/hsdefaultruntimeplugin/inc/hsdefaultruntime.h Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/runtimeplugins/hsdefaultruntimeplugin/inc/hsdefaultruntime.h Thu May 27 12:46:08 2010 +0300 @@ -34,9 +34,6 @@ #endif class HsContentService; -#ifdef Q_OS_SYMBIAN -class CHsBackupRestoreObserver; -#endif QTM_BEGIN_NAMESPACE class QValueSpacePublisher; QTM_END_NAMESPACE @@ -62,8 +59,6 @@ private: Q_DISABLE_COPY(HsDefaultRuntime) - void registerAnimations(); - void createStatePublisher(); void createContentServiceParts(); void createStates(); @@ -73,6 +68,8 @@ private slots: void onIdleStateEntered(); void onIdleStateExited(); + void activityRequested(const QString &name); + private: HsContentService *mContentService; @@ -84,7 +81,6 @@ #ifdef Q_OS_SYMBIAN XqKeyCapture keyCapture; - CHsBackupRestoreObserver* mBRObserver; #endif TEST_FRIEND diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/runtimeplugins/hsdefaultruntimeplugin/resource/tapandhold.axml --- a/homescreenapp/runtimeplugins/hsdefaultruntimeplugin/resource/tapandhold.axml Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ - - - qtg_anim_longtap_0 - qtg_anim_longtap_1 - qtg_anim_longtap_2 - qtg_anim_longtap_3 - qtg_anim_longtap_4 - qtg_anim_longtap_5 - qtg_anim_longtap_6 - qtg_anim_longtap_7 - qtg_anim_longtap_8 - qtg_anim_longtap_9 - - diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/runtimeplugins/hsdefaultruntimeplugin/src/hsbackuprestoreactivecallback.cpp --- a/homescreenapp/runtimeplugins/hsdefaultruntimeplugin/src/hsbackuprestoreactivecallback.cpp Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,253 +0,0 @@ -/* -* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "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: Widget's active callback in WidgetBackupRestore. -* -*/ - - -// INCLUDE FILES -#include - -#include "hsbackuprestoreactivecallback.h" -#include "hsdatabase.h" - -// CONSTANTS - -// ======== MEMBER FUNCTIONS ======== - -// --------------------------------------------------------------------------- -// -// --------------------------------------------------------------------------- -// -CHsBRActiveCallback* CHsBRActiveCallback::NewL() -{ - CHsBRActiveCallback* self = - new( ELeave ) CHsBRActiveCallback(); - CleanupStack::PushL( self ); - self->ConstructL(); - CleanupStack::Pop( self ); - - return self; -} - -// --------------------------------------------------------------------------- -// Destructor -// --------------------------------------------------------------------------- -// -CHsBRActiveCallback::~CHsBRActiveCallback() -{ -} - -// --------------------------------------------------------------------------- -// Backup or restore has been finished. -// --------------------------------------------------------------------------- -// -void CHsBRActiveCallback::FinishBackupRestore() -{ - // allow database usage - OpenDataBaseConnection(); - // TODO: Load widgets -} - -// --------------------------------------------------------------------------- -// Backup or restore has been started. -// --------------------------------------------------------------------------- -// -void CHsBRActiveCallback::StartRestore() -{ - // allow database usage - CloseDataBaseConnection(); - // TODO: Load widgets -} - -// --------------------------------------------------------------------------- -// Inform that all data has been backed up or restored. -// --------------------------------------------------------------------------- -// -void CHsBRActiveCallback::AllSnapshotsSuppliedL() -{ - // No implementation needed. Must not leave -} - -// --------------------------------------------------------------------------- -// Not supported. -// --------------------------------------------------------------------------- -// -void CHsBRActiveCallback::ReceiveSnapshotDataL( - TDriveNumber /*aDrive*/, TDesC8& /*aBuffer*/, TBool /*aLastSection*/) -{ - // No implementation needed - User::Leave( KErrNotSupported ); -} - -// --------------------------------------------------------------------------- -// Make a guess about data size. -// --------------------------------------------------------------------------- -// -TUint CHsBRActiveCallback::GetExpectedDataSize( - TDriveNumber /*aDrive*/) -{ - // No implementation needed - return 0; -} - -// --------------------------------------------------------------------------- -// Not supported. -// --------------------------------------------------------------------------- -// -void CHsBRActiveCallback::GetSnapshotDataL( - TDriveNumber /*aDrive*/, TPtr8& /*aBuffer*/, TBool& /*aFinished*/) -{ - // No implementation needed - User::Leave( KErrNotSupported ); -} - -// --------------------------------------------------------------------------- -// Initialize for backup. -// --------------------------------------------------------------------------- -// -void CHsBRActiveCallback::InitialiseGetBackupDataL( - TDriveNumber /*aDrive*/) -{ - // Prevent database usage - CloseDataBaseConnection(); - // TODO: Unload widgets -} - -// --------------------------------------------------------------------------- -// --------------------------------------------------------------------------- -// -void CHsBRActiveCallback::GetBackupDataSectionL( - TPtr8& /*aBuffer*/, TBool& aFinished) -{ - // No data for active backup - aFinished = ETrue; -} - -// --------------------------------------------------------------------------- -// Initialize restore. -// --------------------------------------------------------------------------- -// -void CHsBRActiveCallback::InitialiseRestoreBaseDataL( - TDriveNumber /*aDrive*/ ) -{ - // No implementation needed - //User::Leave( KErrNotSupported ); - CloseDataBaseConnection(); -} - -// --------------------------------------------------------------------------- -// Run state machine for restore. Receive stream from BUR engine and turn it -// to file(s). -// --------------------------------------------------------------------------- -// -void CHsBRActiveCallback::RestoreBaseDataSectionL( - TDesC8& /*aBuffer*/, TBool /*aFinished*/ ) -{ - // No implementation needed - CloseDataBaseConnection(); -} - -// --------------------------------------------------------------------------- -// Incremental restoration is not supported. -// --------------------------------------------------------------------------- -// -void CHsBRActiveCallback::InitialiseRestoreIncrementDataL( - TDriveNumber /*aDrive*/) -{ - // No implementation needed - User::Leave( KErrNotSupported ); -} - -// --------------------------------------------------------------------------- -// Incremental restoration is not supported. -// --------------------------------------------------------------------------- -// -void CHsBRActiveCallback::RestoreIncrementDataSectionL( - TDesC8& /*aBuffer*/, TBool /*aFinished*/) -{ - // No implementation needed - User::Leave( KErrNotSupported ); -} - -// --------------------------------------------------------------------------- -// Called when restore is complete - sets data back to initial state. -// --------------------------------------------------------------------------- -// -void CHsBRActiveCallback::RestoreComplete(TDriveNumber /*aDrive*/) -{ - // No implementation needed -} - -// --------------------------------------------------------------------------- -// Tidy up when operation is over. -// --------------------------------------------------------------------------- -// -void CHsBRActiveCallback::TerminateMultiStageOperation() -{ - // No implementation needed -} - -// --------------------------------------------------------------------------- -// -// --------------------------------------------------------------------------- -// -TUint CHsBRActiveCallback::GetDataChecksum(TDriveNumber /*aDrive*/) -{ - // No implementation needed - return 0; -} - -// --------------------------------------------------------------------------- -// C++ constructor. -// --------------------------------------------------------------------------- -// -CHsBRActiveCallback::CHsBRActiveCallback() -{ -} - -// --------------------------------------------------------------------------- -// 2nd phase constructor. -// --------------------------------------------------------------------------- -// -void CHsBRActiveCallback::ConstructL() -{ -} - -// --------------------------------------------------------------------------- -// CHsBRActiveCallback::CloseDataBaseConnection() -// -// Close database connection. -// --------------------------------------------------------------------------- -// -void CHsBRActiveCallback::CloseDataBaseConnection() -{ - HsDatabase *db = HsDatabase::instance(); - db->setDataBaseBlocked(true); - db->close(); -} - -// --------------------------------------------------------------------------- -// CHsBRActiveCallback::OpenDataBaseConnection() -// -// Open database connection. -// --------------------------------------------------------------------------- -// -void CHsBRActiveCallback::OpenDataBaseConnection() -{ - HsDatabase *db = HsDatabase::instance(); - db->setDataBaseBlocked(false); - db->open(); -} -// End of file diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/runtimeplugins/hsdefaultruntimeplugin/src/hsbackuprestoreobserver.cpp --- a/homescreenapp/runtimeplugins/hsdefaultruntimeplugin/src/hsbackuprestoreobserver.cpp Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,185 +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: Home screen Backup/Restore observer. -* -*/ - -#include -#include "hsdatabase.h" -#include "hsbackuprestoreobserver.h" -#include "hsbackuprestoreactivecallback.h" - -using namespace conn; - -// ----------------------------------------------------------------------------- -// CHsBackupRestoreObserver::CHsBackupRestoreObserver -// C++ default constructor -// ----------------------------------------------------------------------------- -// -CHsBackupRestoreObserver::CHsBackupRestoreObserver() : CActive(EPriorityNormal) -{ - iLastType = conn::EBURUnset; - iProperty.Attach(KUidSystemCategory, KUidBackupRestoreKey); - CActiveScheduler::Add(this); - iStatus = KRequestPending; - iProperty.Subscribe(iStatus); - SetActive(); -} - -// ----------------------------------------------------------------------------- -// CHsBackupRestoreObserver::ConstructL -// S2nd phase constructor. -// ----------------------------------------------------------------------------- -// -void CHsBackupRestoreObserver::ConstructL() -{ - -} - -// --------------------------------------------------------------------------- -// CSpaceDataStorageBURListener::NewL -// --------------------------------------------------------------------------- -// -CHsBackupRestoreObserver* CHsBackupRestoreObserver::NewL() -{ - CHsBackupRestoreObserver* self = new (ELeave) - CHsBackupRestoreObserver(); - CleanupStack::PushL( self ); - self->ConstructL( ); - CleanupStack::Pop( self ); - - return self; -} - -// --------------------------------------------------------------------------- -// CHsBackupRestoreObserver::~CHsBackupRestoreObserver -// --------------------------------------------------------------------------- -// -CHsBackupRestoreObserver::~CHsBackupRestoreObserver() -{ - Cancel(); - iProperty.Close(); - delete iCallBack; - delete iActiveBackupClient; -} - -// --------------------------------------------------------------------------- -// Handles changes in backup state. -// --------------------------------------------------------------------------- -// -void CHsBackupRestoreObserver::HandleBackupStateL( const TInt aValue ) -{ - const TInt type = aValue & conn::KBURPartTypeMask; - - // Test if the device is going into backup or restore mode, and we are - // required to participate. - if ( ( type == conn::EBURBackupFull || type == conn::EBURRestoreFull ) || - ( type == conn::EBURBackupPartial || type == conn::EBURRestorePartial ) ) - { - if ( !iCallBack ) - { - iCallBack = CHsBRActiveCallback::NewL(); - } - - if ( !iActiveBackupClient ) - { - iActiveBackupClient = conn::CActiveBackupClient::NewL( iCallBack ); - - if ( ( type == conn::EBURBackupPartial || - type == conn::EBURRestorePartial ) && - !iActiveBackupClient->DoesPartialBURAffectMeL() ) - { - delete iCallBack; - iCallBack = NULL; - delete iActiveBackupClient; - iActiveBackupClient = NULL; - return; - } - else if(type == conn::EBURRestorePartial || type == conn::EBURRestoreFull) - { - iCallBack->StartRestore(); - } - } - - iActiveBackupClient->ConfirmReadyForBURL( KErrNone ); - } - else - { - if ( type == conn::EBURNormal ) - { - if ( (iLastType == conn::EBURBackupFull || iLastType == conn::EBURBackupPartial) || - (iLastType == conn::EBURRestorePartial || iLastType == conn::EBURRestoreFull) ) - { - iCallBack->FinishBackupRestore(); - } - // delete once back to normal. - delete iCallBack; - iCallBack = NULL; - delete iActiveBackupClient; - iActiveBackupClient = NULL; - } - } - - iLastType = type; -} - -// --------------------------------------------------------------------------- -// Subsribes notifications of backup/restore p&s key. -// --------------------------------------------------------------------------- -// -void CHsBackupRestoreObserver::SubscribePSKey() -{ - Cancel(); - - iProperty.Subscribe( iStatus ); - SetActive(); -} - -// --------------------------------------------------------------------------- -// CHsBackupRestoreObserver::DoCancel -// --------------------------------------------------------------------------- -// -void CHsBackupRestoreObserver::DoCancel() -{ - iProperty.Cancel( ); -} - -// --------------------------------------------------------------------------- -// CHsBackupRestoreObserver::RunL -// --------------------------------------------------------------------------- -// -void CHsBackupRestoreObserver::RunL() -{ - if ( iStatus.Int() == KErrNone ) - { - TInt currentValue = KErrNone; - iProperty.Get( currentValue ); - - HandleBackupStateL( currentValue ); - } - // Re-subscribe notifications. - SubscribePSKey(); -} - -// --------------------------------------------------------------------------- -// CHsBackupRestoreObserver::RunError -// --------------------------------------------------------------------------- -// -TInt CHsBackupRestoreObserver::RunError( TInt /*aError*/) -{ - // No need to do anything - return KErrNone; -} - -// End of File diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/runtimeplugins/hsdefaultruntimeplugin/src/hsdefaultruntime.cpp --- a/homescreenapp/runtimeplugins/hsdefaultruntimeplugin/src/hsdefaultruntime.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/runtimeplugins/hsdefaultruntimeplugin/src/hsdefaultruntime.cpp Thu May 27 12:46:08 2010 +0300 @@ -17,6 +17,7 @@ #include #include +#include #include #include #include @@ -26,10 +27,13 @@ #include #include +#include +#include #include #include #include +#include "hsmenueventfactory.h" #include "homescreendomainpskeys.h" #include "hsdefaultruntime.h" #include "hsdatabase.h" @@ -39,12 +43,10 @@ #include "hswidgetpositioningonorientationchange.h" #include "hswidgetpositioningonwidgetadd.h" #include "hstest_global.h" -#ifdef Q_OS_SYMBIAN -#include "hsbackuprestoreobserver.h" -#endif +#include "hsconfiguration.h" QTM_USE_NAMESPACE - +#define hbApp qobject_cast(qApp) #ifdef Q_OS_SYMBIAN const static Qt::Key applicationKey = Qt::Key_Menu; @@ -54,10 +56,12 @@ 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"; } @@ -83,7 +87,6 @@ mPublisher(NULL) #ifdef Q_OS_SYMBIAN ,keyCapture() - ,mBRObserver(NULL) #endif { HSTEST_FUNC_ENTRY("HS::HsDefaultRuntime::HsDefaultRuntime"); @@ -98,16 +101,13 @@ db->open(); HsDatabase::setInstance(db); + HsConfiguration::loadConfiguration(); + HsWidgetPositioningOnOrientationChange::setInstance( new HsAdvancedWidgetPositioningOnOrientationChange); HsWidgetPositioningOnWidgetAdd::setInstance( new HsAnchorPointInBottomRight); - -#ifdef Q_OS_SYMBIAN - mBRObserver = CHsBackupRestoreObserver::NewL(); -#endif - registerAnimations(); createStatePublisher(); createContentServiceParts(); @@ -115,7 +115,12 @@ assignServices(); QCoreApplication::instance()->installEventFilter(this); - HSTEST_FUNC_EXIT("HS::HsDefaultRuntime::HsDefaultRuntime"); + + if (hbApp) { // Qt test framework uses QApplication. + connect(hbApp->activityManager(), SIGNAL(activityRequested(QString)), + this, SLOT(activityRequested(QString))); + } + HSTEST_FUNC_EXIT("HS::HsDefaultRuntime::HsDefaultRuntime"); } /*! @@ -125,9 +130,6 @@ { HsWidgetPositioningOnOrientationChange::setInstance(0); delete mPublisher; -#ifdef Q_OS_SYMBIAN - delete mBRObserver; -#endif } /*! @@ -174,15 +176,6 @@ } /*! - Registers framework animations. -*/ -void HsDefaultRuntime::registerAnimations() -{ - HbIconAnimationManager *manager = HbIconAnimationManager::global(); - manager->addDefinitionFile(QLatin1String(":/resource/tapandhold.axml")); -} - -/*! Creates Home screen state publisher. */ void HsDefaultRuntime::createStatePublisher() @@ -232,19 +225,22 @@ loadSceneState->setParent(guiRootState); loadSceneState->setObjectName(KHsLoadSceneStateInterface); + QObject *rootStateObj = manager.loadInterface(KHsRootStateInterface); + QState *rootState = qobject_cast(rootStateObj); + rootState->setParent(guiRootState); + rootState->setObjectName(KHsRootStateInterface); + QObject *idleStateObj = manager.loadInterface(KHsIdleStateInterface); QState *idleState = qobject_cast(idleStateObj); - idleState->setParent(guiRootState); + idleState->setParent(rootState); idleState->setObjectName(KHsIdleStateInterface); connect(idleState, SIGNAL(entered()), SLOT(onIdleStateEntered())); connect(idleState, SIGNAL(exited()), SLOT(onIdleStateExited())); - loadSceneState->addTransition( - loadSceneState, SIGNAL(event_idle()), idleState); //menu state QState *menuParallelState = new QState( - QState::ParallelStates, guiRootState); + QState::ParallelStates, rootState); QState *menuRootState = new QState(menuParallelState); QObject *appLibraryStateObj = manager.loadInterface(KHsAppLibraryStateInterface); @@ -253,15 +249,31 @@ 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(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(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, @@ -387,3 +399,14 @@ mIdleStateActive = false; updatePSKeys(); } + +/*! + Activity requested by another client +*/ +void HsDefaultRuntime::activityRequested(const QString &name) +{ + if (name == groupAppLibRecentView()){ + this->postEvent(HsMenuEventFactory::createOpenCollectionEvent(0, + collectionDownloadedTypeName())); + } +} diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/serviceproviders/hsmenuserviceprovider/inc/hsmenuservice.h --- a/homescreenapp/serviceproviders/hsmenuserviceprovider/inc/hsmenuservice.h Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/inc/hsmenuservice.h Thu May 27 12:46:08 2010 +0300 @@ -65,6 +65,8 @@ static bool organizeCollection(int groupId, QList &entryIdList); static int allCollectionsId(); + + static int collectionIdByType(const QString& collectionType); static bool touch(int entryId); diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenuservice.cpp --- a/homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenuservice.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenuservice.cpp Thu May 27 12:46:08 2010 +0300 @@ -126,6 +126,9 @@ } else { query.setFlagsOn(VisibleEntryFlag); } + if(!collectionId) { + collectionId = collectionIdByType(collectionType); + } query.setParentId(collectionId); query.setSort(HsMenuServiceUtils::sortBy(sortAttribute), HsMenuServiceUtils::sortOrder(sortAttribute)); @@ -347,6 +350,33 @@ } /*! + Retrives the first found collection entry id + \param collectionType collection type. + \retval collectionType id + */ +int HsMenuService::collectionIdByType(const QString& collectionType) +{ + HSMENUTEST_FUNC_ENTRY("HsMenuService::collectionsIdByType"); + int collectionId; + CaQuery collectionsQuery; + collectionsQuery.setEntryRoles(GroupEntryRole); + //sorting is set to (default, ascending) to assure that + //proper entry is fetched, somebody can add item with + //"menucollections" typename to the storage, but even if he or she + //do this we fetch entry that we wanted + collectionsQuery.setSort(DefaultSortAttribute, Qt::AscendingOrder); + collectionsQuery.addEntryTypeName(collectionType); + QList ids = CaService::instance()->getEntryIds( + collectionsQuery); + Q_ASSERT(ids.count() > 0); + collectionId = ids.at(0); + qDebug() << "HsMenuService::HsMenuService collectionsIdByType" + << collectionId; + HSMENUTEST_FUNC_EXIT("HsMenuService::collectionsIdByType"); + return collectionId; +} + +/*! Touch action on an entry. \param entryId of this entry. \retval boolean error code. diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsapplibrarystateplugin/conf/applibrary_view.confml --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/conf/applibrary_view.confml Fri May 14 15:43:04 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ - - - - - Applibrary db specific customisation - - - - - AppLibUid Settings - - - - \ No newline at end of file diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsapplibrarystateplugin/conf/hsapplibrary.confml Binary file homescreenapp/stateplugins/hsapplibrarystateplugin/conf/hsapplibrary.confml has changed diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrarystateplugin.pro --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrarystateplugin.pro Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrarystateplugin.pro Thu May 27 12:46:08 2010 +0300 @@ -32,7 +32,7 @@ TARGET.UID3 = 0x20022F97 nft::LIBS += -lhal include(hsapplibrarystateplugin_exports_to_rom.pri) - exists($${EPOCROOT}epoc32/include/mw/XQSettingsManager):LIBS += -lxqsettingsmanager + exists($${EPOCROOT}epoc32/include/platform/mw/XQSettingsManager):LIBS += -lxqsettingsmanager } exportResources(./*.qm, resource/qt/translations) RESOURCES = hsapplibrarystateplugin.qrc diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrarystateplugin_exports_to_rom.pri --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrarystateplugin_exports_to_rom.pri Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrarystateplugin_exports_to_rom.pri Thu May 27 12:46:08 2010 +0300 @@ -17,5 +17,5 @@ BLD_INF_RULES.prj_exports += \ "$${LITERAL_HASH}include " \ "conf/hsapplibrary.confml APP_LAYER_CONFML(hsapplibrary.confml)" \ - "conf/hsapplibrary_20022F97.crml APP_LAYER_CRML(hsapplibrary_20022F97.crml)" \ - "conf/applibrary_view.confml APP_LAYER_CONFML(applibrary_view.confml)" + "conf/hsapplibrary_20022F97.crml APP_LAYER_CRML(hsapplibrary_20022F97.crml)" + diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsallappsstate.h --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsallappsstate.h Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsallappsstate.h Thu May 27 12:46:08 2010 +0300 @@ -38,6 +38,7 @@ class HsMenuViewBuilder; class HsMenuItemModel; class HsMenuModeWrapper; +class HsMainWindow; class HsAllAppsState: public QState { @@ -46,6 +47,7 @@ public: HsAllAppsState(HsMenuViewBuilder &menuViewBuilder, HsMenuModeWrapper &menuMode, + HsMainWindow &mainWindow, QState *parent = 0); ~HsAllAppsState(); signals: @@ -68,8 +70,8 @@ void stateEntered(); void addModeEntered(); void normalModeEntered(); - void stateExited(); - void contextMenuAction(HbAction *action); + void stateExited(); + void contextMenuAction(HbAction *action); private: void construct(); void setMenuOptions(); @@ -81,8 +83,9 @@ HsMenuView mMenuView; HsMenuModeWrapper &mMenuMode; HsMenuItemModel *mAllAppsModel; - QModelIndex mContextModelIndex; - QPointer mContextMenu; + HsMainWindow &mMainWindow; + QModelIndex mContextModelIndex; + QPointer mContextMenu; }; #endif // HSALLAPPSSTATE_H diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsallcollectionsstate.h --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsallcollectionsstate.h Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsallcollectionsstate.h Thu May 27 12:46:08 2010 +0300 @@ -37,6 +37,7 @@ class HbMainWindow; class HsMenuItemModel; class HsMenuView; +class HsMainWindow; class HsAllCollectionsState: public QState { @@ -45,6 +46,7 @@ public: HsAllCollectionsState(HsMenuViewBuilder &menuViewBuilder, HsMenuModeWrapper &menuMode, + HsMainWindow &mainWindow, QState *parent = 0); ~HsAllCollectionsState(); protected: @@ -70,7 +72,7 @@ void normalModeEntered(); void normalModeExited(); void stateExited(); - void contextMenuAction(HbAction *action); + void contextMenuAction(HbAction *action); private: void construct(); void setMenuOptions(); @@ -80,8 +82,9 @@ HsMenuView mMenuView; HsMenuModeWrapper &mMenuMode; HsMenuItemModel *mAllCollectionsModel; - QModelIndex mContextModelIndex; - QPointer mContextMenu; + HsMainWindow &mMainWindow; + QModelIndex mContextModelIndex; + QPointer mContextMenu; }; #endif // HSALLCOLLECTIONSSTATE_H diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsapplibrarystate.h --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsapplibrarystate.h Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsapplibrarystate.h Thu May 27 12:46:08 2010 +0300 @@ -22,6 +22,7 @@ #include #include "hsmenustates_global.h" #include "hsmenuview.h" +#include "hsmainwindow.h" #include "hsmenumodewrapper.h" #include "hsapp_defs.h" @@ -54,6 +55,8 @@ signals: + void collectionEntered(); + void toHomescreenState(); void initialize(); @@ -108,6 +111,8 @@ HsInstalledAppsState *mInstalledAppsState; HsMenuModeWrapper mMenuMode; + + HsMainWindow mMainWindow; }; #endif //HSAPPLIBRARYSTATE_H diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hscollectionstate.h --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hscollectionstate.h Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hscollectionstate.h Thu May 27 12:46:08 2010 +0300 @@ -36,6 +36,7 @@ class HsMenuItemModel; class HsMenuModeWrapper; class HsMenuViewBuilder; +class HsMainWindow; class HsCollectionState: public QState { @@ -44,6 +45,7 @@ public: HsCollectionState(HsMenuViewBuilder &menuView, HsMenuModeWrapper &menuMode, + HsMainWindow &mainWindow, QState *parent = 0); ~HsCollectionState(); public slots: @@ -66,7 +68,7 @@ void stateExited(); void latestOnTopMenuAction(); void oldestOnTopMenuAction(); - void contextMenuAction(HbAction *action); + void contextMenuAction(HbAction *action); private: void construct(); void constructMenu(bool isDynamic); @@ -84,9 +86,9 @@ HbAction *const mSecondarySoftkeyAction; HsMenuItemModel *mCollectionModel; HbMenu *mOptions; - QModelIndex mContextModelIndex; - QPointer mContextMenu; - + QModelIndex mContextModelIndex; + QPointer mContextMenu; + HsMainWindow &mMainWindow; }; #endif // HSCOLLECTIONSTATE_H diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsinstalledappsstate.h --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsinstalledappsstate.h Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsinstalledappsstate.h Thu May 27 12:46:08 2010 +0300 @@ -35,6 +35,7 @@ class QPointF; class HsMenuViewBuilder; class HsMenuItemModel; +class HsMainWindow; class HsInstalledAppsState: public QState { @@ -45,6 +46,7 @@ public: HsInstalledAppsState(HsMenuViewBuilder &menuViewBuilder, + HsMainWindow &mainWindow, QState *parent = 0); ~HsInstalledAppsState(); @@ -64,7 +66,7 @@ void stateExited(); - void contextMenuAction(HbAction *action); + void contextMenuAction(HbAction *action); private: @@ -91,9 +93,11 @@ * Own. */ HbAction *const mSecondarySoftkeyAction; + + HsMainWindow &mMainWindow; - QModelIndex mContextModelIndex; - QPointer mContextMenu; + QModelIndex mContextModelIndex; + QPointer mContextMenu; }; #endif // HSINSTALLEDAPPSSTATE_H diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmainwindow.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmainwindow.h Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,32 @@ +/* + * 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. + * + */ + +#ifndef HS_MAIN_WINDOW_H +#define HS_MAIN_WINDOW_H + +class HsMenuView; +class HsMainWindow +{ + +public: + HsMainWindow(); + virtual ~HsMainWindow(); + + virtual void setCurrentView(const HsMenuView &menuView); +}; + +#endif // HS_MAIN_WINDOW_H diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmenuview.h --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmenuview.h Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmenuview.h Thu May 27 12:46:08 2010 +0300 @@ -36,6 +36,7 @@ class HbListView; class HbGroupBox; class HbWidget; +class HbStaticVkbHost; class HsMenuItemModel; @@ -51,14 +52,14 @@ void setSearchPanelVisible(bool visible); - HbView *view(); + HbView *view() const; - HbListView *listView(); + HbListView *listView() const; void activate(); void inactivate(); - HbGroupBox *viewLabel(); + HbGroupBox *viewLabel() const; void setModel(HsMenuItemModel *model); @@ -83,11 +84,11 @@ QAbstractItemView::PositionAtTop); void findItem(QString criteriaStr); + void vkbOpened(); + void vkbClosed(); private: - void addViewToMainWindow(HbView *view); - QModelIndex firstVisibleItemIndex(const HbListView *view) const; void connectSearchPanelSignals(); @@ -117,6 +118,7 @@ HbListView *mSearchListView; HbSearchPanel *mSearchPanel; + HbStaticVkbHost* mVkbHost; HS_STATES_TEST_FRIEND_CLASS(MenuStatesTest) }; diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallappsstate.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallappsstate.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallappsstate.cpp Thu May 27 12:46:08 2010 +0300 @@ -36,6 +36,7 @@ #include "hsmenumodetransition.h" #include "caentry.h" #include "caservice.h" +#include "hsmainwindow.h" /*! \class HsAllAppsState @@ -75,12 +76,15 @@ */ HsAllAppsState::HsAllAppsState(HsMenuViewBuilder &menuViewBuilder, HsMenuModeWrapper &menuMode, + HsMainWindow &mainWindow, QState *parent) : QState(parent), mSortAttribute(AscendingNameHsSortAttribute), mCollectionsSortAttribute(LatestOnTopHsSortAttribute), mMenuView(menuViewBuilder, HsAllAppsContext), mMenuMode(menuMode), - mAllAppsModel(0), mContextModelIndex(), mContextMenu(0) + mAllAppsModel(0), + mMainWindow(mainWindow), + mContextModelIndex(), mContextMenu(0) { construct(); } @@ -207,6 +211,7 @@ qDebug("AllAppsState::stateEntered()"); HSMENUTEST_FUNC_ENTRY("HsAllAppsState::stateEntered"); + mMainWindow.setCurrentView(mMenuView); mMenuView.activate(); HSMENUTEST_FUNC_EXIT("HsAllAppsState::stateEntered"); @@ -345,6 +350,7 @@ "txt_common_menu_delete")); uninstallAction->setData(UninstallContextAction); HbAction *appSettingsAction(NULL); + HbAction *appDetailsAction(NULL); // check conditions and hide irrelevant menu items @@ -355,6 +361,13 @@ "txt_common_menu_settings")); appSettingsAction->setData(AppSettingContextAction); } + if (!(entry->attribute(componentIdAttributeName()).isEmpty()) && + entry->entryTypeName() == applicationTypeName() ) { + appDetailsAction = mContextMenu->addAction(hbTrId( + "txt_common_menu_details")); + appDetailsAction->setData(AppDetailsContextAction); + } + EntryFlags flags = item->modelIndex().data( CaItemModel::FlagsRole).value (); @@ -399,6 +412,10 @@ machine()->postEvent( HsMenuEventFactory::createAppSettingsViewEvent(itemId)); break; + case AppDetailsContextAction: + machine()->postEvent( + HsMenuEventFactory::createAppDetailsViewEvent(itemId)); + break; default: break; } diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallcollectionsstate.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallcollectionsstate.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallcollectionsstate.cpp Thu May 27 12:46:08 2010 +0300 @@ -33,6 +33,7 @@ #include "hsallcollectionsstate.h" #include "hsaddappstocollectionstate.h" #include "hsmenumodetransition.h" +#include "hsmainwindow.h" /*! \class HsAllCollectionsState @@ -74,12 +75,15 @@ HsAllCollectionsState::HsAllCollectionsState( HsMenuViewBuilder &menuViewBuilder, HsMenuModeWrapper &menuMode, + HsMainWindow &mainWindow, QState *parent): QState(parent), mSortAttribute(CustomHsSortAttribute), mMenuView(menuViewBuilder, HsAllCollectionsContext), mMenuMode(menuMode), - mAllCollectionsModel(0), mContextModelIndex(), mContextMenu(0) + mAllCollectionsModel(0), + mMainWindow(mainWindow), + mContextModelIndex(), mContextMenu(0) { construct(); } @@ -214,6 +218,7 @@ qDebug("AllCollectionsState::stateEntered()"); HSMENUTEST_FUNC_ENTRY("HsAllCollectionsState::stateEntered"); + mMainWindow.setCurrentView(mMenuView); mMenuView.activate(); HSMENUTEST_FUNC_EXIT("HsAllCollectionsState::stateExited"); diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsapplibrarystate.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsapplibrarystate.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsapplibrarystate.cpp Thu May 27 12:46:08 2010 +0300 @@ -119,10 +119,11 @@ HSMENUTEST_FUNC_ENTRY("HsAppLibraryState::construct"); setObjectName("homescreen.nokia.com/state/applibrarystate"); - mAllAppsState = new HsAllAppsState(mMenuViewBuilder, mMenuMode, this); + mAllAppsState = new HsAllAppsState(mMenuViewBuilder, mMenuMode, mMainWindow, this); connect(this, SIGNAL(entered()),mAllAppsState, SLOT(scrollToBeginning())); - mAllCollectionsState = new HsAllCollectionsState(mMenuViewBuilder, mMenuMode, this); + mAllCollectionsState = new HsAllCollectionsState(mMenuViewBuilder, mMenuMode, + mMainWindow, this); connect(this, SIGNAL(entered()), mAllCollectionsState, SLOT(scrollToBeginning())); @@ -138,14 +139,15 @@ mCollectionState = new HsCollectionState(mMenuViewBuilder, mMenuMode, + mMainWindow, this); connect(mCollectionState, SIGNAL(entered()),SLOT(clearToolbarLatch())); HsMenuEventTransition *eventTransition = new HsMenuEventTransition(HsMenuEvent::OpenCollection, - mAllCollectionsState, mCollectionState); - mAllCollectionsState->addTransition(eventTransition); + this, mCollectionState); + this->addTransition(eventTransition); HsMenuEventTransition *collectionDeletedTransition = new HsMenuEventTransition(HsMenuEvent::CollectionDeleted, @@ -159,7 +161,7 @@ mCollectionState->addTransition(collectionToAppLibTransition); mInstalledAppsState = new HsInstalledAppsState( - mMenuViewBuilder, this); + mMenuViewBuilder, mMainWindow, this); HsMenuEventTransition *installedToAppLibTransition = new HsMenuEventTransition(HsMenuEvent::OpenApplicationLibrary, @@ -294,6 +296,7 @@ if (checkedAction != NULL) { checkedAction->setChecked(false); } + emit collectionEntered(); HSMENUTEST_FUNC_EXIT("HsAppLibraryState::clearToolbarLatch"); } diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hscollectionstate.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hscollectionstate.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hscollectionstate.cpp Thu May 27 12:46:08 2010 +0300 @@ -37,7 +37,7 @@ #include "hscollectionstate.h" #include "hsaddappstocollectionstate.h" #include "hsapp_defs.h" - +#include "hsmainwindow.h" /*! \class HsCollectionState @@ -118,6 +118,7 @@ */ HsCollectionState::HsCollectionState(HsMenuViewBuilder &menuViewBuilder, HsMenuModeWrapper &menuMode, + HsMainWindow &mainWindow, QState *parent) : QState(parent), mSortAttribute(LatestOnTopHsSortAttribute), @@ -127,7 +128,8 @@ mMenuMode(menuMode), mSecondarySoftkeyAction(new HbAction(Hb::BackNaviAction, this)), mCollectionModel(0), - mOptions(0), mContextModelIndex(), mContextMenu(0) + mOptions(0), mContextModelIndex(), mContextMenu(0), + mMainWindow(mainWindow) { construct(); } @@ -196,21 +198,16 @@ { HSMENUTEST_FUNC_ENTRY("HsCollectionState::stateEntered"); + mMainWindow.setCurrentView(mMenuView); mMenuView.activate(); if (!mCollectionModel) { mCollectionModel = HsMenuService::getCollectionModel( mCollectionId, mSortAttribute, mCollectionType); - } else { - if (mCollectionType == collectionDownloadedTypeName()) { - mCollectionModel->setFlagsOn(RemovableEntryFlag | VisibleEntryFlag); - } else { - mCollectionModel->setFlagsOn(VisibleEntryFlag); - } - mCollectionModel->setParentId(mCollectionId); - mCollectionModel->setSort(LatestOnTopHsSortAttribute); } + + connect(mCollectionModel, SIGNAL(modelReset()), SLOT(updateLabel())); mMenuView.setModel(mCollectionModel); @@ -285,6 +282,8 @@ mMenuView.setSearchPanelVisible(false); mMenuView.inactivate(); + disconnect(mCollectionModel, SIGNAL(modelReset()), + this, SLOT(updateLabel())); delete mCollectionModel; mCollectionModel = NULL; delete mOptions; @@ -292,6 +291,7 @@ if (mContextMenu) mContextMenu->close(); HSMENUTEST_FUNC_EXIT("HsCollectionState::stateExited"); + this->mSortAttribute = NoHsSortAttribute; qDebug("CollectionState::stateExited()"); } @@ -308,7 +308,6 @@ connect(&mMenuView, SIGNAL(longPressed(HbAbstractViewItem *, QPointF)), SLOT(listItemLongPressed(HbAbstractViewItem *, QPointF))); - connect(mCollectionModel, SIGNAL(modelReset()),SLOT(updateLabel())); } /*! @@ -319,9 +318,6 @@ disconnect(mSecondarySoftkeyAction, SIGNAL(triggered()), this, SLOT(backSteppingAction())); - disconnect(mCollectionModel, SIGNAL(modelReset()), - this, SLOT(updateLabel())); - disconnect(&mMenuView, SIGNAL(activated(QModelIndex)), this, SLOT(listItemActivated(QModelIndex))); @@ -391,6 +387,7 @@ 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 = @@ -417,7 +414,13 @@ "txt_common_menu_settings")); appSettingsAction->setData(AppSettingContextAction); } - + + if (!(entry->attribute(componentIdAttributeName()).isEmpty()) && + entry->entryTypeName() == applicationTypeName() ) { + appDetailsAction = mContextMenu->addAction(hbTrId( + "txt_common_menu_details")); + appDetailsAction->setData(AppDetailsContextAction); + } mContextModelIndex = item->modelIndex(); mContextMenu->setPreferredPos(coords); mContextMenu->setAttribute(Qt::WA_DeleteOnClose); @@ -458,6 +461,10 @@ machine()->postEvent( HsMenuEventFactory::createAppSettingsViewEvent(itemId)); break; + case AppDetailsContextAction: + machine()->postEvent( + HsMenuEventFactory::createAppDetailsViewEvent(itemId)); + break; default: break; } diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsinstalledappsstate.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsinstalledappsstate.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsinstalledappsstate.cpp Thu May 27 12:46:08 2010 +0300 @@ -34,6 +34,7 @@ #include "hsaddappstocollectionstate.h" #include "hsapp_defs.h" #include "hsmenumodetransition.h" +#include "hsmainwindow.h" /*! \class HsInstalledAppsState @@ -75,11 +76,13 @@ \param parent Owner. */ HsInstalledAppsState::HsInstalledAppsState(HsMenuViewBuilder &menuViewBuilder, + HsMainWindow &mainWindow, QState *parent): QState(parent), mMenuView(menuViewBuilder, HsInstalledAppsContext), mInstalledAppsModel(0), mSecondarySoftkeyAction(new HbAction(Hb::BackNaviAction, this)), + mMainWindow(mainWindow), mContextModelIndex(),mContextMenu(0) { construct(); @@ -146,6 +149,7 @@ qDebug("AllAppsState::stateEntered()"); HSMENUTEST_FUNC_ENTRY("HsInstalledAppsState::stateEntered"); + mMainWindow.setCurrentView(mMenuView); mMenuView.activate(); if (!mInstalledAppsModel) { diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmainwindow.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmainwindow.cpp Thu May 27 12:46:08 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 view. + * + */ + +#include +#include +#include +#include "hsmainwindow.h" +#include "hsmenuview.h" + +/*! + Constructor + */ +HsMainWindow::HsMainWindow() +{ +} + +/*! + Destructor + */ +HsMainWindow::~HsMainWindow() +{ +} + +/*! + 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) +{ + HbMainWindow *const hbW( + HbInstance::instance()->allMainWindows().value(0)); + + HbView *const view = menuView.view(); + + if (!hbW->views().contains(view)) { + hbW->addView(view); + } + if (hbW->currentView() && !hbW->currentView()->isContentFullScreen()) { + // quick trick to know if we are not comming from IDLE + hbW->setCurrentView(view, true, Hb::ViewSwitchUseAltEvent); + } else { + hbW->setCurrentView(view); + } +} + diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuview.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuview.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuview.cpp Thu May 27 12:46:08 2010 +0300 @@ -27,6 +27,7 @@ #include #include #include +#include #include "hsallappsstate.h" #include "hsallcollectionsstate.h" @@ -62,7 +63,8 @@ mListView(NULL), mViewLabel(NULL), mSearchListView(NULL), - mSearchPanel(NULL) + mSearchPanel(NULL), + mVkbHost(NULL) { mBuilder.setOperationalContext(HsItemViewContext); mBuilder.setViewContext(mViewContext); @@ -76,6 +78,10 @@ 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())); + connect(mListView, SIGNAL(activated(QModelIndex)), this, SIGNAL(activated(QModelIndex))); @@ -103,18 +109,20 @@ { HSMENUTEST_FUNC_ENTRY("HsMenuView::setModel"); - disconnect(mListView->model(), - SIGNAL(scrollTo(int, QAbstractItemView::ScrollHint)), - this, - SLOT(scrollToRow(int, QAbstractItemView::ScrollHint))); - + if (mListView->model()) { + disconnect(mListView->model(), + SIGNAL(scrollTo(int, QAbstractItemView::ScrollHint)), + this, + SLOT(scrollToRow(int, QAbstractItemView::ScrollHint))); + } mListView->setModel(model); - connect(mListView->model(), - SIGNAL(scrollTo(int, QAbstractItemView::ScrollHint)), - this, - SLOT(scrollToRow(int, QAbstractItemView::ScrollHint))); - + if (mListView->model()) { + connect(mListView->model(), + SIGNAL(scrollTo(int, QAbstractItemView::ScrollHint)), + this, + SLOT(scrollToRow(int, QAbstractItemView::ScrollHint))); + } HSMENUTEST_FUNC_EXIT("HsMenuView::setModel"); } @@ -123,7 +131,7 @@ Returns label appropriate for the view. \return pointer to the label or NULL if the view has no label. */ -HbGroupBox *HsMenuView::viewLabel() +HbGroupBox *HsMenuView::viewLabel() const { return mViewLabel; } @@ -180,7 +188,7 @@ /*! \return View widget of the menu view. */ -HbView *HsMenuView::view() +HbView *HsMenuView::view() const { return mView; } @@ -188,7 +196,7 @@ /*! \return List view widget of the menu view. */ -HbListView *HsMenuView::listView() +HbListView *HsMenuView::listView() const { return mListView; } @@ -392,6 +400,7 @@ mSearchListView = NULL; mSearchPanel = NULL; + vkbClosed(); HSMENUTEST_FUNC_EXIT("hsmenuview::searchFinished"); } @@ -424,32 +433,13 @@ } /*! - Add the \view to first instance of HbMainWindow registered in HbInstance. - \param view View to be added to HbMainWindow. - */ -void HsMenuView::addViewToMainWindow(HbView *view) -{ - HbMainWindow *const hbW( - HbInstance::instance()->allMainWindows().value(0)); - - if (!hbW->views().contains(view)) { - hbW->addView(view); - } - hbW->setCurrentView(view); -} - - -/*! Add the view to main window and search action with \a showSearchPanel slot of the window. */ void HsMenuView::activate() { - addViewToMainWindow(mView); - connect(mBuilder.searchAction(), SIGNAL(triggered()), this, SLOT(showSearchPanel())); - } /*! @@ -465,4 +455,19 @@ } +/*! + change size of view when VKB is opened + */ +void HsMenuView::vkbOpened() +{ + mView->setMaximumHeight(mVkbHost->applicationArea().height()); +} +/*! + change size of view when VKB is closed + */ +void HsMenuView::vkbClosed() +{ + mView->setMaximumHeight(-1); +} + diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuviewbuilder.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuviewbuilder.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuviewbuilder.cpp Thu May 27 12:46:08 2010 +0300 @@ -34,34 +34,6 @@ #include "hsmenuviewbuilder.h" #include "hsmenustates_global.h" -// TODO this class is temprary solution, proper one should come from Orbit -class HsVkbHost : public HbStaticVkbHost -{ -public: - explicit HsVkbHost(HbWidget *target): - HbStaticVkbHost(target), mWidget(target) {} - -#ifdef COVERAGE_MEASUREMENT -#pragma CTC SKIP -#endif //COVERAGE_MEASUREMENT skipped: its very temporary TODO - void openFinished() { - updateViewHeight(applicationArea().height()); - } - - void closeFinished() { - updateViewHeight(-1); - } - - void updateViewHeight(qreal height) { - HbView *view = mWidget->mainWindow()->currentView(); - view->setMaximumHeight(height); - } -#ifdef COVERAGE_MEASUREMENT -#pragma CTC ENDSKIP -#endif //COVERAGE_MEASUREMENT - - HbWidget *mWidget; -}; /*! \class HsMenuViewBuilder @@ -85,19 +57,12 @@ void HsMenuViewBuilder::searchPanelVisibilityChange(bool visible) { if (visible) { - // TODO this is temprary solution, proper solution should come from Orbit - if (!HbVkbHost::getVkbHost(currentSearchPanel())) { - new HsVkbHost(currentSearchPanel()); - } + HbLineEdit *const lineEdit(searchPanelLineEdit()); lineEdit->setText(""); - } else { - if (static_cast(HbVkbHost::getVkbHost(currentSearchPanel()))) { - static_cast(HbVkbHost::getVkbHost(currentSearchPanel()))-> - updateViewHeight(-1); - } - } + lineEdit->setFocus(); + } } diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hshomescreenstateplugin/inc/hsbackuprestorestate.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/stateplugins/hshomescreenstateplugin/inc/hsbackuprestorestate.h Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,52 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#ifndef HSBACKUPRESTORESTATE_H +#define HSBACKUPRESTORESTATE_H + +#include +#include "hstest_global.h" +HOMESCREEN_TEST_CLASS(HomeScreenStatePluginTest) + +class HsDatabase; + +class HsBackupRestoreState : public QState +{ + Q_OBJECT + +public: + HsBackupRestoreState(QState *parent = 0); + ~HsBackupRestoreState(); + +signals: + void event_loadScene(); + +private slots: + void action_startListenBURStatus(); + void action_stopListenBURStatus(); + +private: + void deleteIdleView(); + Q_DISABLE_COPY(HsBackupRestoreState) + +private: + QScopedPointer mDatabase; + + HOMESCREEN_TEST_FRIEND_CLASS(HomeScreenStatePluginTest) +}; + +#endif // HSBACKUPRESTORESTATE_H diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hshomescreenstateplugin/inc/hsidlestate.h --- a/homescreenapp/stateplugins/hshomescreenstateplugin/inc/hsidlestate.h Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hshomescreenstateplugin/inc/hsidlestate.h Thu May 27 12:46:08 2010 +0300 @@ -21,6 +21,7 @@ #include #include #include +#include #include "hstest_global.h" HOMESCREEN_TEST_CLASS(HomeScreenStatePluginTest) @@ -28,7 +29,6 @@ class QGraphicsItem; class QGraphicsSceneMouseEvent; class QPropertyAnimation; -class HbView; class HbAction; class HbContinuousFeedback; class HsIdleWidget; @@ -75,6 +75,7 @@ void addPageToScene(int pageIndex); qreal parallaxFactor() const; void updateZoneAnimation(); + void showTrashBin(); void removeActivePage(); private slots: @@ -136,28 +137,25 @@ QGraphicsItem *watched, QGraphicsSceneMouseEvent *event, bool &filtered); void onOrientationChanged(Qt::Orientation orientation); - void widgetInteraction_onTapAndHoldTimeout(); void sceneInteraction_onTapAndHoldTimeout(); - void onTitleChanged(QString title); - void onAddContentActionTriggered(); - bool openTaskSwitcher(); void zoneAnimationFinished(); + void onSceneMenuTriggered(HbAction *action); + void onRemovePageMessageBoxClosed(HbAction *action); void onSceneMenuAboutToClose(); - void onRemovePageMessageBoxClosed(HbAction *action); private: - HbView *mView; HbAction *mNavigationAction; HsIdleWidget *mUiWidget; + QTimer mTimer; qreal mTapAndHoldDistance; qreal mPageChangeZoneWidth; - QPointF mSceneMenuPos; + QPointF mTouchScenePos; HsTitleResolver *mTitleResolver; QPropertyAnimation *mZoneAnimation; bool mPageChanged; @@ -167,6 +165,7 @@ bool mTrashBinFeedbackAlreadyPlayed; qreal mDeltaX; + QPointer mSceneMenu; #ifdef Q_OS_SYMBIAN XQSettingsManager *mSettingsMgr; #endif diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hshomescreenstateplugin/inc/hsloadscenestate.h --- a/homescreenapp/stateplugins/hshomescreenstateplugin/inc/hsloadscenestate.h Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hshomescreenstateplugin/inc/hsloadscenestate.h Thu May 27 12:46:08 2010 +0300 @@ -29,7 +29,7 @@ ~HsLoadSceneState(); signals: - void event_idle(); + void event_history(); private slots: void action_loadScene(); diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hshomescreenstateplugin/inc/hsrootstate.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/stateplugins/hshomescreenstateplugin/inc/hsrootstate.h Thu May 27 12:46:08 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: +* +*/ + +#ifndef HSROOTSTATE_H +#define HSROOTSTATE_H + +#include +#include "hstest_global.h" +HOMESCREEN_TEST_CLASS(HomeScreenStatePluginTest) + + +class HsRootState : public QState +{ + Q_OBJECT + +public: + HsRootState(QState *parent = 0); + ~HsRootState(); + +signals: + void event_backupRestore(); + +private slots: + void action_startListenBURStatus(); + void action_stopListenBURStatus(); + +private: + Q_DISABLE_COPY(HsRootState) + +private: + HOMESCREEN_TEST_FRIEND_CLASS(HomeScreenStatePluginTest) +}; + +#endif // HSROOTSTATE_H diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hshomescreenstateplugin/inc/hsselectbackgroundstate.h --- a/homescreenapp/stateplugins/hshomescreenstateplugin/inc/hsselectbackgroundstate.h Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hshomescreenstateplugin/inc/hsselectbackgroundstate.h Thu May 27 12:46:08 2010 +0300 @@ -26,15 +26,13 @@ HOMESCREEN_TEST_CLASS(HomeScreenStatePluginTest) -class QThread; +class HbProgressDialog; class HbView; -class HbProgressDialog; #ifdef Q_OS_SYMBIAN class HsImageFetcherClient; #else class XQAIWGetImageClient; #endif -class HsImageRender; class HsSelectBackgroundState : public QState { @@ -47,15 +45,6 @@ private: Q_DISABLE_COPY(HsSelectBackgroundState) - enum ImageProcessingState { - NotRunning, - ProcessPortraitAsFirst, - ProcessLandscapeAsFirst, - ProcessPortraitAsSecond, - ProcessLandscapeAsSecond, - Error - }; - signals: void event_waitInput(); void handleError(); @@ -85,10 +74,10 @@ #endif HbView *mSourceView; - QThread *mWallpaperImageReaderThread; - HsWallpaperImageReader *mWallpaperImageReader; + HsWallpaperImageReader *mPortraitWallpaperImageReader; + HsWallpaperImageReader *mLandscapeWallpaperImageReader; HbProgressDialog *mProgressDialog; - ImageProcessingState mImageProcessingState; + int mRunningThreadAmount; bool mShowAnimation; HOMESCREEN_TEST_FRIEND_CLASS(HomeScreenStatePluginTest) diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hshomescreenstateplugin/resource/hshomescreenstateplugin.xml --- a/homescreenapp/stateplugins/hshomescreenstateplugin/resource/hshomescreenstateplugin.xml Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hshomescreenstateplugin/resource/hshomescreenstateplugin.xml Thu May 27 12:46:08 2010 +0300 @@ -4,6 +4,12 @@ hshomescreenstateplugin + com.nokia.homescreen.state.HsRootState + 1.0 + + + + com.nokia.homescreen.state.HsLoadSceneState 1.0 @@ -15,4 +21,10 @@ + + com.nokia.homescreen.state.HsBackupRestoreState + 1.0 + + + diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hshomescreenstateplugin/src/hsbackuprestorestate.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsbackuprestorestate.cpp Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,105 @@ +/* +* 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 +#include +#include +#include +#include +#include "hsdatabase.h" +#include "hsscene.h" +#include "hsbackuprestoreobserver.h" +#include "hsbackuprestorestate.h" +#include "hsscene.h" +#include "hsgui.h" + +/*! + \class HsBackupRestoreState + \ingroup group_hshomescreenstateplugin + \brief Home screen Bacup/Restore state. + + Releases all Home screen data, which will be backed up or restored. +*/ + +/*! + Constructs a new backup/restore state with the given \a parent. +*/ +HsBackupRestoreState::HsBackupRestoreState(QState *parent) + : QState(parent) +{ + connect(this, SIGNAL(entered()), SLOT(action_startListenBURStatus())); + connect(this, SIGNAL(exited()), SLOT(action_stopListenBURStatus())); +} + +/*! + Destroys this backup/restore state. +*/ +HsBackupRestoreState::~HsBackupRestoreState() +{ +} + +/*! + Starts listen backup/restore status and releases Home screen data. +*/ +void HsBackupRestoreState::action_startListenBURStatus() +{ + HsBackupRestoreObserver *backupRestoreObserver = + HsBackupRestoreObserver::instance(); + + connect(backupRestoreObserver, + SIGNAL(event_backupRestoreComplited()), + SIGNAL(event_loadScene())); + + // Close database + mDatabase.reset(HsDatabase::takeInstance()); + mDatabase->close(); + + deleteIdleView(); + + // Delete scene + HsScene *scene = HsScene::instance(); + delete scene; + + backupRestoreObserver->readyForBUR(); +} + +/*! + Stops listen backup/restore status. +*/ +void HsBackupRestoreState::action_stopListenBURStatus() +{ + HsBackupRestoreObserver::instance()->disconnect(this); + + // Open database + HsDatabase::setInstance(mDatabase.data()); + mDatabase.take(); + HsDatabase::instance()->open(); +} + +/*! + Deletes idle view +*/ +void HsBackupRestoreState::deleteIdleView() +{ + // Delete idle view + QScopedPointer idleView(HsGui::takeIdleView()); + + if (idleView){ + idleView->setNavigationAction(0); + HsScene::mainWindow()->removeView(idleView.data()); + } +} diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hshomescreenstateplugin/src/hsdocumentloader.cpp --- a/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsdocumentloader.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsdocumentloader.cpp Thu May 27 12:46:08 2010 +0300 @@ -18,6 +18,7 @@ #include "hsdocumentloader.h" #include "hspageindicator.h" #include "hstrashbinwidget.h" +#include "hsconfiguration.h" /*! \class HsDocumentLoader @@ -50,7 +51,7 @@ QObject *HsDocumentLoader::createObject(const QString &type, const QString &name) { if (type == HsPageIndicator::staticMetaObject.className()) { - QObject *object = new HsPageIndicator; + QObject *object = new HsPageIndicator(HsConfiguration::pageIndicatorSpacing()); object->setObjectName(name); return object; } diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hshomescreenstateplugin/src/hshomescreenstateplugin.cpp --- a/homescreenapp/stateplugins/hshomescreenstateplugin/src/hshomescreenstateplugin.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hshomescreenstateplugin/src/hshomescreenstateplugin.cpp Thu May 27 12:46:08 2010 +0300 @@ -22,6 +22,8 @@ #include "hshomescreenstateplugin.h" #include "hsloadscenestate.h" #include "hsidlestate.h" +#include "hsrootstate.h" +#include "hsbackuprestorestate.h" #ifdef COVERAGE_MEASUREMENT #pragma CTC SKIP @@ -40,9 +42,16 @@ if (descriptor.interfaceName() == QLatin1String("com.nokia.homescreen.state.HsLoadSceneState")) { return new HsLoadSceneState(); - } else if(descriptor.interfaceName() == QLatin1String("com.nokia.homescreen.state.HsIdleState")) { + } + else if(descriptor.interfaceName() == QLatin1String("com.nokia.homescreen.state.HsIdleState")) { return new HsIdleState(); - } else { + } + else if(descriptor.interfaceName() == QLatin1String("com.nokia.homescreen.state.HsRootState")) { + return new HsRootState(); + } + else if(descriptor.interfaceName() == QLatin1String("com.nokia.homescreen.state.HsBackupRestoreState")) { + return new HsBackupRestoreState(); + }else { return 0; } } diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hshomescreenstateplugin/src/hsidlestate.cpp --- a/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsidlestate.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsidlestate.cpp Thu May 27 12:46:08 2010 +0300 @@ -51,6 +51,8 @@ #include "hshomescreenstatecommon.h" #include "hstitleresolver.h" #include "hsmenuservice.h" +#include "hsgui.h" +#include "hsconfiguration.h" // Helper macros for connecting state entry and exit actions. #define ENTRY_ACTION(state, action) \ @@ -121,9 +123,7 @@ */ HsIdleState::HsIdleState(QState *parent) : QState(parent), - mView(0), mNavigationAction(0), mUiWidget(0), - mTapAndHoldDistance(16), - mPageChangeZoneWidth(60), + mNavigationAction(0), mUiWidget(0), mTitleResolver(0), mZoneAnimation(0), mPageChanged(false), @@ -131,11 +131,14 @@ mPageChangeAnimation(0), mContinuousFeedback(0), mTrashBinFeedbackAlreadyPlayed(false), - mDeltaX(0) -#ifdef Q_OS_SYMBIAN + mDeltaX(0), + mSceneMenu(0) +#ifdef Q_OS_SYMBIAN ,mSettingsMgr(0) -#endif +#endif { + mTapAndHoldDistance = HsConfiguration::tapAndHoldDistance(); + mPageChangeZoneWidth = HsConfiguration::pageChangeZoneWidth(); setupStates(); mTimer.setSingleShot(true); mTitleResolver = new HsTitleResolver(this); @@ -281,6 +284,8 @@ this, SIGNAL(event_waitInput()), state_waitInput); state_widgetInteraction->addTransition( this, SIGNAL(event_moveWidget()), state_moveWidget); + state_widgetInteraction->addTransition( + this, SIGNAL(event_moveScene()), state_moveScene); state_sceneInteraction->addTransition( this, SIGNAL(event_waitInput()), state_waitInput); @@ -326,7 +331,7 @@ ENTRY_ACTION(state_waitInput, action_waitInput_updateOptionsMenu) ENTRY_ACTION(state_waitInput, action_waitInput_connectMouseEventHandlers) - ENTRY_ACTION(state_waitInput, action_waitInput_publishIdleKey) + ENTRY_ACTION(state_waitInput, action_waitInput_publishIdleKey) EXIT_ACTION(state_waitInput, action_waitInput_disconnectMouseEventHandlers) ENTRY_ACTION(state_widgetInteraction, action_widgetInteraction_connectMouseEventHandlers) @@ -389,7 +394,7 @@ mPageChangeAnimation->addAnimation(animation); animation = new QPropertyAnimation(mUiWidget->sceneLayer(), "x"); - animation->setEndValue((parallaxFactor() * pageLayerXPos(targetPageIndex)) - HSBOUNDARYEFFECT / 2); + animation->setEndValue((parallaxFactor() * pageLayerXPos(targetPageIndex)) - HsConfiguration::bounceEffect() / 2); animation->setDuration(duration); mPageChangeAnimation->addAnimation(animation); } @@ -403,11 +408,11 @@ qobject_cast(animation)->setDuration(duration); animation = mPageChangeAnimation->animationAt(1); - qobject_cast(animation)->setEndValue((parallaxFactor() * pageLayerXPos(targetPageIndex)) - HSBOUNDARYEFFECT / 2); + qobject_cast(animation)->setEndValue((parallaxFactor() * pageLayerXPos(targetPageIndex)) - HsConfiguration::bounceEffect() / 2); qobject_cast(animation)->setDuration(duration); } mPageChangeAnimation->start(); - HbInstantFeedback::play(HbFeedback::Sensitive); + HbInstantFeedback::play(HsConfiguration::pageChangeFeedbackType()); mUiWidget->showPageIndicator(); mUiWidget->setActivePage(targetPageIndex); } @@ -424,7 +429,7 @@ if (isInLeftPageChangeZone() && 0 < targetPageIndex) { --targetPageIndex; } else if (isInRightPageChangeZone() && - targetPageIndex < scene->pages().count()) { + targetPageIndex < scene->maximumPageCount()-1) { ++targetPageIndex; } else { mAllowZoneAnimation = true; @@ -441,10 +446,12 @@ mZoneAnimation = new QPropertyAnimation(mUiWidget->sceneLayer(), "x"); } + int bounceEffect = HsConfiguration::bounceEffect(); + if (isInLeftPageChangeZone()) { - mZoneAnimation->setEndValue(((parallaxFactor() * pageLayerXPos(scene->activePageIndex()))-HSBOUNDARYEFFECT/2)+HSBOUNDARYEFFECT/2); + mZoneAnimation->setEndValue(((parallaxFactor() * pageLayerXPos(scene->activePageIndex()))-bounceEffect/2)+bounceEffect/2); } else { - mZoneAnimation->setEndValue(((parallaxFactor() * pageLayerXPos(scene->activePageIndex()))-HSBOUNDARYEFFECT/2)-HSBOUNDARYEFFECT/2); + mZoneAnimation->setEndValue(((parallaxFactor() * pageLayerXPos(scene->activePageIndex()))-bounceEffect/2)-bounceEffect/2); } mZoneAnimation->setDuration(duration); mZoneAnimation->setDirection(QAbstractAnimation::Forward); @@ -462,31 +469,27 @@ */ bool HsIdleState::isInPageChangeZone() { - qreal widgetXPos = HsScene::instance()->activeWidget()->geometry().center().x(); - qreal pageWidth = HsScene::mainWindow()->layoutRect().width(); - return widgetXPos < mPageChangeZoneWidth || - pageWidth - mPageChangeZoneWidth < widgetXPos; + return isInLeftPageChangeZone() || + isInRightPageChangeZone(); } /*! - Checks if the active widget is located inside the left + Checks if touch point in the active widget is located inside the left page change zone. */ bool HsIdleState::isInLeftPageChangeZone() { - qreal widgetXPos = HsScene::instance()->activeWidget()->geometry().center().x(); - return widgetXPos < mPageChangeZoneWidth; + return mTouchScenePos.x() < mPageChangeZoneWidth; } /*! - Checks if the active widget is located inside the right + Checks if touch point in the active widget is located inside the right page change zone. */ bool HsIdleState::isInRightPageChangeZone() { - qreal widgetXPos = HsScene::instance()->activeWidget()->geometry().center().x(); qreal pageWidth = HsScene::mainWindow()->layoutRect().width(); - return pageWidth - mPageChangeZoneWidth < widgetXPos; + return mTouchScenePos.x() > pageWidth - mPageChangeZoneWidth; } /*! @@ -509,7 +512,7 @@ qreal HsIdleState::parallaxFactor() const { qreal clw = mUiWidget->controlLayer()->size().width(); - qreal slw = mUiWidget->sceneLayer()->size().width() - HSBOUNDARYEFFECT; + qreal slw = mUiWidget->sceneLayer()->size().width() - HsConfiguration::bounceEffect(); int n = HsScene::instance()->pages().count(); if (n < 2) { return 1; @@ -528,14 +531,14 @@ /* We don't want to create another animation before previous is finished */ mAllowZoneAnimation = false; - startPageChangeZoneAnimation(800); + startPageChangeZoneAnimation(HsConfiguration::pageChangeZoneAnimationDuration()); } } else if (mZoneAnimation && !isInPageChangeZone()) { if (mZoneAnimation->state() == QAbstractAnimation::Running) { if (mZoneAnimation->direction() == QAbstractAnimation::Forward) { mPageChanged = false; - mZoneAnimation->setDuration(200); + mZoneAnimation->setDuration(HsConfiguration::pageChangeZoneReverseAnimationDuration()); mZoneAnimation->setDirection(QAbstractAnimation::Backward); } } @@ -554,24 +557,45 @@ } /*! + Selects which trash bin icon is shown or not shown at all +*/ +void HsIdleState::showTrashBin() +{ + if (mUiWidget->trashBin()->isUnderMouse()) { + if (!mTrashBinFeedbackAlreadyPlayed) { + HbInstantFeedback::play(HsConfiguration::widgetOverTrashbinFeedbackType()); + mTrashBinFeedbackAlreadyPlayed = true; + } + mUiWidget->trashBin()->activate(); + } else { + mUiWidget->trashBin()->deactivate(); + mTrashBinFeedbackAlreadyPlayed = false; + } + + if (!mUiWidget->pageIndicator()->isAnimationRunning()) { + mUiWidget->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); delete page; - + pageIndex = pageIndex == 0 ? 0 : pageIndex - 1; scene->setActivePageIndex(pageIndex); - - startPageChangeAnimation(pageIndex, 200); - + + startPageChangeAnimation(pageIndex, HsConfiguration::pageRemovedAnimationDuration()); + mUiWidget->pageIndicator()->removeItem(pageIndex); mUiWidget->setActivePage(pageIndex); mUiWidget->showPageIndicator(); @@ -600,21 +624,28 @@ */ void HsIdleState::action_idle_setupView() { - if (!mView) { + HbView *idleView = HsGui::idleView(); + if (!idleView) { mUiWidget = new HsIdleWidget; - mView = HsScene::mainWindow()->addView(mUiWidget); - mView->setContentFullScreen(); + idleView = HsScene::mainWindow()->addView(mUiWidget); + idleView->setContentFullScreen(); mNavigationAction = new HbAction(this); mNavigationAction->setIcon(HbIcon(gApplicationLibraryIconName)); connect(mNavigationAction, SIGNAL(triggered()), SIGNAL(event_applicationLibrary())); - mView->setNavigationAction(mNavigationAction); + idleView->setNavigationAction(mNavigationAction); // TODO: Workaround to Qt/Hb layouting bugs. QApplication::processEvents(QEventLoop::ExcludeUserInputEvents); + HsGui::setIdleView(idleView); + + if (mPageChangeAnimation) { + delete mPageChangeAnimation; + mPageChangeAnimation = NULL; + } } - HsScene::mainWindow()->setCurrentView(mView); + HsScene::mainWindow()->setCurrentView(idleView); } /*! @@ -634,7 +665,7 @@ void HsIdleState::onTitleChanged(QString title) { qDebug() << "HsIdleState::onTitleChanged() to title: " << title; - mView->setTitle(title); + HsGui::idleView()->setTitle(title); } /*! @@ -687,7 +718,7 @@ { qreal x = pageLayerXPos(HsScene::instance()->activePageIndex()); mUiWidget->pageLayer()->setX(x); - mUiWidget->sceneLayer()->setX((parallaxFactor() * x) - HSBOUNDARYEFFECT / 2); + mUiWidget->sceneLayer()->setX((parallaxFactor() * x) - HsConfiguration::bounceEffect() / 2); } /*! @@ -721,7 +752,7 @@ mSettingsMgr = new XQSettingsManager(this); XQPublishAndSubscribeSettingsKey key(KPSUidStartup.iUid, KPSIdlePhase1Ok); mSettingsMgr->writeItemValue(key, EIdlePhase1Ok); - + // Done, we can disconnect this signal. disconnect(sender(), SIGNAL(entered()), this, SLOT(action_waitInput_publishIdleKey())); } @@ -733,9 +764,18 @@ */ void HsIdleState::action_idle_cleanupView() { - if (mUiWidget){ + if (mUiWidget) { mUiWidget->clearDelayedPress(); } + + //Close options menu on view change + HsGui::idleView()->setMenu(NULL); + + //Close context menu on view change + if (mSceneMenu) { + disconnect(mSceneMenu, SIGNAL(aboutToClose()), this, SLOT(onSceneMenuAboutToClose())); + mSceneMenu->close(); + } } /*! @@ -798,7 +838,7 @@ this, SIGNAL(event_toggleConnection())); } - mView->setMenu(menu); + HsGui::idleView()->setMenu(menu); } /*! @@ -831,13 +871,10 @@ */ void HsIdleState::action_widgetInteraction_connectGestureTimers() { - mTimer.setInterval(500); + mTimer.setInterval(HsConfiguration::widgetTapAndHoldTimeout()); connect(&mTimer, SIGNAL(timeout()), SLOT(widgetInteraction_onTapAndHoldTimeout())); mTimer.start(); - - HsWidgetHost *widget = HsScene::instance()->activeWidget(); - widget->startTapAndHoldAnimation(); } /*! @@ -856,9 +893,6 @@ { disconnect(&mTimer, SIGNAL(timeout()), this, SLOT(widgetInteraction_onTapAndHoldTimeout())); - - HsWidgetHost *widget = HsScene::instance()->activeWidget(); - widget->stopTapAndHoldAnimation(); } /*! @@ -875,7 +909,7 @@ */ void HsIdleState::action_sceneInteraction_connectGestureTimers() { - mTimer.setInterval(500); + mTimer.setInterval(HsConfiguration::sceneTapAndHoldTimeout()); connect(&mTimer, SIGNAL(timeout()), SLOT(sceneInteraction_onTapAndHoldTimeout())); mTimer.start(); @@ -941,7 +975,7 @@ && mZoneAnimation->state() == QAbstractAnimation::Running && mZoneAnimation->direction() == QAbstractAnimation::Forward) { mPageChanged = false; - mZoneAnimation->setDuration(200); + mZoneAnimation->setDuration(HsConfiguration::pageChangeZoneReverseAnimationDuration()); mZoneAnimation->setDirection(QAbstractAnimation::Backward); } @@ -950,7 +984,7 @@ HsWidgetHost *widget = scene->activeWidget(); if (mUiWidget->trashBin()->isUnderMouse()) { - HbInstantFeedback::play(HbFeedback::ItemDrop); + HbInstantFeedback::play(HsConfiguration::widgetDropToTrashbinFeedbackType()); widget->page()->removeWidget(widget); widget->uninitializeWidget(); widget->deleteFromDatabase(); @@ -974,7 +1008,7 @@ // 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(HbFeedback::BounceEffect); + HbInstantFeedback::play(HsConfiguration::widgetRepositionFeedbackType()); } widget->setPos(widgetX, widgetY); @@ -1035,7 +1069,7 @@ HsScene::instance()->setActivePageIndex(pageIndex); - startPageChangeAnimation(pageIndex, 200); + startPageChangeAnimation(pageIndex, HsConfiguration::pageChangeAnimationDuration()); } /*! @@ -1055,29 +1089,22 @@ */ void HsIdleState::action_sceneMenu_showMenu() { - HbMenu *sceneMenu = new HbMenu(); - sceneMenu->setAttribute(Qt::WA_DeleteOnClose); - sceneMenu->setDismissPolicy(HbDialog::TapOutside); + mSceneMenu = new HbMenu(); + mSceneMenu->setAttribute(Qt::WA_DeleteOnClose); + mSceneMenu->setDismissPolicy(HbDialog::TapOutside); //This is used to check if any action is not triggered ( == menu is dismissed by user or timeout). - connect(sceneMenu, SIGNAL(aboutToClose()), this, SLOT(onSceneMenuAboutToClose())); + connect(mSceneMenu, SIGNAL(aboutToClose()), this, SLOT(onSceneMenuAboutToClose())); - HbAction *addContentAction = - sceneMenu->addAction(hbTrId(hsLocTextId_ContextMenu_AddContent)); - connect(addContentAction, SIGNAL(triggered()), this, SLOT(onAddContentActionTriggered())); + mSceneMenu->addAction(hbTrId(hsLocTextId_ContextMenu_AddContent), this, SLOT(onAddContentActionTriggered())); - HbAction *addPageAction = 0; HsScene *scene = HsScene::instance(); if (scene->pages().count() < scene->maximumPageCount()) { - addPageAction = sceneMenu->addAction(hbTrId(hsLocTextId_OptionsMenu_AddPage)); - connect(addPageAction, SIGNAL(triggered()), this, SIGNAL(event_addPage())); + mSceneMenu->addAction(hbTrId(hsLocTextId_OptionsMenu_AddPage), this, SIGNAL(event_addPage())); } - HbAction *changeWallpaperAction = - sceneMenu->addAction(hbTrId(hsLocTextId_ContextMenu_ChangeWallpaper)); - connect(changeWallpaperAction, SIGNAL(triggered()), this, SIGNAL(event_selectSceneWallpaper())); - - sceneMenu->setPreferredPos(mSceneMenuPos); - sceneMenu->show(); + mSceneMenu->addAction(hbTrId(hsLocTextId_ContextMenu_ChangeWallpaper), this, SIGNAL(event_selectSceneWallpaper())); + mSceneMenu->setPreferredPos(mTouchScenePos); + mSceneMenu->open(this, SLOT(onSceneMenuTriggered(HbAction *))); } #ifdef COVERAGE_MEASUREMENT #pragma CTC ENDSKIP @@ -1092,7 +1119,7 @@ int pageIndex = scene->pages().count(); addPageToScene(pageIndex); scene->setActivePageIndex(pageIndex); - startPageChangeAnimation(pageIndex, 700); + startPageChangeAnimation(pageIndex, HsConfiguration::newPageAddedAnimationDuration()); mUiWidget->pageIndicator()->addItem(pageIndex); mUiWidget->showPageIndicator(); } @@ -1166,7 +1193,7 @@ } } - mSceneMenuPos = event->scenePos(); + mTouchScenePos = event->scenePos(); emit event_sceneInteraction(); } @@ -1191,10 +1218,18 @@ QPointF point = event->scenePos() - event->buttonDownScenePos(Qt::LeftButton); if (mTapAndHoldDistance < point.manhattanLength()) { + // Threshold area for tap exceeded. This is pan or swipe mTimer.stop(); - mUiWidget->sendDelayedPress(); - HsScene::instance()->activeWidget()->stopTapAndHoldAnimation(); + if (HsScene::instance()->activeWidget()->isPannable(event)) { + // let widget get first press + mUiWidget->sendDelayedPress(); + } else { + // Widget doesn't consume pan or swipe gestures + mUiWidget->clearDelayedPress(); + emit event_moveScene(); + } } + } /*! @@ -1233,7 +1268,7 @@ Q_UNUSED(watched) Q_UNUSED(filtered) - mSceneMenuPos = event->scenePos(); + mTouchScenePos = event->scenePos(); if (!mTimer.isActive()) { return; @@ -1286,32 +1321,45 @@ HsScene *scene = HsScene::instance(); HsWidgetHost *widget = scene->activeWidget(); - HsPage *page = scene->activePage(); + QRectF widgetRect = widget->geometry(); + //Move widget to new position: + mTouchScenePos = event->scenePos(); QPointF delta(event->scenePos() - event->lastScenePos()); - - QRectF widgetRect = widget->geometry(); widgetRect.moveTopLeft(widgetRect.topLeft() + delta); - QRectF pageRect = mView->rect(); - - qreal lowerBoundX = -widgetRect.width() / 2 + 10; + //Widget can be moved over the pages left border if not in the first page. + //In the first page widget cannot cross the page's left border at all. + qreal lowerBoundX = -widgetRect.width(); + HsPage *page = scene->activePage(); if (page == scene->pages().first()) { lowerBoundX = 0; } - qreal upperBoundX = pageRect.width() - widgetRect.width() / 2 - 10; + + //Widget can be moved over the pages right border if not in the last page when maximum amount + //of pages exist. Widget cannot cross the lastest page's right border at all. + QRectF pageRect = HsGui::idleView()->rect(); + qreal upperBoundX = pageRect.width() + widgetRect.width(); if (page == scene->pages().last() && scene->pages().count() == scene->maximumPageCount()) { upperBoundX = pageRect.width() - widgetRect.width(); } + //Widget cannot cross over top or bottom edges of the page. + /* if using ItemClipsChildrenToShape-flag in widgethost then + setPos does not update position here, however setGeometry does it, QT bug? + */ qreal widgetX = qBound(lowerBoundX, widgetRect.x(), upperBoundX); qreal widgetY = qBound(qreal(64), widgetRect.y(), pageRect.height() - widgetRect.height()); + widget->setGeometry(widgetX, widgetY, widgetRect.width(), widgetRect.height()); - // if user is trying to move widget past first or last page, play "not a good idea" feedback effect - if( (page == scene->pages().first() && widgetRect.x() < 3 ) || + int bounceFeedbackEffectDistance = HsConfiguration::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. + if( (page == scene->pages().first() && widgetRect.x() < bounceFeedbackEffectDistance ) || (page == scene->pages().last() && scene->pages().count() == scene->maximumPageCount() - && widgetRect.x()+ widgetRect.width() > pageRect.width()-3)) { - HbInstantFeedback::play(HbFeedback::Basic); + && widgetRect.x()+ widgetRect.width() > pageRect.width() - bounceFeedbackEffectDistance)) { + HbInstantFeedback::play(HsConfiguration::widgetMoveBlockedFeedbackType()); // TODO: use code below when Orbit has updated ContinuousFeedback API //if (!mContinuousFeedback->isPlaying()) { // mContinuousFeedback->play(); @@ -1321,27 +1369,9 @@ //mContinuousFeedback->stop(); } - /* 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()); - - updateZoneAnimation(); // cyclomatic complexity was 20, logic moved to separate function + updateZoneAnimation(); + showTrashBin(); - if (mUiWidget->trashBin()->isUnderMouse()) { - if (!mTrashBinFeedbackAlreadyPlayed) { - HbInstantFeedback::play(HbFeedback::ItemMoveOver); - mTrashBinFeedbackAlreadyPlayed = true; - } - mUiWidget->trashBin()->activate(); - } else { - mUiWidget->trashBin()->deactivate(); - mTrashBinFeedbackAlreadyPlayed = false; - } - - if (!mUiWidget->pageIndicator()->isAnimationRunning()) { - mUiWidget->showTrashBin(); - } filtered = true; } @@ -1373,15 +1403,19 @@ Q_UNUSED(watched) Q_UNUSED(filtered) + filtered = true; + HsScene *scene = HsScene::instance(); mDeltaX = event->scenePos().x() - event->buttonDownScenePos(Qt::LeftButton).x(); - qreal x = qBound(pageLayerXPos(scene->pages().count() - 1) - HSBOUNDARYEFFECT / 2 / parallaxFactor(), + int bounceEffect = HsConfiguration::bounceEffect(); + + qreal x = qBound(pageLayerXPos(scene->pages().count() - 1) - bounceEffect / 2 / parallaxFactor(), pageLayerXPos(scene->activePageIndex()) + mDeltaX, - pageLayerXPos(0) + (HSBOUNDARYEFFECT / 2 / parallaxFactor()) - qreal(0.5)); + pageLayerXPos(0) + (bounceEffect / 2 / parallaxFactor()) - qreal(0.5)); mUiWidget->pageLayer()->setX(x); - mUiWidget->sceneLayer()->setX((parallaxFactor() * x) - HSBOUNDARYEFFECT / 2); + mUiWidget->sceneLayer()->setX((parallaxFactor() * x) - bounceEffect / 2); } /*! @@ -1395,6 +1429,7 @@ { Q_UNUSED(watched) Q_UNUSED(filtered) + filtered = true; mDeltaX = event->scenePos().x() - event->buttonDownScenePos(Qt::LeftButton).x(); @@ -1529,7 +1564,7 @@ } } scene->setActivePageIndex(pageIndex); - startPageChangeAnimation(pageIndex, 200); + startPageChangeAnimation(pageIndex, HsConfiguration::pageChangeAnimationDuration()); } else { scene->setActivePageIndex(pageIndex); @@ -1542,14 +1577,16 @@ } /*! - Handles the close of the scene menu. + Handles the close of the scene menu when menu is dismissed. + While dismissed menu should be triggered with NULL action. + Actions on menu are connected stright to desired slot or signal. */ -void HsIdleState::onSceneMenuAboutToClose() { - //We need to check if menu is dismissed either by user tap in outside of the menu or - //menu's dismiss timer timeouts. There is active action if any action tapped otherwise - //menu was dissmised. - HbMenu *menu = static_cast(sender()); - if(!menu->activeAction()) { +void HsIdleState::onSceneMenuTriggered(HbAction *action) +{ + //We check if menu was dismissed either by user tap in outside of the menu, + //menu's dismiss timer timeouts or state_sceneMenu was exited by any other reason + //than triggered action, e.g. applib activated while context menu is active. + if(!action) { emit event_waitInput(); } } @@ -1566,6 +1603,25 @@ } } +/*! + Handles the close of the scene menu. + + This workaround is needed since HbMenu does not trigger empty action in case of + dismission of menu dialog. That functionality will be added in near future. Thereafter + onSceneMenuTriggered() can handle dismissions (HbMenu::triggered() emitted with NULL + action). This workaround can be removed at that time. +*/ +void HsIdleState::onSceneMenuAboutToClose() { + //We need to check if menu is dismissed either by user tap in outside of the menu or + //menu's dismiss timer timeouts. There is active action if any action tapped otherwise + //menu was dissmised. + HbMenu *menu = static_cast(sender()); + if(!menu->activeAction()) { + //mSceneMenu = 0; //Menu deletes itself at the close + emit event_waitInput(); + } +} + // Undefine the helper macros. #undef ENTRY_ACTION #undef EXIT_ACTION diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hshomescreenstateplugin/src/hsidlewidget.cpp --- a/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsidlewidget.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsidlewidget.cpp Thu May 27 12:46:08 2010 +0300 @@ -31,7 +31,7 @@ #include "hstrashbinwidget.h" #include "hspageindicator.h" #include "hsdocumentloader.h" -#include "hshomescreenstatecommon.h" +#include "hsconfiguration.h" namespace { @@ -111,7 +111,7 @@ int n = HsScene::instance()->pages().count(); mControlLayer->resize(rect.size()); mPageLayer->resize(n * rect.width(), rect.height()); - mSceneLayer->resize(2 * rect.width() + HSBOUNDARYEFFECT, rect.height()); + mSceneLayer->resize(2 * rect.width() + HsConfiguration::bounceEffect(), rect.height()); HbWidget::setGeometry(rect); } diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hshomescreenstateplugin/src/hsloadscenestate.cpp --- a/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsloadscenestate.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsloadscenestate.cpp Thu May 27 12:46:08 2010 +0300 @@ -56,5 +56,5 @@ { HsScene::instance()->load(); HsScene::mainWindow()->show(); - emit event_idle(); + emit event_history(); } diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hshomescreenstateplugin/src/hsrootstate.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsrootstate.cpp Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,69 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#include +#include "hsbackuprestoreobserver.h" +#include "hsrootstate.h" + +/*! + \class HsRootState + \ingroup group_hshomescreenstateplugin + \brief View part of the home screen idle state. + + Loads the home screen scene. +*/ + +/*! + Constructs a new load scene state with the given \a parent. +*/ +HsRootState::HsRootState(QState *parent) + : QState(parent) +{ + connect(this, SIGNAL(entered()), SLOT(action_startListenBURStatus())); + connect(this, SIGNAL(exited()), SLOT(action_stopListenBURStatus())); +} + +/*! + Destroys this idle state. +*/ +HsRootState::~HsRootState() +{ +} + +/*! + Starts listen backup/restore status. +*/ +void HsRootState::action_startListenBURStatus() +{ + HsBackupRestoreObserver *backupRestoreObserver = + HsBackupRestoreObserver::instance(); + + connect(backupRestoreObserver, + SIGNAL(event_backupRestoreStarted()), + SIGNAL(event_backupRestore())); +} + +/*! + Stops listen backup/restore status. +*/ +void HsRootState::action_stopListenBURStatus() +{ + HsBackupRestoreObserver *backupRestoreObserver = + HsBackupRestoreObserver::instance(); + + backupRestoreObserver->disconnect(this); +} diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hshomescreenstateplugin/src/hsselectbackgroundstate.cpp --- a/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsselectbackgroundstate.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsselectbackgroundstate.cpp Thu May 27 12:46:08 2010 +0300 @@ -15,16 +15,13 @@ * */ +#include #include #include #include -#include -#include -#include #include #include -#include #include "hsselectbackgroundstate.h" #include "hsscene.h" @@ -32,6 +29,7 @@ #include "hswallpaper.h" #include "hsdatabase.h" #include "hshomescreenstatecommon.h" +#include "hsconfiguration.h" #ifdef Q_OS_SYMBIAN #include "hsimagefetcherclient.h" @@ -40,7 +38,8 @@ #include "xqaiwcommon.h" #endif -const char hsLocTextId_ProgressDialog_WallpaperLoading[] = "txt_homescreen_dpopinfo_loading_wallpaper"; +const char hsLocTextId_ProgressDialog_WallpaperLoading[] = + "txt_homescreen_dpopinfo_loading_wallpaper"; /*! \class HsSelectBackgroundState @@ -58,10 +57,10 @@ QState(parent), mImageFetcher(0), mSourceView(0), - mWallpaperImageReaderThread(0), - mWallpaperImageReader(0), + mPortraitWallpaperImageReader(0), + mLandscapeWallpaperImageReader(0), mProgressDialog(0), - mImageProcessingState(NotRunning), + mRunningThreadAmount(0), mShowAnimation(false) { #ifdef Q_OS_SYMBIAN @@ -82,8 +81,8 @@ HsSelectBackgroundState::~HsSelectBackgroundState() { delete mImageFetcher; - delete mWallpaperImageReaderThread; - delete mWallpaperImageReader; + delete mPortraitWallpaperImageReader; + delete mLandscapeWallpaperImageReader; } /*! @@ -95,7 +94,7 @@ { mSourceView = HsScene::mainWindow()->currentView(); - mImageProcessingState = NotRunning; + mRunningThreadAmount = 0; mShowAnimation = false; #ifdef Q_OS_SYMBIAN @@ -129,18 +128,12 @@ */ void HsSelectBackgroundState::onFetchComplete(QStringList imageStringList) { - if (mImageProcessingState == NotRunning) { - // TODO: temporarily show animation immediately (~0.5 sec delay) - onShowAnimation(); - // start counting time for possible animation - // TODO: from UX the real response time - // TODO: cannot use timer since UI does not respond during hardcore image processing - //QTimer::singleShot(1000, this, SLOT(onShowAnimation())); - } + // start animation immediately + onShowAnimation(); + // check that sceneData is available HsDatabase *db = HsDatabase::instance(); Q_ASSERT(db); - HsSceneData sceneData; if (!db->scene(sceneData)) { emit handleError(); @@ -148,69 +141,54 @@ } // clean thread instances - delete mWallpaperImageReader; - delete mWallpaperImageReaderThread; - mWallpaperImageReader = NULL; - mWallpaperImageReaderThread = NULL; + delete mPortraitWallpaperImageReader; + delete mLandscapeWallpaperImageReader; + mPortraitWallpaperImageReader = NULL; + mLandscapeWallpaperImageReader = NULL; - mWallpaperImageReaderThread = new QThread(); - mWallpaperImageReader = new HsWallpaperImageReader(); + mPortraitWallpaperImageReader = new HsWallpaperImageReader(); + mLandscapeWallpaperImageReader = new HsWallpaperImageReader(); - // setup processing when image is fetched at first time - if (mImageProcessingState == NotRunning) { - // delete old wallpapers - QFile::remove(sceneData.portraitWallpaper); - QFile::remove(sceneData.landscapeWallpaper); - - QString wallpaperDir = HsWallpaper::wallpaperDirectory(); - QDir dir(wallpaperDir); - if (!dir.exists()) { - dir.mkpath(wallpaperDir); - } - HsScene *scene = HsScene::instance(); - Qt::Orientation orientation = scene->orientation(); - // based on screen orientation select first image to process - if (orientation == Qt::Vertical) { - mImageProcessingState = ProcessPortraitAsFirst; - } else { - mImageProcessingState = ProcessLandscapeAsFirst; - } - } + mRunningThreadAmount = 2; - QRect targetRect; + // delete old wallpapers + QFile::remove(sceneData.portraitWallpaper); + QFile::remove(sceneData.landscapeWallpaper); - switch (mImageProcessingState) { - case ProcessPortraitAsFirst: - case ProcessPortraitAsSecond: - targetRect = QRect(0, 0, (2 * 360) + HSBOUNDARYEFFECT, 640); - break; - case ProcessLandscapeAsFirst: - case ProcessLandscapeAsSecond: - targetRect = QRect(0, 0, (2 * 640) + HSBOUNDARYEFFECT, 360); - break; - default: - emit handleError(); - return; + QString wallpaperDir = HsWallpaper::wallpaperDirectory(); + QDir dir(wallpaperDir); + if (!dir.exists()) { + dir.mkpath(wallpaperDir); } // left empty to signal we want to use full size image as source QRect sourceRect; - mWallpaperImageReader->setSourcePath(imageStringList.first()); - mWallpaperImageReader->setSourceRect(sourceRect); - mWallpaperImageReader->setTargetRect(targetRect); - mWallpaperImageReader->setCenterTarget(true); - mWallpaperImageReader->moveToThread(mWallpaperImageReaderThread); + + // Initialize portrait image threading + QRect targetRectPortrait(0, 0, (2 * 360) + HsConfiguration::bounceEffect(), 640); + mPortraitWallpaperImageReader->setSourcePath(imageStringList.first()); + mPortraitWallpaperImageReader->setSourceRect(sourceRect); + mPortraitWallpaperImageReader->setTargetRect(targetRectPortrait); + mPortraitWallpaperImageReader->setCenterTarget(true); - mWallpaperImageReader->connect(mWallpaperImageReaderThread, - SIGNAL(started()), - SLOT(processImage())); - - connect(mWallpaperImageReader, - SIGNAL(processingFinished()), + connect(mPortraitWallpaperImageReader, + SIGNAL(finished()), + SLOT(onImageProcessed())); + + // Initialize landscape image threading + QRect targetRectLandscape(0, 0, (2 * 640) + HsConfiguration::bounceEffect(), 360); + mLandscapeWallpaperImageReader->setSourcePath(imageStringList.first()); + mLandscapeWallpaperImageReader->setSourceRect(sourceRect); + mLandscapeWallpaperImageReader->setTargetRect(targetRectLandscape); + mLandscapeWallpaperImageReader->setCenterTarget(true); + + connect(mLandscapeWallpaperImageReader, + SIGNAL(finished()), SLOT(onImageProcessed())); // start image processing in thread - mWallpaperImageReaderThread->start(QThread::IdlePriority); + mPortraitWallpaperImageReader->start(); + mLandscapeWallpaperImageReader->start(); } /*! @@ -229,7 +207,8 @@ */ void HsSelectBackgroundState::onImageProcessed() { - HsScene *scene = HsScene::instance(); + mRunningThreadAmount--; + HsDatabase *db = HsDatabase::instance(); Q_ASSERT(db); HsSceneData sceneData; @@ -237,88 +216,74 @@ emit handleError(); return; } - QFileInfo fileInfo(mWallpaperImageReader->getSourcePath()); + + QFileInfo fileInfo; + // get image path + if (sender() == mPortraitWallpaperImageReader) { + fileInfo = mPortraitWallpaperImageReader->sourcePath(); + } else { + fileInfo = mLandscapeWallpaperImageReader->sourcePath(); + } + // suffix is same for both orientations QString fileExtension(""); if (!fileInfo.suffix().isEmpty()) { fileExtension = fileInfo.suffix(); } - // set image path to sceneData - QString path; - if (mImageProcessingState == ProcessPortraitAsFirst || - mImageProcessingState == ProcessPortraitAsSecond) { - path = HsWallpaper::wallpaperPath(Qt::Vertical, QString(), fileExtension); - sceneData.portraitWallpaper = path; + + QImage image; + // set portrait image path to sceneData + QString portraitPath(HsWallpaper::wallpaperPath(Qt::Vertical, QString(), + fileExtension)); + // we need to set this always as image to be activated can be either orientation + sceneData.portraitWallpaper = portraitPath; + QString landscapePath(HsWallpaper::wallpaperPath(Qt::Horizontal, QString(), + fileExtension)); + sceneData.landscapeWallpaper = landscapePath; + + if (sender() == mPortraitWallpaperImageReader) { + // get image from thread + image = mPortraitWallpaperImageReader->processedImage(); + // save image + image.save(portraitPath); } else { - path = HsWallpaper::wallpaperPath(Qt::Horizontal, QString(), fileExtension); - sceneData.landscapeWallpaper = path; + image = mLandscapeWallpaperImageReader->processedImage(); + image.save(landscapePath); } - // get image from renderer and save it - QImage image = mWallpaperImageReader->getProcessedImage(); - image.save(path); - if (!image.isNull()) { - // update scenedata and set new image to background - if (db->updateScene(sceneData)) { - switch (mImageProcessingState) { - case ProcessPortraitAsFirst: - scene->wallpaper()->setPortraitImage(path, true); - break; - case ProcessPortraitAsSecond: - // if orientation changed during first image settings - if (HsScene::orientation() == Qt::Vertical) { - scene->wallpaper()->setPortraitImage(path, true); - } else { - scene->wallpaper()->setPortraitImage(path); - } - break; - case ProcessLandscapeAsFirst: - scene->wallpaper()->setLandscapeImage(path, true); - break; - case ProcessLandscapeAsSecond: - if (HsScene::orientation() == Qt::Horizontal) { - scene->wallpaper()->setLandscapeImage(path, true); - } else { - scene->wallpaper()->setLandscapeImage(path); - } - break; - default: - emit handleError(); - break; - } - } - } else { + + if (image.isNull()) { emit handleError(); return; } - - switch (mImageProcessingState) { - case ProcessPortraitAsFirst: - mImageProcessingState = ProcessLandscapeAsSecond; - if (mShowAnimation) { - mProgressDialog->setProgressValue(2); - } - // process second orientation - onFetchComplete(QStringList(mWallpaperImageReader->getSourcePath())); - break; - case ProcessLandscapeAsFirst: - mImageProcessingState = ProcessPortraitAsSecond; - if (mShowAnimation) { - mProgressDialog->setProgressValue(2); + // update scenedata and set new image to background + if (db->updateScene(sceneData)) { + HsScene *scene = HsScene::instance(); + // set image to wallpaper (don't activate yet) + if (sender() == mPortraitWallpaperImageReader) { + scene->wallpaper()->setPortraitImage(portraitPath, false); + } else { + scene->wallpaper()->setLandscapeImage(landscapePath, false); } - onFetchComplete(QStringList(mWallpaperImageReader->getSourcePath())); - break; - case ProcessPortraitAsSecond: - case ProcessLandscapeAsSecond: - mImageProcessingState = NotRunning; - if (mShowAnimation) { - mProgressDialog->setProgressValue(3); + // if last thread running + if (mRunningThreadAmount == 0) { + // if current orientation matches -> set to active wallpaper + if (HsScene::orientation() == Qt::Vertical) { + scene->wallpaper()->setPortraitImage(portraitPath, true); + } else { + scene->wallpaper()->setLandscapeImage(landscapePath, true); + } + // finish progress bar + if (mShowAnimation) { + mProgressDialog->setProgressValue(3); + } + // let user control again homescreen + emit event_waitInput(); + } else { + // update progress information + if (mShowAnimation) { + mProgressDialog->setProgressValue(2); + } } - // let user control again homescreen - emit event_waitInput(); - break; - default: - emit handleError(); - break; - } + } } /*! @@ -329,18 +294,20 @@ { delete mProgressDialog; mProgressDialog = new HbProgressDialog(HbProgressDialog::ProgressDialog); - // TODO: setPrimaryAction is deprecated, clearActions does the same but crashes when dialog closes, check orbit list - mProgressDialog->setPrimaryAction(0); + /* TODO: workaround to remove cancel button (setPrimaryAction(0) is deprecated). + * clearActions does the same but crashes, fix should be in wk16, check orbit list + */ + QList actions = mProgressDialog->actions(); + actions[0]->setVisible(false); mProgressDialog->setIcon(HbIcon("note_info")); mProgressDialog->setText(hbTrId(hsLocTextId_ProgressDialog_WallpaperLoading)); mProgressDialog->setMinimum(0); mProgressDialog->setMaximum(3); mProgressDialog->setBackgroundFaded(true); mProgressDialog->setAutoClose(true); + // set initial value to appear as loading mProgressDialog->setProgressValue(1); mProgressDialog->show(); - // TODO: temporary solution to minimize progress dialog resizing problem - QApplication::processEvents(); mShowAnimation = true; } @@ -350,7 +317,6 @@ */ void HsSelectBackgroundState::onHandleError() { - mImageProcessingState = Error; if (mShowAnimation) { mProgressDialog->close(); } diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsmenuworkerstateplugin/hsmenuworkerstateplugin.pro --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/hsmenuworkerstateplugin.pro Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/hsmenuworkerstateplugin.pro Thu May 27 12:46:08 2010 +0300 @@ -25,7 +25,8 @@ LIBS += -lhsdomainmodel \ -lhsmenuserviceprovider \ -lhsutils \ - -lcaclient + -lcaclient \ + -lcasoftwareregistry DEPENDPATH += ./inc \ ./src diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsmenuworkerstateplugin/hsmenuworkerstateplugin.qrc --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/hsmenuworkerstateplugin.qrc Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/hsmenuworkerstateplugin.qrc Thu May 27 12:46:08 2010 +0300 @@ -3,5 +3,6 @@ resource/hsappchecklist.docml resource/hswidgetpreviewdialog.docml resource/hsarrangedialog.docml + resource/hsdetailsdialog.docml diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsmenustates_global.h --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsmenustates_global.h Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsmenustates_global.h Thu May 27 12:46:08 2010 +0300 @@ -44,6 +44,10 @@ ":/xml/hsarrangedialog.docml"; static const char *const HS_ARRANGE_DIALOG_NAME="arrange_dialog"; static const char *const HS_ARRANGE_LIST_NAME="arrange_list"; + +static const char *const HS_DETAILS_DIALOG_LAYOUT = + ":/xml/hsdetailsdialog.docml"; +static const char *const HS_DETAILS_DIALOG_NAME="details_dialog"; /*! To enable logging of function entry and exit use the following flag for qmake: -config nft diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsmenuworkerstate.h --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsmenuworkerstate.h Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsmenuworkerstate.h Thu May 27 12:46:08 2010 +0300 @@ -37,6 +37,10 @@ HsMenuWorkerState(QState *parent = 0); virtual ~HsMenuWorkerState(); + +signals: + + void reset(); private: diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsviewappdetailsstate.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsviewappdetailsstate.h Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,71 @@ +/* +* 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 Application Library state. +* +*/ + +#ifndef HSVIEWAPPDETAILSSTATE_H_ +#define HSVIEWAPPDETAILSSTATE_H_ + +#include +#include + +#include "hsmenustates_global.h" +HS_STATES_TEST_CLASS(MenuStatesTest) + +class HbListWidget; +class HsMenuItemModel; +class HbDialog; +class CaNotifier; + +class HsViewAppDetailsState: public QState +{ + Q_OBJECT + + HS_STATES_TEST_FRIEND_CLASS(MenuStatesTest) + +public: + + HsViewAppDetailsState(QState *parent = 0); + + virtual ~HsViewAppDetailsState(); + +protected: + + void onEntry(QEvent *event); + void onExit(QEvent *event); + +private slots: + + void stateExited(); + void memoryCardRemoved(); + +signals: + void exit(); + +private: + + void construct(); + void subscribeForMemoryCardRemove(int entryId); + +private: + + HbDialog *mDialog; + + QObjectList mObjectList; + + CaNotifier *mNotifier; +}; + +#endif /* HSVIEWAPPDETAILSSTATE_H_ */ diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsdetailsdialog.docml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsdetailsdialog.docml Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,95 @@ + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsaddappstocollectionstate.cpp --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsaddappstocollectionstate.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsaddappstocollectionstate.cpp Thu May 27 12:46:08 2010 +0300 @@ -472,7 +472,7 @@ if (!mListFinishedEntered) { mListFinishedEntered = true; - if (finishedAction != mListDialog->actions().value(1)) { + if (finishedAction != mListDialog->actions().value(0)) { int itemId = mListDialog->getItemId(); if (itemId) { if (mActionType == ViaAllViewOptionMenuType) { diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionnamedialog.cpp --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionnamedialog.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionnamedialog.cpp Thu May 27 12:46:08 2010 +0300 @@ -81,9 +81,6 @@ \param item_id Item's id. \retval Selected action. */ -#ifdef COVERAGE_MEASUREMENT -#pragma CTC SKIP // Reason: Modal inputdialog open -#endif //COVERAGE_MEASUREMENT void HsCollectionNameDialog::open(QObject* receiver, const char* member) { HSMENUTEST_FUNC_ENTRY("HsCollectionNameDialog::open"); @@ -96,10 +93,6 @@ HSMENUTEST_FUNC_EXIT("HsCollectionNameDialog::open"); } -#ifdef COVERAGE_MEASUREMENT -#pragma CTC ENDSKIP // Reason: Modal inputdialog exec -#endif //COVERAGE_MEASUREMENT - /*! \reimp diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionslistdialog.cpp --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionslistdialog.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionslistdialog.cpp Thu May 27 12:46:08 2010 +0300 @@ -79,10 +79,6 @@ delete mModel; } - -#ifdef COVERAGE_MEASUREMENT -#pragma CTC SKIP // Reason: Modal inputdialog open -#endif //COVERAGE_MEASUREMENT /*! Executes dialog. \retval Selected action. @@ -92,11 +88,6 @@ this->setAttribute(Qt::WA_DeleteOnClose); HbSelectionDialog::open(receiver, member); } -#ifdef COVERAGE_MEASUREMENT -#pragma CTC ENDSKIP // Reason: Modal inputdialog exec -#endif //COVERAGE_MEASUREMENT - - /*! \reimp @@ -107,7 +98,7 @@ qDebug("HsCollectionsListDialog::closeEvent"); HbAction *closingAction = qobject_cast(sender()); - if (closingAction != actions().value(1)) { + if (closingAction != actions().value(0)) { QModelIndexList modlist = selectedModelIndexes(); if (modlist.count()) { mItemId diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsmenuworkerstate.cpp --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsmenuworkerstate.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsmenuworkerstate.cpp Thu May 27 12:46:08 2010 +0300 @@ -26,6 +26,7 @@ #include "hsarrangestate.h" #include "hspreviewhswidgetstate.h" #include "hsviewappsettingsstate.h" +#include "hsviewappdetailsstate.h" /*! \class HsMenuWorkerState @@ -103,9 +104,10 @@ // set a transition to the initial state after child processing finished addAppsToCollectionState->addTransition(addAppsToCollectionState, SIGNAL(finished()), mInitialState); - + connect(this, SIGNAL(reset()), addAppsToCollectionState, SIGNAL(finished())); createChildState (HsMenuEvent::PreviewHSWidget); createChildState (HsMenuEvent::ShowAppSettings); + createChildState (HsMenuEvent::ShowAppDetails); HSMENUTEST_FUNC_EXIT("HsMenuWorkerState::construct"); } @@ -130,6 +132,7 @@ mInitialState->addTransition(newChildStateTransition); // set a transition to the initial state after child processing finished newChildState->addTransition(newChildState, SIGNAL(exit()), mInitialState); + connect(this, SIGNAL(reset()), newChildState, SIGNAL(exit())); HSMENUTEST_FUNC_EXIT("HsMenuWorkerState::createChildState"); return newChildState; diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsviewappdetailsstate.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsviewappdetailsstate.cpp Thu May 27 12:46:08 2010 +0300 @@ -0,0 +1,182 @@ +/* +* 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 Application Library state. + * +*/ + +#include +#include +#include +#include +#include + +#include "caservice.h" +#include "casoftwareregistry.h" + +#include "canotifier.h" +#include "canotifierfilter.h" + +#include "hsviewappdetailsstate.h" +#include "hsmenuevent.h" +#include "hsmenuitemmodel.h" + +HsViewAppDetailsState::HsViewAppDetailsState(QState *parent) : + QState(parent), mDialog(0), mNotifier(0) +{ + construct(); +} + +HsViewAppDetailsState::~HsViewAppDetailsState() +{ + if (mDialog) { + delete mDialog; + } +} + +void HsViewAppDetailsState::construct() +{ + HSMENUTEST_FUNC_ENTRY("HsViewAppDetailsState::construct"); + setObjectName(this->parent()->objectName() + + "/ViewAppDetailsState"); + HSMENUTEST_FUNC_EXIT("HsViewAppDetailsState::construct"); +} + +void HsViewAppDetailsState::onEntry(QEvent *event) +{ + HSMENUTEST_FUNC_ENTRY("HsViewAppDetailsState::onEntry"); + QState::onEntry(event); + HsMenuEvent *menuEvent = static_cast(event); + QVariantMap data = menuEvent->data(); + + const int entryId = data.value(itemIdKey()).toInt(); + QSharedPointer entry = CaService::instance()->getEntry(entryId); + const int componentId = entry->attribute(componentIdAttributeName()).toInt(); + + QSharedPointer scr = CaSoftwareRegistry::create(); + CaSoftwareRegistry::DetailMap detailMap = scr->entryDetails(componentId); + + HbDocumentLoader loader; + bool loadStatusOk = false; + mObjectList = + loader.load(HS_DETAILS_DIALOG_LAYOUT, &loadStatusOk); + Q_ASSERT_X(loadStatusOk, + HS_DETAILS_DIALOG_LAYOUT, + "Error while loading docml file."); + + mDialog = qobject_cast(loader.findWidget(HS_DETAILS_DIALOG_NAME)); + mDialog->actions()[0]->setParent(mDialog); + + subscribeForMemoryCardRemove(entryId); + + HbLabel* nameLabel = qobject_cast(loader.findWidget(CaSoftwareRegistry::componentNameKey())); + HbLabel* versionLabel = qobject_cast(loader.findWidget(CaSoftwareRegistry::componentVersionKey())); + HbLabel* supplierLabel = qobject_cast(loader.findWidget(CaSoftwareRegistry::componentVendorKey())); + HbLabel* memoryLabel = qobject_cast(loader.findWidget(CaSoftwareRegistry::componentDriveInfoKey())); + HbLabel* sizeLabel = qobject_cast(loader.findWidget(CaSoftwareRegistry::componentSizeKey())); + HbLabel* typeLabel = qobject_cast(loader.findWidget(CaSoftwareRegistry::componentTypeKey())); + + nameLabel->setPlainText(detailMap[CaSoftwareRegistry::componentNameKey()]); + versionLabel->setPlainText(detailMap[CaSoftwareRegistry::componentVersionKey()]); + supplierLabel->setPlainText(detailMap[CaSoftwareRegistry::componentVendorKey()]); + if(detailMap[CaSoftwareRegistry::componentDriveInfoKey()] == "C:") + memoryLabel->setPlainText(QString("%1 txt_applib_dialog_1_device_memory").arg(detailMap[CaSoftwareRegistry::componentDriveInfoKey()])); + else if (detailMap[CaSoftwareRegistry::componentDriveInfoKey()] == "E:") + memoryLabel->setPlainText(QString("%1 txt_applib_dialog_1_mass_storage").arg(detailMap[CaSoftwareRegistry::componentDriveInfoKey()])); + else if (detailMap[CaSoftwareRegistry::componentDriveInfoKey()] == "F:") + memoryLabel->setPlainText(QString("%1 txt_applib_dialog_1_memory_card").arg(detailMap[CaSoftwareRegistry::componentDriveInfoKey()])); + else + 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())); + } + + HSMENUTEST_FUNC_EXIT("HsViewAppDetailsState::onEntry"); +} +#ifdef COVERAGE_MEASUREMENT +#pragma CTC SKIP +#endif //COVERAGE_MEASUREMENT +/*! + Slot invoked when a state is exited. + */ +void HsViewAppDetailsState::stateExited() +{ + HSMENUTEST_FUNC_ENTRY("HsViewAppDetailsState::stateExited"); + mDialog = NULL; + emit exit(); + HSMENUTEST_FUNC_EXIT("HsViewAppDetailsState::stateExited"); + qDebug("HsViewAppDetailsState::stateExited()"); +} +#ifdef COVERAGE_MEASUREMENT +#pragma CTC ENDSKIP +#endif //COVERAGE_MEASUREMENT + + +#ifdef COVERAGE_MEASUREMENT +#pragma CTC SKIP +#endif //COVERAGE_MEASUREMENT +void HsViewAppDetailsState::onExit(QEvent *event) +{ + QState::onExit(event); + // Close popups if App key was pressed + if (mDialog) { + mDialog->close(); + } + mDialog = NULL; +} +#ifdef COVERAGE_MEASUREMENT +#pragma CTC ENDSKIP +#endif //COVERAGE_MEASUREMENT + +/*! + Subscribe for memory card remove. + \param entryId: entry id. + \retval void + */ +void HsViewAppDetailsState::subscribeForMemoryCardRemove(int entryId) +{ + CaNotifierFilter filter; + QList entryIds; + entryIds.append(entryId); + filter.setIds(entryIds); + mNotifier = CaService::instance()->createNotifier(filter); + mNotifier->setParent(this); + connect(mNotifier, + SIGNAL(entryChanged(CaEntry,ChangeType)), + SLOT(memoryCardRemoved())); +} + +#ifdef COVERAGE_MEASUREMENT +#pragma CTC SKIP +#endif //COVERAGE_MEASUREMENT +/*! + Memory card with instaled widget was removed. + \retval void + */ +void HsViewAppDetailsState::memoryCardRemoved() +{ + if (mDialog) { + mDialog->close(); + } + // exit not needed, it is called after dialog closed + +} +#ifdef COVERAGE_MEASUREMENT +#pragma CTC ENDSKIP +#endif //COVERAGE_MEASUREMENT + diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/widgetplugins/hsclockwidgetplugin/hsclockwidgetplugin.pro --- a/homescreenapp/widgetplugins/hsclockwidgetplugin/hsclockwidgetplugin.pro Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/widgetplugins/hsclockwidgetplugin/hsclockwidgetplugin.pro Thu May 27 12:46:08 2010 +0300 @@ -17,14 +17,20 @@ TEMPLATE = lib CONFIG += plugin hb mobility MOBILITY = serviceframework + +HB += hbfeedback + +LIBS += -lhsdomainmodel + PLUGIN_SUBDIR = /private/20022F35/import/widgetregistry/20022F6C include(../../common.pri) DEPENDPATH += ./inc \ ./src -INCLUDEPATH += ./inc - +INCLUDEPATH += ./inc \ + ../../hsdomainmodel/inc + symbian: { TARGET.UID3 = 0x20022F6C LIBS += -lbafl -lapgrfx -lcone diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/widgetplugins/hsclockwidgetplugin/inc/hsclockwidget.h --- a/homescreenapp/widgetplugins/hsclockwidgetplugin/inc/hsclockwidget.h Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/widgetplugins/hsclockwidgetplugin/inc/hsclockwidget.h Thu May 27 12:46:08 2010 +0300 @@ -38,9 +38,6 @@ HsClockWidget(QGraphicsItem *parent = 0, Qt::WindowFlags flags = 0); ~HsClockWidget(); -signals: - void setPreferences(const QStringList &names); - public slots: void onInitialize(); void onShow(); diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/widgetplugins/hsclockwidgetplugin/src/hsanalogclockwidget.cpp --- a/homescreenapp/widgetplugins/hsclockwidgetplugin/src/hsanalogclockwidget.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/widgetplugins/hsclockwidgetplugin/src/hsanalogclockwidget.cpp Thu May 27 12:46:08 2010 +0300 @@ -21,7 +21,9 @@ #include #include #include +#include +#include "hsconfiguration.h" #include "hsanalogclockwidget.h" /*! @@ -147,5 +149,7 @@ return; } + HbInstantFeedback::play(HsConfiguration::clockWidgetTapFeedbackType()); + emit clockTapped(); } diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/widgetplugins/hsclockwidgetplugin/src/hsdigitalclockwidget.cpp --- a/homescreenapp/widgetplugins/hsclockwidgetplugin/src/hsdigitalclockwidget.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/widgetplugins/hsclockwidgetplugin/src/hsdigitalclockwidget.cpp Thu May 27 12:46:08 2010 +0300 @@ -23,6 +23,7 @@ #include #include #include +#include #include "hsdigitalclockwidget.h" @@ -247,5 +248,7 @@ return; } + HbInstantFeedback::play(HbFeedback::BasicItem); + emit clockTapped(); } diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/widgetplugins/hsshortcutwidgetplugin/src/hsshortcutwidget.cpp --- a/homescreenapp/widgetplugins/hsshortcutwidgetplugin/src/hsshortcutwidget.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/widgetplugins/hsshortcutwidgetplugin/src/hsshortcutwidget.cpp Thu May 27 12:46:08 2010 +0300 @@ -31,6 +31,7 @@ #include "caservice.h" #include "canotifier.h" #include "caquery.h" +#include "hsconfiguration.h" /*! \class HsShortcutWidget @@ -209,7 +210,7 @@ return; } - HbInstantFeedback::play(HbFeedback::BasicItem); + HbInstantFeedback::play(HsConfiguration::shortcutWidgetTapFeedbackType()); if (mCaEntryRole == ItemEntryRole) { CaService::instance()->executeCommand(mCaEntryId); diff -r 23b5d6a29cce -r 4785f57bf3d4 taskswitcherapp/taskswitcherapp.pro --- a/taskswitcherapp/taskswitcherapp.pro Fri May 14 15:43:04 2010 +0300 +++ b/taskswitcherapp/taskswitcherapp.pro Thu May 27 12:46:08 2010 +0300 @@ -18,18 +18,22 @@ SUBDIRS += tsdevicedialogplugin -tests { - SUBDIRS += internal\tstestrunner - SUBDIRS += tsdevicedialogplugin\tsrc - SUBDIRS += ..\..\homescreensrv\activityfw\activityserviceplugin\unittests - SUBDIRS += ..\..\homescreensrv\activityfw\activitydatabase\hsactivitydbclient\t_hsactivitydbclient - SUBDIRS += ..\..\homescreensrv\hsappkeyhandler\tsrc\t_hsappkeyhandler - SUBDIRS += ..\..\homescreensrv\activityfw\activityserviceplugin\s60\tsrc +coverage { + SUBDIRS += ../../homescreensrv/activityfw + SUBDIRS += ../../homescreensrv/hsappkeyhandler + SUBDIRS += ../../homescreensrv/tstaskmonitor } -coverage { - SUBDIRS += ..\..\homescreensrv\activityfw - SUBDIRS += ..\..\homescreensrv\hsappkeyhandler +tests { + SUBDIRS += internal/tstestrunner + SUBDIRS += tsdevicedialogplugin/tsrc + SUBDIRS += ../../homescreensrv/activityfw/activityserviceplugin/tsrc + SUBDIRS += ../../homescreensrv/activityfw/activitydatabase/hsactivitydbclient/t_hsactivitydbclient + SUBDIRS += ../../homescreensrv/hsappkeyhandler/tsrc/t_hsappkeyhandler + SUBDIRS += ../../homescreensrv/activityfw/activityserviceplugin/s60/tsrc + SUBDIRS += ../../homescreensrv/tstaskmonitor/client/tsrc + SUBDIRS += ../../homescreensrv/tstaskmonitor/server/tsrc + SUBDIRS += ../../homescreensrv/activityfw/tsutils/tsrc } symbian:include(rom.pri) diff -r 23b5d6a29cce -r 4785f57bf3d4 taskswitcherapp/tsdevicedialogplugin/inc/tsdevicedialogplugin.h --- a/taskswitcherapp/tsdevicedialogplugin/inc/tsdevicedialogplugin.h Fri May 14 15:43:04 2010 +0300 +++ b/taskswitcherapp/tsdevicedialogplugin/inc/tsdevicedialogplugin.h Thu May 27 12:46:08 2010 +0300 @@ -27,7 +27,7 @@ #include "tsdocumentloader.h" -class CaService; +class TsTaskMonitor; class TsDeviceDialogPlugin : public HbDeviceDialogPlugin { Q_OBJECT @@ -43,20 +43,11 @@ PluginFlags pluginFlags() const; int error() const; -private slots: - void activated(QModelIndex index); - void pressed(); - void longPressed(); - -signals: - void activate(QModelIndex); - private: int mError; TsDocumentLoader mLoader; QAbstractListModel *mModel; - QSharedPointer mStorage; - bool mLongPressed; + TsTaskMonitor *mStorage; Q_DISABLE_COPY(TsDeviceDialogPlugin) }; diff -r 23b5d6a29cce -r 4785f57bf3d4 taskswitcherapp/tsdevicedialogplugin/inc/tsentrymodelitem.h --- a/taskswitcherapp/tsdevicedialogplugin/inc/tsentrymodelitem.h Fri May 14 15:43:04 2010 +0300 +++ b/taskswitcherapp/tsdevicedialogplugin/inc/tsentrymodelitem.h Thu May 27 12:46:08 2010 +0300 @@ -18,9 +18,11 @@ #ifndef TSENTRYMODELITEM_H #define TSENTRYMODELITEM_H #include "tsmodelitem.h" -#include -class CaEntry; +#include +#include + +class TsTask; /*! Class implements model item which represents Content Arsenal entry @@ -28,19 +30,14 @@ class TsEntryModelItem : public TsModelItem { public: - TsEntryModelItem(CaService &service, QSharedPointer entry, QSize mSize); + TsEntryModelItem(QSharedPointer entry); ~TsEntryModelItem(); QVariant data(int role) const; void close(); void open(); private: - bool closable() const; - -private: - CaService &mService; - const QSharedPointer mEntry; - const QSize mSize; + const QSharedPointer mEntry; }; #endif // TSMODEL_H diff -r 23b5d6a29cce -r 4785f57bf3d4 taskswitcherapp/tsdevicedialogplugin/inc/tsmodel.h --- a/taskswitcherapp/tsdevicedialogplugin/inc/tsmodel.h Fri May 14 15:43:04 2010 +0300 +++ b/taskswitcherapp/tsdevicedialogplugin/inc/tsmodel.h Thu May 27 12:46:08 2010 +0300 @@ -22,10 +22,12 @@ #include #include #include -#include -#include +#include +#ifdef Q_OS_SYMBIAN +#include +#endif -class CaService; +class TsTaskMonitor; class ActivityManager; class CaNotifier; class TsModelItem; @@ -35,7 +37,7 @@ Q_OBJECT public: - explicit TsModel(CaService &applicationSrv, + explicit TsModel(TsTaskMonitor &applicationSrv, QObject &activitySrv, QObject *parent = 0); ~TsModel(); @@ -48,7 +50,6 @@ void openApplication(const QModelIndex &index); void closeApplication(const QModelIndex &index); void updateModel(); - void entryChanged(CaEntry, ChangeType); void entryChanged(TsModelItem *); private: TsModelItem *entry(const QModelIndex &index) const; @@ -63,25 +64,16 @@ */ QList mEntries; - /* - * Query - */ - CaQuery mQuery; - - /* - * Content Arsenal Service - */ - CaService &mApplicationService; + TsTaskMonitor &mApplicationService; /* * Activity Service */ QObject &mActivityService; - - /* - * Content Arsenal Notifier - */ - CaNotifier *mNotifier; + +#ifdef Q_OS_SYMBIAN + RApaLsSession iAppArcSession; +#endif /* * Icon size in model diff -r 23b5d6a29cce -r 4785f57bf3d4 taskswitcherapp/tsdevicedialogplugin/resource/layout.docml --- a/taskswitcherapp/tsdevicedialogplugin/resource/layout.docml Fri May 14 15:43:04 2010 +0300 +++ b/taskswitcherapp/tsdevicedialogplugin/resource/layout.docml Thu May 27 12:46:08 2010 +0300 @@ -9,6 +9,7 @@ + diff -r 23b5d6a29cce -r 4785f57bf3d4 taskswitcherapp/tsdevicedialogplugin/src/tsdevicedialogplugin.cpp --- a/taskswitcherapp/tsdevicedialogplugin/src/tsdevicedialogplugin.cpp Fri May 14 15:43:04 2010 +0300 +++ b/taskswitcherapp/tsdevicedialogplugin/src/tsdevicedialogplugin.cpp Thu May 27 12:46:08 2010 +0300 @@ -26,7 +26,6 @@ #include "tstasksgriditem.h" #include "tsdocumentloader.h" #include "tsmodel.h" -#include /*! \class TsDeviceDialogPlugin @@ -39,7 +38,7 @@ /*! Constructor. */ -TsDeviceDialogPlugin::TsDeviceDialogPlugin() : mError(0), mModel(0), mStorage(CaService::instance()), mLongPressed(false) +TsDeviceDialogPlugin::TsDeviceDialogPlugin() : mError(0), mModel(0), mStorage(0) { } @@ -70,6 +69,10 @@ TsDeviceDialog *dialog(0); if (deviceDialogType == KTsDialogType) { if (0 == mModel) { + mStorage = new TsTaskMonitor(this); + if (0 == mStorage) { + return 0; + } QtMobility::QServiceManager serviceManager; QObject *objPtr(serviceManager.loadInterface("com.nokia.qt.activities.ActivityManager")); if (objPtr) { @@ -96,23 +99,17 @@ grid->setItemPrototype(new TsTasksGridItem()); grid->setModel(mModel); - static_cast(mModel)->updateModel(); + //static_cast(mModel)->updateModel(); // connect the grid and model qRegisterMetaType("QModelIndex"); - disconnect(grid, SIGNAL(activated(QModelIndex)), this, SLOT(activated(QModelIndex))); - disconnect(grid, SIGNAL(pressed(QModelIndex)), this, SLOT(pressed())); - disconnect(grid, SIGNAL(longPressed(HbAbstractViewItem *, QPointF)), this, SLOT(longPressed())); - disconnect(this, SIGNAL(activate(QModelIndex)), mModel, SLOT(openApplication(QModelIndex))); - disconnect(this, SIGNAL(activate(QModelIndex)), dialog, SLOT(close())); + disconnect(grid, SIGNAL(activated(QModelIndex)), mModel, SLOT(openApplication(QModelIndex))); + disconnect(grid, SIGNAL(activated(QModelIndex)), dialog, SLOT(close())); disconnect(grid, SIGNAL(deleteButtonClicked(QModelIndex)), mModel, SLOT(closeApplication(QModelIndex))); - connect(grid, SIGNAL(activated(QModelIndex)), this, SLOT(activated(QModelIndex))); - connect(grid, SIGNAL(pressed(QModelIndex)), this, SLOT(pressed())); - connect(grid, SIGNAL(longPressed(HbAbstractViewItem *, QPointF)), this, SLOT(longPressed())); - connect(this, SIGNAL(activate(QModelIndex)), mModel, SLOT(openApplication(QModelIndex))); - connect(this, SIGNAL(activate(QModelIndex)), dialog, SLOT(close())); + connect(grid, SIGNAL(activated(QModelIndex)), mModel, SLOT(openApplication(QModelIndex))); + connect(grid, SIGNAL(activated(QModelIndex)), dialog, SLOT(close())); connect(grid, SIGNAL(deleteButtonClicked(QModelIndex)), mModel, SLOT(closeApplication(QModelIndex)), Qt::QueuedConnection); } return dialog; @@ -157,21 +154,4 @@ return mError; } -void TsDeviceDialogPlugin::activated(QModelIndex index) -{ - if (!mLongPressed) { - emit activate(index); - } -} - -void TsDeviceDialogPlugin::pressed() -{ - mLongPressed = false; -} - -void TsDeviceDialogPlugin::longPressed() -{ - mLongPressed = true; -} - Q_EXPORT_PLUGIN2(tsdevicedialogplugin, TsDeviceDialogPlugin) diff -r 23b5d6a29cce -r 4785f57bf3d4 taskswitcherapp/tsdevicedialogplugin/src/tsentrymodelitem.cpp --- a/taskswitcherapp/tsdevicedialogplugin/src/tsentrymodelitem.cpp Fri May 14 15:43:04 2010 +0300 +++ b/taskswitcherapp/tsdevicedialogplugin/src/tsentrymodelitem.cpp Thu May 27 12:46:08 2010 +0300 @@ -17,6 +17,7 @@ #include "tsentrymodelitem.h" #include "tsdataroles.h" +#include #include /*! @@ -27,15 +28,11 @@ /*! Standard C++ constructor - /param service - reference to initialized Content Aresnal client instance /param entry - Content Arsenal data - /param size - icon size */ -TsEntryModelItem::TsEntryModelItem(CaService& service, QSharedPointer entry, QSize size) +TsEntryModelItem::TsEntryModelItem(QSharedPointer entry) : - mService(service), - mEntry(entry), - mSize(size) + mEntry(entry) { //no implementation required } @@ -56,11 +53,18 @@ { switch (role) { case Qt::DisplayRole: - return QVariant(mEntry->text()); + return QVariant(mEntry->name()); case Qt::DecorationRole: - return QVariant(mEntry->makeIcon(mSize)); + { + QPixmap icon = mEntry->icon(); + if (icon.isNull()) { + return HbIcon("qtg_large_application"); + } else { + return QVariant::fromValue(HbIcon(icon)); + } + } case TsDataRoles::Closable: - return QVariant(closable()); + return QVariant(mEntry->isClosable()); case TsDataRoles::Visible: return QVariant(true); default: @@ -73,7 +77,7 @@ */ void TsEntryModelItem::close() { - mService.executeCommand(mEntry->id(), QString("close")); + mEntry->close(); } /*! @@ -81,15 +85,6 @@ */ void TsEntryModelItem::open() { - mService.executeCommand(mEntry->id(), QString("open")); + mEntry->open(); } -/*! - Check if application represented by entry is running. - /return true if application is running, false otherwise -*/ -bool TsEntryModelItem::closable() const -{ - return (mEntry->flags().testFlag(RunningEntryFlag) && - !mEntry->flags().testFlag(SystemEntryFlag)); -} diff -r 23b5d6a29cce -r 4785f57bf3d4 taskswitcherapp/tsdevicedialogplugin/src/tsmodel.cpp --- a/taskswitcherapp/tsdevicedialogplugin/src/tsmodel.cpp Fri May 14 15:43:04 2010 +0300 +++ b/taskswitcherapp/tsdevicedialogplugin/src/tsmodel.cpp Thu May 27 12:46:08 2010 +0300 @@ -23,21 +23,16 @@ #include #include #include -#include - -#include -#include #include #ifdef Q_OS_SYMBIAN #include +#include const int TSDeviceDialogUid = 0x2002677F; const int ItemsLimit = 0x00000001; #endif -const char entryTypeKeyword[] = "application"; -const char applicationUidKeyword [] = "application:uid"; const int maxItems(10); /*! \class TsModel @@ -50,33 +45,15 @@ \param query used to create model \param pointer to parent object */ -TsModel::TsModel(CaService &applicationSrv, QObject &activitySrv, QObject *parent) : +TsModel::TsModel(TsTaskMonitor &applicationSrv, QObject &activitySrv, QObject *parent) : QAbstractListModel(parent), mEntries(), mApplicationService(applicationSrv), mActivityService(activitySrv), - mNotifier(NULL), mSize(240, 240), mMaxItems(maxItems) { - // creating query - mQuery.setEntryRoles(ItemEntryRole); - mQuery.addEntryTypeName(entryTypeKeyword); - mQuery.setFlagsOn(VisibleEntryFlag); - mQuery.setFlagsOff(MissingEntryFlag); - mQuery.setFlagsOn(UsedEntryFlag); - mQuery.setSort(LastUsedSortAttribute, Qt::DescendingOrder); - // requesting new data - updateModel(); - // creating notyfication filter - CaNotifierFilter filter(mQuery); - mNotifier = mApplicationService.createNotifier(filter); - connect(mNotifier, SIGNAL(entryChanged(CaEntry,ChangeType)), this, SLOT(entryChanged(CaEntry, ChangeType))); - connect(mNotifier, SIGNAL(entryTouched(int)), this, SLOT(updateModel())); - if (mQuery.parentId() > 0) { - connect(mNotifier, SIGNAL(groupContentChanged(int)), this, SLOT(updateModel())); - } - + #ifdef Q_OS_SYMBIAN XQSettingsManager *crManager = new XQSettingsManager; XQCentralRepositorySettingsKey itemsNumberKey(TSDeviceDialogUid, ItemsLimit); @@ -87,7 +64,12 @@ mMaxItems = number; } } + iAppArcSession.Connect(); #endif + + connect(&activitySrv, SIGNAL(dataChanged()), this, SLOT(updateModel())); + connect(&applicationSrv, SIGNAL(taskListChanged()), this, SLOT(updateModel())); + updateModel(); } /*! @@ -95,8 +77,10 @@ */ TsModel::~TsModel() { +#ifdef Q_OS_SYMBIAN + iAppArcSession.Close(); +#endif qDeleteAll(mEntries); - delete mNotifier; } /*! @@ -177,18 +161,11 @@ { //get running applications TsModelItem *entry(0); - QList< QSharedPointer > applications(mApplicationService.getEntries(mQuery)); - foreach(QSharedPointer application, applications) { - //CA entry ownership is transfered to model item - entry = new TsEntryModelItem(mApplicationService, application, mSize); - if (entry) { - //add running application filtering - if (entry->data(TsDataRoles::Closable).toBool() && //running application filtering - entry->data(TsDataRoles::Visible).toBool()) { //visible applications filtering - mEntries.append(entry); - } else { - delete entry; - } + QList< QSharedPointer > tasks(mApplicationService.taskList()); + foreach (QSharedPointer taskData, tasks) { + entry = new TsEntryModelItem(taskData); + if (0 != entry) { + mEntries.append(entry); } } } @@ -206,9 +183,9 @@ prepareActivityEntry(activity); entry = new TsActivityModelItem(*this, mActivityService, activity); if (entry) { - if (maxRowCount() <= mEntries.count()) { - break; - } + if (maxRowCount() <= mEntries.count()) { + break; + } if (entry->data(TsDataRoles::Visible).toBool()) { //visible activity filtering mEntries.append(entry); } else { @@ -235,32 +212,17 @@ */ QString TsModel::getApplicationName(int id) { - CaQuery query; QString retVal; - query.setEntryRoles(ItemEntryRole); - query.addEntryTypeName(entryTypeKeyword); - query.setAttribute(applicationUidKeyword, QString::number(id)); - QList< QSharedPointer > applications(mApplicationService.getEntries(query)); - if (applications.begin() != applications.end()) { - retVal = (*applications.begin())->text(); - } +#ifdef Q_OS_SYMBIAN + TApaAppInfo info; + iAppArcSession.GetAppInfo( info, TUid::Uid(id)); + retVal = QString::fromUtf16(info.iShortCaption.Ptr(), + info.iShortCaption.Length()); +#endif return retVal; } /*! - Called when some entry was changed - \param updatedEntry entry that was changed - \param change change type -*/ -void TsModel::entryChanged(CaEntry updatedEntry, - ChangeType change) -{ - Q_UNUSED(updatedEntry); - Q_UNUSED(change) - updateModel(); -} - -/*! Called when some item was changed \param itemPtr - address of updated item */ diff -r 23b5d6a29cce -r 4785f57bf3d4 taskswitcherapp/tsdevicedialogplugin/tsdevicedialogplugin.pro --- a/taskswitcherapp/tsdevicedialogplugin/tsdevicedialogplugin.pro Fri May 14 15:43:04 2010 +0300 +++ b/taskswitcherapp/tsdevicedialogplugin/tsdevicedialogplugin.pro Thu May 27 12:46:08 2010 +0300 @@ -43,7 +43,7 @@ INCLUDEPATH += . \ ./inc \ -LIBS += -lcaclient +LIBS += -ltstaskmonitorclient TRANSLATIONS = taskswitcher.ts