Mini browser

# HG changeset patch # User hgs # Date 1278675361 -10800 # Node ID 52b0f64eeb514c7c39d4f8bbd48627cf511c473c # Parent 341166945d6540991f9662c6650e549c558e8523 201027 diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/common.pri --- a/homescreenapp/common.pri Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/common.pri Fri Jul 09 14:36:01 2010 +0300 @@ -73,8 +73,7 @@ win32 { # add platfrom API for windows INCLUDEPATH += \ - $$PWD/../../homescreensrv/homescreensrv_plat/contentstorage_api \ - $$PWD/../../homescreensrv/homescreensrv_plat/hswidgetmodel_api \ + $$PWD/../../homescreensrv/homescreensrv_plat/contentstorage_api \ $$PWD/../../homescreensrv/homescreensrv_plat/homescreen_information_api/inc } diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/examples/batterywidgetplugin/sis/batterywidgetplugin.bat --- a/homescreenapp/examples/batterywidgetplugin/sis/batterywidgetplugin.bat Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/examples/batterywidgetplugin/sis/batterywidgetplugin.bat Fri Jul 09 14:36:01 2010 +0300 @@ -19,7 +19,7 @@ if exist batterywidgetplugin.sisx del batterywidgetplugin.sisx makesis batterywidgetplugin.pkg -signsis batterywidgetplugin.sis batterywidgetplugin.sisx ../../../../sis/rd.cer ../../../../sis/rd-key.pem +signsis batterywidgetplugin.sis batterywidgetplugin.sisx ../../../sis/rd.cer ../../../sis/rd-key.pem if exist batterywidgetplugin.sisx ( echo batterywidgetplugin.sisx creation SUCCEEDED diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/examples/minibrowserwidgetplugin/inc/minibrowserwidget.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/minibrowserwidgetplugin/inc/minibrowserwidget.h Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,77 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Example of home screen widget +* +*/ + +#ifndef MINIBROWSERWIDGET_H +#define MINIBROWSERWIDGET_H + +#include +class HbLineEdit; +class QGraphicsWebView; +class HbIconItem; +class HbPushButton; + +class MiniBrowserWidget : public HbWidget +{ + Q_OBJECT +// Start of snippet 1 + Q_PROPERTY(bool isOnline READ isOnline WRITE setOnline) +// End of snippet 1 +// Start of snippet 2 + Q_PROPERTY(QString url READ url WRITE setUrl) +// End of snippet 2 + +public: + MiniBrowserWidget(QGraphicsItem *parent = 0, Qt::WindowFlags flags = 0); + ~MiniBrowserWidget(); + +public: + bool isOnline(); + void setOnline(bool online); + QString url() const; + void setUrl(const QString& url); + +public slots: + void onInitialize(); + void onShow(); + void onHide(); + +public slots: + void pressGoButton(); + void pressStopButton(); + void loadFinished(bool ok); + void loadProgress(int progress); + void loadStarted(); + +// Start of snippet 3 +signals: + void setPreferences(const QStringList &names); +// End of snippet 3 + +private: + Q_DISABLE_COPY(MiniBrowserWidget) + + HbPushButton *mGoButton; + HbPushButton *mStopButton; + HbLineEdit *mEditor; + QGraphicsWebView *mWeb; + HbIconItem *mSpinnerAnimationWidget; + bool mOnline; + QString mUrl; + +}; + +#endif // MINIBROWSERWIDGET_H diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/examples/minibrowserwidgetplugin/inc/minibrowserwidgetplugin.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/minibrowserwidgetplugin/inc/minibrowserwidgetplugin.h Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,38 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Example of home screen widget +* +*/ + +#ifndef MINIBROWSERWIDGETPLUGIN_H +#define MINIBROWSERWIDGETPLUGIN_H + +#include +#include + +QTM_USE_NAMESPACE +// Start of snippet 1 +class MiniBrowserWidgetPlugin : public QObject, public QServicePluginInterface +{ + Q_OBJECT + Q_INTERFACES(QtMobility::QServicePluginInterface) + +public: + QObject *createInstance(const QServiceInterfaceDescriptor &descriptor, + QServiceContext *context, + QAbstractSecuritySession *session); +}; +// End of snippet 1 + +#endif // HELLOWORLDWIDGETPLUGIN_H diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/examples/minibrowserwidgetplugin/minibrowserwidgetplugin.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/minibrowserwidgetplugin/minibrowserwidgetplugin.pro Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,67 @@ +# +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: Example of home screen widget +# + +TEMPLATE = lib +CONFIG += plugin mobility hb +MOBILITY = serviceframework + +QT += webkit + +HEADERS += ./inc/*.h +SOURCES += ./src/*.cpp + +INCLUDEPATH += ./inc + +symbian: { + + DESTDIR = /private/20022F35/import/widgetregistry/20022F6F + INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE + + TARGET.UID3 = 0x20022F6F + TARGET.EPOCALLOWDLLDATA=1 + TARGET.CAPABILITY = ALL -TCB + + plugins.path = $${DESTDIR} + plugins.sources = $${TARGET}.dll + + widgetResources.path = $${DESTDIR} + widgetResources.sources += resource/$${TARGET}.xml + widgetResources.sources += resource/$${TARGET}.manifest + widgetResources.sources += resource/$${TARGET}preview.png + widgetResources.sources += resource/$${TARGET}.svg + + DEPLOYMENT += plugins \ + widgetResources +} + +win32: { + + CONFIG(debug, debug|release) { + SUBDIRPART = debug + } else { + SUBDIRPART = release + } + + PLUGIN_SUBDIR = /private/20022F35/import/widgetregistry/20022F6F + + DESTDIR = $$PWD/../../../../bin/$${SUBDIRPART}/$${PLUGIN_SUBDIR} + + manifest.path = $${DESTDIR} + manifest.files = ./resource/*.manifest ./resource/*.xml ./resource/*.png ./resource/*.svg + + INSTALLS += manifest + +} diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/examples/minibrowserwidgetplugin/resource/minibrowserwidgetplugin.manifest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/minibrowserwidgetplugin/resource/minibrowserwidgetplugin.manifest Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,10 @@ + + + minibrowserwidgetplugin + Mini browser + Home screen example widget + minibrowserwidgetplugin.svg + minibrowserwidgetpluginpreview.png + false + minibrowserwidgetplugin.xml + diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/examples/minibrowserwidgetplugin/resource/minibrowserwidgetplugin.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/minibrowserwidgetplugin/resource/minibrowserwidgetplugin.svg Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,1566 @@ + + + + + + + + + + +]> + diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/examples/minibrowserwidgetplugin/resource/minibrowserwidgetplugin.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/minibrowserwidgetplugin/resource/minibrowserwidgetplugin.xml Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,11 @@ + + + minibrowserwidgetplugin + minibrowserwidgetplugin + Example widget + + com.nokia.symbian.IHomeScreenWidget + 1.0 + Example of home screen widget + + diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/examples/minibrowserwidgetplugin/resource/minibrowserwidgetpluginpreview.png Binary file homescreenapp/examples/minibrowserwidgetplugin/resource/minibrowserwidgetpluginpreview.png has changed diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/examples/minibrowserwidgetplugin/sis/minibrowserwidgetplugin.bat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/minibrowserwidgetplugin/sis/minibrowserwidgetplugin.bat Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,30 @@ +@rem +@rem Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +@rem All rights reserved. +@rem This component and the accompanying materials are made available +@rem under the terms of "Eclipse Public License v1.0" +@rem which accompanies this distribution, and is available +@rem at the URL "http://www.eclipse.org/legal/epl-v10.html". +@rem +@rem Initial Contributors: +@rem Nokia Corporation - initial contribution. +@rem +@rem Contributors: +@rem +@rem Description: +@rem +@echo off + +if exist minibrowserwidgetplugin.sisx del minibrowserwidgetplugin.sisx + +makesis minibrowserwidgetplugin.pkg +signsis minibrowserwidgetplugin.sis minibrowserwidgetplugin.sisx ../../../sis/rd.cer ../../../sis/rd-key.pem + +if exist minibrowserwidgetplugin.sisx ( +echo minibrowserwidgetplugin.sisx creation SUCCEEDED +del minibrowserwidgetplugin.sis +) + +if not exist minibrowserwidgetplugin.sisx ( +echo minibrowserwidgetplugin.sisx creation FAILED +) \ No newline at end of file diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/examples/minibrowserwidgetplugin/sis/minibrowserwidgetplugin.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/minibrowserwidgetplugin/sis/minibrowserwidgetplugin.pkg Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,45 @@ +; +; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +; All rights reserved. +; This component and the accompanying materials are made available +; under the terms of "Eclipse Public License v1.0" +; which accompanies this distribution, and is available +; at the URL "http://www.eclipse.org/legal/epl-v10.html". +; +; Initial Contributors: +; Nokia Corporation - initial contribution. +; +; Contributors: +; +; Description: +; + +; Language +&EN + +; SIS header: name, uid, version +#{"minibrowserwidgetplugin"},(0x20022F6F),1,0,0 + +; Localised Vendor name +%{"Vendor"} + +; Unique Vendor name +:"Vendor" + +; Manual PKG pre-rules from PRO files +; Default HW/platform dependencies +[0x101F7961],0,0,0,{"S60ProductID"} +[0x102032BE],0,0,0,{"S60ProductID"} +[0x102752AE],0,0,0,{"S60ProductID"} +[0x1028315F],0,0,0,{"S60ProductID"} + + +"../resource/minibrowserwidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.manifest",FM,"application/hs-widget-uninstall+xml",RR,RW + +"/epoc32/release/armv5/urel/minibrowserwidgetplugin.dll" - "!:/sys/bin/minibrowserwidgetplugin.dll" +"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.qtplugin" - "!:/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.qtplugin" +"../resource/minibrowserwidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.manifest" +"../resource/minibrowserwidgetplugin.xml" - "!:/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.xml" +"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.svg" - "!:/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.svg" +"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetpluginpreview.png" - "!:/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetpluginpreview.png" + diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/examples/minibrowserwidgetplugin/sis/minibrowserwidgetplugin_winscw.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/minibrowserwidgetplugin/sis/minibrowserwidgetplugin_winscw.pkg Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,44 @@ +; +; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +; All rights reserved. +; This component and the accompanying materials are made available +; under the terms of "Eclipse Public License v1.0" +; which accompanies this distribution, and is available +; at the URL "http://www.eclipse.org/legal/epl-v10.html". +; +; Initial Contributors: +; Nokia Corporation - initial contribution. +; +; Contributors: +; +; Description: +; + +; Language +&EN + +; SIS header: name, uid, version +#{"minibrowserwidgetplugin"},(0x20022F6F),1,0,0 + +; Localised Vendor name +%{"Vendor"} + +; Unique Vendor name +:"Vendor" + +; Manual PKG pre-rules from PRO files +; Default HW/platform dependencies +[0x101F7961],0,0,0,{"S60ProductID"} +[0x102032BE],0,0,0,{"S60ProductID"} +[0x102752AE],0,0,0,{"S60ProductID"} +[0x1028315F],0,0,0,{"S60ProductID"} + + +"../resource/minibrowserwidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.manifest",FM,"application/hs-widget-uninstall+xml",RR,RW + +"/epoc32/release/winscw/udeb/minibrowserwidgetplugin.dll" - "!:/sys/bin/minibrowserwidgetplugin.dll" +"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.qtplugin" - "!:/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.qtplugin" +"../resource/minibrowserwidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.manifest" +"../resource/minibrowserwidgetplugin.xml" - "!:/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.xml" +"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.svg" - "!:/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetplugin.svg" +"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetpluginpreview.png" - "!:/private/20022F35/import/widgetregistry/20022F6F/minibrowserwidgetpluginpreview.png" diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/examples/minibrowserwidgetplugin/src/minibrowserwidget.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/minibrowserwidgetplugin/src/minibrowserwidget.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,221 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Example of home screen widget +* +*/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include "minibrowserwidget.h" + +/*! + \ingroup group_minibrowser_widget + \class MiniBrowserWidget + \brief Example implementation for home screen widget. + + MiniBrowserWidget derived from the HbWidget and implements + needed functions for the home screen widget. + As name suggests MiniBrowserWidget is a small web browser widget in + the home screen. + + Mini browser widget demonstrates the following home screen widget features: +

home screen online/offline state, see \ref sssection_isonline
preferences, see \ref sssection_setpreferences

+ It also shows use of HbPushButton and HbLineEdit widgets. + @image html hs_minibrowser.png + + +*/ + +/*! + Constructs a widget which is a child of \a parent, with widget flags set to \a flags. + Widget creates two buttons ('go' and 'stop'), text field to write url and browser view. + Note that this is just an simple example so this creates child widgets directly to the layout. + For more complicated widget layouting, see Orbit documentation and especially WidgetML section of it. +*/ +MiniBrowserWidget::MiniBrowserWidget(QGraphicsItem* parent, Qt::WindowFlags flags) + : HbWidget(parent, flags) +{ + QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Vertical); + setLayout(layout); + + QGraphicsLinearLayout *buttonLayout = new QGraphicsLinearLayout(Qt::Horizontal); + mGoButton = new HbPushButton("Go"); + connect(mGoButton, SIGNAL(pressed()), SLOT(pressGoButton())); + buttonLayout->addItem(mGoButton); + mStopButton = new HbPushButton("Stop"); + connect(mStopButton, SIGNAL(pressed()), SLOT(pressStopButton())); + buttonLayout->addItem(mStopButton); + mStopButton->setEnabled(false); + mEditor = new HbLineEdit(); + buttonLayout->addItem(mEditor); + + layout->addItem(buttonLayout); + + mWeb = new QGraphicsWebView(); + layout->addItem(mWeb); + + connect(mWeb, SIGNAL(loadStarted()), SLOT(loadStarted())); + connect(mWeb, SIGNAL(loadProgress(int)), SLOT(loadProgress(int))); + connect(mWeb, SIGNAL(loadFinished(bool)), SLOT(loadFinished(bool))); + + // maximum size of the home screen widget is (48,39) units. Convert units to pixels and + // resize minibrowser as maximum size + HbFrameDrawer *drawer = new HbFrameDrawer( + QLatin1String("qtg_fr_hsshortcut_normal"), HbFrameDrawer::NinePieces); + setBackgroundItem(new HbFrameItem(drawer)); + + HbDeviceProfile profile; + qreal factor = profile.unitValue(); + setPreferredSize(48*factor, 39*factor); + resize(preferredSize()); + + mUrl = QString("http://www.nokia.com"); +} + +/*! + Destructor +*/ +MiniBrowserWidget::~MiniBrowserWidget() +{ +} + +/*! + Returns widget's online state +*/ +// Start of snippet 1 +bool MiniBrowserWidget::isOnline() +{ + return mOnline; +} + +/*! + Sets online state of the widget as \a online +*/ +void MiniBrowserWidget::setOnline(bool online) +{ + mOnline = online; +} +// End of snippet 1 + +/*! + Returns url of the widget currently showing. +*/ +// Start of snippet 2 +QString MiniBrowserWidget::url() const +{ + return mUrl; +} + +/*! + Sets url of the widget as \a url +*/ +void MiniBrowserWidget::setUrl(const QString& url) +{ + mUrl = url; +} +// End of snippet 2 + +/*! + Called when widget is initialized and all to properties are set +*/ +void MiniBrowserWidget::onInitialize() +{ + mGoButton->setEnabled(mOnline); + mEditor->setText(mUrl); +} + +/*! + Called when widget is shown in the home screen +*/ +// Start of snippet 3 +void MiniBrowserWidget::onShow() +{ + if (mOnline) { + mWeb->load(QUrl(mUrl)); + mStopButton->setEnabled(true); + } +} +// End of snippet 3 + +/*! + Called when widget is hidden from the home screen. + Widget can decide what is appropriate action when + widget is not visible on the screen. At least it + should not update itself as often as when on the + screen to save battery etc. +*/ +// Start of snippet 4 +void MiniBrowserWidget::onHide() +{ + mWeb->stop(); +} +// End of snippet 4 + +/*! + Slot connected to 'go' button +*/ +// Start of snippet 5 +void MiniBrowserWidget::pressGoButton() +{ + setUrl(mEditor->text()); + if (mOnline) { + mWeb->load(QUrl(mUrl)); + mStopButton->setEnabled(true); + } + QStringList list; + list.append("url"); + emit setPreferences(list); +} +// End of snippet 5 + +/*! + Slot connected to 'stop' button +*/ +void MiniBrowserWidget::pressStopButton() +{ + mWeb->stop(); + //mStopButton->setEnabled(false); +} + +/*! + Slot connected to webview's loadProgress signal + TODO: check if this is needed. +*/ +void MiniBrowserWidget::loadProgress(int progress) +{ + Q_UNUSED(progress) + qDebug() << progress; +} + +/*! + Slot connected to webview's loadFinished signal +*/ +void MiniBrowserWidget::loadFinished(bool ok) +{ + Q_UNUSED(ok) + mStopButton->setEnabled(false); +} +void MiniBrowserWidget::loadStarted() +{ +} + diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/examples/minibrowserwidgetplugin/src/minibrowserwidgetplugin.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/examples/minibrowserwidgetplugin/src/minibrowserwidgetplugin.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,49 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Example of home screen widget +* +*/ + +#include +#include +#include + +#include "minibrowserwidgetplugin.h" +#include "minibrowserwidget.h" + +/*! + \ingroup group_minibrowser_widget + \class MiniBrowserWidgetPlugin + \brief Example implementation for home screen widget plugin. +*/ + +/*! + Initialize plugin for minibrowser widget. Contains necessary information about + the minibrowser widget that it can be loaded through QT Service Framework. +*/ +QObject *MiniBrowserWidgetPlugin::createInstance(const QServiceInterfaceDescriptor &descriptor, + QServiceContext *context, + QAbstractSecuritySession *session) +{ + Q_UNUSED(context); + Q_UNUSED(session); + + if (descriptor.interfaceName() == QLatin1String("com.nokia.symbian.IHomeScreenWidget")) { + return new MiniBrowserWidget(); + } else { + return 0; + } +} + +Q_EXPORT_PLUGIN2(minibrowserwidgetplugin, MiniBrowserWidgetPlugin) diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/homescreenapp.pro --- a/homescreenapp/homescreenapp.pro Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/homescreenapp.pro Fri Jul 09 14:36:01 2010 +0300 @@ -18,7 +18,6 @@ SUBDIRS += hsutils \ hsdomainmodel \ - runtimeplugins \ serviceproviders \ stateplugins \ widgetplugins \ @@ -27,7 +26,8 @@ symbian: { SUBDIRS += hshomescreenclientplugin \ - hswidgetuninstaller + hswidgetuninstaller \ + hsapplicationlauncher } SUBDIRS += ./../tsrc diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/conf/base/confml/CI_homescreendb.confml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsapplication/conf/base/confml/CI_homescreendb.confml Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1hsclockwidgetplugin + 2dialerwidgetplugin + 3ftuhswidget + 4hsshortcutwidgetplugin + 5hsshortcutwidgetplugin + 6hsshortcutwidgetplugin + 7hsshortcutwidgetplugin + 8hsshortcutwidgetplugin + 9hsshortcutwidgetplugin + 10hsshortcutwidgetplugin + 11hsshortcutwidgetplugin + 12hsshortcutwidgetplugin + 13hsshortcutwidgetplugin + portrait15800.0 + landscape15800.0 + portrait1362760.0 + landscape1361760.0 + portrait154000.0 + landscape3001500.0 + portrait15800.0 + portrait100800.0 + portrait185800.0 + portrait270800.0 + portrait151850.0 + portrait1001850.0 + portrait1851850.0 + portrait15800.0 + portrait100800.0 + portrait185800.0 + clockTypeAnalog + uid0x20022EF9 + uid0x10005901 + uid0x20029F80 + uid0x2001FE79 + uid0x10207C62 + uid0x10005951 + uid0x20025FD9 + uid0x102828D6 + uid0x101FB751 + uid0x100059EE + 10 + 21 + 32 + bounceEffect20 + widgetTapAndHoldTimeout500 + sceneTapAndHoldTimeout500 + pageChangeAnimationDuration200 + pageChangeZoneAnimationDuration800 + pageChangeZoneReverseAnimationDuration200 + pageRemovedAnimationDuration200 + newPageAddedAnimationDuration200 + widgetDragEffectDuration200 + widgetDropEffectDuration200 + defaultPageId1 + maximumPageCount8 + isShortcutLabelVisibletrue + bounceFeedbackEffectDistance3 + pageChangePanDistanceInPixels120 + tapAndHoldDistance16 + pageChangeZoneWidth60 + pageIndicatorSpacing8 + maximumWidgetHeight39 + maximumWidgetWidth48 + minimumWidgetHeight8.75 + minimumWidgetWidth8.75 + pageChangePanDistance17.91 + pageChangeFeedbackEffectSensitive + widgetPickFeedbackEffectItemPick + widgetDropFeedbackEffectItemDrop + widgetRepositionFeedbackEffectBounceEffect + widgetOverTrashbinFeedbackEffectItemMoveOver + widgetDropToTrashbinFeedbackEffectItemDrop + shortcutWidgetTapFeedbackEffectBasicItem + widgetMoveBlockedFeedbackEffectBasic + clockWidgetTapFeedbackEffectBasicItem + widgetSnappingFeedbackEffectItemMoveOver + isSnapEnabledtrue + snapTimeout100 + snapForce30 + snapGap6 + pageMargin0 + snapLineFadeInDuration200 + snapLineFadeOutDuration100 + isSnapEffectsEnabledtrue + sceneTypePageWallpapers + + + diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/conf/base/confml/homescreendb.confml --- a/homescreenapp/hsapplication/conf/base/confml/homescreendb.confml Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/hsapplication/conf/base/confml/homescreendb.confml Fri Jul 09 14:36:01 2010 +0300 @@ -1,125 +1,125 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1hsclockwidgetplugin - 2hsdialerwidgetplugin - 3ftuhswidget - 4hsshortcutwidgetplugin - 5hsshortcutwidgetplugin - 6hsshortcutwidgetplugin - 7hsshortcutwidgetplugin - 8hsshortcutwidgetplugin - 9hsshortcutwidgetplugin - 10hsshortcutwidgetplugin - 11hsshortcutwidgetplugin - 12hsshortcutwidgetplugin - 13hsshortcutwidgetplugin - portrait15800.0 - landscape15800.0 - portrait1362760.0 - landscape1361760.0 - portrait154000.0 - landscape3001500.0 - portrait15800.0 - portrait100800.0 - portrait185800.0 - portrait270800.0 - portrait151850.0 - portrait1001850.0 - portrait1851850.0 - portrait15800.0 - portrait100800.0 - portrait185800.0 - clockTypeAnalog - uid0x20022EF9 - uid0x10005901 - uid0x20029F80 - uid0x2001FE79 - uid0x10207C62 - uid0x10005951 - uid0x20025FD9 - uid0x102828D6 - uid0x101FB751 - uid0x100059EE - 10 - 21 - 32 - bounceEffect20 - widgetTapAndHoldTimeout500 - sceneTapAndHoldTimeout500 - pageChangeAnimationDuration200 - pageChangeZoneAnimationDuration800 - pageChangeZoneReverseAnimationDuration200 - pageRemovedAnimationDuration200 - newPageAddedAnimationDuration200 - widgetDragEffectDuration200 - widgetDropEffectDuration200 - defaultPageId1 - maximumPageCount8 - isShortcutLabelVisibletrue - bounceFeedbackEffectDistance3 - pageChangePanDistanceInPixels120 - tapAndHoldDistance16 - pageChangeZoneWidth60 - pageIndicatorSpacing8 - maximumWidgetHeight39 - maximumWidgetWidth48 - minimumWidgetHeight8.75 - minimumWidgetWidth8.75 - pageChangePanDistance17.91 - pageChangeFeedbackEffectSensitive - widgetPickFeedbackEffectItemPick - widgetDropFeedbackEffectItemDrop - widgetRepositionFeedbackEffectBounceEffect - widgetOverTrashbinFeedbackEffectItemMoveOver - widgetDropToTrashbinFeedbackEffectItemDrop - shortcutWidgetTapFeedbackEffectBasicItem - widgetMoveBlockedFeedbackEffectBasic - clockWidgetTapFeedbackEffectBasicItem - widgetSnappingFeedbackEffectItemMoveOver - isSnapEnabledtrue - snapTimeout100 - snapForce30 - snapGap6 - snapBorderGap0 - snapLineFadeInDuration200 - snapLineFadeOutDuration100 - isSnapEffectsEnabledtrue - sceneTypePageWallpapers - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1hsclockwidgetplugin + 2hsdialerwidgetplugin + 3ftuhswidget + 4hsshortcutwidgetplugin + 5hsshortcutwidgetplugin + 6hsshortcutwidgetplugin + 7hsshortcutwidgetplugin + 8hsshortcutwidgetplugin + 9hsshortcutwidgetplugin + 10hsshortcutwidgetplugin + 11hsshortcutwidgetplugin + 12hsshortcutwidgetplugin + 13hsshortcutwidgetplugin + portrait15800.0 + landscape15800.0 + portrait1362760.0 + landscape1361760.0 + portrait154000.0 + landscape3001500.0 + portrait15800.0 + portrait100800.0 + portrait185800.0 + portrait270800.0 + portrait151850.0 + portrait1001850.0 + portrait1851850.0 + portrait15800.0 + portrait100800.0 + portrait185800.0 + clockTypeAnalog + uid0x20022EF9 + uid0x10005901 + uid0x20029F80 + uid0x2001FE79 + uid0x10207C62 + uid0x10005951 + uid0x20025FD9 + uid0x102828D6 + uid0x101FB751 + uid0x100059EE + 10 + 21 + 32 + bounceEffect20 + widgetTapAndHoldTimeout500 + sceneTapAndHoldTimeout500 + pageChangeAnimationDuration200 + pageChangeZoneAnimationDuration800 + pageChangeZoneReverseAnimationDuration200 + pageRemovedAnimationDuration200 + newPageAddedAnimationDuration200 + widgetDragEffectDuration200 + widgetDropEffectDuration200 + defaultPageId1 + maximumPageCount8 + isShortcutLabelVisibletrue + bounceFeedbackEffectDistance3 + pageChangePanDistanceInPixels120 + tapAndHoldDistance16 + pageChangeZoneWidth60 + pageIndicatorSpacing8 + maximumWidgetHeight39 + maximumWidgetWidth48 + minimumWidgetHeight8.75 + minimumWidgetWidth8.75 + pageChangePanDistance17.91 + pageChangeFeedbackEffectSensitive + widgetPickFeedbackEffectItemPick + widgetDropFeedbackEffectItemDrop + widgetRepositionFeedbackEffectBounceEffect + widgetOverTrashbinFeedbackEffectItemMoveOver + widgetDropToTrashbinFeedbackEffectItemDrop + shortcutWidgetTapFeedbackEffectBasicItem + widgetMoveBlockedFeedbackEffectBasic + clockWidgetTapFeedbackEffectBasicItem + widgetSnappingFeedbackEffectItemMoveOver + isSnapEnabledtrue + snapTimeout100 + snapForce30 + snapGap6 + snapBorderGap0 + snapLineFadeInDuration200 + snapLineFadeOutDuration100 + isSnapEffectsEnabledtrue + sceneTypePageWallpapers + + + diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/conf/base/implml/homescreendb.implml --- a/homescreenapp/hsapplication/conf/base/implml/homescreendb.implml Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/hsapplication/conf/base/implml/homescreendb.implml Fri Jul 09 14:36:01 2010 +0300 @@ -1,7 +1,8 @@ - - + + + + + + + @@ -26,13 +31,13 @@ - + - + - + \ No newline at end of file diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/hsapplication.pri --- a/homescreenapp/hsapplication/hsapplication.pri Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/hsapplication/hsapplication.pri Fri Jul 09 14:36:01 2010 +0300 @@ -14,10 +14,14 @@ # Description: # -HEADERS += ./inc/hshomescreen.h +HEADERS += ./inc/hshomescreen.h \ + ./inc/hsstatemachine.h SOURCES += ./src/hshomescreen.cpp \ + ./src/hsstatemachine.cpp \ ./src/main.cpp symbian:{ - HEADERS += ./inc/hshomescreenclientserviceprovider.h - SOURCES += ./src/hshomescreenclientserviceprovider.cpp + HEADERS += ./inc/hshomescreenclientserviceprovider.h \ + ./inc/hsrecoverymanager.h + SOURCES += ./src/hshomescreenclientserviceprovider.cpp \ + ./src/hsrecoverymanager.cpp } diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/hsapplication.pro --- a/homescreenapp/hsapplication/hsapplication.pro Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/hsapplication/hsapplication.pro Fri Jul 09 14:36:01 2010 +0300 @@ -18,13 +18,12 @@ include(../common.pri) -LIBS += -lhsutils -lhsdomainmodel CONFIG += console -QT += xml +#QT += xml CONFIG += hb mobility -MOBILITY = serviceframework +MOBILITY = serviceframework publishsubscribe fute:DEFINES += FUTE @@ -56,7 +55,7 @@ include(hsapplication_exports_to_rom.pri) CONFIG += service - LIBS += -lxqservice -lxqserviceutil + LIBS += -lxqservice -lxqserviceutil -lXQKeyCapture SERVICE.FILE = ipc_service_conf.xml } diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/hsapplication_exports_to_rom.pri --- a/homescreenapp/hsapplication/hsapplication_exports_to_rom.pri Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/hsapplication/hsapplication_exports_to_rom.pri Fri Jul 09 14:36:01 2010 +0300 @@ -16,6 +16,7 @@ # configuration file exports BLD_INF_RULES.prj_exports += \ + "conf/base/confml/CI_homescreendb.confml APP_LAYER_CONFML(CI_homescreendb.confml)" \ "conf/base/confml/homescreendb.confml APP_LAYER_CONFML(homescreendb.confml)" \ "conf/base/implml/homescreendb.implml APP_LAYER_CRML(homescreendb.implml)" \ "conf/base/implml/homescreendb_templates/create.sql APP_LAYER_CRML(homescreendb_templates/create.sql)" \ diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/inc/hshomescreen.h --- a/homescreenapp/hsapplication/inc/hshomescreen.h Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/hsapplication/inc/hshomescreen.h Fri Jul 09 14:36:01 2010 +0300 @@ -53,7 +53,7 @@ bool eventFilter(QObject *watched, QEvent *event); private: - void registerServicePlugins(QServiceManager &serviceManager); + void registerServicePlugins(); void registerServicePlugins(const QString &root, QServiceManager &serviceManager); private slots: diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/inc/hsrecoverymanager.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsapplication/inc/hsrecoverymanager.h Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,51 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#ifndef HSRECOVERYMANAGER_H +#define HSRECOVERYMANAGER_H + +#include +#include + +#include "hstest_global.h" +HOMESCREEN_TEST_CLASS(t_hsapplication) + +class HsRecoveryManager : public QObject +{ + Q_OBJECT + +public: + HsRecoveryManager(QObject *parent = 0); + ~HsRecoveryManager(); + + void execute(); + +private slots: + void restoreRomDatabase(); + void resetCrashCount(); + +private: + Q_DISABLE_COPY(HsRecoveryManager) + int crashCount(); + +private: + QTimer mTimer; + + HOMESCREEN_TEST_FRIEND_CLASS(t_hsapplication) +}; + +#endif // HSRECOVERYMANAGER_H diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/inc/hsstatemachine.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsapplication/inc/hsstatemachine.h Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,84 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Default implementation of the home screen runtime. +* +*/ + +#ifndef HSSTATEMACHINE_H +#define HSSTATEMACHINE_H + +#include +#include + +#ifdef Q_OS_SYMBIAN +#include +#endif + +#include "hstest_global.h" + +class HsContentService; +QTM_BEGIN_NAMESPACE +class QValueSpacePublisher; +QTM_END_NAMESPACE + +QTM_USE_NAMESPACE + +HOMESCREEN_TEST_CLASS(t_hsapplication) + +class HsStateMachine : public QStateMachine +{ + Q_OBJECT + +public: + HsStateMachine(QObject *parent = 0); + ~HsStateMachine(); + +signals: + void event_exit(); + void event_toIdle(); +protected: + bool eventFilter(QObject *watched, QEvent *event); + +private: + Q_DISABLE_COPY(HsStateMachine) + + + void registerAnimations(); + void createStatePublisher(); + void createContentServiceParts(); + void createStates(); + void updatePSKeys(); + +private slots: + void onIdleStateEntered(); + void onIdleStateExited(); + void activityRequested(const QString &name); + + +private: + HsContentService *mContentService; + + bool mHomeScreenActive; + bool mIdleStateActive; + + QValueSpacePublisher *mPublisher; + +#ifdef Q_OS_SYMBIAN + XQKeyCapture keyCapture; +#endif + + HOMESCREEN_TEST_FRIEND_CLASS(t_hsapplication) +}; + +#endif diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/installs_symbian.pri --- a/homescreenapp/hsapplication/installs_symbian.pri Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/hsapplication/installs_symbian.pri Fri Jul 09 14:36:01 2010 +0300 @@ -21,17 +21,23 @@ for(export1, exports1.sources):BLD_INF_RULES.prj_exports += "./$$export1 $$deploy.path$$exports1.path/$$basename(export1)" exports2.path = /private/20022f35/wallpapers/scene -exports2.sources += resource/scene/default_landscape.png -exports2.sources += resource/scene/default_portrait.png +exports2.sources += resource/wallpapers/scene/default_landscape.png +exports2.sources += resource/wallpapers/scene/default_portrait.png for(export2, exports2.sources):BLD_INF_RULES.prj_exports += "./$$export2 $$deploy.path$$exports2.path/$$basename(export2)" exports3.path = /private/20022f35/wallpapers/page -exports3.sources += resource/page/default_landscape.png -exports3.sources += resource/page/default_portrait.png -exports3.sources += resource/page/1_landscape.png -exports3.sources += resource/page/1_portrait.png -exports3.sources += resource/page/2_landscape.png -exports3.sources += resource/page/2_portrait.png -exports3.sources += resource/page/3_landscape.png -exports3.sources += resource/page/3_portrait.png +exports3.sources += resource/wallpapers/page/default_landscape.png +exports3.sources += resource/wallpapers/page/default_portrait.png +exports3.sources += resource/wallpapers/page/1_landscape.png +exports3.sources += resource/wallpapers/page/1_portrait.png +exports3.sources += resource/wallpapers/page/2_landscape.png +exports3.sources += resource/wallpapers/page/2_portrait.png +exports3.sources += resource/wallpapers/page/3_landscape.png +exports3.sources += resource/wallpapers/page/3_portrait.png for(export3, exports3.sources):BLD_INF_RULES.prj_exports += "./$$export3 $$deploy.path$$exports3.path/$$basename(export3)" + +exports4.path = /private/20022f35/wallpapers/originals +exports4.sources += resource/wallpapers/page/originals/car.png +exports4.sources += resource/wallpapers/page/originals/shapes.png +exports4.sources += resource/wallpapers/page/originals/shoes.png +for(export4, exports4.sources):BLD_INF_RULES.prj_exports += "./$$export4 $$deploy.path$$exports4.path/$$basename(export4)" diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/installs_win.pri --- a/homescreenapp/hsapplication/installs_win.pri Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/hsapplication/installs_win.pri Fri Jul 09 14:36:01 2010 +0300 @@ -16,9 +16,9 @@ kqtihswallpapers.CONFIG += no_build kqtihswallpapers.path = $$DESTDIR/resource/kqtihswallpapers -kqtihswallpapers.files = ./resource/bg_1.png \ - ./resource/bg_2.png \ - ./resource/bg_3.png +kqtihswallpapers.files = ./resource/wallpapers/page/originals/car.png \ + ./resource/wallpapers/page/originals/shapes.png \ + ./resource/wallpapers/page/originals/shoes.png homescreendb.CONFIG += no_build homescreendb.path = $$DESTDIR/private/20022f35 @@ -26,19 +26,19 @@ scenewallpapers.CONFIG += no_build scenewallpapers.path = $$DESTDIR/private/20022f35/wallpapers/scene -scenewallpapers.files = ./resource/scene/default_landscape.png \ - ./resource/scene/default_portrait.png +scenewallpapers.files = ./resource/wallpapers/scene/default_landscape.png \ + ./resource/wallpapers/scene/default_portrait.png pagewallpapers.CONFIG += no_build pagewallpapers.path = $$DESTDIR/private/20022f35/wallpapers/page -pagewallpapers.files = ./resource/page/default_landscape.png \ - ./resource/page/default_portrait.png \ - ./resource/page/1_portrait.png \ - ./resource/page/1_landscape.png \ - ./resource/page/2_portrait.png \ - ./resource/page/2_landscape.png \ - ./resource/page/3_portrait.png \ - ./resource/page/3_landscape.png +pagewallpapers.files = ./resource/wallpapers/page/default_landscape.png \ + ./resource/wallpapers/page/default_portrait.png \ + ./resource/wallpapers/page/1_portrait.png \ + ./resource/wallpapers/page/1_landscape.png \ + ./resource/wallpapers/page/2_portrait.png \ + ./resource/wallpapers/page/2_landscape.png \ + ./resource/wallpapers/page/3_portrait.png \ + ./resource/wallpapers/page/3_landscape.png INSTALLS += kqtihswallpapers homescreendb scenewallpapers pagewallpapers PRE_TARGETDEPS += install_kqtihswallpapers install_homescreendb install_scenewallpapers install_pagewallpapers diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/resource/bg_1.png Binary file homescreenapp/hsapplication/resource/bg_1.png has changed diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/resource/bg_2.png Binary file homescreenapp/hsapplication/resource/bg_2.png has changed diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/resource/bg_3.png Binary file homescreenapp/hsapplication/resource/bg_3.png has changed diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/resource/page/1_landscape.png Binary file homescreenapp/hsapplication/resource/page/1_landscape.png has changed diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/resource/page/1_portrait.png Binary file homescreenapp/hsapplication/resource/page/1_portrait.png has changed diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/resource/page/2_landscape.png Binary file homescreenapp/hsapplication/resource/page/2_landscape.png has changed diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/resource/page/2_portrait.png Binary file homescreenapp/hsapplication/resource/page/2_portrait.png has changed diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/resource/page/3_landscape.png Binary file homescreenapp/hsapplication/resource/page/3_landscape.png has changed diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/resource/page/3_portrait.png Binary file homescreenapp/hsapplication/resource/page/3_portrait.png has changed diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/resource/page/default_landscape.png Binary file homescreenapp/hsapplication/resource/page/default_landscape.png has changed diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/resource/page/default_portrait.png Binary file homescreenapp/hsapplication/resource/page/default_portrait.png has changed diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/resource/resource_win/homescreen.db Binary file homescreenapp/hsapplication/resource/resource_win/homescreen.db has changed diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/resource/scene/default_landscape.png Binary file homescreenapp/hsapplication/resource/scene/default_landscape.png has changed diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/resource/scene/default_portrait.png Binary file homescreenapp/hsapplication/resource/scene/default_portrait.png has changed diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/resource/wallpapers/page/1_landscape.png Binary file homescreenapp/hsapplication/resource/wallpapers/page/1_landscape.png has changed diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/resource/wallpapers/page/1_portrait.png Binary file homescreenapp/hsapplication/resource/wallpapers/page/1_portrait.png has changed diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/resource/wallpapers/page/2_landscape.png Binary file homescreenapp/hsapplication/resource/wallpapers/page/2_landscape.png has changed diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/resource/wallpapers/page/2_portrait.png Binary file homescreenapp/hsapplication/resource/wallpapers/page/2_portrait.png has changed diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/resource/wallpapers/page/3_landscape.png Binary file homescreenapp/hsapplication/resource/wallpapers/page/3_landscape.png has changed diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/resource/wallpapers/page/3_portrait.png Binary file homescreenapp/hsapplication/resource/wallpapers/page/3_portrait.png has changed diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/resource/wallpapers/page/default_landscape.png Binary file homescreenapp/hsapplication/resource/wallpapers/page/default_landscape.png has changed diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/resource/wallpapers/page/default_portrait.png Binary file homescreenapp/hsapplication/resource/wallpapers/page/default_portrait.png has changed diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/resource/wallpapers/page/originals/car.png Binary file homescreenapp/hsapplication/resource/wallpapers/page/originals/car.png has changed diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/resource/wallpapers/page/originals/shapes.png Binary file homescreenapp/hsapplication/resource/wallpapers/page/originals/shapes.png has changed diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/resource/wallpapers/page/originals/shoes.png Binary file homescreenapp/hsapplication/resource/wallpapers/page/originals/shoes.png has changed diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/resource/wallpapers/scene/default_landscape.png Binary file homescreenapp/hsapplication/resource/wallpapers/scene/default_landscape.png has changed diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/resource/wallpapers/scene/default_portrait.png Binary file homescreenapp/hsapplication/resource/wallpapers/scene/default_portrait.png has changed diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/resource/wallpapers/scene/originals/kites.png Binary file homescreenapp/hsapplication/resource/wallpapers/scene/originals/kites.png has changed diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/src/hshomescreen.cpp --- a/homescreenapp/hsapplication/src/hshomescreen.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/hsapplication/src/hshomescreen.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -26,6 +26,7 @@ #include "hshomescreen.h" #include "hstest_global.h" +#include "hsstatemachine.h" #ifdef Q_OS_SYMBIAN #include "hshomescreenclientserviceprovider.h" #endif @@ -35,8 +36,7 @@ \class HsHomeScreen \ingroup group_hsapplication \brief Homescreen application main class. - Loads a runtime from a runtime provider plugin. Manages - the state machine execution. + Manages the state machine execution. */ /*! @@ -52,34 +52,17 @@ { HSTEST_FUNC_ENTRY("HS::HsHomeScreen::HsHomeScreen"); - QServiceManager serviceManager; - - registerServicePlugins(serviceManager); + registerServicePlugins(); - QServiceFilter filter("com.nokia.symbian.IHomeScreenRuntime"); - QList interfaces = serviceManager.findInterfaces(filter); - - if (interfaces.isEmpty()) { - emit exit(); - return; - } + mRuntime = new HsStateMachine(this); - QObject *object = serviceManager.loadInterface(interfaces.first().interfaceName()); - mRuntime = qobject_cast(object); - - if (mRuntime) { - mRuntime->setParent(this); - connect(mRuntime, SIGNAL(started()), SLOT(onRuntimeStarted())); - connect(mRuntime, SIGNAL(stopped()), SLOT(onRuntimeStopped())); - hbInstance->allMainWindows().first()->installEventFilter(this); + connect(mRuntime, SIGNAL(started()), SLOT(onRuntimeStarted())); + connect(mRuntime, SIGNAL(stopped()), SLOT(onRuntimeStopped())); + hbInstance->allMainWindows().first()->installEventFilter(this); #ifdef Q_OS_SYMBIAN - mHomeScreenClientServiceProvider = new HsHomeScreenClientServiceProvider; - mHomeScreenClientServiceProvider->setParent(this); + mHomeScreenClientServiceProvider = new HsHomeScreenClientServiceProvider; + mHomeScreenClientServiceProvider->setParent(this); #endif - } else { - delete object; - emit exit(); - } HSTEST_FUNC_EXIT("HS::HsHomeScreen::HsHomeScreen"); } @@ -97,26 +80,21 @@ */ /*! - Starts the runtime. + Starts the state machine. */ void HsHomeScreen::start() { HSTEST_FUNC_ENTRY("HS::HsHomeScreen::start"); - if (mRuntime) { - mRuntime->start(); - } else { - HSTEST_FUNC_EXIT("HS::HsHomeScreen::start, mRuntime not created, exit application"); - emit exit(); - } + mRuntime->start(); HSTEST_FUNC_EXIT("HS::HsHomeScreen::start"); } /*! - Stops the runtime. + Stops the state machine. */ void HsHomeScreen::stop() { - if (mRuntime && mRuntime->isRunning()) { + if (mRuntime->isRunning()) { QEventLoop eventLoop; connect(mRuntime, SIGNAL(finished()), &eventLoop, SLOT(quit())); QMetaObject::invokeMethod(mRuntime, "event_exit", Qt::QueuedConnection); @@ -137,14 +115,14 @@ } /*! - Called after the runtime has started. + Called after the state machine has started. */ void HsHomeScreen::onRuntimeStarted() { } /*! - Called after the runtime has stopped. + Called after the state machine has stopped. */ void HsHomeScreen::onRuntimeStopped() { @@ -154,9 +132,12 @@ /*! Registers service plugins pre-installed on the device. */ -void HsHomeScreen::registerServicePlugins(QServiceManager &serviceManager) -{ +void HsHomeScreen::registerServicePlugins() +{ HSTEST_FUNC_ENTRY("HS::HsHomeScreen::registerServicePlugins()"); + + QServiceManager serviceManager; + QStringList pluginPaths; pluginPaths << "private/20022F35"; diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/src/hsrecoverymanager.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsapplication/src/hsrecoverymanager.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,104 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#include + +#include + +#include "hsrecoverymanager.h" + +const TInt KPSCategoryUid(0x20022F36); +const TInt KPSCrashCountKey(1); +const int KCrashCountThreshold(3); +const int KResetCrashCountInterval(60000); + +/*! + \class HsRecoveryManager + \ingroup group_hsapplication + \brief Used during homescreen startup for recovering from possible crash situations. +*/ + +/*! + Constructs a new recovery manager with the given \a parent item. +*/ +HsRecoveryManager::HsRecoveryManager(QObject *parent) + : QObject(parent) +{ + mTimer.setInterval(KResetCrashCountInterval); + mTimer.setSingleShot(true); + connect(&mTimer, SIGNAL(timeout()), SLOT(resetCrashCount())); +} + +/*! + Destructor. +*/ +HsRecoveryManager::~HsRecoveryManager() +{ +} + +/*! + Executes this recovery manager. If crash count exceeds the + threshold, the ROM configuration is selected. Otherwise, + the existing one is used. +*/ +void HsRecoveryManager::execute() +{ + int count = crashCount(); + if (KCrashCountThreshold <= count) { + restoreRomDatabase(); + resetCrashCount(); + return; + } + if (0 < count) { + mTimer.start(); + } +} + +/*! + Restores the ROM database to c: drive. +*/ +void HsRecoveryManager::restoreRomDatabase() +{ + // If exists, remove the database from c: + QFile file("c:/private/20022f35/homescreen.db"); + if (file.exists()) { + file.remove(); + } + // Copy the rom database to c: and set permissions. + file.setFileName("z:/private/20022f35/homescreen.db"); + file.copy("c:/private/20022f35/homescreen.db"); + file.setFileName("c:/private/20022f35/homescreen.db"); + file.setPermissions(QFile::ReadOwner | QFile::WriteOwner); +} + +/*! + Resets the crash count to zero. +*/ +void HsRecoveryManager::resetCrashCount() +{ + RProperty::Set(TUid::Uid(KPSCategoryUid), KPSCrashCountKey, 0); +} + +/*! + Returns the current crash count. +*/ +int HsRecoveryManager::crashCount() +{ + TInt count = 0; + RProperty::Get(TUid::Uid(KPSCategoryUid), KPSCrashCountKey, count); + return count; +} diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/src/hsstatemachine.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsapplication/src/hsstatemachine.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,412 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Default implementation of the home state machine. +* +*/ + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "hsmenueventfactory.h" +#include "homescreendomainpskeys.h" +#include "hsstatemachine.h" +#include "hsdatabase.h" +#include "hscontentservice.h" +#include "hsshortcutservice.h" +#include "hsmenueventtransition.h" +#include "hswidgetpositioningonorientationchange.h" +#include "hswidgetpositioningonwidgetadd.h" +#include "hsconfiguration.h" +#include "hstest_global.h" +#include "hswidgetpositioningonwidgetmove.h" + +QTM_USE_NAMESPACE +#define hbApp qobject_cast(qApp) + +#ifdef Q_OS_SYMBIAN +const static Qt::Key applicationKey = Qt::Key_Menu; +#else +const static Qt::Key applicationKey = Qt::Key_Home; +#endif + +namespace +{ + const char KHsRootStateInterface[] = "com.nokia.homescreen.state.HsRootState"; + const char KHsLoadSceneStateInterface[] = "com.nokia.homescreen.state.HsLoadSceneState"; + const char KHsIdleStateInterface[] = "com.nokia.homescreen.state.HsIdleState"; + const char KHsAppLibraryStateInterface[] = "com.nokia.homescreen.state.HsAppLibraryState"; + const char KHsMenuWorkerStateInterface[] = "com.nokia.homescreen.state.HsMenuWorkerState"; + const char KHsBacupRestoreStateInterface[] = "com.nokia.homescreen.state.HsBackupRestoreState"; +} + + +/*! + \class HsStateMachine + \ingroup group_hsstatemachine + \brief Default implementation of the home screen state machine. + Creates an execution context (EC) and populates it with + runtime services. States are loaded from state plugins. + Each state is given an access to the EC. States + are added to a state machine. Finally, the state machine + is started. +*/ + +/*! + Constructs state machine with \a parent as the parent object. +*/ +HsStateMachine::HsStateMachine(QObject *parent) + : QStateMachine(parent), + mContentService(0), + mHomeScreenActive(false), + mIdleStateActive(false), + mPublisher(NULL) +#ifdef Q_OS_SYMBIAN + ,keyCapture() +#endif +{ + HSTEST_FUNC_ENTRY("HS::HsStateMachine::HsStateMachine"); + + HsDatabase *db = new HsDatabase; + db->setConnectionName("homescreen.dbc"); +#ifdef Q_OS_SYMBIAN + db->setDatabaseName("c:/private/20022f35/homescreen.db"); +#else + db->setDatabaseName("private/20022f35/homescreen.db"); +#endif + db->open(); + HsDatabase::setInstance(db); + + HsConfiguration::setInstance(new HsConfiguration); + HsConfiguration::instance()->load(); + + HsWidgetPositioningOnOrientationChange::setInstance( + new HsAdvancedWidgetPositioningOnOrientationChange); + + HsWidgetPositioningOnWidgetAdd::setInstance( + new HsAnchorPointInBottomRight); + + HsWidgetPositioningOnWidgetMove::setInstance( + new HsSnapToLines); + + registerAnimations(); + + createStatePublisher(); + createContentServiceParts(); + createStates(); + + // create the instance so that singleton is accessible from elsewhere + HsShortcutService::instance(this); + + QCoreApplication::instance()->installEventFilter(this); + + if (hbApp) { // Qt test framework uses QApplication. + connect(hbApp->activityManager(), SIGNAL(activityRequested(QString)), + this, SLOT(activityRequested(QString))); + } + HSTEST_FUNC_EXIT("HS::HsStateMachine::HsStateMachine"); +} + +/*! + Destructor. +*/ +HsStateMachine::~HsStateMachine() +{ + HsWidgetPositioningOnOrientationChange::setInstance(0); + delete mPublisher; +} + +/*! + \fn void HsStateMachine::stopStateMachine() + Emission of this signal initiates a transition to the final state. +*/ + +/*! + \copydoc QObject::eventFilter(QObject *watched, QEvent *event) +*/ +bool HsStateMachine::eventFilter(QObject *watched, QEvent *event) +{ + Q_UNUSED(watched); + + switch (event->type()) { + case QEvent::ApplicationActivate: + qDebug() << "HsStateMachine::eventFilter: QEvent::ApplicationActivate"; +#ifdef Q_OS_SYMBIAN + keyCapture.captureKey(applicationKey); +#endif + mHomeScreenActive = true; + updatePSKeys(); + break; + case QEvent::ApplicationDeactivate: + qDebug() << "HsStateMachine::eventFilter: QEvent::ApplicationDeactivate"; +#ifdef Q_OS_SYMBIAN + keyCapture.cancelCaptureKey(applicationKey); +#endif + mHomeScreenActive = false; + updatePSKeys(); + break; + default: + break; + } + + bool result = QStateMachine::eventFilter(watched, event); + // temporary hack as we should not register twice for events + if (event->type() == QEvent::KeyPress ) { + QKeyEvent* ke = static_cast(event); + // Key_Launch0 should be removed when QT starts to send Key_Menu + result = (ke->key() == applicationKey) || ke->key() == Qt::Key_Launch0; + } + return result; +} + + +/*! + Registers framework animations. +*/ +void HsStateMachine::registerAnimations() +{ + HbIconAnimationManager *manager = HbIconAnimationManager::global(); + manager->addDefinitionFile(QLatin1String("qtg_anim_loading.axml")); +} + +/*! + Creates Home screen state publisher. +*/ +void HsStateMachine::createStatePublisher() +{ + mPublisher = new QValueSpacePublisher(QValueSpace::PermanentLayer, HsStatePSKeyPath); + + if (!mPublisher->isConnected()){ + // No permanent layer available + mPublisher = new QValueSpacePublisher(HsStatePSKeyPath); + } + + mPublisher->setValue(HsStatePSKeySubPath, EHomeScreenInactive); +} + +/*! + Creates content service parts. +*/ +void HsStateMachine::createContentServiceParts() +{ + HSTEST_FUNC_ENTRY("HS::HsStateMachine::createContentServiceParts"); + + mContentService = new HsContentService(this); + + HSTEST_FUNC_EXIT("HS::HsStateMachine::createContentServiceParts"); +} + +/*! + Creates states. +*/ +void HsStateMachine::createStates() +{ + HSTEST_FUNC_ENTRY("HS::HsStateMachine::createStates"); + + QFinalState *finalState = new QFinalState(); + addState(finalState); + + QState *guiRootState = new QState(); + addState(guiRootState); + + guiRootState->addTransition(this, SIGNAL(event_exit()), finalState); + + QServiceManager manager; + + + QObject *loadSceneStateObj = manager.loadInterface(KHsLoadSceneStateInterface); + QState *loadSceneState = qobject_cast(loadSceneStateObj); + 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(rootState); + idleState->setObjectName(KHsIdleStateInterface); + connect(idleState, SIGNAL(entered()), SLOT(onIdleStateEntered())); + connect(idleState, SIGNAL(exited()), SLOT(onIdleStateExited())); + + + //menu state + QState *menuParallelState = new QState( + QState::ParallelStates, rootState); + QState *menuRootState = new QState(menuParallelState); + + QObject *appLibraryStateObj = manager.loadInterface(KHsAppLibraryStateInterface); + QState *appLibraryState = qobject_cast(appLibraryStateObj); + appLibraryState->setParent(menuRootState); + appLibraryState->setObjectName(KHsAppLibraryStateInterface); + menuRootState->setInitialState(appLibraryState); + + QHistoryState *historyState = new QHistoryState(rootState); + historyState->setDefaultState(idleState); + + loadSceneState->addTransition( + loadSceneState, SIGNAL(event_history()), historyState); + + QObject *menuWorkerStateObj = manager.loadInterface(KHsMenuWorkerStateInterface); + QState *menuWorkerState = qobject_cast(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, + idleState, appLibraryState); + idleState->addTransition(idleToAppLibTransition); + + HsMenuEventTransition *appLibToIdleTransition = + new HsMenuEventTransition( + HsMenuEvent::OpenHomeScreen, appLibraryState, idleState); + appLibraryState->addTransition(appLibToIdleTransition); + + HbMainWindow *window = hbInstance->allMainWindows().first(); + + // key driven transition from idle to menu + QKeyEventTransition *idleToMenuRootTransition = + new QKeyEventTransition( + window, QEvent::KeyPress, applicationKey); + idleToMenuRootTransition->setTargetState(menuRootState); + idleState->addTransition(idleToMenuRootTransition); + // key driven transition from menu to idle + QKeyEventTransition *menuToIdleTransition = + new QKeyEventTransition( + window, QEvent::KeyPress, applicationKey); + menuToIdleTransition->setTargetState(idleState); + menuRootState->addTransition(menuToIdleTransition); + + // transition for Key_Launch0 should be removed + // when OT starts to send Key_Menu (maybe wk14) + QKeyEventTransition *idleToMenuRootTransition2 = + new QKeyEventTransition( + window, QEvent::KeyPress, Qt::Key_Launch0); + idleToMenuRootTransition2->setTargetState(menuRootState); + idleState->addTransition(idleToMenuRootTransition2); + // key driven transition from menu to idle + QKeyEventTransition *menuToIdleTransition2 = + new QKeyEventTransition( + window, QEvent::KeyPress, Qt::Key_Launch0); + menuToIdleTransition2->setTargetState(idleState); + menuRootState->addTransition(menuToIdleTransition2); + // add transition to switch to idle + menuRootState->addTransition( this, SIGNAL(event_toIdle()), idleState); + + // transitions to child states + // opening shortcut to a colleciton + QList collectionStates = + appLibraryState-> + findChildren + ("homescreen.nokia.com/state/applibrarystate/collectionstate"); + qDebug( + "Found %d \"collectionstate\" children for Application Library State", + collectionStates.count()); + if (collectionStates.count()) { + HsMenuEventTransition *idleToCollectionTransition = + new HsMenuEventTransition(HsMenuEvent::OpenCollection, + idleState, collectionStates[0]); + idleState->addTransition(idleToCollectionTransition); + } + + guiRootState->setInitialState(loadSceneState); + setInitialState(guiRootState); + + HSTEST_FUNC_EXIT("HS::HsStateMachine::createStates"); +} + + +/*! + Publishes Home screen states via Publish & Subscribe. +*/ +void HsStateMachine::updatePSKeys() +{ + if (!mPublisher){ + createStatePublisher(); + } + + if (mHomeScreenActive && mIdleStateActive){ + qDebug() << "HsStateMachine::updatePSKeys: EHomeScreenIdleState"; + mPublisher->setValue(HsStatePSKeySubPath, EHomeScreenIdleState); + } + else{ + qDebug() << "HsStateMachine::updatePSKeys: EHomeScreenInactive"; + mPublisher->setValue(HsStatePSKeySubPath, EHomeScreenInactive); + } +} + +/*! + Called when state machine is in Idle state. +*/ +void HsStateMachine::onIdleStateEntered() +{ + mIdleStateActive = true; + updatePSKeys(); +} + +/*! + Called when state machine leaves the Idle state. +*/ +void HsStateMachine::onIdleStateExited() +{ + mIdleStateActive = false; + updatePSKeys(); +} + +/*! + Activity requested by another client +*/ +void HsStateMachine::activityRequested(const QString &name) +{ + if (name == groupAppLibRecentView()) { + this->postEvent( + HsMenuEventFactory::createOpenCollectionEvent(0, + collectionDownloadedTypeName())); + } else if (name == activityHsIdleView()) { + emit event_toIdle(); + } +} diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplication/src/main.cpp --- a/homescreenapp/hsapplication/src/main.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/hsapplication/src/main.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -36,6 +36,7 @@ #include #include +#include "hsrecoverymanager.h" void loadTranslationFilesOnSymbian(QTranslator &commonTranslator, QTranslator &hsTranslator, @@ -43,6 +44,7 @@ void copyWallpapersFromRom(); void copyHsDatabaseFileFromRom(); void createPrivateFolder(); +void copyWallpaperOriginalsFromRomToPhotos(); /*! \fn setHomescreenAsSystemAppL(CEikonEnv* eikonEnv) @@ -133,6 +135,8 @@ #ifdef Q_OS_SYMBIAN copyHsDatabaseFileFromRom(); + HsRecoveryManager recoveryManager; + recoveryManager.execute(); copyWallpapersFromRom(); #endif @@ -203,7 +207,7 @@ HSTEST("HS::main() - homescreen.db not in c:"); file.setFileName("z:/private/20022f35/homescreen.db"); if(!file.exists()) { - HSTEST("HS::main() - homescreen.db not in ROM!"); + qWarning() << "HS::main() - homescreen.db not in ROM!"; } else { HSTEST("HS::main() - homescreen.db found from z:"); createPrivateFolder(); @@ -214,10 +218,12 @@ HSTEST("HS::main() - homescreen.db copied from ROM to c:!"); file.setFileName("c:/private/20022f35/homescreen.db"); if(!file.setPermissions(QFile::ReadOwner | QFile::WriteOwner)) { - HSTEST("HS::main() - homescreen.db ReadWrite permission settings on c: failed!"); + qWarning() << "HS::main() - homescreen.db ReadWrite permission settings on c: failed!"; } HSTEST("HS::main() - homescreen.db permission set to ReadWrite!"); } + // Copy wallpaper originals to C drive user data to be visible in Photos + copyWallpaperOriginalsFromRomToPhotos(); } #ifdef __WINS__ else if(!file.setPermissions(QFile::ReadOwner | QFile::WriteOwner)) { @@ -280,6 +286,36 @@ } /*! + \fn copyWallpaperOriginalFromRomToPhotos() + \ingroup group_hsapplication + \internal + \brief Wallpaper original copier + Copies homescreen wallpaper originals from rom to C for Photos + does not exist on c: drive +*/ +void copyWallpaperOriginalsFromRomToPhotos() +{ + QString targetPath("e:/data/images/wallpapers"); + QDir dir(targetPath); + if(!dir.exists()) { + dir.mkpath(targetPath); + QDir dir2("z:/private/20022f35/wallpapers/originals"); + dir2.setFilter(QDir::Files); + QStringList files = dir2.entryList(); + foreach(QString file, files) { + QString targetFile(targetPath + "/" + file); + if ( QFile::copy(dir2.absoluteFilePath(file), targetFile) ) { + qDebug() << "Wallpaper original copied from " << dir2.absoluteFilePath(file) << "to " << targetFile; + } + QFile createdFile(targetFile); + if(!createdFile.setPermissions(QFile::ReadOwner | QFile::WriteOwner)) { + qDebug() << "Read write permission set failed for wallpaper original" << targetFile; + } + } + } +} + +/*! \fn loadTranslationFilesOnSymbian(QTranslator &commonTranslator, QTranslator &hsTranslator, QTranslator &alTranslator) diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplicationlauncher/group/hsapplicationlauncher.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsapplicationlauncher/group/hsapplicationlauncher.mmp Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,50 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Makefile of hsapplicationlauncher +* +*/ + +#include + +TARGET hsapplicationlauncher.exe + +targettype exe + +UID 0x1000008d 0x20022F36 +CAPABILITY ReadDeviceData WriteDeviceData +VENDORID VID_DEFAULT +SECUREID 0x20022F36 + +EPOCHEAPSIZE 0x1000 0x100000 // 4KB - 1 MB +EPOCSTACKSIZE 0x5000 + +SOURCEPATH ../src +SOURCE hsapplicationlauncher.cpp +SOURCE hsprocessmonitor.cpp +SOURCE hsshutdownmonitor.cpp + +USERINCLUDE . +USERINCLUDE ../inc + +MW_LAYER_SYSTEMINCLUDE + +LIBRARY euser.lib // CBase etc +LIBRARY bafl.lib // descriptors +LIBRARY ssmcmn.lib // state manager +LIBRARY centralrepository.lib +LIBRARY cenrepnotifhandler.lib + +LANG SC + + diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplicationlauncher/hsapplicationlauncher.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsapplicationlauncher/hsapplicationlauncher.pro Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,21 @@ +# +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: Main project file for homescreen application +# + +TEMPLATE = subdirs + +symbian: { + BLD_INF_RULES.prj_mmpfiles += "./group/hsapplicationlauncher.mmp" +} diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplicationlauncher/inc/hsapplicationlauncher.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsapplicationlauncher/inc/hsapplicationlauncher.h Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,186 @@ +/* +* Copyright (c) 1020 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: application class. +*/ + +#ifndef __HS_LAUNCH_ +#define __HS_LAUNCH_ + +#include +#include +#include +#include "hsprocessmonitor.h" +#include "hsshutdownmonitor.h" + +class t_hsapplicationlauncher; + +/** + * CHsLaunch + * + * application class. + * + * @since S60 5.2 + */ +class CHsLaunch : public CActive, + MCenRepNotifyHandlerCallback, + MHsProcessMonitorObserver, + MHsShutdownMonitorObserver + { + public: + /** + * Create new launcher + * + * @since S60 5.2 + */ + static CHsLaunch* NewL(); + + /** + * Destructor. + * + * @since S60 5.2 + */ + virtual ~CHsLaunch(); + + /** + * Set active object to be ran + * + * @since S60 5.2 + */ + void Activate(); + + /** + * Get application return value + * + * @return TInt Application return value + * @since S60 5.2 + */ + TInt ApplicationReturnValue(); + + protected: + /** + * C++ constructor. + * + * @since S60 5.2 + */ + CHsLaunch(); + + /** + * Symbian 2nd phase constructor + * + * @since S60 5.2 + */ + void ConstructL(); + + private: // From CActive. + /** + * From CActive + */ + void RunL(); + + /** + * From CActive + * + * @since S60 5.2 + */ + void DoCancel(); + + /** + * From CActive + * + * @since S60 5.2 + */ + TInt RunError( TInt aError ); + + private: // From MCenRepNotifyHandlerCallback + /** + * From MCenRepNotifyHandlerCallback + */ + void HandleNotifyInt(TUint32 aId, TInt aNewValue); + + private: // From MHsProcessMonitorObserver + /** + * From MHsProcessMonitorObserver + */ + void ProcessEnded( const TExitType& aExitType, + const TInt aExitReason, + const TExitCategoryName& aExitCategory ); + + /** + * From MHsProcessMonitorObserver + */ + void ProcessMonitoringError( TInt aError ); + + private: // From MHsShutdownMonitorObserver + /** + * From MHsShutdownMonitorObserver + */ + void SystemShutdownEvent(); + + private: + /** + * Initialize process monitor + * + * @param aProcessId Id of process to monitor + */ + void InitProcessMonitorL( const TInt aProcessId ); + + /** + * Shut down application + * + * @param aApplicationReturnValue Application return value. + */ + void ShutdownApp( const TInt aApplicationReturnValue ); + + /** + * Starts the home screen application. + */ + void StartHomeScreen(); + + /** + * Checks if the language is selected. + */ + TBool IsLanguageSelectedL(); + + /** + * Starts listening the repository notifications for + * language selection. + */ + void StartListeningLanguageSelectionL(); + + /** + * Stops listening the repository notifications for + * language selection. + */ + void StopListeningLanguageSelection(); + + private: // data. + // Process monitor. Owned. + CHsProcessMonitor* iProcessMonitor; + + // Shutdown monitor. Owned. + CHsShutdownMonitor* iShutdownMonitor; + + // Repository. + CRepository *iRepository; + + // Repository notify handler. + CCenRepNotifyHandler* iCenRepNotifyHandler; + + // Application return value + TInt iApplicationReturnValue; + + friend class t_hsapplicationlauncher; + }; + +#endif // __HS_LAUNCH_ diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplicationlauncher/inc/hsprocessmonitor.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsapplicationlauncher/inc/hsprocessmonitor.h Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,159 @@ +/* +* Copyright (c) 1020 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: process monitor. +*/ + + +#ifndef __HS_PROCESS_MONITOR__ +#define __HS_PROCESS_MONITOR__ + +#include + +class t_hsapplicationlauncher; + +/** + * MHsProcessMonitorObserver + * + * Monitor component observer. + * + * @since S60 5.2 + */ +class MHsProcessMonitorObserver + { + public: + /** + * Called when monitored process is ended. + * + * @param aExitType Exit type + * @param aExitReason Exit reason + * @param aExitCategory Exit category + */ + virtual void ProcessEnded( const TExitType& aExitType, + const TInt aExitReason, + const TExitCategoryName& aExitCategory ) = 0; + + /** + * Called when error occured during monitoring. + * + * @param aError System wide error code. + */ + virtual void ProcessMonitoringError( TInt aError ) = 0; + }; + +/** + * HsProcessMonitor + * + * Component for monitoring process states. + * + * @since S60 5.2 + */ +class CHsProcessMonitor : public CActive + { + public: + /** + * Create new monitor + * + * @param aProcessName process id + * @param aObserver monitor observer + * @since S60 5.2 + */ + static CHsProcessMonitor* NewL( const TInt aProcessId, + MHsProcessMonitorObserver& aObserver ); + + /** + * Destructor + * + * @since S60 5.2 + */ + ~CHsProcessMonitor(); + + /** + * Attach monitor + * + * @return TInt System wide error code. + * @since S60 5.2 + */ + TInt AttachMonitor(); + + /** + * Start monitor + * + * @return TInt System wide error code. + * @since S60 5.2 + */ + TInt StartMonitor(); + + protected: + /** + * C++ constructor + * + * @param aProcessName process id + * @param aObserver watchdog observer. + * @since S60 5.2 + */ + CHsProcessMonitor( const TInt aProcessId, + MHsProcessMonitorObserver& aObserver ); + + /** + * Symbian 2nd phase constructor + * + * @since S60 5.2 + */ + void ConstructL(); + + private: // From CActive + /** + * From CActive + */ + void RunL(); + + /** + * From CActive + * + * @since S60 5.2 + */ + void DoCancel(); + + /** + * From CActive + * + * @since S60 5.2 + */ + TInt RunError( TInt aError ); + + private: // New methods + /** + * Close process handle if open + * + * @since S60 5.2 + */ + void SecureProcessHandleAsClosed(); + + private: + // process id + TInt iProcessId; + + // watchdog observer + MHsProcessMonitorObserver& iObserver; + + // Process handle + RProcess iProcess; + + // boolean to represent whether process handle is open + TBool iProcessHandleOpen; + + friend class t_hsapplicationlauncher; + }; + +#endif // __HS_PROCESS_MONITOR__ diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplicationlauncher/inc/hsshutdownmonitor.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsapplicationlauncher/inc/hsshutdownmonitor.h Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,121 @@ +/* +* Copyright (c) 1020 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: shutdown monitor. +*/ + + +#ifndef __HS_SHUTDOWN_MONITOR__ +#define __HS_SHUTDOWN_MONITOR__ + +#include +#include + +class t_hsapplicationlauncher; + +/** + * MHsShutdownMonitorObserver + * + * Monitor component observer. + * + * @since S60 5.2 + */ +class MHsShutdownMonitorObserver + { + public: + /** + * Called when shutdown occurs + */ + virtual void SystemShutdownEvent() = 0; + }; + +/** + * HsShutdownMonitor + * + * Component for monitoring shutdown + * + * @since S60 5.2 + */ +class CHsShutdownMonitor : public CActive + { + public: + /** + * Create new monitor + * + * @param aObserver monitor observer + * @since S60 5.2 + */ + static CHsShutdownMonitor* NewL( + MHsShutdownMonitorObserver& aObserver ); + + /** + * Destructor + * + * @since S60 5.2 + */ + ~CHsShutdownMonitor(); + + /** + * Start monitor + * + * @since S60 5.2 + */ + void StartMonitor(); + + protected: + /** + * C++ constructor + * + * @param aObserver monitor observer. + * @since S60 5.2 + */ + CHsShutdownMonitor( MHsShutdownMonitorObserver& aObserver ); + + /** + * Symbian 2nd phase constructor + * + * @since S60 5.2 + */ + void ConstructL(); + + private: // From CActive + /** + * From CActive + */ + void RunL(); + + /** + * From CActive + * + * @since S60 5.2 + */ + void DoCancel(); + + /** + * From CActive + * + * @since S60 5.2 + */ + TInt RunError( TInt aError ); + + private: + // watchdog observer + MHsShutdownMonitorObserver& iObserver; + + // State aware session. + RSsmStateAwareSession iSAS; + + friend class t_hsapplicationlauncher; + }; + +#endif // __HS_PROCESS_MONITOR__ diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplicationlauncher/src/hsapplicationlauncher.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsapplicationlauncher/src/hsapplicationlauncher.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,452 @@ +/* + * Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). + * All rights reserved. + * This component and the accompanying materials are made available + * under the terms of "Eclipse Public License v1.0" + * which accompanies this distribution, and is available + * at the URL "http://www.eclipse.org/legal/epl-v10.html". + * + * Initial Contributors: + * Nokia Corporation - initial contribution. + * + * Contributors: + * + * Description: application class. + * + */ + +#include +#include +#include "hsapplicationlauncher.h" + +// ========================= DECLARATIONS ================================== +_LIT( KHsExeName, "hsapplication.exe" ); +_LIT( KHsProcessName, "hsapplication.exe" ); +const TInt KSleepOnRetry = 250000; // 250ms +const TUid KPSCategoryUid = TUid::Uid( 0x20022F36 ); +const TInt KPSCrashCountKey = 1; +_LIT_SECURITY_POLICY_C1( KPSReadPolicy, ECapabilityReadDeviceData ); +_LIT_SECURITY_POLICY_C1( KPSWritePolicy, ECapabilityWriteDeviceData ); + +// ========================= LOCAL FUNCTIONS ================================== +#ifdef COVERAGE_MEASUREMENT +#pragma CTC SKIP +#endif //COVERAGE_MEASUREMENT +void RunAppL() + { + // Construct active scheduler. + CActiveScheduler* activeScheduler = new ( ELeave )CActiveScheduler(); + CleanupStack::PushL( activeScheduler ); + CActiveScheduler::Install( activeScheduler ); + + // Construct app. + CHsLaunch* app = CHsLaunch::NewL(); + CleanupStack::PushL( app ); + + app->Activate(); + + // Signal startup. + RProcess::Rendezvous(KErrNone); + + // Start active scheduler. + CActiveScheduler::Start(); + + User::LeaveIfError( app->ApplicationReturnValue() ); + + // Cleanup. + CleanupStack::PopAndDestroy( app ); + CleanupStack::PopAndDestroy( activeScheduler ); + } + +#ifndef HOMESCREEN_TEST +// ----------------------------------------------------------------------------- +// E32Main +// entry-point +// ----------------------------------------------------------------------------- +// +TInt E32Main() + { + TInt error = KErrNone; + + __UHEAP_MARK; + + // Construct cleanup stack. + CTrapCleanup* cleanupstack = CTrapCleanup::New(); + if( !cleanupstack ) + { + error = KErrNoMemory; + } + + // Call next phase of startup. + if( !error ) + { + TRAP( error, RunAppL() ); + } + + // Cleanup. + delete cleanupstack; + cleanupstack = NULL; + + __UHEAP_MARKEND; + + return error; + } +#endif //HOMESCREEN_TEST +#ifdef COVERAGE_MEASUREMENT +#pragma CTC ENDSKIP +#endif //COVERAGE_MEASUREMENT +// ========================= MEMBER FUNCTIONS ================================== + +// ----------------------------------------------------------------------------- +// CHsLaunch::NewL() +// Two-phased constructor. +// ----------------------------------------------------------------------------- +CHsLaunch* CHsLaunch::NewL() + { + CHsLaunch* self = new ( ELeave ) CHsLaunch(); + CleanupStack::PushL( self ); + self->ConstructL(); + CleanupStack::Pop( self ); + return self; + } + +// ----------------------------------------------------------------------------- +// CHsLaunch::ConstructL() +// Symbian 2nd phase constructor can leave. +// ----------------------------------------------------------------------------- +// +void CHsLaunch::ConstructL() + { + iRepository = CRepository::NewL(TUid::Uid(0x2002b3aa)); + + iShutdownMonitor = CHsShutdownMonitor::NewL( *this ); + iShutdownMonitor->StartMonitor(); + + // Create property to pub/sub. + TInt error = RProperty::Define( KPSCrashCountKey, + RProperty::EInt, + KPSReadPolicy, + KPSWritePolicy ); + if( error == KErrNone ) + { + // Init it to zero. + error = RProperty::Set( KPSCategoryUid, KPSCrashCountKey, 0 ); + } + else if( error == KErrAlreadyExists ) + { + error = KErrNone; + } + + User::LeaveIfError( error ); + } + +// ----------------------------------------------------------------------------- +// CHsLaunch::CHsLaunch() +// C++ default constructor can NOT contain any code, that might leave. +// ----------------------------------------------------------------------------- +CHsLaunch::CHsLaunch() : + CActive( EPriorityStandard ), + iApplicationReturnValue( KErrNone ) + { + CActiveScheduler::Add( this ); + } + +// ----------------------------------------------------------------------------- +// CHsLaunch::~CHsLaunch() +// Destructor. +// ----------------------------------------------------------------------------- +// +CHsLaunch::~CHsLaunch() + { + Cancel(); + + delete iRepository; + iRepository = NULL; + + delete iProcessMonitor; + iProcessMonitor = NULL; + + delete iShutdownMonitor; + iShutdownMonitor = NULL; + } + +// ----------------------------------------------------------------------------- +// CHsLaunch::Activate() +// Set active object to be ran +// ----------------------------------------------------------------------------- +// +void CHsLaunch::Activate() + { + SetActive(); + TRequestStatus* tmp = &iStatus; + User::RequestComplete( tmp, KErrNone ); + } + +// ----------------------------------------------------------------------------- +// CHsLaunch::ApplicationReturnValue() +// Get application return value +// ----------------------------------------------------------------------------- +// +TInt CHsLaunch::ApplicationReturnValue() + { + return iApplicationReturnValue; + } + +// ----------------------------------------------------------------------------- +// CHsLaunch::RunL +// ----------------------------------------------------------------------------- +// +void CHsLaunch::RunL() + { +#if defined( __WINS__ ) + StartHomeScreen(); +#else + if (IsLanguageSelectedL()) + { + StartHomeScreen(); + } + else + { + StartListeningLanguageSelectionL(); + } +#endif //__WINS__ + } + +// ----------------------------------------------------------------------------- +// CHsLaunch::DoCancel() +// From CActive. +// ----------------------------------------------------------------------------- +// +void CHsLaunch::DoCancel() + { + if( iProcessMonitor ) + { + iProcessMonitor->Cancel(); + } + + if( iShutdownMonitor ) + { + iShutdownMonitor->Cancel(); + } + } + +// ----------------------------------------------------------------------------- +// CHsLaunch::RunError() +// From CActive. +// ----------------------------------------------------------------------------- +// +TInt CHsLaunch::RunError( TInt aError ) + { + /* Shutdown. This application + * will be restarted by startup sw. */ + ShutdownApp( KErrGeneral ); + return KErrNone; + } + +// ----------------------------------------------------------------------------- +// CHsLaunch::HandleNotifyInt() +// From MCenRepNotifyHandlerCallback +// ----------------------------------------------------------------------------- +// +void CHsLaunch::HandleNotifyInt(TUint32 aId, TInt aNewValue) +{ + if (aId == 0x00000007 && aNewValue) + { + StopListeningLanguageSelection(); + StartHomeScreen(); + } +} + +// ----------------------------------------------------------------------------- +// CHsLaunch::ProcessEndedL() +// From MHsProcessMonitorObserver +// ----------------------------------------------------------------------------- +// +void CHsLaunch::ProcessEnded( const TExitType& aExitType, + const TInt aExitReason, + const TExitCategoryName& /*aExitCategory*/ ) + { + TInt crashCount = 0; + TInt error = RProperty::Get( KPSCategoryUid, + KPSCrashCountKey, + crashCount ); + + // increment crash count in cenrep if the process has panic'd or killed with + // an error code + if( aExitType == EExitPanic || + ( aExitType == EExitKill && aExitReason != KErrNone ) ) + { + if( error == KErrNone ) + { + crashCount++; + error = RProperty::Set( KPSCategoryUid, + KPSCrashCountKey, + crashCount ); + } + + if( error == KErrNone ) + { + User::After( KSleepOnRetry ); + Activate(); + } + else + { + ShutdownApp( error ); + } + } + } + +// ----------------------------------------------------------------------------- +// CHsLaunch::ProcessMonitoringErrorL() +// From MHsProcessMonitorObserver +// ----------------------------------------------------------------------------- +// +void CHsLaunch::ProcessMonitoringError( TInt aError ) + { + /* Error in this method is critical and it might cause + * endless active scheduler loop if no active objects are + * not triggered. Therefore shutdown. This application + * will be restarted by startup sw. */ + ShutdownApp( aError ); + } + +// ----------------------------------------------------------------------------- +// CHsLaunch::SystemShutdownEvent() +// From MHsShutdownMonitorObserver +// ----------------------------------------------------------------------------- +// +void CHsLaunch::SystemShutdownEvent() + { + // Do not shut down app. Startup app would try to restart this app. + // Just deactivate all active objects and wait for power off. + if( IsActive() ) + { + Cancel(); + } + else + { + DoCancel(); + } + } + +// ----------------------------------------------------------------------------- +// CHsLaunch::InitProcessMonitorL() +// Initialize process monitor +// ----------------------------------------------------------------------------- +// +void CHsLaunch::InitProcessMonitorL( const TInt aProcessId ) + { + if( iProcessMonitor ) + { + delete iProcessMonitor; + iProcessMonitor = NULL; + } + iProcessMonitor = CHsProcessMonitor::NewL( aProcessId, *this ); + User::LeaveIfError( iProcessMonitor->StartMonitor() ); + } + +// ----------------------------------------------------------------------------- +// CHsLaunch::ShutdownApp() +// Shut down application +// ----------------------------------------------------------------------------- +// +void CHsLaunch::ShutdownApp( const TInt aApplicationReturnValue ) + { + if( IsActive() ) + { + Cancel(); + } + else + { + DoCancel(); + } + + iApplicationReturnValue = aApplicationReturnValue; +#ifndef HOMESCREEN_TEST + CActiveScheduler::Stop(); +#endif //HOMESCREEN_TEST + } + +// ----------------------------------------------------------------------------- +// CHsLaunch::StartHomeScreen() +// Starts the homescreen application. +// ----------------------------------------------------------------------------- +// +void CHsLaunch::StartHomeScreen() + { + // Create app or connect to existing. + TInt processExisted = EFalse; + + RProcess process; + TInt processError = process.Create( KHsExeName, KNullDesC ); + if( processError == KErrAlreadyExists ) + { + processError = process.Open( KHsProcessName, EOwnerProcess ); + processExisted = ETrue; + } + TInt monitorError = KErrNone; + if( processError == KErrNone ) + { + TRAP( monitorError, InitProcessMonitorL( process.Id() ) ); + } + + if( processError == KErrNone && + !processExisted ) + { + // Make sure process is started even if monitor startup + // fails. This will assure that process is not left in + // suspended state. Resume can not be called for + // already running process (will cause KERN-EXEC 46). + process.Resume(); + } + + process.Close(); + + if( processError != KErrNone || + monitorError != KErrNone ) + { + /* Error in this method is critical and it might cause + * endless active scheduler loop if no active objects are + * not triggered. Therefore shutdown. This application + * will be restarted by startup sw. */ + ShutdownApp( KErrGeneral ); + } + } + +// ----------------------------------------------------------------------------- +// CHsLaunch::IsLanguageSelected() +// Checks if the language is selected. +// ----------------------------------------------------------------------------- +// +TBool CHsLaunch::IsLanguageSelectedL() + { + TInt value; + User::LeaveIfError(iRepository->Get(0x00000007, value)); + return value; + } + +// ----------------------------------------------------------------------------- +// CHsLaunch::StartListeningLanguageSelection() +// Starts to listen repository notifications. +// ----------------------------------------------------------------------------- +// +void CHsLaunch::StartListeningLanguageSelectionL() + { + iCenRepNotifyHandler = CCenRepNotifyHandler::NewL( + *this, *iRepository, CCenRepNotifyHandler::EIntKey, 0x00000007); + iCenRepNotifyHandler->StartListeningL(); + } + +// ----------------------------------------------------------------------------- +// CHsLaunch::StopListeningLanguageSelection() +// Stops to listen repository notifications. +// ----------------------------------------------------------------------------- +// +void CHsLaunch::StopListeningLanguageSelection() + { + iCenRepNotifyHandler->StopListening(); + delete iCenRepNotifyHandler; + iCenRepNotifyHandler = NULL; + } + +// End of File diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplicationlauncher/src/hsprocessmonitor.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsapplicationlauncher/src/hsprocessmonitor.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,184 @@ +/* + * Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). + * All rights reserved. + * This component and the accompanying materials are made available + * under the terms of "Eclipse Public License v1.0" + * which accompanies this distribution, and is available + * at the URL "http://www.eclipse.org/legal/epl-v10.html". + * + * Initial Contributors: + * Nokia Corporation - initial contribution. + * + * Contributors: + * + * Description: process monitor. + * + */ + +#include "hsprocessmonitor.h" + +// ========================= MEMBER FUNCTIONS ================================== + +// ----------------------------------------------------------------------------- +// CHsProcessMonitor::NewL() +// Two-phased constructor +// ----------------------------------------------------------------------------- +CHsProcessMonitor* CHsProcessMonitor::NewL( const TInt iProcessId, + MHsProcessMonitorObserver& aObserver ) + { + CHsProcessMonitor* self = new ( ELeave ) CHsProcessMonitor( iProcessId, + aObserver ); + CleanupStack::PushL( self ); + self->ConstructL(); + CleanupStack::Pop( self ); + return self; + } + +// ----------------------------------------------------------------------------- +// CHsProcessMonitor::~CHsProcessMonitor() +// Destructor. +// ----------------------------------------------------------------------------- +// +CHsProcessMonitor::~CHsProcessMonitor() + { + Cancel(); + SecureProcessHandleAsClosed(); + iProcessId = KErrNotFound; + } + +// ----------------------------------------------------------------------------- +// CHsProcessMonitor::AttachMonitor() +// Attach monitor +// ----------------------------------------------------------------------------- +// +TInt CHsProcessMonitor::AttachMonitor() + { + SecureProcessHandleAsClosed(); + + TInt error = iProcess.Open( iProcessId, EOwnerProcess ); + + if( error == KErrNone ) + { + iProcessHandleOpen = ETrue; + } + + return error; + } + +// ----------------------------------------------------------------------------- +// CHsProcessMonitor::StartMonitor() +// Start monitor +// ----------------------------------------------------------------------------- +// +TInt CHsProcessMonitor::StartMonitor() + { + TInt error = KErrNone; + + if( !iProcessHandleOpen ) + { + error = AttachMonitor(); + } + + if( error == KErrNone ) + { + iProcess.Logon( iStatus ); + SetActive(); + } + + return error; + } + +// ----------------------------------------------------------------------------- +// CHsProcessMonitor::CHsProcessMonitor() +// C++ default constructor can NOT contain any code, that might leave. +// ----------------------------------------------------------------------------- +CHsProcessMonitor::CHsProcessMonitor( const TInt aProcessId, + MHsProcessMonitorObserver& aObserver ) : + CActive( EPriorityStandard ), + iProcessId( aProcessId ), + iObserver( aObserver ), + iProcessHandleOpen( EFalse ) + { + CActiveScheduler::Add( this ); + } + +// ----------------------------------------------------------------------------- +// CHsProcessMonitor::ConstructL() +// Symbian 2nd phase constructor can leave. +// ----------------------------------------------------------------------------- +// +void CHsProcessMonitor::ConstructL() + { + } + +// ----------------------------------------------------------------------------- +// CHsProcessMonitor::RunL +// ----------------------------------------------------------------------------- +// +void CHsProcessMonitor::RunL() + { + iProcess.LogonCancel( iStatus ); + + const TInt error = iStatus.Int(); + + if( error == KErrCancel ) + { + } + else if( error == KErrNoMemory ) + { + User::Leave( KErrNoMemory ); + } + else + { + const TExitType exitType = iProcess.ExitType(); + if( exitType == EExitPending ) + { + User::LeaveIfError( StartMonitor() ); + } + else + { + iObserver.ProcessEnded( exitType, + iProcess.ExitReason(), + iProcess.ExitCategory() ); + } + } + } + +// ----------------------------------------------------------------------------- +// CHsProcessMonitor::DoCancel() +// From CActive. +// ----------------------------------------------------------------------------- +// +void CHsProcessMonitor::DoCancel() + { + iProcess.LogonCancel( iStatus ); + } + +// ----------------------------------------------------------------------------- +// CHsProcessMonitor::RunError() +// From CActive. +// ----------------------------------------------------------------------------- +// +TInt CHsProcessMonitor::RunError( TInt aError ) + { + iObserver.ProcessMonitoringError( aError ); + + // Observer will handle error. Return green light. + return KErrNone; + } + +// ----------------------------------------------------------------------------- +// CHsProcessMonitor::SecureProcessHandleAsClosed() +// Close process handle if open +// ----------------------------------------------------------------------------- +// +void CHsProcessMonitor::SecureProcessHandleAsClosed() + { + if( iProcessHandleOpen ) + { + iProcess.Close(); + iProcessHandleOpen = EFalse; + } + } + +// End of File diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsapplicationlauncher/src/hsshutdownmonitor.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsapplicationlauncher/src/hsshutdownmonitor.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,130 @@ +/* + * Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). + * All rights reserved. + * This component and the accompanying materials are made available + * under the terms of "Eclipse Public License v1.0" + * which accompanies this distribution, and is available + * at the URL "http://www.eclipse.org/legal/epl-v10.html". + * + * Initial Contributors: + * Nokia Corporation - initial contribution. + * + * Contributors: + * + * Description: shutdown monitor. + * + */ + +#include +#include + +#include "hsshutdownmonitor.h" + +// ========================= MEMBER FUNCTIONS ================================== + +// ----------------------------------------------------------------------------- +// CHsShutdownMonitor::NewL() +// Two-phased constructor +// ----------------------------------------------------------------------------- +CHsShutdownMonitor* CHsShutdownMonitor::NewL( + MHsShutdownMonitorObserver& aObserver ) + { + CHsShutdownMonitor* self = new ( ELeave ) CHsShutdownMonitor( aObserver ); + CleanupStack::PushL( self ); + self->ConstructL(); + CleanupStack::Pop( self ); + return self; + } + +// ----------------------------------------------------------------------------- +// CHsShutdownMonitor::~CHsShutdownMonitor() +// Destructor. +// ----------------------------------------------------------------------------- +// +CHsShutdownMonitor::~CHsShutdownMonitor() + { + Cancel(); + iSAS.Close(); + } + +// ----------------------------------------------------------------------------- +// CHsShutdownMonitor::StartMonitor() +// Start monitor +// ----------------------------------------------------------------------------- +// +void CHsShutdownMonitor::StartMonitor() + { + iSAS.RequestStateNotification( iStatus ); + SetActive(); + } + +// ----------------------------------------------------------------------------- +// CHsShutdownMonitor::CHsShutdownMonitor() +// C++ default constructor can NOT contain any code, that might leave. +// ----------------------------------------------------------------------------- +CHsShutdownMonitor::CHsShutdownMonitor( MHsShutdownMonitorObserver& aObserver ) : + CActive( EPriorityStandard ), + iObserver( aObserver ) + { + CActiveScheduler::Add( this ); + } + +// ----------------------------------------------------------------------------- +// CHsShutdownMonitor::ConstructL() +// Symbian 2nd phase constructor can leave. +// ----------------------------------------------------------------------------- +// +void CHsShutdownMonitor::ConstructL() + { + User::LeaveIfError( iSAS.Connect( KSM2GenMiddlewareDomain3 ) ); + } + +// ----------------------------------------------------------------------------- +// CHsShutdownMonitor::RunL +// ----------------------------------------------------------------------------- +// +void CHsShutdownMonitor::RunL() + { + User::LeaveIfError( iStatus.Int() ); + + TBool registerForMoreEvents = ETrue; + + TSsmState state = iSAS.State(); + if( state.MainState() == ESsmShutdown ) + { + iObserver.SystemShutdownEvent(); + registerForMoreEvents = EFalse; + } + + if( registerForMoreEvents ) + { + iSAS.AcknowledgeAndRequestStateNotification( KErrNone, iStatus ); + SetActive(); + } + else + { + iSAS.AcknowledgeStateNotification( KErrNone ); + } + } + +// ----------------------------------------------------------------------------- +// CHsShutdownMonitor::DoCancel() +// From CActive. +// ----------------------------------------------------------------------------- +// +void CHsShutdownMonitor::DoCancel() + { + iSAS.RequestStateNotificationCancel(); + } + +// ----------------------------------------------------------------------------- +// CHsShutdownMonitor::RunError() +// From CActive. +// ----------------------------------------------------------------------------- +// +TInt CHsShutdownMonitor::RunError( TInt aError ) + { + return aError; + } + +// End of File diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsdomainmodel/inc/hsconfiguration.h --- a/homescreenapp/hsdomainmodel/inc/hsconfiguration.h Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/hsdomainmodel/inc/hsconfiguration.h Fri Jul 09 14:36:01 2010 +0300 @@ -47,7 +47,7 @@ Q_PROPERTY(int widgetDragEffectDuration READ widgetDragEffectDuration WRITE setWidgetDragEffectDuration) Q_PROPERTY(int widgetDropEffectDuration READ widgetDropEffectDuration WRITE setWidgetDropEffectDuration) Q_PROPERTY(int defaultPageId READ defaultPageId WRITE setDefaultPageId) - Q_PROPERTY(int maximumPageCount READ maximumPageCount WRITE setMaximumPageCount) + Q_PROPERTY(int maximumPageCount READ maximumPageCount WRITE setMaximumPageCount) Q_PROPERTY(bool isShortcutLabelVisible READ isShortcutLabelVisible WRITE setShortcutLabelVisible) Q_PROPERTY(qreal bounceFeedbackEffectDistance READ bounceFeedbackEffectDistance WRITE setBounceFeedbackEffectDistance) Q_PROPERTY(qreal pageChangePanDistanceInPixels READ pageChangePanDistanceInPixels WRITE setPageChangePanDistanceInPixels) @@ -73,7 +73,7 @@ Q_PROPERTY(int snapTimeout READ snapTimeout WRITE setSnapTimeout) Q_PROPERTY(qreal snapForce READ snapForce WRITE setSnapForce) Q_PROPERTY(qreal snapGap READ snapGap WRITE setSnapGap) - Q_PROPERTY(qreal snapBorderGap READ snapBorderGap WRITE setSnapBorderGap) + Q_PROPERTY(qreal pageMargin READ pageMargin WRITE setPageMargin) Q_PROPERTY(int snapLineFadeInDuration READ snapLineFadeInDuration WRITE setSnapLineFadeInDuration) Q_PROPERTY(int snapLineFadeOutDuration READ snapLineFadeOutDuration WRITE setSnapLineFadeOutDuration) Q_PROPERTY(bool isSnapEffectsEnabled READ isSnapEffectsEnabled WRITE setSnapEffectsEnabled) @@ -91,107 +91,117 @@ SceneWallpaper }; +#define SETVALUE(member, name) \ + if (member != value) { \ + member = value; \ + emit propertyChanged(name); \ + } + int bounceEffect() const { return mBounceEffect; } - void setBounceEffect(int effect) { mBounceEffect = effect; } + void setBounceEffect(int value) { SETVALUE(mBounceEffect, "bounceEffect") } int widgetTapAndHoldTimeout() const { return mWidgetTapAndHoldTimeout; } - void setWidgetTapAndHoldTimeout(int timeout) { mWidgetTapAndHoldTimeout = timeout; } + void setWidgetTapAndHoldTimeout(int value) { SETVALUE(mWidgetTapAndHoldTimeout, "widgetTapAndHoldTimeout") } int sceneTapAndHoldTimeout() const { return mSceneTapAndHoldTimeout; } - void setSceneTapAndHoldTimeout(int timeout) { mSceneTapAndHoldTimeout = timeout; } + void setSceneTapAndHoldTimeout(int value) { SETVALUE(mSceneTapAndHoldTimeout, "sceneTapAndHoldTimeout") } int pageChangeAnimationDuration() const { return mPageChangeAnimationDuration; } - void setPageChangeAnimationDuration(int duration) { mPageChangeAnimationDuration = duration; } + void setPageChangeAnimationDuration(int value) { SETVALUE(mPageChangeAnimationDuration, "pageChangeAnimationDuration") } int pageChangeZoneAnimationDuration() const { return mPageChangeZoneAnimationDuration; } - void setPageChangeZoneAnimationDuration(int duration) { mPageChangeZoneAnimationDuration = duration; } + void setPageChangeZoneAnimationDuration(int value) { SETVALUE(mPageChangeZoneAnimationDuration, "pageChangeZoneAnimationDuration") } int pageChangeZoneReverseAnimationDuration() const { return mPageChangeZoneReverseAnimationDuration; } - void setPageChangeZoneReverseAnimationDuration(int duration) { mPageChangeZoneReverseAnimationDuration = duration; } + void setPageChangeZoneReverseAnimationDuration(int value) { SETVALUE(mPageChangeZoneReverseAnimationDuration, "pageChangeZoneReverseAnimationDuration") } int pageRemovedAnimationDuration() const { return mPageRemovedAnimationDuration; } - void setPageRemovedAnimationDuration(int duration) { mPageRemovedAnimationDuration = duration; } + void setPageRemovedAnimationDuration(int value) { SETVALUE(mPageRemovedAnimationDuration, "pageRemovedAnimationDuration") } int newPageAddedAnimationDuration() const { return mNewPageAddedAnimationDuration; } - void setNewPageAddedAnimationDuration(int duration) { mNewPageAddedAnimationDuration = duration; } + void setNewPageAddedAnimationDuration(int value) { SETVALUE(mNewPageAddedAnimationDuration, "newPageAddedAnimationDuration") } int widgetDragEffectDuration() const { return mWidgetDragEffectDuration; } - void setWidgetDragEffectDuration(int duration) { mWidgetDragEffectDuration = duration; } + void setWidgetDragEffectDuration(int value) { SETVALUE(mWidgetDragEffectDuration, "widgetDragEffectDuration") } int widgetDropEffectDuration() const { return mWidgetDropEffectDuration; } - void setWidgetDropEffectDuration(int duration) { mWidgetDropEffectDuration = duration; } + void setWidgetDropEffectDuration(int value) { SETVALUE(mWidgetDropEffectDuration, "widgetDropEffectDuration") } int defaultPageId() const { return mDefaultPageId; } - void setDefaultPageId(int id) { mDefaultPageId = id; } + void setDefaultPageId(int value) { SETVALUE(mDefaultPageId, "defaultPageId") } int maximumPageCount() const { return mMaximumPageCount; } - void setMaximumPageCount(int count) { mMaximumPageCount = count; } + void setMaximumPageCount(int value) { SETVALUE(mMaximumPageCount, "maximumPageCount") } bool isShortcutLabelVisible() const { return mIsShortcutLabelVisible; } - void setShortcutLabelVisible(bool visible) { mIsShortcutLabelVisible = visible; } + void setShortcutLabelVisible(bool value) { SETVALUE(mIsShortcutLabelVisible, "isShortcutLabelVisible") } qreal bounceFeedbackEffectDistance() const { return mBounceFeedbackEffectDistance; } - void setBounceFeedbackEffectDistance(qreal distance) { mBounceFeedbackEffectDistance = distance; } + void setBounceFeedbackEffectDistance(qreal value) { SETVALUE(mBounceFeedbackEffectDistance, "bounceFeedbackEffectDistance") } qreal pageChangePanDistanceInPixels() const { return mPageChangePanDistanceInPixels; } - void setPageChangePanDistanceInPixels(qreal distance) { mPageChangePanDistanceInPixels = distance; } + void setPageChangePanDistanceInPixels(qreal value) { SETVALUE(mPageChangePanDistanceInPixels, "pageChangePanDistanceInPixels") } qreal tapAndHoldDistance() const { return mTapAndHoldDistance; } - void setTapAndHoldDistance(qreal distance) { mTapAndHoldDistance = distance; } + void setTapAndHoldDistance(qreal value) { SETVALUE(mTapAndHoldDistance, "tapAndHoldDistance") } qreal pageChangeZoneWidth() const { return mPageChangeZoneWidth; } - void setPageChangeZoneWidth(qreal width) { mPageChangeZoneWidth = width; } + void setPageChangeZoneWidth(qreal value) { SETVALUE(mPageChangeZoneWidth, "pageChangeZoneWidth") } qreal pageIndicatorSpacing() const { return mPageIndicatorSpacing; } - void setPageIndicatorSpacing(qreal spacing) { mPageIndicatorSpacing = spacing; } + void setPageIndicatorSpacing(qreal value) { SETVALUE(mPageIndicatorSpacing, "pageIndicatorSpacing") } qreal maximumWidgetHeight() const { return mMaximumWidgetHeight; } - void setMaximumWidgetHeight(qreal height) { mMaximumWidgetHeight = height; } + void setMaximumWidgetHeight(qreal value) { SETVALUE(mMaximumWidgetHeight, "maximumWidgetHeight") } qreal maximumWidgetWidth() const { return mMaximumWidgetWidth; } - void setMaximumWidgetWidth(qreal width) { mMaximumWidgetWidth = width; } + void setMaximumWidgetWidth(qreal value) { SETVALUE(mMaximumWidgetWidth, "maximumWidgetWidth") } qreal minimumWidgetHeight() const { return mMinimumWidgetHeight; } - void setMinimumWidgetHeight(qreal height) { mMinimumWidgetHeight = height; } + void setMinimumWidgetHeight(qreal value) { SETVALUE(mMinimumWidgetHeight, "minimumWidgetHeight") } qreal minimumWidgetWidth() const { return mMinimumWidgetWidth; } - void setMinimumWidgetWidth(qreal width) { mMinimumWidgetWidth = width; } + void setMinimumWidgetWidth(qreal value) { SETVALUE(mMinimumWidgetWidth, "minimumWidgetWidth") } qreal pageChangePanDistance() const { return mPageChangePanDistance; } - void setPageChangePanDistance(qreal distance) { mPageChangePanDistance = distance; } + void setPageChangePanDistance(qreal value) { SETVALUE(mPageChangePanDistance, "pageChangePanDistance") } HbFeedback::InstantEffect pageChangeFeedbackEffect() const { return mPageChangeFeedbackEffect; } - void setPageChangeFeedbackEffect(HbFeedback::InstantEffect effect) { mPageChangeFeedbackEffect = effect; } + void setPageChangeFeedbackEffect(HbFeedback::InstantEffect value) { SETVALUE(mPageChangeFeedbackEffect, "pageChangeFeedbackEffect") } HbFeedback::InstantEffect widgetPickFeedbackEffect() const { return mWidgetPickFeedbackEffect; } - void setWidgetPickFeedbackEffect(HbFeedback::InstantEffect effect) { mWidgetPickFeedbackEffect = effect; } + void setWidgetPickFeedbackEffect(HbFeedback::InstantEffect value) { SETVALUE(mWidgetPickFeedbackEffect, "widgetPickFeedbackEffect") } HbFeedback::InstantEffect widgetDropFeedbackEffect() const { return mWidgetDropFeedbackEffect; } - void setWidgetDropFeedbackEffect(HbFeedback::InstantEffect effect) { mWidgetDropFeedbackEffect = effect; } + void setWidgetDropFeedbackEffect(HbFeedback::InstantEffect value) { SETVALUE(mWidgetDropFeedbackEffect, "widgetDropFeedbackEffect") } HbFeedback::InstantEffect widgetRepositionFeedbackEffect() const { return mWidgetRepositionFeedbackEffect; } - void setWidgetRepositionFeedbackEffect(HbFeedback::InstantEffect effect) { mWidgetRepositionFeedbackEffect = effect; } + void setWidgetRepositionFeedbackEffect(HbFeedback::InstantEffect value) { SETVALUE(mWidgetRepositionFeedbackEffect, "widgetRepositionFeedbackEffect") } HbFeedback::InstantEffect widgetOverTrashbinFeedbackEffect() const { return mWidgetOverTrashbinFeedbackEffect; } - void setWidgetOverTrashbinFeedbackEffect(HbFeedback::InstantEffect effect) { mWidgetOverTrashbinFeedbackEffect = effect; } + void setWidgetOverTrashbinFeedbackEffect(HbFeedback::InstantEffect value) { SETVALUE(mWidgetOverTrashbinFeedbackEffect, "widgetOverTrashbinFeedbackEffect") } HbFeedback::InstantEffect widgetDropToTrashbinFeedbackEffect() const { return mWidgetDropToTrashbinFeedbackEffect; } - void setWidgetDropToTrashbinFeedbackEffect(HbFeedback::InstantEffect effect) { mWidgetDropToTrashbinFeedbackEffect = effect; } + void setWidgetDropToTrashbinFeedbackEffect(HbFeedback::InstantEffect value) { SETVALUE(mWidgetDropToTrashbinFeedbackEffect, "widgetDropToTrashbinFeedbackEffect") } HbFeedback::InstantEffect shortcutWidgetTapFeedbackEffect() const { return mShortcutWidgetTapFeedbackEffect; } - void setShortcutWidgetTapFeedbackEffect(HbFeedback::InstantEffect effect) { mShortcutWidgetTapFeedbackEffect = effect; } + void setShortcutWidgetTapFeedbackEffect(HbFeedback::InstantEffect value) { SETVALUE(mShortcutWidgetTapFeedbackEffect, "shortcutWidgetTapFeedbackEffect") } HbFeedback::InstantEffect widgetMoveBlockedFeedbackEffect() const { return mWidgetMoveBlockedFeedbackEffect; } - void setWidgetMoveBlockedFeedbackEffect(HbFeedback::InstantEffect effect) { mWidgetMoveBlockedFeedbackEffect = effect; } + void setWidgetMoveBlockedFeedbackEffect(HbFeedback::InstantEffect value) { SETVALUE(mWidgetMoveBlockedFeedbackEffect, "widgetMoveBlockedFeedbackEffect") } HbFeedback::InstantEffect clockWidgetTapFeedbackEffect() const { return mClockWidgetTapFeedbackEffect; } - void setClockWidgetTapFeedbackEffect(HbFeedback::InstantEffect effect) { mClockWidgetTapFeedbackEffect = effect; } + void setClockWidgetTapFeedbackEffect(HbFeedback::InstantEffect value) { SETVALUE(mClockWidgetTapFeedbackEffect, "clockWidgetTapFeedbackEffect") } HbFeedback::InstantEffect widgetSnappingFeedbackEffect() const { return mWidgetSnappingFeedbackEffect; } - void setWidgetSnappingFeedbackEffect(HbFeedback::InstantEffect effect) { mWidgetSnappingFeedbackEffect = effect; } + void setWidgetSnappingFeedbackEffect(HbFeedback::InstantEffect value) { SETVALUE(mWidgetSnappingFeedbackEffect, "widgetSnappingFeedbackEffect") } bool isSnapEnabled() const { return mIsSnapEnabled; } - void setSnapEnabled(bool enabled) { mIsSnapEnabled = enabled; } + void setSnapEnabled(bool value) { SETVALUE(mIsSnapEnabled, "isSnapEnabled") } int snapTimeout() const { return mSnapTimeout; } - void setSnapTimeout(int timeout) { mSnapTimeout = timeout; } + void setSnapTimeout(int value) { SETVALUE(mSnapTimeout, "snapTimeout") } qreal snapForce() const { return mSnapForce; } - void setSnapForce(qreal force) { mSnapForce = force; } + void setSnapForce(qreal value) { SETVALUE(mSnapForce, "snapForce") } qreal snapGap() const { return mSnapGap; } - void setSnapGap(qreal gap) { mSnapGap = gap; } - qreal snapBorderGap() const { return mSnapBorderGap; } - void setSnapBorderGap(qreal gap) { mSnapBorderGap = gap; } + void setSnapGap(qreal value) { SETVALUE(mSnapGap, "snapGap") } + qreal pageMargin() const { return mPageMargin; } + void setPageMargin(qreal value) { SETVALUE(mPageMargin, "pageMargin") } int snapLineFadeInDuration() const { return mSnapLineFadeInDuration; } - void setSnapLineFadeInDuration(int duration) { mSnapLineFadeInDuration = duration; } + void setSnapLineFadeInDuration(int value) { SETVALUE(mSnapLineFadeInDuration, "snapLineFadeInDuration") } int snapLineFadeOutDuration() const { return mSnapLineFadeOutDuration; } - void setSnapLineFadeOutDuration(int duration) { mSnapLineFadeOutDuration = duration; } + void setSnapLineFadeOutDuration(int value) { SETVALUE(mSnapLineFadeOutDuration, "snapLineFadeOutDuration") } bool isSnapEffectsEnabled() const { return mIsSnapEffectsEnabled; } - void setSnapEffectsEnabled(bool enabled) { mIsSnapEffectsEnabled = enabled; } + void setSnapEffectsEnabled(bool value) { SETVALUE(mIsSnapEffectsEnabled, "isSnapEffectsEnabled") } SceneType sceneType() const { return mSceneType; } - void setSceneType(SceneType type) { mSceneType = type; } - + void setSceneType(SceneType value) { SETVALUE(mSceneType, "sceneType") } +#undef SETVALUE + QSizeF minimumWidgetSizeInUnits() const; QSizeF maximumWidgetSizeInUnits() const; QSizeF minimumWidgetSizeInPixels() const; QSizeF maximumWidgetSizeInPixels() const; - + bool load(); bool importFromFile(const QString &path); bool exportToFile(const QString &path); - + static HsConfiguration *instance(); static HsConfiguration *takeInstance(); static void setInstance(HsConfiguration *instance); +signals: + void propertyChanged(const QString &name); + private: Q_DISABLE_COPY(HsConfiguration) - + private: int mBounceEffect; int mWidgetTapAndHoldTimeout; @@ -230,7 +240,7 @@ int mSnapTimeout; qreal mSnapForce; qreal mSnapGap; - qreal mSnapBorderGap; + qreal mPageMargin; int mSnapLineFadeInDuration; int mSnapLineFadeOutDuration; bool mIsSnapEffectsEnabled; diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsdomainmodel/inc/hspage.h --- a/homescreenapp/hsdomainmodel/inc/hspage.h Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/hsdomainmodel/inc/hspage.h Fri Jul 09 14:36:01 2010 +0300 @@ -18,6 +18,7 @@ #ifndef HSPAGE_H #define HSPAGE_H +#include #include #include #include "hsdomainmodel_global.h" @@ -38,44 +39,35 @@ public: HsPage(QGraphicsItem *parent = 0); ~HsPage(); - int databaseId() const; void setDatabaseId(int id); - void setGeometry(const QRectF &rect); - bool load(); - HsWallpaper *wallpaper() const; - bool addExistingWidget(HsWidgetHost *widgetHost); bool removeWidget(HsWidgetHost *widgeHost); - QList newWidgets(); bool addNewWidget(HsWidgetHost *widgetHost, const QPointF &position = QPointF()); void layoutNewWidgets(); void resetNewWidgets(); bool deleteFromDatabase(); - QList widgets() const; - bool isRemovable() const; void setRemovable(bool removable); - bool isDefaultPage() const; bool isActivePage() const; - static HsPage *createInstance(const HsPageData &pageData); - - QPointF mTouchPoint; + QPointF adjustedWidgetPosition(const QRectF &origWidgetRect); + QRectF contentGeometry(); + QRectF contentGeometry(Qt::Orientation orientation); + QRectF contentRect(); + QRectF contentRect(Qt::Orientation orientation); public slots: void showWidgets(); void hideWidgets(); void setOnline(bool online = true); - void updateZValues(); - int pageIndex(); private: @@ -90,8 +82,8 @@ void onWidgetResized(); void onWidgetAvailable(); void onWidgetUnavailable(); - void onOrientationChanged(Qt::Orientation orientation); + void onPageMarginChanged(const QString &value); private: int mDatabaseId; @@ -101,7 +93,8 @@ QList mNewWidgets; QList mUnavailableWidgets; HsPageTouchArea *mTouchArea; - + QPointF mTouchPoint; + qreal mPageMargin; HOMESCREEN_TEST_FRIEND_CLASS(TestHsDomainModel) }; diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsdomainmodel/src/hsconfiguration.cpp --- a/homescreenapp/hsdomainmodel/src/hsconfiguration.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/hsdomainmodel/src/hsconfiguration.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -73,7 +73,7 @@ mSnapTimeout(100), mSnapForce(30), mSnapGap(6), - mSnapBorderGap(0), + mPageMargin(0), mSnapLineFadeInDuration(200), mSnapLineFadeOutDuration(100), mIsSnapEffectsEnabled(true), diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsdomainmodel/src/hspage.cpp --- a/homescreenapp/hsdomainmodel/src/hspage.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/hsdomainmodel/src/hspage.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -48,13 +48,18 @@ mDatabaseId(-1), mWallpaper(0), mRemovable(true), - mTouchArea(0) + mTouchArea(0), + mPageMargin(0.0) { setFlag(QGraphicsItem::ItemHasNoContents); setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored)); setupTouchArea(); + + //Page margin + mPageMargin = HSCONFIGURATION_GET(pageMargin); + connect(HsConfiguration::instance(), SIGNAL(propertyChanged(QString)), SLOT(onPageMarginChanged(QString))); } /*! @@ -127,7 +132,7 @@ } /*! - Return wallpaper. + Return wallpaper. */ HsWallpaper *HsPage::wallpaper() const { @@ -156,6 +161,7 @@ return true; } + /*! Remove given \a widgetHost from a page. Widget is not deleted. Returns true if successful @@ -172,6 +178,7 @@ return true; } + /*! Returns list of new widgets belonging to a page. Widgets which are not yet layouted are considered as new widgets. @@ -197,16 +204,17 @@ } HsWidgetPresentationData presentation; + QPointF adjustedWidgetPos = adjustedWidgetPosition(widgetHost->geometry()); presentation.orientation = HsScene::orientation(); if (!widgetHost->getPresentation(presentation)) { presentation.orientation = HsScene::orientation(); - presentation.setPos(mTouchPoint); + presentation.setPos(adjustedWidgetPos); presentation.zValue = 0; widgetHost->savePresentation(presentation); } widgetHost->hide(); - widgetHost->setPos(presentation.x, presentation.y); + widgetHost->setPos(adjustedWidgetPos); widgetHost->setZValue(presentation.zValue); connectWidget(widgetHost); @@ -244,6 +252,15 @@ } /*! + Clears new widgets list and resets layout. +*/ +void HsPage::resetNewWidgets() +{ + mNewWidgets.clear(); + setLayout(0); +} + +/*! Remove page and all it's contained widgets from database */ bool HsPage::deleteFromDatabase() @@ -262,9 +279,13 @@ widget->remove(); } mUnavailableWidgets.clear(); - + + if (mWallpaper) { + mWallpaper->remove(); + } return HsDatabase::instance()->deletePage(mDatabaseId); } + /*! Return list of widgets belonging to a page */ @@ -289,6 +310,7 @@ { mRemovable = removable; } + /*! Return true if page is default page. */ @@ -296,6 +318,7 @@ { return mDatabaseId == HSCONFIGURATION_GET(defaultPageId); } + /*! Return true if page is active page. */ @@ -303,6 +326,7 @@ { return this == HsScene::instance()->activePage(); } + /*! Create page into database and return instance of a new page. */ @@ -322,6 +346,65 @@ } /*! + The widget is bounded in the rectangle which is smaller by pageMargin on all sides of page. +*/ +QPointF HsPage::adjustedWidgetPosition(const QRectF &origWidgetRect) +{ + QRectF widgetAreaRect = contentGeometry(); + qreal widgetX = qBound(widgetAreaRect.left(), origWidgetRect.x(), widgetAreaRect.right() - origWidgetRect.width()); + qreal widgetY = qBound(widgetAreaRect.top(), origWidgetRect.y(), widgetAreaRect.bottom() - origWidgetRect.height()); + + return QPointF(widgetX, widgetY); +} + +/*! + Returns rect of rectangular where widgets are allowed to be placed in the page. +*/ +QRectF HsPage::contentGeometry() +{ + return contentGeometry(HsScene::mainWindow()->orientation()); +} + +/*! + Returns rect of rectangular where widgets are allowed to be placed in the page. +*/ +QRectF HsPage::contentGeometry(Qt::Orientation orientation) +{ + QRectF pageRect = HsScene::mainWindow()->layoutRect(); + + if (orientation != HsScene::orientation()) { + qreal width = pageRect.width(); + qreal height = pageRect.height(); + pageRect.setWidth(height); + pageRect.setHeight(width); + } + + //Take care of chrome in both orientation + pageRect.setTop(64); + + //Shrink by page margins at each side + return pageRect.adjusted(mPageMargin, mPageMargin, -mPageMargin, -mPageMargin); +} + +/*! + Returns rect of rectangular where widgets are allowed to be placed in the page. +*/ +QRectF HsPage::contentRect() +{ + return contentRect(HsScene::mainWindow()->orientation()); +} + +/*! + Returns rect of rectangular where widgets are allowed to be placed in the page. +*/ +QRectF HsPage::contentRect(Qt::Orientation orientation) +{ + QRectF rect = contentGeometry(orientation); + rect.moveTopLeft(QPointF(0,0)); + return rect; +} + +/*! Calls onShow() for contained widgets. */ void HsPage::showWidgets() @@ -346,7 +429,7 @@ } /*! - Propogate online state to widgets. + Propagate online state to widgets. */ void HsPage::setOnline(bool online) { @@ -357,6 +440,7 @@ widget->setOnline(online); } } + /*! Update widgets z-values and persist those. Active widget has top most z-value. @@ -457,11 +541,7 @@ { if ( !layout() ) { HsWidgetHost *widget = qobject_cast(sender()); - QRectF widgetRect = widget->geometry(); - QRectF pageRect = HsScene::mainWindow()->layoutRect(); - qreal widgetX = qBound(qreal(0), widgetRect.x(), pageRect.width() - widgetRect.width()); - qreal widgetY = qBound(qreal(64), widgetRect.y(), pageRect.height() - widgetRect.height()); - widget->setPos(widgetX, widgetY); + widget->setPos(adjustedWidgetPosition(widget->geometry())); } else { layout()->invalidate(); } @@ -500,20 +580,19 @@ widget->hide(); widget->setParentItem(0); } + /*! Run positioning algorithm for widgets which don't have position on target orientation. Otherwise set orientation positions for widgets. */ void HsPage::onOrientationChanged(Qt::Orientation orientation) { - QRectF rect = HsScene::mainWindow()->layoutRect(); - HsWidgetPositioningOnOrientationChange *converter = HsWidgetPositioningOnOrientationChange::instance(); - qreal chrome = 64; - QRectF from(0, chrome, rect.height(), rect.width() - chrome); - QRectF to(0, chrome, rect.width(), rect.height() - chrome); + Qt::Orientation orientationFrom = orientation == Qt::Vertical ? Qt::Horizontal : Qt::Vertical; + QRectF from = contentGeometry(orientationFrom); + QRectF to = contentGeometry(orientation); HsWidgetPresentationData presentation; presentation.orientation = orientation; @@ -525,18 +604,33 @@ widget->setGeometry(geometries.first()); widget->savePresentation(); } else { - widget->setPos(presentation.pos()); + QRectF adjustWidgetPosition; + adjustWidgetPosition = widget->geometry(); + adjustWidgetPosition.moveTopLeft(presentation.pos()); + widget->setPos(adjustedWidgetPosition(adjustWidgetPosition)); widget->setZValue(presentation.zValue); + widget->savePresentation(); //Needed to follow pageMargin dynamic change } } } -/*! - Clears new widgets list and resets layout. -*/ -void HsPage::resetNewWidgets() +void HsPage::onPageMarginChanged(const QString &value) { - mNewWidgets.clear(); - setLayout(0); + if (value == "pageMargin") { + mPageMargin = HSCONFIGURATION_GET(pageMargin); + + if (!mWidgets.isEmpty()) { + foreach (HsWidgetHost *widget, mWidgets) { + widget->setPos(adjustedWidgetPosition(widget->geometry())); + widget->savePresentation(); + } + } + + if (!mNewWidgets.isEmpty()) { + foreach (HsWidgetHost *widget, mNewWidgets) { + widget->setPos(adjustedWidgetPosition(widget->geometry())); + widget->savePresentation(); + } + } + } } - diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsdomainmodel/src/hspagenewwidgetlayout.cpp --- a/homescreenapp/hsdomainmodel/src/hspagenewwidgetlayout.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/hsdomainmodel/src/hspagenewwidgetlayout.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -20,6 +20,7 @@ #include "hsdomainmodeldatastructures.h" #include "hspagenewwidgetlayout.h" #include "hsscene.h" +#include "hspage.h" #include "hsdatabase.h" #include "hswidgethost.h" #include "hswallpaper.h" @@ -113,13 +114,10 @@ -> set widget center point to this touch point */ if (mTouchPoint != QPointF() && mNewWidgets.count() == 1) { - QRectF pageRect = HsScene::mainWindow()->layoutRect(); - qreal widgetX = qBound(qreal(0), mTouchPoint.x() - rects.at(0).width() / 2, pageRect.width() - rects.at(0).width()); - qreal widgetY = qBound(qreal(64), mTouchPoint.y() - rects.at(0).height() / 2, pageRect.height() - rects.at(0).height()); - mNewWidgets.at(0)->setGeometry(widgetX, - widgetY, - rects.at(0).width(), - rects.at(0).height()); + QRectF widgetRect = rects.at(0); + widgetRect.moveCenter(mTouchPoint); + widgetRect.moveTopLeft(HsScene::instance()->activePage()->adjustedWidgetPosition(widgetRect)); + mNewWidgets.at(0)->setGeometry(widgetRect); /* we have to save widget presentation data here after drawing to get correct position for later use */ @@ -129,8 +127,7 @@ else { HsWidgetPositioningOnWidgetAdd *algorithm = HsWidgetPositioningOnWidgetAdd::instance(); - QRectF pageRect = HsScene::mainWindow()->layoutRect(); - pageRect.adjust( (qreal)0,(qreal)64,(qreal)0,(qreal)0); + QRectF pageRect = HsScene::instance()->activePage()->contentGeometry(); QList calculatedRects = algorithm->convert(pageRect, rects, QPointF()); diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsdomainmodel/src/hsscene.cpp --- a/homescreenapp/hsdomainmodel/src/hsscene.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/hsdomainmodel/src/hsscene.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -164,29 +164,41 @@ return true; } - int index = mPages.indexOf(page) + 1; + int nextIndex = mPages.indexOf(page) + 1; HsDatabase *db = HsDatabase::instance(); db->transaction(); - + // update page indexes HsPageData data; - for (int i = index; i < mPages.count(); ++i) { - data.id = mPages.at(i)->databaseId(); - data.indexPosition = i - 1; + int pageCount(mPages.count()); + for (;nextIndex < pageCount; ++nextIndex) { + data.id = mPages.at(nextIndex)->databaseId(); + data.indexPosition = nextIndex - 1; if (!db->updatePage(data)) { db->rollback(); return false; } } - + // page will remove itself from database if (!page->deleteFromDatabase()) { db->rollback(); return false; } db->commit(); - + // update internal list + int index = mPages.indexOf(page); + bool lastPage(mPages.last() == page); mPages.removeOne(page); + if (mPages.isEmpty()) { + mActivePage = NULL; + }else if (mActivePage == page) { + if (lastPage) { + index--; + } + setActivePageIndex(index); + } + return true; } diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsutils/inc/hsmenudialogfactory.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsutils/inc/hsmenudialogfactory.h Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,44 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Menu Dialog +* +*/ + + +#ifndef HSMENUDIALOG_H +#define HSMENUDIALOG_H + +#include + +class QStringList; +class HbAction; +class HbMessageBox; + +#include "hsutils_global.h" + +class HSUTILS_EXPORT HsMenuDialogFactory +{ +public: + enum Options { OkCancel, Close }; + + virtual HbMessageBox *create(const QString &text, + Options options = OkCancel) const; + virtual ~HsMenuDialogFactory(); +private: + void setUpActions(HbMessageBox *box, + const QStringList &translationIdentifiers) const; +}; + +#endif + diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsutils/inc/hsmenuevent.h --- a/homescreenapp/hsutils/inc/hsmenuevent.h Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/hsutils/inc/hsmenuevent.h Fri Jul 09 14:36:01 2010 +0300 @@ -46,10 +46,12 @@ OpenInstalledView, OpenHomeScreen, ArrangeCollection, + ArrangeAllCollections, CreateCollection, PreviewHSWidget, ShowAppSettings, ShowAppDetails, + ShowInstallationLog, Unknown }; diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsutils/inc/hsmenueventfactory.h --- a/homescreenapp/hsutils/inc/hsmenueventfactory.h Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/hsutils/inc/hsmenueventfactory.h Fri Jul 09 14:36:01 2010 +0300 @@ -63,19 +63,20 @@ static QEvent *createAddAppsFromApplicationsViewEvent( HsSortAttribute aApplicationsSortOder, - HsSortAttribute aCollectionsSortOder, int aItemId = 0); - static QEvent *createAddAppsFromCallectionViewEvent( + static QEvent *createAddAppsFromCollectionViewEvent( int aCollectionId, - int aApplicationId = 0, - HsSortAttribute aCollectionsSortOder = NoHsSortAttribute); + int aApplicationId = 0); static QEvent *createRemoveAppFromCollectionEvent(int aItemId, int aCollectionId); static QEvent *createUninstallApplicationEvent(int aItemId); - static QEvent *createArrangeCollectionEvent(int aTopItemId); + static QEvent *createArrangeCollectionEvent(int aTopItemId, + int aCollectionId); + + static QEvent *createArrangeAllCollectionsEvent(int aTopItemId); static QEvent *createPreviewHSWidgetEvent( int entryId, @@ -87,6 +88,8 @@ static QEvent *createAppSettingsViewEvent(int entryId); static QEvent *createAppDetailsViewEvent(int entryId); + + static QEvent *createInstallationLogEvent(); static QEvent *createUnknownEvent(); diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsutils/inc/hsmessageboxwrapper.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsutils/inc/hsmessageboxwrapper.h Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,60 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#ifndef HSMESSAGEBOXWRAPPER_H +#define HSMESSAGEBOXWRAPPER_H + +#include + +#include "hsutils_global.h" + +#include "hstest_global.h" +HOMESCREEN_TEST_CLASS(t_hsUtils) + +class HbAction; +struct HsMessageBoxWrapperImpl; + +class HSUTILS_EXPORT HsMessageBoxWrapper : public QObject +{ + Q_OBJECT + +public: + HsMessageBoxWrapper(QObject *parent=0); + ~HsMessageBoxWrapper(); + + void setHeader(const QString &header); + void setQueryText(const QString &queryText); + +signals: + void accepted(); + void rejected(); +public slots: + void show(); + +private: + Q_DISABLE_COPY(HsMessageBoxWrapper) + +private slots: + void onDialogClosed(int action); + +private: + HsMessageBoxWrapperImpl *mImpl; + + HOMESCREEN_TEST_FRIEND_CLASS(t_hsUtils) +}; + +#endif // HSPAGEINDICATOR_H diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsutils/inc/hspropertyanimationwrapper.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsutils/inc/hspropertyanimationwrapper.h Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,57 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#ifndef HSPROPERTYANIMATIONWRAPPER_H +#define HSPROPERTYANIMATIONWRAPPER_H + +#include +#include "hsutils_global.h" + +#include "hstest_global.h" +HOMESCREEN_TEST_CLASS(t_hsUtils) + +struct HsPropertyAnimationWrapperImpl; +class HSUTILS_EXPORT HsPropertyAnimationWrapper : public QObject +{ + Q_OBJECT + +public: + HsPropertyAnimationWrapper(QObject *parent=0); + ~HsPropertyAnimationWrapper(); + + void setTargetObject(QObject *target); + void setPropertyName(const QByteArray &propertyName); + bool isRunning(); + void setEndValue(const QVariant &value); + void setDuration(int msecs); +signals: + void finished(); + +public slots: + void start(); + void stop(); + +private: + Q_DISABLE_COPY(HsPropertyAnimationWrapper) + + +private: + QScopedPointer mImpl; + HOMESCREEN_TEST_FRIEND_CLASS(t_hsUtils) +}; + +#endif // HSPAGEINDICATOR_H diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsutils/inc/hswidgetpositioningonwidgetmove.h --- a/homescreenapp/hsutils/inc/hswidgetpositioningonwidgetmove.h Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/hsutils/inc/hswidgetpositioningonwidgetmove.h Fri Jul 09 14:36:01 2010 +0300 @@ -156,7 +156,6 @@ bool mSnapEnabled; qreal mSnapForce; qreal mSnapGap; - qreal mSnapBorderGap; bool mRectVerticalEdgeLiesInLineWithVerticalLine; bool mRectLieAboveVerticalLine; diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsutils/src/hsmenudialogfactory.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsutils/src/hsmenudialogfactory.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,110 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Menu Dialog +* +*/ + +#include +#include +#include +#include + +#include +#include +#include "hsmenudialogfactory.h" + +/*! + \class HsMenuDialogFactory + \ingroup group_hsutils + + \brief Creates dialog instances for Application Library. + + \sa HsMenuEvent +*/ + +/*! \enum HsMenuDialogFactory::Options + Describes what actions the dialog will have. + */ + +/*! \var HsMenuDialogFactory::Options HsMenuDialogFactory::OkCancel + Requested dialog should have two actions in the following order: Ok (confirm) and Cancel (reject). + */ +/*! \var HsMenuDialogFactory::Options HsMenuDialogFactory::Close + Requested dialog should have one action: Close. + */ +/*! + Creates dialog. + \param text to be displayed in the dialog. + \param options specify dialog actions. + \return requested dialog. +*/ +HbMessageBox *HsMenuDialogFactory::create(const QString &text, + Options options) const +{ + + QStringList actionIdentifiers; // head of the list will be first action in dialog + HbMessageBox::MessageBoxType type(HbMessageBox::MessageTypeNone); + + switch (options) { + + case OkCancel: + + actionIdentifiers << hbTrId("txt_common_button_ok"); + actionIdentifiers << hbTrId("txt_common_button_cancel"); + type = HbMessageBox::MessageTypeQuestion; + break; + + case Close: + + actionIdentifiers << hbTrId("txt_common_button_close"); + type = HbMessageBox::MessageTypeInformation; + break; + + default: + break; + } + + QScopedPointer box(new HbMessageBox(type)); + + setUpActions(box.data(), actionIdentifiers); + + box->setText(text); + box->setAttribute(Qt::WA_DeleteOnClose); + + return box.take(); +} + + +/*! + Destructor. +*/ +HsMenuDialogFactory::~HsMenuDialogFactory() {} + +/*! + Sets up dialog actions + \param box dialog to operate on. + \param actionIdentifiers list of translation identifiers for actions. Order of + actions in the dialog will reflect the identifiers order in the list. +*/ +void HsMenuDialogFactory::setUpActions(HbMessageBox *box, + const QStringList &translationIdentifiers) const +{ + box->clearActions(); + + foreach (QString identifier, translationIdentifiers) { + QScopedPointer action(new HbAction(identifier)); + action->setParent(box); + box->addAction(action.take()); + } +} diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsutils/src/hsmenuevent.cpp --- a/homescreenapp/hsutils/src/hsmenuevent.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/hsutils/src/hsmenuevent.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -57,7 +57,7 @@ Opening application library from shortcut. */ /*! \var HsMenuEvent::OperationType HsMenuEvent::ArrangeCollection - Swith to arrange mode. + Switch to arrange mode. */ /*! \var HsMenuEvent::OperationType HsMenuEvent::Unknown Unknown menu event. diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsutils/src/hsmenueventfactory.cpp --- a/homescreenapp/hsutils/src/hsmenueventfactory.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/hsutils/src/hsmenueventfactory.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -177,18 +177,15 @@ Creates an HsMenuEvent::AddAppsToCollection event. \param aApplicationsSortOder applications sort order. - \param aCollectionsSortOder collections sort order. \param aItemId item id. \return Add applications to collection event. */ QEvent *HsMenuEventFactory::createAddAppsFromApplicationsViewEvent( HsSortAttribute aApplicationsSortOder, - HsSortAttribute aCollectionsSortOder, int aItemId) { QVariantMap params; params.insert(appSortOrderKey(), aApplicationsSortOder); - params.insert(collectionSortOrderKey(), aCollectionsSortOder); params.insert(itemIdKey(), aItemId); return new HsMenuEvent(HsMenuEvent::AddAppsToCollection, params); } @@ -198,18 +195,15 @@ \param aCollectionId collection id. \param aApplicationId application id. - \param aCollectionsSortOder collections sort order. \return Add applications to collection event. */ -QEvent *HsMenuEventFactory::createAddAppsFromCallectionViewEvent( +QEvent *HsMenuEventFactory::createAddAppsFromCollectionViewEvent( int aCollectionId, - int aApplicationId, - HsSortAttribute aCollectionsSortOder) + int aApplicationId) { QVariantMap params; params.insert(itemIdKey(), aApplicationId); params.insert(collectionIdKey(), aCollectionId); - params.insert(collectionSortOrderKey(), aCollectionsSortOder); return new HsMenuEvent(HsMenuEvent::AddAppsToCollection, params); } @@ -247,16 +241,33 @@ Creates an HsMenuEvent::ArrangeCollection event. \param aTopItemId Item id to be scrolled. - \return ArrangeCollection event. + \param aCollectionId Collection id. + \retval ArrangeCollection event. */ -QEvent *HsMenuEventFactory::createArrangeCollectionEvent(int aTopItemId) +QEvent *HsMenuEventFactory::createArrangeCollectionEvent( + int aTopItemId, + int aCollectionId) { QVariantMap params; params.insert(itemIdKey(), aTopItemId); + params.insert(collectionIdKey(), aCollectionId); return new HsMenuEvent(HsMenuEvent::ArrangeCollection, params); } /*! + Creates an HsMenuEvent::ArrangeAllCollections event. + + \param aTopItemId Item id to be scrolled. + \retval ArrangeAllCollections event. + */ +QEvent *HsMenuEventFactory::createArrangeAllCollectionsEvent(int aTopItemId) +{ + QVariantMap params; + params.insert(itemIdKey(), aTopItemId); + return new HsMenuEvent(HsMenuEvent::ArrangeAllCollections, params); +} + +/*! Prepares event triggered on tap on Widget. \param entryId Id of an item. \param entryTypeName Name of the entry type (e.g. application, widget). @@ -315,6 +326,16 @@ } /*! + Creates an HsMenuEvent::ShowInstallationLog event. + + \return Event for installation log. +*/ +QEvent *HsMenuEventFactory::createInstallationLogEvent() +{ + return new HsMenuEvent(HsMenuEvent::ShowInstallationLog); +} + +/*! Creates an HsMenuEvent::Unknown event. \return Unknown event. diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsutils/src/hsmessageboxwrapper.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsutils/src/hsmessageboxwrapper.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,95 @@ +/* +* 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 +#include +#include "hsmessageboxwrapper.h" + +/*! + \class HsMessageBoxWrapper + \ingroup group_hsutils + \brief +*/ + + +struct HsMessageBoxWrapperImpl{ + QString mHeader; + QString mQueryText; + +}; +/*! + +*/ +HsMessageBoxWrapper::HsMessageBoxWrapper(QObject *parent) + : QObject(parent),mImpl(new HsMessageBoxWrapperImpl) +{ +} + +/*! + +*/ +HsMessageBoxWrapper::~HsMessageBoxWrapper() +{ + delete mImpl; +} + +/*! + +*/ +void HsMessageBoxWrapper::setHeader(const QString &header) +{ + mImpl->mHeader = header; +} +/*! + +*/ +void HsMessageBoxWrapper::setQueryText(const QString &queryText) +{ + mImpl->mQueryText = queryText; +} +/*! + +*/ +#ifdef COVERAGE_MEASUREMENT +#pragma CTC SKIP +#endif + +void HsMessageBoxWrapper::show() +{ + HbMessageBox *box = new HbMessageBox(HbMessageBox::MessageTypeQuestion); + box->setAttribute(Qt::WA_DeleteOnClose); + box->setHeadingWidget(new HbLabel(mImpl->mHeader)); + box->setText(mImpl->mQueryText); + box->setStandardButtons(HbMessageBox::Yes | HbMessageBox::No); + + box->open(this,SLOT(onDialogClosed(int))); +} +/*! + +*/ +void HsMessageBoxWrapper::onDialogClosed(int action) +{ + if (action == HbMessageBox::Yes){ + emit accepted(); + } else { + emit rejected(); + } +} +#ifdef COVERAGE_MEASUREMENT +#pragma CTC ENDSKIP +#endif //COVERAGE_MEASUREMENT diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsutils/src/hspageindicator.cpp --- a/homescreenapp/hsutils/src/hspageindicator.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/hsutils/src/hspageindicator.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -79,7 +79,7 @@ */ void HsPageIndicator::setActiveItemIndex(int activeItemIndex) { - if (activeItemIndex < 0 || itemCount() <= activeItemIndex) { + if (activeItemIndex < 0 || itemCount()-1 < activeItemIndex) { return; } @@ -116,13 +116,18 @@ */ void HsPageIndicator::removeItem(int activeItemIndex) { - if (activeItemIndex < 0 || itemCount() - 1 <= activeItemIndex) { + if (activeItemIndex < 0 || itemCount() <= activeItemIndex) { return; } + if (activeItemIndex == itemCount()-1) { + activeItemIndex--; + } + delete mItems.last(); mItems.removeLast(); layoutItems(); + setActiveItemIndex(activeItemIndex); } diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsutils/src/hspageindicatoritem.cpp --- a/homescreenapp/hsutils/src/hspageindicatoritem.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/hsutils/src/hspageindicatoritem.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -111,9 +111,12 @@ setTransformOriginPoint(rect().center()); QPropertyAnimation *animation = new QPropertyAnimation(graphicsEffect(), "strength"); + animation->setDuration(800); animation->setKeyValueAt(0.2, 1); animation->setEndValue(0); + + connect(this,SIGNAL(destroyed()),animation,SLOT(stop())); connect(animation, SIGNAL(finished()), SLOT(animationFinished())); animation->start(QAbstractAnimation::DeleteWhenStopped); } diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsutils/src/hspropertyanimationwrapper.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsutils/src/hspropertyanimationwrapper.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,91 @@ +/* +* 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 "hspropertyanimationwrapper.h" + +/*! + \class HsMessageBoxWrapper + \ingroup group_hsutils + \brief +*/ + +struct HsPropertyAnimationWrapperImpl +{ +public: + QPropertyAnimation *mPropertyAnimation; +}; + +/*! + +*/ +HsPropertyAnimationWrapper::HsPropertyAnimationWrapper(QObject *parent) + : QObject(parent),mImpl(new HsPropertyAnimationWrapperImpl) +{ + mImpl->mPropertyAnimation = new QPropertyAnimation(parent); + connect(mImpl->mPropertyAnimation,SIGNAL(finished()),SIGNAL(finished())); +} + +/*! + +*/ +HsPropertyAnimationWrapper::~HsPropertyAnimationWrapper() +{ + +} + +/*! + +*/ +void HsPropertyAnimationWrapper::setTargetObject(QObject *target) +{ + mImpl->mPropertyAnimation->setTargetObject(target); +} +/*! + +*/ +void HsPropertyAnimationWrapper::setPropertyName(const QByteArray &propertyName) +{ + mImpl->mPropertyAnimation->setPropertyName(propertyName); +} + +bool HsPropertyAnimationWrapper::isRunning() +{ + return (mImpl->mPropertyAnimation->state() == QAbstractAnimation::Running); +} +void HsPropertyAnimationWrapper::setEndValue(const QVariant &value) +{ + mImpl->mPropertyAnimation->setEndValue(value); +} +void HsPropertyAnimationWrapper::setDuration(int msecs) +{ + mImpl->mPropertyAnimation->setDuration(msecs); +} +/*! + +*/ +void HsPropertyAnimationWrapper::start() +{ + mImpl->mPropertyAnimation->start(); +} +/*! + +*/ +void HsPropertyAnimationWrapper::stop() +{ + mImpl->mPropertyAnimation->stop(); +} diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/hsutils/src/hswidgetpositioningonwidgetmove.cpp --- a/homescreenapp/hsutils/src/hswidgetpositioningonwidgetmove.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/hsutils/src/hswidgetpositioningonwidgetmove.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -63,7 +63,7 @@ mRectLieLeft(false), mTopInRange(false), mBottomInRange(false), mMinHorizontalEdgesDistance(0.0), mHorizontalDistance(0.0), mHorizontalDistanceFromSelectedRect(0.0), mContainerHorizontalEdgeDistance(0.0), - mSnapEnabled(false), mSnapForce(0.0), mSnapGap(0.0), mSnapBorderGap(0.0), + mSnapEnabled(false), mSnapForce(0.0), mSnapGap(0.0), mRectVerticalEdgeLiesInLineWithVerticalLine(false), mRectLieAboveVerticalLine(false), mRectLieBelowVerticalLine(false), mRectHorizontalEdgeLiesInLineWithHorizontalLine(false), mRectLieLeftOfHorizontalLine(false), mRectLiesRightOfHorizontalLine(false) { @@ -80,7 +80,6 @@ //The following values should be in qreal, so the status received in canConvert is ignored mSnapForce = configuration[SNAPFORCE].toDouble(&canConvert); mSnapGap = configuration[SNAPGAP].toDouble(&canConvert); - mSnapBorderGap = configuration[SNAPBORDERGAP].toDouble(&canConvert); } /*! @@ -91,11 +90,7 @@ const QList &inactiveRects, const QRectF &activeRect) { - mContainerRect.setLeft(containerRect.left() + mSnapBorderGap); - mContainerRect.setTop(containerRect.top() + mSnapBorderGap); - mContainerRect.setRight(containerRect.right() - mSnapBorderGap); - mContainerRect.setBottom(containerRect.bottom() - mSnapBorderGap); - + mContainerRect = containerRect; mActiveRectWidth = activeRect.width(); mActiveRectHeight = activeRect.height(); diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/inc/hsapp_defs.h --- a/homescreenapp/inc/hsapp_defs.h Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/inc/hsapp_defs.h Fri Jul 09 14:36:01 2010 +0300 @@ -47,7 +47,7 @@ inline const QString groupNameAttributeName(); inline const QString componentIdAttributeName(); inline const QString entryShortName(); -inline const QString appLibActivity(); + // Sort attribute enum HsSortAttribute { NoHsSortAttribute, diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/inc/hsapp_defs.inl --- a/homescreenapp/inc/hsapp_defs.inl Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/inc/hsapp_defs.inl Fri Jul 09 14:36:01 2010 +0300 @@ -308,15 +308,6 @@ } /*! - \return app lib activity name -*/ -inline const QString appLibActivity() -{ - static const QString key("AppLibMainView"); - return key; -} - -/*! \return homescreen activitity name to open idle iew */ inline const QString activityHsIdleView() diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/rom/homescreenapp_core.iby --- a/homescreenapp/rom/homescreenapp_core.iby Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/rom/homescreenapp_core.iby Fri Jul 09 14:36:01 2010 +0300 @@ -20,6 +20,7 @@ // ---- hsapplication -------------------------------------------- +file=ABI_DIR\BUILD_DIR\hsapplicationlauncher.exe PROGRAMS_DIR\hsapplicationlauncher.exe file=ABI_DIR\BUILD_DIR\hsapplication.exe PROGRAMS_DIR\hsapplication.exe data=ZPRIVATE\10003a3f\import\apps\hsapplication_reg.rsc private\10003a3f\import\apps\hsapplication_reg.rsc data=\epoc32\data\z\resource\apps\hsapplication.mif resource\apps\hsapplication.mif @@ -34,6 +35,9 @@ data=ZPRIVATE\20022f35\wallpapers\page\2_landscape.png private\20022f35\wallpapers\page\2_landscape.png data=ZPRIVATE\20022f35\wallpapers\page\3_portrait.png private\20022f35\wallpapers\page\3_portrait.png data=ZPRIVATE\20022f35\wallpapers\page\3_landscape.png private\20022f35\wallpapers\page\3_landscape.png +data=ZPRIVATE\20022f35\wallpapers\originals\car.png private\20022f35\wallpapers\originals\car.png +data=ZPRIVATE\20022f35\wallpapers\originals\shapes.png private\20022f35\wallpapers\originals\shapes.png +data=ZPRIVATE\20022f35\wallpapers\originals\shoes.png private\20022f35\wallpapers\originals\shoes.png // ---- hswidgetuninstaller -------------------------------------------- file=ABI_DIR\BUILD_DIR\hswidgetuninstaller.exe PROGRAMS_DIR\hswidgetuninstaller.exe @@ -53,12 +57,10 @@ data=\epoc32\data\z\resource\qt\plugins\hshomescreenclientplugin.qtplugin resource\qt\plugins\hshomescreenclientplugin.qtplugin data=ZPRIVATE\20022f35\hshomescreenclientplugin.xml private\20022f35\hshomescreenclientplugin.xml -// ---- runtimeplugins -------------------------------------------- + -// -------- hsdefaultruntimeplugin -file=ABI_DIR\BUILD_DIR\hsdefaultruntimeplugin.dll SHARED_LIB_DIR\hsdefaultruntimeplugin.dll -data=ZPRIVATE\20022f35\plugins\runtimeplugins\hsdefaultruntimeplugin.qtplugin private\20022f35\plugins\runtimeplugins\hsdefaultruntimeplugin.qtplugin -data=ZPRIVATE\20022f35\plugins\runtimeplugins\hsdefaultruntimeplugin.xml private\20022f35\plugins\runtimeplugins\hsdefaultruntimeplugin.xml + + // ---- serviceproviders -------------------------------------------- diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/runtimeplugins/hsdefaultruntimeplugin/hsdefaultruntimeplugin.pri --- a/homescreenapp/runtimeplugins/hsdefaultruntimeplugin/hsdefaultruntimeplugin.pri Fri Jun 25 19:19:22 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -# -# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -# All rights reserved. -# This component and the accompanying materials are made available -# under the terms of "Eclipse Public License v1.0" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# - -HEADERS += ./inc/hsdefaultruntime.h \ - ./inc/hsdefaultruntimeplugin.h -SOURCES += ./src/hsdefaultruntime.cpp \ - ./src/hsdefaultruntimeplugin.cpp diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/runtimeplugins/hsdefaultruntimeplugin/hsdefaultruntimeplugin.pro --- a/homescreenapp/runtimeplugins/hsdefaultruntimeplugin/hsdefaultruntimeplugin.pro Fri Jun 25 19:19:22 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ -# -# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -# All rights reserved. -# This component and the accompanying materials are made available -# under the terms of "Eclipse Public License v1.0" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# - -TEMPLATE = lib -CONFIG += plugin hb mobility -MOBILITY = serviceframework publishsubscribe - -PLUGIN_SUBDIR = /private/20022F35/plugins/runtimeplugins - -include (../../common.pri) - -LIBS += -lhsdomainmodel \ - -lhsutils - -QT += xml sql - -DEPENDPATH += ./inc \ - ./src -INCLUDEPATH += ./inc \ - ../../hsutils/inc \ - ../../hsdomainmodel/inc \ - -symbian: { - TARGET.UID3 = 0x20022F3E - LIBS += -lxqkeycapture -} - - -include(hsdefaultruntimeplugin.pri) diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/runtimeplugins/hsdefaultruntimeplugin/inc/hsdefaultruntime.h --- a/homescreenapp/runtimeplugins/hsdefaultruntimeplugin/inc/hsdefaultruntime.h Fri Jun 25 19:19:22 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,90 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Default implementation of the home screen runtime. -* -*/ - -#ifndef HSDEFAULTRUNTIME_H -#define HSDEFAULTRUNTIME_H - -#include -#include - -#ifdef Q_OS_SYMBIAN -#include -#endif - -#ifndef HSDEFAULTRUNTIMEPLUGIN_UNITTEST - #define TEST_CLASS_FWD - #define TEST_FRIEND -#else - #define TEST_CLASS_FWD class DefaultRuntimePluginTest; - #define TEST_FRIEND friend class DefaultRuntimePluginTest; -#endif - -class HsContentService; -QTM_BEGIN_NAMESPACE -class QValueSpacePublisher; -QTM_END_NAMESPACE - -QTM_USE_NAMESPACE - -TEST_CLASS_FWD - -class HsDefaultRuntime : public QStateMachine -{ - Q_OBJECT - -public: - HsDefaultRuntime(QObject *parent = 0); - ~HsDefaultRuntime(); - -signals: - void event_exit(); - void event_toIdle(); -protected: - bool eventFilter(QObject *watched, QEvent *event); - -private: - Q_DISABLE_COPY(HsDefaultRuntime) - - void registerAnimations(); - void createStatePublisher(); - void createContentServiceParts(); - void createStates(); - void assignServices(); - void updatePSKeys(); - -private slots: - void onIdleStateEntered(); - void onIdleStateExited(); - void activityRequested(const QString &name); - - -private: - HsContentService *mContentService; - - bool mHomeScreenActive; - bool mIdleStateActive; - - QValueSpacePublisher *mPublisher; - -#ifdef Q_OS_SYMBIAN - XqKeyCapture keyCapture; -#endif - - TEST_FRIEND -}; - -#endif diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/runtimeplugins/hsdefaultruntimeplugin/inc/hsdefaultruntimeplugin.h --- a/homescreenapp/runtimeplugins/hsdefaultruntimeplugin/inc/hsdefaultruntimeplugin.h Fri Jun 25 19:19:22 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Default runtime provider. -* -*/ - -#ifndef HSDEFAULTRUNTIMEPLUGIN_H -#define HSDEFAULTRUNTIMEPLUGIN_H - -#include -#include - -QTM_USE_NAMESPACE - -class HsDefaultRuntimePlugin : public QObject, public QServicePluginInterface -{ - Q_OBJECT - Q_INTERFACES(QtMobility::QServicePluginInterface) - -public: - QObject *createInstance(const QServiceInterfaceDescriptor &descriptor, - QServiceContext *context, - QAbstractSecuritySession *session); -}; - -#endif //HSDEFAULTRUNTIMEPLUGIN_H diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/runtimeplugins/hsdefaultruntimeplugin/resource/hsdefaultruntimeplugin.xml --- a/homescreenapp/runtimeplugins/hsdefaultruntimeplugin/resource/hsdefaultruntimeplugin.xml Fri Jun 25 19:19:22 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ - - - hsdefaultruntimeplugin - hsdefaultruntimeplugin - Homescreen Runtime Plugin - - com.nokia.symbian.IHomeScreenRuntime - 1.0 - Default implementation for homescreen runtime - - - diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/runtimeplugins/hsdefaultruntimeplugin/src/hsdefaultruntime.cpp --- a/homescreenapp/runtimeplugins/hsdefaultruntimeplugin/src/hsdefaultruntime.cpp Fri Jun 25 19:19:22 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,447 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Default implementation of the home screen runtime. -* -*/ - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include "hsmenueventfactory.h" -#include "homescreendomainpskeys.h" -#include "hsdefaultruntime.h" -#include "hsdatabase.h" -#include "hscontentservice.h" -#include "hsshortcutservice.h" -#include "hsmenueventtransition.h" -#include "hswidgetpositioningonorientationchange.h" -#include "hswidgetpositioningonwidgetadd.h" -#include "hsconfiguration.h" -#include "hstest_global.h" -#include "hswidgetpositioningonwidgetmove.h" - -QTM_USE_NAMESPACE -#define hbApp qobject_cast(qApp) - -#ifdef Q_OS_SYMBIAN -const static Qt::Key applicationKey = Qt::Key_Menu; -#else -const static Qt::Key applicationKey = Qt::Key_Home; -#endif - -namespace -{ - const char KHsRootStateInterface[] = "com.nokia.homescreen.state.HsRootState"; - const char KHsLoadSceneStateInterface[] = "com.nokia.homescreen.state.HsLoadSceneState"; - const char KHsIdleStateInterface[] = "com.nokia.homescreen.state.HsIdleState"; - const char KHsAppLibraryStateInterface[] = "com.nokia.homescreen.state.HsAppLibraryState"; - const char KHsMenuWorkerStateInterface[] = "com.nokia.homescreen.state.HsMenuWorkerState"; - const char KHsBacupRestoreStateInterface[] = "com.nokia.homescreen.state.HsBackupRestoreState"; -} - - -/*! - \class HsDefaultRuntime - \ingroup group_hsdefaultruntimeplugin - \brief Default implementation of the home screen runtime. - Creates an execution context (EC) and populates it with - runtime services. States are loaded from state plugins. - Each state is given an access to the EC. States - are added to a state machine. Finally, the state machine - is started. -*/ - -/*! - Constructs runtime with \a parent as the parent object. -*/ -HsDefaultRuntime::HsDefaultRuntime(QObject *parent) - : QStateMachine(parent), - mContentService(0), - mHomeScreenActive(false), - mIdleStateActive(false), - mPublisher(NULL) -#ifdef Q_OS_SYMBIAN - ,keyCapture() -#endif -{ - HSTEST_FUNC_ENTRY("HS::HsDefaultRuntime::HsDefaultRuntime"); - - HsDatabase *db = new HsDatabase; - db->setConnectionName("homescreen.dbc"); -#ifdef Q_OS_SYMBIAN - db->setDatabaseName("c:/private/20022f35/homescreen.db"); -#else - db->setDatabaseName("private/20022f35/homescreen.db"); -#endif - db->open(); - HsDatabase::setInstance(db); - - HsConfiguration::setInstance(new HsConfiguration); - HsConfiguration::instance()->load(); - - HsWidgetPositioningOnOrientationChange::setInstance( - new HsAdvancedWidgetPositioningOnOrientationChange); - - HsWidgetPositioningOnWidgetAdd::setInstance( - new HsAnchorPointInBottomRight); - - HsWidgetPositioningOnWidgetMove::setInstance( - new HsSnapToLines); - - registerAnimations(); - - createStatePublisher(); - createContentServiceParts(); - createStates(); - assignServices(); - - // create the instance so that singleton is accessible from elsewhere - HsShortcutService::instance(this); - - QCoreApplication::instance()->installEventFilter(this); - - if (hbApp) { // Qt test framework uses QApplication. - connect(hbApp->activityManager(), SIGNAL(activityRequested(QString)), - this, SLOT(activityRequested(QString))); - } - HSTEST_FUNC_EXIT("HS::HsDefaultRuntime::HsDefaultRuntime"); -} - -/*! - Destructor. -*/ -HsDefaultRuntime::~HsDefaultRuntime() -{ - HsWidgetPositioningOnOrientationChange::setInstance(0); - delete mPublisher; -} - -/*! - \fn void HsDefaultRuntime::stopStateMachine() - Emission of this signal initiates a transition to the final state. -*/ - -/*! - \copydoc QObject::eventFilter(QObject *watched, QEvent *event) -*/ -bool HsDefaultRuntime::eventFilter(QObject *watched, QEvent *event) -{ - Q_UNUSED(watched); - - switch (event->type()) { - case QEvent::ApplicationActivate: - qDebug() << "HsDefaultRuntime::eventFilter: QEvent::ApplicationActivate"; -#ifdef Q_OS_SYMBIAN - keyCapture.captureKey(applicationKey); -#endif - mHomeScreenActive = true; - updatePSKeys(); - break; - case QEvent::ApplicationDeactivate: - qDebug() << "HsDefaultRuntime::eventFilter: QEvent::ApplicationDeactivate"; -#ifdef Q_OS_SYMBIAN - keyCapture.cancelCaptureKey(applicationKey); -#endif - mHomeScreenActive = false; - updatePSKeys(); - break; - default: - break; - } - - bool result = QStateMachine::eventFilter(watched, event); - // temporary hack as we should not register twice for events - if (event->type() == QEvent::KeyPress ) { - QKeyEvent* ke = static_cast(event); - // Key_Launch0 should be removed when QT starts to send Key_Menu - result = (ke->key() == applicationKey) || ke->key() == Qt::Key_Launch0; - } - return result; -} - - -/*! - Registers framework animations. -*/ -void HsDefaultRuntime::registerAnimations() -{ - HbIconAnimationManager *manager = HbIconAnimationManager::global(); - manager->addDefinitionFile(QLatin1String("qtg_anim_loading.axml")); -} - -/*! - Creates Home screen state publisher. -*/ -void HsDefaultRuntime::createStatePublisher() -{ - mPublisher = new QValueSpacePublisher(QValueSpace::PermanentLayer, HsStatePSKeyPath); - - if (!mPublisher->isConnected()){ - // No permanent layer available - mPublisher = new QValueSpacePublisher(HsStatePSKeyPath); - } - - mPublisher->setValue(HsStatePSKeySubPath, EHomeScreenInactive); -} - -/*! - Creates content service parts. -*/ -void HsDefaultRuntime::createContentServiceParts() -{ - HSTEST_FUNC_ENTRY("HS::HsDefaultRuntime::createContentServiceParts"); - - mContentService = new HsContentService(this); - - HSTEST_FUNC_EXIT("HS::HsDefaultRuntime::createContentServiceParts"); -} - -/*! - Creates states. -*/ -void HsDefaultRuntime::createStates() -{ - HSTEST_FUNC_ENTRY("HS::HsDefaultRuntime::createStates"); - - QFinalState *finalState = new QFinalState(); - addState(finalState); - - QState *guiRootState = new QState(); - addState(guiRootState); - - guiRootState->addTransition(this, SIGNAL(event_exit()), finalState); - - QServiceManager manager; - - - QObject *loadSceneStateObj = manager.loadInterface(KHsLoadSceneStateInterface); - QState *loadSceneState = qobject_cast(loadSceneStateObj); - 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(rootState); - idleState->setObjectName(KHsIdleStateInterface); - connect(idleState, SIGNAL(entered()), SLOT(onIdleStateEntered())); - connect(idleState, SIGNAL(exited()), SLOT(onIdleStateExited())); - - - //menu state - QState *menuParallelState = new QState( - QState::ParallelStates, rootState); - QState *menuRootState = new QState(menuParallelState); - - QObject *appLibraryStateObj = manager.loadInterface(KHsAppLibraryStateInterface); - QState *appLibraryState = qobject_cast(appLibraryStateObj); - appLibraryState->setParent(menuRootState); - appLibraryState->setObjectName(KHsAppLibraryStateInterface); - menuRootState->setInitialState(appLibraryState); - - QHistoryState *historyState = new QHistoryState(rootState); - historyState->setDefaultState(idleState); - - loadSceneState->addTransition( - loadSceneState, SIGNAL(event_history()), historyState); - - QObject *menuWorkerStateObj = manager.loadInterface(KHsMenuWorkerStateInterface); - QState *menuWorkerState = qobject_cast(menuWorkerStateObj); - menuWorkerState->setParent(menuParallelState); - menuWorkerState->setObjectName(KHsMenuWorkerStateInterface); - - connect(appLibraryState, SIGNAL(collectionEntered()), - menuWorkerState, SIGNAL(reset())); - connect(appLibraryState, SIGNAL(allAppsStateEntered ()), - menuWorkerState, SIGNAL(reset())); - connect(appLibraryState, SIGNAL(allCollectionsStateEntered ()), - menuWorkerState, SIGNAL(reset())); - - //Backup/Restore state - QObject *backupRestoreStateObj = manager.loadInterface(KHsBacupRestoreStateInterface); - QState *backupRestoreState = qobject_cast(backupRestoreStateObj); - backupRestoreState->setParent(guiRootState); - backupRestoreState->setObjectName(KHsBacupRestoreStateInterface); - backupRestoreState->addTransition( - backupRestoreState, SIGNAL(event_loadScene()), loadSceneState); - - // root state transitions - idleState->addTransition(idleState, SIGNAL(event_applicationLibrary()), menuRootState); - appLibraryState->addTransition( - appLibraryState, SIGNAL(toHomescreenState()), idleState); - rootState->addTransition(rootState, SIGNAL(event_backupRestore()), backupRestoreState); - // opening shortcut to Application Library - HsMenuEventTransition *idleToAppLibTransition = - new HsMenuEventTransition(HsMenuEvent::OpenApplicationLibrary, - idleState, appLibraryState); - idleState->addTransition(idleToAppLibTransition); - - HsMenuEventTransition *appLibToIdleTransition = - new HsMenuEventTransition( - HsMenuEvent::OpenHomeScreen, appLibraryState, idleState); - appLibraryState->addTransition(appLibToIdleTransition); - - HbMainWindow *window = hbInstance->allMainWindows().first(); - - // key driven transition from idle to menu - QKeyEventTransition *idleToMenuRootTransition = - new QKeyEventTransition( - window, QEvent::KeyPress, applicationKey); - idleToMenuRootTransition->setTargetState(menuRootState); - idleState->addTransition(idleToMenuRootTransition); - // key driven transition from menu to idle - QKeyEventTransition *menuToIdleTransition = - new QKeyEventTransition( - window, QEvent::KeyPress, applicationKey); - menuToIdleTransition->setTargetState(idleState); - menuRootState->addTransition(menuToIdleTransition); - - // transition for Key_Launch0 should be removed - // when OT starts to send Key_Menu (maybe wk14) - QKeyEventTransition *idleToMenuRootTransition2 = - new QKeyEventTransition( - window, QEvent::KeyPress, Qt::Key_Launch0); - idleToMenuRootTransition2->setTargetState(menuRootState); - idleState->addTransition(idleToMenuRootTransition2); - // key driven transition from menu to idle - QKeyEventTransition *menuToIdleTransition2 = - new QKeyEventTransition( - window, QEvent::KeyPress, Qt::Key_Launch0); - menuToIdleTransition2->setTargetState(idleState); - menuRootState->addTransition(menuToIdleTransition2); - // add transition to switch to idle - menuRootState->addTransition( this, SIGNAL(event_toIdle()), idleState); - - // transitions to child states - // opening shortcut to a colleciton - QList collectionStates = - appLibraryState-> - findChildren - ("homescreen.nokia.com/state/applibrarystate/collectionstate"); - qDebug( - "Found %d \"collectionstate\" children for Application Library State", - collectionStates.count()); - if (collectionStates.count()) { - HsMenuEventTransition *idleToCollectionTransition = - new HsMenuEventTransition(HsMenuEvent::OpenCollection, - idleState, collectionStates[0]); - idleState->addTransition(idleToCollectionTransition); - } - - guiRootState->setInitialState(loadSceneState); - setInitialState(guiRootState); - - HSTEST_FUNC_EXIT("HS::HsDefaultRuntime::createStates"); -} - -/*! - Assigns services to states based on value of property HS_SERVICES_REGISTRATION_KEY. -*/ -void HsDefaultRuntime::assignServices() -{ - HSTEST_FUNC_ENTRY("HS::HsDefaultRuntime::assignServices"); - - QList children = findChildren(); - foreach (QState *state, children) { - QList services = state->property(HS_SERVICES_REGISTRATION_KEY).toList(); - foreach (const QVariant &service, services) { - QString name = service.toString(); - qDebug() << "Assign service:" << name << "\n to " << state->objectName(); - if (name == CONTENT_SERVICE_KEY) { - state->setProperty(name.toAscii().data(), qVariantFromValue(mContentService)); - } else if (name == SHORTCUT_SERVICE_KEY) { - state->setProperty(name.toAscii().data(), - qVariantFromValue(HsShortcutService::instance(this))); - } else { - qWarning() << "WARNING: Service " << name << " is unknown"; - } - } - } - - HSTEST_FUNC_EXIT("HS::HsDefaultRuntime::assignServices"); -} - -/*! - Publishes Home screen states via Publish & Subscribe. -*/ -void HsDefaultRuntime::updatePSKeys() -{ - if (!mPublisher){ - createStatePublisher(); - } - - if (mHomeScreenActive && mIdleStateActive){ - qDebug() << "HsDefaultRuntime::updatePSKeys: EHomeScreenIdleState"; - mPublisher->setValue(HsStatePSKeySubPath, EHomeScreenIdleState); - } - else{ - qDebug() << "HsDefaultRuntime::updatePSKeys: EHomeScreenInactive"; - mPublisher->setValue(HsStatePSKeySubPath, EHomeScreenInactive); - } -} - -/*! - Called when state machine is in Idle state. -*/ -void HsDefaultRuntime::onIdleStateEntered() -{ - mIdleStateActive = true; - updatePSKeys(); -} - -/*! - Called when state machine leaves the Idle state. -*/ -void HsDefaultRuntime::onIdleStateExited() -{ - mIdleStateActive = false; - updatePSKeys(); -} - -/*! - Activity requested by another client -*/ -void HsDefaultRuntime::activityRequested(const QString &name) -{ - if (name == appLibActivity()) { - this->postEvent( - HsMenuEventFactory::createOpenAppLibraryEvent(NormalHsMenuMode)); - } - else if (name == groupAppLibRecentView()) { - this->postEvent( - HsMenuEventFactory::createOpenCollectionEvent(0, - collectionDownloadedTypeName())); - } else if (name == activityHsIdleView()) { - emit event_toIdle(); - } -} diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/runtimeplugins/hsdefaultruntimeplugin/src/hsdefaultruntimeplugin.cpp --- a/homescreenapp/runtimeplugins/hsdefaultruntimeplugin/src/hsdefaultruntimeplugin.cpp Fri Jun 25 19:19:22 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Default runtime plugin. -* -*/ - -#include -#include -#include - -#include "hsdefaultruntimeplugin.h" -#include "hsdefaultruntime.h" - -#ifdef COVERAGE_MEASUREMENT -#pragma CTC SKIP -#endif //COVERAGE_MEASUREMENT - -QObject *HsDefaultRuntimePlugin::createInstance(const QServiceInterfaceDescriptor &descriptor, - QServiceContext *context, - QAbstractSecuritySession *session) -{ - Q_UNUSED(context); - Q_UNUSED(session); - - if (descriptor.interfaceName() == QLatin1String("com.nokia.symbian.IHomeScreenRuntime")) { - return new HsDefaultRuntime(this); - } else { - return 0; - } -} - -Q_EXPORT_PLUGIN2(hsdefaultruntimeplugin, HsDefaultRuntimePlugin) - -#ifdef COVERAGE_MEASUREMENT -#pragma CTC ENDSKIP -#endif //COVERAGE_MEASUREMENT diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/runtimeplugins/runtimeplugins.pro --- a/homescreenapp/runtimeplugins/runtimeplugins.pro Fri Jun 25 19:19:22 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -# -# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -# All rights reserved. -# This component and the accompanying materials are made available -# under the terms of "Eclipse Public License v1.0" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# - -TEMPLATE = subdirs -SUBDIRS = hsdefaultruntimeplugin diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/serviceproviders/hsmenuserviceprovider/inc/hsmenuservice.h --- a/homescreenapp/serviceproviders/hsmenuserviceprovider/inc/hsmenuservice.h Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/inc/hsmenuservice.h Fri Jul 09 14:36:01 2010 +0300 @@ -40,8 +40,7 @@ // Function declarations static HsMenuItemModel *getAllApplicationsModel( HsSortAttribute sortAttribute = DescendingNameHsSortAttribute); - static HsMenuItemModel *getAllCollectionsModel( - HsSortAttribute sortAttribute = LatestOnTopHsSortAttribute); + static HsMenuItemModel *getAllCollectionsModel(); static HsMenuItemModel *getInstalledModel( HsSortAttribute sortAttribute = DescendingNameHsSortAttribute); static HsMenuItemModel *getCollectionModel(int collectionId, diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenuitemmodel.cpp --- a/homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenuitemmodel.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenuitemmodel.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -77,9 +77,9 @@ } else if (role == Hb::IndexFeedbackRole){ QVariant display = CaItemModel::data(index, Qt::DisplayRole); if (display.type() == QVariant::String){ - variant = display; + variant = QVariant(display.toString().at(0).toUpper());; } else { - variant = QVariant(display.toList().at(0)); + variant = QVariant(display.toList().at(0).toString().at(0).toUpper()); } } else { variant = CaItemModel::data(index, role); diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenuservice.cpp --- a/homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenuservice.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenuservice.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -63,22 +63,16 @@ /*! Returns all collections model - \param sortAttribute :: SortAttribute - \param details : switch to return details or not \retval HsMenuItemModel: all collections model */ -HsMenuItemModel *HsMenuService::getAllCollectionsModel( - HsSortAttribute sortAttribute) +HsMenuItemModel *HsMenuService::getAllCollectionsModel() { - qDebug() << "HsMenuService::getAllCollectionsModel" << "sortAttribute:" - << sortAttribute; + qDebug() << "HsMenuService::getAllCollectionsModel"; HSMENUTEST_FUNC_ENTRY("HsMenuService::getAllCollectionsModel"); CaQuery query; query.setParentId(allCollectionsId()); query.setFlagsOn(VisibleEntryFlag); query.setFlagsOff(MissingEntryFlag); - query.setSort(HsMenuServiceUtils::sortBy(sortAttribute), - HsMenuServiceUtils::sortOrder(sortAttribute)); HsMenuItemModel *model = new HsMenuCollectionsItemModel(query); HSMENUTEST_FUNC_EXIT("HsMenuService::getAllCollectionsModel"); return model; diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/sis/homescreenapp.pkg --- a/homescreenapp/sis/homescreenapp.pkg Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/sis/homescreenapp.pkg Fri Jul 09 14:36:01 2010 +0300 @@ -59,13 +59,6 @@ "/epoc32/release/armv5/urel/hsdomainmodel.dll" - "c:/sys/bin/hsdomainmodel.dll" -; ---- runtimeplugins -------------------------------------------- - -; -------- hsdefaultruntimeplugin -"/epoc32/release/armv5/urel/hsdefaultruntimeplugin.dll" - "c:/sys/bin/hsdefaultruntimeplugin.dll" -"/epoc32/data/z/hsresources/plugins/runtimeplugins/hsdefaultruntimeplugin.qtplugin" - "c:/hsresources/plugins/runtimeplugins/hsdefaultruntimeplugin.qtplugin" -"/epoc32/data/z/hsresources/plugins/runtimeplugins/hsdefaultruntimeplugin.manifest" - "c:/hsresources/plugins/runtimeplugins/hsdefaultruntimeplugin.manifest" - ; ---- serviceproviders -------------------------------------------- ; -------- hsmenuserviceprovider diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/sis/homescreenapp_ut_hs.pkg --- a/homescreenapp/sis/homescreenapp_ut_hs.pkg Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/sis/homescreenapp_ut_hs.pkg Fri Jul 09 14:36:01 2010 +0300 @@ -33,16 +33,14 @@ "/epoc32/release/armv5/urel/t_hsapplicationexe.exe" - "c:/sys/bin/t_hsapplicationexe.exe" "/epoc32/data/z/private/10003a3f/import/apps/t_hsapplicationexe_reg.rsc" - "c:/private/10003a3f/import/apps/t_hsapplicationexe_reg.rsc" "/epoc32/data/z/resource/apps/t_hsapplicationexe.rsc" - "c:/resource/apps/t_hsapplicationexe.rsc" -"/epoc32/release/armv5/urel/mockruntimeplugin.dll" - "c:/sys/bin/mockruntimeplugin.dll" -"/epoc32/data/z/private/20022f5f/hsresources/plugins/runtimeplugins/mockruntimeplugin.qtplugin" - "c:/private/20022f5f/hsresources/plugins/runtimeplugins/mockruntimeplugin.qtplugin" -"/epoc32/data/z/private/20022f5f/hsresources/plugins/runtimeplugins/mockruntimeplugin.xml" - "c:/private/20022f5f/hsresources/plugins/runtimeplugins/mockruntimeplugin.xml" +"/epoc32/release/armv5/urel/mockstateplugins.dll" - "c:/sys/bin/mockstateplugins.dll" +"/epoc32/data/z/private/20022f5f/hsresources/plugins/stateplugins/mockstateplugins.qtplugin" - "c:/private/20022f5f/hsresources/plugins/stateplugins/mockstateplugins.qtplugin" +"/epoc32/data/z/private/20022f5f/hsresources/plugins/stateplugins/mockstateplugins.xml" - "c:/private/20022f5f/hsresources/plugins/stateplugins/mockstateplugins.xml" ;--------------- hsutils --------------- "/epoc32/release/armv5/urel/t_hsutils.exe" - "c:/sys/bin/t_hsutils.exe" "/epoc32/data/z/private/10003a3f/import/apps/t_hsutils_reg.rsc" - "c:/private/10003a3f/import/apps/t_hsutils_reg.rsc" "/epoc32/data/z/resource/apps/t_hsutils.rsc" - "c:/resource/apps/t_hsutils.rsc" -"../hsutils/tsrc/t_hsutils/nokia.png" - "c:/hsresources/testresources/nokia.png" -"../hsutils/tsrc/t_hsutils/large.jpg" - "c:/hsresources/testresources/large.jpg" ;--------------- hsdomainmodel --------------- "/epoc32/release/armv5/urel/t_hsdomainmodel.exe" - "c:/sys/bin/t_hsdomainmodel.exe" @@ -69,15 +67,10 @@ "/epoc32/data/z/private/20022F59/hsresources/plugins/widgetplugins/mockwidgetplugintoobig.qtplugin" - "c:/private/20022F59/hsresources/plugins/widgetplugins/mockwidgetplugintoobig.qtplugin" "/epoc32/data/z/private/20022F59/hsresources/plugins/widgetplugins/mockwidgetplugintoobig.xml" - "c:/private/20022F59/hsresources/plugins/widgetplugins/mockwidgetplugintoobig.xml" +"/epoc32/release/armv5/urel/mockwidgetplugincheater.dll" - "c:/sys/bin/mockwidgetplugincheater.dll" +"/epoc32/data/z/private/20022F59/hsresources/plugins/widgetplugins/mockwidgetplugincheater.qtplugin" - "c:/private/20022F59/hsresources/plugins/widgetplugins/mockwidgetplugincheater.qtplugin" +"/epoc32/data/z/private/20022F59/hsresources/plugins/widgetplugins/mockwidgetplugincheater.xml" - "c:/private/20022F59/hsresources/plugins/widgetplugins/mockwidgetplugincheater.xml" -;--------------- runtimeplugins --------------- -;hsdefaultruntimeplugin -"/epoc32/release/armv5/urel/t_hsdefaultruntimeplugin.exe" - "c:/sys/bin/t_hsdefaultruntimeplugin.exe" -"/epoc32/data/z/private/10003a3f/import/apps/t_hsdefaultruntimeplugin_reg.rsc" - "c:/private/10003a3f/import/apps/t_hsdefaultruntimeplugin_reg.rsc" -"/epoc32/data/z/resource/apps/t_hsdefaultruntimeplugin.rsc" - "c:/resource/apps/t_hsdefaultruntimeplugin.rsc" -"/epoc32/release/armv5/urel/mockstateplugins.dll" - "c:/sys/bin/mockstateplugins.dll" -"/epoc32/data/z/private/20022f63/hsresources/plugins/stateplugins/mockstateplugins.qtplugin" - "c:/private/20022f63/hsresources/plugins/stateplugins/mockstateplugins.qtplugin" -"/epoc32/data/z/private/20022f63/hsresources/plugins/stateplugins/mockstateplugins.xml" - "c:/private/20022f63/hsresources/plugins/stateplugins/mockstateplugins.xml" ;--------------- serviceproviders --------------- @@ -102,9 +95,9 @@ ;--------------- hshomescreenclientplugin ----------------------- ;hshomescreenclientplugin -;"/epoc32/release/armv5/urel/t_hshomescreenclientplugin.exe" - "c:/sys/bin/t_hshomescreenclientplugin.exe" -;"/epoc32/data/z/private/10003a3f/import/apps/t_hshomescreenclientplugin_reg.rsc" - "c:/private/10003a3f/import/apps/t_hshomescreenclientplugin_reg.rsc" -;"/epoc32/data/z/resource/apps/t_hshomescreenclientplugin.rsc" - "c:/resource/apps/t_hshomescreenclientplugin.rsc" +"/epoc32/release/armv5/urel/t_hshomescreenclientplugin.exe" - "c:/sys/bin/t_hshomescreenclientplugin.exe" +"/epoc32/data/z/private/10003a3f/import/apps/t_hshomescreenclientplugin_reg.rsc" - "c:/private/10003a3f/import/apps/t_hshomescreenclientplugin_reg.rsc" +"/epoc32/data/z/resource/apps/t_hshomescreenclientplugin.rsc" - "c:/resource/apps/t_hshomescreenclientplugin.rsc" ;--------------- hswidgetuninstaller ----------------------- ;hswidgetuninstaller diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsallappsstate.h --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsallappsstate.h Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsallappsstate.h Fri Jul 09 14:36:01 2010 +0300 @@ -18,10 +18,7 @@ #ifndef HSALLAPPSSTATE_H #define HSALLAPPSSTATE_H -#include -#include -#include - +#include #include "hsbaseviewstate.h" #include "hsmenumodewrapper.h" @@ -29,8 +26,6 @@ HS_STATES_TEST_CLASS(MenuStatesTest) class HbView; -class HbAction; -class HbMenu; class HbAbstractViewItem; class QPointF; class HsMenuViewBuilder; @@ -52,22 +47,13 @@ signals: void toAppLibraryState(); -public slots: - void scrollToBeginning(); - void collectionsSortOrder(HsSortAttribute sortAttribute); private slots: - bool openTaskSwitcher(); - int checkSoftwareUpdates(); - void listItemActivated(const QModelIndex &index); void addActivated(const QModelIndex &index); - void listItemLongPressed(HbAbstractViewItem *item, const QPointF &coords); void addLongPressed(HbAbstractViewItem *item, const QPointF &coords); void addToCollection(); void openInstalledView(); void ascendingMenuAction(); void descendingMenuAction(); - void stateEntered(); - void addModeEntered(); void normalModeEntered(); void stateExited(); void contextMenuAction(HbAction *action); @@ -75,17 +61,10 @@ void construct(); void setMenuOptions(); void addToHomeScreen(const QModelIndex &index); + void setContextMenuOptions(HbAbstractViewItem *item, EntryFlags flags); + private: - HbAction *mSecondarySoftkeyAction; HsSortAttribute mSortAttribute; - HsSortAttribute mCollectionsSortAttribute; - HsMenuView mMenuView; - HsMenuModeWrapper &mMenuMode; - HsMenuItemModel *mAllAppsModel; - HsMainWindow &mMainWindow; - QModelIndex mContextModelIndex; - QPointer mContextMenu; - }; #endif // HSALLAPPSSTATE_H diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsallcollectionsstate.h --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsallcollectionsstate.h Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsallcollectionsstate.h Fri Jul 09 14:36:01 2010 +0300 @@ -18,17 +18,14 @@ #ifndef HSALLCOLLECTIONSSTATE_H #define HSALLCOLLECTIONSSTATE_H -#include -#include +#include #include -#include #include "hsbaseviewstate.h" #include "hsmenumodewrapper.h" HS_STATES_TEST_CLASS(MenuStatesTest) -class HbMenu; class HsMenuViewBuilder; class HbAbstractViewItem; class HbAction; @@ -49,24 +46,13 @@ ~HsAllCollectionsState(); protected: signals: - void sortOrderChanged(HsSortAttribute sortAttribute); void toAppLibraryState(); -public slots: - void scrollToBeginning(); private slots: - bool openTaskSwitcher(); - void listItemActivated(const QModelIndex &index); void addActivated(const QModelIndex &index); - void listItemLongPressed(HbAbstractViewItem *item, const QPointF &coords); void addLongPressed(HbAbstractViewItem *item, const QPointF &coords); void createNewCollection(); void createArrangeCollection(); - void customMenuAction(); - void ascendingMenuAction(); - void descendingMenuAction(); - void stateEntered(); - void addModeEntered(); void normalModeEntered(); void normalModeExited(); void stateExited(); @@ -74,15 +60,7 @@ private: void construct(); void setMenuOptions(); -private: - HbAction *mSecondarySoftkeyAction; - HsSortAttribute mSortAttribute; - HsMenuView mMenuView; - HsMenuModeWrapper &mMenuMode; - HsMenuItemModel *mAllCollectionsModel; - HsMainWindow &mMainWindow; - QModelIndex mContextModelIndex; - QPointer mContextMenu; + void setContextMenuOptions(HbAbstractViewItem *item, EntryFlags flags); }; #endif // HSALLCOLLECTIONSSTATE_H diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsapplibrarystate.h --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsapplibrarystate.h Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsapplibrarystate.h Fri Jul 09 14:36:01 2010 +0300 @@ -84,28 +84,13 @@ private: HsMenuViewBuilder mMenuViewBuilder; - /** - * All Applications state. - * Own. - */ + HsAllAppsState *mAllAppsState; - /** - * Transition to remember last visited child state in Application Library. - * Own. - */ HsMenuModeTransition *mHistoryTransaction; - /** - * All Collections state. - * Own. - */ HsAllCollectionsState *mAllCollectionsState; - /** - * Collection state. - * Own. - */ HsCollectionState *mCollectionState; HsInstalledAppsState *mInstalledAppsState; diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsbaseviewstate.h --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsbaseviewstate.h Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsbaseviewstate.h Fri Jul 09 14:36:01 2010 +0300 @@ -18,14 +18,21 @@ #ifndef HSBASEVIEWSTATE_H #define HSBASEVIEWSTATE_H -#include +#include +#include +#include #include "hsmenustates_global.h" #include "hsmenuservice.h" #include "hsmenuview.h" +class HbMenu; +class HbAction; class HbMessageBox; +class HbAbstractViewItem; class CaNotifier; +class HsMenuModeWrapper; +class HsMainWindow; HS_STATES_TEST_CLASS(MenuStatesTest) @@ -37,35 +44,59 @@ public: - HsBaseViewState(QState *parent); + HsBaseViewState(HsMainWindow &mainWindow, QState *parent); + HsBaseViewState(HsMainWindow &mainWindow, + HsMenuModeWrapper& menuMode, QState *parent); ~HsBaseViewState(); - + void scrollToBeginning(); + private slots: - void applicationLaunchFailMessageFinished(HbAction*); - + virtual void applicationLaunchFailMessageFinished(HbAction*); + virtual void openAppLibrary(); + protected slots: - void stateExited(); - + virtual void stateEntered(); + virtual void stateExited(); + virtual void addModeEntered(); + virtual void normalModeEntered(); + virtual void normalModeExited(); + virtual void launchItem(const QModelIndex &index); + virtual void openCollection(const QModelIndex &index); + virtual void showContextMenu(HbAbstractViewItem *item, const QPointF &coords); + virtual int checkSoftwareUpdates(); + virtual bool openTaskSwitcher(); protected: + void initialize(HsMenuViewBuilder &menuViewBuilder, HsViewContext viewContext); void createApplicationLaunchFailMessage(int errorCode,int itemId); void subscribeForMemoryCardRemove(); - + + void defineTransitions(); + private: - void construct(); void cleanUpApplicationLaunchFailMessage(); - + + virtual void setContextMenuOptions(HbAbstractViewItem *item, EntryFlags flags) = 0; + virtual void setMenuOptions() = 0; + + private: CaNotifier *mNotifier; - int mMessageRelatedItemId; - HbMessageBox *mApplicationLaunchFailMessage; +protected: + HsMenuItemModel *mModel; + QPointer mContextMenu; + QModelIndex mContextModelIndex; + HbAction *mBackKeyAction; + QScopedPointer mMenuView; + HsMenuModeWrapper *mMenuMode; + HsMainWindow &mMainWindow; }; diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hscollectionstate.h --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hscollectionstate.h Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hscollectionstate.h Fri Jul 09 14:36:01 2010 +0300 @@ -18,9 +18,8 @@ #ifndef HSCOLLECTIONSTATE_H #define HSCOLLECTIONSTATE_H -#include -#include -#include +#include +#include #include "hsbaseviewstate.h" @@ -30,7 +29,6 @@ class HbAction; class HbMenu; class HbAbstractViewItem; -class QModelIndex; class HsMenuItemModel; class HsMenuModeWrapper; class HsMenuViewBuilder; @@ -46,29 +44,25 @@ HsMainWindow &mainWindow, QState *parent = 0); ~HsCollectionState(); -public slots: - void collectionsSortOrder(HsSortAttribute sortAttribute); protected: void onEntry(QEvent *event); signals: void sortOrderChanged(HsSortAttribute sortAttribute); private slots: - bool openTaskSwitcher(); - void listItemActivated(const QModelIndex &index); - void listItemLongPressed(HbAbstractViewItem *item, const QPointF &coords); void addAppsAction(bool addApps = true); void addCollectionShortcutToHomeScreenAction(); void renameAction(); void deleteAction(); - void backSteppingAction(); void updateLabel(); void stateEntered(); + void stateExited(); void latestOnTopMenuAction(); void oldestOnTopMenuAction(); void contextMenuAction(HbAction *action); void handleEmptyChange(bool empty); void lockSearchButton(bool lock); + void createArrangeCollection(); private: void construct(); @@ -76,20 +70,13 @@ void makeConnect(); void makeDisconnect(); void addElementToHomeScreen(const QModelIndex &index); + void setContextMenuOptions(HbAbstractViewItem *item, EntryFlags flags); + void setMenuOptions(); private: HsSortAttribute mSortAttribute; - HsSortAttribute mCollectionsSortAttribute; int mCollectionId; QString mCollectionType; - HsMenuView mMenuView; - HsMenuModeWrapper &mMenuMode; - HbAction *const mSecondarySoftkeyAction; - HsMenuItemModel *mCollectionModel; - HbMenu *mOptions; - QModelIndex mContextModelIndex; - QPointer mContextMenu; - HsMainWindow &mMainWindow; }; #endif // HSCOLLECTIONSTATE_H diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsinstalledappsstate.h --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsinstalledappsstate.h Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsinstalledappsstate.h Fri Jul 09 14:36:01 2010 +0300 @@ -18,9 +18,7 @@ #ifndef HSINSTALLEDAPPSSTATE_H #define HSINSTALLEDAPPSSTATE_H -#include -#include -#include +#include #include "hsbaseviewstate.h" @@ -51,15 +49,7 @@ private slots: - bool openTaskSwitcher(); - - void listItemActivated(const QModelIndex &index); - - void listItemLongPressed(HbAbstractViewItem *item, - const QPointF &coords); - - void backAction(); - + void openInstallationLog(); void stateEntered(); void stateExited(); @@ -71,33 +61,8 @@ private: void construct(); - void setMenuOptions(); - -private: - /** - * The View widget. - * Own. - */ - HsMenuView mMenuView; - - /** - * Item Model for the List. - * Own. - */ - HsMenuItemModel *mInstalledAppsModel; - - /** - * Secondary Softkey action. - * Backstepping functionality. - * Own. - */ - HbAction *const mSecondarySoftkeyAction; - - HsMainWindow &mMainWindow; - - QModelIndex mContextModelIndex; - QPointer mContextMenu; + void setContextMenuOptions(HbAbstractViewItem *item, EntryFlags flags); }; #endif // HSINSTALLEDAPPSSTATE_H diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmainwindow.h --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmainwindow.h Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmainwindow.h Fri Jul 09 14:36:01 2010 +0300 @@ -20,31 +20,20 @@ #include #include +#include "hsmenustates_global.h" + +HS_STATES_TEST_CLASS(MenuStatesTest) class HsMenuView; -class HsMainWindow: public QObject +class HsMainWindow { - Q_OBJECT - + public: HsMainWindow(); virtual ~HsMainWindow(); - virtual void setCurrentView(const HsMenuView &menuView); - virtual QPixmap grabScreenshot(); - - public slots: - virtual void saveActivity(); - - signals: - void viewIsReady(); - - private: - /* - * not owned - * - */ - QObject* mActivityClient; + virtual void setCurrentView(const HsMenuView &menuView); + }; #endif // HS_MAIN_WINDOW_H diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmenuview.h --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmenuview.h Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmenuview.h Fri Jul 09 14:36:01 2010 +0300 @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include "hsmenustates_global.h" @@ -36,7 +37,7 @@ class HbListView; class HbGroupBox; class HbWidget; -class HbStaticVkbHost; +class HbShrinkingVkbHost; class HsMenuItemModel; @@ -89,9 +90,6 @@ QAbstractItemView::PositionAtTop); void findItem(QString criteriaStr); - void vkbOpened(); - void vkbClosed(); - private: QModelIndex firstVisibleItemIndex(const HbListView *view) const; @@ -123,7 +121,7 @@ HbListView *mSearchListView; HbSearchPanel *mSearchPanel; - HbStaticVkbHost* mVkbHost; + QScopedPointer mVkbHost; HbPushButton *mCollectionButton; diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsapplibrarystateplugin/resource/applibrary.docml --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/resource/applibrary.docml Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/resource/applibrary.docml Fri Jul 09 14:36:01 2010 +0300 @@ -18,8 +18,6 @@ - - @@ -52,7 +50,7 @@ - + @@ -79,7 +77,7 @@ - + @@ -99,7 +97,7 @@ - + @@ -134,7 +132,7 @@ - + @@ -150,7 +148,6 @@ - @@ -174,7 +171,7 @@ - + @@ -190,7 +187,6 @@ - @@ -214,7 +210,7 @@ - + @@ -231,7 +227,6 @@ - @@ -259,13 +254,13 @@ - + - + @@ -281,7 +276,6 @@ - @@ -310,7 +304,7 @@ - + @@ -324,7 +318,6 @@ - @@ -352,7 +345,7 @@ - + @@ -368,7 +361,6 @@ - @@ -393,7 +385,7 @@ - + @@ -404,7 +396,7 @@ - + @@ -420,7 +412,6 @@ - @@ -452,13 +443,13 @@ - + - + diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallappsstate.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallappsstate.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallappsstate.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -15,29 +15,26 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include #include -#include -#include -#include +#include +#include +#include "hsapp_defs.h" +#include "hsmenueventfactory.h" #include "hsmenuitemmodel.h" -#include "cadefs.h" #include "hsallappsstate.h" -#include "hsaddappstocollectionstate.h" -#include "hsapp_defs.h" #include "hsmenumodewrapper.h" #include "hsmenuviewbuilder.h" -#include "hsmenumodetransition.h" -#include "caentry.h" -#include "caservice.h" #include "hsmainwindow.h" /*! @@ -55,39 +52,20 @@ */ /*! - \var HsAllAppsState::mCollectionsSortAttribute - Collections sort order - */ - -/*! - \var HsAllAppsState::mMenuView - Wrapper for All Applications View. - */ - -/*! - \var HsAllAppsState::mMenuMode - Menu view mode wrapper. - Not Own. - */ - -/*! Constructor. \param menuViewBuilder Menu view builder. - \param menuMode reference to object representing menu mode (add mode on/add mode off). + \param menuMode Menu mode object(add mode on/add mode off). + \param mainWindow Main window wrapper. \param parent Owner. */ HsAllAppsState::HsAllAppsState(HsMenuViewBuilder &menuViewBuilder, HsMenuModeWrapper &menuMode, HsMainWindow &mainWindow, QState *parent) : - HsBaseViewState(parent), mSortAttribute(AscendingNameHsSortAttribute), - mCollectionsSortAttribute(LatestOnTopHsSortAttribute), - mMenuView(menuViewBuilder, HsAllAppsContext), - mMenuMode(menuMode), - mAllAppsModel(0), - mMainWindow(mainWindow), - mContextModelIndex(), mContextMenu(0) + HsBaseViewState(mainWindow, menuMode, parent), + mSortAttribute(AscendingNameHsSortAttribute) { + initialize(menuViewBuilder, HsAllAppsContext); construct(); } @@ -98,46 +76,26 @@ { HSMENUTEST_FUNC_ENTRY("HsAllAppsState::construct"); - QState *initialState = new QState(this); - setInitialState(initialState); - - QState *addModeState = new QState(this); - connect(addModeState, SIGNAL(entered()),SLOT(addModeEntered())); - - QState *normalModeState = new QState(this); - connect(normalModeState, SIGNAL(entered()),SLOT(normalModeEntered())); - - initialState->addTransition(new HsMenuModeTransition( - mMenuMode, NormalHsMenuMode, normalModeState)); - initialState->addTransition(new HsMenuModeTransition( - mMenuMode, AddHsMenuMode, addModeState)); + defineTransitions(); const QString parentName = parent() != 0 ? parent()->objectName() : QString(""); setObjectName(parentName + "/allappsstate"); - connect(this, SIGNAL(entered()),SLOT(stateEntered())); - connect(this, SIGNAL(exited()),SLOT(stateExited())); + connect(mBackKeyAction, SIGNAL(triggered()), SIGNAL(toAppLibraryState())); - mSecondarySoftkeyAction = new HbAction(Hb::BackNaviAction, this); - - mMenuView.view()->setNavigationAction( - mSecondarySoftkeyAction); + mModel = HsMenuService::getAllApplicationsModel(mSortAttribute); + mMenuView->setModel(mModel); - connect(mSecondarySoftkeyAction, SIGNAL(triggered()), - SIGNAL(toAppLibraryState())); - - mAllAppsModel = HsMenuService::getAllApplicationsModel(mSortAttribute); - mMenuView.setModel(mAllAppsModel); - - mMenuView.listView()->verticalScrollBar()->setInteractive(true); - HbIndexFeedback *indexFeedback = new HbIndexFeedback(mMenuView.view()); + mMenuView->listView()->verticalScrollBar()->setInteractive(true); + HbIndexFeedback *indexFeedback = new HbIndexFeedback(mMenuView->view()); indexFeedback->setIndexFeedbackPolicy(HbIndexFeedback::IndexFeedbackSingleCharacter); - indexFeedback->setItemView(mMenuView.listView()); + indexFeedback->setItemView(mMenuView->listView()); HSMENUTEST_FUNC_EXIT("HsAllAppsState::construct"); } + /*! Creates and installs menu options for the view */ @@ -146,11 +104,11 @@ HSMENUTEST_FUNC_ENTRY("HsAllAppsState::setMenuOptions"); QScopedPointer viewOptions(new HbMenu); viewOptions->addAction(hbTrId("txt_applib_opt_task_switcher"), - this, SLOT(openTaskSwitcher())); + static_cast(this), SLOT(openTaskSwitcher())); viewOptions->addAction(hbTrId("txt_applib_opt_add_to_collection"), this, SLOT(addToCollection())); viewOptions->addAction(hbTrId("txt_applib_opt_check_software_updates"), - this, SLOT(checkSoftwareUpdates())); + static_cast(this), SLOT(checkSoftwareUpdates())); HbMenu *const sortMenu = viewOptions->addMenu(hbTrId( "txt_applib_opt_sort_by")); @@ -184,7 +142,7 @@ if (currentSortingPosition >= 0) { sortGroup->actions().at(currentSortingPosition)->setChecked(true); } - mMenuView.view()->setMenu(viewOptions.take()); + mMenuView->view()->setMenu(viewOptions.take()); HSMENUTEST_FUNC_EXIT("HsAllAppsState::setMenuOptions"); } @@ -195,63 +153,18 @@ HsAllAppsState::~HsAllAppsState() { - mMenuView.setModel(NULL); - delete mAllAppsModel; -} - -/*! - Scrolls view to first item at top - */ -void HsAllAppsState::scrollToBeginning() -{ - mMenuView.listView()->scrollTo( - mAllAppsModel->index(0), HbAbstractItemView::PositionAtTop); } -/*! - Slot invoked when a state is entered. - */ - - -void HsAllAppsState::stateEntered() -{ - qDebug("AllAppsState::stateEntered()"); - HSMENUTEST_FUNC_ENTRY("HsAllAppsState::stateEntered"); - - mMainWindow.setCurrentView(mMenuView); - mMenuView.activate(); - - HSMENUTEST_FUNC_EXIT("HsAllAppsState::stateEntered"); -} /*! Slot invoked when add mode entered. */ void HsAllAppsState::normalModeEntered() -{ - setMenuOptions(); - connect(&mMainWindow, SIGNAL(viewIsReady()), - &mMainWindow, SLOT(saveActivity()), - Qt::UniqueConnection); - connect(&mMenuView, +{ + HsBaseViewState::normalModeEntered(); + connect(mMenuView.data(), SIGNAL(activated(QModelIndex)), - SLOT(listItemActivated(QModelIndex))); - connect(&mMenuView, - SIGNAL(longPressed(HbAbstractViewItem *, QPointF)), - SLOT(listItemLongPressed(HbAbstractViewItem *, QPointF))); -} - -/*! - Add mode entered. - */ -void HsAllAppsState::addModeEntered() -{ - connect(&mMenuView, - SIGNAL(activated(QModelIndex)), - SLOT(addActivated(QModelIndex))); - connect(&mMenuView, - SIGNAL(longPressed(HbAbstractViewItem *, QPointF)), - SLOT(addLongPressed(HbAbstractViewItem *, QPointF))); + static_cast(this), SLOT(launchItem(QModelIndex))); } /*! @@ -261,20 +174,6 @@ { HSMENUTEST_FUNC_ENTRY("HsAllAppsState::stateExited"); - disconnect(&mMainWindow, SIGNAL(viewIsReady()), - &mMainWindow, SLOT(saveActivity())); - - mMenuView.setSearchPanelVisible(false); - - mMenuView.disconnect(this); - - mMenuView.view()->setMenu(NULL); - - mMenuView.inactivate(); - - if (mContextMenu) - mContextMenu->close(); - HsBaseViewState::stateExited(); HSMENUTEST_FUNC_EXIT("HsAllAppsState::stateExited"); @@ -282,133 +181,17 @@ } /*! - Open task switcher. - \retval true if operation is successful. - */ -bool HsAllAppsState::openTaskSwitcher() -{ - return HsMenuService::launchTaskSwitcher(); -} - -/*! - Check software updates. - \retval 0 if operation is successful. - */ -int HsAllAppsState::checkSoftwareUpdates() -{ - int errCode = HsMenuService::launchSoftwareUpdate(); - if (errCode != 0){ - createApplicationLaunchFailMessage(errCode,0); - } - return errCode; -} - -/*! - Slot connected to List widget in normal mode. - \param index Model index of the activated item. - */ -void HsAllAppsState::listItemActivated(const QModelIndex &index) -{ - HSMENUTEST_FUNC_ENTRY("HsAllAppsState::listItemActivated"); - - QSharedPointer entry = mAllAppsModel->entry(index); - - if (entry->entryTypeName() == widgetTypeName()) { - EntryFlags flags = index.data(CaItemModel::FlagsRole).value< - EntryFlags> (); - if (!(flags & UninstallEntryFlag)) { - machine()->postEvent( - HsMenuEventFactory::createPreviewHSWidgetEvent( - entry->id(), entry->entryTypeName(), entry->attribute( - widgetUriAttributeName()), entry->attribute( - widgetLibraryAttributeName()))); - - const int itemId = index.data(CaItemModel::IdRole).toInt(); - HsMenuService::touch(itemId); - } - } else { - QVariant data = mAllAppsModel->data(index, CaItemModel::IdRole); - int errCode = HsMenuService::executeAction(data.toInt()); - if (errCode != 0) { - createApplicationLaunchFailMessage(errCode,index.data(CaItemModel::IdRole).toInt()); - } - } - - mMenuView.setSearchPanelVisible(false); - - HSMENUTEST_FUNC_EXIT("HsAllAppsState::listItemActivated"); -} - -/*! Slot connected to List widget in add mode. \param index Model index of the activated item. */ void HsAllAppsState::addActivated(const QModelIndex &index) { + mMenuView->disconnect(this); HSMENUTEST_FUNC_ENTRY("HsAllAppsState::addActivated"); addToHomeScreen(index); HSMENUTEST_FUNC_EXIT("HsAllAppsState::addActivated"); } -/*! - Handles long-item-pressed event in all apps view by showing context menu - \param item View item - \param coords Press point coordinates - */ -void HsAllAppsState::listItemLongPressed(HbAbstractViewItem *item, - const QPointF &coords) -{ - HSMENUTEST_FUNC_ENTRY("HsAllAppsState::listItemLongPressed"); - - EntryFlags flags = item->modelIndex().data( - CaItemModel::FlagsRole).value (); - - if (!(flags & UninstallEntryFlag)) { - // create context menu - mContextMenu = new HbMenu; - - HbAction *addToHomeScreenAction = mContextMenu->addAction( - hbTrId("txt_applib_menu_add_to_home_screen")); - addToHomeScreenAction->setData(AddToHomeScreenContextAction); - - HbAction *addToCollectionAction = mContextMenu->addAction( - hbTrId("txt_applib_menu_add_to_collection")); - addToCollectionAction->setData(AddToCollectionContextAction); - - HbAction *uninstallAction = mContextMenu->addAction( - hbTrId("txt_common_menu_delete")); - uninstallAction->setData(UninstallContextAction); - HbAction *appSettingsAction(NULL); - HbAction *appDetailsAction(NULL); - - // check conditions and hide irrelevant menu items - QSharedPointer entry = mAllAppsModel->entry(item->modelIndex()); - - if (!(entry->attribute(appSettingsPlugin()).isEmpty())) { - appSettingsAction = mContextMenu->addAction( - hbTrId("txt_common_menu_settings")); - appSettingsAction->setData(AppSettingContextAction); - } - if (!(entry->attribute(componentIdAttributeName()).isEmpty()) && - (flags & RemovableEntryFlag) ) { - appDetailsAction = mContextMenu->addAction( - hbTrId("txt_common_menu_details")); - appDetailsAction->setData(AppDetailsContextAction); - } - - if (!(flags & RemovableEntryFlag)) { - uninstallAction->setVisible(false); - } - - mContextModelIndex = item->modelIndex(); - mContextMenu->setPreferredPos(coords); - mContextMenu->setAttribute(Qt::WA_DeleteOnClose); - mContextMenu->open(this, SLOT(contextMenuAction(HbAction*))); - } - - - HSMENUTEST_FUNC_EXIT("HsAllAppsState::listItemLongPressed"); -} /*! Handles context menu actions @@ -429,7 +212,7 @@ // an existing collection via item specific menu. machine()->postEvent( HsMenuEventFactory::createAddAppsFromApplicationsViewEvent( - mSortAttribute, mCollectionsSortAttribute, itemId)); + mSortAttribute, itemId)); break; case UninstallContextAction: machine()->postEvent( @@ -446,8 +229,7 @@ default: break; } - - mMenuView.setSearchPanelVisible(false); + mMenuView->setSearchPanelVisible(false); } /*! @@ -460,6 +242,7 @@ const QPointF &coords) { Q_UNUSED(coords); + mMenuView->disconnect(this); HSMENUTEST_FUNC_ENTRY("HsAllAppsState::addLongPressed"); addToHomeScreen(item->modelIndex()); HSMENUTEST_FUNC_EXIT("HsAllAppsState::addLongPressed"); @@ -475,7 +258,7 @@ // a new/an existing collection via the All view machine()->postEvent( HsMenuEventFactory::createAddAppsFromApplicationsViewEvent( - mSortAttribute, mCollectionsSortAttribute)); + mSortAttribute)); } /*! @@ -495,50 +278,79 @@ /*! Triggers event so that a state adding to Home Screen is reached - \param index of an item to be added to homescreen + \param index of an item to be added to homescreen. \retval void */ void HsAllAppsState::addToHomeScreen(const QModelIndex &index) { HSMENUTEST_FUNC_ENTRY("HsAllAppsState::addToHomeScreen"); - QSharedPointer entry = mAllAppsModel->entry(index); + QSharedPointer entry = mModel->entry(index); machine()-> postEvent(HsMenuEventFactory::createAddToHomeScreenEvent( - entry->id(), mMenuMode.getHsMenuMode(), - mMenuMode.getHsToken())); + entry->id(), mMenuMode->getHsMenuMode(), + mMenuMode->getHsToken())); HSMENUTEST_FUNC_EXIT("HsAllAppsState::addToHomeScreen"); } /*! + Method seting context menu options. + */ +void HsAllAppsState::setContextMenuOptions(HbAbstractViewItem *item, EntryFlags flags) +{ + HbAction *addToHomeScreenAction = mContextMenu->addAction( + hbTrId("txt_applib_menu_add_to_home_screen")); + addToHomeScreenAction->setData(AddToHomeScreenContextAction); + + HbAction *addToCollectionAction = mContextMenu->addAction( + hbTrId("txt_applib_menu_add_to_collection")); + addToCollectionAction->setData(AddToCollectionContextAction); + + HbAction *uninstallAction = mContextMenu->addAction( + hbTrId("txt_common_menu_delete")); + uninstallAction->setData(UninstallContextAction); + HbAction *appSettingsAction(NULL); + HbAction *appDetailsAction(NULL); + + // check conditions and hide irrelevant menu items + QSharedPointer entry = mModel->entry(item->modelIndex()); + + if (!(entry->attribute(appSettingsPlugin()).isEmpty())) { + appSettingsAction = mContextMenu->addAction( + hbTrId("txt_common_menu_settings")); + appSettingsAction->setData(AppSettingContextAction); + } + if (!(entry->attribute(componentIdAttributeName()).isEmpty()) && + (flags & RemovableEntryFlag) ) { + appDetailsAction = mContextMenu->addAction( + hbTrId("txt_common_menu_details")); + appDetailsAction->setData(AppDetailsContextAction); + } + + if (!(flags & RemovableEntryFlag)) { + uninstallAction->setVisible(false); + } +} + +/*! Menu ascending sort action slot. */ void HsAllAppsState::ascendingMenuAction() { HSMENUTEST_FUNC_ENTRY("HsAllAppsState::ascendingMenuAction"); mSortAttribute = AscendingNameHsSortAttribute; - mAllAppsModel->setSort(mSortAttribute); + mModel->setSort(mSortAttribute); HSMENUTEST_FUNC_EXIT("HsAllAppsState::ascendingMenuAction"); } /*! - Sets collections sort order - /param sortOrder sort order. - */ -void HsAllAppsState::collectionsSortOrder( - HsSortAttribute sortOrder) -{ - mCollectionsSortAttribute = sortOrder; -} - -/*! Menu descending sort action slot. */ void HsAllAppsState::descendingMenuAction() { HSMENUTEST_FUNC_ENTRY("HsAllAppsState::descendingMenuAction"); mSortAttribute = DescendingNameHsSortAttribute; - mAllAppsModel->setSort(mSortAttribute); + mModel->setSort(mSortAttribute); HSMENUTEST_FUNC_EXIT("HsAllAppsState::descendingMenuAction"); } diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallcollectionsstate.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallcollectionsstate.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallcollectionsstate.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -18,21 +18,18 @@ #include #include #include -#include #include #include #include -#include -#include + +#include -#include +#include "hsmenueventfactory.h" #include "hsmenumodewrapper.h" -#include "hsmenuviewbuilder.h" #include "hsmenuitemmodel.h" -#include "cadefs.h" #include "hsallcollectionsstate.h" #include "hsaddappstocollectionstate.h" -#include "hsmenumodetransition.h" +//#include "hsmenumodetransition.h" #include "hsmainwindow.h" /*! @@ -45,28 +42,6 @@ */ /*! - \var HsAllCollectionsState::mSortAttribute - Sort order - */ - -/*! - \var HsAllCollectionsState::mMenuView - Wrapper for All Collections View. - */ - -/*! - \var HsAllCollectionsState::mAllCollectionsModel - Item Model for the List. - Own. - */ - -/*! - \fn void HsAllCollectionsState::sortOrderChanged(HsSortAttribute sortAttribute); - Signal emitted when sort order is changed. - \param sortOrder new sort order. - */ - -/*! Constructor. \param menuViewBuilder Menu view builder. \param menuMode reference to object representing menu mode (add mode on/add mode off). @@ -77,14 +52,9 @@ HsMenuModeWrapper &menuMode, HsMainWindow &mainWindow, QState *parent): - HsBaseViewState(parent), - mSortAttribute(CustomHsSortAttribute), - mMenuView(menuViewBuilder, HsAllCollectionsContext), - mMenuMode(menuMode), - mAllCollectionsModel(0), - mMainWindow(mainWindow), - mContextModelIndex(), mContextMenu(0) + HsBaseViewState(mainWindow, menuMode, parent) { + initialize(menuViewBuilder, HsAllCollectionsContext); construct(); } @@ -94,46 +64,21 @@ void HsAllCollectionsState::construct() { HSMENUTEST_FUNC_ENTRY("HsAllCollectionsState::construct"); - - QState *initialState = new QState(this); - setInitialState(initialState); - - QState *addModeState = new QState(this); - connect(addModeState, SIGNAL(entered()),SLOT(addModeEntered())); - - QState *normalModeState = new QState(this); - connect(normalModeState, SIGNAL(entered()),SLOT(normalModeEntered())); - connect(normalModeState, SIGNAL(exited()),SLOT(normalModeExited())); - - initialState->addTransition(new HsMenuModeTransition( - mMenuMode, NormalHsMenuMode, normalModeState)); - initialState->addTransition(new HsMenuModeTransition( - mMenuMode, AddHsMenuMode, addModeState)); - + defineTransitions(); const QString parentName = parent() != 0 ? parent()->objectName() : QString(""); setObjectName(parentName + "/allcollectionsstate"); - connect(this, SIGNAL(entered()),SLOT(stateEntered())); - connect(this, SIGNAL(exited()),SLOT(stateExited())); - mSecondarySoftkeyAction = new HbAction(Hb::BackNaviAction, this); - - mMenuView.view()->setNavigationAction( - mSecondarySoftkeyAction); + connect(mBackKeyAction, SIGNAL(triggered()), SIGNAL(toAppLibraryState())); - connect(mSecondarySoftkeyAction, SIGNAL(triggered()), - SIGNAL(toAppLibraryState())); - - mAllCollectionsModel = HsMenuService::getAllCollectionsModel( - mSortAttribute); - - mMenuView.setModel(mAllCollectionsModel); + mModel = HsMenuService::getAllCollectionsModel(); + mMenuView->setModel(mModel); HSMENUTEST_FUNC_EXIT("HsAllCollectionsState::construct"); } /*! - Creates and installs menu options for the view + Creates and installs menu options for the view. */ void HsAllCollectionsState::setMenuOptions() { @@ -142,86 +87,47 @@ QScopedPointer viewOptions(new HbMenu); viewOptions->addAction(hbTrId("txt_applib_opt_task_switcher"), - this, + static_cast(this), SLOT(openTaskSwitcher())); viewOptions->addAction(hbTrId("txt_applib_opt_new_collection"), this, SLOT(createNewCollection())); - HbMenu *const sortMenu = viewOptions->addMenu( - hbTrId("txt_applib_opt_sort_by")); - - //Grouped options are exclusive by default. - QActionGroup *sortGroup = new QActionGroup(viewOptions.data()); - sortGroup->addAction(sortMenu->addAction( - hbTrId("txt_applib_opt_sub_custom"), - this, SLOT(customMenuAction()))); - sortGroup->addAction(sortMenu->addAction( - hbTrId("txt_applib_opt_sub_ascending"), - this, SLOT(ascendingMenuAction()))); - sortGroup->addAction(sortMenu->addAction( - hbTrId("txt_applib_opt_sub_descending"), - this, SLOT(descendingMenuAction()))); - - if (mSortAttribute == CustomHsSortAttribute) { - viewOptions->addAction(hbTrId("txt_applib_opt_arrange"), - this, SLOT(createArrangeCollection())); - } - - foreach(QAction *action, sortMenu->actions()) { - action->setCheckable(true); - } - - switch (mSortAttribute) { - case AscendingNameHsSortAttribute: - sortGroup->actions().at(1)->setChecked(true); - break; - case DescendingNameHsSortAttribute: - sortGroup->actions().at(2)->setChecked(true); - break; - case CustomHsSortAttribute: - default: - sortGroup->actions().at(0)->setChecked(true); - break; - } - - mMenuView.view()->setMenu(viewOptions.take()); + viewOptions->addAction(hbTrId("txt_applib_opt_arrange"), + this, SLOT(createArrangeCollection())); + mMenuView->view()->setMenu(viewOptions.take()); HSMENUTEST_FUNC_EXIT("HsAllCollectionsState::setMenuOptions"); } /*! + Method seting context menu options. + \param item the context menu is requested for. + \param flags related to \a item. + */ +void HsAllCollectionsState::setContextMenuOptions(HbAbstractViewItem *item, EntryFlags flags) +{ + Q_UNUSED(item) + // create context menu + HbAction *addShortcutAction = mContextMenu->addAction(hbTrId( + "txt_applib_menu_add_to_home_screen")); + addShortcutAction->setData(AddToHomeScreenContextAction); + HbAction *renameAction = NULL; + HbAction *deleteAction = NULL; + + if ((flags & RemovableEntryFlag)) { + renameAction = mContextMenu->addAction( + hbTrId("txt_common_menu_rename_item")); + renameAction->setData(RenameContextAction); + deleteAction = mContextMenu->addAction(hbTrId("txt_common_menu_delete")); + deleteAction->setData(DeleteContextAction); + } +} + +/*! Destructor. */ HsAllCollectionsState::~HsAllCollectionsState() { - mMenuView.setModel(NULL); - delete mAllCollectionsModel; -} - -/*! - Populates all folders - */ -void HsAllCollectionsState::scrollToBeginning() -{ - - mMenuView.listView()->scrollTo( - mAllCollectionsModel->index(0), HbAbstractItemView::PositionAtTop); -} - -/*! - Slot invoked when a state is entered. - */ - - -void HsAllCollectionsState::stateEntered() -{ - qDebug("AllCollectionsState::stateEntered()"); - HSMENUTEST_FUNC_ENTRY("HsAllCollectionsState::stateEntered"); - - mMainWindow.setCurrentView(mMenuView); - mMenuView.activate(); - - HSMENUTEST_FUNC_EXIT("HsAllCollectionsState::stateExited"); } /*! @@ -229,16 +135,11 @@ */ void HsAllCollectionsState::normalModeEntered() { - setMenuOptions(); - connect(&mMainWindow, SIGNAL(viewIsReady()), - &mMainWindow, SLOT(saveActivity()), - Qt::UniqueConnection); - connect(&mMenuView, + HsBaseViewState::normalModeEntered(); + connect(mMenuView.data(), SIGNAL(activated(QModelIndex)), - SLOT(listItemActivated(QModelIndex))); - connect(&mMenuView, - SIGNAL(longPressed(HbAbstractViewItem *, QPointF)), - SLOT(listItemLongPressed(HbAbstractViewItem *, QPointF))); + static_cast(this), + SLOT(openCollection(QModelIndex))); } /*! @@ -246,21 +147,9 @@ */ void HsAllCollectionsState::normalModeExited() { - mMenuView.view()->setMenu(NULL); + mMenuView->view()->setMenu(NULL); } -/*! - Slot invoked when add mode is entered. - */ -void HsAllCollectionsState::addModeEntered() -{ - connect(&mMenuView, - SIGNAL(activated(QModelIndex)), - SLOT(addActivated(QModelIndex))); - connect(&mMenuView, - SIGNAL(longPressed(HbAbstractViewItem *, QPointF)), - SLOT(addLongPressed(HbAbstractViewItem *, QPointF))); -} /*! Slot invoked when a state is exited. @@ -268,19 +157,7 @@ void HsAllCollectionsState::stateExited() { HSMENUTEST_FUNC_ENTRY("HsAllCollectionsState::stateExited"); - - disconnect(&mMainWindow, SIGNAL(viewIsReady()), - &mMainWindow, SLOT(saveActivity())); - - mMenuView.setSearchPanelVisible(false); - mMenuView.disconnect(this); - - mMenuView.inactivate(); - - if (mContextMenu) - mContextMenu->close(); - HsBaseViewState::stateExited(); HSMENUTEST_FUNC_EXIT("HsAllCollectionsState::stateExited"); @@ -288,45 +165,16 @@ } /*! - Open task switcher. - \retval true if operation is successful. - */ -bool HsAllCollectionsState::openTaskSwitcher() -{ - return HsMenuService::launchTaskSwitcher(); -} - -/*! - Slot connected to List widget in normal mode. - \param index Model index of the activated item. - */ -void HsAllCollectionsState::listItemActivated(const QModelIndex &index) -{ - HSMENUTEST_FUNC_ENTRY("HsAllCollectionsState::listItemActivated"); - QVariant data = mAllCollectionsModel->data(index, CaItemModel::IdRole); - int id = data.toInt(); - QString collectionType = - mAllCollectionsModel->data(index, CaItemModel::TypeRole).toString(); - qDebug("AllCollectionsState::listItemActivated - MCS ID: %d", - data.toInt()); - - mMenuView.setSearchPanelVisible(false); - - machine()->postEvent(HsMenuEventFactory::createOpenCollectionFromAppLibraryEvent(id, - collectionType)); - HSMENUTEST_FUNC_EXIT("HsAllCollectionsState::listItemActivated"); -} - -/*! Slot connected to List widget in add mode. \param index Model index of the activated item. */ void HsAllCollectionsState::addActivated(const QModelIndex &index) { + mMenuView->disconnect(this); const int itemId = index.data(CaItemModel::IdRole).toInt(); machine()->postEvent( HsMenuEventFactory::createAddToHomeScreenEvent( - itemId, mMenuMode.getHsMenuMode(), mMenuMode.getHsToken())); + itemId, mMenuMode->getHsMenuMode(), mMenuMode->getHsToken())); } /*! @@ -339,53 +187,16 @@ const QPointF &coords) { Q_UNUSED(coords); + mMenuView->disconnect(this); const int itemId = item->modelIndex().data(CaItemModel::IdRole).toInt(); machine()->postEvent( HsMenuEventFactory::createAddToHomeScreenEvent(itemId, - mMenuMode.getHsMenuMode(), mMenuMode.getHsToken())); + mMenuMode->getHsMenuMode(), mMenuMode->getHsToken())); } /*! - Slot connected to List widget in normal mode. - Called when item long pressed. - \param item View item. - \param coords Press point coordinates. - */ -void HsAllCollectionsState::listItemLongPressed(HbAbstractViewItem *item, - const QPointF &coords) -{ - HSMENUTEST_FUNC_ENTRY("HsAllCollectionsState::listItemLongPressed"); - - mContextMenu = new HbMenu; - - // create context menu - HbAction *addShortcutAction = mContextMenu->addAction(hbTrId( - "txt_applib_menu_add_to_home_screen")); - addShortcutAction->setData(AddToHomeScreenContextAction); - HbAction *renameAction = NULL; - HbAction *deleteAction = NULL; - - EntryFlags flags = item->modelIndex().data(CaItemModel::FlagsRole).value< - EntryFlags> (); - - if ((flags & RemovableEntryFlag)) { - renameAction = mContextMenu->addAction( - hbTrId("txt_common_menu_rename_item")); - renameAction->setData(RenameContextAction); - deleteAction = mContextMenu->addAction(hbTrId("txt_common_menu_delete")); - deleteAction->setData(DeleteContextAction); - } - - mContextModelIndex = item->modelIndex(); - mContextMenu->setPreferredPos(coords); - mContextMenu->setAttribute(Qt::WA_DeleteOnClose); - mContextMenu->open(this, SLOT(contextMenuAction(HbAction*))); - - HSMENUTEST_FUNC_EXIT("HsAllCollectionsState::listItemLongPressed"); -} - -/*! - Handles context menu actions + Handles context menu actions. + \param action to be handled. */ void HsAllCollectionsState::contextMenuAction(HbAction *action) { @@ -398,7 +209,7 @@ case AddToHomeScreenContextAction: machine()->postEvent( HsMenuEventFactory::createAddToHomeScreenEvent( - itemId, mMenuMode.getHsMenuMode(), mMenuMode.getHsToken())); + itemId, mMenuMode->getHsMenuMode(), mMenuMode->getHsToken())); break; case RenameContextAction: machine()->postEvent( @@ -412,7 +223,7 @@ break; } - mMenuView.setSearchPanelVisible(false); + mMenuView->setSearchPanelVisible(false); } /*! @@ -433,7 +244,7 @@ int topItemId(0); const QList array = - mMenuView.listView()->visibleItems(); + mMenuView->listView()->visibleItems(); if (array.count() >= 1) { QModelIndex idx = array[0]->modelIndex(); @@ -441,45 +252,5 @@ } machine()->postEvent( - HsMenuEventFactory::createArrangeCollectionEvent(topItemId)); -} - -/*! - Menu custom sort action slot. - */ -void HsAllCollectionsState::customMenuAction() -{ - HSMENUTEST_FUNC_ENTRY("HsAllCollectionsState::customMenuAction"); - mSortAttribute = CustomHsSortAttribute; - setMenuOptions(); - mAllCollectionsModel->setSort(mSortAttribute); - emit sortOrderChanged(mSortAttribute); - HSMENUTEST_FUNC_EXIT("HsAllCollectionsState::customMenuAction"); + HsMenuEventFactory::createArrangeAllCollectionsEvent(topItemId)); } - -/*! - Menu ascending sort action slot. - */ -void HsAllCollectionsState::ascendingMenuAction() -{ - HSMENUTEST_FUNC_ENTRY("HsAllCollectionsState::ascendingMenuAction"); - mSortAttribute = AscendingNameHsSortAttribute; - setMenuOptions(); - mAllCollectionsModel->setSort(mSortAttribute); - emit sortOrderChanged(mSortAttribute); - HSMENUTEST_FUNC_EXIT("HsAllCollectionsState::ascendingMenuAction"); -} - -/*! - Menu descending sort action slot. - */ -void HsAllCollectionsState::descendingMenuAction() -{ - HSMENUTEST_FUNC_ENTRY("HsAllCollectionsState::descendingMenuAction"); - mSortAttribute = DescendingNameHsSortAttribute; - setMenuOptions(); - mAllCollectionsModel->setSort(mSortAttribute); - emit sortOrderChanged(mSortAttribute); - HSMENUTEST_FUNC_EXIT("HsAllCollectionsState::descendingMenuAction"); -} - diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsapplibrarystate.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsapplibrarystate.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsapplibrarystate.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -14,18 +14,11 @@ * Description: Menu Application Library state. * */ -#include -#include -#include + +#include #include -#include -#include -#include -#include #include #include -#include - #include "hstest_global.h" #include "hsapplibrarystate.h" @@ -34,7 +27,7 @@ #include "hscollectionstate.h" #include "hsinstalledappsstate.h" #include "hsoperatorhandler.h" -#include "hsmenuview.h" +#include "hsmenueventtransition.h" #include "hsmenumodetransition.h" @@ -180,11 +173,6 @@ constructToolbar(); - connect(mAllCollectionsState, SIGNAL(sortOrderChanged(HsSortAttribute)), - mAllAppsState, SLOT(collectionsSortOrder(HsSortAttribute))); - connect(mAllCollectionsState, SIGNAL(sortOrderChanged(HsSortAttribute)), - mCollectionState, SLOT(collectionsSortOrder(HsSortAttribute))); - connect(mAllAppsState, SIGNAL(entered()), this, SLOT(allAppsStateEntered())); diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsbaseviewstate.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsbaseviewstate.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsbaseviewstate.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -15,38 +15,91 @@ * */ -#include +#include +#include #include -#include +#include +#include +#include +#include +#include + #include #include "hsbaseviewstate.h" +#include "hsmenueventfactory.h" +#include "hsmenudialogfactory.h" +#include "hsmenuitemmodel.h" +#include "hsmenumodetransition.h" +#include "hsmainwindow.h" + /*! Constructor. + \param mainWindow main window wrapper object. + \param parent Owner. */ -HsBaseViewState::HsBaseViewState( +HsBaseViewState::HsBaseViewState(HsMainWindow &mainWindow, QState *parent): + QState(parent), + mNotifier(0), + mMessageRelatedItemId(0), + mApplicationLaunchFailMessage(0), + mModel(0), + mContextMenu(0), + mContextModelIndex(), + mBackKeyAction(0), + mMenuView(0), + mMenuMode(0), + mMainWindow(mainWindow) +{ + mBackKeyAction = new HbAction(Hb::BackNaviAction, this); +} + +/*! + Constructor. + \param mainWindow main window wrapper object. + \param menuMode menu mode object. + \param parent Owner. + */ +HsBaseViewState::HsBaseViewState(HsMainWindow &mainWindow, + HsMenuModeWrapper& menuMode, QState *parent): QState(parent), mNotifier(0), mMessageRelatedItemId(0), - mApplicationLaunchFailMessage(0) + mApplicationLaunchFailMessage(0), + mModel(0), + mContextMenu(0), + mContextModelIndex(), + mBackKeyAction(0), + mMenuView(0), + mMenuMode(&menuMode), + mMainWindow(mainWindow) { - construct(); + mBackKeyAction = new HbAction(Hb::BackNaviAction, this); } +/*! + Initialize contained objects. + \param menuViewBuilder object providing widgets for menu view. + \param viewContext state context of the view the builder is to provide widgets for. + */ +void HsBaseViewState::initialize(HsMenuViewBuilder &menuViewBuilder, + HsViewContext viewContext) +{ + mMenuView.reset(new HsMenuView(menuViewBuilder, viewContext)); + mMenuView->view()->setNavigationAction(mBackKeyAction); -/*! - Constructs contained objects. - */ -void HsBaseViewState::construct() -{ + connect(this, SIGNAL(entered()),SLOT(stateEntered())); + connect(this, SIGNAL(exited()),SLOT(stateExited())); } /*! Creates and open application launch fail message. \param errorCode eroor code to display. + \param itemId id of the launched item. */ -void HsBaseViewState::createApplicationLaunchFailMessage(int errorCode,int itemId) +void HsBaseViewState::createApplicationLaunchFailMessage(int errorCode, + int itemId) { QString message; message.append( @@ -56,15 +109,7 @@ mMessageRelatedItemId = itemId; // create and show message box - mApplicationLaunchFailMessage = new HbMessageBox(HbMessageBox::MessageTypeInformation); - mApplicationLaunchFailMessage->setAttribute(Qt::WA_DeleteOnClose); - - mApplicationLaunchFailMessage->setText(message); - - mApplicationLaunchFailMessage->clearActions(); - HbAction *mClosemAction = new HbAction(hbTrId("txt_common_button_close"), - mApplicationLaunchFailMessage); - mApplicationLaunchFailMessage->addAction(mClosemAction); + mApplicationLaunchFailMessage = HsMenuDialogFactory().create(message, HsMenuDialogFactory::Close); mApplicationLaunchFailMessage->open(this, SLOT(applicationLaunchFailMessageFinished(HbAction*))); @@ -115,19 +160,214 @@ cleanUpApplicationLaunchFailMessage(); } + +/*! + Slot invoked when a state is entered. + */ +void HsBaseViewState::stateEntered() +{ + qDebug("HsBaseViewState::stateEntered()"); + HSMENUTEST_FUNC_ENTRY("HsBaseViewState::stateEntered"); + + mMainWindow.setCurrentView(*mMenuView); + mMenuView->activate(); + + HSMENUTEST_FUNC_EXIT("HsBaseViewState::stateEntered"); +} + /*! Slot invoked when a state is exited. */ void HsBaseViewState::stateExited() { HSMENUTEST_FUNC_ENTRY("HsBaseViewState::stateExited"); + mMenuView->setSearchPanelVisible(false); + mMenuView->disconnect(this); + mMenuView->view()->setMenu(NULL); + mMenuView->inactivate(); cleanUpApplicationLaunchFailMessage(); + if (mContextMenu){ + mContextMenu->close(); + } HSMENUTEST_FUNC_EXIT("HsBaseViewState::stateExited"); } /*! + Add mode entered. + */ +void HsBaseViewState::addModeEntered() +{ + connect(mMenuView.data(), + SIGNAL(activated(QModelIndex)), + SLOT(addActivated(QModelIndex))); + connect(mMenuView.data(), + SIGNAL(longPressed(HbAbstractViewItem *, QPointF)), + SLOT(addLongPressed(HbAbstractViewItem *, QPointF))); +} + +/*! + Slot invoked when add mode entered. + */ +void HsBaseViewState::normalModeEntered() +{ + setMenuOptions(); + connect(mMenuView.data(), + SIGNAL(activated(QModelIndex)), + mMenuView.data(), + SLOT(hideSearchPanel())); + connect(mMenuView.data(), + SIGNAL(longPressed(HbAbstractViewItem *, QPointF)), + SLOT(showContextMenu(HbAbstractViewItem *, QPointF))); +} + +/*! Destructor. */ HsBaseViewState::~HsBaseViewState() { + mMenuView->setModel(NULL); + delete mModel; } + +/*! + Slot connected to List widget in normal mode. + \param index Model index of the activated item. + */ +void HsBaseViewState::launchItem(const QModelIndex &index) +{ + HSMENUTEST_FUNC_ENTRY("HsBaseViewState::launchItem"); + + QSharedPointer entry = mModel->entry(index); + + if (entry->entryTypeName() == widgetTypeName()) { + EntryFlags flags = index.data(CaItemModel::FlagsRole).value< + EntryFlags> (); + if (!(flags & UninstallEntryFlag)) { + machine()->postEvent( + HsMenuEventFactory::createPreviewHSWidgetEvent( + entry->id(), entry->entryTypeName(), entry->attribute( + widgetUriAttributeName()), entry->attribute( + widgetLibraryAttributeName()))); + + const int itemId = index.data(CaItemModel::IdRole).toInt(); + HsMenuService::touch(itemId); + } + } else { + QVariant data = mModel->data(index, CaItemModel::IdRole); + int errCode = HsMenuService::executeAction(data.toInt()); + if (errCode != 0) { + createApplicationLaunchFailMessage(errCode,index.data(CaItemModel::IdRole).toInt()); + } + } + + HSMENUTEST_FUNC_EXIT("HsBaseViewState::launchItem"); +} + +/*! + Slot connected to List widget in normal mode. + \param index Model index of the activated item. + */ +void HsBaseViewState::openCollection(const QModelIndex &index) +{ + HSMENUTEST_FUNC_ENTRY("HsBaseViewState::openCollection"); + QVariant data = mModel->data(index, CaItemModel::IdRole); + int id = data.toInt(); + QString collectionType = + mModel->data(index, CaItemModel::TypeRole).toString(); + qDebug("HsBaseViewState::openCollection - MCS ID: %d", + data.toInt()); + + machine()->postEvent(HsMenuEventFactory::createOpenCollectionFromAppLibraryEvent(id, + collectionType)); + HSMENUTEST_FUNC_EXIT("HsBaseViewState::openCollection"); +} + +/*! + Slot connected to List widget in normal mode. + \param index Model index of the activated item. + */ +void HsBaseViewState::showContextMenu(HbAbstractViewItem *item, const QPointF &coords) +{ + + HSMENUTEST_FUNC_ENTRY("HsBaseViewState::showContextMenu"); + + EntryFlags flags = item->modelIndex().data( + CaItemModel::FlagsRole).value (); + + if (!(flags & UninstallEntryFlag)) { + mContextMenu = new HbMenu; + setContextMenuOptions(item,flags); + mContextModelIndex = item->modelIndex(); + mContextMenu->setPreferredPos(coords); + mContextMenu->setAttribute(Qt::WA_DeleteOnClose); + mContextMenu->open(this, SLOT(contextMenuAction(HbAction*))); + } + HSMENUTEST_FUNC_EXIT("HsBaseViewState::showContextMenu"); + +} + +/*! + Open task switcher. + \retval true if operation is successful. + */ +bool HsBaseViewState::openTaskSwitcher() +{ + return HsMenuService::launchTaskSwitcher(); +} + +/*! + Menu softkey back action slot + */ +void HsBaseViewState::openAppLibrary() +{ + machine()->postEvent(HsMenuEventFactory::createOpenAppLibraryEvent()); +} + +/*! + Check software updates. + \retval 0 if operation is successful. + */ +int HsBaseViewState::checkSoftwareUpdates() +{ + int errCode = HsMenuService::launchSoftwareUpdate(); + if (errCode != 0){ + createApplicationLaunchFailMessage(errCode,0); + } + return errCode; +} +/*! + Scrolls view to first item at top + */ +void HsBaseViewState::scrollToBeginning() +{ + mMenuView->listView()->scrollTo( + mModel->index(0), HbAbstractItemView::PositionAtTop); +} + +/*! + Normal mode exited dummy implementation. + */ +void HsBaseViewState::normalModeExited() +{ +} + +/*! + Defines transitions + */ +void HsBaseViewState::defineTransitions() +{ + QState *initialState = new QState(this); + setInitialState(initialState); + + QState *addModeState = new QState(this); + connect(addModeState, SIGNAL(entered()),SLOT(addModeEntered())); + + QState *normalModeState = new QState(this); + connect(normalModeState, SIGNAL(entered()),SLOT(normalModeEntered())); + connect(normalModeState, SIGNAL(exited()),SLOT(normalModeExited())); + + initialState->addTransition(new HsMenuModeTransition( + *mMenuMode, NormalHsMenuMode, normalModeState)); + initialState->addTransition(new HsMenuModeTransition( + *mMenuMode, AddHsMenuMode, addModeState)); +} diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hscollectionstate.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hscollectionstate.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hscollectionstate.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -15,30 +15,26 @@ * */ -#include - +#include +#include +#include #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include + +#include "hsapp_defs.h" #include "hsmenuevent.h" +#include "hsmenueventfactory.h" #include "hsmenuservice.h" #include "hsmenumodewrapper.h" #include "hsmenuitemmodel.h" -#include "hsmenuviewbuilder.h" -#include "cadefs.h" -#include "caentry.h" #include "hscollectionstate.h" #include "hsaddappstocollectionstate.h" -#include "hsapp_defs.h" -#include "hsmainwindow.h" /*! \class HsCollectionState @@ -55,11 +51,6 @@ */ /*! - \var HsCollectionState::mCollectionsSortAttribute - All collections sort order. - */ - -/*! \var HsCollectionState::mCollectionId The id of the current collection. */ @@ -69,35 +60,6 @@ The type of the current collection. */ -/*! - \var HsCollectionState::mMenuView - The List View widget. - */ - -/*! - \var HsCollectionState::mSecondarySoftkeyAction - Secondary Softkey action. - Backstepping functionality. - Own. - */ - -/*! - \var HsCollectionState::mOldNavigationAction - Old navigation icon. - Not own. - */ - -/*! - \var HsCollectionState::mCollectionModel - Item Model for the List. - Own. - */ - -/*! - \var HsCollectionState::mOptions - Options menu. - Own. - */ /*! \fn void HsCollectionState::sortOrderChanged(SHsSortAttribute sortOrder); @@ -114,24 +76,19 @@ /*! Constructor. \param menuViewBuilder Menu view builder. - \param menuMode reference to object representing menu mode (add mode on/add mode off). + \param menuMode menu mode object (add mode on/add mode off). + \param mainWindow main window wrapper. \param parent Owner. */ HsCollectionState::HsCollectionState(HsMenuViewBuilder &menuViewBuilder, HsMenuModeWrapper &menuMode, HsMainWindow &mainWindow, QState *parent) : - HsBaseViewState(parent), + HsBaseViewState(mainWindow, menuMode, parent), mSortAttribute(LatestOnTopHsSortAttribute), - mCollectionsSortAttribute(CustomHsSortAttribute), - mCollectionId(-1), - mMenuView(menuViewBuilder, HsCollectionContext), - mMenuMode(menuMode), - mSecondarySoftkeyAction(new HbAction(Hb::BackNaviAction, this)), - mCollectionModel(0), - mOptions(0), mContextModelIndex(), mContextMenu(0), - mMainWindow(mainWindow) + mCollectionId(-1) { + initialize(menuViewBuilder, HsCollectionContext); construct(); } @@ -146,12 +103,7 @@ parent() != 0 ? parent()->objectName() : QString(""); setObjectName(parentName + "/collectionstate"); - connect(this, SIGNAL(entered()),SLOT(stateEntered())); - connect(this, SIGNAL(exited()),SLOT(stateExited())); - - mMenuView.collectionButton()->setCheckable(true); - makeConnect(); - mMenuView.view()->setNavigationAction(mSecondarySoftkeyAction); + mMenuView->collectionButton()->setCheckable(true); HSMENUTEST_FUNC_EXIT("HsCollectionState::construct"); } @@ -161,11 +113,8 @@ */ HsCollectionState::~HsCollectionState() { - makeDisconnect(); - mMenuView.inactivate(); - mMenuView.setModel(NULL); - mMenuView.view()->setNavigationAction(NULL); - delete mCollectionModel; + mMenuView->inactivate(); + mMenuView->view()->setNavigationAction(NULL); } @@ -192,101 +141,114 @@ /*! Slot invoked when a state is entered. */ - - void HsCollectionState::stateEntered() { HSMENUTEST_FUNC_ENTRY("HsCollectionState::stateEntered"); - - mMainWindow.setCurrentView(mMenuView); - mMenuView.activate(); - - if (!mCollectionModel) { - mCollectionModel = + HsBaseViewState::stateEntered(); + makeConnect(); + if (!mModel) { + mModel = HsMenuService::getCollectionModel( mCollectionId, mSortAttribute, mCollectionType); } - + EntryFlags flags = - mCollectionModel->root().data(CaItemModel::FlagsRole).value< + mModel->root().data(CaItemModel::FlagsRole).value< EntryFlags> (); - if (mCollectionModel->rowCount() == 0){ + if (mModel->rowCount() == 0){ if (flags & RemovableEntryFlag){ - mMenuView.setContext(HsCollectionContext,HsButtonContext); + mMenuView->setContext(HsCollectionContext,HsButtonContext); } else { - mMenuView.setContext(HsCollectionContext,HsEmptyLabelContext); + mMenuView->setContext(HsCollectionContext,HsEmptyLabelContext); } - mMenuView.disableSearch(true); + mMenuView->disableSearch(true); } else { - mMenuView.setContext(HsCollectionContext,HsItemViewContext); - mMenuView.disableSearch(false); + mMenuView->setContext(HsCollectionContext,HsItemViewContext); + mMenuView->disableSearch(false); } - connect(mCollectionModel, SIGNAL(modelReset()), SLOT(updateLabel())); - connect(mCollectionModel, SIGNAL(empty(bool)),this, + connect(mModel, SIGNAL(modelReset()), SLOT(updateLabel())); + connect(mModel, SIGNAL(empty(bool)),this, SLOT(handleEmptyChange(bool))); - connect(mCollectionModel, SIGNAL(empty(bool)),this, + connect(mModel, SIGNAL(empty(bool)),this, SLOT(lockSearchButton(bool))); - mMenuView.setModel(mCollectionModel); + mMenuView->setModel(mModel); + + mMenuView->listView()->scrollTo( + mModel->index(0), HbAbstractItemView::PositionAtTop); - mMenuView.listView()->scrollTo( - mCollectionModel->index(0), HbAbstractItemView::PositionAtTop); + mMenuView->viewLabel()->setHeading( + mModel->root().data(Qt::DisplayRole).toString()); + setMenuOptions(); + + HSMENUTEST_FUNC_EXIT("HsCollectionState::stateEntered"); +} - mMenuView.viewLabel()->setHeading( - mCollectionModel->root().data(Qt::DisplayRole).toString()); +/*! + Creates and installs menu options for the view + */ +void HsCollectionState::setMenuOptions() +{ + HSMENUTEST_FUNC_ENTRY("HsAllCollectionsState::setMenuOptions"); - if (!mOptions) { - mOptions = new HbMenu(); - mOptions->addAction(hbTrId("txt_applib_opt_task_switcher"), - this, + EntryFlags flags = + mModel->root().data(CaItemModel::FlagsRole).value (); + + QScopedPointer viewOptions(new HbMenu); + + viewOptions->addAction(hbTrId("txt_applib_opt_task_switcher"), + static_cast(this), SLOT(openTaskSwitcher())); - if (flags & RemovableEntryFlag) { - mOptions->addAction(hbTrId("txt_applib_opt_add_content"), this, - SLOT(addAppsAction())); - } - - mOptions->addAction(hbTrId("txt_applib_opt_add_to_home_screen"), - this, SLOT(addCollectionShortcutToHomeScreenAction())); + if (flags & RemovableEntryFlag) { + viewOptions->addAction(hbTrId("txt_applib_opt_add_content"), this, + SLOT(addAppsAction())); + } - if (flags & RemovableEntryFlag) { - mOptions->addAction( - hbTrId("txt_common_opt_rename_item"), + viewOptions->addAction(hbTrId("txt_applib_opt_add_to_home_screen"), + this, SLOT(addCollectionShortcutToHomeScreenAction())); + + if (flags & RemovableEntryFlag) { + if (mModel->rowCount() > 0) { + viewOptions->addAction( + hbTrId("txt_applib_opt_arrange"), this, - SLOT(renameAction())); - mOptions->addAction( - hbTrId("txt_common_opt_delete"), - this, - SLOT(deleteAction())); + SLOT(createArrangeCollection())); } - if (mCollectionType == collectionDownloadedTypeName()) { - HbMenu *sortMenu = mOptions->addMenu( - hbTrId("txt_applib_opt_sort_by")); - //Grouped options are exclusive by default. - QActionGroup *sortGroup = new QActionGroup(mOptions); - sortGroup->addAction( - sortMenu->addAction( - hbTrId("txt_applib_opt_sort_by_sub_latest_on_top"), - this, - SLOT(latestOnTopMenuAction()))); - sortGroup->addAction( - sortMenu->addAction( - hbTrId("txt_applib_opt_sort_by_sub_oldest_on_top"), - this, - SLOT(oldestOnTopMenuAction()))); - foreach(QAction *action, sortMenu->actions()) { - action->setCheckable(true); - } - static const int defaultSortingPosition = 0; - sortGroup->actions().at(defaultSortingPosition)->setChecked(true); + viewOptions->addAction( + hbTrId("txt_common_opt_rename_item"), + this, + SLOT(renameAction())); + viewOptions->addAction( + hbTrId("txt_common_opt_delete"), + this, + SLOT(deleteAction())); + } + if (mCollectionType == collectionDownloadedTypeName()) { + HbMenu *sortMenu = viewOptions->addMenu( + hbTrId("txt_applib_opt_sort_by")); + //Grouped options are exclusive by default. + QActionGroup *sortGroup = new QActionGroup(viewOptions.data()); + sortGroup->addAction( + sortMenu->addAction( + hbTrId("txt_applib_opt_sort_by_sub_latest_on_top"), + this, + SLOT(latestOnTopMenuAction()))); + sortGroup->addAction( + sortMenu->addAction( + hbTrId("txt_applib_opt_sort_by_sub_oldest_on_top"), + this, + SLOT(oldestOnTopMenuAction()))); + foreach(QAction *action, sortMenu->actions()) { + action->setCheckable(true); } - - mOptions->setParent(this); - mMenuView.view()->setMenu(mOptions); + static const int defaultSortingPosition = 0; + sortGroup->actions().at(defaultSortingPosition)->setChecked(true); } - HSMENUTEST_FUNC_EXIT("HsCollectionState::stateEntered"); + mMenuView->view()->setMenu(viewOptions.take()); + HSMENUTEST_FUNC_EXIT("HsAllCollectionsState::setMenuOptions"); } /*! @@ -295,29 +257,22 @@ void HsCollectionState::stateExited() { HSMENUTEST_FUNC_ENTRY("HsCollectionState::stateExited"); - - mMenuView.inactivate(); - mMenuView.setSearchPanelVisible(false); - mMenuView.disableSearch(false); - disconnect(mCollectionModel, SIGNAL(empty(bool)),this, + makeDisconnect(); + mMenuView->disableSearch(false); + disconnect(mModel, SIGNAL(empty(bool)),this, SLOT(handleEmptyChange(bool))); - disconnect(mCollectionModel, SIGNAL(empty(bool)),this, + disconnect(mModel, SIGNAL(empty(bool)),this, SLOT(lockSearchButton(bool))); - disconnect(mCollectionModel, SIGNAL(modelReset()), + disconnect(mModel, SIGNAL(modelReset()), this, SLOT(updateLabel())); - delete mCollectionModel; - mCollectionModel = NULL; - mOptions->close(); - delete mOptions; - mOptions = NULL; - if (mContextMenu) - mContextMenu->close(); + delete mModel; + mModel = NULL; this->mSortAttribute = NoHsSortAttribute; - + HsBaseViewState::stateExited(); - + HSMENUTEST_FUNC_EXIT("HsCollectionState::stateExited"); qDebug("CollectionState::stateExited()"); } @@ -327,15 +282,21 @@ */ void HsCollectionState::makeConnect() { - connect(mSecondarySoftkeyAction, SIGNAL(triggered()), - SLOT(backSteppingAction())); - connect(&mMenuView, + connect(mBackKeyAction, SIGNAL(triggered()), + static_cast(this), SLOT(openAppLibrary())); + connect(mMenuView.data(), + SIGNAL(activated(QModelIndex)), + static_cast(this), + SLOT(launchItem(QModelIndex))); + connect(mMenuView.data(), SIGNAL(activated(QModelIndex)), - SLOT(listItemActivated(QModelIndex))); - connect(&mMenuView, + mMenuView.data(), + SLOT(hideSearchPanel())); + connect(mMenuView.data(), SIGNAL(longPressed(HbAbstractViewItem *, QPointF)), - SLOT(listItemLongPressed(HbAbstractViewItem *, QPointF))); - connect(mMenuView.collectionButton(), + static_cast(this), + SLOT(showContextMenu(HbAbstractViewItem *, QPointF))); + connect(mMenuView->collectionButton(), SIGNAL(toggled(bool)), this, SLOT(addAppsAction(bool))); } @@ -344,130 +305,24 @@ */ void HsCollectionState::makeDisconnect() { - disconnect(mMenuView.collectionButton(), + disconnect(mMenuView->collectionButton(), SIGNAL(toggled(bool)), this, SLOT(addAppsAction(bool))); - disconnect(mSecondarySoftkeyAction, SIGNAL(triggered()), - this, SLOT(backSteppingAction())); - - disconnect(&mMenuView, - SIGNAL(activated(QModelIndex)), - this, SLOT(listItemActivated(QModelIndex))); - - disconnect(&mMenuView, - SIGNAL(longPressed(HbAbstractViewItem *, QPointF)), - this, SLOT(listItemLongPressed(HbAbstractViewItem *, QPointF))); -} - -/*! - Open task switcher. - \retval true if operation is successful. - */ -bool HsCollectionState::openTaskSwitcher() -{ - return HsMenuService::launchTaskSwitcher(); -} - -/*! - Slot connected to List widget. - \param index Model index of the activated item. - */ -void HsCollectionState::listItemActivated(const QModelIndex &index) -{ - HSMENUTEST_FUNC_ENTRY("HsCollectionState::listItemActivated"); - - QSharedPointer entry = mCollectionModel->entry(index); - - if (entry->entryTypeName() == widgetTypeName()) { - EntryFlags flags = index.data(CaItemModel::FlagsRole).value< - EntryFlags> (); - if (!(flags & UninstallEntryFlag)) { - machine()->postEvent( - HsMenuEventFactory::createPreviewHSWidgetEvent( - entry->id(), entry->entryTypeName(), entry->attribute( - widgetUriAttributeName()), entry->attribute( - widgetLibraryAttributeName()))); - - const int itemId = index.data(CaItemModel::IdRole).toInt(); - HsMenuService::touch(itemId); - } - } else { - QVariant data = mCollectionModel->data(index, CaItemModel::IdRole); - int errCode = HsMenuService::executeAction(data.toInt()); - if (errCode != 0) { - createApplicationLaunchFailMessage(errCode,index.data(CaItemModel::IdRole).toInt()); - } - } - - mMenuView.setSearchPanelVisible(false); - HSMENUTEST_FUNC_EXIT("HsCollectionState::listItemActivated"); -} + disconnect(mBackKeyAction, SIGNAL(triggered()), + static_cast(this), SLOT(openAppLibrary())); -/*! - Handles long-item-pressed event in all apps view by showing context menu - \param item the event pertains to - \param coords press point coordinates. - \retval void - */ -void HsCollectionState::listItemLongPressed(HbAbstractViewItem *item, - const QPointF &coords) -{ - HSMENUTEST_FUNC_ENTRY("HsCollectionState::listItemLongPressed"); - - EntryFlags flags = item->modelIndex().data(CaItemModel::FlagsRole).value< - EntryFlags> (); - - if (!(flags & UninstallEntryFlag)) { - // create context menu - mContextMenu = new HbMenu(); - - HbAction *addShortcutAction = mContextMenu->addAction(hbTrId( - "txt_applib_menu_add_to_home_screen")); - addShortcutAction->setData(AddToHomeScreenContextAction); - HbAction *addToCollection = mContextMenu->addAction(hbTrId( - "txt_applib_menu_add_to_collection")); - addToCollection->setData(AddToCollectionContextAction); - HbAction *removeAction(NULL); - HbAction *uninstallAction(NULL); - HbAction *appSettingsAction(NULL); - HbAction *appDetailsAction(NULL); - // we do not add remove option in locked collection - // check conditions and hide irrelevant menu items - EntryFlags rootFlags = - mCollectionModel->root().data(CaItemModel::FlagsRole).value< - EntryFlags> (); - - if (rootFlags & RemovableEntryFlag) { - removeAction = mContextMenu->addAction( - hbTrId("txt_applib_menu_remove_from_collection")); - removeAction->setData(RemoveFromCollectionContextAction); - } - - if ((flags & RemovableEntryFlag)) { - uninstallAction = mContextMenu->addAction(hbTrId("txt_common_menu_delete")); - uninstallAction->setData(UninstallContextAction); - } - QSharedPointer entry = mCollectionModel->entry(item->modelIndex()); - - if (!(entry->attribute(appSettingsPlugin()).isEmpty())) { - appSettingsAction = mContextMenu->addAction(hbTrId( - "txt_common_menu_settings")); - appSettingsAction->setData(AppSettingContextAction); - } - - if (!(entry->attribute(componentIdAttributeName()).isEmpty()) && - (flags & RemovableEntryFlag) ) { - appDetailsAction = mContextMenu->addAction(hbTrId( - "txt_common_menu_details")); - appDetailsAction->setData(AppDetailsContextAction); - } - mContextModelIndex = item->modelIndex(); - mContextMenu->setPreferredPos(coords); - mContextMenu->setAttribute(Qt::WA_DeleteOnClose); - mContextMenu->open(this, SLOT(contextMenuAction(HbAction*))); - } - - HSMENUTEST_FUNC_EXIT("HsCollectionState::listItemLongPressed"); + disconnect(mMenuView.data(), + SIGNAL(activated(QModelIndex)), + static_cast(this), + SLOT(launchItem(QModelIndex))); + disconnect(mMenuView.data(), + SIGNAL(activated(QModelIndex)), + mMenuView.data(), + SLOT(hideSearchPanel())); + disconnect(mMenuView.data(), + SIGNAL(longPressed(HbAbstractViewItem *, QPointF)), + static_cast(this), + SLOT(showContextMenu(HbAbstractViewItem *, QPointF))); } /*! @@ -475,7 +330,7 @@ */ void HsCollectionState::contextMenuAction(HbAction *action) { - HsContextAction command = + HsContextAction command = static_cast(action->data().toInt()); const int itemId = mContextModelIndex.data(CaItemModel::IdRole).toInt(); @@ -486,8 +341,8 @@ break; case AddToCollectionContextAction: machine()->postEvent( - HsMenuEventFactory::createAddAppsFromCallectionViewEvent( - mCollectionId, itemId, mCollectionsSortAttribute)); + HsMenuEventFactory::createAddAppsFromCollectionViewEvent( + mCollectionId, itemId)); break; case UninstallContextAction: machine()->postEvent( @@ -499,66 +354,68 @@ HsMenuEventFactory::createRemoveAppFromCollectionEvent( itemId, mCollectionId)); break; - case AppSettingContextAction: + case AppSettingContextAction: machine()->postEvent( HsMenuEventFactory::createAppSettingsViewEvent(itemId)); break; - case AppDetailsContextAction: + case AppDetailsContextAction: machine()->postEvent( HsMenuEventFactory::createAppDetailsViewEvent(itemId)); - break; + break; default: break; } - - mMenuView.setSearchPanelVisible(false); + + mMenuView->setSearchPanelVisible(false); } /*! Handles button visibility - \param empty if true set empty text label or button to add entries to collection + \param empty if true set empty text label or button to add entries to collection. */ void HsCollectionState::handleEmptyChange(bool empty) { EntryFlags flags = - mCollectionModel->root().data(CaItemModel::FlagsRole).value< + mModel->root().data(CaItemModel::FlagsRole).value< EntryFlags> (); if (empty){ if (flags & RemovableEntryFlag){ - mMenuView.setContext(HsCollectionContext,HsButtonContext); + mMenuView->setContext(HsCollectionContext,HsButtonContext); } else { - mMenuView.setContext(HsCollectionContext,HsEmptyLabelContext); + mMenuView->setContext(HsCollectionContext,HsEmptyLabelContext); } } else { - mMenuView.setContext(HsCollectionContext,HsItemViewContext); + mMenuView->setContext(HsCollectionContext,HsItemViewContext); } + setMenuOptions(); } /*! - Handles lock serch button - \param lock if true lock search button + Handles lock search button + \param lock if true lock search button. */ void HsCollectionState::lockSearchButton(bool lock) { - mMenuView.disableSearch(lock); + mMenuView->disableSearch(lock); } /*! Menu add applications action slot - \param addApps if true create event for add enties to collection. Parametr use by toggled from HbPushButton + \param addApps if true create event for add enties to collection. + Parametr use by toggled from HbPushButton */ void HsCollectionState::addAppsAction(bool addApps) { // Add applications if (addApps) { - mMenuView.collectionButton()->setChecked(false); + mMenuView->collectionButton()->setChecked(false); machine()->postEvent( - HsMenuEventFactory::createAddAppsFromCallectionViewEvent( + HsMenuEventFactory::createAddAppsFromCollectionViewEvent( mCollectionId)); - } + } } /*! @@ -567,8 +424,8 @@ void HsCollectionState::addCollectionShortcutToHomeScreenAction() { machine()->postEvent(HsMenuEventFactory::createAddToHomeScreenEvent( - mCollectionId, mMenuMode.getHsMenuMode(), - mMenuMode.getHsToken())); + mCollectionId, mMenuMode->getHsMenuMode(), + mMenuMode->getHsToken())); } /*! @@ -590,40 +447,79 @@ } /*! - Menu softkey back action slot - */ -void HsCollectionState::backSteppingAction() -{ - machine()->postEvent(HsMenuEventFactory::createOpenAppLibraryEvent()); -} - -/*! Updates label */ void HsCollectionState::updateLabel() { HSMENUTEST_FUNC_ENTRY("HsCollectionState::updateLabel"); - if (mCollectionModel) { - mMenuView.viewLabel()->setHeading( - mCollectionModel->root().data(Qt::DisplayRole).toString()); + if (mModel) { + mMenuView->viewLabel()->setHeading( + mModel->root().data(Qt::DisplayRole).toString()); } HSMENUTEST_FUNC_EXIT("HsCollectionState::updateLabel"); } /*! Triggers event so that a state adding to Home Screen is reached - \param index of an item to be added to homescreen + \param index of an item to be added to homescreen. \retval void */ void HsCollectionState::addElementToHomeScreen(const QModelIndex &index) { - QSharedPointer entry = mCollectionModel->entry(index); + QSharedPointer entry = mModel->entry(index); QMap attributes = entry->attributes(); machine()->postEvent( HsMenuEventFactory::createAddToHomeScreenEvent( - entry->id(), mMenuMode.getHsMenuMode(), mMenuMode.getHsToken())); + entry->id(), mMenuMode->getHsMenuMode(), mMenuMode->getHsToken())); +} + +/*! + Method seting context menu options. + */ +void HsCollectionState::setContextMenuOptions(HbAbstractViewItem *item, EntryFlags flags) +{ + HbAction *addShortcutAction = mContextMenu->addAction(hbTrId( + "txt_applib_menu_add_to_home_screen")); + addShortcutAction->setData(AddToHomeScreenContextAction); + HbAction *addToCollection = mContextMenu->addAction(hbTrId( + "txt_applib_menu_add_to_collection")); + addToCollection->setData(AddToCollectionContextAction); + HbAction *removeAction(NULL); + HbAction *uninstallAction(NULL); + HbAction *appSettingsAction(NULL); + HbAction *appDetailsAction(NULL); + // we do not add remove option in locked collection + // check conditions and hide irrelevant menu items + EntryFlags rootFlags = + mModel->root().data(CaItemModel::FlagsRole).value< + EntryFlags> (); + + if (rootFlags & RemovableEntryFlag) { + removeAction = mContextMenu->addAction( + hbTrId("txt_applib_menu_remove_from_collection")); + removeAction->setData(RemoveFromCollectionContextAction); + } + + if ((flags & RemovableEntryFlag)) { + uninstallAction = mContextMenu->addAction(hbTrId("txt_common_menu_delete")); + uninstallAction->setData(UninstallContextAction); + } + QSharedPointer entry = mModel->entry(item->modelIndex()); + + if (!(entry->attribute(appSettingsPlugin()).isEmpty())) { + appSettingsAction = mContextMenu->addAction(hbTrId( + "txt_common_menu_settings")); + appSettingsAction->setData(AppSettingContextAction); + } + + if (!(entry->attribute(componentIdAttributeName()).isEmpty()) && + (flags & RemovableEntryFlag) ) { + appDetailsAction = mContextMenu->addAction(hbTrId( + "txt_common_menu_details")); + appDetailsAction->setData(AppDetailsContextAction); + } } /*! @@ -633,7 +529,7 @@ void HsCollectionState::latestOnTopMenuAction() { mSortAttribute = LatestOnTopHsSortAttribute; - mCollectionModel->setSort(mSortAttribute); + mModel->setSort(mSortAttribute); emit sortOrderChanged(mSortAttribute); } @@ -644,16 +540,29 @@ void HsCollectionState::oldestOnTopMenuAction() { mSortAttribute = OldestOnTopHsSortAttribute; - mCollectionModel->setSort(mSortAttribute); + mModel->setSort(mSortAttribute); emit sortOrderChanged(mSortAttribute); } /*! - Slot for setting all collections sort order - \param sortOrder all collections sort order + A Slot called when an arrange operation + is invoked for a static collection. */ -void HsCollectionState::collectionsSortOrder( - HsSortAttribute sortOrder) +void HsCollectionState::createArrangeCollection() { - mCollectionsSortAttribute = sortOrder; + // Arrange collection via the Arrange view + int topItemId(0); + + const QList array = + mMenuView->listView()->visibleItems(); + + if (array.count() >= 1) { + QModelIndex idx = array[0]->modelIndex(); + topItemId = idx.data(CaItemModel::IdRole).toInt(); + } + + machine()->postEvent( + HsMenuEventFactory::createArrangeCollectionEvent( + topItemId, + mCollectionId)); } diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsinstalledappsstate.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsinstalledappsstate.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsinstalledappsstate.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -15,26 +15,23 @@ * */ -#include +#include +#include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include + +#include #include -#include +#include "hsapp_defs.h" +#include "hsmenueventfactory.h" #include "hsmenuitemmodel.h" -#include "hsmenuviewbuilder.h" -#include "cadefs.h" #include "hsinstalledappsstate.h" #include "hsaddappstocollectionstate.h" -#include "hsapp_defs.h" #include "hsmenumodetransition.h" -#include "hsmainwindow.h" /*! \class HsInstalledAppsState @@ -46,45 +43,17 @@ */ /*! - \var HsInstalledAppsState::mMenuView - The View widget. - Own. - */ - -/*! - \var HsInstalledAppsState::mInstalledAppsModel - Item Model for the List. - Own. - */ - -/*! - \var HsInstalledAppsState::mSecondarySoftkeyAction - Secondary Softkey action. - Backstepping functionality. - Own. - */ - -/*! - \var HsInstalledAppsState::mOldNavigationAction - Old navigation icon. - Not own. - */ - -/*! Constructor. \param menuViewBuilder Menu view builder. + \param mainWindow main window wrapper. \param parent Owner. */ HsInstalledAppsState::HsInstalledAppsState(HsMenuViewBuilder &menuViewBuilder, HsMainWindow &mainWindow, QState *parent): - HsBaseViewState(parent), - mMenuView(menuViewBuilder, HsInstalledAppsContext), - mInstalledAppsModel(0), - mSecondarySoftkeyAction(new HbAction(Hb::BackNaviAction, this)), - mMainWindow(mainWindow), - mContextModelIndex(),mContextMenu(0) + HsBaseViewState(mainWindow, parent) { + initialize(menuViewBuilder, HsInstalledAppsContext); construct(); } @@ -98,16 +67,8 @@ const QString parentName = parent() != 0 ? parent()->objectName() : QString(""); setObjectName(parentName + "/installedappsstate"); - connect(this, SIGNAL(entered()),SLOT(stateEntered())); - connect(this, SIGNAL(exited()),SLOT(stateExited())); - connect(mSecondarySoftkeyAction, SIGNAL(triggered()), - SLOT(backAction())); - mMenuView.view()-> - setNavigationAction(mSecondarySoftkeyAction); - - - setMenuOptions(); + connect(mBackKeyAction, SIGNAL(triggered()), SLOT(openAppLibrary())); HSMENUTEST_FUNC_EXIT("HsInstalledAppsState::construct"); } @@ -123,21 +84,43 @@ mOptions->addAction(hbTrId("txt_applib_opt_task_switcher"), this, SLOT(openTaskSwitcher())); + mOptions->addAction(hbTrId("txt_applib_opt_installation_log"), + this, SLOT(openInstallationLog())); - mMenuView.view()->setMenu(mOptions); + mMenuView->view()->setMenu(mOptions); HSMENUTEST_FUNC_EXIT("HsInstalledAppsState::setMenuOptions"); } /*! + Method seting context menu options. + \param item the context menu is built for. + \param flags of the \item. + */ +void HsInstalledAppsState::setContextMenuOptions(HbAbstractViewItem *item, EntryFlags flags) +{ + HbAction *uninstallAction = mContextMenu->addAction( + hbTrId("txt_common_menu_delete")); + HbAction *appDetailsAction(NULL); + uninstallAction->setData(UninstallContextAction); + + QSharedPointer entry = mModel->entry(item->modelIndex()); + + if (!(entry->attribute(componentIdAttributeName()).isEmpty()) && + (flags & RemovableEntryFlag) ) { + appDetailsAction = mContextMenu->addAction(hbTrId( + "txt_common_menu_details")); + appDetailsAction->setData(AppDetailsContextAction); + } +} + + +/*! Destructor. */ HsInstalledAppsState::~HsInstalledAppsState() { - mMenuView.inactivate(); - mMenuView.setModel(NULL); - mMenuView.view()->setNavigationAction(NULL); - - delete mInstalledAppsModel; + mMenuView->inactivate(); + mMenuView->view()->setNavigationAction(NULL); } /*! @@ -149,30 +132,26 @@ qDebug("AllAppsState::stateEntered()"); HSMENUTEST_FUNC_ENTRY("HsInstalledAppsState::stateEntered"); - mMainWindow.setCurrentView(mMenuView); - mMenuView.activate(); - - if (!mInstalledAppsModel) { - mInstalledAppsModel + HsBaseViewState::stateEntered(); + setMenuOptions(); + if (!mModel) { + mModel = HsMenuService::getInstalledModel(AscendingNameHsSortAttribute); - mMenuView.setModel(mInstalledAppsModel); + mMenuView->setModel(mModel); } - if (mInstalledAppsModel->rowCount() == 0){ - mMenuView.setContext(HsInstalledAppsContext,HsEmptyLabelContext); + if (mModel->rowCount() == 0){ + mMenuView->setContext(HsInstalledAppsContext,HsEmptyLabelContext); } - mMenuView.listView()->scrollTo( - mInstalledAppsModel->index(0)); + mMenuView->listView()->scrollTo( + mModel->index(0)); - connect(&mMenuView, - SIGNAL(activated(QModelIndex)), - SLOT(listItemActivated(QModelIndex))); - connect(&mMenuView, + connect(mMenuView.data(), SIGNAL(longPressed(HbAbstractViewItem *, QPointF)), - SLOT(listItemLongPressed(HbAbstractViewItem *, QPointF))); + SLOT(showContextMenu(HbAbstractViewItem *, QPointF))); - connect(mInstalledAppsModel, SIGNAL(empty(bool)),this, + connect(mModel, SIGNAL(empty(bool)),this, SLOT(setEmptyLabelVisibility(bool))); HSMENUTEST_FUNC_EXIT("HsInstalledAppsState::stateEntered"); @@ -185,23 +164,13 @@ { HSMENUTEST_FUNC_ENTRY("HsInstalledAppsState::stateExited"); - disconnect(mInstalledAppsModel, SIGNAL(empty(bool)),this, + disconnect(mModel, SIGNAL(empty(bool)),this, SLOT(setEmptyLabelVisibility(bool))); - mMenuView.setSearchPanelVisible(false); - - disconnect(&mMenuView, - SIGNAL(activated(QModelIndex)), this, - SLOT(listItemActivated(QModelIndex))); - disconnect(&mMenuView, + disconnect(mMenuView.data(), SIGNAL(longPressed(HbAbstractViewItem *, QPointF)), this, - SLOT(listItemLongPressed(HbAbstractViewItem *, QPointF))); - - mMenuView.inactivate(); + SLOT(showContextMenu(HbAbstractViewItem *, QPointF))); - if (mContextMenu) - mContextMenu->close(); - HsBaseViewState::stateExited(); HSMENUTEST_FUNC_EXIT("HsInstalledAppsState::stateExited"); @@ -209,89 +178,30 @@ } /*! - Handles button visibility + Handles button visibility. + \param visibility indicates whether show or not to show 'empty' label. */ void HsInstalledAppsState::setEmptyLabelVisibility(bool visibility) { if(visibility){ - mMenuView.setContext(HsInstalledAppsContext,HsEmptyLabelContext); + mMenuView->setContext(HsInstalledAppsContext,HsEmptyLabelContext); } else { - mMenuView.setContext(HsInstalledAppsContext,HsItemViewContext); + mMenuView->setContext(HsInstalledAppsContext,HsItemViewContext); } } /*! - Open task switcher. - \retval true if operation is successful. + Open installation log. */ -bool HsInstalledAppsState::openTaskSwitcher() +void HsInstalledAppsState::openInstallationLog() { - return HsMenuService::launchTaskSwitcher(); + machine()->postEvent( + HsMenuEventFactory::createInstallationLogEvent()); } /*! - Method invoked when a list item is activated. - \param index indec of activated item. - */ -#ifdef COVERAGE_MEASUREMENT -#pragma CTC SKIP -#endif //COVERAGE_MEASUREMENT -void HsInstalledAppsState::listItemActivated(const QModelIndex &/*index*/) -{ - //no implementation yet -} -#ifdef COVERAGE_MEASUREMENT -#pragma CTC ENDSKIP -#endif //COVERAGE_MEASUREMENT - -/*! - Handles long-item-pressed event in all apps view by showing context menu - \param item the event pertains to - \param coords press point coordinates. - */ -#ifdef COVERAGE_MEASUREMENT -#pragma CTC SKIP -#endif //COVERAGE_MEASUREMENT -void HsInstalledAppsState::listItemLongPressed(HbAbstractViewItem *item, - const QPointF &coords) -{ - HSMENUTEST_FUNC_ENTRY("HsInstalledAppsState::listItemLongPressed"); - - EntryFlags flags = item->modelIndex().data( - CaItemModel::FlagsRole).value (); - if (!(flags & UninstallEntryFlag)) { - // create context menu - mContextMenu = new HbMenu(); - - HbAction *uninstallAction = mContextMenu->addAction( - hbTrId("txt_common_menu_delete")); - HbAction *appDetailsAction(NULL); - uninstallAction->setData(UninstallContextAction); - - QSharedPointer entry = mInstalledAppsModel->entry(item->modelIndex()); - - if (!(entry->attribute(componentIdAttributeName()).isEmpty()) && - (flags & RemovableEntryFlag) ) { - appDetailsAction = mContextMenu->addAction(hbTrId( - "txt_common_menu_details")); - appDetailsAction->setData(AppDetailsContextAction); - } - - mContextModelIndex = item->modelIndex(); - mContextMenu->setPreferredPos(coords); - mContextMenu->setAttribute(Qt::WA_DeleteOnClose); - mContextMenu->open(this, SLOT(contextMenuAction(HbAction*))); - } - - - HSMENUTEST_FUNC_EXIT("HsInstalledAppsState::listItemLongPressed"); -} -#ifdef COVERAGE_MEASUREMENT -#pragma CTC ENDSKIP -#endif //COVERAGE_MEASUREMENT - -/*! - Handles context menu actions + Handles context menu actions. + \param action to handle. */ void HsInstalledAppsState::contextMenuAction(HbAction *action) { @@ -313,19 +223,5 @@ default: break; } - mMenuView.setSearchPanelVisible(false); + mMenuView->setSearchPanelVisible(false); } - -/*! - Slot invoked when a back action is triggered. - */ -#ifdef COVERAGE_MEASUREMENT -#pragma CTC SKIP -#endif //COVERAGE_MEASUREMENT -void HsInstalledAppsState::backAction() -{ - machine()->postEvent(HsMenuEventFactory::createOpenAppLibraryEvent()); -} -#ifdef COVERAGE_MEASUREMENT -#pragma CTC ENDSKIP -#endif //COVERAGE_MEASUREMENT diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hslistviewitem.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hslistviewitem.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hslistviewitem.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -62,17 +62,23 @@ if (!progress) { progress = new HbProgressBar(this); progress->setRange(0, 100); + HbEffect::disable(progress); repolish(); } int progresVal = modelIndex().data( CaItemModel::UninstalRole).toInt(); progress->setProgressValue(progresVal); HbStyle::setItemName(progress, "progress"); + if (!progress->isVisible()) { + progress->setVisible(!progress->isVisible()); + repolish(); + } } else if (progress) { HbStyle::setItemName(progress, ""); - delete progress; - progress = 0; - repolish(); + if (progress->isVisible()) { + progress->setVisible(!progress->isVisible()); + repolish(); + } } // hide text-2 if we have to foreach (QGraphicsItem * item, this->childItems()) { diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmainwindow.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmainwindow.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmainwindow.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -21,11 +21,11 @@ #include "hsmainwindow.h" #include "hsmenuview.h" -#include + /*! Constructor */ -QTM_USE_NAMESPACE + /* @@ -36,7 +36,7 @@ */ -HsMainWindow::HsMainWindow() : mActivityClient(NULL) +HsMainWindow::HsMainWindow() { } @@ -55,9 +55,6 @@ { HbMainWindow *const hbW( HbInstance::instance()->allMainWindows().value(0)); - - connect( hbW, SIGNAL(viewReady()), SIGNAL(viewIsReady()), - Qt::UniqueConnection ); HbView *const view = menuView.view(); @@ -66,53 +63,3 @@ } hbW->setCurrentView(view); } - - -/*! - Grabs screenshot from actual main window - \retval QPixmap& containing screenshot -*/ -QPixmap HsMainWindow::grabScreenshot() - { - HbMainWindow *const hbW( - HbInstance::instance()->allMainWindows().value(0)); - return QPixmap::grabWidget(hbW, hbW->rect()); - } - -/*! - Saves applib activity with current view screenshot -*/ -void HsMainWindow::saveActivity() -{ -#ifdef Q_OS_SYMBIAN - - if (!mActivityClient) { - QServiceManager serviceManager; - mActivityClient = serviceManager.loadInterface("com.nokia.qt.activities.ActivityClient"); - if (!mActivityClient) { - qWarning("Cannot initialize critical com.nokia.qt.activities.ActivityClient service."); - } - } - - if (mActivityClient) { - bool retok; - bool ok = QMetaObject::invokeMethod(mActivityClient, "removeActivity", - Q_RETURN_ARG(bool, retok), Q_ARG(QString, appLibActivity())); - if (!ok) { - qWarning("remove appLibActivity failed"); - } - - QVariant variant; - QVariantHash metadata; - metadata.insert("screenshot", grabScreenshot()); - - ok = QMetaObject::invokeMethod(mActivityClient, "addActivity", Q_RETURN_ARG(bool, retok), - Q_ARG(QString, appLibActivity() ), Q_ARG(QVariant, QVariant(variant)), - Q_ARG(QVariantHash, metadata)); - if (!ok) { - qWarning("add appLibActivity failed"); - } - } -#endif//Q_OS_SYMBIAN -} - diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuview.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuview.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuview.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include "hsallappsstate.h" #include "hsallcollectionsstate.h" @@ -65,7 +65,7 @@ mListView(NULL), mViewLabel(NULL), mSearchListView(NULL), - mSearchPanel(NULL), + mSearchPanel(NULL), mVkbHost(NULL) { mBuilder.setOperationalContext(HsItemViewContext); @@ -83,9 +83,7 @@ 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())); + mVkbHost.reset(new HbShrinkingVkbHost(mView)); connect(mListView, SIGNAL(activated(QModelIndex)), @@ -367,27 +365,17 @@ */ void HsMenuView::findItem(QString criteriaStr) { - qDebug - () << QString("hsmenuview::findItem: %1").arg(criteriaStr); + qDebug() << QString("hsmenuview::findItem: %1").arg(criteriaStr); HSMENUTEST_FUNC_ENTRY("hsmenuview::findItem"); - if ("" != criteriaStr) { - mProxyModel->invalidate(); - mProxyModel->setSourceModel(mListView->model()); - mProxyModel->setFilterRegExp(QRegExp( - QString("(^|\\b)%1").arg(criteriaStr), Qt::CaseInsensitive)); - mSearchListView->scrollTo(mProxyModel->index(0,0), - HbAbstractItemView::PositionAtTop); - } else { - mProxyModel->setFilterRegExp(QRegExp(QString(".*"), - Qt::CaseInsensitive, QRegExp::RegExp)); + mProxyModel->invalidate(); + mProxyModel->setSourceModel(mListView->model()); + mProxyModel->setFilterRegExp(QRegExp( + QString("(^|\\b)%1").arg(criteriaStr), Qt::CaseInsensitive)); - // scroll to first item in model - mSearchListView->scrollTo( - mProxyModel->index(0, 0), - - HbAbstractItemView::PositionAtTop); - } + mSearchListView->scrollTo(mProxyModel->index(0,0), + HbAbstractItemView::PositionAtTop); + HSMENUTEST_FUNC_EXIT("hsmenuview::findItem"); } @@ -440,7 +428,6 @@ mSearchListView = NULL; mSearchPanel = NULL; - vkbClosed(); HSMENUTEST_FUNC_EXIT("hsmenuview::searchFinished"); } @@ -493,21 +480,3 @@ disconnect(mBuilder.searchAction(), SIGNAL(triggered()), this, SLOT(showSearchPanel())); } - - -/*! - 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 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuviewbuilder.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuviewbuilder.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuviewbuilder.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -63,6 +63,8 @@ lineEdit->setText(""); lineEdit->setFocus(); + lineEdit->setInputMethodHints(Qt::ImhNoPredictiveText | + Qt::ImhNoAutoUppercase); } } diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hshomescreenstateplugin/inc/hsidlestate.h --- a/homescreenapp/stateplugins/hshomescreenstateplugin/inc/hsidlestate.h Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hshomescreenstateplugin/inc/hsidlestate.h Fri Jul 09 14:36:01 2010 +0300 @@ -44,6 +44,9 @@ #endif class HsWidgetHost; +class HsPage; +class HsMessageBoxWrapper; +class HsPropertyAnimationWrapper; class HsIdleState : public QState { @@ -60,6 +63,7 @@ void event_moveScene(); void event_selectWallpaper(); void event_addPage(); + void event_preRemovePage(); void event_removePage(); void event_toggleConnection(); @@ -78,8 +82,6 @@ void addPageToScene(int pageIndex); void updateZoneAnimation(); void showTrashBin(); - void removeActivePage(); - void deleteZoneAnimation(); QList createInactiveWidgetRects(); void updatePagePresentationToWidgetSnap(); void resetSnapPosition(); @@ -117,6 +119,8 @@ void action_moveScene_moveToNearestPage(); void action_moveScene_disconnectGestureHandlers(); void action_addPage_addPage(); + void action_preRemovePage_showQuery(); + void action_removePage_startRemovePageAnimation(); void action_removePage_removePage(); void action_toggleConnection_toggleConnection(); void action_idle_setupTitle(); @@ -136,18 +140,17 @@ bool openTaskSwitcher(); void zoneAnimationFinished(); void pageChangeAnimationFinished(); - void onRemovePageConfirmationOk(); void onVerticalSnapLineTimerTimeout(); void onHorizontalSnapLineTimerTimeout(); void onActivePageChanged(); - + private: HbAction *mNavigationAction; HsIdleWidget *mUiWidget; HsTitleResolver *mTitleResolver; QPropertyAnimation *mZoneAnimation; bool mAllowZoneAnimation; - QPropertyAnimation *mPageChangeAnimation; + HsPropertyAnimationWrapper *mPageChangeAnimation; HbContinuousFeedback *mContinuousFeedback; bool mTrashBinFeedbackAlreadyPlayed; QPointF mPageHotSpot; @@ -157,12 +160,13 @@ QPointer mSceneMenu; HsWidgetPositioningOnWidgetMove::Result mSnapResult; HsWidgetPositioningOnWidgetMove::Result mPreviousSnapResult; - qreal mSnapBorderGap; QTimer mVerticalSnapLineTimer; - QTimer mHorizontalSnapLineTimer; + QTimer mHorizontalSnapLineTimer; #ifdef Q_OS_SYMBIAN XQSettingsManager *mSettingsMgr; #endif + HsMessageBoxWrapper *mMessageBoxWrapper; + HOMESCREEN_TEST_FRIEND_CLASS(HomeScreenStatePluginTest) }; diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hshomescreenstateplugin/src/hsidlestate.cpp --- a/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsidlestate.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsidlestate.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -53,6 +53,8 @@ #include "hsmenuservice.h" #include "hsgui.h" #include "hsconfiguration.h" +#include "hsmessageboxwrapper.h" +#include "hspropertyanimationwrapper.h" // Helper macros for connecting state entry and exit actions. #define ENTRY_ACTION(state, action) \ @@ -92,10 +94,10 @@ const char hsLocTextId_Confirmation_RemovePage[] = "txt_homescreen_info_page_and_content_will_be_remov"; //Button in confirmation dialog while removing page with content - const char hsLocTextId_ConfirmationButton_Ok[] = "txt_homescreen_button_ok"; + //const char hsLocTextId_ConfirmationButton_Ok[] = "txt_homescreen_button_ok"; //Button in confirmation dialog while removing page with content - const char hsLocTextId_ConfirmationButton_Cancel[] = "txt_homescreen_button_cancel"; + //const char hsLocTextId_ConfirmationButton_Cancel[] = "txt_homescreen_button_cancel"; } /*! @@ -114,7 +116,8 @@ */ HsIdleState::HsIdleState(QState *parent) : QState(parent), - mNavigationAction(0), mUiWidget(0), + mNavigationAction(0), + mUiWidget(0), mTitleResolver(0), mZoneAnimation(0), mAllowZoneAnimation(false), @@ -122,15 +125,16 @@ mContinuousFeedback(0), mTrashBinFeedbackAlreadyPlayed(false), mDeltaX(0), - mSceneMenu(0), - mSnapBorderGap(0.0) + mSceneMenu(0) #ifdef Q_OS_SYMBIAN ,mSettingsMgr(0) #endif + ,mMessageBoxWrapper(0) + { setupStates(); mTitleResolver = new HsTitleResolver(this); - + // TODO: Uncomment when updated API available //mContinuousFeedback = new HbContinuousFeedback; //mContinuousFeedback->setContinuousEffect(HbFeedback::ContinuousSmooth); @@ -145,7 +149,15 @@ */ HsIdleState::~HsIdleState() { - delete mZoneAnimation; + if (mZoneAnimation) { + mZoneAnimation->stop(); + delete mZoneAnimation; + } + if (mPageChangeAnimation) { + mPageChangeAnimation->stop(); + delete mPageChangeAnimation; + } + // TODO: Uncomment when updated API available //delete mContinuousFeedback; } @@ -231,6 +243,7 @@ HsWallpaperSelectionState *state_wallpaperSelectionState = new HsWallpaperSelectionState(this); QState *state_addPage = new QState(this); + QState *state_preRemovePage = new QState(this); QState *state_removePage = new QState(this); QState *state_toggleConnection = new QState(this); @@ -239,7 +252,7 @@ state_waitInput->addTransition( this, SIGNAL(event_addPage()), state_addPage); state_waitInput->addTransition( - this, SIGNAL(event_removePage()), state_removePage); + this, SIGNAL(event_preRemovePage()), state_preRemovePage); state_waitInput->addTransition( this, SIGNAL(event_toggleConnection()), state_toggleConnection); state_waitInput->addTransition( @@ -259,8 +272,15 @@ state_wallpaperSelectionState, SIGNAL(event_waitInput()), state_waitInput); state_addPage->addTransition(state_waitInput); + + state_preRemovePage->addTransition( + this,SIGNAL(event_removePage()),state_removePage); + + state_preRemovePage->addTransition( + this,SIGNAL(event_waitInput()),state_waitInput); - state_removePage->addTransition(state_waitInput); + state_removePage->addTransition( + this,SIGNAL(event_waitInput()),state_waitInput); state_toggleConnection->addTransition(state_waitInput); @@ -299,8 +319,11 @@ EXIT_ACTION(state_moveScene, action_moveScene_disconnectGestureHandlers) ENTRY_ACTION(state_addPage, action_addPage_addPage) + + ENTRY_ACTION(state_preRemovePage, action_preRemovePage_showQuery) - ENTRY_ACTION(state_removePage, action_removePage_removePage) + ENTRY_ACTION(state_removePage, action_removePage_startRemovePageAnimation) + EXIT_ACTION(state_removePage, action_removePage_removePage) ENTRY_ACTION(state_toggleConnection, action_toggleConnection_toggleConnection) } @@ -319,13 +342,10 @@ */ void HsIdleState::startPageChangeAnimation(int targetPageIndex, int duration) { - if (!mPageChangeAnimation) { - mPageChangeAnimation = new QPropertyAnimation(mUiWidget, "sceneX"); - } - else if (mPageChangeAnimation->state() != QAbstractAnimation::Stopped) { + if (mPageChangeAnimation->isRunning()) { mPageChangeAnimation->stop(); } - + mPageChangeAnimation->disconnect(this); mPageChangeAnimation->setEndValue(pageLayerXPos(targetPageIndex)); mPageChangeAnimation->setDuration(duration); connect(mPageChangeAnimation, @@ -358,10 +378,6 @@ return; } - if (!mZoneAnimation) { - mZoneAnimation = new QPropertyAnimation(mUiWidget, "sceneX"); - } - int bounceEffect = HSCONFIGURATION_GET(bounceEffect); if (isInLeftPageChangeZone()) { @@ -374,7 +390,8 @@ connect(mZoneAnimation, SIGNAL(finished()), - SLOT(zoneAnimationFinished())); + SLOT(zoneAnimationFinished()), + Qt::UniqueConnection); mZoneAnimation->start(); } @@ -426,26 +443,22 @@ */ void HsIdleState::updateZoneAnimation() { - if (isInPageChangeZone() && mAllowZoneAnimation) { - if (!mZoneAnimation && (!mPageChangeAnimation - || mPageChangeAnimation->state() == QAbstractAnimation::Stopped )) { + if (!mAllowZoneAnimation) { + mZoneAnimation->stop(); + } else if (isInPageChangeZone()) { + // should we start it + if (mZoneAnimation->state() == QAbstractAnimation::Stopped && + !mPageChangeAnimation->isRunning()) { startPageChangeZoneAnimation(HSCONFIGURATION_GET(pageChangeZoneAnimationDuration)); - } - } else if (mZoneAnimation && !isInPageChangeZone()) { - if (mZoneAnimation->state() == QAbstractAnimation::Running) { - if (mZoneAnimation->direction() == QAbstractAnimation::Forward) { - mZoneAnimation->setDuration(HSCONFIGURATION_GET(pageChangeZoneReverseAnimationDuration)); - mZoneAnimation->setDirection(QAbstractAnimation::Backward); - } - } else { - // Out of the page change zone. Delete animation. - deleteZoneAnimation(); - } - } else if (!isInPageChangeZone()) { - if (mZoneAnimation) { - mZoneAnimation->stop(); - } - } + } + } else if (mZoneAnimation->state() == QAbstractAnimation::Running) { + // Not in zone, but still running + if (mZoneAnimation->direction() == QAbstractAnimation::Forward){ + // reverse + mZoneAnimation->setDuration(HSCONFIGURATION_GET(pageChangeZoneReverseAnimationDuration)); + mZoneAnimation->setDirection(QAbstractAnimation::Backward); + } + } } /*! @@ -470,43 +483,6 @@ } /*! - Removes currently active page. -*/ -void HsIdleState::removeActivePage() -{ - HsScene *scene = HsScene::instance(); - HsPage *page = scene->activePage(); - - int pageIndex = scene->activePageIndex(); - - mUiWidget->removePage(pageIndex); - scene->removePage(page); - - if (page->wallpaper()) { - page->wallpaper()->remove(); - } - delete page; - - pageIndex = pageIndex == 0 ? 0 : pageIndex - 1; - scene->setActivePageIndex(pageIndex); - - startPageChangeAnimation(pageIndex, HSCONFIGURATION_GET(pageRemovedAnimationDuration)); - - mUiWidget->pageIndicator()->removeItem(pageIndex); - mUiWidget->setActivePage(pageIndex); - mUiWidget->showPageIndicator(); -} - -/*! - Deletes page change zone animation. -*/ -void HsIdleState::deleteZoneAnimation() -{ - delete mZoneAnimation; - mZoneAnimation = NULL; -} - -/*! If called for the first time, setups the idle view. Updates the soft key action and sets the idle view as the current view to the main window. @@ -526,11 +502,16 @@ idleView->setNavigationAction(mNavigationAction); HsGui::setIdleView(idleView); - - if (mPageChangeAnimation) { - delete mPageChangeAnimation; - mPageChangeAnimation = NULL; - } + + delete mPageChangeAnimation; + mPageChangeAnimation = NULL; + mPageChangeAnimation = new HsPropertyAnimationWrapper; + mPageChangeAnimation->setTargetObject(mUiWidget); + mPageChangeAnimation->setPropertyName("sceneX"); + delete mZoneAnimation; + mZoneAnimation = NULL; + mZoneAnimation = new QPropertyAnimation(mUiWidget, "sceneX"); + } HsScene::mainWindow()->setCurrentView(idleView); @@ -587,9 +568,6 @@ mTitleResolver->disconnect(this); } -#ifdef COVERAGE_MEASUREMENT -#pragma CTC SKIP -#endif //COVERAGE_MEASUREMENT /*! */ @@ -617,9 +595,6 @@ mSceneMenu->setPreferredPos(mPageHotSpot); mSceneMenu->open(); } -#ifdef COVERAGE_MEASUREMENT -#pragma CTC ENDSKIP -#endif //COVERAGE_MEASUREMENT void HsIdleState::onPagePanStarted(QGestureEvent *event) { @@ -673,28 +648,29 @@ void HsIdleState::onWidgetMoveUpdated(const QPointF &scenePos, HsWidgetHost *widget) { - HsScene *scene = HsScene::instance(); QRectF widgetRect = widget->geometry(); - // Move widget to new position. + // Move widget to updated position. mWidgetHotSpot = scenePos; - widgetRect.moveTopLeft(mWidgetHotSpot - mWidgetHotSpotOffset); - // Widget can be moved over the pages left border. + // When moving widget can go over the pages left border. qreal lowerBoundX = -widgetRect.width(); - HsPage *page = scene->activePage(); + + // When moving widget can go over the pages right border. QRectF pageRect = HsGui::idleView()->rect(); - // Widget can be moved over the pages right border. qreal upperBoundX = pageRect.width(); + // When moving widget can go under the chrome at the pages upper border. // Notice that chrome height is 64 pixels. qreal lowerBoundY = qreal(64) - widgetRect.height(); - // Widget can be moved over the pages down border. + + // When moving widget can go over the pages down border. qreal upperBoundY = pageRect.height(); qreal widgetX = qBound(lowerBoundX, widgetRect.x(), upperBoundX); qreal widgetY = qBound(lowerBoundY, widgetRect.y(), upperBoundY); + // If using ItemClipsChildrenToShape-flag in widgethost then // setPos does not update position here, however setGeometry does it, QT bug? widget->setGeometry(widgetX, widgetY, widgetRect.width(), widgetRect.height()); @@ -720,11 +696,12 @@ mPreviousSnapResult = mSnapResult; } - - int bounceFeedbackEffectDistance = HSCONFIGURATION_GET(bounceFeedbackEffectDistance); // Handle effects: // User is indicated by a tactile feedback if he/she is trying to move // widget over the first or the last page. + HsScene *scene = HsScene::instance(); + HsPage *page = scene->activePage(); + int bounceFeedbackEffectDistance = HSCONFIGURATION_GET(bounceFeedbackEffectDistance); if( (page == scene->pages().first() && mWidgetHotSpot.x() < bounceFeedbackEffectDistance ) || (page == scene->pages().last() && scene->pages().count() == HSCONFIGURATION_GET(maximumPageCount) && mWidgetHotSpot.x() > pageRect.width() - bounceFeedbackEffectDistance)) { @@ -733,8 +710,7 @@ //if (!mContinuousFeedback->isPlaying()) { // mContinuousFeedback->play(); //} - } - else /*if (mContinuousFeedback->isPlaying())*/ { + } else /*if (mContinuousFeedback->isPlaying())*/ { //mContinuousFeedback->stop(); } @@ -876,41 +852,36 @@ HbMenu *menu = new HbMenu(); menu->setObjectName("hs_menu"); // Task switcher - HbAction *action = menu->addAction(hbTrId(hsLocTextId_OptionsMenu_TaskSwitcher), + menu->addAction(hbTrId(hsLocTextId_OptionsMenu_TaskSwitcher), this, SLOT(openTaskSwitcher())); - action->setObjectName("action_open_task_switcher"); + // Add content - action = menu->addAction(hbTrId(hsLocTextId_ContextMenu_AddContent), + menu->addAction(hbTrId(hsLocTextId_ContextMenu_AddContent), this, SLOT(onAddContentFromOptionsMenuActionTriggered())); - action->setObjectName("action_add_content"); // Add page if (scene->pages().count() < HSCONFIGURATION_GET(maximumPageCount)) { - action = menu->addAction(hbTrId(hsLocTextId_OptionsMenu_AddPage), + menu->addAction(hbTrId(hsLocTextId_OptionsMenu_AddPage), this, SIGNAL(event_addPage())); - action->setObjectName("action_add_page"); - + } // Change wallpaper - action = menu->addAction(hbTrId(hsLocTextId_ContextMenu_ChangeWallpaper), + menu->addAction(hbTrId(hsLocTextId_ContextMenu_ChangeWallpaper), this, SIGNAL(event_selectWallpaper())); - action->setObjectName("action_change_wallpaper"); + // Remove page if (scene->activePage()->isRemovable()) { - action = menu->addAction(hbTrId(hsLocTextId_OptionsMenu_RemovePage), - this, SIGNAL(event_removePage())); - action->setObjectName("action_remove_page"); + menu->addAction(hbTrId(hsLocTextId_OptionsMenu_RemovePage), + this, SIGNAL(event_preRemovePage())); } // Online / Offline if (scene->isOnline()) { - action = menu->addAction(hbTrId(hsLocTextId_OptionsMenu_HsToOffline), + menu->addAction(hbTrId(hsLocTextId_OptionsMenu_HsToOffline), this, SIGNAL(event_toggleConnection())); - action->setObjectName("action_to_offline"); } else { - action = menu->addAction(hbTrId(hsLocTextId_OptionsMenu_HsToOnline), + menu->addAction(hbTrId(hsLocTextId_OptionsMenu_HsToOnline), this, SIGNAL(event_toggleConnection())); - action->setObjectName("action_to_online"); } HsGui::idleView()->setMenu(menu); @@ -1001,16 +972,13 @@ void HsIdleState::action_moveWidget_setWidgetSnap() { if (HSCONFIGURATION_GET(isSnapEnabled)) { - mSnapBorderGap = HSCONFIGURATION_GET(snapBorderGap); QVariantHash snapConfiguration; snapConfiguration[SNAPENABLED] = QString::number(HSCONFIGURATION_GET(isSnapEnabled)); snapConfiguration[SNAPFORCE] = QString::number(HSCONFIGURATION_GET(snapForce)); snapConfiguration[SNAPGAP] = QString::number(HSCONFIGURATION_GET(snapGap)); - snapConfiguration[SNAPBORDERGAP] = mSnapBorderGap; HsWidgetPositioningOnWidgetMove::instance()->setConfiguration(snapConfiguration); - updatePagePresentationToWidgetSnap(); connect(HsScene::instance(), SIGNAL(activePageChanged()), @@ -1083,10 +1051,8 @@ } } + //Set the snap position of the widget and save the position QRectF widgetRect = widget->geometry(); - QRectF pageRect = page->rect(); - - //Set the snap position of the widget and save the position if (mSnapResult.hasHorizontalSnap) { widgetRect.moveLeft(mSnapResult.horizontalSnapPosition); } @@ -1094,15 +1060,8 @@ widgetRect.moveTop(mSnapResult.verticalSnapPosition); } - //if snapBorderGap is defined, the widget is bounded in the rectangle which is smaller by snapBorderGap on all sides - qreal widgetX = qBound(qreal(0) + mSnapBorderGap, widgetRect.x(), (pageRect.width() - mSnapBorderGap) - widgetRect.width()); - qreal widgetY = qBound(qreal(64) + mSnapBorderGap, widgetRect.y(), (pageRect.height() - mSnapBorderGap) - widgetRect.height()); - - // play feedback effect if user drops widget between pages and it needs to be repositioned back to original page - if( widgetX != widgetRect.x() || widgetY != widgetRect.y()) { - HbInstantFeedback::play(HSCONFIGURATION_GET(widgetRepositionFeedbackEffect)); - } - widget->setPos(widgetX, widgetY); + QPointF adjustedWidgetPosition = page->adjustedWidgetPosition(widgetRect); + widget->setPos(adjustedWidgetPosition); widget->savePresentation(); page->updateZValues(); @@ -1216,36 +1175,83 @@ mUiWidget->showPageIndicator(); } -/*! - Removes an existing page from the scene. -*/ -void HsIdleState::action_removePage_removePage() +void HsIdleState::action_preRemovePage_showQuery() { HsScene *scene = HsScene::instance(); HsPage *page = scene->activePage(); if (!page->widgets().isEmpty()) { -#ifndef HOMESCREEN_TEST //We don't want to test message box. - //Confirm removal of page having content - HbMessageBox *box = new HbMessageBox(HbMessageBox::MessageTypeQuestion); - box->setAttribute(Qt::WA_DeleteOnClose); - box->setHeadingWidget(new HbLabel - (hbTrId(hsLocTextId_Title_RemovePage))); - box->setText(hbTrId(hsLocTextId_Confirmation_RemovePage)); - - QAction *buttonOk = box->actions().at(0); - //We are keen only from OK button. Cancel is not connected to any slot. - connect(buttonOk, SIGNAL(triggered()), SLOT(onRemovePageConfirmationOk())); - - box->open(); -#endif // HOMESCREEN_TEST + if (!mMessageBoxWrapper) { + mMessageBoxWrapper = new HsMessageBoxWrapper(this); + mMessageBoxWrapper->setHeader(hbTrId(hsLocTextId_Title_RemovePage)); + mMessageBoxWrapper->setQueryText(hbTrId(hsLocTextId_Confirmation_RemovePage)); + connect(mMessageBoxWrapper,SIGNAL(accepted()),SIGNAL(event_removePage())); + connect(mMessageBoxWrapper,SIGNAL(rejected()),SIGNAL(event_waitInput())); + } + mMessageBoxWrapper->show(); } else { // Empty page can be removed without confirmation - removeActivePage(); + emit event_removePage(); } } /*! + Start remove page animation. +*/ +void HsIdleState::action_removePage_startRemovePageAnimation() +{ + HsScene *scene = HsScene::instance(); + + int pageToRemoveIndex = scene->activePageIndex(); + bool isLastPage(scene->activePage() == scene->pages().last()); + + int nextPageIndex(pageToRemoveIndex); + nextPageIndex++; + if (isLastPage) { + nextPageIndex--; + } + + if (mPageChangeAnimation->isRunning()) { + mPageChangeAnimation->stop(); + } + mPageChangeAnimation->disconnect(this); + connect(mPageChangeAnimation, + SIGNAL(finished()), + SIGNAL(event_waitInput()), + Qt::UniqueConnection); + mPageChangeAnimation->setEndValue(pageLayerXPos(nextPageIndex)); + mPageChangeAnimation->setDuration(HSCONFIGURATION_GET(pageRemovedAnimationDuration)); + + mPageChangeAnimation->start(); + + HbInstantFeedback::play(HSCONFIGURATION_GET(pageChangeFeedbackEffect)); + +} + +/*! + Removes an existing page from the scene. +*/ +void HsIdleState::action_removePage_removePage() +{ + if (mPageChangeAnimation->isRunning()) { + mPageChangeAnimation->stop(); + } + HsScene *scene = HsScene::instance(); + HsPage *pageToRemove = scene->activePage(); + + // remove from ui + mUiWidget->removePage(pageToRemove->pageIndex()); + mUiWidget->showPageIndicator(); + // update data model + HsScene::instance()->removePage(pageToRemove); + // Take new active page (previous was removed) and move scene to right position + qreal x = pageLayerXPos(scene->activePageIndex()); + mUiWidget->setSceneX(x); + // delete it + pageToRemove->deleteLater(); + +} +/*! Toggles the homescreen online/offline state. */ void HsIdleState::action_toggleConnection_toggleConnection() @@ -1299,8 +1305,6 @@ scene->setActivePageIndex(pageIndex); mUiWidget->setActivePage(pageIndex); } - - deleteZoneAnimation(); } /*! @@ -1311,21 +1315,13 @@ updateZoneAnimation(); } -/*! - Handles the close of remove page confirmation dialog for page having content. -*/ -void HsIdleState::onRemovePageConfirmationOk() -{ - removeActivePage(); -} /*! Provides the page presentation to the Widget Snap algorithm */ void HsIdleState::updatePagePresentationToWidgetSnap() { - QRectF containerRect = HsScene::instance()->activePage()->rect(); - containerRect.setTop(qreal(64)); + QRectF containerRect = HsScene::instance()->activePage()->contentGeometry(); HsWidgetHost *activeWidget = HsScene::instance()->activeWidget(); HsWidgetPositioningOnWidgetMove::instance()->setPagePresentation(containerRect, createInactiveWidgetRects(), activeWidget->geometry()); } @@ -1419,3 +1415,5 @@ updatePagePresentationToWidgetSnap(); resetSnapPosition(); } + + diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hshomescreenstateplugin/src/hsidlewidget.cpp --- a/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsidlewidget.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsidlewidget.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -216,6 +216,7 @@ mPageWallpaperLayer->resize( layout->count() * size().width(), size().height()); } + mPageIndicator->removeItem(index); } /*! diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsmenuworkerstateplugin/hsmenuworkerstateplugin.qrc --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/hsmenuworkerstateplugin.qrc Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/hsmenuworkerstateplugin.qrc Fri Jul 09 14:36:01 2010 +0300 @@ -5,5 +5,6 @@ resource/hsarrangedialog.docml resource/hsdetailsdialog.docml resource/hsuninstalldialog.docml + resource/hsinstallationlogdialog.docml diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsaddappstocollectionstate.h --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsaddappstocollectionstate.h Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsaddappstocollectionstate.h Fri Jul 09 14:36:01 2010 +0300 @@ -128,8 +128,6 @@ HsSortAttribute mApplicationsSortAttribute; - HsSortAttribute mCollectionsSortAttribute; - HsAppsCheckList *mAppsCheckList; HsCollectionNameDialog *mEditorDialog; diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsaddtohomescreenstate.h --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsaddtohomescreenstate.h Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsaddtohomescreenstate.h Fri Jul 09 14:36:01 2010 +0300 @@ -27,6 +27,7 @@ HS_STATES_TEST_CLASS(MenuStatesTest) +class QAction; class HbAction; class HbMessageBox; class CaEntry; @@ -82,7 +83,7 @@ HbMessageBox *mCorruptedMessage; - HbAction *mConfirmAction; + QAction *mConfirmAction; HsMenuMode mMenuMode; diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsarrangestate.h --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsarrangestate.h Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsarrangestate.h Fri Jul 09 14:36:01 2010 +0300 @@ -15,8 +15,8 @@ * */ -#ifndef ARRANGE_H -#define ARRANGE_H +#ifndef HSARRANGESTATE_H +#define HSARRANGESTATE_H #include #include @@ -76,15 +76,17 @@ HsMenuItemModel *mItemModel; int mTopItemId; + + int mCollectionId; QModelIndex mTopModelIndex; - QList mCollIdList; + QList mCollItemIdList; - QList mArrangedCollIdList; + QList mArrangedCollItemIdList; QObjectList mObjectList; }; -#endif /* ARRANGE_H_ */ +#endif /* HSARRANGESTATE_H */ diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hscollectionslistdialog.h --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hscollectionslistdialog.h Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hscollectionslistdialog.h Fri Jul 09 14:36:01 2010 +0300 @@ -33,8 +33,7 @@ public: - HsCollectionsListDialog(HsSortAttribute sortOrder, - int collectionId = 0); + HsCollectionsListDialog(int collectionId = 0); virtual ~HsCollectionsListDialog(); @@ -51,8 +50,7 @@ void makeDisconnect(); - QStandardItemModel *standartItemModel(HsSortAttribute sortOrder, - int collectionId); + QStandardItemModel *standardItemModel(int collectionId); void insertNewCollectionItem(QStandardItemModel *model); diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsdeletecollectionitemstate.h --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsdeletecollectionitemstate.h Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsdeletecollectionitemstate.h Fri Jul 09 14:36:01 2010 +0300 @@ -23,6 +23,7 @@ #include "hsmenustates_global.h" HS_STATES_TEST_CLASS(MenuStatesTest) +class QAction; class HbAction; class HbMessageBox; class HsShortcutService; @@ -66,7 +67,7 @@ HbMessageBox *mDeleteMessage; // deletes itself automatically on close - HbAction *mConfirmAction; // child for mDeleteMessage + QAction *mConfirmAction; // child for mDeleteMessage }; diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsdeletecollectionstate.h --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsdeletecollectionstate.h Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsdeletecollectionstate.h Fri Jul 09 14:36:01 2010 +0300 @@ -23,6 +23,7 @@ #include "hsmenustates_global.h" HS_STATES_TEST_CLASS(MenuStatesTest) +class QAction; class HbAction; class HbMessageBox; class HsMenuService; @@ -60,7 +61,7 @@ private: int mItemId; HbMessageBox *mDeleteMessage; // deletes itself automatically on close - HbAction *mConfirmAction; // child for mDeleteMessage + QAction *mConfirmAction; // child for mDeleteMessage }; #endif //HSDELETECOLLECTIONSTATE_H diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsinstallationlogstate.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsinstallationlogstate.h Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). + * All rights reserved. + * This component and the accompanying materials are made available + * under the terms of "Eclipse Public License v1.0" + * which accompanies this distribution, and is available + * at the URL "http://www.eclipse.org/legal/epl-v10.html". + * + * Initial Contributors: + * Nokia Corporation - initial contribution. + * + * Contributors: + * + * Description: + * + */ + +#ifndef HSINSTALLATIONLOGSTATE_H +#define HSINSTALLATIONLOGSTATE_H + +#include + +#include "hsmenustates_global.h" +HS_STATES_TEST_CLASS(MenuStatesTest) + +class HbDialog; + +class HsInstallationLogState: public QState +{ + Q_OBJECT + + HS_STATES_TEST_FRIEND_CLASS(MenuStatesTest) + +public: + + HsInstallationLogState(QState *parent = 0); + + virtual ~HsInstallationLogState(); + +protected: + + void onEntry(QEvent *event); + void onExit(QEvent *event); + +private slots: + + void stateExited(); + void cleanUp(); + +signals: + + void exit(); + +private: + + void construct(); + void createInstallationLogDialog(); + +private: + + HbDialog* mInstalationLogDialog; + +}; + +#endif //HSINSTALLATIONLOGSTATE_H diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsmenustates_global.h --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsmenustates_global.h Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsmenustates_global.h Fri Jul 09 14:36:01 2010 +0300 @@ -60,6 +60,10 @@ static const char *const HS_UNINSTALL_DIALOG_CONFIRMATION_ACTION ="qtl_dialog_softkey_2_left"; static const char *const HS_UNINSTALL_DIALOG_CONFIRMATION_DIALOG_ICON ="icon"; +static const char *const HS_INSTALLATION_LOG_DIALOG_LAYOUT =":/xml/hsinstallationlogdialog.docml"; +static const char *const HS_INSTALLATION_LOG_DIALOG_NAME="installation_log_dialog"; +static const char *const HS_INSTALLATION_LOG_DIALOG_LOG_LABEL="log_label"; + /*! To enable logging of function entry and exit use the following flag for qmake: diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hspreviewhswidgetstate.h --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hspreviewhswidgetstate.h Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hspreviewhswidgetstate.h Fri Jul 09 14:36:01 2010 +0300 @@ -20,18 +20,21 @@ #define HSPREVIEWHSWIDGETSTATE_H #include +#include #include "hsmenustates_global.h" HS_STATES_TEST_CLASS(MenuStatesTest) +class QAction; +class HbAction; class CaEntry; class HbDialog; class HsWidgetHost; class CaNotifier; -class HbAction; class HbScrollArea; class HbMessageBox; + class HsPreviewHSWidgetState : public QState { Q_OBJECT @@ -71,11 +74,15 @@ CaNotifier *mNotifier; - QScopedPointer mWidget; - int mEntryId; HbMessageBox *mCorruptedMessage; + + QAction *mConfirmAction; + + QVariant mToken; + + QString mUri; }; diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsuninstallitemstate.h --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsuninstallitemstate.h Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsuninstallitemstate.h Fri Jul 09 14:36:01 2010 +0300 @@ -23,6 +23,7 @@ #include "hsmenustates_global.h" HS_STATES_TEST_CLASS(MenuStatesTest) +class QAction; class HbAction; class HbMessageBox; class HsShortcutService; @@ -82,10 +83,9 @@ HbMessageBox *mUninstallMessage; // deletes itself automatically on close HbDialog *mUninstallJavaMessage; - QObjectList mObjectList; UninstallDialogType mDialogType; - HbAction *mConfirmAction; // child for mConfirmMessage + QAction *mConfirmAction; // child for mConfirmMessage }; diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsviewappdetailsstate.h --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsviewappdetailsstate.h Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsviewappdetailsstate.h Fri Jul 09 14:36:01 2010 +0300 @@ -22,12 +22,15 @@ #include #include "hsmenustates_global.h" +#include "casoftwareregistry.h" HS_STATES_TEST_CLASS(MenuStatesTest) class HbListWidget; class HsMenuItemModel; class HbDialog; class CaNotifier; +class HbDocumentLoader; + class HsViewAppDetailsState: public QState { @@ -57,13 +60,14 @@ void construct(); void subscribeForMemoryCardRemove(int entryId); + void setFieldPresentation(QString key, + CaSoftwareRegistry::DetailMap &detailMap, + HbDocumentLoader &loader); private: HbDialog *mDialog; - QObjectList mObjectList; - CaNotifier *mNotifier; }; diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsarrangedialog.docml --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsarrangedialog.docml Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsarrangedialog.docml Fri Jul 09 14:36:01 2010 +0300 @@ -3,9 +3,9 @@

+ + + diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsdetailsdialog.docml --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsdetailsdialog.docml Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsdetailsdialog.docml Fri Jul 09 14:36:01 2010 +0300 @@ -6,7 +6,6 @@ - @@ -91,6 +90,116 @@ +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsinstallationlogdialog.docml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsinstallationlogdialog.docml Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,38 @@ + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hswidgetpreviewdialog.docml --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hswidgetpreviewdialog.docml Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hswidgetpreviewdialog.docml Fri Jul 09 14:36:01 2010 +0300 @@ -11,21 +11,20 @@ - + - - - - - + + + - - - - + + + + + diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsaddappstocollectionstate.cpp --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsaddappstocollectionstate.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsaddappstocollectionstate.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -179,8 +179,7 @@ mShowConfirmation(0), mInitialState(0), mSelectCollectionState(0), mNewCollectionState(0), mAppsCheckListState(0), mActionType( NoActionType), mApplicationsSortAttribute(NoHsSortAttribute), - mCollectionsSortAttribute(NoHsSortAttribute), mAppsCheckList(0), - mEditorDialog(0), mListDialog(0) + mAppsCheckList(0), mEditorDialog(0), mListDialog(0) { construct(); } @@ -330,27 +329,19 @@ mApplicationsSortAttribute = static_cast(data.value( appSortOrderKey()).toInt()); - mCollectionsSortAttribute = static_cast(data.value( - collectionSortOrderKey()).toInt()); const int itemId = data.value(itemIdKey()).toInt(); mCollectionId = data.value(collectionIdKey()).toInt(); - if (itemId && (mCollectionsSortAttribute != NoHsSortAttribute - || mCollectionId)) { - //add selected app item form allAppView or collectionView + if (itemId) { + //add selected app item from allAppView or collectionView mAppList.append(itemId); - mInitialState->addTransition(mSelectCollectionState); - mShowConfirmation = true; - } else if (mApplicationsSortAttribute != NoHsSortAttribute - && mCollectionsSortAttribute != NoHsSortAttribute) { + } else if (mApplicationsSortAttribute != NoHsSortAttribute) { //add apps from allAppView options menu mActionType = ViaAllViewOptionMenuType; - mInitialState->addTransition(mSelectCollectionState); - mShowConfirmation = true; } else if (mCollectionId) { //add apps from collectionView options menu @@ -437,8 +428,7 @@ { qDebug("HsAddAppsToCollectionState::selectCollection()"); HSMENUTEST_FUNC_ENTRY("HsAddAppsToCollectionState::selectCollection"); - mListDialog = new HsCollectionsListDialog(mCollectionsSortAttribute, - mCollectionId); + mListDialog = new HsCollectionsListDialog(mCollectionId); mListDialog->open(this, SLOT(listDialogFinished(HbAction*))); HSMENUTEST_FUNC_EXIT("HsAddAppsToCollectionState::selectCollection"); } diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsaddtohomescreenstate.cpp --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsaddtohomescreenstate.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsaddtohomescreenstate.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -17,14 +17,13 @@ #include #include -#include #include #include #include #include #include #include - +#include "hsmenudialogfactory.h" #include "hsaddtohomescreenstate.h" #include "hsmenuevent.h" #include "canotifier.h" @@ -163,21 +162,9 @@ { HSMENUTEST_FUNC_ENTRY("HsCollectionState::showMessageWidgetCorrupted"); - mCorruptedMessage = new HbMessageBox(HbMessageBox::MessageTypeQuestion); - mCorruptedMessage->setAttribute(Qt::WA_DeleteOnClose); - - QString message(hbTrId("txt_applib_dialog_file_corrupted_unable_to_use_wi")); - mCorruptedMessage->setText(message); - - mCorruptedMessage->clearActions(); - mConfirmAction = new HbAction(hbTrId("txt_common_button_ok"), - mCorruptedMessage); - mCorruptedMessage->addAction(mConfirmAction); - - HbAction *secondaryAction = new HbAction( - hbTrId("txt_common_button_cancel"), mCorruptedMessage); - mCorruptedMessage->addAction(secondaryAction); - + mCorruptedMessage = HsMenuDialogFactory().create( + hbTrId("txt_applib_dialog_file_corrupted_unable_to_use_wi")); + mConfirmAction = mCorruptedMessage->actions().value(0); mCorruptedMessage->open(this, SLOT(messageWidgetCorruptedFinished(HbAction*))); HSMENUTEST_FUNC_EXIT("HsCollectionState::showMessageWidgetCorrupted"); @@ -190,7 +177,7 @@ void HsAddToHomeScreenState::messageWidgetCorruptedFinished (HbAction* finishedAction) { - if (finishedAction == mConfirmAction) { + if (static_cast(finishedAction) == mConfirmAction) { HsMenuService::executeAction(mEntryId, removeActionIdentifier()); } emit exit(); @@ -198,6 +185,7 @@ machine()->postEvent( HsMenuEventFactory::createOpenHomeScreenEvent()); } + mConfirmAction = NULL; } diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsarrangestate.cpp --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsarrangestate.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsarrangestate.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -78,7 +78,7 @@ */ HsArrangeState::HsArrangeState(QState *parent) : QState(parent), mDialog(0), mEntriesList(0), - mItemModel(0) + mItemModel(0),mCollectionId(0) { construct(); } @@ -119,9 +119,10 @@ HSMENUTEST_FUNC_ENTRY("HsArrangeState::save"); getArrangedEntriesIds(listWidget); - if (mArrangedCollIdList != mCollIdList) { + if (mArrangedCollItemIdList != mCollItemIdList) { HsMenuService::organizeCollection( - HsMenuService::allCollectionsId(), mArrangedCollIdList); + mCollectionId, + mArrangedCollItemIdList); } HSMENUTEST_FUNC_EXIT("HsArrangeState::save"); @@ -156,9 +157,22 @@ mDialog = qobject_cast( loader.findWidget(HS_ARRANGE_DIALOG_NAME)); - if (mEntriesList != NULL && mDialog != NULL) { + if (mEntriesList && mDialog) { + switch (menuEvent->operation()) { + case HsMenuEvent::ArrangeCollection: + mCollectionId = data.value(collectionIdKey()).toInt(); + mItemModel = HsMenuService::getCollectionModel( + mCollectionId, + NoHsSortAttribute); + break; + case HsMenuEvent::ArrangeAllCollections: + mCollectionId = HsMenuService::allCollectionsId(); + mItemModel = HsMenuService::getAllCollectionsModel(); + break; + default: + break; + } - mItemModel = HsMenuService::getAllCollectionsModel(); // as we copy the model contents to the list widget // we do not need the model to auto update mItemModel->setAutoUpdate(false); @@ -171,7 +185,7 @@ mEntriesList->setArrangeMode(true); mDialog->setTimeout(HbPopup::NoTimeout); - mDialog->setAttribute(Qt::WA_DeleteOnClose, true); + mDialog->setAttribute(Qt::WA_DeleteOnClose); mDialog->setPreferredSize( HbInstance::instance()->allMainWindows().at(0)->size()); @@ -201,7 +215,8 @@ { HSMENUTEST_FUNC_ENTRY("HsArrangeState::stateExited"); if (mDialog) { - disconnect(mDialog, SIGNAL(finished(HbAction*)), this, SLOT(arrangeDialogFinished(HbAction*))); + disconnect(mDialog, SIGNAL(finished(HbAction*)), + this, SLOT(arrangeDialogFinished(HbAction*))); mDialog->close(); mDialog = NULL; } @@ -212,8 +227,8 @@ delete mItemModel; mItemModel = NULL; - mArrangedCollIdList.clear(); - mCollIdList.clear(); + mArrangedCollItemIdList.clear(); + mCollItemIdList.clear(); HSMENUTEST_FUNC_EXIT("HsArrangeState::stateExited"); qDebug("HsArrangeState::stateExited()"); @@ -235,7 +250,7 @@ int itemId = mItemModel->data(idx, CaItemModel::IdRole).toInt(); widgetItem->setData(mItemModel->data(idx, CaItemModel::IdRole), CaItemModel::IdRole); - mCollIdList.append(itemId); + mCollItemIdList.append(itemId); widgetItem->setData(mItemModel->data(idx, Qt::DisplayRole), Qt::DisplayRole); widgetItem->setData(mItemModel->data(idx, Qt::DecorationRole), @@ -259,6 +274,6 @@ for (int i(0); i < listWidget.count(); ++i) { HbListWidgetItem *widgetItem = listWidget.item(i); QVariant entryId = widgetItem->data(CaItemModel::IdRole); - mArrangedCollIdList.append(entryId.toInt()); + mArrangedCollItemIdList.append(entryId.toInt()); } } diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionslistdialog.cpp --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionslistdialog.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionslistdialog.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -58,19 +58,19 @@ to remove from list. \retval void */ -HsCollectionsListDialog::HsCollectionsListDialog(HsSortAttribute sortOrder, - int collectionId) : +HsCollectionsListDialog::HsCollectionsListDialog(int collectionId) : HbSelectionDialog(), mItemId(0) { clearActions(); - HbAction *cancelAction = new HbAction(hbTrId("txt_common_button_cancel"), this); + HbAction *cancelAction = new HbAction( + hbTrId("txt_common_button_cancel"), this); addAction(cancelAction); setHeadingWidget(new HbLabel(hbTrId("txt_applib_title_add_to"))); // it must be single selection, although it shows checkboxes - // it is Orbit defect and will be fixed in next release setSelectionMode(HbAbstractItemView::SingleSelection); - mModel = standartItemModel(sortOrder, collectionId); + mModel = standardItemModel(collectionId); setModel(mModel); } @@ -96,7 +96,7 @@ \reimp Disconnects signals and calls base class impl. which emits finished(HbAction*) */ -void HsCollectionsListDialog::closeEvent ( QCloseEvent * event ) +void HsCollectionsListDialog::closeEvent (QCloseEvent * event) { qDebug("HsCollectionsListDialog::closeEvent"); HbAction *closingAction = qobject_cast(sender()); @@ -118,12 +118,12 @@ \param collectionId id of collection to remove from model. \return QStandardItemModel - caller takes ownership. */ -QStandardItemModel *HsCollectionsListDialog::standartItemModel( - HsSortAttribute sortOrder, int collectionId) +QStandardItemModel *HsCollectionsListDialog::standardItemModel( + int collectionId) { HSMENUTEST_FUNC_ENTRY("HsListDialog::standartItemModel"); QScopedPointer caModel( - HsMenuService::getAllCollectionsModel(sortOrder)); + HsMenuService::getAllCollectionsModel()); caModel->setSecondLineVisibility(false); QStandardItemModel *model = new QStandardItemModel(this); QList items; diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsdeletecollectionitemstate.cpp --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsdeletecollectionitemstate.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsdeletecollectionitemstate.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -15,12 +15,13 @@ * */ -#include +#include #include #include #include #include +#include "hsmenudialogfactory.h" #include "hsdeletecollectionitemstate.h" #include "hsmenuevent.h" @@ -86,18 +87,8 @@ HsMenuService::getName(mItemId))); // create and show message box - mDeleteMessage = new HbMessageBox(HbMessageBox::MessageTypeQuestion); - mDeleteMessage->setAttribute(Qt::WA_DeleteOnClose); - - mDeleteMessage->setText(message); - - mDeleteMessage->clearActions(); - mConfirmAction = new HbAction(hbTrId("txt_common_button_ok"), mDeleteMessage); - mDeleteMessage->addAction(mConfirmAction); - - HbAction *secondaryAction = new HbAction(hbTrId("txt_common_button_cancel"), mDeleteMessage); - mDeleteMessage->addAction(secondaryAction); - + mDeleteMessage = HsMenuDialogFactory().create(message); + mConfirmAction = mDeleteMessage->actions().value(0); mDeleteMessage->open(this, SLOT(deleteMessageFinished(HbAction*))); HSMENUTEST_FUNC_EXIT("HsDeleteCollectionItemState::onEntry"); @@ -110,10 +101,11 @@ */ void HsDeleteCollectionItemState::deleteMessageFinished(HbAction* finishedAction) { - if (finishedAction == mConfirmAction) { + if (static_cast(finishedAction) == mConfirmAction) { HsMenuService::removeApplicationFromCollection(mItemId, mCollectionId); } emit exit(); + mConfirmAction = NULL; } /*! diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsdeletecollectionstate.cpp --- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsdeletecollectionstate.cpp Fri Jun 25 19:19:22 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsdeletecollectionstate.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -16,7 +16,7 @@ */ #include -#include +#include #include #include #include @@ -24,6 +24,7 @@ #include #include "hsdeletecollectionstate.h" +#include "hsmenudialogfactory.h" #include "hsmenuevent.h" /*! @@ -91,19 +92,10 @@ } // create and show message box - mDeleteMessage = new HbMessageBox(HbMessageBox::MessageTypeQuestion); - mDeleteMessage->setAttribute(Qt::WA_DeleteOnClose); - - mDeleteMessage->setText(message); + mDeleteMessage = HsMenuDialogFactory().create(message); + mConfirmAction = mDeleteMessage->actions().value(0); + mDeleteMessage->open(this, SLOT(deleteMessageFinished(HbAction*))); - mDeleteMessage->clearActions(); - mConfirmAction = new HbAction(hbTrId("txt_common_button_ok"), mDeleteMessage); - mDeleteMessage->addAction(mConfirmAction); - - HbAction *secondaryAction = new HbAction(hbTrId("txt_common_button_cancel"), mDeleteMessage); - mDeleteMessage->addAction(secondaryAction); - - mDeleteMessage->open(this, SLOT(deleteMessageFinished(HbAction*))); HSMENUTEST_FUNC_EXIT("HsDeleteCollectionState::onEntry"); } @@ -113,12 +105,13 @@ // void HsDeleteCollectionState::deleteMessageFinished(HbAction* finishedAction) { - if (finishedAction == mConfirmAction) { + if (static_cast(finishedAction) == mConfirmAction) { HsMenuService::removeCollection(mItemId); machine()->postEvent( HsMenuEventFactory::createCollectionDeletedEvent()); } emit exit(); + mConfirmAction = NULL; } /*! @@ -129,7 +122,6 @@ { // Close messagebox if App key was pressed if (mDeleteMessage) { - disconnect(mDeleteMessage, SIGNAL(finished(HbAction*)), this, SLOT(deleteMessageFinished(HbAction*))); mDeleteMessage->close(); mDeleteMessage = NULL; } diff -r 341166945d65 -r 52b0f64eeb51 homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsinstallationlogstate.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsinstallationlogstate.cpp Fri Jul 09 14:36:01 2010 +0300 @@ -0,0 +1,167 @@ +/* + * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). + * All rights reserved. + * This component and the accompanying materials are made available + * under the terms of "Eclipse Public License v1.0" + * which accompanies this distribution, and is available + * at the URL "http://www.eclipse.org/legal/epl-v10.html". + * + * Initial Contributors: + * Nokia Corporation - initial contribution. + * + * Contributors: + * + * Description: Menu delete collection item state + * + */ + +#include +#include +#include +#include +#include +#include + +#include "hsinstallationlogstate.h" + +/*! + \class HsInstallationLogState + \ingroup group_hsworkerstateplugin + \brief Uninstall Item State. + Deletes app from collection. + */ + +/*! + Constructor. + \param parent Parent state. + */ +HsInstallationLogState::HsInstallationLogState(QState *parent) : + QState(parent), + mInstalationLogDialog(NULL) +{ + construct(); +} + +/*! + Destructor. + */ +HsInstallationLogState::~HsInstallationLogState() +{ + cleanUp(); // in case of throw +} + +/*! + Constructs contained objects. + */ +void HsInstallationLogState::construct() +{ + setObjectName("/InstallationLogState"); + if (this->parent()) { + setObjectName(this->parent()->objectName() + objectName()); + } + connect(this, SIGNAL(exited()), SLOT(cleanUp())); +} + +/*! + Sets entry event. + \param event entry event. + */ +void HsInstallationLogState::onEntry(QEvent *event) +{ + HSMENUTEST_FUNC_ENTRY("HsInstallationLogState::onEntry"); + QState::onEntry(event); + qDebug("HsInstallationLogState::onEntry()"); + + createInstallationLogDialog(); + + HSMENUTEST_FUNC_EXIT("HsInstallationLogState::onEntry"); +} + +/*! + Invoked on exiting state + */ +void HsInstallationLogState::onExit(QEvent *event) +{ + QState::onExit(event); +} + +/*! + Create installation log dialog. + \retval void + */ +void HsInstallationLogState::createInstallationLogDialog() +{ + QList detailsList = + CaSoftwareRegistry::create()->retrieveLogEntries(); + + HbDocumentLoader loader; + bool loadStatusOk = false; + loader.load(HS_INSTALLATION_LOG_DIALOG_LAYOUT, &loadStatusOk); + Q_ASSERT_X(loadStatusOk, HS_INSTALLATION_LOG_DIALOG_LAYOUT, + "Error while loading docml file."); + + mInstalationLogDialog = qobject_cast( + loader.findWidget(HS_INSTALLATION_LOG_DIALOG_NAME)); + + if (mInstalationLogDialog != NULL) { + mInstalationLogDialog->actions()[0]->setParent(mInstalationLogDialog); + mInstalationLogDialog->setTimeout(HbPopup::NoTimeout); + mInstalationLogDialog->setAttribute(Qt::WA_DeleteOnClose, true); + + HbLabel* logList; + QString applicationsList; + QString listElement("%1 (%2)\n%3 - "); + QString applicationName; + QString version; + QString date; + QString type; + QString installed(hbTrId("txt_applib_dialog_installed")); + QString removed(hbTrId("txt_applib_dialog_removed")); + QString newLine("\n"); + + logList = qobject_cast( + loader.findWidget(HS_INSTALLATION_LOG_DIALOG_LOG_LABEL)); + + for (int i=0; i