| author | hgs |
| Wed, 18 Aug 2010 10:33:57 +0300 | |
| changeset 81 | 7dd137878ff8 |
| parent 76 | 3916af29624a |
| child 86 | e4f038c420f7 |
--- a/homescreen_plat/homescreen_plat.pro Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreen_plat/homescreen_plat.pro Wed Aug 18 10:33:57 2010 +0300 @@ -18,6 +18,7 @@ BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include <platform_paths.hrh>" include(homescreenclient_api/homescreenclient_api.pri) +include(screensaver_api/screensaver_api.pri) for(filename,PLATFORM_HEADERS){ BLD_INF_RULES.prj_exports *= "$$filename APP_LAYER_PLATFORM_EXPORT_PATH($$basename(filename))"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreen_plat/screensaver_api/screensaver_api.metaxml Wed Aug 18 10:33:57 2010 +0300 @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<api id="d6b00b4f5e8ec6fbbc00974d33597f11" dataversion="2.0"> + <name>screensaver_api</name> + <description>Central repository keys to enable/disable use of screensaver and to control its settings.</description> + <type>c++</type> + <collection>screensaver</collection> + <libs/> + <release category="platform" sinceversion=""/> + <attributes> + <htmldocprovided>no</htmldocprovided> + <adaptation>no</adaptation> + </attributes> +</api>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreen_plat/screensaver_api/screensaver_api.pri Wed Aug 18 10:33:57 2010 +0300 @@ -0,0 +1,18 @@ +# +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + +PLATFORM_HEADERS += \ + screensaver_api/screensaverdomaincrkeys.h \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreen_plat/screensaver_api/screensaverdomaincrkeys.h Wed Aug 18 10:33:57 2010 +0300 @@ -0,0 +1,118 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#ifndef SCREENSAVERDOMAINCRKEYS_H +#define SCREENSAVERDOMAINCRKEYS_H + +#include <e32cmn.h> + +/** +* Screensaver Settings repository UID. +* +* @publishedPartner +* @released +*/ +const TUid KCRUidScreensaverSettings = {0x2002FFAB}; + + +/* +* Swipe to open +* +* Boolean value for swipe-to-open widget on active mode. +* +* Possible integer values: +* +* 0 = Swipe_to_open not used +* 1 = Swipe_to_open exists on active mode +* +* Default value: 1 +* +* @publishedPartner +* @released +*/ +const unsigned long int KScreensaverSwipeToOpen = 0x00000001; + +/** +* Timeout from active mode to power save mode +* +* Screensaver timeout from active mode to power save mode +* Power save mode is clock display in OLED-devices, blank display in other devices +* +* Possible integer values: +* +* 5 - 60 Seconds +* +* Default value: 30 +* +* @publishedPartner +* @released +*/ +const unsigned long int KScreensaverTimeToPowerSave = 0x00000002; + +/** +* User setting whether screensaver is shown in power save mode +* +* Boolean value for screensaver on/off via control panel. +* Setting is visible only in OLED-devices, i.e. if FF_AVC_DISPLAY_OLED_LOWPOWER_SUPPORT is enabled +* Non-OLED devices have allways blank display in power save mode +* +* Possible integer values: +* +* 0 = Screensaver is off +* 1 = Screensaver is on +* +* Default value: 1 +* +* @publishedPartner +* @released +*/ +const unsigned long int KScreensaverStatus = 0x00000003; + +/** +* Type of display (for legacy reasons, prefer use of FF_AVC_DISPLAY_OLED_LOWPOWER_SUPPORT) +* +* 0 = Regular display type +* 1 = RegularAndOled +* 2 = OLED +* +* +* Default value: 2 +* +* @publishedPartner +* @released +*/ +const unsigned long int KScreensaverDisplayType = 0x00000004; + +/** +* Initial state of the screensaver +* +* 1 = ViewTypeActive +* 2 = ViewTypePowerSave +* +* Initial view type for startup +* +* Default value: 2 +* +* @publishedPartner +* @released +*/ +const unsigned long int KScreensaverStartupView = 0x00000005; + + +#endif // SCREENSAVERDOMAINCRKEYS_H + +// End of File
--- a/homescreenapp/common.pri Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/common.pri Wed Aug 18 10:33:57 2010 +0300 @@ -147,6 +147,4 @@ symbian { SYMBIAN_PLATFORMS = WINSCW ARMV5 -# ONLY FOR DEVELOPMENT! REMOVE THIS BEFORE EACH HS_Domain RELEASE! -MMP_RULES += EXPORTUNFROZEN }
--- a/homescreenapp/examples/batterywidgetplugin/src/batterywidget.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/examples/batterywidgetplugin/src/batterywidget.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -15,10 +15,6 @@ * */ - -//#define OWN_TESTING - - #include <QGraphicsLinearLayout> #include <QPainter> #include <QTimer> @@ -246,19 +242,13 @@ mChargingTimer->stop(); mChargingTimer->disconnect(this); connect(mDeviceInfo, SIGNAL(powerStateChanged(QSystemDeviceInfo::PowerState)), SLOT(powerStateChanged(QSystemDeviceInfo::PowerState))); -#ifdef OWN_TESTING - connect(mChargingTimer, SIGNAL(timeout()), this, SLOT(updateChargingBatteryValue())); - mChargingTimer->start(1000); -#else if (mDeviceInfo->currentPowerState() == QSystemDeviceInfo::WallPowerChargingBattery) { connect(mChargingTimer, SIGNAL(timeout()), this, SLOT(updateChargingBatteryValue())); mChargingTimer->start(500); } else { - connect(mDeviceInfo, SIGNAL(batteryStatusChanged(QSystemDeviceInfo::BatteryStatus)), SLOT(batteryStatusChanged(QSystemDeviceInfo::BatteryStatus))); connect(mDeviceInfo, SIGNAL(batteryLevelChanged(int)), SLOT(batteryLevelChanged(int))); mBatteryValue = mDeviceInfo->batteryLevel(); } -#endif drawBatteryImage(); update(); }
--- a/homescreenapp/examples/localisedhellowidgetplugin/resource/localisedhellowidgetplugin.xml Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/examples/localisedhellowidgetplugin/resource/localisedhellowidgetplugin.xml Wed Aug 18 10:33:57 2010 +0300 @@ -2,8 +2,11 @@ <service> <name>localisedhellowidgetplugin</name> <filepath>localisedhellowidgetplugin</filepath> + <description>Example widget</description> <interface> <name>com.nokia.symbian.IHomeScreenWidget</name> <version>1.0</version> + <description>Example of home screen widget</description> + <capabilities></capabilities> </interface> </service>
--- a/homescreenapp/examples/localisedhellowidgetplugin/sis/localisedhellowidgetplugin.pkg Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/examples/localisedhellowidgetplugin/sis/localisedhellowidgetplugin.pkg Wed Aug 18 10:33:57 2010 +0300 @@ -37,9 +37,9 @@ "/epoc32/release/armv5/urel/localisedhellowidgetplugin.dll" - "!:/sys/bin/localisedhellowidgetplugin.dll" "/epoc32/data/z/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.qtplugin" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.qtplugin" -"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.manifest" -"../resource/localisedhellowidgetplugin.xml" - "!:/data/widgets/servicefw/localisedhellowidgetplugin.xml" -"/epoc32/data/z/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.png" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.png" +"../resource/localisedhellowidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.manifest" +"../resource/localisedhellowidgetplugin.xml" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.xml" +"../resource/localisedhellowidgetplugin.png" - "!:/private/20022F35/import/widgetregistry/20022F80/localisedhellowidgetplugin.png" "/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin.qm" - "!:/resource/qt/translations/localisedhellowidgetplugin.qm" "/epoc32/data/z/resource/qt/translations/localisedhellowidgetplugin_fi.qm" - "!:/resource/qt/translations/localisedhellowidgetplugin_fi.qm"
--- a/homescreenapp/examples/localisedhellowidgetplugin/src/localisedhellowidget.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/examples/localisedhellowidgetplugin/src/localisedhellowidget.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -78,10 +78,6 @@ { // localisation can be used now mText = hbTrId("txt_localisedhellowidgetplugin_button_hello_world2"); - QString testing = hbTrId("txt_localisedhellowidgetplugin_button_hello_world2"); - testing = hbTrId("txt_localisedhellowidgetplugin_button_hello_world1"); - testing = hbTrId("txt_localisedhellowidgetplugin_dblist_hello_world_title"); - testing = hbTrId("txt_localisedhellowidgetplugin_dblist_hello_world_desc"); mButton->setText(hbTrId("txt_localisedhellowidgetplugin_button_hello_world1")); // roothPath is set thus we can use it QString iconPath = QDir::toNativeSeparators(mRootPath + "/localisedhellowidgetplugin.png");
--- a/homescreenapp/hsapplication/conf/base/confml/CI_homescreendb.confml Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/hsapplication/conf/base/confml/CI_homescreendb.confml Wed Aug 18 10:33:57 2010 +0300 @@ -79,28 +79,24 @@ <confml:Pages><confml:id>2</confml:id><confml:indexPosition>1</confml:indexPosition></confml:Pages> <confml:Pages><confml:id>3</confml:id><confml:indexPosition>2</confml:indexPosition></confml:Pages> <confml:Configuration><confml:key>bounceEffect</confml:key><confml:value>20</confml:value></confml:Configuration> - <confml:Configuration><confml:key>widgetTapAndHoldTimeout</confml:key><confml:value>500</confml:value></confml:Configuration> - <confml:Configuration><confml:key>sceneTapAndHoldTimeout</confml:key><confml:value>500</confml:value></confml:Configuration> - <confml:Configuration><confml:key>pageChangeAnimationDuration</confml:key><confml:value>200</confml:value></confml:Configuration> - <confml:Configuration><confml:key>pageChangeZoneAnimationDuration</confml:key><confml:value>800</confml:value></confml:Configuration> + <confml:Configuration><confml:key>pageChangeAnimationDuration</confml:key><confml:value>300</confml:value></confml:Configuration> + <confml:Configuration><confml:key>pageChangeZoneAnimationDuration</confml:key><confml:value>600</confml:value></confml:Configuration> <confml:Configuration><confml:key>pageChangeZoneReverseAnimationDuration</confml:key><confml:value>200</confml:value></confml:Configuration> - <confml:Configuration><confml:key>pageRemovedAnimationDuration</confml:key><confml:value>200</confml:value></confml:Configuration> - <confml:Configuration><confml:key>newPageAddedAnimationDuration</confml:key><confml:value>200</confml:value></confml:Configuration> - <confml:Configuration><confml:key>widgetDragEffectDuration</confml:key><confml:value>200</confml:value></confml:Configuration> + <confml:Configuration><confml:key>pageRemovedAnimationDuration</confml:key><confml:value>1000</confml:value></confml:Configuration> + <confml:Configuration><confml:key>newPageAddedAnimationDuration</confml:key><confml:value>1000</confml:value></confml:Configuration> + <confml:Configuration><confml:key>widgetDragEffectDuration</confml:key><confml:value>250</confml:value></confml:Configuration> <confml:Configuration><confml:key>widgetDropEffectDuration</confml:key><confml:value>200</confml:value></confml:Configuration> <confml:Configuration><confml:key>defaultPageId</confml:key><confml:value>1</confml:value></confml:Configuration> <confml:Configuration><confml:key>maximumPageCount</confml:key><confml:value>8</confml:value></confml:Configuration> <confml:Configuration><confml:key>isShortcutLabelVisible</confml:key><confml:value>true</confml:value></confml:Configuration> - <confml:Configuration><confml:key>bounceFeedbackEffectDistance</confml:key><confml:value>3</confml:value></confml:Configuration> - <confml:Configuration><confml:key>pageChangePanDistanceInPixels</confml:key><confml:value>120</confml:value></confml:Configuration> - <confml:Configuration><confml:key>tapAndHoldDistance</confml:key><confml:value>16</confml:value></confml:Configuration> - <confml:Configuration><confml:key>pageChangeZoneWidth</confml:key><confml:value>60</confml:value></confml:Configuration> + <confml:Configuration><confml:key>bounceFeedbackEffectDistance</confml:key><confml:value>30</confml:value></confml:Configuration> + <confml:Configuration><confml:key>pageChangeZoneWidth</confml:key><confml:value>30</confml:value></confml:Configuration> <confml:Configuration><confml:key>pageIndicatorSpacing</confml:key><confml:value>8</confml:value></confml:Configuration> <confml:Configuration><confml:key>maximumWidgetHeight</confml:key><confml:value>39</confml:value></confml:Configuration> <confml:Configuration><confml:key>maximumWidgetWidth</confml:key><confml:value>48</confml:value></confml:Configuration> <confml:Configuration><confml:key>minimumWidgetHeight</confml:key><confml:value>8.75</confml:value></confml:Configuration> <confml:Configuration><confml:key>minimumWidgetWidth</confml:key><confml:value>8.75</confml:value></confml:Configuration> - <confml:Configuration><confml:key>pageChangePanDistance</confml:key><confml:value>17.91</confml:value></confml:Configuration> + <confml:Configuration><confml:key>pageChangePanDistance</confml:key><confml:value>120</confml:value></confml:Configuration> <confml:Configuration><confml:key>pageChangeFeedbackEffect</confml:key><confml:value>Sensitive</confml:value></confml:Configuration> <confml:Configuration><confml:key>widgetPickFeedbackEffect</confml:key><confml:value>ItemPick</confml:value></confml:Configuration> <confml:Configuration><confml:key>widgetDropFeedbackEffect</confml:key><confml:value>ItemDrop</confml:value></confml:Configuration> @@ -112,14 +108,16 @@ <confml:Configuration><confml:key>clockWidgetTapFeedbackEffect</confml:key><confml:value>BasicItem</confml:value></confml:Configuration> <confml:Configuration><confml:key>widgetSnappingFeedbackEffect</confml:key><confml:value>ItemMoveOver</confml:value></confml:Configuration> <confml:Configuration><confml:key>isSnapEnabled</confml:key><confml:value>true</confml:value></confml:Configuration> - <confml:Configuration><confml:key>snapTimeout</confml:key><confml:value>100</confml:value></confml:Configuration> + <confml:Configuration><confml:key>snapTimeout</confml:key><confml:value>300</confml:value></confml:Configuration> <confml:Configuration><confml:key>snapForce</confml:key><confml:value>30</confml:value></confml:Configuration> <confml:Configuration><confml:key>snapGap</confml:key><confml:value>6</confml:value></confml:Configuration> <confml:Configuration><confml:key>pageMargin</confml:key><confml:value>0</confml:value></confml:Configuration> - <confml:Configuration><confml:key>snapLineFadeInDuration</confml:key><confml:value>200</confml:value></confml:Configuration> + <confml:Configuration><confml:key>snapLineFadeInDuration</confml:key><confml:value>100</confml:value></confml:Configuration> <confml:Configuration><confml:key>snapLineFadeOutDuration</confml:key><confml:value>100</confml:value></confml:Configuration> <confml:Configuration><confml:key>isSnapEffectsEnabled</confml:key><confml:value>true</confml:value></confml:Configuration> <confml:Configuration><confml:key>sceneType</confml:key><confml:value>PageWallpapers</confml:value></confml:Configuration> + <confml:Configuration><confml:key>bounceAnimationEasingCurve</confml:key><confml:value>Linear</confml:value></confml:Configuration> + <confml:Configuration><confml:key>pageChangeAnimationEasingCurve</confml:key><confml:value>Linear</confml:value></confml:Configuration> </confml:HomeScreenDbSettings> </confml:data> </confml:configuration>
--- a/homescreenapp/hsapplication/conf/base/confml/homescreendb.confml Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/hsapplication/conf/base/confml/homescreendb.confml Wed Aug 18 10:33:57 2010 +0300 @@ -79,28 +79,24 @@ <Pages><id>2</id><indexPosition>1</indexPosition></Pages> <Pages><id>3</id><indexPosition>2</indexPosition></Pages> <Configuration><key>bounceEffect</key><value>20</value></Configuration> - <Configuration><key>widgetTapAndHoldTimeout</key><value>500</value></Configuration> - <Configuration><key>sceneTapAndHoldTimeout</key><value>500</value></Configuration> - <Configuration><key>pageChangeAnimationDuration</key><value>200</value></Configuration> - <Configuration><key>pageChangeZoneAnimationDuration</key><value>800</value></Configuration> + <Configuration><key>pageChangeAnimationDuration</key><value>300</value></Configuration> + <Configuration><key>pageChangeZoneAnimationDuration</key><value>600</value></Configuration> <Configuration><key>pageChangeZoneReverseAnimationDuration</key><value>200</value></Configuration> - <Configuration><key>pageRemovedAnimationDuration</key><value>200</value></Configuration> - <Configuration><key>newPageAddedAnimationDuration</key><value>200</value></Configuration> - <Configuration><key>widgetDragEffectDuration</key><value>200</value></Configuration> + <Configuration><key>pageRemovedAnimationDuration</key><value>1000</value></Configuration> + <Configuration><key>newPageAddedAnimationDuration</key><value>1000</value></Configuration> + <Configuration><key>widgetDragEffectDuration</key><value>250</value></Configuration> <Configuration><key>widgetDropEffectDuration</key><value>200</value></Configuration> <Configuration><key>defaultPageId</key><value>1</value></Configuration> <Configuration><key>maximumPageCount</key><value>8</value></Configuration> <Configuration><key>isShortcutLabelVisible</key><value>true</value></Configuration> - <Configuration><key>bounceFeedbackEffectDistance</key><value>3</value></Configuration> - <Configuration><key>pageChangePanDistanceInPixels</key><value>120</value></Configuration> - <Configuration><key>tapAndHoldDistance</key><value>16</value></Configuration> - <Configuration><key>pageChangeZoneWidth</key><value>60</value></Configuration> + <Configuration><key>bounceFeedbackEffectDistance</key><value>30</value></Configuration> + <Configuration><key>pageChangeZoneWidth</key><value>30</value></Configuration> <Configuration><key>pageIndicatorSpacing</key><value>8</value></Configuration> <Configuration><key>maximumWidgetHeight</key><value>39</value></Configuration> <Configuration><key>maximumWidgetWidth</key><value>48</value></Configuration> <Configuration><key>minimumWidgetHeight</key><value>8.75</value></Configuration> <Configuration><key>minimumWidgetWidth</key><value>8.75</value></Configuration> - <Configuration><key>pageChangePanDistance</key><value>17.91</value></Configuration> + <Configuration><key>pageChangePanDistance</key><value>120</value></Configuration> <Configuration><key>pageChangeFeedbackEffect</key><value>Sensitive</value></Configuration> <Configuration><key>widgetPickFeedbackEffect</key><value>ItemPick</value></Configuration> <Configuration><key>widgetDropFeedbackEffect</key><value>ItemDrop</value></Configuration> @@ -112,11 +108,11 @@ <Configuration><key>clockWidgetTapFeedbackEffect</key><value>BasicItem</value></Configuration> <Configuration><key>widgetSnappingFeedbackEffect</key><value>ItemMoveOver</value></Configuration> <Configuration><key>isSnapEnabled</key><value>true</value></Configuration> - <Configuration><key>snapTimeout</key><value>100</value></Configuration> + <Configuration><key>snapTimeout</key><value>300</value></Configuration> <Configuration><key>snapForce</key><value>30</value></Configuration> <Configuration><key>snapGap</key><value>6</value></Configuration> <Configuration><key>pageMargin</key><value>0</value></Configuration> - <Configuration><key>snapLineFadeInDuration</key><value>200</value></Configuration> + <Configuration><key>snapLineFadeInDuration</key><value>100</value></Configuration> <Configuration><key>snapLineFadeOutDuration</key><value>100</value></Configuration> <Configuration><key>isSnapEffectsEnabled</key><value>true</value></Configuration> <Configuration><key>sceneType</key><value>PageWallpapers</value></Configuration>
--- a/homescreenapp/hsapplication/conf/export_database_s60.bat Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/hsapplication/conf/export_database_s60.bat Wed Aug 18 10:33:57 2010 +0300 @@ -14,4 +14,4 @@ @rem Description: @rem -call xcopy /r output\private\20022f35\homescreen.db \epoc32\data\z\private\20022F35 \ No newline at end of file +call xcopy /r output\content\private\20022f35\homescreen.db \epoc32\data\z\private\20022F35 \ No newline at end of file
--- a/homescreenapp/hsapplication/hsapplication.pro Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/hsapplication/hsapplication.pro Wed Aug 18 10:33:57 2010 +0300 @@ -58,8 +58,8 @@ include(hsapplication_exports_to_rom.pri) CONFIG += service - LIBS += -lxqservice -lxqserviceutil -lXQKeyCapture - + LIBS += -lxqservice -lxqserviceutil -lXQKeyCapture -lxqtelephonyservice + SERVICE.FILE = ipc_service_conf.xml }
--- a/homescreenapp/hsapplication/inc/hsstatemachine.h Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/hsapplication/inc/hsstatemachine.h Wed Aug 18 10:33:57 2010 +0300 @@ -54,7 +54,7 @@ private: Q_DISABLE_COPY(HsStateMachine) - + void startDialer(); void registerAnimations(); void createStatePublisher(); void createContentServiceParts(); @@ -74,6 +74,7 @@ bool mHomeScreenActive; bool mIdleStateActive; bool mEndKeyCaptured; + bool mSendKeyCaptured; QValueSpacePublisher *mPublisher;
--- a/homescreenapp/hsapplication/src/hsrecoverymanager.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/hsapplication/src/hsrecoverymanager.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -80,9 +80,14 @@ } // 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); + if (!file.copy("c:/private/20022f35/homescreen.db")) { + qDebug() << "copying of homescreen.db to c: drive failed"; + } else { + file.setFileName("c:/private/20022f35/homescreen.db"); + if (!file.setPermissions(QFile::ReadOwner | QFile::WriteOwner)) { + qDebug() << "setPermissions of homescreen.db failed"; + } + } } /*!
--- a/homescreenapp/hsapplication/src/hsstatemachine.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/hsapplication/src/hsstatemachine.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -46,6 +46,13 @@ #include "hstest_global.h" #include "hswidgetpositioningonwidgetmove.h" +#ifdef Q_OS_SYMBIAN +#include <xqappmgr.h> +#include <xqcallinfo.h> +#include <logsservices.h> +#include <xqrequestinfo.h> +#endif // Q_OS_SYMBIAN + QTM_USE_NAMESPACE #define hbApp qobject_cast<HbApplication*>(qApp) @@ -80,6 +87,7 @@ mHomeScreenActive(false), mIdleStateActive(false), mEndKeyCaptured(false), + mSendKeyCaptured(false), mPublisher(NULL) #ifdef Q_OS_SYMBIAN ,keyCapture() @@ -170,13 +178,82 @@ } bool result = QStateMachine::eventFilter(watched, event); + if (event->type() == QEvent::KeyPress ) { - QKeyEvent* ke = static_cast<QKeyEvent *>(event); - result = (ke->key() == Qt::Key_Home); + QKeyEvent* ke = static_cast<QKeyEvent *>(event); + int key = ke->key(); + + if (key == Qt::Key_Home ) { + result = true; + } + else if (key == Qt::Key_Yes ) { + result = true; + if (mSendKeyCaptured == false && mHomeScreenActive == true) { + mSendKeyCaptured = true; + startDialer(); + } + } } return result; } +#ifdef COVERAGE_MEASUREMENT +#pragma CTC SKIP +#endif //COVERAGE_MEASUREMENT +/*! + \fn void HsStateMachine::startDialer() + Starts Dialer application +*/ +void HsStateMachine::startDialer() + { + // copy-paste code from dialer widget +#ifdef Q_OS_SYMBIAN + qDebug("HsStateMachine::startDialer()"); + + QList<CallInfo> calls; + QScopedPointer<XQCallInfo> callInfo(XQCallInfo::create()); + callInfo->getCalls(calls); + QList<QVariant> args; + QString service; + QString interface; + QString operation; + + if (0 < calls.count()) { + qDebug("HS: call ongoing, bring Telephone to foreground"); + service = "phoneui"; + interface = "com.nokia.symbian.IStart"; + operation = "start(int)"; + int openDialer(0); + args << openDialer; + } else { + qDebug("HS: no calls, open Dialer"); + service = "logs"; + interface = "com.nokia.symbian.ILogsView"; + operation = "show(QVariantMap)"; + QVariantMap map; + map.insert("view_index", QVariant(int(LogsServices::ViewAll))); + map.insert("show_dialpad", QVariant(true)); + map.insert("dialpad_text", QVariant(QString())); + args.append(QVariant(map)); + } + + XQApplicationManager appManager; + QScopedPointer<XQAiwRequest> request(appManager.create(service, interface, operation, false)); + if (request == NULL) { + return; + } + request->setArguments(args); + XQRequestInfo info; + info.setForeground(true); + request->setInfo(info); + bool ret = request->send(); + qDebug("HS: request sent successfully:", ret); +#endif +} + +#ifdef COVERAGE_MEASUREMENT +#pragma CTC ENDSKIP +#endif //COVERAGE_MEASUREMENT /*! Registers framework animations. @@ -373,6 +450,7 @@ } else { captureEndKey(false); } + mSendKeyCaptured = false; } /*! @@ -414,13 +492,13 @@ */ void HsStateMachine::activityRequested(const QString &name) { - if (name == groupAppLibRecentView()) { + if (name == Hs::groupAppLibRecentView) { this->postEvent( HsMenuEventFactory::createOpenCollectionEvent(0, - collectionDownloadedTypeName())); - } else if (name == activityHsIdleView()) { + Hs::collectionDownloadedTypeName)); + } else if (name == Hs::activityHsIdleView) { emit event_toIdle(); - } else if (name == activityAppLibMainView()) { + } else if (name == Hs::activityAppLibMainView) { emit event_toAppLib(); } }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsdomainmodel/bwins/hsdomainmodelu.def Wed Aug 18 10:33:57 2010 +0300 @@ -0,0 +1,659 @@ +EXPORTS + ?trUtf8@HsScene@@SA?AVQString@@PBD0H@Z @ 1 NONAME ; class QString HsScene::trUtf8(char const *, char const *, int) + ?staticMetaObject@HsPageVisual@@2UQMetaObject@@B @ 2 NONAME ; struct QMetaObject const HsPageVisual::staticMetaObject + ?metaObject@HsConfiguration@@UBEPBUQMetaObject@@XZ @ 3 NONAME ; struct QMetaObject const * HsConfiguration::metaObject(void) const + ?aboutToUninstall@HsWidgetComponent@@IAEXXZ @ 4 NONAME ; void HsWidgetComponent::aboutToUninstall(void) + ??_EHsWidgetData@@QAE@I@Z @ 5 NONAME ; HsWidgetData::~HsWidgetData(unsigned int) + ?metaObject@HsHostedWidgetFactory@@UBEPBUQMetaObject@@XZ @ 6 NONAME ; struct QMetaObject const * HsHostedWidgetFactory::metaObject(void) const + ?pageChangeZoneAnimationDuration@HsConfiguration@@QBEHXZ @ 7 NONAME ; int HsConfiguration::pageChangeZoneAnimationDuration(void) const + ?takeInstance@HsHostedWidgetFactory@@SAPAV1@XZ @ 8 NONAME ; class HsHostedWidgetFactory * HsHostedWidgetFactory::takeInstance(void) + ?widgetDropEffectDuration@HsConfiguration@@QBEHXZ @ 9 NONAME ; int HsConfiguration::widgetDropEffectDuration(void) const + ?setMaximumPageCount@HsConfiguration@@QAEXH@Z @ 10 NONAME ; void HsConfiguration::setMaximumPageCount(int) + ?qt_metacast@HsShortcutService@@UAEPAXPBD@Z @ 11 NONAME ; void * HsShortcutService::qt_metacast(char const *) + ?propertyChanged@HsConfiguration@@IAEXABVQString@@@Z @ 12 NONAME ; void HsConfiguration::propertyChanged(class QString const &) + ?showWidget@HsWidgetHost@@QAEXXZ @ 13 NONAME ; void HsWidgetHost::showWidget(void) + ?setInstance@HsConfiguration@@SAXPAV1@@Z @ 14 NONAME ; void HsConfiguration::setInstance(class HsConfiguration *) + ?isActivePage@HsPage@@QBE_NXZ @ 15 NONAME ; bool HsPage::isActivePage(void) const + ?hidden@HsWidgetComponentDescriptor@@QBE?AVQString@@XZ @ 16 NONAME ; class QString HsWidgetComponentDescriptor::hidden(void) const + ?cancel@HsWallpaperLoader@@QAEXXZ @ 17 NONAME ; void HsWallpaperLoader::cancel(void) + ?metaObject@HsShortcutService@@UBEPBUQMetaObject@@XZ @ 18 NONAME ; struct QMetaObject const * HsShortcutService::metaObject(void) const + ?instance@HsBackupRestoreObserver@@SAPAV1@XZ @ 19 NONAME ; class HsBackupRestoreObserver * HsBackupRestoreObserver::instance(void) + ??1HsWidgetHostVisual@@UAE@XZ @ 20 NONAME ; HsWidgetHostVisual::~HsWidgetHostVisual(void) + ?load@HsPage@@QAE_NXZ @ 21 NONAME ; bool HsPage::load(void) + ?setSnapEnabled@HsConfiguration@@QAEX_N@Z @ 22 NONAME ; void HsConfiguration::setSnapEnabled(bool) + ?clockWidgetTapFeedbackEffect@HsConfiguration@@QBE?AW4InstantEffect@HbFeedback@@XZ @ 23 NONAME ; enum HbFeedback::InstantEffect HsConfiguration::clockWidgetTapFeedbackEffect(void) const + ?readyForBUR@HsBackupRestoreObserver@@QAEXXZ @ 24 NONAME ; void HsBackupRestoreObserver::readyForBUR(void) + ?handleEntryUpdated@HsWidgetComponentRegistry@@AAEXABVCaEntry@@ABVQString@@@Z @ 25 NONAME ; void HsWidgetComponentRegistry::handleEntryUpdated(class CaEntry const &, class QString const &) + ?instance@HsShortcutService@@SAPAV1@PAVQStateMachine@@@Z @ 26 NONAME ; class HsShortcutService * HsShortcutService::instance(class QStateMachine *) + ?staticMetaObject@HsDatabase@@2UQMetaObject@@B @ 27 NONAME ; struct QMetaObject const HsDatabase::staticMetaObject + ??1HsSceneWallpaper@@UAE@XZ @ 28 NONAME ; HsSceneWallpaper::~HsSceneWallpaper(void) + ?setActivePageIndex@HsScene@@QAE_NH@Z @ 29 NONAME ; bool HsScene::setActivePageIndex(int) + ??1HsContentService@@UAE@XZ @ 30 NONAME ; HsContentService::~HsContentService(void) + ?widgetPreference@HsDatabase@@QAE_NHABVQString@@AAVQVariant@@@Z @ 31 NONAME ; bool HsDatabase::widgetPreference(int, class QString const &, class QVariant &) + ?tr@HsBackupRestoreObserver@@SA?AVQString@@PBD0H@Z @ 32 NONAME ; class QString HsBackupRestoreObserver::tr(char const *, char const *, int) + ?setOnline@HsScene@@QAEX_N@Z @ 33 NONAME ; void HsScene::setOnline(bool) + ?updateIconItem@HsWallpaper@@AAEXW4Orientation@Qt@@@Z @ 34 NONAME ; void HsWallpaper::updateIconItem(enum Qt::Orientation) + ?getStaticMetaObject@HsWidgetComponentRegistry@@SAABUQMetaObject@@XZ @ 35 NONAME ; struct QMetaObject const & HsWidgetComponentRegistry::getStaticMetaObject(void) + ?trUtf8@HsPageWallpaper@@SA?AVQString@@PBD0@Z @ 36 NONAME ; class QString HsPageWallpaper::trUtf8(char const *, char const *) + ??0HsWidgetComponentRegistry@@AAE@PAVQObject@@@Z @ 37 NONAME ; HsWidgetComponentRegistry::HsWidgetComponentRegistry(class QObject *) + ?NewL@CHsBURActiveCallback@@SAPAV1@PAVHsBackupRestoreObserver@@@Z @ 38 NONAME ; class CHsBURActiveCallback * CHsBURActiveCallback::NewL(class HsBackupRestoreObserver *) + ?action_unload@HsWidgetHost@@AAEXXZ @ 39 NONAME ; void HsWidgetHost::action_unload(void) + ?visualModel@HsWidgetHostVisual@@QBEPAVHsWidgetHost@@XZ @ 40 NONAME ; class HsWidgetHost * HsWidgetHostVisual::visualModel(void) const + ?tr@HsBackupRestoreObserver@@SA?AVQString@@PBD0@Z @ 41 NONAME ; class QString HsBackupRestoreObserver::tr(char const *, char const *) + ?setMinimumWidgetWidth@HsConfiguration@@QAEXM@Z @ 42 NONAME ; void HsConfiguration::setMinimumWidgetWidth(float) + ?event_show@HsWidgetHost@@IAEXXZ @ 43 NONAME ; void HsWidgetHost::event_show(void) + ?setBounceAnimationEasingCurve@HsConfiguration@@QAEXW4Type@QEasingCurve@@@Z @ 44 NONAME ; void HsConfiguration::setBounceAnimationEasingCurve(enum QEasingCurve::Type) + ?wallpaperDirectory@HsSceneWallpaper@@MBE?AVQString@@XZ @ 45 NONAME ; class QString HsSceneWallpaper::wallpaperDirectory(void) const + ?setWidgetMoveBlockedFeedbackEffect@HsConfiguration@@QAEXW4InstantEffect@HbFeedback@@@Z @ 46 NONAME ; void HsConfiguration::setWidgetMoveBlockedFeedbackEffect(enum HbFeedback::InstantEffect) + ?imageSetFailed@HsWallpaper@@IAEXXZ @ 47 NONAME ; void HsWallpaper::imageSetFailed(void) + ?trUtf8@HsWidgetHostVisual@@SA?AVQString@@PBD0@Z @ 48 NONAME ; class QString HsWidgetHostVisual::trUtf8(char const *, char const *) + ?setSnapForce@HsConfiguration@@QAEXM@Z @ 49 NONAME ; void HsConfiguration::setSnapForce(float) + ??0HsWidgetData@@QAE@XZ @ 50 NONAME ; HsWidgetData::HsWidgetData(void) + ?event_backupRestoreCompleted@HsBackupRestoreObserver@@IAEXXZ @ 51 NONAME ; void HsBackupRestoreObserver::event_backupRestoreCompleted(void) + ?staticMetaObject@HsWidgetHostVisual@@2UQMetaObject@@B @ 52 NONAME ; struct QMetaObject const HsWidgetHostVisual::staticMetaObject + ?setActivePage@HsScene@@QAE_NPAVHsPage@@@Z @ 53 NONAME ; bool HsScene::setActivePage(class HsPage *) + ?setSceneX@HsIdleWidget@@QAEXM@Z @ 54 NONAME ; void HsIdleWidget::setSceneX(float) + ?qt_metacast@HsContentService@@UAEPAXPBD@Z @ 55 NONAME ; void * HsContentService::qt_metacast(char const *) + ?qt_metacall@HsContentService@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 56 NONAME ; int HsContentService::qt_metacall(enum QMetaObject::Call, int, void * *) + ?qt_metacall@HsSceneWallpaper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 57 NONAME ; int HsSceneWallpaper::qt_metacall(enum QMetaObject::Call, int, void * *) + ?widgets@HsContentService@@QAE_NABVQString@@ABV?$QHash@VQString@@VQVariant@@@@AAH@Z @ 58 NONAME ; bool HsContentService::widgets(class QString const &, class QHash<class QString, class QVariant> const &, int &) + ?createWidget@HsHostedWidgetFactory@@QAEPAVQObject@@ABVQString@@@Z @ 59 NONAME ; class QObject * HsHostedWidgetFactory::createWidget(class QString const &) + ?metaObject@HsDatabase@@UBEPBUQMetaObject@@XZ @ 60 NONAME ; struct QMetaObject const * HsDatabase::metaObject(void) const + ?contentGeometry@HsPage@@QAE?AVQRectF@@W4Orientation@Qt@@@Z @ 61 NONAME ; class QRectF HsPage::contentGeometry(enum Qt::Orientation) + ?exportToFile@HsConfiguration@@QAE_NABVQString@@@Z @ 62 NONAME ; bool HsConfiguration::exportToFile(class QString const &) + ?widgetStartFaulted@HsContentService@@AAEXXZ @ 63 NONAME ; void HsContentService::widgetStartFaulted(void) + ??_EHsWidgetHostVisual@@UAE@I@Z @ 64 NONAME ; HsWidgetHostVisual::~HsWidgetHostVisual(unsigned int) + ?setPageChangePanDistance@HsConfiguration@@QAEXM@Z @ 65 NONAME ; void HsConfiguration::setPageChangePanDistance(float) + ?qt_metacast@HsSceneWallpaper@@UAEPAXPBD@Z @ 66 NONAME ; void * HsSceneWallpaper::qt_metacast(char const *) + ?metaObject@HsWallpaperLoader@@UBEPBUQMetaObject@@XZ @ 67 NONAME ; struct QMetaObject const * HsWallpaperLoader::metaObject(void) const + ?action_finished@HsWidgetHost@@AAEXXZ @ 68 NONAME ; void HsWidgetHost::action_finished(void) + ?visual@HsWidgetHost@@QBEPAVHsWidgetHostVisual@@XZ @ 69 NONAME ; class HsWidgetHostVisual * HsWidgetHost::visual(void) const + ?pageChangeFeedbackEffect@HsConfiguration@@QBE?AW4InstantEffect@HbFeedback@@XZ @ 70 NONAME ; enum HbFeedback::InstantEffect HsConfiguration::pageChangeFeedbackEffect(void) const + ??0HsWallpaperLoader@@QAE@PAVQObject@@@Z @ 71 NONAME ; HsWallpaperLoader::HsWallpaperLoader(class QObject *) + ?trUtf8@HsShortcutService@@SA?AVQString@@PBD0H@Z @ 72 NONAME ; class QString HsShortcutService::trUtf8(char const *, char const *, int) + ?maximumWidgetWidth@HsConfiguration@@QBEMXZ @ 73 NONAME ; float HsConfiguration::maximumWidgetWidth(void) const + ?metaObject@HsContentService@@UBEPBUQMetaObject@@XZ @ 74 NONAME ; struct QMetaObject const * HsContentService::metaObject(void) const + ?setScene@HsSceneWallpaper@@QAEXPAVHsScene@@@Z @ 75 NONAME ; void HsSceneWallpaper::setScene(class HsScene *) + ?onPageMarginChanged@HsPage@@AAEXABVQString@@@Z @ 76 NONAME ; void HsPage::onPageMarginChanged(class QString const &) + ?finished@HsWidgetHost@@IAEXXZ @ 77 NONAME ; void HsWidgetHost::finished(void) + ?pagePanStarted@HsScene@@IAEXPAVQGestureEvent@@@Z @ 78 NONAME ; void HsScene::pagePanStarted(class QGestureEvent *) + ?addPage@HsScene@@QAE_NPAVHsPage@@@Z @ 79 NONAME ; bool HsScene::addPage(class HsPage *) + ?controlLayer@HsIdleWidget@@QBEPAVHbWidget@@XZ @ 80 NONAME ; class HbWidget * HsIdleWidget::controlLayer(void) const + ?qt_metacall@HsWidgetHost@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 81 NONAME ; int HsWidgetHost::qt_metacall(enum QMetaObject::Call, int, void * *) + ?configuration@HsDatabase@@QAE_NAAV?$QHash@VQString@@VQVariant@@@@@Z @ 82 NONAME ; bool HsDatabase::configuration(class QHash<class QString, class QVariant> &) + ?tr@HsContentService@@SA?AVQString@@PBD0@Z @ 83 NONAME ; class QString HsContentService::tr(char const *, char const *) + ?mInstance@HsHostedWidgetFactory@@0PAV1@A @ 84 NONAME ; class HsHostedWidgetFactory * HsHostedWidgetFactory::mInstance + ?setInstance@HsHostedWidgetFactory@@SAPAV1@PAV1@@Z @ 85 NONAME ; class HsHostedWidgetFactory * HsHostedWidgetFactory::setInstance(class HsHostedWidgetFactory *) + ?staticMetaObject@HsScene@@2UQMetaObject@@B @ 86 NONAME ; struct QMetaObject const HsScene::staticMetaObject + ?setMaximumWidgetWidth@HsConfiguration@@QAEXM@Z @ 87 NONAME ; void HsConfiguration::setMaximumWidgetWidth(float) + ?scene@HsDatabase@@QAE_NAAVHsSceneData@@@Z @ 88 NONAME ; bool HsDatabase::scene(class HsSceneData &) + ?resetNewWidgets@HsPage@@QAEXXZ @ 89 NONAME ; void HsPage::resetNewWidgets(void) + ?tr@HsScene@@SA?AVQString@@PBD0@Z @ 90 NONAME ; class QString HsScene::tr(char const *, char const *) + ?tr@HsPage@@SA?AVQString@@PBD0@Z @ 91 NONAME ; class QString HsPage::tr(char const *, char const *) + ?emitAvailable@HsWidgetComponent@@AAEXXZ @ 92 NONAME ; void HsWidgetComponent::emitAvailable(void) + ?getStaticMetaObject@HsDatabase@@SAABUQMetaObject@@XZ @ 93 NONAME ; struct QMetaObject const & HsDatabase::getStaticMetaObject(void) + ?contentRect@HsPage@@QAE?AVQRectF@@XZ @ 94 NONAME ; class QRectF HsPage::contentRect(void) + ?tr@HsPageVisual@@SA?AVQString@@PBD0@Z @ 95 NONAME ; class QString HsPageVisual::tr(char const *, char const *) + ?setIconUri@HsWidgetComponentDescriptor@@QAEXABVQString@@@Z @ 96 NONAME ; void HsWidgetComponentDescriptor::setIconUri(class QString const &) + ?orientationChanged@HsGui@@IAEXW4Orientation@Qt@@@Z @ 97 NONAME ; void HsGui::orientationChanged(enum Qt::Orientation) + ?widgetAdded@HsContentService@@IAEXABVQString@@ABV?$QHash@VQString@@VQVariant@@@@@Z @ 98 NONAME ; void HsContentService::widgetAdded(class QString const &, class QHash<class QString, class QVariant> const &) + ?staticMetaObject@HsWallpaperLoaderThread@@2UQMetaObject@@B @ 99 NONAME ; struct QMetaObject const HsWallpaperLoaderThread::staticMetaObject + ?databaseName@HsDatabase@@QBE?AVQString@@XZ @ 100 NONAME ; class QString HsDatabase::databaseName(void) const + ?setPageChangeAnimationEasingCurve@HsConfiguration@@QAEXW4Type@QEasingCurve@@@Z @ 101 NONAME ; void HsConfiguration::setPageChangeAnimationEasingCurve(enum QEasingCurve::Type) + ?setPageChangeZoneAnimationDuration@HsConfiguration@@QAEXH@Z @ 102 NONAME ; void HsConfiguration::setPageChangeZoneAnimationDuration(int) + ?qt_metacast@HsIdleWidget@@UAEPAXPBD@Z @ 103 NONAME ; void * HsIdleWidget::qt_metacast(char const *) + ?executeCollectionAction@HsShortcutService@@QAEXHABVQString@@@Z @ 104 NONAME ; void HsShortcutService::executeCollectionAction(int, class QString const &) + ?widgets@HsDatabase@@QAE_NABVQString@@ABV?$QHash@VQString@@VQVariant@@@@AAH@Z @ 105 NONAME ; bool HsDatabase::widgets(class QString const &, class QHash<class QString, class QVariant> const &, int &) + ?qt_metacast@HsWallpaperLoaderThread@@UAEPAXPBD@Z @ 106 NONAME ; void * HsWallpaperLoaderThread::qt_metacast(char const *) + ?pageCrawlingAnimation@HsGui@@QAEPAVHsPropertyAnimationWrapper@@XZ @ 107 NONAME ; class HsPropertyAnimationWrapper * HsGui::pageCrawlingAnimation(void) + ?setSceneType@HsConfiguration@@QAEXW4SceneType@1@@Z @ 108 NONAME ; void HsConfiguration::setSceneType(enum HsConfiguration::SceneType) + ?layoutNewWidgets@HsPage@@QAEXXZ @ 109 NONAME ; void HsPage::layoutNewWidgets(void) + ?matchWidgetPreferences@HsDatabase@@AAE_NABV?$QHash@VQString@@VQVariant@@@@ABV?$QMultiMap@VQString@@V1@@@@Z @ 110 NONAME ; bool HsDatabase::matchWidgetPreferences(class QHash<class QString, class QVariant> const &, class QMultiMap<class QString, class QString> const &) + ?tr@HsWidgetHostVisual@@SA?AVQString@@PBD0@Z @ 111 NONAME ; class QString HsWidgetHostVisual::tr(char const *, char const *) + ?targetSize@HsWallpaperLoaderThread@@QBE?AVQSize@@XZ @ 112 NONAME ; class QSize HsWallpaperLoaderThread::targetSize(void) const + ?trUtf8@HsWallpaperLoader@@SA?AVQString@@PBD0H@Z @ 113 NONAME ; class QString HsWallpaperLoader::trUtf8(char const *, char const *, int) + ?event_remove@HsWidgetHost@@IAEXXZ @ 114 NONAME ; void HsWidgetHost::event_remove(void) + ?startDropEffect@HsWidgetHost@@QAEXXZ @ 115 NONAME ; void HsWidgetHost::startDropEffect(void) + ?trUtf8@HsWidgetComponentRegistry@@SA?AVQString@@PBD0@Z @ 116 NONAME ; class QString HsWidgetComponentRegistry::trUtf8(char const *, char const *) + ?event_close@HsWidgetHost@@IAEXXZ @ 117 NONAME ; void HsWidgetHost::event_close(void) + ??1HsWallpaperLoader@@UAE@XZ @ 118 NONAME ; HsWallpaperLoader::~HsWallpaperLoader(void) + ?mInstance@HsBackupRestoreObserver@@0PAV1@A @ 119 NONAME ; class HsBackupRestoreObserver * HsBackupRestoreObserver::mInstance + ?connectWidget@HsPage@@AAEXPAVHsWidgetHost@@@Z @ 120 NONAME ; void HsPage::connectWidget(class HsWidgetHost *) + ?setShortcutLabelVisible@HsConfiguration@@QAEX_N@Z @ 121 NONAME ; void HsConfiguration::setShortcutLabelVisible(bool) + ?sceneLayer@HsIdleWidget@@QBEPAVHbWidget@@XZ @ 122 NONAME ; class HbWidget * HsIdleWidget::sceneLayer(void) const + ?trUtf8@HsWallpaperLoaderThread@@SA?AVQString@@PBD0@Z @ 123 NONAME ; class QString HsWallpaperLoaderThread::trUtf8(char const *, char const *) + ?qt_metacast@HsScene@@UAEPAXPBD@Z @ 124 NONAME ; void * HsScene::qt_metacast(char const *) + ??1HsWidgetHost@@UAE@XZ @ 125 NONAME ; HsWidgetHost::~HsWidgetHost(void) + ?uninstallComponent@HsWidgetComponentRegistry@@QAEXABVHsWidgetComponentDescriptor@@@Z @ 126 NONAME ; void HsWidgetComponentRegistry::uninstallComponent(class HsWidgetComponentDescriptor const &) + ?action_notifyRemove@HsWidgetHost@@AAEXXZ @ 127 NONAME ; void HsWidgetHost::action_notifyRemove(void) + ?open@HsDatabase@@QAE_NXZ @ 128 NONAME ; bool HsDatabase::open(void) + ?idleWidget@HsGui@@QBEPAVHsIdleWidget@@XZ @ 129 NONAME ; class HsIdleWidget * HsGui::idleWidget(void) const + ?pageMargin@HsConfiguration@@QBEMXZ @ 130 NONAME ; float HsConfiguration::pageMargin(void) const + ?failed@HsWallpaperLoader@@IAEXXZ @ 131 NONAME ; void HsWallpaperLoader::failed(void) + ?setPos@HsWidgetPresentationData@@QAEXABVQPointF@@@Z @ 132 NONAME ; void HsWidgetPresentationData::setPos(class QPointF const &) + ?isSnapEffectsEnabled@HsConfiguration@@QBE_NXZ @ 133 NONAME ; bool HsConfiguration::isSnapEffectsEnabled(void) const + ?trUtf8@HsWallpaperLoaderThread@@SA?AVQString@@PBD0H@Z @ 134 NONAME ; class QString HsWallpaperLoaderThread::trUtf8(char const *, char const *, int) + ?setSourcePath@HsWallpaperLoaderThread@@QAEXABVQString@@@Z @ 135 NONAME ; void HsWallpaperLoaderThread::setSourcePath(class QString const &) + ?tr@HsGui@@SA?AVQString@@PBD0@Z @ 136 NONAME ; class QString HsGui::tr(char const *, char const *) + ?disconnectWidget@HsPage@@AAEXPAVHsWidgetHost@@@Z @ 137 NONAME ; void HsPage::disconnectWidget(class HsWidgetHost *) + ?setOnline@HsPage@@QAEX_N@Z @ 138 NONAME ; void HsPage::setOnline(bool) + ?tr@HsDatabase@@SA?AVQString@@PBD0@Z @ 139 NONAME ; class QString HsDatabase::tr(char const *, char const *) + ?onLoaderFailed@HsWallpaper@@AAEXXZ @ 140 NONAME ; void HsWallpaper::onLoaderFailed(void) + ?trUtf8@HsScene@@SA?AVQString@@PBD0@Z @ 141 NONAME ; class QString HsScene::trUtf8(char const *, char const *) + ?uninstallTranslator@HsWidgetComponent@@AAEXXZ @ 142 NONAME ; void HsWidgetComponent::uninstallTranslator(void) + ?setGeometry@HsIdleWidget@@UAEXABVQRectF@@@Z @ 143 NONAME ; void HsIdleWidget::setGeometry(class QRectF const &) + ?updateZValues@HsPage@@QAEXXZ @ 144 NONAME ; void HsPage::updateZValues(void) + ?tr@HsShortcutService@@SA?AVQString@@PBD0H@Z @ 145 NONAME ; class QString HsShortcutService::tr(char const *, char const *, int) + ?pos@HsWidgetPresentationData@@QBE?AVQPointF@@XZ @ 146 NONAME ; class QPointF HsWidgetPresentationData::pos(void) const + ?getStaticMetaObject@HsBackupRestoreObserver@@SAABUQMetaObject@@XZ @ 147 NONAME ; struct QMetaObject const & HsBackupRestoreObserver::getStaticMetaObject(void) + ?trUtf8@HsPageVisual@@SA?AVQString@@PBD0@Z @ 148 NONAME ; class QString HsPageVisual::trUtf8(char const *, char const *) + ?action_show@HsWidgetHost@@AAEXXZ @ 149 NONAME ; void HsWidgetHost::action_show(void) + ?pageLayer@HsIdleWidget@@QBEPAVHbWidget@@XZ @ 150 NONAME ; class HbWidget * HsIdleWidget::pageLayer(void) const + ?setSnapGap@HsConfiguration@@QAEXM@Z @ 151 NONAME ; void HsConfiguration::setSnapGap(float) + ?trUtf8@HsHostedWidgetFactory@@SA?AVQString@@PBD0@Z @ 152 NONAME ; class QString HsHostedWidgetFactory::trUtf8(char const *, char const *) + ?setActiveWidget@HsScene@@QAEXPAVHsWidgetHost@@@Z @ 153 NONAME ; void HsScene::setActiveWidget(class HsWidgetHost *) + ?transaction@HsDatabase@@QAE_NXZ @ 154 NONAME ; bool HsDatabase::transaction(void) + ?snapForce@HsConfiguration@@QBEMXZ @ 155 NONAME ; float HsConfiguration::snapForce(void) const + ?isOnline@HsScene@@QBE_NXZ @ 156 NONAME ; bool HsScene::isOnline(void) const + ??0HsWidgetPresentationData@@QAE@XZ @ 157 NONAME ; HsWidgetPresentationData::HsWidgetPresentationData(void) + ?tr@HsShortcutService@@SA?AVQString@@PBD0@Z @ 158 NONAME ; class QString HsShortcutService::tr(char const *, char const *) + ?metaObject@HsWidgetComponent@@UBEPBUQMetaObject@@XZ @ 159 NONAME ; struct QMetaObject const * HsWidgetComponent::metaObject(void) const + ?setConnectionName@HsDatabase@@QAEXABVQString@@@Z @ 160 NONAME ; void HsDatabase::setConnectionName(class QString const &) + ?qt_metacall@HsGui@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 161 NONAME ; int HsGui::qt_metacall(enum QMetaObject::Call, int, void * *) + ?metaObject@HsWallpaper@@UBEPBUQMetaObject@@XZ @ 162 NONAME ; struct QMetaObject const * HsWallpaper::metaObject(void) const + ?removeWidget@HsPage@@QAE_NPAVHsWidgetHost@@@Z @ 163 NONAME ; bool HsPage::removeWidget(class HsWidgetHost *) + ?trUtf8@HsPageVisual@@SA?AVQString@@PBD0H@Z @ 164 NONAME ; class QString HsPageVisual::trUtf8(char const *, char const *, int) + ?tr@HsWallpaperLoaderThread@@SA?AVQString@@PBD0@Z @ 165 NONAME ; class QString HsWallpaperLoaderThread::tr(char const *, char const *) + ?qt_metacall@HsWallpaper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 166 NONAME ; int HsWallpaper::qt_metacall(enum QMetaObject::Call, int, void * *) + ?onWidgetUnavailable@HsPage@@AAEXXZ @ 167 NONAME ; void HsPage::onWidgetUnavailable(void) + ?mInstance@HsDatabase@@0PAV1@A @ 168 NONAME ; class HsDatabase * HsDatabase::mInstance + ?available@HsWidgetComponent@@IAEXXZ @ 169 NONAME ; void HsWidgetComponent::available(void) + ?tr@HsSceneWallpaper@@SA?AVQString@@PBD0@Z @ 170 NONAME ; class QString HsSceneWallpaper::tr(char const *, char const *) + ?trUtf8@HsPage@@SA?AVQString@@PBD0@Z @ 171 NONAME ; class QString HsPage::trUtf8(char const *, char const *) + ?trUtf8@HsWidgetHostVisual@@SA?AVQString@@PBD0H@Z @ 172 NONAME ; class QString HsWidgetHostVisual::trUtf8(char const *, char const *, int) + ?hideWidgets@HsPage@@QAEXXZ @ 173 NONAME ; void HsPage::hideWidgets(void) + ?trUtf8@HsWidgetHost@@SA?AVQString@@PBD0H@Z @ 174 NONAME ; class QString HsWidgetHost::trUtf8(char const *, char const *, int) + ?qt_metacall@HsHostedWidgetFactory@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 175 NONAME ; int HsHostedWidgetFactory::qt_metacall(enum QMetaObject::Call, int, void * *) + ??0HsScene@@QAE@PAVQObject@@@Z @ 176 NONAME ; HsScene::HsScene(class QObject *) + ?getStaticMetaObject@HsPageVisual@@SAABUQMetaObject@@XZ @ 177 NONAME ; struct QMetaObject const & HsPageVisual::getStaticMetaObject(void) + ?pagePanUpdated@HsScene@@IAEXPAVQGestureEvent@@@Z @ 178 NONAME ; void HsScene::pagePanUpdated(class QGestureEvent *) + ?showTrashBin@HsIdleWidget@@QAEXXZ @ 179 NONAME ; void HsIdleWidget::showTrashBin(void) + ?qt_metacast@HsWidgetHost@@UAEPAXPBD@Z @ 180 NONAME ; void * HsWidgetHost::qt_metacast(char const *) + ?trUtf8@HsWallpaperLoader@@SA?AVQString@@PBD0@Z @ 181 NONAME ; class QString HsWallpaperLoader::trUtf8(char const *, char const *) + ?qt_metacall@HsWidgetComponentRegistry@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 182 NONAME ; int HsWidgetComponentRegistry::qt_metacall(enum QMetaObject::Call, int, void * *) + ?setMaximumWidgetHeight@HsConfiguration@@QAEXM@Z @ 183 NONAME ; void HsConfiguration::setMaximumWidgetHeight(float) + ?qt_metacall@HsPageVisual@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 184 NONAME ; int HsPageVisual::qt_metacall(enum QMetaObject::Call, int, void * *) + ?instance@HsConfiguration@@SAPAV1@XZ @ 185 NONAME ; class HsConfiguration * HsConfiguration::instance(void) + ?tr@HsWallpaperLoader@@SA?AVQString@@PBD0H@Z @ 186 NONAME ; class QString HsWallpaperLoader::tr(char const *, char const *, int) + ??_EHsConfiguration@@UAE@I@Z @ 187 NONAME ; HsConfiguration::~HsConfiguration(unsigned int) + ?metaObject@HsPage@@UBEPBUQMetaObject@@XZ @ 188 NONAME ; struct QMetaObject const * HsPage::metaObject(void) const + ?activePageIndex@HsScene@@QBEHXZ @ 189 NONAME ; int HsScene::activePageIndex(void) const + ?qt_metacast@HsWidgetHostVisual@@UAEPAXPBD@Z @ 190 NONAME ; void * HsWidgetHostVisual::qt_metacast(char const *) + ?hideHorizontalSnapLine@HsIdleWidget@@QAEXXZ @ 191 NONAME ; void HsIdleWidget::hideHorizontalSnapLine(void) + ?minimumWidgetWidth@HsConfiguration@@QBEMXZ @ 192 NONAME ; float HsConfiguration::minimumWidgetWidth(void) const + ?setWidgetPreferences@HsDatabase@@QAE_NHABV?$QHash@VQString@@VQVariant@@@@@Z @ 193 NONAME ; bool HsDatabase::setWidgetPreferences(int, class QHash<class QString, class QVariant> const &) + ?orientation@HsGui@@QAE?AW4Orientation@Qt@@XZ @ 194 NONAME ; enum Qt::Orientation HsGui::orientation(void) + ?deleteWidget@HsDatabase@@QAE_NH@Z @ 195 NONAME ; bool HsDatabase::deleteWidget(int) + ?widgetOverTrashbinFeedbackEffect@HsConfiguration@@QBE?AW4InstantEffect@HbFeedback@@XZ @ 196 NONAME ; enum HbFeedback::InstantEffect HsConfiguration::widgetOverTrashbinFeedbackEffect(void) const + ?deleteFromDatabase@HsPage@@QAE_NXZ @ 197 NONAME ; bool HsPage::deleteFromDatabase(void) + ?setWidgetPresentation@HsDatabase@@QAE_NABVHsWidgetPresentationData@@@Z @ 198 NONAME ; bool HsDatabase::setWidgetPresentation(class HsWidgetPresentationData const &) + ?takeInstance@HsGui@@SAPAV1@XZ @ 199 NONAME ; class HsGui * HsGui::takeInstance(void) + ??0HsConfiguration@@QAE@PAVQObject@@@Z @ 200 NONAME ; HsConfiguration::HsConfiguration(class QObject *) + ?setDefaultImage@HsWallpaper@@QAEXXZ @ 201 NONAME ; void HsWallpaper::setDefaultImage(void) + ?setupTouchArea@HsPageVisual@@AAEXXZ @ 202 NONAME ; void HsPageVisual::setupTouchArea(void) + ?trUtf8@HsWidgetComponent@@SA?AVQString@@PBD0H@Z @ 203 NONAME ; class QString HsWidgetComponent::trUtf8(char const *, char const *, int) + ?setWidget@HsWidgetHostVisual@@QAEXPAVQObject@@@Z @ 204 NONAME ; void HsWidgetHostVisual::setWidget(class QObject *) + ?importFromFile@HsConfiguration@@QAE_NABVQString@@@Z @ 205 NONAME ; bool HsConfiguration::importFromFile(class QString const &) + ?page@HsDatabase@@QAE_NAAVHsPageData@@@Z @ 206 NONAME ; bool HsDatabase::page(class HsPageData &) + ??_EHsPage@@UAE@I@Z @ 207 NONAME ; HsPage::~HsPage(unsigned int) + ?instance@HsHostedWidgetFactory@@SAPAV1@XZ @ 208 NONAME ; class HsHostedWidgetFactory * HsHostedWidgetFactory::instance(void) + ?staticMetaObject@HsPage@@2UQMetaObject@@B @ 209 NONAME ; struct QMetaObject const HsPage::staticMetaObject + ?widgetDropFeedbackEffect@HsConfiguration@@QBE?AW4InstantEffect@HbFeedback@@XZ @ 210 NONAME ; enum HbFeedback::InstantEffect HsConfiguration::widgetDropFeedbackEffect(void) const + ?pageChangeZoneReverseAnimationDuration@HsConfiguration@@QBEHXZ @ 211 NONAME ; int HsConfiguration::pageChangeZoneReverseAnimationDuration(void) const + ?createWidget@HsContentService@@QAE_NABV?$QHash@VQString@@VQVariant@@@@@Z @ 212 NONAME ; bool HsContentService::createWidget(class QHash<class QString, class QVariant> const &) + ?setVersion@HsWidgetComponentDescriptor@@QAEXABVQString@@@Z @ 213 NONAME ; void HsWidgetComponentDescriptor::setVersion(class QString const &) + ?getStaticMetaObject@HsWallpaperLoader@@SAABUQMetaObject@@XZ @ 214 NONAME ; struct QMetaObject const & HsWallpaperLoader::getStaticMetaObject(void) + ?mInstance@HsWidgetComponentRegistry@@0PAV1@A @ 215 NONAME ; class HsWidgetComponentRegistry * HsWidgetComponentRegistry::mInstance + ?staticMetaObject@HsWidgetHost@@2UQMetaObject@@B @ 216 NONAME ; struct QMetaObject const HsWidgetHost::staticMetaObject + ?qt_metacast@HsPageVisual@@UAEPAXPBD@Z @ 217 NONAME ; void * HsPageVisual::qt_metacast(char const *) + ?qt_metacall@HsShortcutService@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 218 NONAME ; int HsShortcutService::qt_metacall(enum QMetaObject::Call, int, void * *) + ??1HsPageWallpaper@@UAE@XZ @ 219 NONAME ; HsPageWallpaper::~HsPageWallpaper(void) + ?startDropEffect@HsWidgetHostVisual@@QAEXXZ @ 220 NONAME ; void HsWidgetHostVisual::startDropEffect(void) + ?activeWidget@HsScene@@QBEPAVHsWidgetHost@@XZ @ 221 NONAME ; class HsWidgetHost * HsScene::activeWidget(void) const + ?widgets@HsDatabase@@QAE_NABVQString@@AAV?$QList@VHsWidgetData@@@@@Z @ 222 NONAME ; bool HsDatabase::widgets(class QString const &, class QList<class HsWidgetData> &) + ?rootDirectory@HsWallpaper@@IBE?AVQString@@XZ @ 223 NONAME ; class QString HsWallpaper::rootDirectory(void) const + ?tr@HsContentService@@SA?AVQString@@PBD0H@Z @ 224 NONAME ; class QString HsContentService::tr(char const *, char const *, int) + ??0HsDatabase@@QAE@PAVQObject@@@Z @ 225 NONAME ; HsDatabase::HsDatabase(class QObject *) + ?eventFilter@HsWidgetHostVisual@@MAE_NPAVQObject@@PAVQEvent@@@Z @ 226 NONAME ; bool HsWidgetHostVisual::eventFilter(class QObject *, class QEvent *) + ?tr@HsWidgetHost@@SA?AVQString@@PBD0@Z @ 227 NONAME ; class QString HsWidgetHost::tr(char const *, char const *) + ?remove@HsWallpaper@@QAEXXZ @ 228 NONAME ; void HsWallpaper::remove(void) + ?idleView@HsGui@@QBEPAVHbView@@XZ @ 229 NONAME ; class HbView * HsGui::idleView(void) const + ??1HsPageVisual@@UAE@XZ @ 230 NONAME ; HsPageVisual::~HsPageVisual(void) + ?widgetMoveBlockedFeedbackEffect@HsConfiguration@@QBE?AW4InstantEffect@HbFeedback@@XZ @ 231 NONAME ; enum HbFeedback::InstantEffect HsConfiguration::widgetMoveBlockedFeedbackEffect(void) const + ?widgetPickFeedbackEffect@HsConfiguration@@QBE?AW4InstantEffect@HbFeedback@@XZ @ 232 NONAME ; enum HbFeedback::InstantEffect HsConfiguration::widgetPickFeedbackEffect(void) const + ?widgetSnappingFeedbackEffect@HsConfiguration@@QBE?AW4InstantEffect@HbFeedback@@XZ @ 233 NONAME ; enum HbFeedback::InstantEffect HsConfiguration::widgetSnappingFeedbackEffect(void) const + ?load@HsScene@@QAE_NXZ @ 234 NONAME ; bool HsScene::load(void) + ?trUtf8@HsSceneWallpaper@@SA?AVQString@@PBD0H@Z @ 235 NONAME ; class QString HsSceneWallpaper::trUtf8(char const *, char const *, int) + ?tr@HsConfiguration@@SA?AVQString@@PBD0@Z @ 236 NONAME ; class QString HsConfiguration::tr(char const *, char const *) + ?widgetRepositionFeedbackEffect@HsConfiguration@@QBE?AW4InstantEffect@HbFeedback@@XZ @ 237 NONAME ; enum HbFeedback::InstantEffect HsConfiguration::widgetRepositionFeedbackEffect(void) const + ?onError@HsWidgetHost@@AAEXXZ @ 238 NONAME ; void HsWidgetHost::onError(void) + ?cleanup@HsWallpaperLoader@@AAEXXZ @ 239 NONAME ; void HsWallpaperLoader::cleanup(void) + ?targets@HsWallpaperLoader@@QBE?AV?$QHash@VQString@@VQVariant@@@@XZ @ 240 NONAME ; class QHash<class QString, class QVariant> HsWallpaperLoader::targets(void) const + ??0HsShortcutService@@AAE@PAVQStateMachine@@PAVQObject@@@Z @ 241 NONAME ; HsShortcutService::HsShortcutService(class QStateMachine *, class QObject *) + ?hideVerticalSnapLine@HsIdleWidget@@QAEXXZ @ 242 NONAME ; void HsIdleWidget::hideVerticalSnapLine(void) + ?setActivePage@HsIdleWidget@@QAEXH@Z @ 243 NONAME ; void HsIdleWidget::setActivePage(int) + ?setSnapLineFadeOutDuration@HsConfiguration@@QAEXH@Z @ 244 NONAME ; void HsConfiguration::setSnapLineFadeOutDuration(int) + ?polishEvent@HsIdleWidget@@MAEXXZ @ 245 NONAME ; void HsIdleWidget::polishEvent(void) + ?tr@HsPageWallpaper@@SA?AVQString@@PBD0H@Z @ 246 NONAME ; class QString HsPageWallpaper::tr(char const *, char const *, int) + ?widgetDropToTrashbinFeedbackEffect@HsConfiguration@@QBE?AW4InstantEffect@HbFeedback@@XZ @ 247 NONAME ; enum HbFeedback::InstantEffect HsConfiguration::widgetDropToTrashbinFeedbackEffect(void) const + ?staticMetaObject@HsPageWallpaper@@2UQMetaObject@@B @ 248 NONAME ; struct QMetaObject const HsPageWallpaper::staticMetaObject + ?onWidgetFinished@HsPage@@AAEXXZ @ 249 NONAME ; void HsPage::onWidgetFinished(void) + ?onThreadFinished@HsWallpaperLoader@@AAEXXZ @ 250 NONAME ; void HsWallpaperLoader::onThreadFinished(void) + ?tr@HsWidgetComponentRegistry@@SA?AVQString@@PBD0H@Z @ 251 NONAME ; class QString HsWidgetComponentRegistry::tr(char const *, char const *, int) + ?loadControlLayer@HsIdleWidget@@AAEXXZ @ 252 NONAME ; void HsIdleWidget::loadControlLayer(void) + ?action_initialize@HsWidgetHost@@AAEXXZ @ 253 NONAME ; void HsWidgetHost::action_initialize(void) + ?sceneX@HsIdleWidget@@QBEMXZ @ 254 NONAME ; float HsIdleWidget::sceneX(void) const + ?action_load@HsWidgetHost@@AAEXXZ @ 255 NONAME ; void HsWidgetHost::action_load(void) + ?connectionName@HsDatabase@@QBE?AVQString@@XZ @ 256 NONAME ; class QString HsDatabase::connectionName(void) const + ?snapLineFadeInDuration@HsConfiguration@@QBEHXZ @ 257 NONAME ; int HsConfiguration::snapLineFadeInDuration(void) const + ?setMethod@HsWidgetHost@@AAE_NPBDAAVQMetaMethod@@@Z @ 258 NONAME ; bool HsWidgetHost::setMethod(char const *, class QMetaMethod &) + ?setInstance@HsDatabase@@SAXPAV1@@Z @ 259 NONAME ; void HsDatabase::setInstance(class HsDatabase *) + ??0HsWallpaper@@QAE@PAVQGraphicsItem@@@Z @ 260 NONAME ; HsWallpaper::HsWallpaper(class QGraphicsItem *) + ?setSnapEffectsEnabled@HsConfiguration@@QAEX_N@Z @ 261 NONAME ; void HsConfiguration::setSnapEffectsEnabled(bool) + ?newPageAddedAnimationDuration@HsConfiguration@@QBEHXZ @ 262 NONAME ; int HsConfiguration::newPageAddedAnimationDuration(void) const + ?getStaticMetaObject@HsWallpaperLoaderThread@@SAABUQMetaObject@@XZ @ 263 NONAME ; struct QMetaObject const & HsWallpaperLoaderThread::getStaticMetaObject(void) + ?commit@HsDatabase@@QAE_NXZ @ 264 NONAME ; bool HsDatabase::commit(void) + ?trUtf8@HsDatabase@@SA?AVQString@@PBD0@Z @ 265 NONAME ; class QString HsDatabase::trUtf8(char const *, char const *) + ?mousePressEvent@HsWidgetHostVisual@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 266 NONAME ; void HsWidgetHostVisual::mousePressEvent(class QGraphicsSceneMouseEvent *) + ?tr@HsWidgetComponent@@SA?AVQString@@PBD0H@Z @ 267 NONAME ; class QString HsWidgetComponent::tr(char const *, char const *, int) + ?backupRestoreStarted@HsBackupRestoreObserver@@QAEXXZ @ 268 NONAME ; void HsBackupRestoreObserver::backupRestoreStarted(void) + ?qt_metacast@HsPageWallpaper@@UAEPAXPBD@Z @ 269 NONAME ; void * HsPageWallpaper::qt_metacast(char const *) + ?trUtf8@HsWidgetHost@@SA?AVQString@@PBD0@Z @ 270 NONAME ; class QString HsWidgetHost::trUtf8(char const *, char const *) + ?setDefaultPageId@HsConfiguration@@QAEXH@Z @ 271 NONAME ; void HsConfiguration::setDefaultPageId(int) + ?metaObject@HsWidgetHostVisual@@UBEPBUQMetaObject@@XZ @ 272 NONAME ; struct QMetaObject const * HsWidgetHostVisual::metaObject(void) const + ?installTranslator@HsWidgetComponent@@AAEXXZ @ 273 NONAME ; void HsWidgetComponent::installTranslator(void) + ?bounceAnimationEasingCurve@HsConfiguration@@QBE?AW4Type@QEasingCurve@@XZ @ 274 NONAME ; enum QEasingCurve::Type HsConfiguration::bounceAnimationEasingCurve(void) const + ??_EHsIdleWidget@@UAE@I@Z @ 275 NONAME ; HsIdleWidget::~HsIdleWidget(unsigned int) + ?qt_metacall@HsWidgetComponent@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 276 NONAME ; int HsWidgetComponent::qt_metacall(enum QMetaObject::Call, int, void * *) + ?qt_metacall@HsConfiguration@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 277 NONAME ; int HsConfiguration::qt_metacall(enum QMetaObject::Call, int, void * *) + ?cleanupIdleUi@HsGui@@QAEXXZ @ 278 NONAME ; void HsGui::cleanupIdleUi(void) + ?setWidgetOverTrashbinFeedbackEffect@HsConfiguration@@QAEXW4InstantEffect@HbFeedback@@@Z @ 279 NONAME ; void HsConfiguration::setWidgetOverTrashbinFeedbackEffect(enum HbFeedback::InstantEffect) + ?handleEntryAdded@HsWidgetComponentRegistry@@AAEXABVCaEntry@@ABVQString@@@Z @ 280 NONAME ; void HsWidgetComponentRegistry::handleEntryAdded(class CaEntry const &, class QString const &) + ?setProperty@HsWidgetHost@@AAE_NPBDAAVQMetaProperty@@@Z @ 281 NONAME ; bool HsWidgetHost::setProperty(char const *, class QMetaProperty &) + ?pagePanFinished@HsScene@@IAEXPAVQGestureEvent@@@Z @ 282 NONAME ; void HsScene::pagePanFinished(class QGestureEvent *) + ?minimumWidgetSizeInUnits@HsConfiguration@@QBE?AVQSizeF@@XZ @ 283 NONAME ; class QSizeF HsConfiguration::minimumWidgetSizeInUnits(void) const + ??0HsBackupRestoreObserver@@AAE@PAVQObject@@@Z @ 284 NONAME ; HsBackupRestoreObserver::HsBackupRestoreObserver(class QObject *) + ?setClockWidgetTapFeedbackEffect@HsConfiguration@@QAEXW4InstantEffect@HbFeedback@@@Z @ 285 NONAME ; void HsConfiguration::setClockWidgetTapFeedbackEffect(enum HbFeedback::InstantEffect) + ??1HsPage@@UAE@XZ @ 286 NONAME ; HsPage::~HsPage(void) + ?databaseId@HsWidgetHost@@QBEHXZ @ 287 NONAME ; int HsWidgetHost::databaseId(void) const + ?setInstallationPath@HsWidgetComponentDescriptor@@QAEXABVQString@@@Z @ 288 NONAME ; void HsWidgetComponentDescriptor::setInstallationPath(class QString const &) + ?staticMetaObject@HsHostedWidgetFactory@@2UQMetaObject@@B @ 289 NONAME ; struct QMetaObject const HsHostedWidgetFactory::staticMetaObject + ?setTitle@HsWidgetComponentDescriptor@@QAEXABVQString@@@Z @ 290 NONAME ; void HsWidgetComponentDescriptor::setTitle(class QString const &) + ?qt_metacall@HsPageWallpaper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 291 NONAME ; int HsPageWallpaper::qt_metacall(enum QMetaObject::Call, int, void * *) + ?setWidgetSnappingFeedbackEffect@HsConfiguration@@QAEXW4InstantEffect@HbFeedback@@@Z @ 292 NONAME ; void HsConfiguration::setWidgetSnappingFeedbackEffect(enum HbFeedback::InstantEffect) + ?setWidgetDragEffectDuration@HsConfiguration@@QAEXH@Z @ 293 NONAME ; void HsConfiguration::setWidgetDragEffectDuration(int) + ?widgetPresentation@HsDatabase@@QAE_NAAVHsWidgetPresentationData@@@Z @ 294 NONAME ; bool HsDatabase::widgetPresentation(class HsWidgetPresentationData &) + ?pageChangePanDistance@HsConfiguration@@QBEMXZ @ 295 NONAME ; float HsConfiguration::pageChangePanDistance(void) const + ?mInstance@HsContentService@@0PAV1@A @ 296 NONAME ; class HsContentService * HsContentService::mInstance + ??0HsWidgetComponent@@AAE@ABVQString@@PAVQObject@@@Z @ 297 NONAME ; HsWidgetComponent::HsWidgetComponent(class QString const &, class QObject *) + ?startDragEffect@HsWidgetHostVisual@@QAEXXZ @ 298 NONAME ; void HsWidgetHostVisual::startDragEffect(void) + ?insertPage@HsIdleWidget@@QAEXHPAVHsPage@@@Z @ 299 NONAME ; void HsIdleWidget::insertPage(int, class HsPage *) + ?onOrientationChanged@HsPage@@AAEXW4Orientation@Qt@@@Z @ 300 NONAME ; void HsPage::onOrientationChanged(enum Qt::Orientation) + ?adjustedWidgetPosition@HsPage@@QAE?AVQPointF@@ABVQRectF@@@Z @ 301 NONAME ; class QPointF HsPage::adjustedWidgetPosition(class QRectF const &) + ?staticMetaObject@HsWallpaperLoader@@2UQMetaObject@@B @ 302 NONAME ; struct QMetaObject const HsWallpaperLoader::staticMetaObject + ?widgetDragEffectDuration@HsConfiguration@@QBEHXZ @ 303 NONAME ; int HsConfiguration::widgetDragEffectDuration(void) const + ?tr@HsHostedWidgetFactory@@SA?AVQString@@PBD0H@Z @ 304 NONAME ; class QString HsHostedWidgetFactory::tr(char const *, char const *, int) + ?navigateToApplibrary@HsGui@@IAEXXZ @ 305 NONAME ; void HsGui::navigateToApplibrary(void) + ?load@HsConfiguration@@QAE_NXZ @ 306 NONAME ; bool HsConfiguration::load(void) + ?createInstance@HsPage@@SAPAV1@ABVHsPageData@@@Z @ 307 NONAME ; class HsPage * HsPage::createInstance(class HsPageData const &) + ?widgetPreferences@HsDatabase@@QAE_NHAAV?$QHash@VQString@@VQVariant@@@@@Z @ 308 NONAME ; bool HsDatabase::widgetPreferences(int, class QHash<class QString, class QVariant> &) + ?removePage@HsScene@@QAE_NPAVHsPage@@@Z @ 309 NONAME ; bool HsScene::removePage(class HsPage *) + ?hideWidget@HsWidgetHost@@QAEXXZ @ 310 NONAME ; void HsWidgetHost::hideWidget(void) + ?close@HsDatabase@@QAEXXZ @ 311 NONAME ; void HsDatabase::close(void) + ?maximumPageCount@HsConfiguration@@QBEHXZ @ 312 NONAME ; int HsConfiguration::maximumPageCount(void) const + ?action_faulted@HsWidgetHost@@AAEXXZ @ 313 NONAME ; void HsWidgetHost::action_faulted(void) + ?setServiceXml@HsWidgetComponentDescriptor@@QAEXABVQString@@@Z @ 314 NONAME ; void HsWidgetComponentDescriptor::setServiceXml(class QString const &) + ?getStaticMetaObject@HsWidgetHost@@SAABUQMetaObject@@XZ @ 315 NONAME ; struct QMetaObject const & HsWidgetHost::getStaticMetaObject(void) + ??0HsWidgetData@@QAE@ABV0@@Z @ 316 NONAME ; HsWidgetData::HsWidgetData(class HsWidgetData const &) + ?installationPath@HsWidgetComponentDescriptor@@QBE?AVQString@@XZ @ 317 NONAME ; class QString HsWidgetComponentDescriptor::installationPath(void) const + ?showHorizontalSnapLine@HsIdleWidget@@QAEXABVQLineF@@@Z @ 318 NONAME ; void HsIdleWidget::showHorizontalSnapLine(class QLineF const &) + ??_EHsPageVisual@@UAE@I@Z @ 319 NONAME ; HsPageVisual::~HsPageVisual(unsigned int) + ?setWidgetDropEffectDuration@HsConfiguration@@QAEXH@Z @ 320 NONAME ; void HsConfiguration::setWidgetDropEffectDuration(int) + ?pageRemovedAnimationDuration@HsConfiguration@@QBEHXZ @ 321 NONAME ; int HsConfiguration::pageRemovedAnimationDuration(void) const + ?onFinished@HsWidgetHost@@AAEXXZ @ 322 NONAME ; void HsWidgetHost::onFinished(void) + ?rollback@HsDatabase@@QAE_NXZ @ 323 NONAME ; bool HsDatabase::rollback(void) + ?widget@HsDatabase@@QAE_NAAVHsWidgetData@@@Z @ 324 NONAME ; bool HsDatabase::widget(class HsWidgetData &) + ?description@HsWidgetComponentDescriptor@@QBE?AVQString@@XZ @ 325 NONAME ; class QString HsWidgetComponentDescriptor::description(void) const + ?mInstance@HsShortcutService@@0PAV1@A @ 326 NONAME ; class HsShortcutService * HsShortcutService::mInstance + ?pageIndicator@HsIdleWidget@@QBEPAVHsPageIndicator@@XZ @ 327 NONAME ; class HsPageIndicator * HsIdleWidget::pageIndicator(void) const + ?setShortcutWidgetTapFeedbackEffect@HsConfiguration@@QAEXW4InstantEffect@HbFeedback@@@Z @ 328 NONAME ; void HsConfiguration::setShortcutWidgetTapFeedbackEffect(enum HbFeedback::InstantEffect) + ?wallpaperDirectory@HsPageWallpaper@@MBE?AVQString@@XZ @ 329 NONAME ; class QString HsPageWallpaper::wallpaperDirectory(void) const + ?qt_metacast@HsWidgetComponent@@UAEPAXPBD@Z @ 330 NONAME ; void * HsWidgetComponent::qt_metacast(char const *) + ?metaObject@HsWallpaperLoaderThread@@UBEPBUQMetaObject@@XZ @ 331 NONAME ; struct QMetaObject const * HsWallpaperLoaderThread::metaObject(void) const + ?setTargetSize@HsWallpaperLoaderThread@@QAEXABVQSize@@@Z @ 332 NONAME ; void HsWallpaperLoaderThread::setTargetSize(class QSize const &) + ?removePage@HsIdleWidget@@QAEXH@Z @ 333 NONAME ; void HsIdleWidget::removePage(int) + ?tr@HsWallpaper@@SA?AVQString@@PBD0H@Z @ 334 NONAME ; class QString HsWallpaper::tr(char const *, char const *, int) + ?defaultPageId@HsConfiguration@@QBEHXZ @ 335 NONAME ; int HsConfiguration::defaultPageId(void) const + ?setSourcePath@HsWallpaperLoader@@QAEXABVQString@@@Z @ 336 NONAME ; void HsWallpaperLoader::setSourcePath(class QString const &) + ?metaObject@HsGui@@UBEPBUQMetaObject@@XZ @ 337 NONAME ; struct QMetaObject const * HsGui::metaObject(void) const + ?pageChangeAnimationEasingCurve@HsConfiguration@@QBE?AW4Type@QEasingCurve@@XZ @ 338 NONAME ; enum QEasingCurve::Type HsConfiguration::pageChangeAnimationEasingCurve(void) const + ?wallpaper@HsPage@@QBEPAVHsWallpaper@@XZ @ 339 NONAME ; class HsWallpaper * HsPage::wallpaper(void) const + ??0HsPageVisual@@QAE@PAVQGraphicsItem@@@Z @ 340 NONAME ; HsPageVisual::HsPageVisual(class QGraphicsItem *) + ?trUtf8@HsWidgetComponent@@SA?AVQString@@PBD0@Z @ 341 NONAME ; class QString HsWidgetComponent::trUtf8(char const *, char const *) + ?event_backupRestoreStarted@HsBackupRestoreObserver@@IAEXXZ @ 342 NONAME ; void HsBackupRestoreObserver::event_backupRestoreStarted(void) + ?version@HsWidgetComponentDescriptor@@QBE?AVQString@@XZ @ 343 NONAME ; class QString HsWidgetComponentDescriptor::version(void) const + ?action_disconnectComponent@HsWidgetHost@@AAEXXZ @ 344 NONAME ; void HsWidgetHost::action_disconnectComponent(void) + ?scene@HsSceneWallpaper@@QBEPAVHsScene@@XZ @ 345 NONAME ; class HsScene * HsSceneWallpaper::scene(void) const + ?widgetTapStarted@HsScene@@IAEXPAVHsWidgetHost@@@Z @ 346 NONAME ; void HsScene::widgetTapStarted(class HsWidgetHost *) + ?mInstance@HsConfiguration@@0PAV1@A @ 347 NONAME ; class HsConfiguration * HsConfiguration::mInstance + ?newWidgets@HsPage@@QAE?AV?$QList@PAVHsWidgetHost@@@@XZ @ 348 NONAME ; class QList<class HsWidgetHost *> HsPage::newWidgets(void) + ??0HsHostedWidgetFactory@@AAE@PAVQObject@@@Z @ 349 NONAME ; HsHostedWidgetFactory::HsHostedWidgetFactory(class QObject *) + ?trUtf8@HsContentService@@SA?AVQString@@PBD0@Z @ 350 NONAME ; class QString HsContentService::trUtf8(char const *, char const *) + ?emitUpdated@HsWidgetComponent@@AAEXXZ @ 351 NONAME ; void HsWidgetComponent::emitUpdated(void) + ?emitUninstalled@HsWidgetComponent@@AAEXXZ @ 352 NONAME ; void HsWidgetComponent::emitUninstalled(void) + ?tr@HsConfiguration@@SA?AVQString@@PBD0H@Z @ 353 NONAME ; class QString HsConfiguration::tr(char const *, char const *, int) + ??0HsSceneWallpaper@@QAE@PAVHsScene@@PAVQGraphicsItem@@@Z @ 354 NONAME ; HsSceneWallpaper::HsSceneWallpaper(class HsScene *, class QGraphicsItem *) + ?createTargets@HsPageWallpaper@@MAE?AV?$QHash@VQString@@VQVariant@@@@ABVQString@@@Z @ 355 NONAME ; class QHash<class QString, class QVariant> HsPageWallpaper::createTargets(class QString const &) + ?mInstance@HsGui@@0PAV1@A @ 356 NONAME ; class HsGui * HsGui::mInstance + ?pageChangeZoneWidth@HsConfiguration@@QBEMXZ @ 357 NONAME ; float HsConfiguration::pageChangeZoneWidth(void) const + ?qt_metacast@HsGui@@UAEPAXPBD@Z @ 358 NONAME ; void * HsGui::qt_metacast(char const *) + ?setInstance@HsGui@@SAPAV1@PAV1@@Z @ 359 NONAME ; class HsGui * HsGui::setInstance(class HsGui *) + ?tr@HsPageWallpaper@@SA?AVQString@@PBD0@Z @ 360 NONAME ; class QString HsPageWallpaper::tr(char const *, char const *) + ?maximumWidgetSizeInPixels@HsConfiguration@@QBE?AVQSizeF@@XZ @ 361 NONAME ; class QSizeF HsConfiguration::maximumWidgetSizeInPixels(void) const + ??_EHsBackupRestoreObserver@@UAE@I@Z @ 362 NONAME ; HsBackupRestoreObserver::~HsBackupRestoreObserver(unsigned int) + ??1HsScene@@UAE@XZ @ 363 NONAME ; HsScene::~HsScene(void) + ?pageWallpaperLayer@HsIdleWidget@@QBEPAVHbWidget@@XZ @ 364 NONAME ; class HbWidget * HsIdleWidget::pageWallpaperLayer(void) const + ?deleteWidgetPresentation@HsDatabase@@QAE_NHW4Orientation@Qt@@@Z @ 365 NONAME ; bool HsDatabase::deleteWidgetPresentation(int, enum Qt::Orientation) + ?getStaticMetaObject@HsWidgetComponent@@SAABUQMetaObject@@XZ @ 366 NONAME ; struct QMetaObject const & HsWidgetComponent::getStaticMetaObject(void) + ?addExistingWidget@HsPage@@QAE_NPAVHsWidgetHost@@@Z @ 367 NONAME ; bool HsPage::addExistingWidget(class HsWidgetHost *) + ?qt_metacast@HsWidgetComponentRegistry@@UAEPAXPBD@Z @ 368 NONAME ; void * HsWidgetComponentRegistry::qt_metacast(char const *) + ?close@HsWidgetHost@@QAEXXZ @ 369 NONAME ; void HsWidgetHost::close(void) + ?action_remove@HsWidgetHost@@AAEXXZ @ 370 NONAME ; void HsWidgetHost::action_remove(void) + ?trUtf8@HsWallpaper@@SA?AVQString@@PBD0H@Z @ 371 NONAME ; class QString HsWallpaper::trUtf8(char const *, char const *, int) + ?activePage@HsScene@@QBEPAVHsPage@@XZ @ 372 NONAME ; class HsPage * HsScene::activePage(void) const + ?bounceEffect@HsConfiguration@@QBEHXZ @ 373 NONAME ; int HsConfiguration::bounceEffect(void) const + ?setupIdleUi@HsGui@@QAEXXZ @ 374 NONAME ; void HsGui::setupIdleUi(void) + ?pages@HsDatabase@@QAE_NAAV?$QList@VHsPageData@@@@@Z @ 375 NONAME ; bool HsDatabase::pages(class QList<class HsPageData> &) + ?savePresentation@HsWidgetHost@@QAE_NXZ @ 376 NONAME ; bool HsWidgetHost::savePresentation(void) + ?pageChangeAnimation@HsGui@@QAEPAVHsPropertyAnimationWrapper@@XZ @ 377 NONAME ; class HsPropertyAnimationWrapper * HsGui::pageChangeAnimation(void) + ?takeInstance@HsScene@@SAPAV1@XZ @ 378 NONAME ; class HsScene * HsScene::takeInstance(void) + ?rootPath@HsWidgetComponent@@QBE?AVQString@@XZ @ 379 NONAME ; class QString HsWidgetComponent::rootPath(void) const + ?event_startAndHide@HsWidgetHost@@IAEXXZ @ 380 NONAME ; void HsWidgetHost::event_startAndHide(void) + ?qt_metacast@HsWallpaperLoader@@UAEPAXPBD@Z @ 381 NONAME ; void * HsWallpaperLoader::qt_metacast(char const *) + ?startDragEffect@HsWidgetHost@@QAEXXZ @ 382 NONAME ; void HsWidgetHost::startDragEffect(void) + ??1HsDatabase@@UAE@XZ @ 383 NONAME ; HsDatabase::~HsDatabase(void) + ??1HsWidgetComponent@@UAE@XZ @ 384 NONAME ; HsWidgetComponent::~HsWidgetComponent(void) + ?metaObject@HsSceneWallpaper@@UBEPBUQMetaObject@@XZ @ 385 NONAME ; struct QMetaObject const * HsSceneWallpaper::metaObject(void) const + ?createInstance@HsWidgetHost@@SAPAV1@AAVHsWidgetData@@ABV?$QHash@VQString@@VQVariant@@@@@Z @ 386 NONAME ; class HsWidgetHost * HsWidgetHost::createInstance(class HsWidgetData &, class QHash<class QString, class QVariant> const &) + ?setupEffects@HsWidgetHostVisual@@AAEXXZ @ 387 NONAME ; void HsWidgetHostVisual::setupEffects(void) + ?trUtf8@HsGui@@SA?AVQString@@PBD0@Z @ 388 NONAME ; class QString HsGui::trUtf8(char const *, char const *) + ?setPage@HsPageWallpaper@@QAEXPAVHsPage@@@Z @ 389 NONAME ; void HsPageWallpaper::setPage(class HsPage *) + ?shape@HsWidgetHostVisual@@UBE?AVQPainterPath@@XZ @ 390 NONAME ; class QPainterPath HsWidgetHostVisual::shape(void) const + ?deletePage@HsDatabase@@QAE_NH@Z @ 391 NONAME ; bool HsDatabase::deletePage(int) + ?savePresentation@HsWidgetHost@@QAE_NAAVHsWidgetPresentationData@@@Z @ 392 NONAME ; bool HsWidgetHost::savePresentation(class HsWidgetPresentationData &) + ?tr@HsWallpaperLoaderThread@@SA?AVQString@@PBD0H@Z @ 393 NONAME ; class QString HsWallpaperLoaderThread::tr(char const *, char const *, int) + ?resized@HsWidgetHostVisual@@IAEXXZ @ 394 NONAME ; void HsWidgetHostVisual::resized(void) + ?page@HsWidgetHost@@QBEPAVHsPage@@XZ @ 395 NONAME ; class HsPage * HsWidgetHost::page(void) const + ?qt_metacast@HsWallpaper@@UAEPAXPBD@Z @ 396 NONAME ; void * HsWallpaper::qt_metacast(char const *) + ?staticMetaObject@HsWidgetComponent@@2UQMetaObject@@B @ 397 NONAME ; struct QMetaObject const HsWidgetComponent::staticMetaObject + ?setRemovable@HsPage@@QAEX_N@Z @ 398 NONAME ; void HsPage::setRemovable(bool) + ?showVerticalSnapLine@HsIdleWidget@@QAEXABVQLineF@@@Z @ 399 NONAME ; void HsIdleWidget::showVerticalSnapLine(class QLineF const &) + ?staticMetaObject@HsIdleWidget@@2UQMetaObject@@B @ 400 NONAME ; struct QMetaObject const HsIdleWidget::staticMetaObject + ?widgetRemoved@HsContentService@@IAEXABVQString@@ABV?$QHash@VQString@@VQVariant@@@@@Z @ 401 NONAME ; void HsContentService::widgetRemoved(class QString const &, class QHash<class QString, class QVariant> const &) + ?widgetMoveUpdated@HsScene@@IAEXABVQPointF@@PAVHsWidgetHost@@@Z @ 402 NONAME ; void HsScene::widgetMoveUpdated(class QPointF const &, class HsWidgetHost *) + ?qt_metacall@HsWallpaperLoaderThread@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 403 NONAME ; int HsWallpaperLoaderThread::qt_metacall(enum QMetaObject::Call, int, void * *) + ?loadPresentation@HsWidgetHost@@QAE_NXZ @ 404 NONAME ; bool HsWidgetHost::loadPresentation(void) + ?setupStates@HsWidgetHost@@AAEXXZ @ 405 NONAME ; void HsWidgetHost::setupStates(void) + ?getStaticMetaObject@HsContentService@@SAABUQMetaObject@@XZ @ 406 NONAME ; struct QMetaObject const & HsContentService::getStaticMetaObject(void) + ?wallpaper@HsScene@@QBEPAVHsWallpaper@@XZ @ 407 NONAME ; class HsWallpaper * HsScene::wallpaper(void) const + ?isItemShortcutWidget@HsShortcutService@@QAE_NH@Z @ 408 NONAME ; bool HsShortcutService::isItemShortcutWidget(int) + ?setGeometry@HsPageVisual@@UAEXABVQRectF@@@Z @ 409 NONAME ; void HsPageVisual::setGeometry(class QRectF const &) + ?tr@HsIdleWidget@@SA?AVQString@@PBD0H@Z @ 410 NONAME ; class QString HsIdleWidget::tr(char const *, char const *, int) + ?setDatabaseName@HsDatabase@@QAEXABVQString@@@Z @ 411 NONAME ; void HsDatabase::setDatabaseName(class QString const &) + ?updateWidget@HsDatabase@@QAE_NABVHsWidgetData@@@Z @ 412 NONAME ; bool HsDatabase::updateWidget(class HsWidgetData const &) + ?trUtf8@HsBackupRestoreObserver@@SA?AVQString@@PBD0H@Z @ 413 NONAME ; class QString HsBackupRestoreObserver::trUtf8(char const *, char const *, int) + ?loadPresentation@HsWidgetHost@@QAE_NW4Orientation@Qt@@@Z @ 414 NONAME ; bool HsWidgetHost::loadPresentation(enum Qt::Orientation) + ?createWidgetForPreview@HsContentService@@QAEPAVHsWidgetHost@@ABV?$QHash@VQString@@VQVariant@@@@@Z @ 415 NONAME ; class HsWidgetHost * HsContentService::createWidgetForPreview(class QHash<class QString, class QVariant> const &) + ?available@HsWidgetHost@@IAEXXZ @ 416 NONAME ; void HsWidgetHost::available(void) + ?setPageChangeZoneWidth@HsConfiguration@@QAEXM@Z @ 417 NONAME ; void HsConfiguration::setPageChangeZoneWidth(float) + ?emitAboutToUninstall@HsWidgetComponent@@AAEXXZ @ 418 NONAME ; void HsWidgetComponent::emitAboutToUninstall(void) + ?iconUri@HsWidgetComponentDescriptor@@QBE?AVQString@@XZ @ 419 NONAME ; class QString HsWidgetComponentDescriptor::iconUri(void) const + ?event_faulted@HsWidgetHost@@IAEXXZ @ 420 NONAME ; void HsWidgetHost::event_faulted(void) + ?emitUnavailable@HsWidgetComponent@@AAEXXZ @ 421 NONAME ; void HsWidgetComponent::emitUnavailable(void) + ??1HsWidgetData@@QAE@XZ @ 422 NONAME ; HsWidgetData::~HsWidgetData(void) + ?snapTimeout@HsConfiguration@@QBEHXZ @ 423 NONAME ; int HsConfiguration::snapTimeout(void) const + ?faulted@HsWidgetHost@@IAEXXZ @ 424 NONAME ; void HsWidgetHost::faulted(void) + ??0HsIdleWidget@@QAE@PAVQGraphicsItem@@@Z @ 425 NONAME ; HsIdleWidget::HsIdleWidget(class QGraphicsItem *) + ?event_unload@HsWidgetHost@@IAEXXZ @ 426 NONAME ; void HsWidgetHost::event_unload(void) + ?handleEntryRemoved@HsWidgetComponentRegistry@@AAEXABVCaEntry@@ABVQString@@@Z @ 427 NONAME ; void HsWidgetComponentRegistry::handleEntryRemoved(class CaEntry const &, class QString const &) + ?metaObject@HsWidgetComponentRegistry@@UBEPBUQMetaObject@@XZ @ 428 NONAME ; struct QMetaObject const * HsWidgetComponentRegistry::metaObject(void) const + ?updated@HsWidgetComponent@@IAEXXZ @ 429 NONAME ; void HsWidgetComponent::updated(void) + ?takeInstance@HsConfiguration@@SAPAV1@XZ @ 430 NONAME ; class HsConfiguration * HsConfiguration::takeInstance(void) + ?pageIndex@HsPage@@QAEHXZ @ 431 NONAME ; int HsPage::pageIndex(void) + ?setTargets@HsWallpaperLoader@@QAEXABV?$QHash@VQString@@VQVariant@@@@@Z @ 432 NONAME ; void HsWallpaperLoader::setTargets(class QHash<class QString, class QVariant> const &) + ??1HsIdleWidget@@UAE@XZ @ 433 NONAME ; HsIdleWidget::~HsIdleWidget(void) + ??_EHsHostedWidgetFactory@@UAE@I@Z @ 434 NONAME ; HsHostedWidgetFactory::~HsHostedWidgetFactory(unsigned int) + ??0HsWallpaperLoaderThread@@QAE@PAVQObject@@@Z @ 435 NONAME ; HsWallpaperLoaderThread::HsWallpaperLoaderThread(class QObject *) + ?staticMetaObject@HsGui@@2UQMetaObject@@B @ 436 NONAME ; struct QMetaObject const HsGui::staticMetaObject + ?start@HsWallpaperLoader@@QAEXXZ @ 437 NONAME ; void HsWallpaperLoader::start(void) + ?component@HsWidgetComponentRegistry@@QAEPAVHsWidgetComponent@@ABVQString@@@Z @ 438 NONAME ; class HsWidgetComponent * HsWidgetComponentRegistry::component(class QString const &) + ??_EHsWidgetComponent@@UAE@I@Z @ 439 NONAME ; HsWidgetComponent::~HsWidgetComponent(unsigned int) + ?mInstance@HsScene@@0PAV1@A @ 440 NONAME ; class HsScene * HsScene::mInstance + ?getStaticMetaObject@HsGui@@SAABUQMetaObject@@XZ @ 441 NONAME ; struct QMetaObject const & HsGui::getStaticMetaObject(void) + ?trUtf8@HsSceneWallpaper@@SA?AVQString@@PBD0@Z @ 442 NONAME ; class QString HsSceneWallpaper::trUtf8(char const *, char const *) + ??_EHsWidgetHost@@UAE@I@Z @ 443 NONAME ; HsWidgetHost::~HsWidgetHost(unsigned int) + ?minimumWidgetHeight@HsConfiguration@@QBEMXZ @ 444 NONAME ; float HsConfiguration::minimumWidgetHeight(void) const + ?setVisualModel@HsWidgetHostVisual@@QAEXPAVHsWidgetHost@@@Z @ 445 NONAME ; void HsWidgetHostVisual::setVisualModel(class HsWidgetHost *) + ??0HsPageWallpaper@@QAE@PAVHsPage@@PAVQGraphicsItem@@@Z @ 446 NONAME ; HsPageWallpaper::HsPageWallpaper(class HsPage *, class QGraphicsItem *) + ?onSetPreferences@HsWidgetHost@@AAEXABVQStringList@@@Z @ 447 NONAME ; void HsWidgetHost::onSetPreferences(class QStringList const &) + ?staticMetaObject@HsShortcutService@@2UQMetaObject@@B @ 448 NONAME ; struct QMetaObject const HsShortcutService::staticMetaObject + ??1HsWidgetComponentDescriptor@@QAE@XZ @ 449 NONAME ; HsWidgetComponentDescriptor::~HsWidgetComponentDescriptor(void) + ?showPageIndicator@HsIdleWidget@@QAEXXZ @ 450 NONAME ; void HsIdleWidget::showPageIndicator(void) + ??1HsBackupRestoreObserver@@UAE@XZ @ 451 NONAME ; HsBackupRestoreObserver::~HsBackupRestoreObserver(void) + ?insertPage@HsDatabase@@QAE_NAAVHsPageData@@@Z @ 452 NONAME ; bool HsDatabase::insertPage(class HsPageData &) + ??_EHsWidgetComponentRegistry@@UAE@I@Z @ 453 NONAME ; HsWidgetComponentRegistry::~HsWidgetComponentRegistry(unsigned int) + ?metaObject@HsIdleWidget@@UBEPBUQMetaObject@@XZ @ 454 NONAME ; struct QMetaObject const * HsIdleWidget::metaObject(void) const + ?qt_metacast@HsHostedWidgetFactory@@UAEPAXPBD@Z @ 455 NONAME ; void * HsHostedWidgetFactory::qt_metacast(char const *) + ?setUri@HsWidgetComponentDescriptor@@QAEXABVQString@@@Z @ 456 NONAME ; void HsWidgetComponentDescriptor::setUri(class QString const &) + ??1HsWallpaperLoaderThread@@UAE@XZ @ 457 NONAME ; HsWallpaperLoaderThread::~HsWallpaperLoaderThread(void) + ?staticMetaObject@HsWidgetComponentRegistry@@2UQMetaObject@@B @ 458 NONAME ; struct QMetaObject const HsWidgetComponentRegistry::staticMetaObject + ??1HsWallpaper@@UAE@XZ @ 459 NONAME ; HsWallpaper::~HsWallpaper(void) + ?qt_metacall@HsPage@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 460 NONAME ; int HsPage::qt_metacall(enum QMetaObject::Call, int, void * *) + ?onWidgetAvailable@HsPage@@AAEXXZ @ 461 NONAME ; void HsPage::onWidgetAvailable(void) + ?qt_metacast@HsPage@@UAEPAXPBD@Z @ 462 NONAME ; void * HsPage::qt_metacast(char const *) + ?result@HsWallpaperLoaderThread@@QBE_NXZ @ 463 NONAME ; bool HsWallpaperLoaderThread::result(void) const + ?setPageIndicatorSpacing@HsConfiguration@@QAEXM@Z @ 464 NONAME ; void HsConfiguration::setPageIndicatorSpacing(float) + ?setSnapLineFadeInDuration@HsConfiguration@@QAEXH@Z @ 465 NONAME ; void HsConfiguration::setSnapLineFadeInDuration(int) + ??1HsGui@@UAE@XZ @ 466 NONAME ; HsGui::~HsGui(void) + ?isValid@HsWidgetComponentDescriptor@@QAE_NXZ @ 467 NONAME ; bool HsWidgetComponentDescriptor::isValid(void) + ?uri@HsWidgetComponentDescriptor@@QBE?AVQString@@XZ @ 468 NONAME ; class QString HsWidgetComponentDescriptor::uri(void) const + ?setOrientation@HsGui@@QAEXW4Orientation@Qt@@@Z @ 469 NONAME ; void HsGui::setOrientation(enum Qt::Orientation) + ?tr@HsWidgetComponentRegistry@@SA?AVQString@@PBD0@Z @ 470 NONAME ; class QString HsWidgetComponentRegistry::tr(char const *, char const *) + ?getStaticMetaObject@HsPage@@SAABUQMetaObject@@XZ @ 471 NONAME ; struct QMetaObject const & HsPage::getStaticMetaObject(void) + ?onWidgetFaulted@HsPage@@AAEXXZ @ 472 NONAME ; void HsPage::onWidgetFaulted(void) + ?page@HsPageWallpaper@@QBEPAVHsPage@@XZ @ 473 NONAME ; class HsPage * HsPageWallpaper::page(void) const + ?qt_metacast@HsBackupRestoreObserver@@UAEPAXPBD@Z @ 474 NONAME ; void * HsBackupRestoreObserver::qt_metacast(char const *) + ?setTargetPath@HsWallpaperLoaderThread@@QAEXABVQString@@@Z @ 475 NONAME ; void HsWallpaperLoaderThread::setTargetPath(class QString const &) + ?setSnapTimeout@HsConfiguration@@QAEXH@Z @ 476 NONAME ; void HsConfiguration::setSnapTimeout(int) + ?createTargets@HsSceneWallpaper@@MAE?AV?$QHash@VQString@@VQVariant@@@@ABVQString@@@Z @ 477 NONAME ; class QHash<class QString, class QVariant> HsSceneWallpaper::createTargets(class QString const &) + ?onWidgetResized@HsPage@@AAEXXZ @ 478 NONAME ; void HsPage::onWidgetResized(void) + ?checkBUR@HsBackupRestoreObserver@@QAE_NXZ @ 479 NONAME ; bool HsBackupRestoreObserver::checkBUR(void) + ?showWidgets@HsPage@@QAEXXZ @ 480 NONAME ; void HsPage::showWidgets(void) + ?startWidget@HsWidgetHost@@QAEX_N@Z @ 481 NONAME ; void HsWidgetHost::startWidget(bool) + ??_EHsShortcutService@@UAE@I@Z @ 482 NONAME ; HsShortcutService::~HsShortcutService(unsigned int) + ?bounceFeedbackEffectDistance@HsConfiguration@@QBEMXZ @ 483 NONAME ; float HsConfiguration::bounceFeedbackEffectDistance(void) const + ?unavailable@HsWidgetHost@@IAEXXZ @ 484 NONAME ; void HsWidgetHost::unavailable(void) + ?qt_metacall@HsDatabase@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 485 NONAME ; int HsDatabase::qt_metacall(enum QMetaObject::Call, int, void * *) + ?contentRect@HsPage@@QAE?AVQRectF@@W4Orientation@Qt@@@Z @ 486 NONAME ; class QRectF HsPage::contentRect(enum Qt::Orientation) + ?contentGeometry@HsPage@@QAE?AVQRectF@@XZ @ 487 NONAME ; class QRectF HsPage::contentGeometry(void) + ?setHidden@HsWidgetComponentDescriptor@@QAEXABVQString@@@Z @ 488 NONAME ; void HsWidgetComponentDescriptor::setHidden(class QString const &) + ?widgets@HsDatabase@@QAE_NHAAV?$QList@VHsWidgetData@@@@@Z @ 489 NONAME ; bool HsDatabase::widgets(int, class QList<class HsWidgetData> &) + ??_EHsPageWallpaper@@UAE@I@Z @ 490 NONAME ; HsPageWallpaper::~HsPageWallpaper(unsigned int) + ?databaseId@HsPage@@QBEHXZ @ 491 NONAME ; int HsPage::databaseId(void) const + ?tr@HsWallpaperLoader@@SA?AVQString@@PBD0@Z @ 492 NONAME ; class QString HsWallpaperLoader::tr(char const *, char const *) + ?show@HsGui@@QAEXXZ @ 493 NONAME ; void HsGui::show(void) + ??0HsGui@@AAE@PAVQObject@@@Z @ 494 NONAME ; HsGui::HsGui(class QObject *) + ?qt_metacall@HsBackupRestoreObserver@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 495 NONAME ; int HsBackupRestoreObserver::qt_metacall(enum QMetaObject::Call, int, void * *) + ??_EHsWallpaperLoaderThread@@UAE@I@Z @ 496 NONAME ; HsWallpaperLoaderThread::~HsWallpaperLoaderThread(unsigned int) + ?resolveRootPathAndTranslationFilename@HsWidgetComponent@@AAEXXZ @ 497 NONAME ; void HsWidgetComponent::resolveRootPathAndTranslationFilename(void) + ?maximumWidgetHeight@HsConfiguration@@QBEMXZ @ 498 NONAME ; float HsConfiguration::maximumWidgetHeight(void) const + ?isSnapEnabled@HsConfiguration@@QBE_NXZ @ 499 NONAME ; bool HsConfiguration::isSnapEnabled(void) const + ?backupRestoreCompleted@HsBackupRestoreObserver@@QAEXXZ @ 500 NONAME ; void HsBackupRestoreObserver::backupRestoreCompleted(void) + ?setPageRemovedAnimationDuration@HsConfiguration@@QAEXH@Z @ 501 NONAME ; void HsConfiguration::setPageRemovedAnimationDuration(int) + ?insertWidget@HsDatabase@@QAE_NAAVHsWidgetData@@@Z @ 502 NONAME ; bool HsDatabase::insertWidget(class HsWidgetData &) + ??1HsShortcutService@@UAE@XZ @ 503 NONAME ; HsShortcutService::~HsShortcutService(void) + ?setupTouchArea@HsWidgetHostVisual@@AAEXXZ @ 504 NONAME ; void HsWidgetHostVisual::setupTouchArea(void) + ?setBounceFeedbackEffectDistance@HsConfiguration@@QAEXM@Z @ 505 NONAME ; void HsConfiguration::setBounceFeedbackEffectDistance(float) + ?onEntryChanged@HsWidgetComponentRegistry@@AAEXABVCaEntry@@W4ChangeType@@@Z @ 506 NONAME ; void HsWidgetComponentRegistry::onEntryChanged(class CaEntry const &, enum ChangeType) + ?getPresentation@HsWidgetHost@@QAE_NAAVHsWidgetPresentationData@@@Z @ 507 NONAME ; bool HsWidgetHost::getPresentation(class HsWidgetPresentationData &) + ?getStaticMetaObject@HsSceneWallpaper@@SAABUQMetaObject@@XZ @ 508 NONAME ; struct QMetaObject const & HsSceneWallpaper::getStaticMetaObject(void) + ?tr@HsScene@@SA?AVQString@@PBD0H@Z @ 509 NONAME ; class QString HsScene::tr(char const *, char const *, int) + ?uri@HsWidgetComponent@@QBE?AVQString@@XZ @ 510 NONAME ; class QString HsWidgetComponent::uri(void) const + ?instance@HsContentService@@SAPAV1@XZ @ 511 NONAME ; class HsContentService * HsContentService::instance(void) + ?snapGap@HsConfiguration@@QBEMXZ @ 512 NONAME ; float HsConfiguration::snapGap(void) const + ?savePresentation@HsWidgetHost@@QAE_NW4Orientation@Qt@@@Z @ 513 NONAME ; bool HsWidgetHost::savePresentation(enum Qt::Orientation) + ?setWidgetDropToTrashbinFeedbackEffect@HsConfiguration@@QAEXW4InstantEffect@HbFeedback@@@Z @ 514 NONAME ; void HsConfiguration::setWidgetDropToTrashbinFeedbackEffect(enum HbFeedback::InstantEffect) + ?tr@HsIdleWidget@@SA?AVQString@@PBD0@Z @ 515 NONAME ; class QString HsIdleWidget::tr(char const *, char const *) + ?title@HsWidgetComponentDescriptor@@QBE?AVQString@@XZ @ 516 NONAME ; class QString HsWidgetComponentDescriptor::title(void) const + ?event_hide@HsWidgetHost@@IAEXXZ @ 517 NONAME ; void HsWidgetHost::event_hide(void) + ?databaseId@HsScene@@QBEHXZ @ 518 NONAME ; int HsScene::databaseId(void) const + ?setWidgetDropFeedbackEffect@HsConfiguration@@QAEXW4InstantEffect@HbFeedback@@@Z @ 519 NONAME ; void HsConfiguration::setWidgetDropFeedbackEffect(enum HbFeedback::InstantEffect) + ??1HsWidgetComponentRegistry@@UAE@XZ @ 520 NONAME ; HsWidgetComponentRegistry::~HsWidgetComponentRegistry(void) + ?setDescription@HsWidgetComponentDescriptor@@QAEXABVQString@@@Z @ 521 NONAME ; void HsWidgetComponentDescriptor::setDescription(class QString const &) + ?getStaticMetaObject@HsConfiguration@@SAABUQMetaObject@@XZ @ 522 NONAME ; struct QMetaObject const & HsConfiguration::getStaticMetaObject(void) + ?isRunning@HsWallpaperLoader@@QBE_NXZ @ 523 NONAME ; bool HsWallpaperLoader::isRunning(void) const + ?activePageChanged@HsScene@@IAEXXZ @ 524 NONAME ; void HsScene::activePageChanged(void) + ?staticMetaObject@HsSceneWallpaper@@2UQMetaObject@@B @ 525 NONAME ; struct QMetaObject const HsSceneWallpaper::staticMetaObject + ?uninstalled@HsWidgetComponent@@IAEXXZ @ 526 NONAME ; void HsWidgetComponent::uninstalled(void) + ??1HsHostedWidgetFactory@@UAE@XZ @ 527 NONAME ; HsHostedWidgetFactory::~HsHostedWidgetFactory(void) + ?trUtf8@HsShortcutService@@SA?AVQString@@PBD0@Z @ 528 NONAME ; class QString HsShortcutService::trUtf8(char const *, char const *) + ?setPage@HsWidgetHost@@QAE_NPAVHsPage@@@Z @ 529 NONAME ; bool HsWidgetHost::setPage(class HsPage *) + ?metaObject@HsScene@@UBEPBUQMetaObject@@XZ @ 530 NONAME ; struct QMetaObject const * HsScene::metaObject(void) const + ??_EHsScene@@UAE@I@Z @ 531 NONAME ; HsScene::~HsScene(unsigned int) + ?pageTapAndHoldFinished@HsScene@@IAEXPAVQGestureEvent@@@Z @ 532 NONAME ; void HsScene::pageTapAndHoldFinished(class QGestureEvent *) + ?remove@HsWidgetHost@@QAEXXZ @ 533 NONAME ; void HsWidgetHost::remove(void) + ?run@HsWallpaperLoaderThread@@MAEXXZ @ 534 NONAME ; void HsWallpaperLoaderThread::run(void) + ?maximumWidgetSizeInUnits@HsConfiguration@@QBE?AVQSizeF@@XZ @ 535 NONAME ; class QSizeF HsConfiguration::maximumWidgetSizeInUnits(void) const + ?getStaticMetaObject@HsScene@@SAABUQMetaObject@@XZ @ 536 NONAME ; struct QMetaObject const & HsScene::getStaticMetaObject(void) + ?finished@HsWallpaperLoader@@IAEXXZ @ 537 NONAME ; void HsWallpaperLoader::finished(void) + ?visual@HsPage@@QBEPAVHsPageVisual@@XZ @ 538 NONAME ; class HsPageVisual * HsPage::visual(void) const + ?snapLineFadeOutDuration@HsConfiguration@@QBEHXZ @ 539 NONAME ; int HsConfiguration::snapLineFadeOutDuration(void) const + ?trUtf8@HsPageWallpaper@@SA?AVQString@@PBD0H@Z @ 540 NONAME ; class QString HsPageWallpaper::trUtf8(char const *, char const *, int) + ?setNewSize@HsWidgetHostVisual@@AAEXABVQSizeF@@@Z @ 541 NONAME ; void HsWidgetHostVisual::setNewSize(class QSizeF const &) + ?imageSet@HsWallpaper@@IAEXXZ @ 542 NONAME ; void HsWallpaper::imageSet(void) + ?tr@HsWidgetHostVisual@@SA?AVQString@@PBD0H@Z @ 543 NONAME ; class QString HsWidgetHostVisual::tr(char const *, char const *, int) + ?sceneType@HsConfiguration@@QBE?AW4SceneType@1@XZ @ 544 NONAME ; enum HsConfiguration::SceneType HsConfiguration::sceneType(void) const + ?tr@HsPage@@SA?AVQString@@PBD0H@Z @ 545 NONAME ; class QString HsPage::tr(char const *, char const *, int) + ?setNewPageAddedAnimationDuration@HsConfiguration@@QAEXH@Z @ 546 NONAME ; void HsConfiguration::setNewPageAddedAnimationDuration(int) + ??_EHsGui@@UAE@I@Z @ 547 NONAME ; HsGui::~HsGui(unsigned int) + ?isAvailable@HsWidgetComponent@@QBE_NXZ @ 548 NONAME ; bool HsWidgetComponent::isAvailable(void) const + ?updateWidgetZValues@HsDatabase@@QAE_NABV?$QHash@HM@@W4Orientation@Qt@@@Z @ 549 NONAME ; bool HsDatabase::updateWidgetZValues(class QHash<int, float> const &, enum Qt::Orientation) + ?checkConnection@HsDatabase@@ABE_NXZ @ 550 NONAME ; bool HsDatabase::checkConnection(void) const + ?staticMetaObject@HsConfiguration@@2UQMetaObject@@B @ 551 NONAME ; struct QMetaObject const HsConfiguration::staticMetaObject + ?takeInstance@HsDatabase@@SAPAV1@XZ @ 552 NONAME ; class HsDatabase * HsDatabase::takeInstance(void) + ?tr@HsWallpaper@@SA?AVQString@@PBD0@Z @ 553 NONAME ; class QString HsWallpaper::tr(char const *, char const *) + ?deleteWidgets@HsDatabase@@QAE_NABVQString@@@Z @ 554 NONAME ; bool HsDatabase::deleteWidgets(class QString const &) + ??0HsPageData@@QAE@XZ @ 555 NONAME ; HsPageData::HsPageData(void) + ?tr@HsSceneWallpaper@@SA?AVQString@@PBD0H@Z @ 556 NONAME ; class QString HsSceneWallpaper::tr(char const *, char const *, int) + ?pageIndicatorSpacing@HsConfiguration@@QBEMXZ @ 557 NONAME ; float HsConfiguration::pageIndicatorSpacing(void) const + ?getStaticMetaObject@HsShortcutService@@SAABUQMetaObject@@XZ @ 558 NONAME ; struct QMetaObject const & HsShortcutService::getStaticMetaObject(void) + ?isRemovable@HsPage@@QBE_NXZ @ 559 NONAME ; bool HsPage::isRemovable(void) const + ?setDatabaseId@HsPage@@QAEXH@Z @ 560 NONAME ; void HsPage::setDatabaseId(int) + ?trUtf8@HsIdleWidget@@SA?AVQString@@PBD0@Z @ 561 NONAME ; class QString HsIdleWidget::trUtf8(char const *, char const *) + ?pageChangeAnimationDuration@HsConfiguration@@QBEHXZ @ 562 NONAME ; int HsConfiguration::pageChangeAnimationDuration(void) const + ?staticMetaObject@HsBackupRestoreObserver@@2UQMetaObject@@B @ 563 NONAME ; struct QMetaObject const HsBackupRestoreObserver::staticMetaObject + ?widgetTapAndHoldFinished@HsScene@@IAEXPAVQGestureEvent@@PAVHsWidgetHost@@@Z @ 564 NONAME ; void HsScene::widgetTapAndHoldFinished(class QGestureEvent *, class HsWidgetHost *) + ?metaObject@HsPageWallpaper@@UBEPBUQMetaObject@@XZ @ 565 NONAME ; struct QMetaObject const * HsPageWallpaper::metaObject(void) const + ?tr@HsGui@@SA?AVQString@@PBD0H@Z @ 566 NONAME ; class QString HsGui::tr(char const *, char const *, int) + ?updatePage@HsDatabase@@QAE_NABVHsPageData@@@Z @ 567 NONAME ; bool HsDatabase::updatePage(class HsPageData const &) + ?action_uninitialize@HsWidgetHost@@AAEXXZ @ 568 NONAME ; void HsWidgetHost::action_uninitialize(void) + ??_EHsWallpaperLoader@@UAE@I@Z @ 569 NONAME ; HsWallpaperLoader::~HsWallpaperLoader(unsigned int) + ??_EHsWallpaper@@UAE@I@Z @ 570 NONAME ; HsWallpaper::~HsWallpaper(unsigned int) + ?action_connectComponent@HsWidgetHost@@AAEXXZ @ 571 NONAME ; void HsWidgetHost::action_connectComponent(void) + ?setImage@HsWallpaper@@QAEXABVQString@@@Z @ 572 NONAME ; void HsWallpaper::setImage(class QString const &) + ?setPageChangeAnimationDuration@HsConfiguration@@QAEXH@Z @ 573 NONAME ; void HsConfiguration::setPageChangeAnimationDuration(int) + ??0HsSceneData@@QAE@XZ @ 574 NONAME ; HsSceneData::HsSceneData(void) + ?hasSignal@HsWidgetHost@@AAE_NPBD@Z @ 575 NONAME ; bool HsWidgetHost::hasSignal(char const *) + ?getStaticMetaObject@HsWidgetHostVisual@@SAABUQMetaObject@@XZ @ 576 NONAME ; struct QMetaObject const & HsWidgetHostVisual::getStaticMetaObject(void) + ?getStaticMetaObject@HsWallpaper@@SAABUQMetaObject@@XZ @ 577 NONAME ; struct QMetaObject const & HsWallpaper::getStaticMetaObject(void) + ?trUtf8@HsWallpaper@@SA?AVQString@@PBD0@Z @ 578 NONAME ; class QString HsWallpaper::trUtf8(char const *, char const *) + ??0HsWidgetHost@@QAE@HPAVQObject@@@Z @ 579 NONAME ; HsWidgetHost::HsWidgetHost(int, class QObject *) + ?emitWidgetRemoved@HsContentService@@QAEXABVQString@@ABV?$QHash@VQString@@VQVariant@@@@@Z @ 580 NONAME ; void HsContentService::emitWidgetRemoved(class QString const &, class QHash<class QString, class QVariant> const &) + ?pages@HsScene@@QBE?AV?$QList@PAVHsPage@@@@XZ @ 581 NONAME ; class QList<class HsPage *> HsScene::pages(void) const + ??1HsConfiguration@@UAE@XZ @ 582 NONAME ; HsConfiguration::~HsConfiguration(void) + ?trashBin@HsIdleWidget@@QBEPAVHsTrashBinWidget@@XZ @ 583 NONAME ; class HsTrashBinWidget * HsIdleWidget::trashBin(void) const + ?translationFilename@HsWidgetComponentDescriptor@@QBE?AVQString@@XZ @ 584 NONAME ; class QString HsWidgetComponentDescriptor::translationFilename(void) const + ?trUtf8@HsConfiguration@@SA?AVQString@@PBD0@Z @ 585 NONAME ; class QString HsConfiguration::trUtf8(char const *, char const *) + ?instance@HsScene@@SAPAV1@XZ @ 586 NONAME ; class HsScene * HsScene::instance(void) + ?eventFilter@HsScene@@MAE_NPAVQObject@@PAVQEvent@@@Z @ 587 NONAME ; bool HsScene::eventFilter(class QObject *, class QEvent *) + ?trUtf8@HsPage@@SA?AVQString@@PBD0H@Z @ 588 NONAME ; class QString HsPage::trUtf8(char const *, char const *, int) + ?isDefaultPage@HsPage@@QBE_NXZ @ 589 NONAME ; bool HsPage::isDefaultPage(void) const + ??_EHsDatabase@@UAE@I@Z @ 590 NONAME ; HsDatabase::~HsDatabase(unsigned int) + ?event_startAndShow@HsWidgetHost@@IAEXXZ @ 591 NONAME ; void HsWidgetHost::event_startAndShow(void) + ?layoutRect@HsGui@@QBE?AVQRectF@@XZ @ 592 NONAME ; class QRectF HsGui::layoutRect(void) const + ?trUtf8@HsContentService@@SA?AVQString@@PBD0H@Z @ 593 NONAME ; class QString HsContentService::trUtf8(char const *, char const *, int) + ?setMinimumWidgetHeight@HsConfiguration@@QAEXM@Z @ 594 NONAME ; void HsConfiguration::setMinimumWidgetHeight(float) + ?unavailable@HsWidgetComponent@@IAEXXZ @ 595 NONAME ; void HsWidgetComponent::unavailable(void) + ?isShortcutLabelVisible@HsConfiguration@@QBE_NXZ @ 596 NONAME ; bool HsConfiguration::isShortcutLabelVisible(void) const + ?setPageChangeZoneReverseAnimationDuration@HsConfiguration@@QAEXH@Z @ 597 NONAME ; void HsConfiguration::setPageChangeZoneReverseAnimationDuration(int) + ?getStaticMetaObject@HsIdleWidget@@SAABUQMetaObject@@XZ @ 598 NONAME ; struct QMetaObject const & HsIdleWidget::getStaticMetaObject(void) + ?qt_metacall@HsWidgetHostVisual@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 599 NONAME ; int HsWidgetHostVisual::qt_metacall(enum QMetaObject::Call, int, void * *) + ?tr@HsDatabase@@SA?AVQString@@PBD0H@Z @ 600 NONAME ; class QString HsDatabase::tr(char const *, char const *, int) + ?instance@HsWidgetComponentRegistry@@SAPAV1@XZ @ 601 NONAME ; class HsWidgetComponentRegistry * HsWidgetComponentRegistry::instance(void) + ?serviceXml@HsWidgetComponentDescriptor@@QBE?AVQString@@XZ @ 602 NONAME ; class QString HsWidgetComponentDescriptor::serviceXml(void) const + ?qt_metacall@HsWallpaperLoader@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 603 NONAME ; int HsWallpaperLoader::qt_metacall(enum QMetaObject::Call, int, void * *) + ??_EHsSceneWallpaper@@UAE@I@Z @ 604 NONAME ; HsSceneWallpaper::~HsSceneWallpaper(unsigned int) + ?instance@HsDatabase@@SAPAV1@XZ @ 605 NONAME ; class HsDatabase * HsDatabase::instance(void) + ?setTranslationFilename@HsWidgetComponentDescriptor@@QAEXABVQString@@@Z @ 606 NONAME ; void HsWidgetComponentDescriptor::setTranslationFilename(class QString const &) + ?onLoaderFinished@HsWallpaper@@AAEXXZ @ 607 NONAME ; void HsWallpaper::onLoaderFinished(void) + ?qt_metacall@HsIdleWidget@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 608 NONAME ; int HsIdleWidget::qt_metacall(enum QMetaObject::Call, int, void * *) + ?addWidget@HsContentService@@QAE_NABVQString@@ABV?$QHash@VQString@@VQVariant@@@@ABVQVariant@@@Z @ 609 NONAME ; bool HsContentService::addWidget(class QString const &, class QHash<class QString, class QVariant> const &, class QVariant const &) + ?shortcutWidgetTapFeedbackEffect@HsConfiguration@@QBE?AW4InstantEffect@HbFeedback@@XZ @ 610 NONAME ; enum HbFeedback::InstantEffect HsConfiguration::shortcutWidgetTapFeedbackEffect(void) const + ?widgetMoveFinished@HsScene@@IAEXABVQPointF@@PAVHsWidgetHost@@@Z @ 611 NONAME ; void HsScene::widgetMoveFinished(class QPointF const &, class HsWidgetHost *) + ?setInstance@HsScene@@SAXPAV1@@Z @ 612 NONAME ; void HsScene::setInstance(class HsScene *) + ?tr@HsPageVisual@@SA?AVQString@@PBD0H@Z @ 613 NONAME ; class QString HsPageVisual::tr(char const *, char const *, int) + ??_EHsContentService@@UAE@I@Z @ 614 NONAME ; HsContentService::~HsContentService(unsigned int) + ?trUtf8@HsDatabase@@SA?AVQString@@PBD0H@Z @ 615 NONAME ; class QString HsDatabase::trUtf8(char const *, char const *, int) + ?action_hide@HsWidgetHost@@AAEXXZ @ 616 NONAME ; void HsWidgetHost::action_hide(void) + ?addNewWidget@HsPage@@QAE_NPAVHsWidgetHost@@ABVQPointF@@@Z @ 617 NONAME ; bool HsPage::addNewWidget(class HsWidgetHost *, class QPointF const &) + ?removePresentation@HsWidgetHost@@QAE_NW4Orientation@Qt@@@Z @ 618 NONAME ; bool HsWidgetHost::removePresentation(enum Qt::Orientation) + ?staticMetaObject@HsContentService@@2UQMetaObject@@B @ 619 NONAME ; struct QMetaObject const HsContentService::staticMetaObject + ?tr@HsWidgetHost@@SA?AVQString@@PBD0H@Z @ 620 NONAME ; class QString HsWidgetHost::tr(char const *, char const *, int) + ?setWidgetRepositionFeedbackEffect@HsConfiguration@@QAEXW4InstantEffect@HbFeedback@@@Z @ 621 NONAME ; void HsConfiguration::setWidgetRepositionFeedbackEffect(enum HbFeedback::InstantEffect) + ?gestureEvent@HsWidgetHostVisual@@MAEXPAVQGestureEvent@@@Z @ 622 NONAME ; void HsWidgetHostVisual::gestureEvent(class QGestureEvent *) + ?metaObject@HsBackupRestoreObserver@@UBEPBUQMetaObject@@XZ @ 623 NONAME ; struct QMetaObject const * HsBackupRestoreObserver::metaObject(void) const + ?instance@HsGui@@SAPAV1@XZ @ 624 NONAME ; class HsGui * HsGui::instance(void) + ?getStaticMetaObject@HsHostedWidgetFactory@@SAABUQMetaObject@@XZ @ 625 NONAME ; struct QMetaObject const & HsHostedWidgetFactory::getStaticMetaObject(void) + ?qt_metacall@HsScene@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 626 NONAME ; int HsScene::qt_metacall(enum QMetaObject::Call, int, void * *) + ?setExistingImage@HsWallpaper@@IAE_NXZ @ 627 NONAME ; bool HsWallpaper::setExistingImage(void) + ?setPageChangeFeedbackEffect@HsConfiguration@@QAEXW4InstantEffect@HbFeedback@@@Z @ 628 NONAME ; void HsConfiguration::setPageChangeFeedbackEffect(enum HbFeedback::InstantEffect) + ?trUtf8@HsHostedWidgetFactory@@SA?AVQString@@PBD0H@Z @ 629 NONAME ; class QString HsHostedWidgetFactory::trUtf8(char const *, char const *, int) + ?trUtf8@HsConfiguration@@SA?AVQString@@PBD0H@Z @ 630 NONAME ; class QString HsConfiguration::trUtf8(char const *, char const *, int) + ?minimumWidgetSizeInPixels@HsConfiguration@@QBE?AVQSizeF@@XZ @ 631 NONAME ; class QSizeF HsConfiguration::minimumWidgetSizeInPixels(void) const + ?event_finished@HsWidgetHost@@IAEXXZ @ 632 NONAME ; void HsWidgetHost::event_finished(void) + ?sourcePath@HsWallpaperLoaderThread@@QBE?AVQString@@XZ @ 633 NONAME ; class QString HsWallpaperLoaderThread::sourcePath(void) const + ?widgets@HsPage@@QBE?AV?$QList@PAVHsWidgetHost@@@@XZ @ 634 NONAME ; class QList<class HsWidgetHost *> HsPage::widgets(void) const + ?setPageMargin@HsConfiguration@@QAEXM@Z @ 635 NONAME ; void HsConfiguration::setPageMargin(float) + ?parallaxFactor@HsIdleWidget@@QBEMXZ @ 636 NONAME ; float HsIdleWidget::parallaxFactor(void) const + ?setOnline@HsWidgetHost@@QAEX_N@Z @ 637 NONAME ; void HsWidgetHost::setOnline(bool) + ?setPreferencesToWidget@HsWidgetHost@@AAE_NXZ @ 638 NONAME ; bool HsWidgetHost::setPreferencesToWidget(void) + ?setWidgetPickFeedbackEffect@HsConfiguration@@QAEXW4InstantEffect@HbFeedback@@@Z @ 639 NONAME ; void HsConfiguration::setWidgetPickFeedbackEffect(enum HbFeedback::InstantEffect) + ?getStaticMetaObject@HsPageWallpaper@@SAABUQMetaObject@@XZ @ 640 NONAME ; struct QMetaObject const & HsPageWallpaper::getStaticMetaObject(void) + ??0HsWidgetHostVisual@@QAE@PAVQGraphicsItem@@@Z @ 641 NONAME ; HsWidgetHostVisual::HsWidgetHostVisual(class QGraphicsItem *) + ?trUtf8@HsIdleWidget@@SA?AVQString@@PBD0H@Z @ 642 NONAME ; class QString HsIdleWidget::trUtf8(char const *, char const *, int) + ??0HsContentService@@QAE@PAVQObject@@@Z @ 643 NONAME ; HsContentService::HsContentService(class QObject *) + ?trUtf8@HsWidgetComponentRegistry@@SA?AVQString@@PBD0H@Z @ 644 NONAME ; class QString HsWidgetComponentRegistry::trUtf8(char const *, char const *, int) + ?targetPath@HsWallpaperLoaderThread@@QBE?AVQString@@XZ @ 645 NONAME ; class QString HsWallpaperLoaderThread::targetPath(void) const + ?staticMetaObject@HsWallpaper@@2UQMetaObject@@B @ 646 NONAME ; struct QMetaObject const HsWallpaper::staticMetaObject + ?trUtf8@HsGui@@SA?AVQString@@PBD0H@Z @ 647 NONAME ; class QString HsGui::trUtf8(char const *, char const *, int) + ?metaObject@HsPageVisual@@UBEPBUQMetaObject@@XZ @ 648 NONAME ; struct QMetaObject const * HsPageVisual::metaObject(void) const + ?tr@HsWidgetComponent@@SA?AVQString@@PBD0@Z @ 649 NONAME ; class QString HsWidgetComponent::tr(char const *, char const *) + ?tr@HsHostedWidgetFactory@@SA?AVQString@@PBD0@Z @ 650 NONAME ; class QString HsHostedWidgetFactory::tr(char const *, char const *) + ?setBounceEffect@HsConfiguration@@QAEXH@Z @ 651 NONAME ; void HsConfiguration::setBounceEffect(int) + ??0HsPage@@QAE@PAVQObject@@@Z @ 652 NONAME ; HsPage::HsPage(class QObject *) + ?qt_metacast@HsDatabase@@UAEPAXPBD@Z @ 653 NONAME ; void * HsDatabase::qt_metacast(char const *) + ?registerService@HsWidgetComponentRegistry@@AAEXABVCaEntry@@ABVQString@@_N@Z @ 654 NONAME ; void HsWidgetComponentRegistry::registerService(class CaEntry const &, class QString const &, bool) + ?trUtf8@HsBackupRestoreObserver@@SA?AVQString@@PBD0@Z @ 655 NONAME ; class QString HsBackupRestoreObserver::trUtf8(char const *, char const *) + ?metaObject@HsWidgetHost@@UBEPBUQMetaObject@@XZ @ 656 NONAME ; struct QMetaObject const * HsWidgetHost::metaObject(void) const + ?qt_metacast@HsConfiguration@@UAEPAXPBD@Z @ 657 NONAME ; void * HsConfiguration::qt_metacast(char const *) +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsdomainmodel/eabi/hsdomainmodelu.def Wed Aug 18 10:33:57 2010 +0300 @@ -0,0 +1,556 @@ +EXPORTS + _ZN10HsDatabase10deletePageEi @ 1 NONAME + _ZN10HsDatabase10insertPageER10HsPageData @ 2 NONAME + _ZN10HsDatabase10updatePageERK10HsPageData @ 3 NONAME + _ZN10HsDatabase11qt_metacallEN11QMetaObject4CallEiPPv @ 4 NONAME + _ZN10HsDatabase11qt_metacastEPKc @ 5 NONAME + _ZN10HsDatabase11setInstanceEPS_ @ 6 NONAME + _ZN10HsDatabase11transactionEv @ 7 NONAME + _ZN10HsDatabase12deleteWidgetEi @ 8 NONAME + _ZN10HsDatabase12insertWidgetER12HsWidgetData @ 9 NONAME + _ZN10HsDatabase12takeInstanceEv @ 10 NONAME + _ZN10HsDatabase12updateWidgetERK12HsWidgetData @ 11 NONAME + _ZN10HsDatabase13configurationER5QHashI7QString8QVariantE @ 12 NONAME + _ZN10HsDatabase13deleteWidgetsERK7QString @ 13 NONAME + _ZN10HsDatabase15setDatabaseNameERK7QString @ 14 NONAME + _ZN10HsDatabase16staticMetaObjectE @ 15 NONAME DATA 16 + _ZN10HsDatabase16widgetPreferenceEiRK7QStringR8QVariant @ 16 NONAME + _ZN10HsDatabase17setConnectionNameERK7QString @ 17 NONAME + _ZN10HsDatabase17widgetPreferencesEiR5QHashI7QString8QVariantE @ 18 NONAME + _ZN10HsDatabase18widgetPresentationER24HsWidgetPresentationData @ 19 NONAME + _ZN10HsDatabase19getStaticMetaObjectEv @ 20 NONAME + _ZN10HsDatabase19updateWidgetZValuesERK5QHashIifEN2Qt11OrientationE @ 21 NONAME + _ZN10HsDatabase20setWidgetPreferencesEiRK5QHashI7QString8QVariantE @ 22 NONAME + _ZN10HsDatabase21setWidgetPresentationERK24HsWidgetPresentationData @ 23 NONAME + _ZN10HsDatabase22matchWidgetPreferencesERK5QHashI7QString8QVariantERK9QMultiMapIS1_S1_E @ 24 NONAME + _ZN10HsDatabase24deleteWidgetPresentationEiN2Qt11OrientationE @ 25 NONAME + _ZN10HsDatabase4openEv @ 26 NONAME + _ZN10HsDatabase4pageER10HsPageData @ 27 NONAME + _ZN10HsDatabase5closeEv @ 28 NONAME + _ZN10HsDatabase5pagesER5QListI10HsPageDataE @ 29 NONAME + _ZN10HsDatabase5sceneER11HsSceneData @ 30 NONAME + _ZN10HsDatabase6commitEv @ 31 NONAME + _ZN10HsDatabase6widgetER12HsWidgetData @ 32 NONAME + _ZN10HsDatabase7widgetsERK7QStringR5QListI12HsWidgetDataE @ 33 NONAME + _ZN10HsDatabase7widgetsERK7QStringRK5QHashIS0_8QVariantERi @ 34 NONAME + _ZN10HsDatabase7widgetsEiR5QListI12HsWidgetDataE @ 35 NONAME + _ZN10HsDatabase8instanceEv @ 36 NONAME + _ZN10HsDatabase8rollbackEv @ 37 NONAME + _ZN10HsDatabase9mInstanceE @ 38 NONAME DATA 4 + _ZN10HsDatabaseC1EP7QObject @ 39 NONAME + _ZN10HsDatabaseC2EP7QObject @ 40 NONAME + _ZN10HsDatabaseD0Ev @ 41 NONAME + _ZN10HsDatabaseD1Ev @ 42 NONAME + _ZN10HsDatabaseD2Ev @ 43 NONAME + _ZN11HsWallpaper11qt_metacallEN11QMetaObject4CallEiPPv @ 44 NONAME + _ZN11HsWallpaper11qt_metacastEPKc @ 45 NONAME + _ZN11HsWallpaper14imageSetFailedEv @ 46 NONAME + _ZN11HsWallpaper14onLoaderFailedEv @ 47 NONAME + _ZN11HsWallpaper14updateIconItemEN2Qt11OrientationE @ 48 NONAME + _ZN11HsWallpaper15setDefaultImageEv @ 49 NONAME + _ZN11HsWallpaper16onLoaderFinishedEv @ 50 NONAME + _ZN11HsWallpaper16setExistingImageEv @ 51 NONAME + _ZN11HsWallpaper16staticMetaObjectE @ 52 NONAME DATA 16 + _ZN11HsWallpaper19getStaticMetaObjectEv @ 53 NONAME + _ZN11HsWallpaper6removeEv @ 54 NONAME + _ZN11HsWallpaper8imageSetEv @ 55 NONAME + _ZN11HsWallpaper8setImageERK7QString @ 56 NONAME + _ZN11HsWallpaperC2EP13QGraphicsItem @ 57 NONAME + _ZN11HsWallpaperD0Ev @ 58 NONAME + _ZN11HsWallpaperD1Ev @ 59 NONAME + _ZN11HsWallpaperD2Ev @ 60 NONAME + _ZN12HsIdleWidget10insertPageEiP6HsPage @ 61 NONAME + _ZN12HsIdleWidget10removePageEi @ 62 NONAME + _ZN12HsIdleWidget11polishEventEv @ 63 NONAME + _ZN12HsIdleWidget11qt_metacallEN11QMetaObject4CallEiPPv @ 64 NONAME + _ZN12HsIdleWidget11qt_metacastEPKc @ 65 NONAME + _ZN12HsIdleWidget11setGeometryERK6QRectF @ 66 NONAME + _ZN12HsIdleWidget12showTrashBinEv @ 67 NONAME + _ZN12HsIdleWidget13setActivePageEi @ 68 NONAME + _ZN12HsIdleWidget16loadControlLayerEv @ 69 NONAME + _ZN12HsIdleWidget16staticMetaObjectE @ 70 NONAME DATA 16 + _ZN12HsIdleWidget17showPageIndicatorEv @ 71 NONAME + _ZN12HsIdleWidget19getStaticMetaObjectEv @ 72 NONAME + _ZN12HsIdleWidget20hideVerticalSnapLineEv @ 73 NONAME + _ZN12HsIdleWidget20showVerticalSnapLineERK6QLineF @ 74 NONAME + _ZN12HsIdleWidget22hideHorizontalSnapLineEv @ 75 NONAME + _ZN12HsIdleWidget22showHorizontalSnapLineERK6QLineF @ 76 NONAME + _ZN12HsIdleWidget9setSceneXEf @ 77 NONAME + _ZN12HsIdleWidgetC1EP13QGraphicsItem @ 78 NONAME + _ZN12HsIdleWidgetC2EP13QGraphicsItem @ 79 NONAME + _ZN12HsIdleWidgetD0Ev @ 80 NONAME + _ZN12HsIdleWidgetD1Ev @ 81 NONAME + _ZN12HsIdleWidgetD2Ev @ 82 NONAME + _ZN12HsPageVisual11qt_metacallEN11QMetaObject4CallEiPPv @ 83 NONAME + _ZN12HsPageVisual11qt_metacastEPKc @ 84 NONAME + _ZN12HsPageVisual11setGeometryERK6QRectF @ 85 NONAME + _ZN12HsPageVisual14setupTouchAreaEv @ 86 NONAME + _ZN12HsPageVisual16staticMetaObjectE @ 87 NONAME DATA 16 + _ZN12HsPageVisual19getStaticMetaObjectEv @ 88 NONAME + _ZN12HsPageVisualC1EP13QGraphicsItem @ 89 NONAME + _ZN12HsPageVisualC2EP13QGraphicsItem @ 90 NONAME + _ZN12HsPageVisualD0Ev @ 91 NONAME + _ZN12HsPageVisualD1Ev @ 92 NONAME + _ZN12HsPageVisualD2Ev @ 93 NONAME + _ZN12HsWidgetHost10event_hideEv @ 94 NONAME + _ZN12HsWidgetHost10event_showEv @ 95 NONAME + _ZN12HsWidgetHost10hideWidgetEv @ 96 NONAME + _ZN12HsWidgetHost10onFinishedEv @ 97 NONAME + _ZN12HsWidgetHost10showWidgetEv @ 98 NONAME + _ZN12HsWidgetHost11action_hideEv @ 99 NONAME + _ZN12HsWidgetHost11action_loadEv @ 100 NONAME + _ZN12HsWidgetHost11action_showEv @ 101 NONAME + _ZN12HsWidgetHost11event_closeEv @ 102 NONAME + _ZN12HsWidgetHost11qt_metacallEN11QMetaObject4CallEiPPv @ 103 NONAME + _ZN12HsWidgetHost11qt_metacastEPKc @ 104 NONAME + _ZN12HsWidgetHost11setPropertyEPKcR13QMetaProperty @ 105 NONAME + _ZN12HsWidgetHost11setupStatesEv @ 106 NONAME + _ZN12HsWidgetHost11startWidgetEb @ 107 NONAME + _ZN12HsWidgetHost11unavailableEv @ 108 NONAME + _ZN12HsWidgetHost12event_removeEv @ 109 NONAME + _ZN12HsWidgetHost12event_unloadEv @ 110 NONAME + _ZN12HsWidgetHost13action_removeEv @ 111 NONAME + _ZN12HsWidgetHost13action_unloadEv @ 112 NONAME + _ZN12HsWidgetHost13event_faultedEv @ 113 NONAME + _ZN12HsWidgetHost14action_faultedEv @ 114 NONAME + _ZN12HsWidgetHost14createInstanceER12HsWidgetDataRK5QHashI7QString8QVariantE @ 115 NONAME + _ZN12HsWidgetHost14event_finishedEv @ 116 NONAME + _ZN12HsWidgetHost15action_finishedEv @ 117 NONAME + _ZN12HsWidgetHost15getPresentationER24HsWidgetPresentationData @ 118 NONAME + _ZN12HsWidgetHost15startDragEffectEv @ 119 NONAME + _ZN12HsWidgetHost15startDropEffectEv @ 120 NONAME + _ZN12HsWidgetHost16loadPresentationEN2Qt11OrientationE @ 121 NONAME + _ZN12HsWidgetHost16loadPresentationEv @ 122 NONAME + _ZN12HsWidgetHost16onSetPreferencesERK11QStringList @ 123 NONAME + _ZN12HsWidgetHost16savePresentationEN2Qt11OrientationE @ 124 NONAME + _ZN12HsWidgetHost16savePresentationER24HsWidgetPresentationData @ 125 NONAME + _ZN12HsWidgetHost16savePresentationEv @ 126 NONAME + _ZN12HsWidgetHost16staticMetaObjectE @ 127 NONAME DATA 16 + _ZN12HsWidgetHost17action_initializeEv @ 128 NONAME + _ZN12HsWidgetHost18event_startAndHideEv @ 129 NONAME + _ZN12HsWidgetHost18event_startAndShowEv @ 130 NONAME + _ZN12HsWidgetHost18removePresentationEN2Qt11OrientationE @ 131 NONAME + _ZN12HsWidgetHost19action_notifyRemoveEv @ 132 NONAME + _ZN12HsWidgetHost19action_uninitializeEv @ 133 NONAME + _ZN12HsWidgetHost19getStaticMetaObjectEv @ 134 NONAME + _ZN12HsWidgetHost22setPreferencesToWidgetEv @ 135 NONAME + _ZN12HsWidgetHost23action_connectComponentEv @ 136 NONAME + _ZN12HsWidgetHost26action_disconnectComponentEv @ 137 NONAME + _ZN12HsWidgetHost5closeEv @ 138 NONAME + _ZN12HsWidgetHost6removeEv @ 139 NONAME + _ZN12HsWidgetHost7faultedEv @ 140 NONAME + _ZN12HsWidgetHost7onErrorEv @ 141 NONAME + _ZN12HsWidgetHost7setPageEP6HsPage @ 142 NONAME + _ZN12HsWidgetHost8finishedEv @ 143 NONAME + _ZN12HsWidgetHost9availableEv @ 144 NONAME + _ZN12HsWidgetHost9hasSignalEPKc @ 145 NONAME + _ZN12HsWidgetHost9setMethodEPKcR11QMetaMethod @ 146 NONAME + _ZN12HsWidgetHost9setOnlineEb @ 147 NONAME + _ZN12HsWidgetHostC1EiP7QObject @ 148 NONAME + _ZN12HsWidgetHostC2EiP7QObject @ 149 NONAME + _ZN12HsWidgetHostD0Ev @ 150 NONAME + _ZN12HsWidgetHostD1Ev @ 151 NONAME + _ZN12HsWidgetHostD2Ev @ 152 NONAME + _ZN15HsConfiguration11qt_metacallEN11QMetaObject4CallEiPPv @ 153 NONAME + _ZN15HsConfiguration11qt_metacastEPKc @ 154 NONAME + _ZN15HsConfiguration11setInstanceEPS_ @ 155 NONAME + _ZN15HsConfiguration12exportToFileERK7QString @ 156 NONAME + _ZN15HsConfiguration12takeInstanceEv @ 157 NONAME + _ZN15HsConfiguration14importFromFileERK7QString @ 158 NONAME + _ZN15HsConfiguration15propertyChangedERK7QString @ 159 NONAME + _ZN15HsConfiguration16staticMetaObjectE @ 160 NONAME DATA 16 + _ZN15HsConfiguration19getStaticMetaObjectEv @ 161 NONAME + _ZN15HsConfiguration4loadEv @ 162 NONAME + _ZN15HsConfiguration8instanceEv @ 163 NONAME + _ZN15HsConfiguration9mInstanceE @ 164 NONAME DATA 4 + _ZN15HsConfigurationC1EP7QObject @ 165 NONAME + _ZN15HsConfigurationC2EP7QObject @ 166 NONAME + _ZN15HsConfigurationD0Ev @ 167 NONAME + _ZN15HsConfigurationD1Ev @ 168 NONAME + _ZN15HsConfigurationD2Ev @ 169 NONAME + _ZN15HsPageWallpaper11qt_metacallEN11QMetaObject4CallEiPPv @ 170 NONAME + _ZN15HsPageWallpaper11qt_metacastEPKc @ 171 NONAME + _ZN15HsPageWallpaper13createTargetsERK7QString @ 172 NONAME + _ZN15HsPageWallpaper16staticMetaObjectE @ 173 NONAME DATA 16 + _ZN15HsPageWallpaper19getStaticMetaObjectEv @ 174 NONAME + _ZN15HsPageWallpaper7setPageEP6HsPage @ 175 NONAME + _ZN15HsPageWallpaperC1EP6HsPageP13QGraphicsItem @ 176 NONAME + _ZN15HsPageWallpaperC2EP6HsPageP13QGraphicsItem @ 177 NONAME + _ZN15HsPageWallpaperD0Ev @ 178 NONAME + _ZN15HsPageWallpaperD1Ev @ 179 NONAME + _ZN15HsPageWallpaperD2Ev @ 180 NONAME + _ZN16HsContentService11qt_metacallEN11QMetaObject4CallEiPPv @ 181 NONAME + _ZN16HsContentService11qt_metacastEPKc @ 182 NONAME + _ZN16HsContentService11widgetAddedERK7QStringRK5QHashIS0_8QVariantE @ 183 NONAME + _ZN16HsContentService12createWidgetERK5QHashI7QString8QVariantE @ 184 NONAME + _ZN16HsContentService13widgetRemovedERK7QStringRK5QHashIS0_8QVariantE @ 185 NONAME + _ZN16HsContentService16staticMetaObjectE @ 186 NONAME DATA 16 + _ZN16HsContentService17emitWidgetRemovedERK7QStringRK5QHashIS0_8QVariantE @ 187 NONAME + _ZN16HsContentService18widgetStartFaultedEv @ 188 NONAME + _ZN16HsContentService19getStaticMetaObjectEv @ 189 NONAME + _ZN16HsContentService22createWidgetForPreviewERK5QHashI7QString8QVariantE @ 190 NONAME + _ZN16HsContentService7widgetsERK7QStringRK5QHashIS0_8QVariantERi @ 191 NONAME + _ZN16HsContentService8instanceEv @ 192 NONAME + _ZN16HsContentService9addWidgetERK7QStringRK5QHashIS0_8QVariantERKS4_ @ 193 NONAME + _ZN16HsContentService9mInstanceE @ 194 NONAME DATA 4 + _ZN16HsContentServiceC1EP7QObject @ 195 NONAME + _ZN16HsContentServiceC2EP7QObject @ 196 NONAME + _ZN16HsContentServiceD0Ev @ 197 NONAME + _ZN16HsContentServiceD1Ev @ 198 NONAME + _ZN16HsContentServiceD2Ev @ 199 NONAME + _ZN16HsSceneWallpaper11qt_metacallEN11QMetaObject4CallEiPPv @ 200 NONAME + _ZN16HsSceneWallpaper11qt_metacastEPKc @ 201 NONAME + _ZN16HsSceneWallpaper13createTargetsERK7QString @ 202 NONAME + _ZN16HsSceneWallpaper16staticMetaObjectE @ 203 NONAME DATA 16 + _ZN16HsSceneWallpaper19getStaticMetaObjectEv @ 204 NONAME + _ZN16HsSceneWallpaper8setSceneEP7HsScene @ 205 NONAME + _ZN16HsSceneWallpaperC1EP7HsSceneP13QGraphicsItem @ 206 NONAME + _ZN16HsSceneWallpaperC2EP7HsSceneP13QGraphicsItem @ 207 NONAME + _ZN16HsSceneWallpaperD0Ev @ 208 NONAME + _ZN16HsSceneWallpaperD1Ev @ 209 NONAME + _ZN16HsSceneWallpaperD2Ev @ 210 NONAME + _ZN17HsShortcutService11qt_metacallEN11QMetaObject4CallEiPPv @ 211 NONAME + _ZN17HsShortcutService11qt_metacastEPKc @ 212 NONAME + _ZN17HsShortcutService16staticMetaObjectE @ 213 NONAME DATA 16 + _ZN17HsShortcutService19getStaticMetaObjectEv @ 214 NONAME + _ZN17HsShortcutService20isItemShortcutWidgetEi @ 215 NONAME + _ZN17HsShortcutService23executeCollectionActionEiRK7QString @ 216 NONAME + _ZN17HsShortcutService8instanceEP13QStateMachine @ 217 NONAME + _ZN17HsShortcutService9mInstanceE @ 218 NONAME DATA 4 + _ZN17HsShortcutServiceC1EP13QStateMachineP7QObject @ 219 NONAME + _ZN17HsShortcutServiceC2EP13QStateMachineP7QObject @ 220 NONAME + _ZN17HsShortcutServiceD0Ev @ 221 NONAME + _ZN17HsShortcutServiceD1Ev @ 222 NONAME + _ZN17HsShortcutServiceD2Ev @ 223 NONAME + _ZN17HsWallpaperLoader11qt_metacallEN11QMetaObject4CallEiPPv @ 224 NONAME + _ZN17HsWallpaperLoader11qt_metacastEPKc @ 225 NONAME + _ZN17HsWallpaperLoader16onThreadFinishedEv @ 226 NONAME + _ZN17HsWallpaperLoader16staticMetaObjectE @ 227 NONAME DATA 16 + _ZN17HsWallpaperLoader19getStaticMetaObjectEv @ 228 NONAME + _ZN17HsWallpaperLoader5startEv @ 229 NONAME + _ZN17HsWallpaperLoader6cancelEv @ 230 NONAME + _ZN17HsWallpaperLoader6failedEv @ 231 NONAME + _ZN17HsWallpaperLoader7cleanupEv @ 232 NONAME + _ZN17HsWallpaperLoader8finishedEv @ 233 NONAME + _ZN17HsWallpaperLoaderC1EP7QObject @ 234 NONAME + _ZN17HsWallpaperLoaderC2EP7QObject @ 235 NONAME + _ZN17HsWallpaperLoaderD0Ev @ 236 NONAME + _ZN17HsWallpaperLoaderD1Ev @ 237 NONAME + _ZN17HsWallpaperLoaderD2Ev @ 238 NONAME + _ZN17HsWidgetComponent11emitUpdatedEv @ 239 NONAME + _ZN17HsWidgetComponent11qt_metacallEN11QMetaObject4CallEiPPv @ 240 NONAME + _ZN17HsWidgetComponent11qt_metacastEPKc @ 241 NONAME + _ZN17HsWidgetComponent11unavailableEv @ 242 NONAME + _ZN17HsWidgetComponent11uninstalledEv @ 243 NONAME + _ZN17HsWidgetComponent13emitAvailableEv @ 244 NONAME + _ZN17HsWidgetComponent15emitUnavailableEv @ 245 NONAME + _ZN17HsWidgetComponent15emitUninstalledEv @ 246 NONAME + _ZN17HsWidgetComponent16aboutToUninstallEv @ 247 NONAME + _ZN17HsWidgetComponent16staticMetaObjectE @ 248 NONAME DATA 16 + _ZN17HsWidgetComponent17installTranslatorEv @ 249 NONAME + _ZN17HsWidgetComponent19getStaticMetaObjectEv @ 250 NONAME + _ZN17HsWidgetComponent19uninstallTranslatorEv @ 251 NONAME + _ZN17HsWidgetComponent20emitAboutToUninstallEv @ 252 NONAME + _ZN17HsWidgetComponent37resolveRootPathAndTranslationFilenameEv @ 253 NONAME + _ZN17HsWidgetComponent7updatedEv @ 254 NONAME + _ZN17HsWidgetComponent9availableEv @ 255 NONAME + _ZN17HsWidgetComponentC1ERK7QStringP7QObject @ 256 NONAME + _ZN17HsWidgetComponentC2ERK7QStringP7QObject @ 257 NONAME + _ZN17HsWidgetComponentD0Ev @ 258 NONAME + _ZN17HsWidgetComponentD1Ev @ 259 NONAME + _ZN17HsWidgetComponentD2Ev @ 260 NONAME + _ZN18HsWidgetHostVisual10setNewSizeERK6QSizeF @ 261 NONAME + _ZN18HsWidgetHostVisual11eventFilterEP7QObjectP6QEvent @ 262 NONAME + _ZN18HsWidgetHostVisual11qt_metacallEN11QMetaObject4CallEiPPv @ 263 NONAME + _ZN18HsWidgetHostVisual11qt_metacastEPKc @ 264 NONAME + _ZN18HsWidgetHostVisual12gestureEventEP13QGestureEvent @ 265 NONAME + _ZN18HsWidgetHostVisual12setupEffectsEv @ 266 NONAME + _ZN18HsWidgetHostVisual14setVisualModelEP12HsWidgetHost @ 267 NONAME + _ZN18HsWidgetHostVisual14setupTouchAreaEv @ 268 NONAME + _ZN18HsWidgetHostVisual15startDragEffectEv @ 269 NONAME + _ZN18HsWidgetHostVisual15startDropEffectEv @ 270 NONAME + _ZN18HsWidgetHostVisual16staticMetaObjectE @ 271 NONAME DATA 16 + _ZN18HsWidgetHostVisual19getStaticMetaObjectEv @ 272 NONAME + _ZN18HsWidgetHostVisual7resizedEv @ 273 NONAME + _ZN18HsWidgetHostVisual9setWidgetEP7QObject @ 274 NONAME + _ZN18HsWidgetHostVisualC1EP13QGraphicsItem @ 275 NONAME + _ZN18HsWidgetHostVisualC2EP13QGraphicsItem @ 276 NONAME + _ZN18HsWidgetHostVisualD0Ev @ 277 NONAME + _ZN18HsWidgetHostVisualD1Ev @ 278 NONAME + _ZN18HsWidgetHostVisualD2Ev @ 279 NONAME + _ZN21HsHostedWidgetFactory11qt_metacallEN11QMetaObject4CallEiPPv @ 280 NONAME + _ZN21HsHostedWidgetFactory11qt_metacastEPKc @ 281 NONAME + _ZN21HsHostedWidgetFactory11setInstanceEPS_ @ 282 NONAME + _ZN21HsHostedWidgetFactory12createWidgetERK7QString @ 283 NONAME + _ZN21HsHostedWidgetFactory12takeInstanceEv @ 284 NONAME + _ZN21HsHostedWidgetFactory16staticMetaObjectE @ 285 NONAME DATA 16 + _ZN21HsHostedWidgetFactory19getStaticMetaObjectEv @ 286 NONAME + _ZN21HsHostedWidgetFactory8instanceEv @ 287 NONAME + _ZN21HsHostedWidgetFactory9mInstanceE @ 288 NONAME DATA 4 + _ZN21HsHostedWidgetFactoryC1EP7QObject @ 289 NONAME + _ZN21HsHostedWidgetFactoryC2EP7QObject @ 290 NONAME + _ZN21HsHostedWidgetFactoryD0Ev @ 291 NONAME + _ZN21HsHostedWidgetFactoryD1Ev @ 292 NONAME + _ZN21HsHostedWidgetFactoryD2Ev @ 293 NONAME + _ZN23HsBackupRestoreObserver11qt_metacallEN11QMetaObject4CallEiPPv @ 294 NONAME + _ZN23HsBackupRestoreObserver11qt_metacastEPKc @ 295 NONAME + _ZN23HsBackupRestoreObserver11readyForBUREv @ 296 NONAME + _ZN23HsBackupRestoreObserver16staticMetaObjectE @ 297 NONAME DATA 16 + _ZN23HsBackupRestoreObserver19getStaticMetaObjectEv @ 298 NONAME + _ZN23HsBackupRestoreObserver20backupRestoreStartedEv @ 299 NONAME + _ZN23HsBackupRestoreObserver22backupRestoreCompletedEv @ 300 NONAME + _ZN23HsBackupRestoreObserver26event_backupRestoreStartedEv @ 301 NONAME + _ZN23HsBackupRestoreObserver28event_backupRestoreCompletedEv @ 302 NONAME + _ZN23HsBackupRestoreObserver8checkBUREv @ 303 NONAME + _ZN23HsBackupRestoreObserver8instanceEv @ 304 NONAME + _ZN23HsBackupRestoreObserver9mInstanceE @ 305 NONAME DATA 4 + _ZN23HsBackupRestoreObserverC1EP7QObject @ 306 NONAME + _ZN23HsBackupRestoreObserverC2EP7QObject @ 307 NONAME + _ZN23HsBackupRestoreObserverD0Ev @ 308 NONAME + _ZN23HsBackupRestoreObserverD1Ev @ 309 NONAME + _ZN23HsBackupRestoreObserverD2Ev @ 310 NONAME + _ZN23HsWallpaperLoaderThread11qt_metacallEN11QMetaObject4CallEiPPv @ 311 NONAME + _ZN23HsWallpaperLoaderThread11qt_metacastEPKc @ 312 NONAME + _ZN23HsWallpaperLoaderThread16staticMetaObjectE @ 313 NONAME DATA 16 + _ZN23HsWallpaperLoaderThread19getStaticMetaObjectEv @ 314 NONAME + _ZN23HsWallpaperLoaderThread3runEv @ 315 NONAME + _ZN23HsWallpaperLoaderThreadC1EP7QObject @ 316 NONAME + _ZN23HsWallpaperLoaderThreadC2EP7QObject @ 317 NONAME + _ZN23HsWallpaperLoaderThreadD0Ev @ 318 NONAME + _ZN23HsWallpaperLoaderThreadD1Ev @ 319 NONAME + _ZN23HsWallpaperLoaderThreadD2Ev @ 320 NONAME + _ZN25HsWidgetComponentRegistry11qt_metacallEN11QMetaObject4CallEiPPv @ 321 NONAME + _ZN25HsWidgetComponentRegistry11qt_metacastEPKc @ 322 NONAME + _ZN25HsWidgetComponentRegistry14onEntryChangedERK7CaEntry10ChangeType @ 323 NONAME + _ZN25HsWidgetComponentRegistry15registerServiceERK7CaEntryRK7QStringb @ 324 NONAME + _ZN25HsWidgetComponentRegistry16handleEntryAddedERK7CaEntryRK7QString @ 325 NONAME + _ZN25HsWidgetComponentRegistry16staticMetaObjectE @ 326 NONAME DATA 16 + _ZN25HsWidgetComponentRegistry18handleEntryRemovedERK7CaEntryRK7QString @ 327 NONAME + _ZN25HsWidgetComponentRegistry18handleEntryUpdatedERK7CaEntryRK7QString @ 328 NONAME + _ZN25HsWidgetComponentRegistry18uninstallComponentERK27HsWidgetComponentDescriptor @ 329 NONAME + _ZN25HsWidgetComponentRegistry19getStaticMetaObjectEv @ 330 NONAME + _ZN25HsWidgetComponentRegistry8instanceEv @ 331 NONAME + _ZN25HsWidgetComponentRegistry9componentERK7QString @ 332 NONAME + _ZN25HsWidgetComponentRegistry9mInstanceE @ 333 NONAME DATA 4 + _ZN25HsWidgetComponentRegistryC1EP7QObject @ 334 NONAME + _ZN25HsWidgetComponentRegistryC2EP7QObject @ 335 NONAME + _ZN25HsWidgetComponentRegistryD0Ev @ 336 NONAME + _ZN25HsWidgetComponentRegistryD1Ev @ 337 NONAME + _ZN25HsWidgetComponentRegistryD2Ev @ 338 NONAME + _ZN27HsWidgetComponentDescriptor7isValidEv @ 339 NONAME + _ZN5HsGui11orientationEv @ 340 NONAME + _ZN5HsGui11qt_metacallEN11QMetaObject4CallEiPPv @ 341 NONAME + _ZN5HsGui11qt_metacastEPKc @ 342 NONAME + _ZN5HsGui11setInstanceEPS_ @ 343 NONAME + _ZN5HsGui11setupIdleUiEv @ 344 NONAME + _ZN5HsGui12takeInstanceEv @ 345 NONAME + _ZN5HsGui13cleanupIdleUiEv @ 346 NONAME + _ZN5HsGui14setOrientationEN2Qt11OrientationE @ 347 NONAME + _ZN5HsGui16staticMetaObjectE @ 348 NONAME DATA 16 + _ZN5HsGui18orientationChangedEN2Qt11OrientationE @ 349 NONAME + _ZN5HsGui19getStaticMetaObjectEv @ 350 NONAME + _ZN5HsGui19pageChangeAnimationEv @ 351 NONAME + _ZN5HsGui20navigateToApplibraryEv @ 352 NONAME + _ZN5HsGui21pageCrawlingAnimationEv @ 353 NONAME + _ZN5HsGui4showEv @ 354 NONAME + _ZN5HsGui8instanceEv @ 355 NONAME + _ZN5HsGui9mInstanceE @ 356 NONAME DATA 4 + _ZN5HsGuiC1EP7QObject @ 357 NONAME + _ZN5HsGuiC2EP7QObject @ 358 NONAME + _ZN5HsGuiD0Ev @ 359 NONAME + _ZN5HsGuiD1Ev @ 360 NONAME + _ZN5HsGuiD2Ev @ 361 NONAME + _ZN6HsPage10newWidgetsEv @ 362 NONAME + _ZN6HsPage11contentRectEN2Qt11OrientationE @ 363 NONAME + _ZN6HsPage11contentRectEv @ 364 NONAME + _ZN6HsPage11hideWidgetsEv @ 365 NONAME + _ZN6HsPage11qt_metacallEN11QMetaObject4CallEiPPv @ 366 NONAME + _ZN6HsPage11qt_metacastEPKc @ 367 NONAME + _ZN6HsPage11showWidgetsEv @ 368 NONAME + _ZN6HsPage12addNewWidgetEP12HsWidgetHostRK7QPointF @ 369 NONAME + _ZN6HsPage12removeWidgetEP12HsWidgetHost @ 370 NONAME + _ZN6HsPage12setRemovableEb @ 371 NONAME + _ZN6HsPage13connectWidgetEP12HsWidgetHost @ 372 NONAME + _ZN6HsPage13setDatabaseIdEi @ 373 NONAME + _ZN6HsPage13updateZValuesEv @ 374 NONAME + _ZN6HsPage14createInstanceERK10HsPageData @ 375 NONAME + _ZN6HsPage15contentGeometryEN2Qt11OrientationE @ 376 NONAME + _ZN6HsPage15contentGeometryEv @ 377 NONAME + _ZN6HsPage15onWidgetFaultedEv @ 378 NONAME + _ZN6HsPage15onWidgetResizedEv @ 379 NONAME + _ZN6HsPage15resetNewWidgetsEv @ 380 NONAME + _ZN6HsPage16disconnectWidgetEP12HsWidgetHost @ 381 NONAME + _ZN6HsPage16layoutNewWidgetsEv @ 382 NONAME + _ZN6HsPage16onWidgetFinishedEv @ 383 NONAME + _ZN6HsPage16staticMetaObjectE @ 384 NONAME DATA 16 + _ZN6HsPage17addExistingWidgetEP12HsWidgetHost @ 385 NONAME + _ZN6HsPage17onWidgetAvailableEv @ 386 NONAME + _ZN6HsPage18deleteFromDatabaseEv @ 387 NONAME + _ZN6HsPage19getStaticMetaObjectEv @ 388 NONAME + _ZN6HsPage19onPageMarginChangedERK7QString @ 389 NONAME + _ZN6HsPage19onWidgetUnavailableEv @ 390 NONAME + _ZN6HsPage20onOrientationChangedEN2Qt11OrientationE @ 391 NONAME + _ZN6HsPage22adjustedWidgetPositionERK6QRectF @ 392 NONAME + _ZN6HsPage4loadEv @ 393 NONAME + _ZN6HsPage9pageIndexEv @ 394 NONAME + _ZN6HsPage9setOnlineEb @ 395 NONAME + _ZN6HsPageC1EP7QObject @ 396 NONAME + _ZN6HsPageC2EP7QObject @ 397 NONAME + _ZN6HsPageD0Ev @ 398 NONAME + _ZN6HsPageD1Ev @ 399 NONAME + _ZN6HsPageD2Ev @ 400 NONAME + _ZN7HsScene10removePageEP6HsPage @ 401 NONAME + _ZN7HsScene11eventFilterEP7QObjectP6QEvent @ 402 NONAME + _ZN7HsScene11qt_metacallEN11QMetaObject4CallEiPPv @ 403 NONAME + _ZN7HsScene11qt_metacastEPKc @ 404 NONAME + _ZN7HsScene11setInstanceEPS_ @ 405 NONAME + _ZN7HsScene12takeInstanceEv @ 406 NONAME + _ZN7HsScene13setActivePageEP6HsPage @ 407 NONAME + _ZN7HsScene14pagePanStartedEP13QGestureEvent @ 408 NONAME + _ZN7HsScene14pagePanUpdatedEP13QGestureEvent @ 409 NONAME + _ZN7HsScene15pagePanFinishedEP13QGestureEvent @ 410 NONAME + _ZN7HsScene15setActiveWidgetEP12HsWidgetHost @ 411 NONAME + _ZN7HsScene16staticMetaObjectE @ 412 NONAME DATA 16 + _ZN7HsScene16widgetTapStartedEP12HsWidgetHost @ 413 NONAME + _ZN7HsScene17activePageChangedEv @ 414 NONAME + _ZN7HsScene17widgetMoveUpdatedERK7QPointFP12HsWidgetHost @ 415 NONAME + _ZN7HsScene18setActivePageIndexEi @ 416 NONAME + _ZN7HsScene18widgetMoveFinishedERK7QPointFP12HsWidgetHost @ 417 NONAME + _ZN7HsScene19getStaticMetaObjectEv @ 418 NONAME + _ZN7HsScene22pageTapAndHoldFinishedEP13QGestureEvent @ 419 NONAME + _ZN7HsScene24widgetTapAndHoldFinishedEP13QGestureEventP12HsWidgetHost @ 420 NONAME + _ZN7HsScene4loadEv @ 421 NONAME + _ZN7HsScene7addPageEP6HsPage @ 422 NONAME + _ZN7HsScene8instanceEv @ 423 NONAME + _ZN7HsScene9mInstanceE @ 424 NONAME DATA 4 + _ZN7HsScene9setOnlineEb @ 425 NONAME + _ZN7HsSceneC1EP7QObject @ 426 NONAME + _ZN7HsSceneC2EP7QObject @ 427 NONAME + _ZN7HsSceneD0Ev @ 428 NONAME + _ZN7HsSceneD1Ev @ 429 NONAME + _ZN7HsSceneD2Ev @ 430 NONAME + _ZNK10HsDatabase10metaObjectEv @ 431 NONAME + _ZNK10HsDatabase12databaseNameEv @ 432 NONAME + _ZNK10HsDatabase14connectionNameEv @ 433 NONAME + _ZNK10HsDatabase15checkConnectionEv @ 434 NONAME + _ZNK11HsWallpaper10metaObjectEv @ 435 NONAME + _ZNK11HsWallpaper13rootDirectoryEv @ 436 NONAME + _ZNK12HsIdleWidget10metaObjectEv @ 437 NONAME + _ZNK12HsIdleWidget14parallaxFactorEv @ 438 NONAME + _ZNK12HsIdleWidget6sceneXEv @ 439 NONAME + _ZNK12HsPageVisual10metaObjectEv @ 440 NONAME + _ZNK12HsWidgetHost10databaseIdEv @ 441 NONAME + _ZNK12HsWidgetHost10metaObjectEv @ 442 NONAME + _ZNK12HsWidgetHost4pageEv @ 443 NONAME + _ZNK12HsWidgetHost6visualEv @ 444 NONAME + _ZNK15HsConfiguration10metaObjectEv @ 445 NONAME + _ZNK15HsConfiguration24maximumWidgetSizeInUnitsEv @ 446 NONAME + _ZNK15HsConfiguration24minimumWidgetSizeInUnitsEv @ 447 NONAME + _ZNK15HsConfiguration25maximumWidgetSizeInPixelsEv @ 448 NONAME + _ZNK15HsConfiguration25minimumWidgetSizeInPixelsEv @ 449 NONAME + _ZNK15HsPageWallpaper10metaObjectEv @ 450 NONAME + _ZNK15HsPageWallpaper18wallpaperDirectoryEv @ 451 NONAME + _ZNK16HsContentService10metaObjectEv @ 452 NONAME + _ZNK16HsSceneWallpaper10metaObjectEv @ 453 NONAME + _ZNK16HsSceneWallpaper18wallpaperDirectoryEv @ 454 NONAME + _ZNK17HsShortcutService10metaObjectEv @ 455 NONAME + _ZNK17HsWallpaperLoader10metaObjectEv @ 456 NONAME + _ZNK17HsWidgetComponent10metaObjectEv @ 457 NONAME + _ZNK17HsWidgetComponent11isAvailableEv @ 458 NONAME + _ZNK17HsWidgetComponent3uriEv @ 459 NONAME + _ZNK17HsWidgetComponent8rootPathEv @ 460 NONAME + _ZNK18HsWidgetHostVisual10metaObjectEv @ 461 NONAME + _ZNK18HsWidgetHostVisual11visualModelEv @ 462 NONAME + _ZNK18HsWidgetHostVisual5shapeEv @ 463 NONAME + _ZNK21HsHostedWidgetFactory10metaObjectEv @ 464 NONAME + _ZNK23HsBackupRestoreObserver10metaObjectEv @ 465 NONAME + _ZNK23HsWallpaperLoaderThread10metaObjectEv @ 466 NONAME + _ZNK25HsWidgetComponentRegistry10metaObjectEv @ 467 NONAME + _ZNK5HsGui10idleWidgetEv @ 468 NONAME + _ZNK5HsGui10layoutRectEv @ 469 NONAME + _ZNK5HsGui10metaObjectEv @ 470 NONAME + _ZNK5HsGui8idleViewEv @ 471 NONAME + _ZNK6HsPage10databaseIdEv @ 472 NONAME + _ZNK6HsPage10metaObjectEv @ 473 NONAME + _ZNK6HsPage11isRemovableEv @ 474 NONAME + _ZNK6HsPage12isActivePageEv @ 475 NONAME + _ZNK6HsPage13isDefaultPageEv @ 476 NONAME + _ZNK6HsPage6visualEv @ 477 NONAME + _ZNK6HsPage7widgetsEv @ 478 NONAME + _ZNK6HsPage9wallpaperEv @ 479 NONAME + _ZNK7HsScene10activePageEv @ 480 NONAME + _ZNK7HsScene10databaseIdEv @ 481 NONAME + _ZNK7HsScene10metaObjectEv @ 482 NONAME + _ZNK7HsScene12activeWidgetEv @ 483 NONAME + _ZNK7HsScene15activePageIndexEv @ 484 NONAME + _ZNK7HsScene5pagesEv @ 485 NONAME + _ZNK7HsScene8isOnlineEv @ 486 NONAME + _ZNK7HsScene9wallpaperEv @ 487 NONAME + _ZTI10HsDatabase @ 488 NONAME + _ZTI11HsWallpaper @ 489 NONAME + _ZTI12HsIdleWidget @ 490 NONAME + _ZTI12HsPageVisual @ 491 NONAME + _ZTI12HsWidgetHost @ 492 NONAME + _ZTI15HsConfiguration @ 493 NONAME + _ZTI15HsPageWallpaper @ 494 NONAME + _ZTI16HsContentService @ 495 NONAME + _ZTI16HsSceneWallpaper @ 496 NONAME + _ZTI17HsShortcutService @ 497 NONAME + _ZTI17HsWallpaperLoader @ 498 NONAME + _ZTI17HsWidgetComponent @ 499 NONAME + _ZTI18HsWidgetHostVisual @ 500 NONAME + _ZTI21HsHostedWidgetFactory @ 501 NONAME + _ZTI23HsBackupRestoreObserver @ 502 NONAME + _ZTI23HsWallpaperLoaderThread @ 503 NONAME + _ZTI25HsWidgetComponentRegistry @ 504 NONAME + _ZTI5HsGui @ 505 NONAME + _ZTI6HsPage @ 506 NONAME + _ZTI7HsScene @ 507 NONAME + _ZTV10HsDatabase @ 508 NONAME + _ZTV11HsWallpaper @ 509 NONAME + _ZTV12HsIdleWidget @ 510 NONAME + _ZTV12HsPageVisual @ 511 NONAME + _ZTV12HsWidgetHost @ 512 NONAME + _ZTV15HsConfiguration @ 513 NONAME + _ZTV15HsPageWallpaper @ 514 NONAME + _ZTV16HsContentService @ 515 NONAME + _ZTV16HsSceneWallpaper @ 516 NONAME + _ZTV17HsShortcutService @ 517 NONAME + _ZTV17HsWallpaperLoader @ 518 NONAME + _ZTV17HsWidgetComponent @ 519 NONAME + _ZTV18HsWidgetHostVisual @ 520 NONAME + _ZTV21HsHostedWidgetFactory @ 521 NONAME + _ZTV23HsBackupRestoreObserver @ 522 NONAME + _ZTV23HsWallpaperLoaderThread @ 523 NONAME + _ZTV25HsWidgetComponentRegistry @ 524 NONAME + _ZTV5HsGui @ 525 NONAME + _ZTV6HsPage @ 526 NONAME + _ZTV7HsScene @ 527 NONAME + _ZThn16_N11HsWallpaperD0Ev @ 528 NONAME + _ZThn16_N11HsWallpaperD1Ev @ 529 NONAME + _ZThn16_N12HsIdleWidget11setGeometryERK6QRectF @ 530 NONAME + _ZThn16_N12HsIdleWidgetD0Ev @ 531 NONAME + _ZThn16_N12HsIdleWidgetD1Ev @ 532 NONAME + _ZThn16_N12HsPageVisual11setGeometryERK6QRectF @ 533 NONAME + _ZThn16_N12HsPageVisualD0Ev @ 534 NONAME + _ZThn16_N12HsPageVisualD1Ev @ 535 NONAME + _ZThn16_N15HsPageWallpaperD0Ev @ 536 NONAME + _ZThn16_N15HsPageWallpaperD1Ev @ 537 NONAME + _ZThn16_N16HsSceneWallpaperD0Ev @ 538 NONAME + _ZThn16_N16HsSceneWallpaperD1Ev @ 539 NONAME + _ZThn16_N18HsWidgetHostVisualD0Ev @ 540 NONAME + _ZThn16_N18HsWidgetHostVisualD1Ev @ 541 NONAME + _ZThn8_N11HsWallpaperD0Ev @ 542 NONAME + _ZThn8_N11HsWallpaperD1Ev @ 543 NONAME + _ZThn8_N12HsIdleWidgetD0Ev @ 544 NONAME + _ZThn8_N12HsIdleWidgetD1Ev @ 545 NONAME + _ZThn8_N12HsPageVisualD0Ev @ 546 NONAME + _ZThn8_N12HsPageVisualD1Ev @ 547 NONAME + _ZThn8_N15HsPageWallpaperD0Ev @ 548 NONAME + _ZThn8_N15HsPageWallpaperD1Ev @ 549 NONAME + _ZThn8_N16HsSceneWallpaperD0Ev @ 550 NONAME + _ZThn8_N16HsSceneWallpaperD1Ev @ 551 NONAME + _ZThn8_N18HsWidgetHostVisualD0Ev @ 552 NONAME + _ZThn8_N18HsWidgetHostVisualD1Ev @ 553 NONAME + _ZThn8_NK18HsWidgetHostVisual5shapeEv @ 554 NONAME +
--- a/homescreenapp/hsdomainmodel/inc/hsconfiguration.h Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/hsdomainmodel/inc/hsconfiguration.h Wed Aug 18 10:33:57 2010 +0300 @@ -38,8 +38,6 @@ { Q_OBJECT Q_PROPERTY(int bounceEffect READ bounceEffect WRITE setBounceEffect) - Q_PROPERTY(int widgetTapAndHoldTimeout READ widgetTapAndHoldTimeout WRITE setWidgetTapAndHoldTimeout) - Q_PROPERTY(int sceneTapAndHoldTimeout READ sceneTapAndHoldTimeout WRITE setSceneTapAndHoldTimeout) Q_PROPERTY(int pageChangeAnimationDuration READ pageChangeAnimationDuration WRITE setPageChangeAnimationDuration) Q_PROPERTY(int pageChangeZoneAnimationDuration READ pageChangeZoneAnimationDuration WRITE setPageChangeZoneAnimationDuration) Q_PROPERTY(int pageChangeZoneReverseAnimationDuration READ pageChangeZoneReverseAnimationDuration WRITE setPageChangeZoneReverseAnimationDuration) @@ -51,8 +49,6 @@ 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) - Q_PROPERTY(qreal tapAndHoldDistance READ tapAndHoldDistance WRITE setTapAndHoldDistance) Q_PROPERTY(qreal pageChangeZoneWidth READ pageChangeZoneWidth WRITE setPageChangeZoneWidth) Q_PROPERTY(qreal pageIndicatorSpacing READ pageIndicatorSpacing WRITE setPageIndicatorSpacing) Q_PROPERTY(qreal maximumWidgetHeight READ maximumWidgetHeight WRITE setMaximumWidgetHeight) @@ -102,10 +98,6 @@ int bounceEffect() const { return mBounceEffect; } void setBounceEffect(int value) { SETVALUE(mBounceEffect, "bounceEffect") } - int widgetTapAndHoldTimeout() const { return mWidgetTapAndHoldTimeout; } - void setWidgetTapAndHoldTimeout(int value) { SETVALUE(mWidgetTapAndHoldTimeout, "widgetTapAndHoldTimeout") } - int sceneTapAndHoldTimeout() const { return mSceneTapAndHoldTimeout; } - void setSceneTapAndHoldTimeout(int value) { SETVALUE(mSceneTapAndHoldTimeout, "sceneTapAndHoldTimeout") } int pageChangeAnimationDuration() const { return mPageChangeAnimationDuration; } void setPageChangeAnimationDuration(int value) { SETVALUE(mPageChangeAnimationDuration, "pageChangeAnimationDuration") } int pageChangeZoneAnimationDuration() const { return mPageChangeZoneAnimationDuration; } @@ -128,10 +120,6 @@ void setShortcutLabelVisible(bool value) { SETVALUE(mIsShortcutLabelVisible, "isShortcutLabelVisible") } qreal bounceFeedbackEffectDistance() const { return mBounceFeedbackEffectDistance; } void setBounceFeedbackEffectDistance(qreal value) { SETVALUE(mBounceFeedbackEffectDistance, "bounceFeedbackEffectDistance") } - qreal pageChangePanDistanceInPixels() const { return mPageChangePanDistanceInPixels; } - void setPageChangePanDistanceInPixels(qreal value) { SETVALUE(mPageChangePanDistanceInPixels, "pageChangePanDistanceInPixels") } - qreal tapAndHoldDistance() const { return mTapAndHoldDistance; } - void setTapAndHoldDistance(qreal value) { SETVALUE(mTapAndHoldDistance, "tapAndHoldDistance") } qreal pageChangeZoneWidth() const { return mPageChangeZoneWidth; } void setPageChangeZoneWidth(qreal value) { SETVALUE(mPageChangeZoneWidth, "pageChangeZoneWidth") } qreal pageIndicatorSpacing() const { return mPageIndicatorSpacing; } @@ -212,8 +200,6 @@ private: int mBounceEffect; - int mWidgetTapAndHoldTimeout; - int mSceneTapAndHoldTimeout; int mPageChangeAnimationDuration; int mPageChangeZoneAnimationDuration; int mPageChangeZoneReverseAnimationDuration; @@ -225,8 +211,6 @@ int mMaximumPageCount; bool mIsShortcutLabelVisible; qreal mBounceFeedbackEffectDistance; - qreal mPageChangePanDistanceInPixels; - qreal mTapAndHoldDistance; qreal mPageChangeZoneWidth; qreal mPageIndicatorSpacing; qreal mMaximumWidgetHeight;
--- a/homescreenapp/hsdomainmodel/inc/hsdatabase.h Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/hsdomainmodel/inc/hsdatabase.h Wed Aug 18 10:33:57 2010 +0300 @@ -80,6 +80,8 @@ bool configuration(QVariantHash &configuration); + bool updateWidgetZValues(const QHash<int, qreal> &data, Qt::Orientation orientation); + public: static void setInstance(HsDatabase *instance); static HsDatabase *instance();
--- a/homescreenapp/hsdomainmodel/src/hsconfiguration.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/hsdomainmodel/src/hsconfiguration.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -37,44 +37,40 @@ HsConfiguration::HsConfiguration(QObject *parent) : QObject(parent), mBounceEffect(20), - mWidgetTapAndHoldTimeout(500), - mSceneTapAndHoldTimeout(500), - mPageChangeAnimationDuration(200), - mPageChangeZoneAnimationDuration(800), + mPageChangeAnimationDuration(300), + mPageChangeZoneAnimationDuration(600), mPageChangeZoneReverseAnimationDuration(200), - mPageRemovedAnimationDuration(200), - mNewPageAddedAnimationDuration(200), - mWidgetDragEffectDuration(200), - mWidgetDropEffectDuration(200), - mDefaultPageId(1), + mPageRemovedAnimationDuration(1000), + mNewPageAddedAnimationDuration(1000), + mWidgetDragEffectDuration(250), + mWidgetDropEffectDuration(200), + mDefaultPageId(1), mMaximumPageCount(8), mIsShortcutLabelVisible(true), mBounceFeedbackEffectDistance(3), - mPageChangePanDistanceInPixels(120), - mTapAndHoldDistance(16), - mPageChangeZoneWidth(60), + mPageChangeZoneWidth(30), mPageIndicatorSpacing(8), mMaximumWidgetHeight(39), mMaximumWidgetWidth(48), mMinimumWidgetHeight(8.75), mMinimumWidgetWidth(8.75), - mPageChangePanDistance(17.91), + mPageChangePanDistance(120), mPageChangeFeedbackEffect(HbFeedback::Sensitive), mWidgetPickFeedbackEffect(HbFeedback::ItemPick), - mWidgetDropFeedbackEffect(HbFeedback::ItemDrop), - mWidgetRepositionFeedbackEffect(HbFeedback::BounceEffect), - mWidgetOverTrashbinFeedbackEffect(HbFeedback::ItemMoveOver), - mWidgetDropToTrashbinFeedbackEffect(HbFeedback::ItemDrop), + mWidgetDropFeedbackEffect(HbFeedback::ItemDrop), + mWidgetRepositionFeedbackEffect(HbFeedback::BounceEffect), + mWidgetOverTrashbinFeedbackEffect(HbFeedback::ItemMoveOver), + mWidgetDropToTrashbinFeedbackEffect(HbFeedback::ItemDrop), mShortcutWidgetTapFeedbackEffect(HbFeedback::BasicItem), mWidgetMoveBlockedFeedbackEffect(HbFeedback::Basic), mClockWidgetTapFeedbackEffect(HbFeedback::BasicItem), mWidgetSnappingFeedbackEffect(HbFeedback::ItemMoveOver), mIsSnapEnabled(true), - mSnapTimeout(100), + mSnapTimeout(300), mSnapForce(30), mSnapGap(6), mPageMargin(0), - mSnapLineFadeInDuration(200), + mSnapLineFadeInDuration(100), mSnapLineFadeOutDuration(100), mIsSnapEffectsEnabled(true), mSceneType(PageWallpapers),
--- a/homescreenapp/hsdomainmodel/src/hscontentservice.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/hsdomainmodel/src/hscontentservice.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -55,9 +55,9 @@ */ bool HsContentService::createWidget(const QVariantHash ¶ms) { - return addWidget(params.value(URI).toString(), - params.value(PREFERENCES).toHash(), - params.value(HOMESCREENDATA)); + return addWidget(params.value(Hs::uri).toString(), + params.value(Hs::preferences).toHash(), + params.value(Hs::homescreenData)); } // This method will be removed. @@ -67,10 +67,10 @@ HsWidgetHost *HsContentService::createWidgetForPreview(const QVariantHash ¶ms) { HsWidgetData widgetData; - widgetData.uri = params.value(URI).toString(); + widgetData.uri = params.value(Hs::uri).toString(); return HsWidgetHost::createInstance( - widgetData, params.value(PREFERENCES).toHash()); + widgetData, params.value(Hs::preferences).toHash()); } #ifdef COVERAGE_MEASUREMENT #pragma CTC ENDSKIP
--- a/homescreenapp/hsdomainmodel/src/hsdatabase.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/hsdomainmodel/src/hsdatabase.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -31,7 +31,7 @@ QVariantList toVariantList(const QList<T> &list) { QVariantList vlist; - for (int i=0; i<list.count(); ++i) { + for (int i = 0; i < list.count(); ++i) { T item = list.at(i); vlist << item; } @@ -813,6 +813,36 @@ return false; } +bool HsDatabase::updateWidgetZValues(const QHash<int, qreal> &data, Qt::Orientation orientation) +{ + if (!checkConnection()) { + return false; + } + + QString key = orientation == Qt::Vertical ? + QLatin1String("portrait") : QLatin1String("landscape"); + + QSqlQuery query(QSqlDatabase::database(mConnectionName)); + + QString statement = + "UPDATE WidgetPresentations " + "SET zValue = ? " + "WHERE key = ? AND widgetId = ?"; + + if (query.prepare(statement)) { + query.addBindValue(toVariantList(data.values())); + query.addBindValue(toVariantList(key, data.count())); + query.addBindValue(toVariantList(data.keys())); + if (!query.execBatch()) { + return false; + } + } else { + return false; + } + + return true; +} + /*! Sets the database instance. The existing instance will be deleted.
--- a/homescreenapp/hsdomainmodel/src/hsgui.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/hsdomainmodel/src/hsgui.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -127,6 +127,9 @@ delete mImpl->mPageCrawlingAnimation; mImpl->mPageCrawlingAnimation = 0; + // This gets deleted when mImpl->mIdleView is deleted + // so just nullify. + mImpl->mIdleWidget = 0; } }
--- a/homescreenapp/hsdomainmodel/src/hsidlewidget.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/hsdomainmodel/src/hsidlewidget.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -278,8 +278,8 @@ void HsIdleWidget::showVerticalSnapLine(const QLineF &snapLine) { QVariantHash snapConfiguration; - snapConfiguration[SNAPLINEFADEINDURATION] = QString::number(HSCONFIGURATION_GET(snapLineFadeInDuration)); - snapConfiguration[SNAPLINEFADEOUTDURATION] = QString::number(HSCONFIGURATION_GET(snapLineFadeOutDuration)); + snapConfiguration[Hs::snapLineFadeinDuration] = QString::number(HSCONFIGURATION_GET(snapLineFadeInDuration)); + snapConfiguration[Hs::snapLineFadeoutDuration] = QString::number(HSCONFIGURATION_GET(snapLineFadeOutDuration)); mVerticalSnapLine->setConfiguration(snapConfiguration); mVerticalSnapLine->showLine(snapLine); @@ -291,8 +291,8 @@ void HsIdleWidget::showHorizontalSnapLine(const QLineF &snapLine) { QVariantHash snapConfiguration; - snapConfiguration[SNAPLINEFADEINDURATION] = QString::number(HSCONFIGURATION_GET(snapLineFadeInDuration)); - snapConfiguration[SNAPLINEFADEOUTDURATION] = QString::number(HSCONFIGURATION_GET(snapLineFadeOutDuration)); + snapConfiguration[Hs::snapLineFadeinDuration] = QString::number(HSCONFIGURATION_GET(snapLineFadeInDuration)); + snapConfiguration[Hs::snapLineFadeoutDuration] = QString::number(HSCONFIGURATION_GET(snapLineFadeOutDuration)); mHorizontalSnapLine->setConfiguration(snapConfiguration); mHorizontalSnapLine->showLine(snapLine);
--- a/homescreenapp/hsdomainmodel/src/hspage.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/hsdomainmodel/src/hspage.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -15,6 +15,8 @@ * */ +#include <QHash> + #include <HbInstance> #include "hsdomainmodeldatastructures.h" @@ -498,6 +500,8 @@ { int z = 0; + QHash<int, qreal> widgetZValues; + if (!mWidgets.isEmpty()) { QMultiMap<qreal, HsWidgetHost *> map; foreach (HsWidgetHost *widget, mWidgets) { @@ -513,17 +517,22 @@ } foreach (HsWidgetHost *widget, sortedWidgets) { + widgetZValues.insert(widget->databaseId(), z); widget->visual()->setZValue(z++); - widget->savePresentation(); } } if (!mNewWidgets.isEmpty()) { foreach (HsWidgetHost *widget, mNewWidgets) { + widgetZValues.insert(widget->databaseId(), z); widget->visual()->setZValue(z++); - widget->savePresentation(); } } + + if (!widgetZValues.isEmpty()) { + HsDatabase::instance()->updateWidgetZValues( + widgetZValues, HsGui::instance()->orientation()); + } } /*! Return this page's index. @@ -559,6 +568,7 @@ widget->visual()->disconnect(this); widget->disconnect(this); } + /*! Disconnect and remove widget */ @@ -577,12 +587,11 @@ if (visual->scene()) { visual->scene()->removeItem(visual); } + disconnectWidget(widget); + widget->remove(); } - +} - disconnectWidget(widget); - widget->remove(); -} /*! Remove widget if it faulted */
--- a/homescreenapp/hsdomainmodel/src/hspagenewwidgetlayout.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/hsdomainmodel/src/hspagenewwidgetlayout.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -210,4 +210,5 @@ } return tmpWidgets; } -#endif // HSWIDGETORGANIZER_ALGORITHM \ No newline at end of file +#endif // HSWIDGETORGANIZER_ALGORITHM +
--- a/homescreenapp/hsdomainmodel/src/hswallpaper.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/hsdomainmodel/src/hswallpaper.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -260,10 +260,17 @@ { QVariantHash targets; + QString targetSuffix("png"); + + // Qt doesn't support writing GIFs, so let's save those and everything else but JPGs as PNGs + if (QFileInfo(sourcePath).suffix().toUpper() == "JPG" ) { + targetSuffix = QString("jpg"); + } + QString path = wallpaperDirectory() + QString("temp%1_").arg(mId) + QString("%1.") - + QFileInfo(sourcePath).suffix(); + + targetSuffix; targets.insert(path.arg("portrait"), QSize((2 * 360) + HSCONFIGURATION_GET(bounceEffect), 640)); targets.insert(path.arg("landscape"), QSize((2 * 640) + HSCONFIGURATION_GET(bounceEffect), 360)); @@ -318,10 +325,17 @@ { QVariantHash targets; + QString targetSuffix("png"); + + // Qt doesn't support writing GIFs, so let's save those and everything else but JPGs as PNGs + if (QFileInfo(sourcePath).suffix().toUpper() == "JPG" ) { + targetSuffix = QString("jpg"); + } + QString path = wallpaperDirectory() + QString("temp%1_").arg(mId) + QString("%1.") - + QFileInfo(sourcePath).suffix(); + + targetSuffix; targets.insert(path.arg("portrait"), QSize(360, 640)); targets.insert(path.arg("landscape"), QSize(640, 360));
--- a/homescreenapp/hsdomainmodel/src/hswidgetcomponent.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/hsdomainmodel/src/hswidgetcomponent.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -123,19 +123,19 @@ void HsWidgetComponent::resolveRootPathAndTranslationFilename() { CaQuery query; - query.setEntryTypeNames(QStringList(widgetTypeName())); - query.setAttribute(widgetUriAttributeName(), mUri); + query.setEntryTypeNames(QStringList(Hs::widgetTypeName)); + query.setAttribute(Hs::widgetUriAttributeName, mUri); QList< QSharedPointer<CaEntry> > widgetEntries = CaService::instance()->getEntries(query); if (widgetEntries.isEmpty()) { return; } QSharedPointer<CaEntry> entry = widgetEntries.first(); - mRootPath = entry->attribute(widgetPathAttributeName()); + mRootPath = entry->attribute(Hs::widgetPathAttributeName); if (mRootPath.isEmpty() || !QDir(mRootPath).exists()) { mState = Unavailable; } else { - mTranslationFilename = entry->attribute(translationFilename()); + mTranslationFilename = entry->attribute(Hs::translationFilename); } }
--- a/homescreenapp/hsdomainmodel/src/hswidgetcomponentregistry.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/hsdomainmodel/src/hswidgetcomponentregistry.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -106,7 +106,7 @@ qRegisterMetaType<HsWidgetComponentDescriptor>("HsWidgetComponentDescriptor"); CaQuery query; - query.setEntryTypeNames(QStringList(widgetTypeName())); + query.setEntryTypeNames(QStringList(Hs::widgetTypeName)); CaNotifierFilter filter(query); CaNotifier *notifier = CaService::instance()->createNotifier(filter); notifier->setParent(this); @@ -143,7 +143,7 @@ } } else { // uninstalled - QString rootPath = entry.attribute(widgetPathAttributeName()); + QString rootPath = entry.attribute(Hs::widgetPathAttributeName); mServiceManager.removeService(uri); QCoreApplication::removeLibraryPath(rootPath); if (component) { @@ -176,7 +176,7 @@ */ void HsWidgetComponentRegistry::registerService(const CaEntry &entry, const QString& uri, bool reset) { - QString path = entry.attribute(widgetPathAttributeName()); + QString path = entry.attribute(Hs::widgetPathAttributeName); QString serviceXml = entry.attribute("widget:servicexml"); if (!path.isEmpty() && !serviceXml.isEmpty()) { QString service = QDir::toNativeSeparators(path + "/" + serviceXml); @@ -194,7 +194,7 @@ */ void HsWidgetComponentRegistry::onEntryChanged(const CaEntry &entry, ChangeType changeType) { - QString uri = entry.attribute(widgetUriAttributeName()); + QString uri = entry.attribute(Hs::widgetUriAttributeName); switch (changeType) { case AddChangeType: handleEntryAdded(entry,uri);
--- a/homescreenapp/hsdomainmodel/src/hswidgethost.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/hsdomainmodel/src/hswidgethost.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -55,8 +55,8 @@ */ HsWidgetHost::HsWidgetHost(int databaseId, QObject *parent) : QObject(parent), + mDatabaseId(databaseId), mVisual(new HsWidgetHostVisual), - mDatabaseId(databaseId), mStateMachine(0), mWidget(0), mPage(0),
--- a/homescreenapp/hsmenuclientplugin/src/hsmenuclient.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/hsmenuclientplugin/src/hsmenuclient.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -139,7 +139,7 @@ else if ((pref.contains(hsItemName) || pref.contains(hsItemLocName)) && pref.contains(hsitemLaunchUri) && pref.contains(hsitemPublisherId)) { CaEntry add_entry(ItemEntryRole); - add_entry.setEntryTypeName(templatedApplicationTypeName()); + add_entry.setEntryTypeName(Hs::templatedApplicationTypeName); // mandatory values if(pref.contains(hsItemLocName)) { @@ -206,7 +206,7 @@ // define query query.setFlagsOn(VisibleEntryFlag); query.setEntryRoles(ItemEntryRole); - query.setEntryTypeNames(QStringList(templatedApplicationTypeName())); + query.setEntryTypeNames(QStringList(Hs::templatedApplicationTypeName)); // add atributes to caquery
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsutils/bwins/hsutilsu.def Wed Aug 18 10:33:57 2010 +0300 @@ -0,0 +1,277 @@ +EXPORTS + ?trUtf8@HsSnapLine@@SA?AVQString@@PBD0@Z @ 1 NONAME ; class QString HsSnapLine::trUtf8(char const *, char const *) + ?createOpenAppLibraryEvent@HsMenuEventFactory@@SAPAVQEvent@@W4HsMenuMode@Hs@@VQVariant@@@Z @ 2 NONAME ; class QEvent * HsMenuEventFactory::createOpenAppLibraryEvent(enum Hs::HsMenuMode, class QVariant) + ?instance@HsWidgetPositioningOnWidgetAdd@@SAPAV1@XZ @ 3 NONAME ; class HsWidgetPositioningOnWidgetAdd * HsWidgetPositioningOnWidgetAdd::instance(void) + ?trUtf8@HsTitleResolver@@SA?AVQString@@PBD0@Z @ 4 NONAME ; class QString HsTitleResolver::trUtf8(char const *, char const *) + ?convert@HsAnchorPointInBottomRight@@UAE?AV?$QList@VQRectF@@@@ABVQRectF@@ABV2@1ABVQPointF@@@Z @ 5 NONAME ; class QList<class QRectF> HsAnchorPointInBottomRight::convert(class QRectF const &, class QList<class QRectF> const &, class QList<class QRectF> const &, class QPointF const &) + ?tr@HsTitleResolver@@SA?AVQString@@PBD0@Z @ 6 NONAME ; class QString HsTitleResolver::tr(char const *, char const *) + ?setEasingCurve@HsPropertyAnimationWrapper@@QAEXABVQEasingCurve@@@Z @ 7 NONAME ; void HsPropertyAnimationWrapper::setEasingCurve(class QEasingCurve const &) + ?convert@HsAdvancedWidgetPositioningOnOrientationChange@@UAE?AV?$QList@VQRectF@@@@ABVQRectF@@ABV2@0@Z @ 8 NONAME ; class QList<class QRectF> HsAdvancedWidgetPositioningOnOrientationChange::convert(class QRectF const &, class QList<class QRectF> const &, class QRectF const &) + ?show@HsMessageBoxWrapper@@QAEXXZ @ 9 NONAME ; void HsMessageBoxWrapper::show(void) + ?staticMetaObject@HsPageIndicator@@2UQMetaObject@@B @ 10 NONAME ; struct QMetaObject const HsPageIndicator::staticMetaObject + ?createAddAppsFromCollectionViewEvent@HsMenuEventFactory@@SAPAVQEvent@@HH@Z @ 11 NONAME ; class QEvent * HsMenuEventFactory::createAddAppsFromCollectionViewEvent(int, int) + ?tr@HsImageFetcherClient@@SA?AVQString@@PBD0@Z @ 12 NONAME ; class QString HsImageFetcherClient::tr(char const *, char const *) + ?metaObject@HsTrashBinWidget@@UBEPBUQMetaObject@@XZ @ 13 NONAME ; struct QMetaObject const * HsTrashBinWidget::metaObject(void) const + ??1HsSnapLine@@UAE@XZ @ 14 NONAME ; HsSnapLine::~HsSnapLine(void) + ?trUtf8@HsSnapLine@@SA?AVQString@@PBD0H@Z @ 15 NONAME ; class QString HsSnapLine::trUtf8(char const *, char const *, int) + ?qt_metacall@HsTitleResolver@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 16 NONAME ; int HsTitleResolver::qt_metacall(enum QMetaObject::Call, int, void * *) + ?metaObject@HsImageFetcherClient@@UBEPBUQMetaObject@@XZ @ 17 NONAME ; struct QMetaObject const * HsImageFetcherClient::metaObject(void) const + ?setInstance@HsWidgetPositioningOnWidgetMove@@SAXPAV1@@Z @ 18 NONAME ; void HsWidgetPositioningOnWidgetMove::setInstance(class HsWidgetPositioningOnWidgetMove *) + ?extendVerticalLineToIncludeInactiveRect@HsSnapToLines@@AAEXXZ @ 19 NONAME ; void HsSnapToLines::extendVerticalLineToIncludeInactiveRect(void) + ?getFadeOutDuration@HsSnapLine@@AAEHXZ @ 20 NONAME ; int HsSnapLine::getFadeOutDuration(void) + ?eventType@HsMenuEvent@@SA?AW4Type@QEvent@@XZ @ 21 NONAME ; enum QEvent::Type HsMenuEvent::eventType(void) + ?tr@HsImageFetcherClient@@SA?AVQString@@PBD0H@Z @ 22 NONAME ; class QString HsImageFetcherClient::tr(char const *, char const *, int) + ?qt_metacast@HsPageIndicator@@UAEPAXPBD@Z @ 23 NONAME ; void * HsPageIndicator::qt_metacast(char const *) + ??0HsMessageBoxWrapper@@QAE@PAVQObject@@@Z @ 24 NONAME ; HsMessageBoxWrapper::HsMessageBoxWrapper(class QObject *) + ??0HsMenuEvent@@QAE@W4OperationType@0@ABV?$QMap@VQString@@VQVariant@@@@@Z @ 25 NONAME ; HsMenuEvent::HsMenuEvent(enum HsMenuEvent::OperationType, class QMap<class QString, class QVariant> const &) + ?actionOnFadeOutAnimationStop@HsSnapLine@@AAEXXZ @ 26 NONAME ; void HsSnapLine::actionOnFadeOutAnimationStop(void) + ?qt_metacall@HsMessageBoxWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 27 NONAME ; int HsMessageBoxWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) + ?staticMetaObject@HsImageFetcherClient@@2UQMetaObject@@B @ 28 NONAME ; struct QMetaObject const HsImageFetcherClient::staticMetaObject + ?trUtf8@HsMessageBoxWrapper@@SA?AVQString@@PBD0@Z @ 29 NONAME ; class QString HsMessageBoxWrapper::trUtf8(char const *, char const *) + ?close@HsMessageBoxWrapper@@QAEXXZ @ 30 NONAME ; void HsMessageBoxWrapper::close(void) + ?qt_metacast@HsSnapLine@@UAEPAXPBD@Z @ 31 NONAME ; void * HsSnapLine::qt_metacast(char const *) + ?extendHorizontalLineToIncludeInactiveRect@HsSnapToLines@@AAEXXZ @ 32 NONAME ; void HsSnapToLines::extendHorizontalLineToIncludeInactiveRect(void) + ?fetchFailed@HsImageFetcherClient@@IAEXHABVQString@@@Z @ 33 NONAME ; void HsImageFetcherClient::fetchFailed(int, class QString const &) + ??1HsTitleResolver@@UAE@XZ @ 34 NONAME ; HsTitleResolver::~HsTitleResolver(void) + ?trUtf8@HsSpinnerDialog@@SA?AVQString@@PBD0@Z @ 35 NONAME ; class QString HsSpinnerDialog::trUtf8(char const *, char const *) + ?checkInactiveRectBetterFitForHorizontalSnapping@HsSnapToLines@@AAEXMM@Z @ 36 NONAME ; void HsSnapToLines::checkInactiveRectBetterFitForHorizontalSnapping(float, float) + ?tr@HsPropertyAnimationWrapper@@SA?AVQString@@PBD0H@Z @ 37 NONAME ; class QString HsPropertyAnimationWrapper::tr(char const *, char const *, int) + ?setQueryText@HsMessageBoxWrapper@@QAEXABVQString@@@Z @ 38 NONAME ; void HsMessageBoxWrapper::setQueryText(class QString const &) + ??1HsMenuEventTransition@@UAE@XZ @ 39 NONAME ; HsMenuEventTransition::~HsMenuEventTransition(void) + ?tr@HsSpinnerDialog@@SA?AVQString@@PBD0@Z @ 40 NONAME ; class QString HsSpinnerDialog::tr(char const *, char const *) + ?fadeInAnimationFinished@HsSnapLine@@AAEXXZ @ 41 NONAME ; void HsSnapLine::fadeInAnimationFinished(void) + ?checkInactiveRectLieAboveOrBelowOfMovingRect@HsSnapToLines@@AAEXXZ @ 42 NONAME ; void HsSnapToLines::checkInactiveRectLieAboveOrBelowOfMovingRect(void) + ?setHeader@HsMessageBoxWrapper@@QAEXABVQString@@@Z @ 43 NONAME ; void HsMessageBoxWrapper::setHeader(class QString const &) + ?setSpacing@HsPageIndicator@@QAEXM@Z @ 44 NONAME ; void HsPageIndicator::setSpacing(float) + ??_EHsImageFetcherClient@@UAE@I@Z @ 45 NONAME ; HsImageFetcherClient::~HsImageFetcherClient(unsigned int) + ?qt_metacast@HsPropertyAnimationWrapper@@UAEPAXPBD@Z @ 46 NONAME ; void * HsPropertyAnimationWrapper::qt_metacast(char const *) + ?createPreviewHSWidgetEvent@HsMenuEventFactory@@SAPAVQEvent@@HABVQString@@00@Z @ 47 NONAME ; class QEvent * HsMenuEventFactory::createPreviewHSWidgetEvent(int, class QString const &, class QString const &, class QString const &) + ??1HsMenuEvent@@UAE@XZ @ 48 NONAME ; HsMenuEvent::~HsMenuEvent(void) + ?tr@HsMessageBoxWrapper@@SA?AVQString@@PBD0@Z @ 49 NONAME ; class QString HsMessageBoxWrapper::tr(char const *, char const *) + ?createCollectionDeletedEvent@HsMenuEventFactory@@SAPAVQEvent@@XZ @ 50 NONAME ; class QEvent * HsMenuEventFactory::createCollectionDeletedEvent(void) + ?tr@HsImageGridWidget@@SA?AVQString@@PBD0@Z @ 51 NONAME ; class QString HsImageGridWidget::tr(char const *, char const *) + ?createUninstallApplicationEvent@HsMenuEventFactory@@SAPAVQEvent@@H@Z @ 52 NONAME ; class QEvent * HsMenuEventFactory::createUninstallApplicationEvent(int) + ?data@HsMenuEvent@@QBE?AV?$QMap@VQString@@VQVariant@@@@XZ @ 53 NONAME ; class QMap<class QString, class QVariant> HsMenuEvent::data(void) const + ??1HsMenuDialogFactory@@UAE@XZ @ 54 NONAME ; HsMenuDialogFactory::~HsMenuDialogFactory(void) + ?operation@HsMenuEvent@@QBE?AW4OperationType@1@XZ @ 55 NONAME ; enum HsMenuEvent::OperationType HsMenuEvent::operation(void) const + ?setBackward@HsPropertyAnimationWrapper@@QAEXXZ @ 56 NONAME ; void HsPropertyAnimationWrapper::setBackward(void) + ?qt_metacast@HsSpinnerDialog@@UAEPAXPBD@Z @ 57 NONAME ; void * HsSpinnerDialog::qt_metacast(char const *) + ?getStaticMetaObject@HsPageIndicator@@SAABUQMetaObject@@XZ @ 58 NONAME ; struct QMetaObject const & HsPageIndicator::getStaticMetaObject(void) + ?compareBottomOfMovingRectForSnapping@HsSnapToLines@@AAEXXZ @ 59 NONAME ; void HsSnapToLines::compareBottomOfMovingRectForSnapping(void) + ?createUnknownEvent@HsMenuEventFactory@@SAPAVQEvent@@XZ @ 60 NONAME ; class QEvent * HsMenuEventFactory::createUnknownEvent(void) + ??1HsPropertyAnimationWrapper@@UAE@XZ @ 61 NONAME ; HsPropertyAnimationWrapper::~HsPropertyAnimationWrapper(void) + ?onNetworkNameChanged@HsTitleResolver@@AAEXABVQString@@@Z @ 62 NONAME ; void HsTitleResolver::onNetworkNameChanged(class QString const &) + ?metaObject@HsMessageBoxWrapper@@UBEPBUQMetaObject@@XZ @ 63 NONAME ; struct QMetaObject const * HsMessageBoxWrapper::metaObject(void) const + ?createAppDetailsViewEvent@HsMenuEventFactory@@SAPAVQEvent@@H@Z @ 64 NONAME ; class QEvent * HsMenuEventFactory::createAppDetailsViewEvent(int) + ?setEndValue@HsPropertyAnimationWrapper@@QAEXABVQVariant@@@Z @ 65 NONAME ; void HsPropertyAnimationWrapper::setEndValue(class QVariant const &) + ??_EHsSnapLine@@UAE@I@Z @ 66 NONAME ; HsSnapLine::~HsSnapLine(unsigned int) + ?setContent@HsImageGridWidget@@QAEXABVQStringList@@@Z @ 67 NONAME ; void HsImageGridWidget::setContent(class QStringList const &) + ?staticMetaObject@XQAIWGetImageClient@@2UQMetaObject@@B @ 68 NONAME ; struct QMetaObject const XQAIWGetImageClient::staticMetaObject + ?qt_metacall@HsPropertyAnimationWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 69 NONAME ; int HsPropertyAnimationWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) + ?qt_metacast@HsMessageBoxWrapper@@UAEPAXPBD@Z @ 70 NONAME ; void * HsMessageBoxWrapper::qt_metacast(char const *) + ?createArrangeAllCollectionsEvent@HsMenuEventFactory@@SAPAVQEvent@@H@Z @ 71 NONAME ; class QEvent * HsMenuEventFactory::createArrangeAllCollectionsEvent(int) + ?fetch@XQAIWGetImageClient@@QAEXXZ @ 72 NONAME ; void XQAIWGetImageClient::fetch(void) + ?metaObject@HsPropertyAnimationWrapper@@UBEPBUQMetaObject@@XZ @ 73 NONAME ; struct QMetaObject const * HsPropertyAnimationWrapper::metaObject(void) const + ?isAnimationRunning@HsPageIndicator@@QBE_NXZ @ 74 NONAME ; bool HsPageIndicator::isAnimationRunning(void) const + ?getIndexForCoordinate@HsWidgetOrganizer@@AAEHVQPointF@@@Z @ 75 NONAME ; int HsWidgetOrganizer::getIndexForCoordinate(class QPointF) + ?createAppSettingsViewEvent@HsMenuEventFactory@@SAPAVQEvent@@H@Z @ 76 NONAME ; class QEvent * HsMenuEventFactory::createAppSettingsViewEvent(int) + ?trUtf8@HsImageGridWidget@@SA?AVQString@@PBD0@Z @ 77 NONAME ; class QString HsImageGridWidget::trUtf8(char const *, char const *) + ??1HsAnchorPointInCenter@@UAE@XZ @ 78 NONAME ; HsAnchorPointInCenter::~HsAnchorPointInCenter(void) + ?createDeleteCollectionEvent@HsMenuEventFactory@@SAPAVQEvent@@H@Z @ 79 NONAME ; class QEvent * HsMenuEventFactory::createDeleteCollectionEvent(int) + ?trUtf8@HsSpinnerDialog@@SA?AVQString@@PBD0H@Z @ 80 NONAME ; class QString HsSpinnerDialog::trUtf8(char const *, char const *, int) + ?metaObject@XQAIWGetImageClient@@UBEPBUQMetaObject@@XZ @ 81 NONAME ; struct QMetaObject const * XQAIWGetImageClient::metaObject(void) const + ?fadeOutAnimationFinished@HsSnapLine@@AAEXXZ @ 82 NONAME ; void HsSnapLine::fadeOutAnimationFinished(void) + ?getStaticMetaObject@HsPropertyAnimationWrapper@@SAABUQMetaObject@@XZ @ 83 NONAME ; struct QMetaObject const & HsPropertyAnimationWrapper::getStaticMetaObject(void) + ?trUtf8@HsTitleResolver@@SA?AVQString@@PBD0H@Z @ 84 NONAME ; class QString HsTitleResolver::trUtf8(char const *, char const *, int) + ??0HsSnapToLines@@QAE@XZ @ 85 NONAME ; HsSnapToLines::HsSnapToLines(void) + ?trUtf8@HsTrashBinWidget@@SA?AVQString@@PBD0@Z @ 86 NONAME ; class QString HsTrashBinWidget::trUtf8(char const *, char const *) + ?activate@HsTrashBinWidget@@QAEXXZ @ 87 NONAME ; void HsTrashBinWidget::activate(void) + ??1HsSpinnerDialog@@UAE@XZ @ 88 NONAME ; HsSpinnerDialog::~HsSpinnerDialog(void) + ?checkInactiveRectPositionToHorizontalLine@HsSnapToLines@@AAEXXZ @ 89 NONAME ; void HsSnapToLines::checkInactiveRectPositionToHorizontalLine(void) + ?qt_metacall@HsPageIndicator@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 90 NONAME ; int HsPageIndicator::qt_metacall(enum QMetaObject::Call, int, void * *) + ?setInstance@HsWidgetPositioningOnOrientationChange@@SAXPAV1@@Z @ 91 NONAME ; void HsWidgetPositioningOnOrientationChange::setInstance(class HsWidgetPositioningOnOrientationChange *) + ?run@HsSnapToLines@@UAE?AVResult@HsWidgetPositioningOnWidgetMove@@ABVQRectF@@@Z @ 92 NONAME ; class HsWidgetPositioningOnWidgetMove::Result HsSnapToLines::run(class QRectF const &) + ?staticMetaObject@HsPropertyAnimationWrapper@@2UQMetaObject@@B @ 93 NONAME ; struct QMetaObject const HsPropertyAnimationWrapper::staticMetaObject + ?createOpenCollectionFromAppLibraryEvent@HsMenuEventFactory@@SAPAVQEvent@@HABVQString@@@Z @ 94 NONAME ; class QEvent * HsMenuEventFactory::createOpenCollectionFromAppLibraryEvent(int, class QString const &) + ?staticMetaObject@HsSnapLine@@2UQMetaObject@@B @ 95 NONAME ; struct QMetaObject const HsSnapLine::staticMetaObject + ?start@HsPropertyAnimationWrapper@@QAEXXZ @ 96 NONAME ; void HsPropertyAnimationWrapper::start(void) + ??_EHsTrashBinWidget@@UAE@I@Z @ 97 NONAME ; HsTrashBinWidget::~HsTrashBinWidget(unsigned int) + ?startFadeInAnimation@HsSnapLine@@AAEXXZ @ 98 NONAME ; void HsSnapLine::startFadeInAnimation(void) + ?metaObject@HsSnapLine@@UBEPBUQMetaObject@@XZ @ 99 NONAME ; struct QMetaObject const * HsSnapLine::metaObject(void) const + ??1XQAIWGetImageClient@@UAE@XZ @ 100 NONAME ; XQAIWGetImageClient::~XQAIWGetImageClient(void) + ??_EHsPropertyAnimationWrapper@@UAE@I@Z @ 101 NONAME ; HsPropertyAnimationWrapper::~HsPropertyAnimationWrapper(unsigned int) + ?activeItemIndex@HsPageIndicator@@QBEHXZ @ 102 NONAME ; int HsPageIndicator::activeItemIndex(void) const + ?isFadeInAnimationRunning@HsSnapLine@@ABE_NXZ @ 103 NONAME ; bool HsSnapLine::isFadeInAnimationRunning(void) const + ?qt_metacall@HsSnapLine@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 104 NONAME ; int HsSnapLine::qt_metacall(enum QMetaObject::Call, int, void * *) + ?layoutItems@HsPageIndicator@@AAEXXZ @ 105 NONAME ; void HsPageIndicator::layoutItems(void) + ?trUtf8@HsMessageBoxWrapper@@SA?AVQString@@PBD0H@Z @ 106 NONAME ; class QString HsMessageBoxWrapper::trUtf8(char const *, char const *, int) + ?metaObject@HsSpinnerDialog@@UBEPBUQMetaObject@@XZ @ 107 NONAME ; struct QMetaObject const * HsSpinnerDialog::metaObject(void) const + ?getStaticMetaObject@HsImageGridWidget@@SAABUQMetaObject@@XZ @ 108 NONAME ; struct QMetaObject const & HsImageGridWidget::getStaticMetaObject(void) + ?setConfiguration@HsSnapToLines@@UAEXABV?$QHash@VQString@@VQVariant@@@@@Z @ 109 NONAME ; void HsSnapToLines::setConfiguration(class QHash<class QString, class QVariant> const &) + ?trUtf8@HsPageIndicator@@SA?AVQString@@PBD0@Z @ 110 NONAME ; class QString HsPageIndicator::trUtf8(char const *, char const *) + ?metaObject@HsTitleResolver@@UBEPBUQMetaObject@@XZ @ 111 NONAME ; struct QMetaObject const * HsTitleResolver::metaObject(void) const + ?titleChanged@HsTitleResolver@@IAEXABVQString@@@Z @ 112 NONAME ; void HsTitleResolver::titleChanged(class QString const &) + ?tr@HsPageIndicator@@SA?AVQString@@PBD0@Z @ 113 NONAME ; class QString HsPageIndicator::tr(char const *, char const *) + ?convert@HsWidgetOrganizer@@UAE?AV?$QList@VQRectF@@@@ABVQRectF@@ABV2@1ABVQPointF@@@Z @ 114 NONAME ; class QList<class QRectF> HsWidgetOrganizer::convert(class QRectF const &, class QList<class QRectF> const &, class QList<class QRectF> const &, class QPointF const &) + ?tr@HsPropertyAnimationWrapper@@SA?AVQString@@PBD0@Z @ 115 NONAME ; class QString HsPropertyAnimationWrapper::tr(char const *, char const *) + ?onStatusChanged@HsTitleResolver@@AAEXW4HsDeviceInfoStatus@HsDeviceInfoListener@@@Z @ 116 NONAME ; void HsTitleResolver::onStatusChanged(enum HsDeviceInfoListener::HsDeviceInfoStatus) + ?createVerticalLine@HsSnapToLines@@AAEXXZ @ 117 NONAME ; void HsSnapToLines::createVerticalLine(void) + ?trUtf8@XQAIWGetImageClient@@SA?AVQString@@PBD0H@Z @ 118 NONAME ; class QString XQAIWGetImageClient::trUtf8(char const *, char const *, int) + ?actionOnFadeInAnimationStop@HsSnapLine@@AAEXXZ @ 119 NONAME ; void HsSnapLine::actionOnFadeInAnimationStop(void) + ?qt_metacast@HsTrashBinWidget@@UAEPAXPBD@Z @ 120 NONAME ; void * HsTrashBinWidget::qt_metacast(char const *) + ?createNewCollectionEvent@HsMenuEventFactory@@SAPAVQEvent@@XZ @ 121 NONAME ; class QEvent * HsMenuEventFactory::createNewCollectionEvent(void) + ?createOpenHomeScreenEvent@HsMenuEventFactory@@SAPAVQEvent@@XZ @ 122 NONAME ; class QEvent * HsMenuEventFactory::createOpenHomeScreenEvent(void) + ?checkInactiveRectPositionToVerticalLine@HsSnapToLines@@AAEXXZ @ 123 NONAME ; void HsSnapToLines::checkInactiveRectPositionToVerticalLine(void) + ?findImages@XQAIWGetImageClient@@AAEXABVQString@@ABVQStringList@@AAV3@@Z @ 124 NONAME ; void XQAIWGetImageClient::findImages(class QString const &, class QStringList const &, class QStringList &) + ??_EHsMenuDialogFactory@@UAE@I@Z @ 125 NONAME ; HsMenuDialogFactory::~HsMenuDialogFactory(unsigned int) + ??1HsWidgetPositioningOnWidgetAdd@@UAE@XZ @ 126 NONAME ; HsWidgetPositioningOnWidgetAdd::~HsWidgetPositioningOnWidgetAdd(void) + ?createInstallationLogEvent@HsMenuEventFactory@@SAPAVQEvent@@XZ @ 127 NONAME ; class QEvent * HsMenuEventFactory::createInstallationLogEvent(void) + ?extendVerticalLine@HsSnapToLines@@AAEXXZ @ 128 NONAME ; void HsSnapToLines::extendVerticalLine(void) + ?stop@HsSpinnerDialog@@QAEXXZ @ 129 NONAME ; void HsSpinnerDialog::stop(void) + ?stop@HsPropertyAnimationWrapper@@QAEXXZ @ 130 NONAME ; void HsPropertyAnimationWrapper::stop(void) + ?tr@HsSpinnerDialog@@SA?AVQString@@PBD0H@Z @ 131 NONAME ; class QString HsSpinnerDialog::tr(char const *, char const *, int) + ?getStaticMetaObject@HsSnapLine@@SAABUQMetaObject@@XZ @ 132 NONAME ; struct QMetaObject const & HsSnapLine::getStaticMetaObject(void) + ?handleError@HsImageFetcherClient@@AAEXHABVQString@@@Z @ 133 NONAME ; void HsImageFetcherClient::handleError(int, class QString const &) + ?searchHeightSpace@HsWidgetOrganizer@@AAE_NH@Z @ 134 NONAME ; bool HsWidgetOrganizer::searchHeightSpace(int) + ?tr@HsTitleResolver@@SA?AVQString@@PBD0H@Z @ 135 NONAME ; class QString HsTitleResolver::tr(char const *, char const *, int) + ?setPropertyName@HsPropertyAnimationWrapper@@QAEXABVQByteArray@@@Z @ 136 NONAME ; void HsPropertyAnimationWrapper::setPropertyName(class QByteArray const &) + ?checkInactiveRectBetterFitForVerticalSnapping@HsSnapToLines@@AAEXMM@Z @ 137 NONAME ; void HsSnapToLines::checkInactiveRectBetterFitForVerticalSnapping(float, float) + ?onDialogClosed@HsMessageBoxWrapper@@AAEXH@Z @ 138 NONAME ; void HsMessageBoxWrapper::onDialogClosed(int) + ?createRenameCollectionEvent@HsMenuEventFactory@@SAPAVQEvent@@H@Z @ 139 NONAME ; class QEvent * HsMenuEventFactory::createRenameCollectionEvent(int) + ?tr@HsTrashBinWidget@@SA?AVQString@@PBD0@Z @ 140 NONAME ; class QString HsTrashBinWidget::tr(char const *, char const *) + ?getStaticMetaObject@XQAIWGetImageClient@@SAABUQMetaObject@@XZ @ 141 NONAME ; struct QMetaObject const & XQAIWGetImageClient::getStaticMetaObject(void) + ?getStaticMetaObject@HsTrashBinWidget@@SAABUQMetaObject@@XZ @ 142 NONAME ; struct QMetaObject const & HsTrashBinWidget::getStaticMetaObject(void) + ?removeItem@HsPageIndicator@@QAEXH@Z @ 143 NONAME ; void HsPageIndicator::removeItem(int) + ?mInstance@HsWidgetPositioningOnOrientationChange@@0PAV1@A @ 144 NONAME ; class HsWidgetPositioningOnOrientationChange * HsWidgetPositioningOnOrientationChange::mInstance + ?staticMetaObject@HsSpinnerDialog@@2UQMetaObject@@B @ 145 NONAME ; struct QMetaObject const HsSpinnerDialog::staticMetaObject + ?setDuration@HsPropertyAnimationWrapper@@QAEXH@Z @ 146 NONAME ; void HsPropertyAnimationWrapper::setDuration(int) + ??_EXQAIWGetImageClient@@UAE@I@Z @ 147 NONAME ; XQAIWGetImageClient::~XQAIWGetImageClient(unsigned int) + ??0HsImageFetcherClient@@QAE@PAVQObject@@@Z @ 148 NONAME ; HsImageFetcherClient::HsImageFetcherClient(class QObject *) + ??_EHsMessageBoxWrapper@@UAE@I@Z @ 149 NONAME ; HsMessageBoxWrapper::~HsMessageBoxWrapper(unsigned int) + ?tr@HsTrashBinWidget@@SA?AVQString@@PBD0H@Z @ 150 NONAME ; class QString HsTrashBinWidget::tr(char const *, char const *, int) + ?setTargetObject@HsPropertyAnimationWrapper@@QAEXPAVQObject@@@Z @ 151 NONAME ; void HsPropertyAnimationWrapper::setTargetObject(class QObject *) + ??0HsTrashBinWidget@@QAE@PAVQGraphicsItem@@@Z @ 152 NONAME ; HsTrashBinWidget::HsTrashBinWidget(class QGraphicsItem *) + ?compareLeftSideOfMovingRectForSnapping@HsSnapToLines@@AAEXXZ @ 153 NONAME ; void HsSnapToLines::compareLeftSideOfMovingRectForSnapping(void) + ?fetch@HsImageFetcherClient@@QAEXXZ @ 154 NONAME ; void HsImageFetcherClient::fetch(void) + ?instance@HsWidgetPositioningOnWidgetMove@@SAPAV1@XZ @ 155 NONAME ; class HsWidgetPositioningOnWidgetMove * HsWidgetPositioningOnWidgetMove::instance(void) + ?staticMetaObject@HsMessageBoxWrapper@@2UQMetaObject@@B @ 156 NONAME ; struct QMetaObject const HsMessageBoxWrapper::staticMetaObject + ?qt_metacast@HsImageFetcherClient@@UAEPAXPBD@Z @ 157 NONAME ; void * HsImageFetcherClient::qt_metacast(char const *) + ?trUtf8@HsImageFetcherClient@@SA?AVQString@@PBD0@Z @ 158 NONAME ; class QString HsImageFetcherClient::trUtf8(char const *, char const *) + ?fetchCompleted@HsImageFetcherClient@@IAEXABVQString@@@Z @ 159 NONAME ; void HsImageFetcherClient::fetchCompleted(class QString const &) + ?start@HsSpinnerDialog@@QAEXXZ @ 160 NONAME ; void HsSpinnerDialog::start(void) + ?isFadeOutAnimationRunning@HsSnapLine@@ABE_NXZ @ 161 NONAME ; bool HsSnapLine::isFadeOutAnimationRunning(void) const + ?trUtf8@HsPropertyAnimationWrapper@@SA?AVQString@@PBD0@Z @ 162 NONAME ; class QString HsPropertyAnimationWrapper::trUtf8(char const *, char const *) + ?createSnappableRectangles@HsSnapToLines@@AAEXABV?$QList@VQRectF@@@@@Z @ 163 NONAME ; void HsSnapToLines::createSnappableRectangles(class QList<class QRectF> const &) + ?staticMetaObject@HsImageGridWidget@@2UQMetaObject@@B @ 164 NONAME ; struct QMetaObject const HsImageGridWidget::staticMetaObject + ??_EHsTitleResolver@@UAE@I@Z @ 165 NONAME ; HsTitleResolver::~HsTitleResolver(unsigned int) + ?setForward@HsPropertyAnimationWrapper@@QAEXXZ @ 166 NONAME ; void HsPropertyAnimationWrapper::setForward(void) + ?convert@HsAnchorPointInCenter@@UAE?AV?$QList@VQRectF@@@@ABVQRectF@@ABV2@1ABVQPointF@@@Z @ 167 NONAME ; class QList<class QRectF> HsAnchorPointInCenter::convert(class QRectF const &, class QList<class QRectF> const &, class QList<class QRectF> const &, class QPointF const &) + ??1HsSnapToLines@@UAE@XZ @ 168 NONAME ; HsSnapToLines::~HsSnapToLines(void) + ?staticMetaObject@HsTrashBinWidget@@2UQMetaObject@@B @ 169 NONAME ; struct QMetaObject const HsTrashBinWidget::staticMetaObject + ?title@HsTitleResolver@@QAE?AVQString@@XZ @ 170 NONAME ; class QString HsTitleResolver::title(void) + ??_EHsWidgetPositioningOnWidgetAdd@@UAE@I@Z @ 171 NONAME ; HsWidgetPositioningOnWidgetAdd::~HsWidgetPositioningOnWidgetAdd(unsigned int) + ??_EHsMenuEventTransition@@UAE@I@Z @ 172 NONAME ; HsMenuEventTransition::~HsMenuEventTransition(unsigned int) + ?tr@HsSnapLine@@SA?AVQString@@PBD0@Z @ 173 NONAME ; class QString HsSnapLine::tr(char const *, char const *) + ?setPagePresentation@HsSnapToLines@@UAEXABVQRectF@@ABV?$QList@VQRectF@@@@0@Z @ 174 NONAME ; void HsSnapToLines::setPagePresentation(class QRectF const &, class QList<class QRectF> const &, class QRectF const &) + ?trUtf8@HsTrashBinWidget@@SA?AVQString@@PBD0H@Z @ 175 NONAME ; class QString HsTrashBinWidget::trUtf8(char const *, char const *, int) + ?trUtf8@HsImageFetcherClient@@SA?AVQString@@PBD0H@Z @ 176 NONAME ; class QString HsImageFetcherClient::trUtf8(char const *, char const *, int) + ??_EHsMenuEvent@@UAE@I@Z @ 177 NONAME ; HsMenuEvent::~HsMenuEvent(unsigned int) + ??1HsTrashBinWidget@@UAE@XZ @ 178 NONAME ; HsTrashBinWidget::~HsTrashBinWidget(void) + ?compareTopOfMovingRectForSnapping@HsSnapToLines@@AAEXXZ @ 179 NONAME ; void HsSnapToLines::compareTopOfMovingRectForSnapping(void) + ??_EHsSnapToLines@@UAE@I@Z @ 180 NONAME ; HsSnapToLines::~HsSnapToLines(unsigned int) + ?itemCount@HsPageIndicator@@QBEHXZ @ 181 NONAME ; int HsPageIndicator::itemCount(void) const + ?checkInactiveRectLieLeftOrRightOfMovingRect@HsSnapToLines@@AAEXXZ @ 182 NONAME ; void HsSnapToLines::checkInactiveRectLieLeftOrRightOfMovingRect(void) + ??1HsImageFetcherClient@@UAE@XZ @ 183 NONAME ; HsImageFetcherClient::~HsImageFetcherClient(void) + ?createAddAppsFromApplicationsViewEvent@HsMenuEventFactory@@SAPAVQEvent@@W4HsSortAttribute@Hs@@H@Z @ 184 NONAME ; class QEvent * HsMenuEventFactory::createAddAppsFromApplicationsViewEvent(enum Hs::HsSortAttribute, int) + ??1HsWidgetPositioningOnOrientationChange@@UAE@XZ @ 185 NONAME ; HsWidgetPositioningOnOrientationChange::~HsWidgetPositioningOnOrientationChange(void) + ?metaObject@HsImageGridWidget@@UBEPBUQMetaObject@@XZ @ 186 NONAME ; struct QMetaObject const * HsImageGridWidget::metaObject(void) const + ?checkInactiveRectVerticalEdgesInRange@HsSnapToLines@@AAEXM@Z @ 187 NONAME ; void HsSnapToLines::checkInactiveRectVerticalEdgesInRange(float) + ?imageSelectionCancelled@XQAIWGetImageClient@@AAEXXZ @ 188 NONAME ; void XQAIWGetImageClient::imageSelectionCancelled(void) + ?gridItemActivated@HsImageGridWidget@@AAEXABVQModelIndex@@@Z @ 189 NONAME ; void HsImageGridWidget::gridItemActivated(class QModelIndex const &) + ?markReservedAnchors@HsWidgetOrganizer@@AAE_NXZ @ 190 NONAME ; bool HsWidgetOrganizer::markReservedAnchors(void) + ?createRemoveAppFromCollectionEvent@HsMenuEventFactory@@SAPAVQEvent@@HH@Z @ 191 NONAME ; class QEvent * HsMenuEventFactory::createRemoveAppFromCollectionEvent(int, int) + ??1HsWidgetPositioningOnWidgetMove@@UAE@XZ @ 192 NONAME ; HsWidgetPositioningOnWidgetMove::~HsWidgetPositioningOnWidgetMove(void) + ?trUtf8@HsPageIndicator@@SA?AVQString@@PBD0H@Z @ 193 NONAME ; class QString HsPageIndicator::trUtf8(char const *, char const *, int) + ??0HsSpinnerDialog@@QAE@PAVQGraphicsItem@@@Z @ 194 NONAME ; HsSpinnerDialog::HsSpinnerDialog(class QGraphicsItem *) + ?createOpenCollectionEvent@HsMenuEventFactory@@SAPAVQEvent@@HABVQString@@@Z @ 195 NONAME ; class QEvent * HsMenuEventFactory::createOpenCollectionEvent(int, class QString const &) + ?initialize@HsPageIndicator@@QAEXHH@Z @ 196 NONAME ; void HsPageIndicator::initialize(int, int) + ??1HsPageIndicator@@UAE@XZ @ 197 NONAME ; HsPageIndicator::~HsPageIndicator(void) + ?instance@HsWidgetPositioningOnOrientationChange@@SAPAV1@XZ @ 198 NONAME ; class HsWidgetPositioningOnOrientationChange * HsWidgetPositioningOnOrientationChange::instance(void) + ?createAddToHomeScreenEvent@HsMenuEventFactory@@SAPAVQEvent@@HW4HsMenuMode@Hs@@VQVariant@@@Z @ 199 NONAME ; class QEvent * HsMenuEventFactory::createAddToHomeScreenEvent(int, enum Hs::HsMenuMode, class QVariant) + ?getFadeInDuration@HsSnapLine@@AAEHXZ @ 200 NONAME ; int HsSnapLine::getFadeInDuration(void) + ?getAnchorPoint@HsWidgetOrganizer@@AAE_NABVQSizeF@@@Z @ 201 NONAME ; bool HsWidgetOrganizer::getAnchorPoint(class QSizeF const &) + ?fetchCompleted@XQAIWGetImageClient@@IAEXABVQString@@@Z @ 202 NONAME ; void XQAIWGetImageClient::fetchCompleted(class QString const &) + ?requestCompleted@XQAIWGetImageClient@@AAEXABVQVariant@@@Z @ 203 NONAME ; void XQAIWGetImageClient::requestCompleted(class QVariant const &) + ?initAnchors@HsWidgetOrganizer@@AAE_NABVQSizeF@@@Z @ 204 NONAME ; bool HsWidgetOrganizer::initAnchors(class QSizeF const &) + ?accepted@HsMessageBoxWrapper@@IAEXXZ @ 205 NONAME ; void HsMessageBoxWrapper::accepted(void) + ?getStaticMetaObject@HsMessageBoxWrapper@@SAABUQMetaObject@@XZ @ 206 NONAME ; struct QMetaObject const & HsMessageBoxWrapper::getStaticMetaObject(void) + ?qt_metacast@XQAIWGetImageClient@@UAEPAXPBD@Z @ 207 NONAME ; void * XQAIWGetImageClient::qt_metacast(char const *) + ??_EHsImageGridWidget@@UAE@I@Z @ 208 NONAME ; HsImageGridWidget::~HsImageGridWidget(unsigned int) + ?hideLine@HsSnapLine@@QAEXXZ @ 209 NONAME ; void HsSnapLine::hideLine(void) + ?metaObject@HsPageIndicator@@UBEPBUQMetaObject@@XZ @ 210 NONAME ; struct QMetaObject const * HsPageIndicator::metaObject(void) const + ?imageSelected@XQAIWGetImageClient@@AAEXABVQString@@@Z @ 211 NONAME ; void XQAIWGetImageClient::imageSelected(class QString const &) + ?setActiveItemIndex@HsPageIndicator@@QAEXH@Z @ 212 NONAME ; void HsPageIndicator::setActiveItemIndex(int) + ?trUtf8@HsImageGridWidget@@SA?AVQString@@PBD0H@Z @ 213 NONAME ; class QString HsImageGridWidget::trUtf8(char const *, char const *, int) + ?getStaticMetaObject@HsImageFetcherClient@@SAABUQMetaObject@@XZ @ 214 NONAME ; struct QMetaObject const & HsImageFetcherClient::getStaticMetaObject(void) + ?createOpenInstalledViewEvent@HsMenuEventFactory@@SAPAVQEvent@@XZ @ 215 NONAME ; class QEvent * HsMenuEventFactory::createOpenInstalledViewEvent(void) + ??0HsSnapLine@@QAE@PAVQGraphicsItem@@@Z @ 216 NONAME ; HsSnapLine::HsSnapLine(class QGraphicsItem *) + ?startFadeOutAnimation@HsSnapLine@@AAEXXZ @ 217 NONAME ; void HsSnapLine::startFadeOutAnimation(void) + ?imageSelected@HsImageGridWidget@@IAEXABVQString@@@Z @ 218 NONAME ; void HsImageGridWidget::imageSelected(class QString const &) + ?getStaticMetaObject@HsTitleResolver@@SAABUQMetaObject@@XZ @ 219 NONAME ; struct QMetaObject const & HsTitleResolver::getStaticMetaObject(void) + ?trUtf8@XQAIWGetImageClient@@SA?AVQString@@PBD0@Z @ 220 NONAME ; class QString XQAIWGetImageClient::trUtf8(char const *, char const *) + ?stopFadeInAnimation@HsSnapLine@@AAEXXZ @ 221 NONAME ; void HsSnapLine::stopFadeInAnimation(void) + ?create@HsMenuDialogFactory@@UBEPAVHbMessageBox@@ABVQString@@W4Options@1@@Z @ 222 NONAME ; class HbMessageBox * HsMenuDialogFactory::create(class QString const &, enum HsMenuDialogFactory::Options) const + ?lenghtInAnchorPoints@HsWidgetOrganizer@@AAEHVQVariant@@@Z @ 223 NONAME ; int HsWidgetOrganizer::lenghtInAnchorPoints(class QVariant) + ?createArrangeCollectionEvent@HsMenuEventFactory@@SAPAVQEvent@@HH@Z @ 224 NONAME ; class QEvent * HsMenuEventFactory::createArrangeCollectionEvent(int, int) + ?deactivate@HsTrashBinWidget@@QAEXXZ @ 225 NONAME ; void HsTrashBinWidget::deactivate(void) + ?qt_metacast@HsImageGridWidget@@UAEPAXPBD@Z @ 226 NONAME ; void * HsImageGridWidget::qt_metacast(char const *) + ?isForward@HsPropertyAnimationWrapper@@QBE_NXZ @ 227 NONAME ; bool HsPropertyAnimationWrapper::isForward(void) const + ?tr@HsPageIndicator@@SA?AVQString@@PBD0H@Z @ 228 NONAME ; class QString HsPageIndicator::tr(char const *, char const *, int) + ?eventTest@HsMenuEventTransition@@MAE_NPAVQEvent@@@Z @ 229 NONAME ; bool HsMenuEventTransition::eventTest(class QEvent *) + ?qt_metacall@HsImageGridWidget@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 230 NONAME ; int HsImageGridWidget::qt_metacall(enum QMetaObject::Call, int, void * *) + ?showLine@HsSnapLine@@QAEXABVQLineF@@@Z @ 231 NONAME ; void HsSnapLine::showLine(class QLineF const &) + ?tr@HsMessageBoxWrapper@@SA?AVQString@@PBD0H@Z @ 232 NONAME ; class QString HsMessageBoxWrapper::tr(char const *, char const *, int) + ?qt_metacall@XQAIWGetImageClient@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 233 NONAME ; int XQAIWGetImageClient::qt_metacall(enum QMetaObject::Call, int, void * *) + ??0XQAIWGetImageClient@@QAE@XZ @ 234 NONAME ; XQAIWGetImageClient::XQAIWGetImageClient(void) + ?handleOk@HsImageFetcherClient@@AAEXABVQVariant@@@Z @ 235 NONAME ; void HsImageFetcherClient::handleOk(class QVariant const &) + ??0HsMenuEventTransition@@QAE@W4OperationType@HsMenuEvent@@PAVQState@@1@Z @ 236 NONAME ; HsMenuEventTransition::HsMenuEventTransition(enum HsMenuEvent::OperationType, class QState *, class QState *) + ?fetchFailed@XQAIWGetImageClient@@IAEXHABVQString@@@Z @ 237 NONAME ; void XQAIWGetImageClient::fetchFailed(int, class QString const &) + ??0HsTitleResolver@@QAE@PAVQObject@@@Z @ 238 NONAME ; HsTitleResolver::HsTitleResolver(class QObject *) + ?setConfiguration@HsSnapLine@@QAEXABV?$QHash@VQString@@VQVariant@@@@@Z @ 239 NONAME ; void HsSnapLine::setConfiguration(class QHash<class QString, class QVariant> const &) + ??_EHsPageIndicator@@UAE@I@Z @ 240 NONAME ; HsPageIndicator::~HsPageIndicator(unsigned int) + ?stopFadeOutAnimation@HsSnapLine@@AAEXXZ @ 241 NONAME ; void HsSnapLine::stopFadeOutAnimation(void) + ??_EHsWidgetPositioningOnOrientationChange@@UAE@I@Z @ 242 NONAME ; HsWidgetPositioningOnOrientationChange::~HsWidgetPositioningOnOrientationChange(unsigned int) + ?setUpActions@HsMenuDialogFactory@@ABEXPAVHbMessageBox@@ABVQStringList@@@Z @ 243 NONAME ; void HsMenuDialogFactory::setUpActions(class HbMessageBox *, class QStringList const &) const + ?compareRightSideOfMovingRectForSnapping@HsSnapToLines@@AAEXXZ @ 244 NONAME ; void HsSnapToLines::compareRightSideOfMovingRectForSnapping(void) + ?isRunning@HsPropertyAnimationWrapper@@QAE_NXZ @ 245 NONAME ; bool HsPropertyAnimationWrapper::isRunning(void) + ?mInstance@HsWidgetPositioningOnWidgetMove@@0PAV1@A @ 246 NONAME ; class HsWidgetPositioningOnWidgetMove * HsWidgetPositioningOnWidgetMove::mInstance + ?tr@XQAIWGetImageClient@@SA?AVQString@@PBD0@Z @ 247 NONAME ; class QString XQAIWGetImageClient::tr(char const *, char const *) + ?getAnchorCoordinates@HsWidgetOrganizer@@AAE?AVQPointF@@H@Z @ 248 NONAME ; class QPointF HsWidgetOrganizer::getAnchorCoordinates(int) + ?finished@HsPropertyAnimationWrapper@@IAEXXZ @ 249 NONAME ; void HsPropertyAnimationWrapper::finished(void) + ?addItem@HsPageIndicator@@QAEXH@Z @ 250 NONAME ; void HsPageIndicator::addItem(int) + ??0HsPageIndicator@@QAE@MPAVQGraphicsItem@@@Z @ 251 NONAME ; HsPageIndicator::HsPageIndicator(float, class QGraphicsItem *) + ?rejected@HsMessageBoxWrapper@@IAEXXZ @ 252 NONAME ; void HsMessageBoxWrapper::rejected(void) + ?tr@XQAIWGetImageClient@@SA?AVQString@@PBD0H@Z @ 253 NONAME ; class QString XQAIWGetImageClient::tr(char const *, char const *, int) + ?trUtf8@HsPropertyAnimationWrapper@@SA?AVQString@@PBD0H@Z @ 254 NONAME ; class QString HsPropertyAnimationWrapper::trUtf8(char const *, char const *, int) + ?qt_metacall@HsSpinnerDialog@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 255 NONAME ; int HsSpinnerDialog::qt_metacall(enum QMetaObject::Call, int, void * *) + ?mInstance@HsWidgetPositioningOnWidgetAdd@@0PAV1@A @ 256 NONAME ; class HsWidgetPositioningOnWidgetAdd * HsWidgetPositioningOnWidgetAdd::mInstance + ??1HsMessageBoxWrapper@@UAE@XZ @ 257 NONAME ; HsMessageBoxWrapper::~HsMessageBoxWrapper(void) + ?setInstance@HsWidgetPositioningOnWidgetAdd@@SAXPAV1@@Z @ 258 NONAME ; void HsWidgetPositioningOnWidgetAdd::setInstance(class HsWidgetPositioningOnWidgetAdd *) + ?qt_metacast@HsTitleResolver@@UAEPAXPBD@Z @ 259 NONAME ; void * HsTitleResolver::qt_metacast(char const *) + ??_EHsWidgetPositioningOnWidgetMove@@UAE@I@Z @ 260 NONAME ; HsWidgetPositioningOnWidgetMove::~HsWidgetPositioningOnWidgetMove(unsigned int) + ?extendHorizontalLine@HsSnapToLines@@AAEXXZ @ 261 NONAME ; void HsSnapToLines::extendHorizontalLine(void) + ?qt_metacall@HsTrashBinWidget@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 262 NONAME ; int HsTrashBinWidget::qt_metacall(enum QMetaObject::Call, int, void * *) + ?searchWidthSpace@HsWidgetOrganizer@@AAE_NABVQSizeF@@@Z @ 263 NONAME ; bool HsWidgetOrganizer::searchWidthSpace(class QSizeF const &) + ??1HsImageGridWidget@@UAE@XZ @ 264 NONAME ; HsImageGridWidget::~HsImageGridWidget(void) + ??_EHsAnchorPointInCenter@@UAE@I@Z @ 265 NONAME ; HsAnchorPointInCenter::~HsAnchorPointInCenter(unsigned int) + ?getStaticMetaObject@HsSpinnerDialog@@SAABUQMetaObject@@XZ @ 266 NONAME ; struct QMetaObject const & HsSpinnerDialog::getStaticMetaObject(void) + ?staticMetaObject@HsTitleResolver@@2UQMetaObject@@B @ 267 NONAME ; struct QMetaObject const HsTitleResolver::staticMetaObject + ?checkInactiveRectHorizontalEdgesInRange@HsSnapToLines@@AAEXM@Z @ 268 NONAME ; void HsSnapToLines::checkInactiveRectHorizontalEdgesInRange(float) + ??0HsPropertyAnimationWrapper@@QAE@PAVQObject@@@Z @ 269 NONAME ; HsPropertyAnimationWrapper::HsPropertyAnimationWrapper(class QObject *) + ?createHorizontalLine@HsSnapToLines@@AAEXXZ @ 270 NONAME ; void HsSnapToLines::createHorizontalLine(void) + ?tr@HsSnapLine@@SA?AVQString@@PBD0H@Z @ 271 NONAME ; class QString HsSnapLine::tr(char const *, char const *, int) + ?qt_metacall@HsImageFetcherClient@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 272 NONAME ; int HsImageFetcherClient::qt_metacall(enum QMetaObject::Call, int, void * *) + ??_EHsSpinnerDialog@@UAE@I@Z @ 273 NONAME ; HsSpinnerDialog::~HsSpinnerDialog(unsigned int) + ??0HsImageGridWidget@@QAE@ABVQStringList@@PAVQGraphicsItem@@@Z @ 274 NONAME ; HsImageGridWidget::HsImageGridWidget(class QStringList const &, class QGraphicsItem *) + ?tr@HsImageGridWidget@@SA?AVQString@@PBD0H@Z @ 275 NONAME ; class QString HsImageGridWidget::tr(char const *, char const *, int) +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/hsutils/eabi/hsutilsu.def Wed Aug 18 10:33:57 2010 +0300 @@ -0,0 +1,302 @@ +EXPORTS + _ZN10HsSnapLine11qt_metacallEN11QMetaObject4CallEiPPv @ 1 NONAME + _ZN10HsSnapLine11qt_metacastEPKc @ 2 NONAME + _ZN10HsSnapLine16setConfigurationERK5QHashI7QString8QVariantE @ 3 NONAME + _ZN10HsSnapLine16staticMetaObjectE @ 4 NONAME DATA 16 + _ZN10HsSnapLine19getStaticMetaObjectEv @ 5 NONAME + _ZN10HsSnapLine19stopFadeInAnimationEv @ 6 NONAME + _ZN10HsSnapLine20startFadeInAnimationEv @ 7 NONAME + _ZN10HsSnapLine20stopFadeOutAnimationEv @ 8 NONAME + _ZN10HsSnapLine21startFadeOutAnimationEv @ 9 NONAME + _ZN10HsSnapLine23fadeInAnimationFinishedEv @ 10 NONAME + _ZN10HsSnapLine24fadeOutAnimationFinishedEv @ 11 NONAME + _ZN10HsSnapLine27actionOnFadeInAnimationStopEv @ 12 NONAME + _ZN10HsSnapLine28actionOnFadeOutAnimationStopEv @ 13 NONAME + _ZN10HsSnapLine8hideLineEv @ 14 NONAME + _ZN10HsSnapLine8showLineERK6QLineF @ 15 NONAME + _ZN10HsSnapLineC1EP13QGraphicsItem @ 16 NONAME + _ZN10HsSnapLineC2EP13QGraphicsItem @ 17 NONAME + _ZN10HsSnapLineD0Ev @ 18 NONAME + _ZN10HsSnapLineD1Ev @ 19 NONAME + _ZN10HsSnapLineD2Ev @ 20 NONAME + _ZN11HsMenuEvent9eventTypeEv @ 21 NONAME + _ZN11HsMenuEventC1ENS_13OperationTypeERK4QMapI7QString8QVariantE @ 22 NONAME + _ZN11HsMenuEventC2ENS_13OperationTypeERK4QMapI7QString8QVariantE @ 23 NONAME + _ZN13HsSnapToLines16setConfigurationERK5QHashI7QString8QVariantE @ 24 NONAME + _ZN13HsSnapToLines18createVerticalLineEv @ 25 NONAME + _ZN13HsSnapToLines18extendVerticalLineEv @ 26 NONAME + _ZN13HsSnapToLines19setPagePresentationERK6QRectFRK5QListIS0_ES2_ @ 27 NONAME + _ZN13HsSnapToLines20createHorizontalLineEv @ 28 NONAME + _ZN13HsSnapToLines20extendHorizontalLineEv @ 29 NONAME + _ZN13HsSnapToLines25createSnappableRectanglesERK5QListI6QRectFE @ 30 NONAME + _ZN13HsSnapToLines33compareTopOfMovingRectForSnappingEv @ 31 NONAME + _ZN13HsSnapToLines36compareBottomOfMovingRectForSnappingEv @ 32 NONAME + _ZN13HsSnapToLines37checkInactiveRectVerticalEdgesInRangeEf @ 33 NONAME + _ZN13HsSnapToLines38compareLeftSideOfMovingRectForSnappingEv @ 34 NONAME + _ZN13HsSnapToLines39checkInactiveRectHorizontalEdgesInRangeEf @ 35 NONAME + _ZN13HsSnapToLines39checkInactiveRectPositionToVerticalLineEv @ 36 NONAME + _ZN13HsSnapToLines39compareRightSideOfMovingRectForSnappingEv @ 37 NONAME + _ZN13HsSnapToLines39extendVerticalLineToIncludeInactiveRectEv @ 38 NONAME + _ZN13HsSnapToLines3runERK6QRectF @ 39 NONAME + _ZN13HsSnapToLines41checkInactiveRectPositionToHorizontalLineEv @ 40 NONAME + _ZN13HsSnapToLines41extendHorizontalLineToIncludeInactiveRectEv @ 41 NONAME + _ZN13HsSnapToLines43checkInactiveRectLieLeftOrRightOfMovingRectEv @ 42 NONAME + _ZN13HsSnapToLines44checkInactiveRectLieAboveOrBelowOfMovingRectEv @ 43 NONAME + _ZN13HsSnapToLines45checkInactiveRectBetterFitForVerticalSnappingEff @ 44 NONAME + _ZN13HsSnapToLines47checkInactiveRectBetterFitForHorizontalSnappingEff @ 45 NONAME + _ZN13HsSnapToLinesC1Ev @ 46 NONAME + _ZN13HsSnapToLinesC2Ev @ 47 NONAME + _ZN15HsPageIndicator10initializeEii @ 48 NONAME + _ZN15HsPageIndicator10removeItemEi @ 49 NONAME + _ZN15HsPageIndicator10setSpacingEf @ 50 NONAME + _ZN15HsPageIndicator11layoutItemsEv @ 51 NONAME + _ZN15HsPageIndicator11qt_metacallEN11QMetaObject4CallEiPPv @ 52 NONAME + _ZN15HsPageIndicator11qt_metacastEPKc @ 53 NONAME + _ZN15HsPageIndicator16staticMetaObjectE @ 54 NONAME DATA 16 + _ZN15HsPageIndicator18setActiveItemIndexEi @ 55 NONAME + _ZN15HsPageIndicator19getStaticMetaObjectEv @ 56 NONAME + _ZN15HsPageIndicator7addItemEi @ 57 NONAME + _ZN15HsPageIndicatorC1EfP13QGraphicsItem @ 58 NONAME + _ZN15HsPageIndicatorC2EfP13QGraphicsItem @ 59 NONAME + _ZN15HsPageIndicatorD0Ev @ 60 NONAME + _ZN15HsPageIndicatorD1Ev @ 61 NONAME + _ZN15HsPageIndicatorD2Ev @ 62 NONAME + _ZN15HsSpinnerDialog11qt_metacallEN11QMetaObject4CallEiPPv @ 63 NONAME + _ZN15HsSpinnerDialog11qt_metacastEPKc @ 64 NONAME + _ZN15HsSpinnerDialog16staticMetaObjectE @ 65 NONAME DATA 16 + _ZN15HsSpinnerDialog19getStaticMetaObjectEv @ 66 NONAME + _ZN15HsSpinnerDialog4stopEv @ 67 NONAME + _ZN15HsSpinnerDialog5startEv @ 68 NONAME + _ZN15HsSpinnerDialogC1EP13QGraphicsItem @ 69 NONAME + _ZN15HsSpinnerDialogC2EP13QGraphicsItem @ 70 NONAME + _ZN15HsSpinnerDialogD0Ev @ 71 NONAME + _ZN15HsSpinnerDialogD1Ev @ 72 NONAME + _ZN15HsSpinnerDialogD2Ev @ 73 NONAME + _ZN15HsTitleResolver11qt_metacallEN11QMetaObject4CallEiPPv @ 74 NONAME + _ZN15HsTitleResolver11qt_metacastEPKc @ 75 NONAME + _ZN15HsTitleResolver12titleChangedERK7QString @ 76 NONAME + _ZN15HsTitleResolver15onStatusChangedEN20HsDeviceInfoListener18HsDeviceInfoStatusE @ 77 NONAME + _ZN15HsTitleResolver16staticMetaObjectE @ 78 NONAME DATA 16 + _ZN15HsTitleResolver19getStaticMetaObjectEv @ 79 NONAME + _ZN15HsTitleResolver20onNetworkNameChangedERK7QString @ 80 NONAME + _ZN15HsTitleResolver5titleEv @ 81 NONAME + _ZN15HsTitleResolverC1EP7QObject @ 82 NONAME + _ZN15HsTitleResolverC2EP7QObject @ 83 NONAME + _ZN15HsTitleResolverD0Ev @ 84 NONAME + _ZN15HsTitleResolverD1Ev @ 85 NONAME + _ZN15HsTitleResolverD2Ev @ 86 NONAME + _ZN16HsTrashBinWidget10deactivateEv @ 87 NONAME + _ZN16HsTrashBinWidget11qt_metacallEN11QMetaObject4CallEiPPv @ 88 NONAME + _ZN16HsTrashBinWidget11qt_metacastEPKc @ 89 NONAME + _ZN16HsTrashBinWidget16staticMetaObjectE @ 90 NONAME DATA 16 + _ZN16HsTrashBinWidget19getStaticMetaObjectEv @ 91 NONAME + _ZN16HsTrashBinWidget8activateEv @ 92 NONAME + _ZN16HsTrashBinWidgetC1EP13QGraphicsItem @ 93 NONAME + _ZN16HsTrashBinWidgetC2EP13QGraphicsItem @ 94 NONAME + _ZN16HsTrashBinWidgetD0Ev @ 95 NONAME + _ZN16HsTrashBinWidgetD1Ev @ 96 NONAME + _ZN16HsTrashBinWidgetD2Ev @ 97 NONAME + _ZN17HsImageGridWidget10setContentERK11QStringList @ 98 NONAME + _ZN17HsImageGridWidget11qt_metacallEN11QMetaObject4CallEiPPv @ 99 NONAME + _ZN17HsImageGridWidget11qt_metacastEPKc @ 100 NONAME + _ZN17HsImageGridWidget13imageSelectedERK7QString @ 101 NONAME + _ZN17HsImageGridWidget16staticMetaObjectE @ 102 NONAME DATA 16 + _ZN17HsImageGridWidget17gridItemActivatedERK11QModelIndex @ 103 NONAME + _ZN17HsImageGridWidget19getStaticMetaObjectEv @ 104 NONAME + _ZN17HsImageGridWidgetC1ERK11QStringListP13QGraphicsItem @ 105 NONAME + _ZN17HsImageGridWidgetC2ERK11QStringListP13QGraphicsItem @ 106 NONAME + _ZN17HsImageGridWidgetD0Ev @ 107 NONAME + _ZN17HsImageGridWidgetD1Ev @ 108 NONAME + _ZN17HsImageGridWidgetD2Ev @ 109 NONAME + _ZN17HsWidgetOrganizer11initAnchorsERK6QSizeF @ 110 NONAME + _ZN17HsWidgetOrganizer14getAnchorPointERK6QSizeF @ 111 NONAME + _ZN17HsWidgetOrganizer16searchWidthSpaceERK6QSizeF @ 112 NONAME + _ZN17HsWidgetOrganizer17searchHeightSpaceEi @ 113 NONAME + _ZN17HsWidgetOrganizer19markReservedAnchorsEv @ 114 NONAME + _ZN17HsWidgetOrganizer20getAnchorCoordinatesEi @ 115 NONAME + _ZN17HsWidgetOrganizer20lenghtInAnchorPointsE8QVariant @ 116 NONAME + _ZN17HsWidgetOrganizer21getIndexForCoordinateE7QPointF @ 117 NONAME + _ZN17HsWidgetOrganizer7convertERK6QRectFRK5QListIS0_ES6_RK7QPointF @ 118 NONAME + _ZN18HsMenuEventFactory18createUnknownEventEv @ 119 NONAME + _ZN18HsMenuEventFactory24createNewCollectionEventEv @ 120 NONAME + _ZN18HsMenuEventFactory25createAppDetailsViewEventEi @ 121 NONAME + _ZN18HsMenuEventFactory25createOpenAppLibraryEventEN2Hs10HsMenuModeE8QVariant @ 122 NONAME + _ZN18HsMenuEventFactory25createOpenCollectionEventEiRK7QString @ 123 NONAME + _ZN18HsMenuEventFactory25createOpenHomeScreenEventEv @ 124 NONAME + _ZN18HsMenuEventFactory26createAddToHomeScreenEventEiN2Hs10HsMenuModeE8QVariant @ 125 NONAME + _ZN18HsMenuEventFactory26createAppSettingsViewEventEi @ 126 NONAME + _ZN18HsMenuEventFactory26createInstallationLogEventEv @ 127 NONAME + _ZN18HsMenuEventFactory26createPreviewHSWidgetEventEiRK7QStringS2_S2_ @ 128 NONAME + _ZN18HsMenuEventFactory27createDeleteCollectionEventEi @ 129 NONAME + _ZN18HsMenuEventFactory27createRenameCollectionEventEi @ 130 NONAME + _ZN18HsMenuEventFactory28createArrangeCollectionEventEii @ 131 NONAME + _ZN18HsMenuEventFactory28createCollectionDeletedEventEv @ 132 NONAME + _ZN18HsMenuEventFactory28createOpenInstalledViewEventEv @ 133 NONAME + _ZN18HsMenuEventFactory31createUninstallApplicationEventEi @ 134 NONAME + _ZN18HsMenuEventFactory32createArrangeAllCollectionsEventEi @ 135 NONAME + _ZN18HsMenuEventFactory34createRemoveAppFromCollectionEventEii @ 136 NONAME + _ZN18HsMenuEventFactory36createAddAppsFromCollectionViewEventEii @ 137 NONAME + _ZN18HsMenuEventFactory38createAddAppsFromApplicationsViewEventEN2Hs15HsSortAttributeEi @ 138 NONAME + _ZN18HsMenuEventFactory39createOpenCollectionFromAppLibraryEventEiRK7QString @ 139 NONAME + _ZN19HsMenuDialogFactoryD0Ev @ 140 NONAME + _ZN19HsMenuDialogFactoryD1Ev @ 141 NONAME + _ZN19HsMenuDialogFactoryD2Ev @ 142 NONAME + _ZN19HsMessageBoxWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 143 NONAME + _ZN19HsMessageBoxWrapper11qt_metacastEPKc @ 144 NONAME + _ZN19HsMessageBoxWrapper12setQueryTextERK7QString @ 145 NONAME + _ZN19HsMessageBoxWrapper14onDialogClosedEi @ 146 NONAME + _ZN19HsMessageBoxWrapper16staticMetaObjectE @ 147 NONAME DATA 16 + _ZN19HsMessageBoxWrapper19getStaticMetaObjectEv @ 148 NONAME + _ZN19HsMessageBoxWrapper4showEv @ 149 NONAME + _ZN19HsMessageBoxWrapper5closeEv @ 150 NONAME + _ZN19HsMessageBoxWrapper8acceptedEv @ 151 NONAME + _ZN19HsMessageBoxWrapper8rejectedEv @ 152 NONAME + _ZN19HsMessageBoxWrapper9setHeaderERK7QString @ 153 NONAME + _ZN19HsMessageBoxWrapperC1EP7QObject @ 154 NONAME + _ZN19HsMessageBoxWrapperC2EP7QObject @ 155 NONAME + _ZN19HsMessageBoxWrapperD0Ev @ 156 NONAME + _ZN19HsMessageBoxWrapperD1Ev @ 157 NONAME + _ZN19HsMessageBoxWrapperD2Ev @ 158 NONAME + _ZN19XQAIWGetImageClient10findImagesERK7QStringRK11QStringListRS3_ @ 159 NONAME + _ZN19XQAIWGetImageClient11fetchFailedEiRK7QString @ 160 NONAME + _ZN19XQAIWGetImageClient11qt_metacallEN11QMetaObject4CallEiPPv @ 161 NONAME + _ZN19XQAIWGetImageClient11qt_metacastEPKc @ 162 NONAME + _ZN19XQAIWGetImageClient13imageSelectedERK7QString @ 163 NONAME + _ZN19XQAIWGetImageClient14fetchCompletedERK7QString @ 164 NONAME + _ZN19XQAIWGetImageClient16requestCompletedERK8QVariant @ 165 NONAME + _ZN19XQAIWGetImageClient16staticMetaObjectE @ 166 NONAME DATA 16 + _ZN19XQAIWGetImageClient19getStaticMetaObjectEv @ 167 NONAME + _ZN19XQAIWGetImageClient23imageSelectionCancelledEv @ 168 NONAME + _ZN19XQAIWGetImageClient5fetchEv @ 169 NONAME + _ZN19XQAIWGetImageClientC1Ev @ 170 NONAME + _ZN19XQAIWGetImageClientC2Ev @ 171 NONAME + _ZN19XQAIWGetImageClientD0Ev @ 172 NONAME + _ZN19XQAIWGetImageClientD1Ev @ 173 NONAME + _ZN19XQAIWGetImageClientD2Ev @ 174 NONAME + _ZN20HsImageFetcherClient11fetchFailedEiRK7QString @ 175 NONAME + _ZN20HsImageFetcherClient11handleErrorEiRK7QString @ 176 NONAME + _ZN20HsImageFetcherClient11qt_metacallEN11QMetaObject4CallEiPPv @ 177 NONAME + _ZN20HsImageFetcherClient11qt_metacastEPKc @ 178 NONAME + _ZN20HsImageFetcherClient14fetchCompletedERK7QString @ 179 NONAME + _ZN20HsImageFetcherClient16staticMetaObjectE @ 180 NONAME DATA 16 + _ZN20HsImageFetcherClient19getStaticMetaObjectEv @ 181 NONAME + _ZN20HsImageFetcherClient5fetchEv @ 182 NONAME + _ZN20HsImageFetcherClient8handleOkERK8QVariant @ 183 NONAME + _ZN20HsImageFetcherClientC1EP7QObject @ 184 NONAME + _ZN20HsImageFetcherClientC2EP7QObject @ 185 NONAME + _ZN20HsImageFetcherClientD0Ev @ 186 NONAME + _ZN20HsImageFetcherClientD1Ev @ 187 NONAME + _ZN20HsImageFetcherClientD2Ev @ 188 NONAME + _ZN21HsAnchorPointInCenter7convertERK6QRectFRK5QListIS0_ES6_RK7QPointF @ 189 NONAME + _ZN21HsMenuEventTransition9eventTestEP6QEvent @ 190 NONAME + _ZN21HsMenuEventTransitionC1EN11HsMenuEvent13OperationTypeEP6QStateS3_ @ 191 NONAME + _ZN21HsMenuEventTransitionC2EN11HsMenuEvent13OperationTypeEP6QStateS3_ @ 192 NONAME + _ZN26HsAnchorPointInBottomRight7convertERK6QRectFRK5QListIS0_ES6_RK7QPointF @ 193 NONAME + _ZN26HsPropertyAnimationWrapper10setForwardEv @ 194 NONAME + _ZN26HsPropertyAnimationWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 195 NONAME + _ZN26HsPropertyAnimationWrapper11qt_metacastEPKc @ 196 NONAME + _ZN26HsPropertyAnimationWrapper11setBackwardEv @ 197 NONAME + _ZN26HsPropertyAnimationWrapper11setDurationEi @ 198 NONAME + _ZN26HsPropertyAnimationWrapper11setEndValueERK8QVariant @ 199 NONAME + _ZN26HsPropertyAnimationWrapper14setEasingCurveERK12QEasingCurve @ 200 NONAME + _ZN26HsPropertyAnimationWrapper15setPropertyNameERK10QByteArray @ 201 NONAME + _ZN26HsPropertyAnimationWrapper15setTargetObjectEP7QObject @ 202 NONAME + _ZN26HsPropertyAnimationWrapper16staticMetaObjectE @ 203 NONAME DATA 16 + _ZN26HsPropertyAnimationWrapper19getStaticMetaObjectEv @ 204 NONAME + _ZN26HsPropertyAnimationWrapper4stopEv @ 205 NONAME + _ZN26HsPropertyAnimationWrapper5startEv @ 206 NONAME + _ZN26HsPropertyAnimationWrapper8finishedEv @ 207 NONAME + _ZN26HsPropertyAnimationWrapper9isRunningEv @ 208 NONAME + _ZN26HsPropertyAnimationWrapperC1EP7QObject @ 209 NONAME + _ZN26HsPropertyAnimationWrapperC2EP7QObject @ 210 NONAME + _ZN26HsPropertyAnimationWrapperD0Ev @ 211 NONAME + _ZN26HsPropertyAnimationWrapperD1Ev @ 212 NONAME + _ZN26HsPropertyAnimationWrapperD2Ev @ 213 NONAME + _ZN30HsWidgetPositioningOnWidgetAdd11setInstanceEPS_ @ 214 NONAME + _ZN30HsWidgetPositioningOnWidgetAdd8instanceEv @ 215 NONAME + _ZN30HsWidgetPositioningOnWidgetAdd9mInstanceE @ 216 NONAME DATA 4 + _ZN31HsWidgetPositioningOnWidgetMove11setInstanceEPS_ @ 217 NONAME + _ZN31HsWidgetPositioningOnWidgetMove8instanceEv @ 218 NONAME + _ZN31HsWidgetPositioningOnWidgetMove9mInstanceE @ 219 NONAME DATA 4 + _ZN38HsWidgetPositioningOnOrientationChange11setInstanceEPS_ @ 220 NONAME + _ZN38HsWidgetPositioningOnOrientationChange8instanceEv @ 221 NONAME + _ZN38HsWidgetPositioningOnOrientationChange9mInstanceE @ 222 NONAME DATA 4 + _ZN46HsAdvancedWidgetPositioningOnOrientationChange7convertERK6QRectFRK5QListIS0_ES2_ @ 223 NONAME + _ZNK10HsSnapLine10metaObjectEv @ 224 NONAME + _ZNK10HsSnapLine24isFadeInAnimationRunningEv @ 225 NONAME + _ZNK10HsSnapLine25isFadeOutAnimationRunningEv @ 226 NONAME + _ZNK11HsMenuEvent4dataEv @ 227 NONAME + _ZNK11HsMenuEvent9operationEv @ 228 NONAME + _ZNK15HsPageIndicator10metaObjectEv @ 229 NONAME + _ZNK15HsPageIndicator15activeItemIndexEv @ 230 NONAME + _ZNK15HsPageIndicator18isAnimationRunningEv @ 231 NONAME + _ZNK15HsPageIndicator9itemCountEv @ 232 NONAME + _ZNK15HsSpinnerDialog10metaObjectEv @ 233 NONAME + _ZNK15HsTitleResolver10metaObjectEv @ 234 NONAME + _ZNK16HsTrashBinWidget10metaObjectEv @ 235 NONAME + _ZNK17HsImageGridWidget10metaObjectEv @ 236 NONAME + _ZNK19HsMenuDialogFactory12setUpActionsEP12HbMessageBoxRK11QStringList @ 237 NONAME + _ZNK19HsMenuDialogFactory6createERK7QStringNS_7OptionsE @ 238 NONAME + _ZNK19HsMessageBoxWrapper10metaObjectEv @ 239 NONAME + _ZNK19XQAIWGetImageClient10metaObjectEv @ 240 NONAME + _ZNK20HsImageFetcherClient10metaObjectEv @ 241 NONAME + _ZNK26HsPropertyAnimationWrapper10metaObjectEv @ 242 NONAME + _ZNK26HsPropertyAnimationWrapper9isForwardEv @ 243 NONAME + _ZTI10HsSnapLine @ 244 NONAME + _ZTI11HsMenuEvent @ 245 NONAME + _ZTI13HsSnapToLines @ 246 NONAME + _ZTI15HsPageIndicator @ 247 NONAME + _ZTI15HsSpinnerDialog @ 248 NONAME + _ZTI15HsTitleResolver @ 249 NONAME + _ZTI16HsTrashBinWidget @ 250 NONAME + _ZTI17HsImageGridWidget @ 251 NONAME + _ZTI17HsWidgetOrganizer @ 252 NONAME + _ZTI19HsMenuDialogFactory @ 253 NONAME + _ZTI19HsMessageBoxWrapper @ 254 NONAME + _ZTI19XQAIWGetImageClient @ 255 NONAME + _ZTI20HsImageFetcherClient @ 256 NONAME + _ZTI21HsAnchorPointInCenter @ 257 NONAME + _ZTI21HsMenuEventTransition @ 258 NONAME + _ZTI26HsAnchorPointInBottomRight @ 259 NONAME + _ZTI26HsPropertyAnimationWrapper @ 260 NONAME + _ZTI30HsWidgetPositioningOnWidgetAdd @ 261 NONAME + _ZTI31HsWidgetPositioningOnWidgetMove @ 262 NONAME + _ZTI38HsWidgetPositioningOnOrientationChange @ 263 NONAME + _ZTI46HsAdvancedWidgetPositioningOnOrientationChange @ 264 NONAME + _ZTV10HsSnapLine @ 265 NONAME + _ZTV11HsMenuEvent @ 266 NONAME + _ZTV13HsSnapToLines @ 267 NONAME + _ZTV15HsPageIndicator @ 268 NONAME + _ZTV15HsSpinnerDialog @ 269 NONAME + _ZTV15HsTitleResolver @ 270 NONAME + _ZTV16HsTrashBinWidget @ 271 NONAME + _ZTV17HsImageGridWidget @ 272 NONAME + _ZTV17HsWidgetOrganizer @ 273 NONAME + _ZTV19HsMenuDialogFactory @ 274 NONAME + _ZTV19HsMessageBoxWrapper @ 275 NONAME + _ZTV19XQAIWGetImageClient @ 276 NONAME + _ZTV20HsImageFetcherClient @ 277 NONAME + _ZTV21HsAnchorPointInCenter @ 278 NONAME + _ZTV21HsMenuEventTransition @ 279 NONAME + _ZTV26HsAnchorPointInBottomRight @ 280 NONAME + _ZTV26HsPropertyAnimationWrapper @ 281 NONAME + _ZTV46HsAdvancedWidgetPositioningOnOrientationChange @ 282 NONAME + _ZThn16_N15HsPageIndicatorD0Ev @ 283 NONAME + _ZThn16_N15HsPageIndicatorD1Ev @ 284 NONAME + _ZThn16_N15HsSpinnerDialogD0Ev @ 285 NONAME + _ZThn16_N15HsSpinnerDialogD1Ev @ 286 NONAME + _ZThn16_N16HsTrashBinWidgetD0Ev @ 287 NONAME + _ZThn16_N16HsTrashBinWidgetD1Ev @ 288 NONAME + _ZThn16_N17HsImageGridWidgetD0Ev @ 289 NONAME + _ZThn16_N17HsImageGridWidgetD1Ev @ 290 NONAME + _ZThn8_N10HsSnapLineD0Ev @ 291 NONAME + _ZThn8_N10HsSnapLineD1Ev @ 292 NONAME + _ZThn8_N15HsPageIndicatorD0Ev @ 293 NONAME + _ZThn8_N15HsPageIndicatorD1Ev @ 294 NONAME + _ZThn8_N15HsSpinnerDialogD0Ev @ 295 NONAME + _ZThn8_N15HsSpinnerDialogD1Ev @ 296 NONAME + _ZThn8_N16HsTrashBinWidgetD0Ev @ 297 NONAME + _ZThn8_N16HsTrashBinWidgetD1Ev @ 298 NONAME + _ZThn8_N17HsImageGridWidgetD0Ev @ 299 NONAME + _ZThn8_N17HsImageGridWidgetD1Ev @ 300 NONAME +
--- a/homescreenapp/hsutils/inc/hsdeviceinfolistener.h Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/hsutils/inc/hsdeviceinfolistener.h Wed Aug 18 10:33:57 2010 +0300 @@ -23,7 +23,7 @@ #ifdef HSUTILS_TEST #include "mocksysteminfo.h" #else -#include <qsysteminfo.h> +#include <QSystemInfo> QTM_USE_NAMESPACE #endif
--- a/homescreenapp/hsutils/inc/hsmenueventfactory.h Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/hsutils/inc/hsmenueventfactory.h Wed Aug 18 10:33:57 2010 +0300 @@ -38,7 +38,7 @@ public: - static QEvent *createAddToHomeScreenEvent(int entryId, HsMenuMode menuMode, QVariant homescreenData = NULL); + static QEvent *createAddToHomeScreenEvent(int entryId, Hs::HsMenuMode menuMode, QVariant homescreenData = NULL); static QEvent *createOpenCollectionEvent(int itemId, const QString &collectionType); @@ -53,7 +53,7 @@ static QEvent *createDeleteCollectionEvent(int aItemId); static QEvent *createOpenAppLibraryEvent( - HsMenuMode menuMode = NormalHsMenuMode, QVariant homescreenData = NULL); + Hs::HsMenuMode menuMode = Hs::NormalHsMenuMode, QVariant homescreenData = NULL); static QEvent *createOpenInstalledViewEvent(); @@ -62,7 +62,7 @@ static QEvent *createCollectionDeletedEvent(); static QEvent *createAddAppsFromApplicationsViewEvent( - HsSortAttribute aApplicationsSortOder, + Hs::HsSortAttribute aApplicationsSortOder, int aItemId = 0); static QEvent *createAddAppsFromCollectionViewEvent(
--- a/homescreenapp/hsutils/src/hsmenueventfactory.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/hsutils/src/hsmenueventfactory.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -46,14 +46,14 @@ */ QEvent *HsMenuEventFactory::createAddToHomeScreenEvent( int entryId, - HsMenuMode menuMode, + Hs::HsMenuMode menuMode, QVariant homescreenData) { // get CaEntry type, and if widget get uri and library stored as properties... QVariantMap params; - params.insert(itemIdKey(), entryId); - params.insert(menuModeType(), menuMode); - params.insert(HOMESCREENDATA, homescreenData); + params.insert(Hs::itemIdKey, entryId); + params.insert(Hs::menuModeType, menuMode); + params.insert(Hs::homescreenData, homescreenData); return new HsMenuEvent(HsMenuEvent::AddToHomeScreen, params); } @@ -68,8 +68,8 @@ const QString &collectionType) { QVariantMap params; - params.insert(itemIdKey(), itemId); - params.insert(entryTypeNameKey(), collectionType); + params.insert(Hs::itemIdKey, itemId); + params.insert(Hs::entryTypeNameKey, collectionType); return new HsMenuEvent(HsMenuEvent::OpenCollection, params); } @@ -84,8 +84,8 @@ const QString &collectionType) { QVariantMap params; - params.insert(itemIdKey(), itemId); - params.insert(entryTypeNameKey(), collectionType); + params.insert(Hs::itemIdKey, itemId); + params.insert(Hs::entryTypeNameKey, collectionType); return new HsMenuEvent(HsMenuEvent::OpenCollectionFromAppLibrary, params); } @@ -98,7 +98,7 @@ QEvent *HsMenuEventFactory::createRenameCollectionEvent(int aItemId) { QVariantMap params; - params.insert(itemIdKey(), aItemId); + params.insert(Hs::itemIdKey, aItemId); return new HsMenuEvent(HsMenuEvent::RenameCollection, params); } @@ -110,7 +110,7 @@ QEvent *HsMenuEventFactory::createNewCollectionEvent() { QVariantMap params; - params.insert(itemIdKey(), 0); + params.insert(Hs::itemIdKey, 0); return new HsMenuEvent(HsMenuEvent::CreateCollection, params); } @@ -123,7 +123,7 @@ QEvent *HsMenuEventFactory::createDeleteCollectionEvent(int aItemId) { QVariantMap params; - params.insert(itemIdKey(), aItemId); + params.insert(Hs::itemIdKey, aItemId); return new HsMenuEvent(HsMenuEvent::DeleteCollection, params); } @@ -134,12 +134,12 @@ \return Open Applications Library event. */ QEvent *HsMenuEventFactory::createOpenAppLibraryEvent( - HsMenuMode menuMode, + Hs::HsMenuMode menuMode, QVariant homescreenData) { QVariantMap params; - params.insert(menuModeType(), menuMode); - params.insert(HOMESCREENDATA, homescreenData); + params.insert(Hs::menuModeType, menuMode); + params.insert(Hs::homescreenData, homescreenData); return new HsMenuEvent(HsMenuEvent::OpenApplicationLibrary, params); } @@ -181,12 +181,12 @@ \return Add applications to collection event. */ QEvent *HsMenuEventFactory::createAddAppsFromApplicationsViewEvent( - HsSortAttribute aApplicationsSortOder, + Hs::HsSortAttribute aApplicationsSortOder, int aItemId) { QVariantMap params; - params.insert(appSortOrderKey(), aApplicationsSortOder); - params.insert(itemIdKey(), aItemId); + params.insert(Hs::appSortOrderKey, aApplicationsSortOder); + params.insert(Hs::itemIdKey, aItemId); return new HsMenuEvent(HsMenuEvent::AddAppsToCollection, params); } @@ -202,8 +202,8 @@ int aApplicationId) { QVariantMap params; - params.insert(itemIdKey(), aApplicationId); - params.insert(collectionIdKey(), aCollectionId); + params.insert(Hs::itemIdKey, aApplicationId); + params.insert(Hs::collectionIdKey, aCollectionId); return new HsMenuEvent(HsMenuEvent::AddAppsToCollection, params); } @@ -218,8 +218,8 @@ int aCollectionId) { QVariantMap params; - params.insert(itemIdKey(), aItemId); - params.insert(collectionIdKey(), aCollectionId); + params.insert(Hs::itemIdKey, aItemId); + params.insert(Hs::collectionIdKey, aCollectionId); return new HsMenuEvent(HsMenuEvent::RemoveAppFromCollection, params); } @@ -233,7 +233,7 @@ QEvent *HsMenuEventFactory::createUninstallApplicationEvent(int aItemId) { QVariantMap params; - params.insert(itemIdKey(), aItemId); + params.insert(Hs::itemIdKey, aItemId); return new HsMenuEvent(HsMenuEvent::UninstallApplication, params); } @@ -249,8 +249,8 @@ int aCollectionId) { QVariantMap params; - params.insert(itemIdKey(), aTopItemId); - params.insert(collectionIdKey(), aCollectionId); + params.insert(Hs::itemIdKey, aTopItemId); + params.insert(Hs::collectionIdKey, aCollectionId); return new HsMenuEvent(HsMenuEvent::ArrangeCollection, params); } @@ -263,7 +263,7 @@ QEvent *HsMenuEventFactory::createArrangeAllCollectionsEvent(int aTopItemId) { QVariantMap params; - params.insert(itemIdKey(), aTopItemId); + params.insert(Hs::itemIdKey, aTopItemId); return new HsMenuEvent(HsMenuEvent::ArrangeAllCollections, params); } @@ -284,17 +284,17 @@ // get CaEntry type, and if widget get uri and library stored as properties... QVariantMap params; - params.insert(itemIdKey(), entryId); + params.insert(Hs::itemIdKey, entryId); params.insert( - widgetUriAttributeName(), + Hs::widgetUriAttributeName, uri); params.insert( - widgetLibraryAttributeName(), + Hs::widgetLibraryAttributeName, library); - params.insert(entryTypeNameKey(), entryTypeName); + params.insert(Hs::entryTypeNameKey, entryTypeName); return new HsMenuEvent(HsMenuEvent::PreviewHSWidget, params); } @@ -307,7 +307,7 @@ QEvent *HsMenuEventFactory::createAppSettingsViewEvent(int entryId) { QVariantMap params; - params.insert(itemIdKey(), entryId); + params.insert(Hs::itemIdKey, entryId); return new HsMenuEvent(HsMenuEvent::ShowAppSettings, params); } @@ -320,7 +320,7 @@ QEvent *HsMenuEventFactory::createAppDetailsViewEvent(int entryId) { QVariantMap params; - params.insert(itemIdKey(), entryId); + params.insert(Hs::itemIdKey, entryId); return new HsMenuEvent(HsMenuEvent::ShowAppDetails, params); }
--- a/homescreenapp/hsutils/src/hssnapline.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/hsutils/src/hssnapline.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -61,8 +61,8 @@ { bool canConvert = false; //The following values should be in int, so the status received in canConvert is ignored - mFadeInAnimationDuration = configuration[SNAPLINEFADEINDURATION].toInt(&canConvert); - mFadeOutAnimationDuration = configuration[SNAPLINEFADEOUTDURATION].toInt(&canConvert); + mFadeInAnimationDuration = configuration[Hs::snapLineFadeinDuration].toInt(&canConvert); + mFadeOutAnimationDuration = configuration[Hs::snapLineFadeoutDuration].toInt(&canConvert); } /*!
--- a/homescreenapp/hsutils/src/hswidgetpositioningonwidgetadd.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/hsutils/src/hswidgetpositioningonwidgetadd.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -200,15 +200,15 @@ mAnchors = temp; // test flag - int test = 0; +// int test = 0; // initialize anchor network for widget positions - if (test == 0) { +// if (test == 0) { initAnchors(contentArea.size()); - } else { - mAnchorDistance = 2; - initAnchors(QSizeF(6,6)); - } +// } else { +// mAnchorDistance = 2; +// initAnchors(QSizeF(6,6)); +// } // mark existing rects (widgets) reserved foreach (QRectF rect, existingRects) { @@ -229,12 +229,12 @@ // get positions for all new rects (widgets) for ( int i = 0; i < newRects.count(); i++) { bool found = false; - if (test == 0) { +// if (test == 0) { // find first free anchor point for rect found = getAnchorPoint(newRects.at(i).size()); - } else { - found = getAnchorPoint(QSizeF(2,2)); - } +// } else { +// found = getAnchorPoint(QSizeF(2,2)); +// } if (found) { // save to geometry list @@ -264,6 +264,7 @@ QList<QRectF> calculatedRects = centerAlgorithm->convert(contentArea, tmpExistingRects, notOrganizedRects, QPointF()); toGeometries += calculatedRects; + delete centerAlgorithm; } return toGeometries; @@ -289,7 +290,7 @@ mAnchorRows = lenghtInAnchorPoints(areaSize.height()); // create anchor network - for (int i = 0; i < (mAnchorRows * mAnchorColumns); i = i++) { + for (int i = 0; i < (mAnchorRows * mAnchorColumns); i++) { mAnchors << false; } // zero start points @@ -376,8 +377,8 @@ { mEndHeightAnchorPoint = QPointF(0,0); - for (int i = mStartWidthAnchorPoint.x(); i <= mEndWidthAnchorPoint.x(); i = i++) { - for (int j = mStartWidthAnchorPoint.y(); j <= (mStartWidthAnchorPoint.y() + contentHeight); j = j++) { + for (int i = mStartWidthAnchorPoint.x(); i <= mEndWidthAnchorPoint.x(); i++) { + for (int j = mStartWidthAnchorPoint.y(); j <= (mStartWidthAnchorPoint.y() + contentHeight); j++) { int index = getIndexForCoordinate(QPointF(i,j)); // check that index is not out of bounds if (index == -1) {
--- a/homescreenapp/hsutils/src/hswidgetpositioningonwidgetmove.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/hsutils/src/hswidgetpositioningonwidgetmove.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -77,10 +77,10 @@ void HsSnapToLines::setConfiguration(const QVariantHash &configuration) { bool canConvert = false; - mSnapEnabled = configuration[SNAPENABLED].toBool(); + mSnapEnabled = configuration[Hs::snapEnabled].toBool(); //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); + mSnapForce = configuration[Hs::snapForce].toDouble(&canConvert); + mSnapGap = configuration[Hs::snapGap].toDouble(&canConvert); } /*!
--- a/homescreenapp/hswidgetuninstaller/src/hswidgetinstallersender.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/hswidgetuninstaller/src/hswidgetinstallersender.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -67,7 +67,7 @@ widgetDescriptorHash["serviceXml"] = widgetDescriptor.serviceXml(); widgetDescriptorHash["version"] = widgetDescriptor.version(); widgetDescriptorHash["installationPath"] = widgetDescriptor.installationPath(); - widgetDescriptorHash["translationFilename"] = widgetDescriptor.translationFilename(); + widgetDescriptorHash["Hs::translationFilename"] = widgetDescriptor.translationFilename(); XQServiceRequest snd(INTERFACE_NAME, functionSignature, true); XQRequestInfo requestInfo = snd.info();
--- a/homescreenapp/inc/hsapp_defs.h Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/inc/hsapp_defs.h Wed Aug 18 10:33:57 2010 +0300 @@ -15,87 +15,97 @@ * */ -#ifndef HSAPP_DEFS_H_ -#define HSAPP_DEFS_H_ -#include <qstring.h> +#ifndef HSAPP_DEFS_H +#define HSAPP_DEFS_H -inline const QString widgetLibraryAttributeName(); -inline const QString widgetUriAttributeName(); -inline const QString applicationTypeName(); -inline const QString urlTypeName(); -inline const QString collectionTypeName(); -inline const QString collectionDownloadedTypeName(); -inline const QString menuCollectionsTypeName(); -inline const QString widgetTypeName(); -inline const QString templatedApplicationTypeName(); -inline const QString widgetParam(); -inline const QString openActionIdentifier(); -inline const QString removeActionIdentifier(); -inline const QString itemIdKey(); -inline const QString collectionIdKey(); -inline const QString collectionSortOrderKey(); -inline const QString appSortOrderKey(); -inline const QString entryTypeNameKey(); -inline const QString applicationUidEntryKey(); -inline const QString urlEntryKey(); -inline const QString defaultCollectionIconId(); -inline const QString menuModeType(); -inline const QString swTypeKey(); -inline const QString javaSwType(); -static const char *const HS_CWRT_APP_TYPE="cwrt"; -static const char *const HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE="wrtwidgetuiplugin"; -inline const QString packageTypeName(); -inline const QString appSettingsPlugin(); -inline const QString groupNameAttributeName(); -inline const QString componentIdAttributeName(); -inline const QString entryShortName(); +namespace Hs { + const char widgetPathAttributeName[] = "widget:path"; + const char widgetLibraryAttributeName[] = "widget:library"; + const char widgetUriAttributeName[] = "widget:uri"; + const char applicationTypeName[] = "application"; + const char urlTypeName[] = "url"; + const char collectionTypeName[] = "collection"; + const char collectionDownloadedTypeName[] = "collection::downloaded"; + const char menuCollectionsTypeName[] = "menucollections"; + const char widgetTypeName[] = "widget"; + const char templatedApplicationTypeName[] = "templatedApplication"; + const char widgetParam[] = "widgetparam:"; + const char openActionIdentifier[] = "open"; + const char removeActionIdentifier[] = "remove"; + const char itemIdKey[] = "item_id"; + const char collectionIdKey[] = "collection_id"; + const char collectionSortOrderKey[] = "collection_sort_order"; + const char appSortOrderKey[] = "app_sort_order"; + const char entryTypeNameKey[] = "entry_type_name"; + const char applicationUidEntryKey[] = "application:uid"; + const char urlEntryKey[] = "url"; + const char defaultCollectionIconId[] = "qtg_large_applications_user"; + const char newIconId[] = "qtg_small_new_event"; + const char menuModeType[] = "menu_mode_type"; + const char swTypeKey[] = "apptype"; + const char javaSwType[] = "java"; + static const char *const HS_CWRT_APP_TYPE="cwrt"; + static const char *const HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE= + "wrtwidgetuiplugin"; + const char packageTypeName[] = "package"; + const char appSettingsPlugin[] = "app_settings_plugin"; + const char groupNameAttributeName[] = "appgroup_name"; + const char groupAppLibRecentView[] = "AppLibRecentView"; + const char componentIdAttributeName[] = "component_id"; + const char entryShortName[] = "short_name"; + + const char translationFilename[] = "widget:translation_file"; + const char activityHsIdleView[] = "HsIdleView"; + const char activityAppLibMainView[] = "AppLibMainView"; + + + const char tsDeviceDialogUri[] = + "com.nokia.taskswitcher.tsdevicedialogplugin/1.0"; -// Sort attribute -enum HsSortAttribute { - NoHsSortAttribute, - AscendingNameHsSortAttribute, - DescendingNameHsSortAttribute, - LatestOnTopHsSortAttribute, - OldestOnTopHsSortAttribute, - CustomHsSortAttribute -}; + const char library[] = "library"; + const char uri[] = "uri"; + const char preferences[] = "preferences"; + const char homescreenData[] = "homescreenData"; -enum HsMenuMode { - NormalHsMenuMode, - AddHsMenuMode -}; + const char snapEnabled[] = "snapenabled"; + const char snapForce[] = "snapforce"; + const char snapGap[] = "snapgap"; + const char pageMargin[] = "pagemargin"; + const char snapLineFadeinDuration[] = "snaplinefadeinduration"; + const char snapLineFadeoutDuration[] = "snaplinefadeoutduration"; + + const int softwareUpdateApplicationUid = 0x2001FE2F; + const int oviLauncherApplicationUid = 0x2002D07F; -enum HsContextAction { - AddToHomeScreenContextAction = 1, - AddToCollectionContextAction, - UninstallContextAction, - AppSettingContextAction, - RenameContextAction, - DeleteContextAction, - RemoveFromCollectionContextAction, - AppDetailsContextAction, - OpenContextAction -}; - - -const char TS_DEVICE_DIALOG_URI[] = - "com.nokia.taskswitcher.tsdevicedialogplugin/1.0"; + // Sort attribute + enum HsSortAttribute { + NoHsSortAttribute, + AscendingNameHsSortAttribute, + DescendingNameHsSortAttribute, + LatestOnTopHsSortAttribute, + OldestOnTopHsSortAttribute, + CustomHsSortAttribute + }; + + enum HsMenuMode { + NormalHsMenuMode, + AddHsMenuMode + }; + + enum HsContextAction { + AddToHomeScreenContextAction = 1, + AddToCollectionFromApplicationsViewContextAction, + AddToCollectionFromCollectionViewContextAction, + UninstallContextAction, + AppSettingContextAction, + RemoveFromCollectionContextAction, + AppDetailsContextAction, + OpenAppContextAction, + OpenCollectionContextAction, + DeleteCollectionContextAction, + RenameCollectionContextAction + }; -const char LIBRARY[] = "library"; -const char URI[] = "uri"; -const char PREFERENCES[] = "preferences"; -const char HOMESCREENDATA[] = "homescreenData"; +} // namespace Hs -const char SNAPENABLED[] = "snapenabled"; -const char SNAPFORCE[] = "snapforce"; -const char SNAPGAP[] = "snapgap"; -const char PAGEMARGIN[] = "pagemargin"; -const char SNAPLINEFADEINDURATION[] = "snaplinefadeinduration"; -const char SNAPLINEFADEOUTDURATION[] = "snaplinefadeoutduration"; - -const int softwareUpdateApplicationUid = 0x2001FE2F; -const int oviLauncherApplicationUid = 0x2002D07F; - -#include "hsapp_defs.inl" - -#endif +#endif // HSAPP_DEFS_H
--- a/homescreenapp/inc/hsapp_defs.inl Fri Aug 13 14:38:12 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,328 +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: contains definition of constant strings - * - */ - -#ifndef HSAPPDEFS_INL_ -#define HSAPPDEFS_INL_ - - -/*! -\return widget path attribute name -*/ -inline const QString widgetPathAttributeName() -{ - static const QString name("widget:path"); - return name; -} - -/*! -\return widget library attribute name -*/ -inline const QString widgetLibraryAttributeName() -{ - static const QString name("widget:library"); - return name; -} - -/*! -\return widget uri attribute name -*/ -inline const QString widgetUriAttributeName() -{ - static const QString name("widget:uri"); - return name; -} - -/*! -\return application entry type name -*/ -inline const QString applicationTypeName() -{ - static const QString name("application"); - return name; -} - -/*! -\return url entry type name -*/ -inline const QString urlTypeName() -{ - static const QString name("url"); - return name; -} - -/*! -\return collection entry type name -*/ -inline const QString collectionTypeName() -{ - static const QString name("collection"); - return name; -} - -/*! -\return collection donwloaded entry type name -*/ -inline const QString collectionDownloadedTypeName() -{ - static const QString name("collection::downloaded"); - return name; -} -/*! -\return menu collections entry type name -*/ -inline const QString menuCollectionsTypeName() -{ - static const QString name("menucollections"); - return name; -} - -/*! -\return widget entry type name -*/ -inline const QString widgetTypeName() -{ - static const QString name("widget"); - return name; -} - -/*! -\return temploated application entry type name -*/ -inline const QString templatedApplicationTypeName() -{ - static const QString name("templatedApplication"); - return name; -} - -/*! -\return widget param name -*/ -inline const QString widgetParam() -{ - static const QString name("widgetparam:"); - return name; -} - -/*! -\return identifier for open an item action -*/ -inline const QString openActionIdentifier() -{ - static const QString name("open"); - return name; -} - -/*! -\return identifier for remove an item action -*/ -inline const QString removeActionIdentifier() -{ - static const QString name("remove"); - return name; -} - -/*! -\return item id property key -*/ -inline const QString itemIdKey() -{ - static const QString key("item_id"); - return key; -} - -/*! - \return collection id property key -*/ -inline const QString collectionIdKey() -{ - static const QString key("collection_id"); - return key; -} - -/*! - \return collection sort order property key -*/ -inline const QString collectionSortOrderKey() -{ - static const QString key("collection_sort_order"); - return key; -} - -/*! - \return application sort order property key -*/ -inline const QString appSortOrderKey() -{ - static const QString key("app_sort_order"); - return key; -} - -/*! - \return entry type name property key -*/ -inline const QString entryTypeNameKey() -{ - static const QString key("entry_type_name"); - return key; -} - -/*! - \return application uid entry key -*/ -inline const QString applicationUidEntryKey() -{ - static const QString key("application:uid"); - return key; -} - -/*! - \return url entry key -*/ -inline const QString urlEntryKey() -{ - static const QString name("url"); - return name; -} - -/*! - \return default collection icon id -*/ -inline const QString defaultCollectionIconId() -{ - static const QString name("qtg_large_applications_user"); - return name; -} - -/*! - \return default bling icon id , used to mark unused downloaded apps -*/ -inline const QString newIconId() -{ - static const QString name("qtg_small_new_event"); - return name; -} - - -/*! - \return menu mode type -*/ -inline const QString menuModeType() -{ - static const QString name("menu_mode_type"); - return name; -} - -/*! - \return sw type key -*/ -inline const QString swTypeKey() -{ - static const QString key("apptype"); - return key; -} - -/*! - \return package entry type name -*/ -inline const QString packageTypeName() -{ - static const QString name("package"); - return name; -} - -/*! - \return java sw type -*/ -inline const QString javaSwType() -{ - static const QString value("java"); - return value; -} - -/*! - \return application settings plugin -*/ -inline const QString appSettingsPlugin() -{ - static const QString key("app_settings_plugin"); - return key; -} - -/*! - \return application group name -*/ -inline const QString groupNameAttributeName() -{ - static const QString key("appgroup_name"); - return key; -} - -/*! - \return applibrary activate name to open downloaded -*/ -inline const QString groupAppLibRecentView() -{ - static const QString key("AppLibRecentView"); - return key; -} - -/*! - \return application componentID atribute name -*/ -inline const QString componentIdAttributeName() -{ - static const QString key("component_id"); - return key; -} - -/*! - \return entry short name -*/ -inline const QString entryShortName() -{ - static const QString key("short_name"); - return key; -} - -/*! - \return entry translation file name -*/ -inline const QString translationFilename() -{ - static const QString key("widget:translation_file"); - return key; -} - -/*! - \return homescreen activitity name to open idle iew -*/ -inline const QString activityHsIdleView() -{ - static const QString key("HsIdleView"); - return key; -} - -/*! - \return homescreen activitity name to open applib iew -*/ -inline const QString activityAppLibMainView() -{ - static const QString key("AppLibMainView"); - return key; -} - -#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/bwins/hsmenuserviceprovideru.def Wed Aug 18 10:33:57 2010 +0300 @@ -0,0 +1,61 @@ +EXPORTS + ?trUtf8@HsMenuEntryRemovedHandler@@SA?AVQString@@PBD0@Z @ 1 NONAME ; class QString HsMenuEntryRemovedHandler::trUtf8(char const *, char const *) + ??1HsMenuItemModel@@UAE@XZ @ 2 NONAME ; HsMenuItemModel::~HsMenuItemModel(void) + ?touch@HsMenuService@@SAXH@Z @ 3 NONAME ; void HsMenuService::touch(int) + ??_EHsMenuItemModel@@UAE@I@Z @ 4 NONAME ; HsMenuItemModel::~HsMenuItemModel(unsigned int) + ?preloadIcons@HsMenuItemModel@@QAEXXZ @ 5 NONAME ; void HsMenuItemModel::preloadIcons(void) + ??1HsMenuCollectionsItemModel@@UAE@XZ @ 6 NONAME ; HsMenuCollectionsItemModel::~HsMenuCollectionsItemModel(void) + ?tr@HsMenuItemModel@@SA?AVQString@@PBD0H@Z @ 7 NONAME ; class QString HsMenuItemModel::tr(char const *, char const *, int) + ??0HsMenuItemModel@@QAE@ABVCaQuery@@PAVQObject@@@Z @ 8 NONAME ; HsMenuItemModel::HsMenuItemModel(class CaQuery const &, class QObject *) + ?tr@HsMenuEntryRemovedHandler@@SA?AVQString@@PBD0H@Z @ 9 NONAME ; class QString HsMenuEntryRemovedHandler::tr(char const *, char const *, int) + ??0HsMenuCollectionsItemModel@@QAE@ABVCaQuery@@PAVQObject@@@Z @ 10 NONAME ; HsMenuCollectionsItemModel::HsMenuCollectionsItemModel(class CaQuery const &, class QObject *) + ?allCollectionsId@HsMenuService@@SAHXZ @ 11 NONAME ; int HsMenuService::allCollectionsId(void) + ?qt_metacast@HsMenuItemModel@@UAEPAXPBD@Z @ 12 NONAME ; void * HsMenuItemModel::qt_metacast(char const *) + ?getCollectionModel@HsMenuService@@SAPAVHsMenuItemModel@@HW4HsSortAttribute@Hs@@ABVQString@@@Z @ 13 NONAME ; class HsMenuItemModel * HsMenuService::getCollectionModel(int, enum Hs::HsSortAttribute, class QString const &) + ?metaObject@HsMenuEntryRemovedHandler@@UBEPBUQMetaObject@@XZ @ 14 NONAME ; struct QMetaObject const * HsMenuEntryRemovedHandler::metaObject(void) const + ?trUtf8@HsMenuEntryRemovedHandler@@SA?AVQString@@PBD0H@Z @ 15 NONAME ; class QString HsMenuEntryRemovedHandler::trUtf8(char const *, char const *, int) + ?data@HsMenuCollectionsItemModel@@UBE?AVQVariant@@ABVQModelIndex@@H@Z @ 16 NONAME ; class QVariant HsMenuCollectionsItemModel::data(class QModelIndex const &, int) const + ?launchTaskSwitcher@HsMenuService@@SA_NXZ @ 17 NONAME ; bool HsMenuService::launchTaskSwitcher(void) + ?getName@HsMenuService@@SA?AVQString@@H@Z @ 18 NONAME ; class QString HsMenuService::getName(int) + ??_EHsMenuCollectionsItemModel@@UAE@I@Z @ 19 NONAME ; HsMenuCollectionsItemModel::~HsMenuCollectionsItemModel(unsigned int) + ?qt_metacall@HsMenuItemModel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 20 NONAME ; int HsMenuItemModel::qt_metacall(enum QMetaObject::Call, int, void * *) + ?staticMetaObject@HsMenuItemModel@@2UQMetaObject@@B @ 21 NONAME ; struct QMetaObject const HsMenuItemModel::staticMetaObject + ?qt_metacast@HsMenuEntryRemovedHandler@@UAEPAXPBD@Z @ 22 NONAME ; void * HsMenuEntryRemovedHandler::qt_metacast(char const *) + ?addApplicationsToCollection@HsMenuService@@SA_NABV?$QList@H@@H@Z @ 23 NONAME ; bool HsMenuService::addApplicationsToCollection(class QList<int> const &, int) + ?organizeCollection@HsMenuService@@SA_NHAAV?$QList@H@@@Z @ 24 NONAME ; bool HsMenuService::organizeCollection(int, class QList<int> &) + ?getInstalledModel@HsMenuService@@SAPAVHsMenuItemModel@@W4HsSortAttribute@Hs@@@Z @ 25 NONAME ; class HsMenuItemModel * HsMenuService::getInstalledModel(enum Hs::HsSortAttribute) + ?metaObject@HsMenuItemModel@@UBEPBUQMetaObject@@XZ @ 26 NONAME ; struct QMetaObject const * HsMenuItemModel::metaObject(void) const + ?executeAction@HsMenuService@@SAHHABVQString@@@Z @ 27 NONAME ; int HsMenuService::executeAction(int, class QString const &) + ?tr@HsMenuEntryRemovedHandler@@SA?AVQString@@PBD0@Z @ 28 NONAME ; class QString HsMenuEntryRemovedHandler::tr(char const *, char const *) + ?createCollection@HsMenuService@@SAHABVQString@@@Z @ 29 NONAME ; int HsMenuService::createCollection(class QString const &) + ?data@HsMenuItemModel@@UBE?AVQVariant@@ABVQModelIndex@@H@Z @ 30 NONAME ; class QVariant HsMenuItemModel::data(class QModelIndex const &, int) const + ?launchSoftwareUpdate@HsMenuService@@SAHXZ @ 31 NONAME ; int HsMenuService::launchSoftwareUpdate(void) + ?getStaticMetaObject@HsMenuItemModel@@SAABUQMetaObject@@XZ @ 32 NONAME ; struct QMetaObject const & HsMenuItemModel::getStaticMetaObject(void) + ?touch@HsMenuService@@SAXABV?$QList@H@@@Z @ 33 NONAME ; void HsMenuService::touch(class QList<int> const &) + ?getSecondLine@HsMenuCollectionsItemModel@@ABE?AVQString@@PBVCaEntry@@@Z @ 34 NONAME ; class QString HsMenuCollectionsItemModel::getSecondLine(class CaEntry const *) const + ?sortOrder@HsMenuServiceUtils@@SA?AW4SortOrder@Qt@@W4HsSortAttribute@Hs@@@Z @ 35 NONAME ; enum Qt::SortOrder HsMenuServiceUtils::sortOrder(enum Hs::HsSortAttribute) + ?newIconNeeded@HsMenuItemModel@@QBE_NABVQModelIndex@@@Z @ 36 NONAME ; bool HsMenuItemModel::newIconNeeded(class QModelIndex const &) const + ?getAllApplicationsModel@HsMenuService@@SAPAVHsMenuItemModel@@W4HsSortAttribute@Hs@@@Z @ 37 NONAME ; class HsMenuItemModel * HsMenuService::getAllApplicationsModel(enum Hs::HsSortAttribute) + ?uninstallChange@HsMenuItemModel@@AAEXHH@Z @ 38 NONAME ; void HsMenuItemModel::uninstallChange(int, int) + ??1HsMenuEntryRemovedHandler@@UAE@XZ @ 39 NONAME ; HsMenuEntryRemovedHandler::~HsMenuEntryRemovedHandler(void) + ?trUtf8@HsMenuItemModel@@SA?AVQString@@PBD0H@Z @ 40 NONAME ; class QString HsMenuItemModel::trUtf8(char const *, char const *, int) + ??_EHsMenuEntryRemovedHandler@@UAE@I@Z @ 41 NONAME ; HsMenuEntryRemovedHandler::~HsMenuEntryRemovedHandler(unsigned int) + ?getCollectionNames@HsMenuService@@SA?AVQStringList@@XZ @ 42 NONAME ; class QStringList HsMenuService::getCollectionNames(void) + ?mAllCollectionsId@HsMenuService@@0HA @ 43 NONAME ; int HsMenuService::mAllCollectionsId + ?removeCollection@HsMenuService@@SA_NH@Z @ 44 NONAME ; bool HsMenuService::removeCollection(int) + ?collectionIdByType@HsMenuService@@SAHABVQString@@@Z @ 45 NONAME ; int HsMenuService::collectionIdByType(class QString const &) + ?staticMetaObject@HsMenuEntryRemovedHandler@@2UQMetaObject@@B @ 46 NONAME ; struct QMetaObject const HsMenuEntryRemovedHandler::staticMetaObject + ?entryChanged@HsMenuEntryRemovedHandler@@EAEXHW4ChangeType@@@Z @ 47 NONAME ; void HsMenuEntryRemovedHandler::entryChanged(int, enum ChangeType) + ?sortBy@HsMenuServiceUtils@@SA?AW4SortAttribute@@W4HsSortAttribute@Hs@@@Z @ 48 NONAME ; enum SortAttribute HsMenuServiceUtils::sortBy(enum Hs::HsSortAttribute) + ?getAllCollectionsModel@HsMenuService@@SAPAVHsMenuItemModel@@XZ @ 49 NONAME ; class HsMenuItemModel * HsMenuService::getAllCollectionsModel(void) + ?setSort@HsMenuItemModel@@QAEXW4HsSortAttribute@Hs@@@Z @ 50 NONAME ; void HsMenuItemModel::setSort(enum Hs::HsSortAttribute) + ??0HsMenuEntryRemovedHandler@@QAE@HPAVQObject@@PBD@Z @ 51 NONAME ; HsMenuEntryRemovedHandler::HsMenuEntryRemovedHandler(int, class QObject *, char const *) + ?qt_metacall@HsMenuEntryRemovedHandler@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 52 NONAME ; int HsMenuEntryRemovedHandler::qt_metacall(enum QMetaObject::Call, int, void * *) + ?notify@HsMenuEntryRemovedHandler@@IAEXXZ @ 53 NONAME ; void HsMenuEntryRemovedHandler::notify(void) + ?subscribe@HsMenuEntryRemovedHandler@@AAEXH@Z @ 54 NONAME ; void HsMenuEntryRemovedHandler::subscribe(int) + ?trUtf8@HsMenuItemModel@@SA?AVQString@@PBD0@Z @ 55 NONAME ; class QString HsMenuItemModel::trUtf8(char const *, char const *) + ?renameCollection@HsMenuService@@SA_NHABVQString@@@Z @ 56 NONAME ; bool HsMenuService::renameCollection(int, class QString const &) + ?removeApplicationFromCollection@HsMenuService@@SA_NHH@Z @ 57 NONAME ; bool HsMenuService::removeApplicationFromCollection(int, int) + ?tr@HsMenuItemModel@@SA?AVQString@@PBD0@Z @ 58 NONAME ; class QString HsMenuItemModel::tr(char const *, char const *) + ?getStaticMetaObject@HsMenuEntryRemovedHandler@@SAABUQMetaObject@@XZ @ 59 NONAME ; struct QMetaObject const & HsMenuEntryRemovedHandler::getStaticMetaObject(void) +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/eabi/hsmenuserviceprovideru.def Wed Aug 18 10:33:57 2010 +0300 @@ -0,0 +1,65 @@ +EXPORTS + _ZN13HsMenuService13executeActionEiRK7QString @ 1 NONAME + _ZN13HsMenuService16allCollectionsIdEv @ 2 NONAME + _ZN13HsMenuService16createCollectionERK7QString @ 3 NONAME + _ZN13HsMenuService16removeCollectionEi @ 4 NONAME + _ZN13HsMenuService16renameCollectionEiRK7QString @ 5 NONAME + _ZN13HsMenuService17getInstalledModelEN2Hs15HsSortAttributeE @ 6 NONAME + _ZN13HsMenuService17mAllCollectionsIdE @ 7 NONAME DATA 4 + _ZN13HsMenuService18collectionIdByTypeERK7QString @ 8 NONAME + _ZN13HsMenuService18getCollectionModelEiN2Hs15HsSortAttributeERK7QString @ 9 NONAME + _ZN13HsMenuService18getCollectionNamesEv @ 10 NONAME + _ZN13HsMenuService18launchTaskSwitcherEv @ 11 NONAME + _ZN13HsMenuService18organizeCollectionEiR5QListIiE @ 12 NONAME + _ZN13HsMenuService20launchSoftwareUpdateEv @ 13 NONAME + _ZN13HsMenuService22getAllCollectionsModelEv @ 14 NONAME + _ZN13HsMenuService23getAllApplicationsModelEN2Hs15HsSortAttributeE @ 15 NONAME + _ZN13HsMenuService27addApplicationsToCollectionERK5QListIiEi @ 16 NONAME + _ZN13HsMenuService31removeApplicationFromCollectionEii @ 17 NONAME + _ZN13HsMenuService5touchERK5QListIiE @ 18 NONAME + _ZN13HsMenuService5touchEi @ 19 NONAME + _ZN13HsMenuService7getNameEi @ 20 NONAME + _ZN15HsMenuItemModel11qt_metacallEN11QMetaObject4CallEiPPv @ 21 NONAME + _ZN15HsMenuItemModel11qt_metacastEPKc @ 22 NONAME + _ZN15HsMenuItemModel12preloadIconsEv @ 23 NONAME + _ZN15HsMenuItemModel15uninstallChangeEii @ 24 NONAME + _ZN15HsMenuItemModel16staticMetaObjectE @ 25 NONAME DATA 16 + _ZN15HsMenuItemModel19getStaticMetaObjectEv @ 26 NONAME + _ZN15HsMenuItemModel7setSortEN2Hs15HsSortAttributeE @ 27 NONAME + _ZN15HsMenuItemModelC1ERK7CaQueryP7QObject @ 28 NONAME + _ZN15HsMenuItemModelC2ERK7CaQueryP7QObject @ 29 NONAME + _ZN15HsMenuItemModelD0Ev @ 30 NONAME + _ZN15HsMenuItemModelD1Ev @ 31 NONAME + _ZN15HsMenuItemModelD2Ev @ 32 NONAME + _ZN18HsMenuServiceUtils6sortByEN2Hs15HsSortAttributeE @ 33 NONAME + _ZN18HsMenuServiceUtils9sortOrderEN2Hs15HsSortAttributeE @ 34 NONAME + _ZN25HsMenuEntryRemovedHandler11qt_metacallEN11QMetaObject4CallEiPPv @ 35 NONAME + _ZN25HsMenuEntryRemovedHandler11qt_metacastEPKc @ 36 NONAME + _ZN25HsMenuEntryRemovedHandler12entryChangedEi10ChangeType @ 37 NONAME + _ZN25HsMenuEntryRemovedHandler16staticMetaObjectE @ 38 NONAME DATA 16 + _ZN25HsMenuEntryRemovedHandler19getStaticMetaObjectEv @ 39 NONAME + _ZN25HsMenuEntryRemovedHandler6notifyEv @ 40 NONAME + _ZN25HsMenuEntryRemovedHandler9subscribeEi @ 41 NONAME + _ZN25HsMenuEntryRemovedHandlerC1EiP7QObjectPKc @ 42 NONAME + _ZN25HsMenuEntryRemovedHandlerC2EiP7QObjectPKc @ 43 NONAME + _ZN25HsMenuEntryRemovedHandlerD0Ev @ 44 NONAME + _ZN25HsMenuEntryRemovedHandlerD1Ev @ 45 NONAME + _ZN25HsMenuEntryRemovedHandlerD2Ev @ 46 NONAME + _ZN26HsMenuCollectionsItemModelC1ERK7CaQueryP7QObject @ 47 NONAME + _ZN26HsMenuCollectionsItemModelC2ERK7CaQueryP7QObject @ 48 NONAME + _ZN26HsMenuCollectionsItemModelD0Ev @ 49 NONAME + _ZN26HsMenuCollectionsItemModelD1Ev @ 50 NONAME + _ZN26HsMenuCollectionsItemModelD2Ev @ 51 NONAME + _ZNK15HsMenuItemModel10metaObjectEv @ 52 NONAME + _ZNK15HsMenuItemModel13newIconNeededERK11QModelIndex @ 53 NONAME + _ZNK15HsMenuItemModel4dataERK11QModelIndexi @ 54 NONAME + _ZNK25HsMenuEntryRemovedHandler10metaObjectEv @ 55 NONAME + _ZNK26HsMenuCollectionsItemModel13getSecondLineEPK7CaEntry @ 56 NONAME + _ZNK26HsMenuCollectionsItemModel4dataERK11QModelIndexi @ 57 NONAME + _ZTI15HsMenuItemModel @ 58 NONAME + _ZTI25HsMenuEntryRemovedHandler @ 59 NONAME + _ZTI26HsMenuCollectionsItemModel @ 60 NONAME + _ZTV15HsMenuItemModel @ 61 NONAME + _ZTV25HsMenuEntryRemovedHandler @ 62 NONAME + _ZTV26HsMenuCollectionsItemModel @ 63 NONAME +
--- a/homescreenapp/serviceproviders/hsmenuserviceprovider/inc/hsiconsidleloader.h Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/inc/hsiconsidleloader.h Wed Aug 18 10:33:57 2010 +0300 @@ -19,6 +19,7 @@ #define HSICONSIDLELOADER_H_ #include <QObject> +#include <QSize> #include "hsmenuservice_global.h" class QTimer; @@ -41,6 +42,8 @@ private: HsMenuItemModel *mModel; QTimer *mTimer; + const QSizeF mIconSize; + int mOutStandingIconToLoad; }; #endif /* HSICONSIDLELOADER_H_ */
--- a/homescreenapp/serviceproviders/hsmenuserviceprovider/inc/hsmenuitemmodel.h Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/inc/hsmenuitemmodel.h Wed Aug 18 10:33:57 2010 +0300 @@ -46,7 +46,7 @@ explicit HsMenuItemModel(const CaQuery &query, QObject *parent = 0); ~HsMenuItemModel(); - void setSort(HsSortAttribute sortAttribute); + void setSort(Hs::HsSortAttribute sortAttribute); virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; bool newIconNeeded(const QModelIndex &index) const;
--- a/homescreenapp/serviceproviders/hsmenuserviceprovider/inc/hsmenuservice.h Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/inc/hsmenuservice.h Wed Aug 18 10:33:57 2010 +0300 @@ -39,17 +39,17 @@ // Function declarations static HsMenuItemModel *getAllApplicationsModel( - HsSortAttribute sortAttribute = DescendingNameHsSortAttribute); + Hs::HsSortAttribute sortAttribute = Hs::DescendingNameHsSortAttribute); static HsMenuItemModel *getAllCollectionsModel(); static HsMenuItemModel *getInstalledModel( - HsSortAttribute sortAttribute = DescendingNameHsSortAttribute); + Hs::HsSortAttribute sortAttribute = Hs::DescendingNameHsSortAttribute); static HsMenuItemModel *getCollectionModel(int collectionId, - HsSortAttribute sortAttribute = LatestOnTopHsSortAttribute, - const QString &collectionType = collectionTypeName()); + Hs::HsSortAttribute sortAttribute = Hs::LatestOnTopHsSortAttribute, + const QString &collectionType = Hs::collectionTypeName); static QStringList getCollectionNames(); static QString getName(int entryId); static int executeAction(int entryId, const QString &actionName = - openActionIdentifier()); + Hs::openActionIdentifier); static bool launchTaskSwitcher(); static int createCollection(const QString &name); @@ -67,7 +67,9 @@ static int collectionIdByType(const QString& collectionType); - static bool touch(int entryId); + static void touch(int entryId); + + static void touch(const QList<int> &entryIdList); static int launchSoftwareUpdate();
--- a/homescreenapp/serviceproviders/hsmenuserviceprovider/inc/hsmenuserviceutils.h Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/inc/hsmenuserviceutils.h Wed Aug 18 10:33:57 2010 +0300 @@ -32,9 +32,9 @@ // Function declarations static SortAttribute sortBy( - HsSortAttribute menuSortAttribute); + Hs::HsSortAttribute menuSortAttribute); static Qt::SortOrder sortOrder( - HsSortAttribute menuSortAttribute); + Hs::HsSortAttribute menuSortAttribute); };
--- a/homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsiconsidleloader.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsiconsidleloader.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -15,6 +15,7 @@ * */ +#include <QPainter> #include <QSize> #include <QTimer> #include "hsmenuitemmodel.h" @@ -28,9 +29,11 @@ HsIconsIdleLoader::HsIconsIdleLoader(HsMenuItemModel *model, QObject *parent): QObject(parent), mModel(model), - mTimer(NULL) + mTimer(NULL), + mIconSize(mModel->getIconSize()) { mTimer = new QTimer(this); + mOutStandingIconToLoad = mModel->rowCount(); connect(mTimer, SIGNAL(timeout()), this, SLOT(processWhenIdle())); mTimer->start(0); // NOTE: zero for idle } @@ -49,11 +52,26 @@ */ void HsIconsIdleLoader::processWhenIdle() { - const QSize iconSize(mModel->getIconSize()); - for (int i=0; i<mModel->rowCount(); i++) { - QModelIndex idx = mModel->index(i); - mModel->entry(idx)->makeIcon(iconSize); - } - mTimer->stop(); // No more timing + if (mOutStandingIconToLoad >= 1 + && mModel->rowCount() >= mOutStandingIconToLoad ) { + QPixmap pixmap(mIconSize.toSize()); + pixmap.fill(Qt::transparent); + + QModelIndex idx = mModel->index(mOutStandingIconToLoad -1); + HbIcon icon = mModel->entry(idx)->makeIcon(mIconSize); + icon.setSize(mIconSize); + // creating raster data + QPainter painter; + painter.begin(&pixmap); + icon.paint(&painter, QRectF(QPointF(), mIconSize), + Qt::KeepAspectRatio, + Qt::AlignCenter, + QIcon::Normal, + QIcon::Off); + painter.end(); + --mOutStandingIconToLoad; + } else { + mTimer->stop(); // No more timing + } }
--- a/homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenucollectionsitemmodel.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenucollectionsitemmodel.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -80,7 +80,7 @@ query.setParentId(entry->id()); query.setEntryRoles(ItemEntryRole); - if (entry->entryTypeName() == collectionDownloadedTypeName()) { + if (entry->entryTypeName() == Hs::collectionDownloadedTypeName) { query.setFlagsOn(RemovableEntryFlag | VisibleEntryFlag); } else { query.setFlagsOn(VisibleEntryFlag); @@ -95,7 +95,7 @@ }//if else { int count(0); - if (entry->entryTypeName() == collectionDownloadedTypeName()) { + if (entry->entryTypeName() == Hs::collectionDownloadedTypeName) { for (int i = 0; i < entries.count(); ++i) { if ((entries[i]->flags() & UsedEntryFlag) != UsedEntryFlag) { count++;
--- a/homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenuitemmodel.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenuitemmodel.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -16,6 +16,8 @@ */ #include <hbnamespace.h> +#include <HbInstance> +#include <HbStyle> #include <cauninstallnotifier.h> #include <casoftwareregistry.h> @@ -24,7 +26,7 @@ #include "hsiconsidleloader.h" // Constants -const QSize smallIconSize(55, 55); +const QSizeF smallIconSize(55, 55); /*! Constructor @@ -35,7 +37,13 @@ CaItemModel(query, parent), mIconsIdleLoader(NULL) { - setIconSize(smallIconSize); + qreal size; + if (hbInstance->style()->parameter( + QString("hb-param-graphic-size-primary-large"), size)) { + setIconSize(QSizeF(size, size)); + } else { + setIconSize(smallIconSize); + } mComponentId = 0; mUninstallNotifier = CaSoftwareRegistry::create()->createUninstallNotifier(); @@ -57,7 +65,7 @@ Sets sort order in the model */ void HsMenuItemModel::setSort( - HsSortAttribute sortAttribute) + Hs::HsSortAttribute sortAttribute) { HSMENUTEST_FUNC_ENTRY("HsMenuItemModel::setSort"); CaItemModel::setSort(HsMenuServiceUtils::sortBy(sortAttribute), @@ -82,7 +90,7 @@ QList<QVariant> icons; icons << CaItemModel::data(index, role); - icons << HbIcon(newIconId()); + icons << HbIcon(Hs::newIconId); variant = QVariant(icons); } else if (role == Hb::IndexFeedbackRole){ @@ -111,7 +119,7 @@ bool result = false; if (root().isValid() && (!(entry(index)->flags() & UsedEntryFlag)) - && entry(root())->entryTypeName() == collectionDownloadedTypeName()) { + && entry(root())->entryTypeName() == Hs::collectionDownloadedTypeName) { result = true; } HSMENUTEST_FUNC_EXIT("HsMenuItemModel::newIconNeeded");
--- a/homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenuservice.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenuservice.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -42,17 +42,17 @@ \retval HsMenuItemModel: AllApplicationsModel */ HsMenuItemModel *HsMenuService::getAllApplicationsModel( - HsSortAttribute sortAttribute) + Hs::HsSortAttribute sortAttribute) { qDebug() << "HsMenuService::getAllApplicationsModel sortAttribute:" << sortAttribute; HSMENUTEST_FUNC_ENTRY("HsMenuService::getAllApplicationsModel"); CaQuery query; query.setEntryRoles(ItemEntryRole); - query.addEntryTypeName(applicationTypeName()); - query.addEntryTypeName(urlTypeName()); - query.addEntryTypeName(widgetTypeName()); - query.addEntryTypeName(templatedApplicationTypeName()); + query.addEntryTypeName(Hs::applicationTypeName); + query.addEntryTypeName(Hs::urlTypeName); + query.addEntryTypeName(Hs::widgetTypeName); + query.addEntryTypeName(Hs::templatedApplicationTypeName); query.setFlagsOn(VisibleEntryFlag); query.setFlagsOff(MissingEntryFlag); query.setSort(HsMenuServiceUtils::sortBy(sortAttribute), @@ -85,14 +85,14 @@ \retval HsMenuItemModel: installed model */ HsMenuItemModel *HsMenuService::getInstalledModel( - HsSortAttribute sortAttribute) + Hs::HsSortAttribute sortAttribute) { //TODO get proper items qDebug() << "HsMenuService::getInstalledModel" << "sortAttribute:" << sortAttribute; HSMENUTEST_FUNC_ENTRY("HsMenuService::getInstalledModel"); CaQuery query; - query.addEntryTypeName(packageTypeName()); + query.addEntryTypeName(Hs::packageTypeName); query.setFlagsOn(VisibleEntryFlag | RemovableEntryFlag); query.setFlagsOff(MissingEntryFlag); query.setSort(HsMenuServiceUtils::sortBy(sortAttribute), @@ -109,14 +109,14 @@ \retval HsMenuItemModel: collection model */ HsMenuItemModel *HsMenuService::getCollectionModel(int collectionId, - HsSortAttribute sortAttribute, const QString &collectionType) + Hs::HsSortAttribute sortAttribute, const QString &collectionType) { qDebug() << "HsMenuService::getCollectionModel sortAttribute:" << sortAttribute; HSMENUTEST_FUNC_ENTRY("HsMenuService::getCollectionModel"); CaQuery query; query.setFlagsOff(MissingEntryFlag); - if (collectionType == collectionDownloadedTypeName()) { + if (collectionType == Hs::collectionDownloadedTypeName) { query.setFlagsOn(RemovableEntryFlag | VisibleEntryFlag); } else { query.setFlagsOn(VisibleEntryFlag); @@ -186,30 +186,7 @@ { qDebug() << "HsMenuService::executeAction entryId:" << entryId << "actionName:" << actionName; - int ret = CaService::instance()->executeCommand(entryId, actionName); - -/* // if its remove action we need to mark all items - // that are being uninstalled - if (actionName == caCmdRemove && ret == 0) { - QSharedPointer<CaEntry> entry( - CaService::instance()->getEntry(entryId)); - if (!entry.isNull()) { - QString componentId = entry->attribute( - componentIdAttributeName()); - - CaQuery query; - query.setAttribute(componentIdAttributeName(), componentId); - QList< QSharedPointer<CaEntry> > entries - = CaService::instance()->getEntries(query); - - for (int i = 0; i < entries.count(); i++) { - entries[i]->setFlags( - entries.first()->flags()| UninstallEntryFlag); - CaService::instance()->updateEntry(*entries[i]); - } - } - }*/ - return ret; + return CaService::instance()->executeCommand(entryId, actionName); } /*! @@ -221,7 +198,7 @@ qDebug() << "HsMenuService::launchTaskSwitcher"; HbDeviceDialog deviceDialog; QVariantMap params; - return deviceDialog.show(TS_DEVICE_DIALOG_URI, params); + return deviceDialog.show(Hs::tsDeviceDialogUri, params); } /*! @@ -235,11 +212,11 @@ HSMENUTEST_FUNC_ENTRY("HsMenuService::createCollection"); int entryId = 0; CaEntry collection(GroupEntryRole); - collection.setEntryTypeName(collectionTypeName()); + collection.setEntryTypeName(Hs::collectionTypeName); collection.setText(name); - collection.setAttribute(groupNameAttributeName(),name); + collection.setAttribute(Hs::groupNameAttributeName,name); CaIconDescription iconDescription; - iconDescription.setFilename(defaultCollectionIconId()); + iconDescription.setFilename(Hs::defaultCollectionIconId); collection.setIconDescription(iconDescription); QSharedPointer<CaEntry> entry = CaService::instance()->createEntry(collection); if (!entry.isNull()) { @@ -356,7 +333,7 @@ //"menucollections" typename to the storage, but even if he or she //do this we fetch entry that we wanted collectionsQuery.setSort(DefaultSortAttribute, Qt::AscendingOrder); - collectionsQuery.addEntryTypeName(menuCollectionsTypeName()); + collectionsQuery.addEntryTypeName(Hs::menuCollectionsTypeName); QList<int> ids = CaService::instance()->getEntryIds( collectionsQuery); Q_ASSERT(ids.count() > 0); @@ -400,10 +377,35 @@ \param entryId of this entry. \retval boolean error code. */ -bool HsMenuService::touch(int entryId) +void HsMenuService::touch(int entryId) { QSharedPointer<CaEntry> entry = CaService::instance()->getEntry(entryId); - return CaService::instance()->touch(* entry); + if (entry->flags() & RemovableEntryFlag && + (entry->flags() & UsedEntryFlag) == 0 && + entry->role() == ItemEntryRole && + entry->entryTypeName() != QString(Hs::packageTypeName)) { + CaService::instance()->touch(* entry); + } +} + +/*! + Touch action on an lists of entries. + \param entryIdList of this entry. + \retval boolean error code. + */ +void HsMenuService::touch(const QList<int> &entryIdList) +{ + CaQuery query; + query.setFlagsOn(RemovableEntryFlag); + query.setFlagsOff(UsedEntryFlag); + query.setEntryRoles(ItemEntryRole); + QList<int> removableUnTouchEntries = + CaService::instance()->getEntryIds(query); + foreach (int item, entryIdList) { + if (removableUnTouchEntries.contains(item)) { + touch(item); + } + } } /*! @@ -414,10 +416,10 @@ { qDebug() << "HsMenuService::launchSoftwareUpdate"; QScopedPointer<CaEntry> tsEntry(new CaEntry); - tsEntry->setEntryTypeName(applicationTypeName()); + tsEntry->setEntryTypeName(Hs::applicationTypeName); tsEntry->setAttribute( - applicationUidEntryKey(), QString::number(softwareUpdateApplicationUid)); + Hs::applicationUidEntryKey, QString::number(Hs::softwareUpdateApplicationUid)); int retval = CaService::instance()->executeCommand(*tsEntry, - openActionIdentifier()); + Hs::openActionIdentifier); return retval; }
--- a/homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenuserviceutils.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/serviceproviders/hsmenuserviceprovider/src/hsmenuserviceutils.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -22,18 +22,18 @@ \param sortAttribute menu sort order */ SortAttribute HsMenuServiceUtils::sortBy( - HsSortAttribute menuSortAttribute) + Hs::HsSortAttribute menuSortAttribute) { SortAttribute sortAttribute(DefaultSortAttribute); switch (menuSortAttribute) { - case AscendingNameHsSortAttribute: - case DescendingNameHsSortAttribute: + case Hs::AscendingNameHsSortAttribute: + case Hs::DescendingNameHsSortAttribute: sortAttribute = NameSortAttribute; break; - case NoHsSortAttribute: - case LatestOnTopHsSortAttribute: - case OldestOnTopHsSortAttribute: - case CustomHsSortAttribute: + case Hs::NoHsSortAttribute: + case Hs::LatestOnTopHsSortAttribute: + case Hs::OldestOnTopHsSortAttribute: + case Hs::CustomHsSortAttribute: sortAttribute = DefaultSortAttribute; break; } @@ -45,18 +45,18 @@ \param sortAttribute menu sort order */ Qt::SortOrder HsMenuServiceUtils::sortOrder( - HsSortAttribute menuSortAttribute) + Hs::HsSortAttribute menuSortAttribute) { Qt::SortOrder sortOrder(Qt::AscendingOrder); switch (menuSortAttribute) { - case NoHsSortAttribute: - case AscendingNameHsSortAttribute: - case LatestOnTopHsSortAttribute: - case CustomHsSortAttribute: + case Hs::NoHsSortAttribute: + case Hs::AscendingNameHsSortAttribute: + case Hs::LatestOnTopHsSortAttribute: + case Hs::CustomHsSortAttribute: sortOrder = Qt::AscendingOrder; break; - case DescendingNameHsSortAttribute: - case OldestOnTopHsSortAttribute: + case Hs::DescendingNameHsSortAttribute: + case Hs::OldestOnTopHsSortAttribute: sortOrder = Qt::DescendingOrder; break; }
Binary file homescreenapp/stateplugins/hsapplibrarystateplugin/conf/CI_hsapplibrary.confml has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/docml.pri Wed Aug 18 10:33:57 2010 +0300 @@ -0,0 +1,29 @@ +# +# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + +symbian { +docmlFiles+= \ + resource/addcontentlabeledview.docml \ + resource/common_objects.docml \ + resource/emptylabeledview.docml \ + resource/labeledlistview.docml \ + resource/listview.docml \ + resource/searchview.docml + + qrcFile = hsapplibrarystateplugin.qrc +} else { + qrcFile = hsapplibrarystateplugin_non_symbian.qrc +} \ No newline at end of file
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrary.ts Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrary.ts Wed Aug 18 10:33:57 2010 +0300 @@ -145,6 +145,16 @@ <extra-loc-feature>applib</extra-loc-feature> <extra-loc-blank>False</extra-loc-blank> </message> +<message numerus="no" id="txt_applib_grid_ovi_store"> + <comment>Text shown when operator store is defined and toolbar extension is used to show both stores.</comment> + <source>Ovi Store</source> + <translation variants="no">Ovi Store</translation> + <extra-loc-layout_id>qtl_toolbar_extension_tiny_vrt</extra-loc-layout_id> + <extra-loc-viewid>applib</extra-loc-viewid> + <extra-loc-positionid>grid</extra-loc-positionid> + <extra-loc-feature>applib</extra-loc-feature> + <extra-loc-blank>False</extra-loc-blank> +</message> <message numerus="no" id="txt_applib_info_delete_1_and_associated_data"> <comment>Confirmation note displayed if the user tries to delete an application. %1 is the application name.</comment> <source>Delete %1 and associated data?</source> @@ -435,6 +445,16 @@ <extra-loc-feature>applib</extra-loc-feature> <extra-loc-blank>False</extra-loc-blank> </message> +<message numerus="no" id="txt_common_menu_open"> + <comment>Context menu item. Note! Only use this text ID if there are no icons. Opens a highlighted item such as an application, folder, or message</comment> + <source>Open</source> + <translation variants="no">Open</translation> + <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id> + <extra-loc-viewid>common</extra-loc-viewid> + <extra-loc-positionid>menu</extra-loc-positionid> + <extra-loc-feature>common</extra-loc-feature> + <extra-loc-blank>False</extra-loc-blank> +</message> <message numerus="no" id="txt_applib_opt_sub_custom"> <comment>Sub-menu item. Sorts by default order or user's own order when user has organised the list</comment> <source>Custom</source>
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrarystateplugin.pro Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrarystateplugin.pro Wed Aug 18 10:33:57 2010 +0300 @@ -14,6 +14,8 @@ PLUGIN_SUBDIR = /private/20022F35/plugins/stateplugins include(../../common.pri) +include(docml.pri) + LIBS += -lhsdomainmodel \ -lhsutils \ -lhsmenuserviceprovider \ @@ -28,12 +30,17 @@ ../../hsutils/inc TRANSLATIONS = hsapplibrary.ts include(hsapplibrarystateplugin.pri) -symbian: { + +symbian { TARGET.UID3 = 0x20022F97 nft::LIBS += -lhal + + for(docmlFile, docmlFiles): DOCML+=$$docmlFile + include(hsapplibrarystateplugin_exports_to_rom.pri) LIBS += -lxqsettingsmanager } -exportResources(./*.qm, resource/qt/translations) -RESOURCES = hsapplibrarystateplugin.qrc +RESOURCES = $$qrcFile + +exportResources(./*.qm, resource/qt/translations) \ No newline at end of file
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrarystateplugin.qrc Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrarystateplugin.qrc Wed Aug 18 10:33:57 2010 +0300 @@ -1,11 +1,11 @@ <RCC> <qresource prefix="/xml"> - <file alias="addcontentlabeledview.docml">resource/addcontentlabeledview.docml</file> - <file alias="common_objects.docml">resource/common_objects.docml</file> - <file alias="emptylabeledview.docml">resource/emptylabeledview.docml</file> - <file alias="labeledlistview.docml">resource/labeledlistview.docml</file> - <file alias="listview.docml">resource/listview.docml</file> - <file alias="searchview.docml">resource/searchview.docml</file> + <file alias="addcontentlabeledview.docml">resource/addcontentlabeledview.docml.bin</file> + <file alias="common_objects.docml">resource/common_objects.docml.bin</file> + <file alias="emptylabeledview.docml">resource/emptylabeledview.docml.bin</file> + <file alias="labeledlistview.docml">resource/labeledlistview.docml.bin</file> + <file alias="listview.docml">resource/listview.docml.bin</file> + <file alias="searchview.docml">resource/searchview.docml.bin</file> </qresource> <qresource prefix="/css"> <file alias="hsapplibrarystateplugin.css">resource/hsapplibrarystateplugin.css</file>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/hsapplibrarystateplugin_non_symbian.qrc Wed Aug 18 10:33:57 2010 +0300 @@ -0,0 +1,17 @@ +<RCC> + <qresource prefix="/xml"> + <file alias="addcontentlabeledview.docml">resource/addcontentlabeledview.docml</file> + <file alias="common_objects.docml">resource/common_objects.docml</file> + <file alias="emptylabeledview.docml">resource/emptylabeledview.docml</file> + <file alias="labeledlistview.docml">resource/labeledlistview.docml</file> + <file alias="listview.docml">resource/listview.docml</file> + <file alias="searchview.docml">resource/searchview.docml</file> + </qresource> + <qresource prefix="/css"> + <file alias="hsapplibrarystateplugin.css">resource/hsapplibrarystateplugin.css</file> + </qresource> + <qresource prefix="/layout"> + <file alias="hslistviewitem.css">resource/hslistviewitem.css</file> + <file alias="hslistviewitem.widgetml">resource/hslistviewitem.widgetml</file> + </qresource> +</RCC>
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsaddmodeproxymodel.h Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsaddmodeproxymodel.h Wed Aug 18 10:33:57 2010 +0300 @@ -21,6 +21,7 @@ #include <QSortFilterProxyModel> #include <caquery.h> #include <caentry.h> +#include <QAbstractItemView> #include "hsmenustates_global.h" @@ -37,6 +38,13 @@ HsAddModeProxyModel(QObject *parent = 0); ~HsAddModeProxyModel(); void initilizeCwrtWidgetCache(); + void setSourceModel(QAbstractItemModel *sourceModel); + +signals: + + void scrollTo(int row, QAbstractItemView::ScrollHint hint = + QAbstractItemView::EnsureVisible); + void countChange(); private slots:
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsallappsstate.h Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsallappsstate.h Wed Aug 18 10:33:57 2010 +0300 @@ -44,30 +44,27 @@ HsMainWindow &mainWindow, QState *parent = 0); ~HsAllAppsState(); + void scrollToBeginning(); + void setModel(Hs::HsMenuMode menuMode); signals: void toAppLibraryState(); private slots: - void addActivated(const QModelIndex &index); - void addLongPressed(HbAbstractViewItem *item, const QPointF &coords); void addToCollection(); void openInstalledView(); void ascendingMenuAction(); void descendingMenuAction(); void normalModeEntered(); - void addModeEntered(); void stateExited(); - void contextMenuAction(HbAction *action); private: void construct(); void setMenuOptions(); - void addToHomeScreen(const QModelIndex &index); void setContextMenuOptions(HbAbstractViewItem *item, EntryFlags flags); private: HsAddModeProxyModel *mAddModeProxyModel; - HsSortAttribute mSortAttribute; + Hs::HsSortAttribute mSortAttribute; }; #endif // HSALLAPPSSTATE_H
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsallcollectionsstate.h Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsallcollectionsstate.h Wed Aug 18 10:33:57 2010 +0300 @@ -47,14 +47,11 @@ void toAppLibraryState(); private slots: - void addActivated(const QModelIndex &index); - void addLongPressed(HbAbstractViewItem *item, const QPointF &coords); void createNewCollection(); void createArrangeCollection(); void normalModeEntered(); void normalModeExited(); void stateExited(); - void contextMenuAction(HbAction *action); private: void construct(); void setMenuOptions();
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsbaseviewstate.h Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsbaseviewstate.h Wed Aug 18 10:33:57 2010 +0300 @@ -70,6 +70,11 @@ virtual int checkSoftwareUpdates(); virtual bool openTaskSwitcher(); virtual void closeContextMenu(); + virtual void addToHomeScreen(const int entryId); + virtual void contextMenuAction(HbAction *action); + virtual void addActivated(const QModelIndex &index); + virtual void addLongPressed(HbAbstractViewItem *item, + const QPointF &coords); protected:
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hscollectionstate.h Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hscollectionstate.h Wed Aug 18 10:33:57 2010 +0300 @@ -47,9 +47,9 @@ protected: void onEntry(QEvent *event); signals: - void sortOrderChanged(HsSortAttribute sortAttribute); + void sortOrderChanged(Hs::HsSortAttribute sortAttribute); private slots: - void addAppsAction(bool addApps = true); + void addAppsAction(); void addCollectionShortcutToHomeScreenAction(); void renameAction(); void deleteAction(); @@ -69,12 +69,11 @@ void constructMenu(bool isDynamic); void makeConnect(); void makeDisconnect(); - void addElementToHomeScreen(const QModelIndex &index); void setContextMenuOptions(HbAbstractViewItem *item, EntryFlags flags); void setMenuOptions(); private: - HsSortAttribute mSortAttribute; + Hs::HsSortAttribute mSortAttribute; int mCollectionId; QString mCollectionType; };
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsinstalledappsstate.h Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsinstalledappsstate.h Wed Aug 18 10:33:57 2010 +0300 @@ -51,18 +51,17 @@ void openInstallationLog(); void stateEntered(); - void stateExited(); - void setEmptyLabelVisibility(bool visibility); - - void contextMenuAction(HbAction *action); - + void latestOnTopMenuAction(); + void oldestOnTopMenuAction(); + private: void construct(); void setMenuOptions(); void setContextMenuOptions(HbAbstractViewItem *item, EntryFlags flags); + Hs::HsSortAttribute mSortAttribute; }; #endif // HSINSTALLEDAPPSSTATE_H
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmenumodetransition.h Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmenumodetransition.h Wed Aug 18 10:33:57 2010 +0300 @@ -30,7 +30,7 @@ public: HsMenuModeTransition( - HsMenuModeWrapper &menuMode, HsMenuMode expectedMode, QState *target); + HsMenuModeWrapper &menuMode, Hs::HsMenuMode expectedMode, QState *target); bool eventTest(QEvent *event); @@ -39,7 +39,7 @@ private: HsMenuModeWrapper &mMenuMode; - const HsMenuMode mExpectedMenuMode; + const Hs::HsMenuMode mExpectedMenuMode; }; #endif //HSMENUMODETRANSITION_H
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmenumodewrapper.h Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmenumodewrapper.h Wed Aug 18 10:33:57 2010 +0300 @@ -26,13 +26,13 @@ public: HsMenuModeWrapper(); - HsMenuMode getHsMenuMode() const; + Hs::HsMenuMode getHsMenuMode() const; QVariant getHsToken() const; - void setHsMenuMode(HsMenuMode menuMode, QVariant token = NULL); + void setHsMenuMode(Hs::HsMenuMode menuMode, QVariant token = NULL); private: - HsMenuMode mMode; + Hs::HsMenuMode mMode; QVariant mToken; };
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmenuview.h Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsmenuview.h Wed Aug 18 10:33:57 2010 +0300 @@ -18,9 +18,9 @@ #ifndef HSMENUVIEW_H #define HSMENUVIEW_H +#include <QAbstractItemView> #include <QObject> #include <QModelIndex> -#include <QAbstractItemView> #include <QScopedPointer> #include <QSortFilterProxyModel> #include <HbAbstractItemView> @@ -82,6 +82,7 @@ void scrollToRow(int row, QAbstractItemView::ScrollHint hint = QAbstractItemView::PositionAtTop); + void handleSearchComplete(const QModelIndex& firstMatching); private: @@ -102,7 +103,6 @@ HbPushButton *mAddContentButton; // may be NULL in some contexts QScopedPointer<HsSearchView> mHsSearchView; - HS_STATES_TEST_FRIEND_CLASS(MenuStatesTest) };
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hssearchview.h Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hssearchview.h Wed Aug 18 10:33:57 2010 +0300 @@ -18,9 +18,9 @@ #ifndef HSSEARCHVIEW_H #define HSSEARCHVIEW_H +#include <QInputContext> #include <QModelIndex> #include <QScopedPointer> - #include <HbShrinkingVkbHost> #include "hsmenustates_global.h" @@ -50,10 +50,9 @@ ~HsSearchView(); void setSearchPanelVisible(bool visible); + bool isActive() const; private: - bool isActive() const; - QModelIndex firstVisibleItemIndex(const HbListView *view) const; void searchBegins(); @@ -65,11 +64,13 @@ void disconnectSearchPanelSignals(); void searchFinished(); + void sendEvent(const QEvent::Type eventType); + void openVkb(); signals: void activated(const QModelIndex &index); void longPressed(HbAbstractViewItem *item, const QPointF &coords); - + void searchComplete(const QModelIndex &firstMatching); public slots: void hideSearchPanel(); @@ -81,6 +82,7 @@ private slots: void findItem(QString criteriaStr); void setNoResultsVisibility(); + void hideVkb(); private: void setOriginatingContext(); @@ -104,7 +106,6 @@ QScopedPointer<HbShrinkingVkbHost> mVkbHost; HsSearchViewBuilder mSearchViewBuilder; bool mEmptyResultText; - }; #endif /* HSSEARCHVIEW_H_ */
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/resource/addcontentlabeledview.docml Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/resource/addcontentlabeledview.docml Wed Aug 18 10:33:57 2010 +0300 @@ -10,7 +10,6 @@ <widget name="buttonContainer" type="HbWidget"> <widget name="addContentButton" type="HbPushButton"> <string locid="txt_applib_button_add_to_collection" name="text"/> - <bool name="checkable" value="TRUE"/> <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/> </widget> <layout orientation="Horizontal" spacing="0.0un" type="linear">
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/resource/searchview.docml Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/resource/searchview.docml Wed Aug 18 10:33:57 2010 +0300 @@ -10,12 +10,12 @@ <widget name="emptyViewLabelContainer" type="HbWidget"> <widget name="emptyViewLabel" type="HbLabel"> <enums name="alignment" value="AlignHCenter"/> - <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Minimum" - verticalStretch="0"/> + <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Minimum" verticalStretch="0"/> + <contentsmargins bottom="0un" left="0un" right="0un" top="var(hb-param-text-height-primary)"/> <enums name="elideMode" value="ElideMiddle"/> <bool name="visible" value="TRUE"/> <string locid="txt_applib_formlabel_no_search_results" name="plainText"/> - <fontspec name="fontSpec" role="Title" textheight="4un"/> + <fontspec name="fontSpec" role="Title" textheight="var(hb-param-text-height-primary)"/> </widget> <layout orientation="Horizontal" spacing="0.0un" type="linear"> <stretchitem stretchfactor="1"/> @@ -23,114 +23,118 @@ <stretchitem stretchfactor="1"/> </layout> </widget> - <widget name="listView" type="HbListView"> - <bool name="itemRecycling" value="TRUE"/> - <enums name="horizontalScrollBarPolicy" value="ScrollBarAutoHide"/> - <bool name="frictionEnabled" value="TRUE"/> - </widget> + <widget name="listView" type="HbListView"> + <bool name="itemRecycling" value="TRUE"/> + <enums name="horizontalScrollBarPolicy" value="ScrollBarAutoHide"/> + <bool name="frictionEnabled" value="TRUE"/> + </widget> <widget name="searchPanel" type="HbSearchPanel"/> </widget> <string locid="txt_applib_title_applications" name="title"/> </widget> - - <section name="searchViewLabeledList"> - <widget name="view" type="HbView"> - <widget name="container" role="HbView:widget" type="HbWidget"> - <widget name="label" type="HbGroupBox"> - <bool name="visible" value="TRUE"/> - </widget> - <widget name="emptyViewLabelContainer" type="HbWidget"> - <bool name="visible" value="FALSE"/> - </widget> - <widget name="listView" type="HbListView"> - <bool name="visible" value="TRUE"/> - </widget> - <layout orientation="Vertical" spacing="0.0un" type="linear"> - <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/> - <linearitem itemname="label"/> - <linearitem itemname="listView"/> - <linearitem itemname="searchPanel"/> - </layout> - </widget> - <string locid="txt_applib_title_applications" name="title"/> - <bool name="contentFullScreen" value="TRUE"/> - </widget> + <section name="searchViewLabeledList"> + <widget name="view" type="HbView"> + <widget name="container" role="HbView:widget" type="HbWidget"> + <widget name="label" type="HbGroupBox"> + <bool name="visible" value="TRUE"/> + </widget> + <widget name="emptyViewLabelContainer" type="HbWidget"> + <bool name="visible" value="FALSE"/> + </widget> + <widget name="listView" type="HbListView"> + <bool name="visible" value="TRUE"/> + </widget> + <layout orientation="Vertical" spacing="0un" type="linear"> + <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/> + <linearitem itemname="label"/> + <linearitem itemname="listView"/> + <stretchitem stretchfactor="100"/> + <linearitem itemname="searchPanel"/> + </layout> + </widget> + <string locid="txt_applib_title_applications" name="title"/> + <bool name="contentFullScreen" value="TRUE"/> + </widget> </section> - - <section name="searchViewList"> - <widget name="view" type="HbView"> - <widget name="container" role="HbView:widget" type="HbWidget"> - <widget name="label" type="HbGroupBox"> - <bool name="visible" value="FALSE"/> - </widget> - <widget name="emptyViewLabelContainer" type="HbWidget"> - <bool name="visible" value="FALSE"/> - </widget> - <widget name="listView" type="HbListView"> - <bool name="visible" value="TRUE"/> - </widget> - <layout orientation="Vertical" spacing="0.0un" type="linear"> - <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/> - <linearitem itemname="listView"/> - <linearitem itemname="searchPanel"/> - </layout> - </widget> - <string locid="txt_applib_title_applications" name="title"/> - <bool name="contentFullScreen" value="TRUE"/> - </widget> + <section name="searchViewList"> + <widget name="view" type="HbView"> + <widget name="container" role="HbView:widget" type="HbWidget"> + <widget name="label" type="HbGroupBox"> + <bool name="visible" value="FALSE"/> + </widget> + <widget name="emptyViewLabelContainer" type="HbWidget"> + <bool name="visible" value="FALSE"/> + </widget> + <widget name="listView" type="HbListView"> + <bool name="visible" value="TRUE"/> + </widget> + <layout orientation="Vertical" spacing="0.0un" type="linear"> + <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/> + <linearitem itemname="listView"/> + <stretchitem stretchfactor="100"/> + <linearitem itemname="searchPanel"/> + </layout> + </widget> + <string locid="txt_applib_title_applications" name="title"/> + <bool name="contentFullScreen" value="TRUE"/> + </widget> </section> - - <section name="searchViewLabeledEmpty"> - <widget name="view" type="HbView"> - <widget name="container" role="HbView:widget" type="HbWidget"> - <widget name="label" type="HbGroupBox"> - <bool name="visible" value="TRUE"/> - </widget> - <widget name="emptyViewLabelContainer" type="HbWidget"> - <bool name="visible" value="TRUE"/> - </widget> - <widget name="listView" type="HbListView"> - <bool name="visible" value="FALSE"/> - </widget> - <layout orientation="Vertical" spacing="0un" type="linear"> - <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/> - <linearitem itemname="label"/> - <stretchitem stretchfactor="1"/> - <linearitem itemname="emptyViewLabelContainer"/> - <stretchitem stretchfactor="5"/> - <linearitem itemname="searchPanel"/> - </layout> - </widget> - <string locid="txt_applib_title_applications" name="title"/> - </widget> - </section> - - <section name="searchViewEmpty"> - <widget name="view" type="HbView"> - <widget name="container" role="HbView:widget" type="HbWidget"> - <widget name="emptyViewLabelContainer" type="HbWidget"> - <bool name="visible" value="TRUE"/> - </widget> - <widget name="label" type="HbGroupBox"> - <bool name="visible" value="FALSE"/> - </widget> - <widget name="listView" type="HbListView"> - <bool name="visible" value="FALSE"/> - </widget> - <layout orientation="Vertical" spacing="0un" type="linear"> - <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/> - <stretchitem stretchfactor="1"/> - <linearitem itemname="emptyViewLabelContainer"/> - <stretchitem stretchfactor="5"/> - <linearitem itemname="searchPanel"/> - </layout> - </widget> - <string locid="txt_applib_title_applications" name="title"/> - </widget> - </section> - - <metadata activeUIState="Common ui state" display="NHD-3.2-inch_portrait" - unit="un"> + <section name="searchViewLabeledEmpty"> + <widget name="view" type="HbView"> + <widget name="container" role="HbView:widget" type="HbWidget"> + <widget name="label" type="HbGroupBox"> + <bool name="visible" value="TRUE"/> + </widget> + <widget name="emptyViewLabelContainer" type="HbWidget"> + <bool name="visible" value="TRUE"/> + </widget> + <widget name="listView" type="HbListView"> + <bool name="visible" value="FALSE"/> + </widget> + <layout orientation="Vertical" spacing="0un" type="linear"> + <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/> + <linearitem itemname="label"/> + <linearitem itemname="emptyViewLabelContainer"/> + <stretchitem stretchfactor="100"/> + <linearitem itemname="searchPanel"/> + </layout> + </widget> + <string locid="txt_applib_title_applications" name="title"/> + </widget> + </section> + <section name="searchViewEmpty"> + <widget name="view" type="HbView"> + <widget name="container" role="HbView:widget" type="HbWidget"> + <widget name="emptyViewLabelContainer" type="HbWidget"> + <bool name="visible" value="TRUE"/> + </widget> + <widget name="label" type="HbGroupBox"> + <bool name="visible" value="FALSE"/> + </widget> + <widget name="listView" type="HbListView"> + <bool name="visible" value="FALSE"/> + </widget> + <layout orientation="Vertical" spacing="0un" type="linear"> + <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/> + <linearitem itemname="emptyViewLabelContainer"/> + <stretchitem stretchfactor="100"/> + <linearitem itemname="searchPanel"/> + </layout> + </widget> + <string locid="txt_applib_title_applications" name="title"/> + </widget> + </section> + <metadata activeUIState="Search Labeled List" display="NHD-3.2-inch_portrait" unit="un"> <uistate name="Common ui state" sections="#common"/> + <uistate name="Common ui" sections="#common"/> + <uistate name="Search Labeled List" sections="#common searchViewLabeledList"/> + <uistate name="Search List state" sections="#common searchViewList"/> + <uistate name="Search Empty Labeled View" sections="#common searchViewLabeledEmpty"/> + <uistate name="Search Empty View" sections="#common searchViewEmpty"/> + <dummydata objectName="listView" section="#common" value="app_list_template5"/> + <dummydata objectName="listView" section="searchViewLabeledList" value="app_list_template5"/> + <dummydata objectName="listView" section="searchViewList" value="app_list_template5"/> + <dummydata objectName="listView" section="searchViewLabeledEmpty" value="app_list_template5"/> + <dummydata objectName="listView" section="searchViewEmpty" value="app_list_template5"/> </metadata> </hbdocument>
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsaddmodeproxymodel.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsaddmodeproxymodel.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -68,11 +68,11 @@ void HsAddModeProxyModel::initilizeCwrtWidgetCache() { QStringList entryTypeNames; - entryTypeNames.append(applicationTypeName()); + entryTypeNames.append(Hs::applicationTypeName); mQuery.setEntryTypeNames(entryTypeNames); - mQuery.setAttribute(swTypeKey(), HS_CWRT_APP_TYPE); - mQuery.setAttribute(widgetUriAttributeName(), - HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE); + mQuery.setAttribute(Hs::swTypeKey, Hs::HS_CWRT_APP_TYPE); + mQuery.setAttribute(Hs::widgetUriAttributeName, + Hs::HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE); QList< QSharedPointer<CaEntry> > entries = CaService::instance()->getEntries(mQuery); foreach (QSharedPointer<CaEntry> entry, entries) { @@ -83,18 +83,35 @@ i.next(); QString key(i.key()); QString value(i.value()); - if (key.contains(widgetParam())) { - preferences.insert(key.remove(widgetParam()),value); + if (key.contains(Hs::widgetParam)) { + preferences.insert(key.remove(Hs::widgetParam),value); } } int count(0); HsContentService::instance()->widgets( - HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE,preferences,count); + Hs::HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE,preferences,count); mCwrtWidgetCache.insert(entry->id(), count > 0); } } +/* + Reimplementated from QSortFilterProxyModel to forward signals from CaItemModel. + \param sourceModel source model. + */ +void HsAddModeProxyModel::setSourceModel(QAbstractItemModel *sourceModel) +{ + QSortFilterProxyModel::setSourceModel(sourceModel); + connect(sourceModel, + SIGNAL(scrollTo(int, QAbstractItemView::ScrollHint)), + this, + SIGNAL(scrollTo(int, QAbstractItemView::ScrollHint))); + connect(sourceModel, + SIGNAL(countChange()), + this, + SIGNAL(countChange())); +} + /*! Return entryid for given Cwrt with mini view widget. \param uri of a widget. @@ -107,11 +124,11 @@ CaQuery query; QStringList entryTypeNames; query.setEntryTypeNames(entryTypeNames); - query.setAttribute(swTypeKey(), HS_CWRT_APP_TYPE); - query.setAttribute(widgetUriAttributeName(), - HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE); + query.setAttribute(Hs::swTypeKey, Hs::HS_CWRT_APP_TYPE); + query.setAttribute(Hs::widgetUriAttributeName, + Hs::HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE); foreach (QString key, preferences.keys()) { - query.setAttribute(widgetParam()+key, + query.setAttribute(Hs::widgetParam+key, preferences.value(key).toString()); } QList< QSharedPointer<CaEntry> > entries = @@ -131,7 +148,7 @@ */ void HsAddModeProxyModel::updateCacheOnAddWidget(const QString &uri, const QVariantHash &preferences){ - if (uri == HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE) { + if (uri == Hs::HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE) { int entryId = findCwrtWidgetEntryId(preferences); if (!mCwrtWidgetCache.value(entryId) ) { mCwrtWidgetCache.insert(entryId,true); @@ -149,7 +166,7 @@ void HsAddModeProxyModel::updateCacheOnRemoveWidget(const QString &uri, const QVariantHash &preferences) { - if (uri == HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE) { + if (uri == Hs::HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE) { int entryId = findCwrtWidgetEntryId(preferences); if (mCwrtWidgetCache.value(entryId)) { mCwrtWidgetCache.insert(entryId,false); @@ -186,3 +203,4 @@ HsAppLibStateUtils::isCWRTWidgetOnHomeScreen(&entry)); } } +
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallappsstate.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallappsstate.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -66,11 +66,11 @@ QState *parent) : HsBaseViewState(mainWindow, menuMode, parent), mAddModeProxyModel(0), - mSortAttribute(AscendingNameHsSortAttribute) + mSortAttribute(Hs::AscendingNameHsSortAttribute) { initialize(menuViewBuilder, HsAllAppsContext); construct(); - mAddModeProxyModel = new HsAddModeProxyModel(this); + mAddModeProxyModel = new HsAddModeProxyModel(this); mAddModeProxyModel->setSourceModel(mModel); } @@ -137,10 +137,10 @@ } int currentSortingPosition(-1); switch (mSortAttribute) { - case AscendingNameHsSortAttribute: + case Hs::AscendingNameHsSortAttribute: currentSortingPosition = 0; break; - case DescendingNameHsSortAttribute: + case Hs::DescendingNameHsSortAttribute: currentSortingPosition = 1; break; default: @@ -168,22 +168,38 @@ void HsAllAppsState::normalModeEntered() { HsBaseViewState::normalModeEntered(); - if (mMenuView->model() != mModel) { - mMenuView->setModel(mModel); - } connect(mMenuView.data(), SIGNAL(activated(QModelIndex)), static_cast<HsBaseViewState*>(this), SLOT(launchItem(QModelIndex))); } /*! - Slot invoked when add mode entered. + Sets model for this view in depends on menuMode. + \param menuMode menu mode */ -void HsAllAppsState::addModeEntered() +void HsAllAppsState::setModel(Hs::HsMenuMode menuMode) { - HsBaseViewState::addModeEntered(); - if (mMenuView->model() != mAddModeProxyModel) { - mMenuView->setModel(mAddModeProxyModel); + if (menuMode == Hs::AddHsMenuMode) { + if (mMenuView->model() != mAddModeProxyModel) { + mMenuView->setModel(mAddModeProxyModel); + } + } else { + if (mMenuView->model() != mModel) { + mMenuView->setModel(mModel); + } + } +} + + +/*! + Scrolls view to first item at top + */ +void HsAllAppsState::scrollToBeginning() +{ + QAbstractItemModel* model = mMenuView->model(); + if (model != NULL ) { + mMenuView->listView()->scrollTo( + model->index(0,0), HbAbstractItemView::PositionAtTop); } } @@ -201,78 +217,6 @@ } /*! - 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 context menu actions - */ -void HsAllAppsState::contextMenuAction(HbAction *action) -{ - HsContextAction command = - static_cast<HsContextAction>(action->data().toInt()); - - const int itemId = mContextModelIndex.data(CaItemModel::IdRole).toInt(); - - switch (command) { - case AddToHomeScreenContextAction: - addToHomeScreen(mContextModelIndex); - break; - case AddToCollectionContextAction: - // Addding a specific application to - // an existing collection via item specific menu. - machine()->postEvent( - HsMenuEventFactory::createAddAppsFromApplicationsViewEvent( - mSortAttribute, itemId)); - break; - case UninstallContextAction: - machine()->postEvent( - HsMenuEventFactory::createUninstallApplicationEvent(itemId)); - break; - case AppSettingContextAction: - machine()->postEvent( - HsMenuEventFactory::createAppSettingsViewEvent(itemId)); - break; - case AppDetailsContextAction: - machine()->postEvent( - HsMenuEventFactory::createAppDetailsViewEvent(itemId)); - break; - case OpenContextAction: - launchItem(mContextModelIndex); - break; - default: - break; - } - mMenuView->hideSearchPanel(); -} - -/*! - Slot connected to List widget in add mode. - Called when item long pressed. - \param item View item. - \param coords Press point coordinates. - */ -void HsAllAppsState::addLongPressed(HbAbstractViewItem *item, - const QPointF &coords) -{ - Q_UNUSED(coords); - mMenuView->disconnect(this); - HSMENUTEST_FUNC_ENTRY("HsAllAppsState::addLongPressed"); - addToHomeScreen(item->modelIndex()); - HSMENUTEST_FUNC_EXIT("HsAllAppsState::addLongPressed"); - -} - -/*! Slot called when application is adding to collection. */ void HsAllAppsState::addToCollection() @@ -300,58 +244,43 @@ #endif //COVERAGE_MEASUREMENT /*! - Triggers event so that a state adding to Home Screen is reached - \param index of an item to be added to homescreen. - \retval void - */ -void HsAllAppsState::addToHomeScreen(const QModelIndex &index) -{ - HSMENUTEST_FUNC_ENTRY("HsAllAppsState::addToHomeScreen"); - QSharedPointer<const CaEntry> entry = mModel->entry(index); - - machine()-> postEvent(HsMenuEventFactory::createAddToHomeScreenEvent( - entry->id(), mMenuMode->getHsMenuMode(), - mMenuMode->getHsToken())); - - HSMENUTEST_FUNC_EXIT("HsAllAppsState::addToHomeScreen"); -} - -/*! Method seting context menu options. */ void HsAllAppsState::setContextMenuOptions(HbAbstractViewItem *item, EntryFlags flags) { HbAction *openAction = mContextMenu->addAction(hbTrId( "txt_common_menu_open")); - openAction->setData(OpenContextAction); + openAction->setData(Hs::OpenAppContextAction); HbAction *addToHomeScreenAction = mContextMenu->addAction( hbTrId("txt_applib_menu_add_to_home_screen")); - addToHomeScreenAction->setData(AddToHomeScreenContextAction); + addToHomeScreenAction->setData(Hs::AddToHomeScreenContextAction); HbAction *addToCollectionAction = mContextMenu->addAction( hbTrId("txt_applib_menu_add_to_collection")); - addToCollectionAction->setData(AddToCollectionContextAction); + + addToCollectionAction->setData( + Hs::AddToCollectionFromApplicationsViewContextAction); HbAction *uninstallAction = mContextMenu->addAction( hbTrId("txt_common_menu_delete")); - uninstallAction->setData(UninstallContextAction); + uninstallAction->setData(Hs::UninstallContextAction); HbAction *appSettingsAction(NULL); HbAction *appDetailsAction(NULL); // check conditions and hide irrelevant menu items QSharedPointer<const CaEntry> entry = mModel->entry(item->modelIndex()); - if (!(entry->attribute(appSettingsPlugin()).isEmpty())) { + if (!(entry->attribute(Hs::appSettingsPlugin).isEmpty())) { appSettingsAction = mContextMenu->addAction( hbTrId("txt_common_menu_settings")); - appSettingsAction->setData(AppSettingContextAction); + appSettingsAction->setData(Hs::AppSettingContextAction); } - if (!(entry->attribute(componentIdAttributeName()).isEmpty()) && + if (!(entry->attribute(Hs::componentIdAttributeName).isEmpty()) && (flags & RemovableEntryFlag) ) { appDetailsAction = mContextMenu->addAction( hbTrId("txt_common_menu_details")); - appDetailsAction->setData(AppDetailsContextAction); + appDetailsAction->setData(Hs::AppDetailsContextAction); } if (!(flags & RemovableEntryFlag)) { @@ -368,7 +297,7 @@ void HsAllAppsState::ascendingMenuAction() { HSMENUTEST_FUNC_ENTRY("HsAllAppsState::ascendingMenuAction"); - mSortAttribute = AscendingNameHsSortAttribute; + mSortAttribute = Hs::AscendingNameHsSortAttribute; mModel->setSort(mSortAttribute); HSMENUTEST_FUNC_EXIT("HsAllAppsState::ascendingMenuAction"); } @@ -379,7 +308,7 @@ void HsAllAppsState::descendingMenuAction() { HSMENUTEST_FUNC_ENTRY("HsAllAppsState::descendingMenuAction"); - mSortAttribute = DescendingNameHsSortAttribute; + mSortAttribute = Hs::DescendingNameHsSortAttribute; mModel->setSort(mSortAttribute); HSMENUTEST_FUNC_EXIT("HsAllAppsState::descendingMenuAction");
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallcollectionsstate.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallcollectionsstate.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -109,21 +109,21 @@ HbAction *openAction = mContextMenu->addAction(hbTrId( "txt_common_menu_open")); - openAction->setData(OpenContextAction); + openAction->setData(Hs::OpenCollectionContextAction); // create context menu HbAction *addShortcutAction = mContextMenu->addAction(hbTrId( "txt_applib_menu_add_to_home_screen")); - addShortcutAction->setData(AddToHomeScreenContextAction); + addShortcutAction->setData(Hs::AddToHomeScreenContextAction); HbAction *renameAction = NULL; HbAction *deleteAction = NULL; if ((flags & RemovableEntryFlag)) { renameAction = mContextMenu->addAction( hbTrId("txt_common_menu_rename_item")); - renameAction->setData(RenameContextAction); + renameAction->setData(Hs::RenameCollectionContextAction); deleteAction = mContextMenu->addAction(hbTrId("txt_common_menu_delete")); - deleteAction->setData(DeleteContextAction); + deleteAction->setData(Hs::DeleteCollectionContextAction); } } @@ -169,73 +169,6 @@ } /*! - 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())); -} - -/*! - Slot connected to List widget in add mode. - Called when item long pressed. - \param item View item. - \param coords Press point coordinates. - */ -void HsAllCollectionsState::addLongPressed(HbAbstractViewItem *item, - 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())); -} - -/*! - Handles context menu actions. - \param action to be handled. - */ -void HsAllCollectionsState::contextMenuAction(HbAction *action) -{ - HsContextAction command = - static_cast<HsContextAction>(action->data().toInt()); - - const int itemId = mContextModelIndex.data(CaItemModel::IdRole).toInt(); - - switch (command) { - case AddToHomeScreenContextAction: - machine()->postEvent( - HsMenuEventFactory::createAddToHomeScreenEvent( - itemId, - mMenuMode->getHsMenuMode(), - mMenuMode->getHsToken())); - break; - case RenameContextAction: - machine()->postEvent( - HsMenuEventFactory::createRenameCollectionEvent(itemId)); - break; - case DeleteContextAction: - machine()->postEvent( - HsMenuEventFactory::createDeleteCollectionEvent(itemId)); - break; - case OpenContextAction: - openCollection(mContextModelIndex); - break; - default: - break; - } - - mMenuView->hideSearchPanel(); -} - -/*! Slot connected to constructMenu. */ void HsAllCollectionsState::createNewCollection()
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsapplibrarystate.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsapplibrarystate.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -123,11 +123,11 @@ setInitialState(initialState); mHistoryTransaction = new HsMenuModeTransition( - mMenuMode, NormalHsMenuMode, mAllAppsState); + mMenuMode, Hs::NormalHsMenuMode, mAllAppsState); initialState->addTransition(mHistoryTransaction); initialState->addTransition(new HsMenuModeTransition( - mMenuMode, AddHsMenuMode, mAllAppsState)); + mMenuMode, Hs::AddHsMenuMode, mAllAppsState)); mCollectionState = new HsCollectionState(mMenuViewBuilder, mMenuMode, @@ -197,22 +197,23 @@ HSMENUTEST_FUNC_ENTRY("HsAppLibraryState::onEntry"); QState::onEntry(event); - if (static_cast<HsMenuEvent *>(event)->operation() != - HsMenuEvent::OpenCollectionFromAppLibrary) - { - // we are back from HS, scroll those views to top - mAllAppsState->scrollToBeginning(); - mAllCollectionsState->scrollToBeginning(); - } - if (event->type() == HsMenuEvent::eventType()) { HsMenuEvent *menuEvent = static_cast<HsMenuEvent *>(event); QVariantMap data = menuEvent->data(); mMenuMode.setHsMenuMode( - static_cast<HsMenuMode>(data.value(menuModeType()).toInt()), - data.value(HOMESCREENDATA)); + static_cast<Hs::HsMenuMode>(data.value(Hs::menuModeType).toInt()), + data.value(Hs::homescreenData)); } else { - mMenuMode.setHsMenuMode(NormalHsMenuMode); + mMenuMode.setHsMenuMode(Hs::NormalHsMenuMode); + } + + if (event->type() != HsMenuEvent::eventType() || + static_cast<HsMenuEvent *>(event)->operation() != + HsMenuEvent::OpenCollectionFromAppLibrary) { + // we are back from HS, scroll those views to top + mAllAppsState->setModel(mMenuMode.getHsMenuMode()); + mAllAppsState->scrollToBeginning(); + mAllCollectionsState->scrollToBeginning(); } HSMENUTEST_FUNC_EXIT("HsAppLibraryState::onEntry"); @@ -251,8 +252,7 @@ mMenuViewBuilder.operatorAction())); operatorAction->setText(hbTrId(operatorHandler->text().toLatin1())); - //TODO: no locstring for ovi store currently - mMenuViewBuilder.oviStoreAction()->setText("Ovi Store"); + mMenuViewBuilder.oviStoreAction()->setText(hbTrId("txt_applib_grid_ovi_store")); if (operatorHandler->operatorStoreFirst()) { extension->addAction(operatorAction); extension->addAction(mMenuViewBuilder.oviStoreAction()); @@ -314,14 +314,14 @@ HSMENUTEST_FUNC_ENTRY("HsAppLibraryState::oviStoreAction"); CaEntry oviEntry; - oviEntry.setEntryTypeName(applicationTypeName()); - oviEntry.setAttribute( applicationUidEntryKey(), - QString::number(oviLauncherApplicationUid)); + oviEntry.setEntryTypeName(Hs::applicationTypeName); + oviEntry.setAttribute( Hs::applicationUidEntryKey, + QString::number(Hs::oviLauncherApplicationUid)); int result = CaService::instance()->executeCommand(oviEntry); if (result) { - oviEntry.setEntryTypeName(urlTypeName()); - oviEntry.setAttribute(urlEntryKey(), + oviEntry.setEntryTypeName(Hs::urlTypeName); + oviEntry.setAttribute(Hs::urlEntryKey, QString("https://store.ovi.com/applications/")); result = CaService::instance()->executeCommand(oviEntry); } @@ -335,7 +335,7 @@ */ void HsAppLibraryState::allAppsStateEntered() { - if (mMenuMode.getHsMenuMode() == NormalHsMenuMode) { + if (mMenuMode.getHsMenuMode() == Hs::NormalHsMenuMode) { mHistoryTransaction->setTargetState(mAllAppsState); } } @@ -345,7 +345,7 @@ */ void HsAppLibraryState::allCollectionsStateEntered() { - if (mMenuMode.getHsMenuMode() == NormalHsMenuMode) { + if (mMenuMode.getHsMenuMode() == Hs::NormalHsMenuMode) { mHistoryTransaction->setTargetState(mAllCollectionsState); } }
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsapplibstateutils.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsapplibstateutils.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -34,10 +34,10 @@ bool HsAppLibStateUtils::isCWRTWidgetOnHomeScreen(const CaEntry *entry) { bool result = false; - if (entry->entryTypeName() == applicationTypeName() && - entry->attribute(swTypeKey()) == HS_CWRT_APP_TYPE && - entry->attribute(widgetUriAttributeName()) == - HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE) { + if (entry->entryTypeName() == Hs::applicationTypeName && + entry->attribute(Hs::swTypeKey) == Hs::HS_CWRT_APP_TYPE && + entry->attribute(Hs::widgetUriAttributeName) == + Hs::HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE) { QVariantHash preferences; QMap<QString, QString> attributes = entry->attributes(); QMapIterator<QString, QString> i(attributes); @@ -45,12 +45,12 @@ i.next(); QString key(i.key()); QString value(i.value()); - if (key.contains(widgetParam())) { - preferences.insert(key.remove(widgetParam()),value); + if (key.contains(Hs::widgetParam)) { + preferences.insert(key.remove(Hs::widgetParam),value); } } int count(0); - HsContentService::instance()->widgets(HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE,preferences,count); + HsContentService::instance()->widgets(Hs::HS_WIDGET_URI_ATTRIBUTE_CWRT_VALUE,preferences,count); result = count > 0; } return result;
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsbaseviewstate.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsbaseviewstate.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -34,6 +34,7 @@ #include "hsmenumodetransition.h" #include "hsmenuentryremovedhandler.h" #include "hsmainwindow.h" +#include "hsmenumodewrapper.h" /*! @@ -180,10 +181,6 @@ { setMenuOptions(); connect(mMenuView.data(), - SIGNAL(activated(QModelIndex)), - mMenuView.data(), - SLOT(hideSearchPanel())); - connect(mMenuView.data(), SIGNAL(longPressed(HbAbstractViewItem *, QPointF)), SLOT(showContextMenu(HbAbstractViewItem *, QPointF))); } @@ -194,8 +191,8 @@ HsBaseViewState::~HsBaseViewState() { delete mModel; - mViewOptions = mMenuView->view()->takeMenu(); - delete mViewOptions; + mViewOptions = mMenuView->view()->takeMenu(); + delete mViewOptions; } /*! @@ -208,10 +205,10 @@ QSharedPointer<const CaEntry> entry = mModel->entry(index); if (!entry.isNull() && !(entry->flags() & UninstallEntryFlag)) { - if (entry->entryTypeName() == widgetTypeName()) { + if (entry->entryTypeName() == Hs::widgetTypeName) { machine()->postEvent(HsMenuEventFactory::createPreviewHSWidgetEvent(entry->id(), - entry->entryTypeName(), entry->attribute(widgetUriAttributeName()), - entry->attribute(widgetLibraryAttributeName()))); + entry->entryTypeName(), entry->attribute(Hs::widgetUriAttributeName), + entry->attribute(Hs::widgetLibraryAttributeName))); HsMenuService::touch(entry->id()); } else { @@ -284,6 +281,20 @@ } /*! + Triggers event so that a state adding to Home Screen is reached + \param entryId of an item to be added to homescreen. + \retval void + */ +void HsBaseViewState::addToHomeScreen(const int entryId) +{ + HSMENUTEST_FUNC_ENTRY("HsBaseViewState::addToHomeScreen"); + machine()->postEvent( + HsMenuEventFactory::createAddToHomeScreenEvent( + entryId, mMenuMode->getHsMenuMode(), mMenuMode->getHsToken())); + HSMENUTEST_FUNC_EXIT("HsBaseViewState::addToHomeScreen"); +} + +/*! Check software updates. \retval 0 if operation is successful. */ @@ -305,6 +316,97 @@ mContextMenu->close(); } } + +/*! + Handles context menu actions + \param action action taken in context menu + */ +void HsBaseViewState::contextMenuAction(HbAction *action) +{ + Hs::HsContextAction command = + static_cast<Hs::HsContextAction>(action->data().toInt()); + + const int itemId = mContextModelIndex.data(CaItemModel::IdRole).toInt(); + + switch (command) { + case Hs::AddToHomeScreenContextAction: + addToHomeScreen(itemId); + break; + case Hs::AddToCollectionFromApplicationsViewContextAction: + // Addding a specific application to + // an existing collection via item specific menu. + machine()->postEvent( + HsMenuEventFactory::createAddAppsFromApplicationsViewEvent( + Hs::NoHsSortAttribute, itemId)); + break; + case Hs::AddToCollectionFromCollectionViewContextAction: + machine()->postEvent( + HsMenuEventFactory::createAddAppsFromCollectionViewEvent( + -1, itemId)); + break; + case Hs::UninstallContextAction: + machine()->postEvent( + HsMenuEventFactory::createUninstallApplicationEvent( + itemId)); + break; + case Hs::AppSettingContextAction: + machine()->postEvent( + HsMenuEventFactory::createAppSettingsViewEvent(itemId)); + break; + case Hs::AppDetailsContextAction: + machine()->postEvent( + HsMenuEventFactory::createAppDetailsViewEvent(itemId)); + break; + case Hs::OpenAppContextAction: + launchItem(mContextModelIndex); + break; + case Hs::RenameCollectionContextAction: + machine()->postEvent( + HsMenuEventFactory::createRenameCollectionEvent(itemId)); + break; + case Hs::DeleteCollectionContextAction: + machine()->postEvent( + HsMenuEventFactory::createDeleteCollectionEvent(itemId)); + break; + case Hs::OpenCollectionContextAction: + openCollection(mContextModelIndex); + break; + default: + break; + } + + HsMenuService::touch(itemId); +} + +/*! + Slot connected to List widget in add mode. + \param index Model index of the activated item. + */ +void HsBaseViewState::addActivated(const QModelIndex &index) +{ + HSMENUTEST_FUNC_ENTRY("HsAllAppsState::addActivated"); + mMenuView->disconnect(this); + const int itemId = index.data(CaItemModel::IdRole).toInt(); + addToHomeScreen(itemId); + HsMenuService::touch(itemId); + HSMENUTEST_FUNC_EXIT("HsAllAppsState::addActivated"); +} + +/*! + Slot connected to List widget in add mode. + Called when item long pressed. + \param item View item. + \param coords Press point coordinates. + */ +void HsBaseViewState::addLongPressed(HbAbstractViewItem *item, + const QPointF &coords) +{ + Q_UNUSED(coords); + HSMENUTEST_FUNC_ENTRY("HsAllAppsState::addLongPressed"); + addActivated(item->modelIndex()); + HSMENUTEST_FUNC_EXIT("HsAllAppsState::addLongPressed"); +} + /*! Scrolls view to first item at top */ @@ -338,7 +440,8 @@ connect(normalModeState, SIGNAL(exited()),SLOT(normalModeExited())); initialState->addTransition(new HsMenuModeTransition( - *mMenuMode, NormalHsMenuMode, normalModeState)); + *mMenuMode, Hs::NormalHsMenuMode, normalModeState)); initialState->addTransition(new HsMenuModeTransition( - *mMenuMode, AddHsMenuMode, addModeState)); + *mMenuMode, Hs::AddHsMenuMode, addModeState)); } +
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hscollectionstate.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hscollectionstate.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -87,7 +87,7 @@ HsMainWindow &mainWindow, QState *parent) : HsBaseViewState(mainWindow, menuMode, parent), - mSortAttribute(LatestOnTopHsSortAttribute), + mSortAttribute(Hs::LatestOnTopHsSortAttribute), mCollectionId(-1) { initialize(menuViewBuilder, HsCollectionContext); @@ -131,8 +131,8 @@ if (event->type() == HsMenuEvent::eventType()) { HsMenuEvent *menuEvent = static_cast<HsMenuEvent *>(event); QVariantMap data = menuEvent->data(); - mCollectionId = data.value(itemIdKey()).toInt(); - mCollectionType = data.value(entryTypeNameKey()).toString(); + mCollectionId = data.value(Hs::itemIdKey).toInt(); + mCollectionType = data.value(Hs::entryTypeNameKey).toString(); } HSMENUTEST_FUNC_EXIT("HsCollectionState::onEntry"); @@ -201,19 +201,20 @@ this, SLOT(deleteAction())); } - if (mCollectionType == collectionDownloadedTypeName()) { + if (mCollectionType == Hs::collectionDownloadedTypeName && + mModel->rowCount() > 0) { HbMenu *sortMenu = mViewOptions->addMenu( hbTrId("txt_applib_opt_sort_by")); //Grouped options are exclusive by default. QActionGroup *sortGroup = new QActionGroup(this); sortGroup->addAction( sortMenu->addAction( - hbTrId("txt_applib_opt_sort_by_sub_latest_on_top"), + hbTrId("txt_applib_opt_sub_latest_on_top"), this, SLOT(latestOnTopMenuAction()))); sortGroup->addAction( sortMenu->addAction( - hbTrId("txt_applib_opt_sort_by_sub_oldest_on_top"), + hbTrId("txt_applib_opt_sub_oldest_on_top"), this, SLOT(oldestOnTopMenuAction()))); foreach(QAction *action, sortMenu->actions()) { @@ -237,7 +238,7 @@ delete mModel; mModel = NULL; - this->mSortAttribute = NoHsSortAttribute; + this->mSortAttribute = Hs::NoHsSortAttribute; HsBaseViewState::stateExited(); @@ -257,10 +258,6 @@ static_cast<HsBaseViewState*>(this), SLOT(launchItem(QModelIndex))); connect(mMenuView.data(), - SIGNAL(activated(QModelIndex)), - mMenuView.data(), - SLOT(hideSearchPanel())); - connect(mMenuView.data(), SIGNAL(longPressed(HbAbstractViewItem *, QPointF)), static_cast<HsBaseViewState*>(this), SLOT(showContextMenu(HbAbstractViewItem *, QPointF))); @@ -284,10 +281,6 @@ static_cast<HsBaseViewState*>(this), SLOT(launchItem(QModelIndex))); disconnect(mMenuView.data(), - SIGNAL(activated(QModelIndex)), - mMenuView.data(), - SLOT(hideSearchPanel())); - disconnect(mMenuView.data(), SIGNAL(longPressed(HbAbstractViewItem *, QPointF)), static_cast<HsBaseViewState*>(this), SLOT(showContextMenu(HbAbstractViewItem *, QPointF))); @@ -303,49 +296,19 @@ /*! Handles context menu actions + \param action action taken in context menu */ void HsCollectionState::contextMenuAction(HbAction *action) { - HsContextAction command = - static_cast<HsContextAction>(action->data().toInt()); - - const int itemId = mContextModelIndex.data(CaItemModel::IdRole).toInt(); - - switch (command) { - case AddToHomeScreenContextAction: - addElementToHomeScreen(mContextModelIndex); - break; - case AddToCollectionContextAction: - machine()->postEvent( - HsMenuEventFactory::createAddAppsFromCollectionViewEvent( - mCollectionId, itemId)); - break; - case UninstallContextAction: - machine()->postEvent( - HsMenuEventFactory::createUninstallApplicationEvent( - itemId)); - break; - case RemoveFromCollectionContextAction: - machine()->postEvent( - HsMenuEventFactory::createRemoveAppFromCollectionEvent( - itemId, mCollectionId)); - break; - case AppSettingContextAction: - machine()->postEvent( - HsMenuEventFactory::createAppSettingsViewEvent(itemId)); - break; - case AppDetailsContextAction: - machine()->postEvent( - HsMenuEventFactory::createAppDetailsViewEvent(itemId)); - break; - case OpenContextAction: - launchItem(mContextModelIndex); - break; - default: - break; + HsBaseViewState::contextMenuAction(action); + Hs::HsContextAction command = + static_cast<Hs::HsContextAction>(action->data().toInt()); + if (command == Hs::RemoveFromCollectionContextAction ) { + const int itemId = mContextModelIndex.data(CaItemModel::IdRole).toInt(); + machine()->postEvent( + HsMenuEventFactory::createRemoveAppFromCollectionEvent( + itemId, mCollectionId)); } - - mMenuView->hideSearchPanel(); } /*! @@ -363,7 +326,7 @@ if (flags & RemovableEntryFlag){ mMenuView->reset(HsButtonContext); connect(mMenuView->contentButton(), - SIGNAL(toggled(bool)), this, SLOT(addAppsAction(bool)), + SIGNAL(clicked()), this, SLOT(addAppsAction()), Qt::UniqueConnection); } else { mMenuView->reset(HsEmptyLabelContext); @@ -399,19 +362,12 @@ \param addApps if true create event for add enties to collection. Parametr use by toggled from HbPushButton */ -void HsCollectionState::addAppsAction(bool addApps) +void HsCollectionState::addAppsAction() { // Add applications - if (addApps) { - - if (mMenuView->contentButton()) { - mMenuView->contentButton()->setChecked(false); - } - - machine()->postEvent( - HsMenuEventFactory::createAddAppsFromCollectionViewEvent( - mCollectionId)); - } + machine()->postEvent( + HsMenuEventFactory::createAddAppsFromCollectionViewEvent( + mCollectionId)); } /*! @@ -419,9 +375,7 @@ */ void HsCollectionState::addCollectionShortcutToHomeScreenAction() { - machine()->postEvent(HsMenuEventFactory::createAddToHomeScreenEvent( - mCollectionId, mMenuMode->getHsMenuMode(), - mMenuMode->getHsToken())); + addToHomeScreen(mCollectionId); } /*! @@ -456,35 +410,19 @@ } /*! - Triggers event so that a state adding to Home Screen is reached - \param index of an item to be added to homescreen. - \retval void - */ -void HsCollectionState::addElementToHomeScreen(const QModelIndex &index) -{ - QSharedPointer<const CaEntry> entry = mModel->entry(index); - - QMap<QString, QString> attributes = entry->attributes(); - - machine()->postEvent( - HsMenuEventFactory::createAddToHomeScreenEvent( - entry->id(), mMenuMode->getHsMenuMode(), mMenuMode->getHsToken())); -} - -/*! Method setting context menu options. */ void HsCollectionState::setContextMenuOptions(HbAbstractViewItem *item, EntryFlags flags) { HbAction *openAction = mContextMenu->addAction(hbTrId( "txt_common_menu_open")); - openAction->setData(OpenContextAction); + openAction->setData(Hs::OpenAppContextAction); HbAction *addToHomeScreenAction = mContextMenu->addAction(hbTrId( "txt_applib_menu_add_to_home_screen")); - addToHomeScreenAction->setData(AddToHomeScreenContextAction); + addToHomeScreenAction->setData(Hs::AddToHomeScreenContextAction); HbAction *addToCollection = mContextMenu->addAction(hbTrId( "txt_applib_menu_add_to_collection")); - addToCollection->setData(AddToCollectionContextAction); + addToCollection->setData(Hs::AddToCollectionFromCollectionViewContextAction); HbAction *removeAction(NULL); HbAction *uninstallAction(NULL); HbAction *appSettingsAction(NULL); @@ -498,26 +436,26 @@ if (rootFlags & RemovableEntryFlag) { removeAction = mContextMenu->addAction( hbTrId("txt_applib_menu_remove_from_collection")); - removeAction->setData(RemoveFromCollectionContextAction); + removeAction->setData(Hs::RemoveFromCollectionContextAction); } if ((flags & RemovableEntryFlag)) { uninstallAction = mContextMenu->addAction(hbTrId("txt_common_menu_delete")); - uninstallAction->setData(UninstallContextAction); + uninstallAction->setData(Hs::UninstallContextAction); } QSharedPointer<const CaEntry> entry = mModel->entry(item->modelIndex()); - if (!(entry->attribute(appSettingsPlugin()).isEmpty())) { + if (!(entry->attribute(Hs::appSettingsPlugin).isEmpty())) { appSettingsAction = mContextMenu->addAction(hbTrId( "txt_common_menu_settings")); - appSettingsAction->setData(AppSettingContextAction); + appSettingsAction->setData(Hs::AppSettingContextAction); } - if (!(entry->attribute(componentIdAttributeName()).isEmpty()) && + if (!(entry->attribute(Hs::componentIdAttributeName).isEmpty()) && (flags & RemovableEntryFlag) ) { appDetailsAction = mContextMenu->addAction(hbTrId( "txt_common_menu_details")); - appDetailsAction->setData(AppDetailsContextAction); + appDetailsAction->setData(Hs::AppDetailsContextAction); } addToHomeScreenAction->setVisible( @@ -530,7 +468,7 @@ */ void HsCollectionState::latestOnTopMenuAction() { - mSortAttribute = LatestOnTopHsSortAttribute; + mSortAttribute = Hs::LatestOnTopHsSortAttribute; mModel->setSort(mSortAttribute); emit sortOrderChanged(mSortAttribute); } @@ -541,7 +479,7 @@ */ void HsCollectionState::oldestOnTopMenuAction() { - mSortAttribute = OldestOnTopHsSortAttribute; + mSortAttribute = Hs::OldestOnTopHsSortAttribute; mModel->setSort(mSortAttribute); emit sortOrderChanged(mSortAttribute); }
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsinstalledappsstate.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsinstalledappsstate.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -51,7 +51,8 @@ HsInstalledAppsState::HsInstalledAppsState(HsMenuViewBuilder &menuViewBuilder, HsMainWindow &mainWindow, QState *parent): - HsBaseViewState(mainWindow, parent) + HsBaseViewState(mainWindow, parent), + mSortAttribute(Hs::OldestOnTopHsSortAttribute) { initialize(menuViewBuilder, HsInstalledAppsContext); construct(); @@ -86,7 +87,33 @@ this, SLOT(openTaskSwitcher())); mViewOptions->addAction(hbTrId("txt_applib_opt_installation_log"), this, SLOT(openInstallationLog())); - + if (mModel->rowCount() > 0) { + HbMenu *sortMenu = mViewOptions->addMenu( + hbTrId("txt_applib_opt_sort_by")); + //Grouped options are exclusive by default. + QActionGroup *sortGroup = new QActionGroup(this); + sortGroup->addAction( + sortMenu->addAction( + hbTrId("txt_applib_opt_sort_by_sub_latest_on_top"), + this, + SLOT(latestOnTopMenuAction()))); + sortGroup->addAction( + sortMenu->addAction( + hbTrId("txt_applib_opt_sort_by_sub_oldest_on_top"), + this, + SLOT(oldestOnTopMenuAction()))); + foreach(QAction *action, sortMenu->actions()) { + action->setCheckable(true); + } + static const int defaultSortingPosition = 0; + if(mSortAttribute == Hs::LatestOnTopHsSortAttribute) + { + sortGroup->actions().at(defaultSortingPosition + 1)->setChecked(true); + } + else { + sortGroup->actions().at(defaultSortingPosition)->setChecked(true); + } + } mMenuView->view()->setMenu(mViewOptions); HSMENUTEST_FUNC_EXIT("HsInstalledAppsState::setMenuOptions"); } @@ -101,15 +128,15 @@ HbAction *uninstallAction = mContextMenu->addAction( hbTrId("txt_common_menu_delete")); HbAction *appDetailsAction(NULL); - uninstallAction->setData(UninstallContextAction); + uninstallAction->setData(Hs::UninstallContextAction); QSharedPointer<const CaEntry> entry = mModel->entry(item->modelIndex()); - if (!(entry->attribute(componentIdAttributeName()).isEmpty()) && + if (!(entry->attribute(Hs::componentIdAttributeName).isEmpty()) && (flags & RemovableEntryFlag) ) { appDetailsAction = mContextMenu->addAction(hbTrId( "txt_common_menu_details")); - appDetailsAction->setData(AppDetailsContextAction); + appDetailsAction->setData(Hs::AppDetailsContextAction); } } @@ -137,7 +164,7 @@ if (!mModel) { mModel - = HsMenuService::getInstalledModel(AscendingNameHsSortAttribute); + = HsMenuService::getInstalledModel(mSortAttribute); } if (mModel->rowCount() == 0) { @@ -196,6 +223,7 @@ mMenuView->reset(HsItemViewContext); mMenuView->setModel(mModel); } + setMenuOptions(); mMenuView->activate(); } @@ -209,28 +237,25 @@ } /*! - Handles context menu actions. - \param action to handle. + A Slot called when an action for sorting (latest + on top) is invoked for Installed. */ -void HsInstalledAppsState::contextMenuAction(HbAction *action) +void HsInstalledAppsState::latestOnTopMenuAction() { - HsContextAction command = - static_cast<HsContextAction>(action->data().toInt()); - - const int itemId = mContextModelIndex.data(CaItemModel::IdRole).toInt(); + // as we geting already reversed list from query + // we set it to OldestOnTopHsSortAttribute + mSortAttribute = Hs::OldestOnTopHsSortAttribute; + mModel->setSort(mSortAttribute); +} - switch (command) { - case UninstallContextAction: - machine()->postEvent( - HsMenuEventFactory::createUninstallApplicationEvent( - itemId)); - break; - case AppDetailsContextAction: - machine()->postEvent( - HsMenuEventFactory::createAppDetailsViewEvent(itemId)); - break; - default: - break; - } - mMenuView->hideSearchPanel(); +/*! + A Slot called when an action for sorting (oldest + on top) is invoked for Installed. + */ +void HsInstalledAppsState::oldestOnTopMenuAction() +{ + // as we geting already reversed list from query + // we set it to LatestOnTopHsSortAttribute + mSortAttribute = Hs::LatestOnTopHsSortAttribute; + mModel->setSort(mSortAttribute); }
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenumodetransition.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenumodetransition.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -32,7 +32,7 @@ \param target target state. */ HsMenuModeTransition::HsMenuModeTransition( - HsMenuModeWrapper &menuMode, HsMenuMode expectedMenuMode, QState *target): + HsMenuModeWrapper &menuMode, Hs::HsMenuMode expectedMenuMode, QState *target): mMenuMode(menuMode), mExpectedMenuMode(expectedMenuMode) { setTargetState(target);
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenumodewrapper.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenumodewrapper.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -32,14 +32,14 @@ Constructor. */ -HsMenuModeWrapper::HsMenuModeWrapper(): mMode(NormalHsMenuMode) +HsMenuModeWrapper::HsMenuModeWrapper(): mMode(Hs::NormalHsMenuMode) { } /*! \return homescreen mode (add mode on / add mode off) set on the object */ -HsMenuMode HsMenuModeWrapper::getHsMenuMode() const +Hs::HsMenuMode HsMenuModeWrapper::getHsMenuMode() const { return mMode; } @@ -55,7 +55,7 @@ /*! \return sets in the object homescreen mode (add mode on / add mode off) */ -void HsMenuModeWrapper::setHsMenuMode(HsMenuMode menuMode, QVariant token) +void HsMenuModeWrapper::setHsMenuMode(Hs::HsMenuMode menuMode, QVariant token) { mMode = menuMode; mToken = token;
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuview.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsmenuview.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -51,7 +51,23 @@ */ /*! + \fn void activated(const QModelIndex &index); + \param index of activated item. + Emitted on tap event on the list view. +*/ +/*! + \fn void longPressed(HbAbstractViewItem *item, const QPointF &coords); + \param item List element that was long-pressed. + \param coords Coordinates of the long-press. + Emitted on long-press event on the list view + */ +/*! + \fn void listViewChange(); + Emitted on model count change for current model + \see void setModel(QAbstractItemModel *model) +*/ +/*! Retrieves UI objects for a requested context and sets up signals' connections. \param builder Menu View builder. @@ -82,6 +98,8 @@ connect(mHsSearchView.data(), SIGNAL(longPressed(HbAbstractViewItem *, QPointF)), this, SIGNAL(longPressed(HbAbstractViewItem *, QPointF))); + connect(mHsSearchView.data(), SIGNAL(searchComplete(QModelIndex)), + this, SLOT(handleSearchComplete(QModelIndex))); } /*! @@ -110,7 +128,7 @@ SLOT(scrollToRow(int, QAbstractItemView::ScrollHint))); disconnect(mListView->model(), SIGNAL(countChange()), this, - SIGNAL(listViewChange())); + SIGNAL(listViewChange())); } mListView->setItemPixmapCacheEnabled(true); // TODO: remove when enabled from default @@ -131,11 +149,15 @@ } /*! - Returns model for list item view. + Returns model for list item view or null if list view is not available. */ QAbstractItemModel *HsMenuView::model() const { - return mListView->model(); + if (mListView != NULL) { + return mListView->model(); + } else { + return NULL; + } } /*! @@ -253,9 +275,11 @@ */ void HsMenuView::activate() { - mMainWindow.setCurrentView(mView); - connect(mBuilder.searchAction(), SIGNAL(triggered()), - this, SLOT(showSearchPanel()), Qt::UniqueConnection); + if (!mHsSearchView->isActive()) { + mMainWindow.setCurrentView(mView); + connect(mBuilder.searchAction(), SIGNAL(triggered()), + this, SLOT(showSearchPanel()), Qt::UniqueConnection); + } } /*! @@ -322,3 +346,19 @@ mViewLabel = mBuilder.currentViewLabel(); mAddContentButton = mBuilder.currentAddContentButton(); } + + +/*! + Slot. + \param firstMatching Index of first item of search result. + If menu view is about to show it scrolls the list to \a firstMatching. + Makes view represented by the object main view of the application. + */ +void HsMenuView::handleSearchComplete(const QModelIndex& firstMatching) +{ + if (mListView != NULL) { + mListView->scrollTo(firstMatching, HbAbstractItemView::PositionAtTop); + } + + activate(); +}
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsoperatorhandler_p.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsoperatorhandler_p.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -147,9 +147,9 @@ crManager, OperatorStoreApplication, XQSettingsManager::TypeString); if (!variant.isNull()) { CaEntry *operatorEntry = new CaEntry; - operatorEntry->setEntryTypeName(applicationTypeName()); + operatorEntry->setEntryTypeName(Hs::applicationTypeName); operatorEntry->setAttribute( - applicationUidEntryKey(), variant.toString()); + Hs::applicationUidEntryKey, variant.toString()); return operatorEntry; } @@ -168,8 +168,8 @@ crManager, OperatorStoreURL, XQSettingsManager::TypeString); if (!variant.isNull()) { CaEntry *operatorEntry = new CaEntry; - operatorEntry->setEntryTypeName(urlTypeName()); - operatorEntry->setAttribute(urlEntryKey(), variant.toString()); + operatorEntry->setEntryTypeName(Hs::urlTypeName); + operatorEntry->setAttribute(Hs::urlEntryKey, variant.toString()); return operatorEntry; }
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hssearchview.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hssearchview.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -16,9 +16,7 @@ */ #include <QApplication> -#include <QInputContext> #include <QSortFilterProxyModel> - #include <HbGroupBox> #include <HbLineEdit> #include <HbListView> @@ -33,6 +31,27 @@ #include "hssearchview.h" /*! + * \fn void activated(const QModelIndex &index) + * This signal is emitted when item is tapped. + * \param index of an item that was tapped. + */ + + /*! + * \fn void longPressed(HbAbstractViewItem *item, const QPointF &coords) + * This singal is emitted when view is long pressed. + * \param item View item that was long pressed. + * \param coords View coordinates of the long press. + */ + + /*! + * \fn void searchComplete(const QModelIndex &firstMatching) + * This signal is emitted when search action has been finished + * and search view is about to quit. + * \param firstMatching of first item in search filtered view. + */ + + +/*! Set up proxy model for search. \param builder Retrieves UI widgets. \param stateContext Identifies the state where search starts from. @@ -46,8 +65,9 @@ mVkbHost(NULL), mSearchViewBuilder(), mEmptyResultText(true) { mProxyModel->setFilterRole(CaItemModel::TextRole); - mProxyModel->setFilterKeyColumn(1); + mProxyModel->setFilterKeyColumn(0); mProxyModel->setSortRole(CaItemModel::TextRole); + mProxyModel->setDynamicSortFilter(true); } /*! @@ -128,6 +148,8 @@ mMainWindow.setCurrentView(mSearchView); + openVkb(); + mSearchListView->scrollTo( mProxyModel->mapFromSource(mSearchViewInitialIndex), HbAbstractItemView::PositionAtTop); @@ -157,10 +179,14 @@ */ void HsSearchView::connectSearchItemViewsSignals() { + connect(mSearchListView, SIGNAL(pressed(QModelIndex)), + this, SLOT(hideVkb()), Qt::UniqueConnection); connect(mSearchListView, SIGNAL(activated(QModelIndex)), - this, SLOT(activatedProxySlot(QModelIndex))); + this, SLOT(activatedProxySlot(QModelIndex)), Qt::UniqueConnection); connect(mSearchListView, SIGNAL(longPressed(HbAbstractViewItem *, QPointF)), - this, SLOT(longPressedProxySlot(HbAbstractViewItem *, QPointF))); + this, SLOT(longPressedProxySlot(HbAbstractViewItem *, QPointF)), + Qt::UniqueConnection); + } /*! @@ -170,6 +196,8 @@ */ void HsSearchView::disconnectSearchItemViewsSignals() { + disconnect(mSearchListView, SIGNAL(pressed(QModelIndex)), + this, SLOT(hideVkb())); disconnect(mSearchListView, SIGNAL(activated(QModelIndex)), this, SLOT(activatedProxySlot(QModelIndex))); disconnect(mSearchListView, @@ -195,6 +223,8 @@ */ void HsSearchView::connectSearchPanelSignals() { + connect(mProxyModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)), + this, SLOT(setNoResultsVisibility()), Qt::UniqueConnection); connect(mProxyModel, SIGNAL(rowsInserted(QModelIndex, int, int)), this, SLOT(setNoResultsVisibility())); connect(mProxyModel, SIGNAL(rowsRemoved(QModelIndex, int, int)), @@ -202,7 +232,7 @@ connect(mSearchPanel, SIGNAL(exitClicked()), this, SLOT(hideSearchPanel())); connect(mSearchPanel, SIGNAL(criteriaChanged(QString)), - this, SLOT(findItem(QString))); + this, SLOT(findItem(QString)), Qt::UniqueConnection); } /*! @@ -225,18 +255,17 @@ mIndexToScrollAfterSearchDone = firstVisibleItemIndex(mSearchListView); - setOriginatingContext(); - - mMainWindow.setCurrentView(mBuilder.currentView()); - - mListView->scrollTo(mProxyModel->mapToSource( - mIndexToScrollAfterSearchDone), - HbAbstractItemView::PositionAtTop); + // emiting searchComplete must be done + // after this->isActive() returns false + mSearchListView = NULL; + mSearchPanel = NULL; + + emit searchComplete(mProxyModel->mapToSource( + mIndexToScrollAfterSearchDone)); HbVkbHost::detachHost(mSearchView); mVkbHost.reset(NULL); - mSearchListView = NULL; - mSearchPanel = NULL; + mProxyModel->setSourceModel(NULL); HSMENUTEST_FUNC_EXIT("HsSearchView::searchFinished"); } @@ -254,7 +283,7 @@ QRegExp("(^|\\b)" + criteriaStr, Qt::CaseInsensitive)); mSearchListView->scrollTo( - mProxyModel->index(0,0), HbAbstractItemView::PositionAtTop); + mProxyModel->index(0, 0), HbAbstractItemView::PositionAtTop); HSMENUTEST_FUNC_EXIT("HsSearchView::findItem"); } @@ -340,10 +369,43 @@ } /*! - \retval true when search view is already invoked, \a false otherwise. + \retval true when search view is actually responsible for view management, + \a false otherwise. */ bool HsSearchView::isActive() const { return mSearchListView != NULL; } +/*! + Slot to close virtual keyboard. + */ +void HsSearchView::hideVkb() +{ + sendEvent(QEvent::CloseSoftwareInputPanel); +} + +/*! + Makes Vkb open provided there is an editor visible in the graphics scene. + */ +void HsSearchView::openVkb() +{ + sendEvent(QEvent::RequestSoftwareInputPanel); +} + +/*! + Sends QEvent. + \param eventType Identifies event to be sent. + */ +void HsSearchView::sendEvent(const QEvent::Type eventType) +{ + QInputContext *const ic = qApp->inputContext(); + if (ic != NULL) { + QScopedPointer<QEvent> event( + new QEvent(eventType)); + + ic->filterEvent(event.data()); + } + +} +
--- a/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsidlestate.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hshomescreenstateplugin/src/hsidlestate.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -337,7 +337,7 @@ animation->setEndValue(pageLayerXPos(targetPageIndex)); animation->setDuration(duration); - if (abs(mDeltaX) < HSCONFIGURATION_GET(pageChangePanDistanceInPixels)) { + if (abs(mDeltaX) < HSCONFIGURATION_GET(pageChangePanDistance)) { animation->setEasingCurve(HSCONFIGURATION_GET(bounceAnimationEasingCurve)); } else { @@ -526,7 +526,7 @@ */ QVariant homescreenData(mPageHotSpot); machine()->postEvent( - HsMenuEventFactory::createOpenAppLibraryEvent(AddHsMenuMode, homescreenData)); + HsMenuEventFactory::createOpenAppLibraryEvent(Hs::AddHsMenuMode, homescreenData)); mPageHotSpot = QPointF(); } @@ -536,7 +536,7 @@ void HsIdleState::onAddContentFromOptionsMenuActionTriggered() { machine()->postEvent( - HsMenuEventFactory::createOpenAppLibraryEvent(AddHsMenuMode)); + HsMenuEventFactory::createOpenAppLibraryEvent(Hs::AddHsMenuMode)); } /*! @@ -657,17 +657,17 @@ if (HSCONFIGURATION_GET(isSnapEnabled)) { mSnapResult = HsWidgetPositioningOnWidgetMove::instance()->run(widget->visual()->sceneBoundingRect()); + bool isTrashbinOpen = HsGui::instance()->idleWidget()->trashBin()->isUnderMouse(); + if (HSCONFIGURATION_GET(isSnapEffectsEnabled)) { - if (mSnapResult.hasHorizontalSnap) { + if (mSnapResult.hasHorizontalSnap && !isTrashbinOpen) { showVerticalLine(); - } - else { + } else { hideVerticalLine(); } - if (mSnapResult.hasVerticalSnap) { + if (mSnapResult.hasVerticalSnap && !isTrashbinOpen) { showHorizontalLine(); - } - else { + } else { hideHorizontalLine(); } } @@ -954,9 +954,9 @@ if (HSCONFIGURATION_GET(isSnapEnabled)) { QVariantHash snapConfiguration; - snapConfiguration[SNAPENABLED] = QString::number(HSCONFIGURATION_GET(isSnapEnabled)); - snapConfiguration[SNAPFORCE] = QString::number(HSCONFIGURATION_GET(snapForce)); - snapConfiguration[SNAPGAP] = QString::number(HSCONFIGURATION_GET(snapGap)); + snapConfiguration[Hs::snapEnabled] = QString::number(HSCONFIGURATION_GET(isSnapEnabled)); + snapConfiguration[Hs::snapForce] = QString::number(HSCONFIGURATION_GET(snapForce)); + snapConfiguration[Hs::snapGap] = QString::number(HSCONFIGURATION_GET(snapGap)); HsWidgetPositioningOnWidgetMove::instance()->setConfiguration(snapConfiguration); updatePagePresentationToWidgetSnap(); @@ -1126,9 +1126,9 @@ int pageIndex = HsScene::instance()->activePageIndex(); - if (mDeltaX < -HSCONFIGURATION_GET(pageChangePanDistanceInPixels)) { + if (mDeltaX < -HSCONFIGURATION_GET(pageChangePanDistance)) { pageIndex = qMin(pageIndex + 1, pages.count() - 1); - } else if (HSCONFIGURATION_GET(pageChangePanDistanceInPixels) < mDeltaX) { + } else if (HSCONFIGURATION_GET(pageChangePanDistance) < mDeltaX) { pageIndex = qMax(pageIndex - 1, 0); } @@ -1212,10 +1212,13 @@ bool isLastPage(scene->activePage() == scene->pages().last()); int nextPageIndex(pageToRemoveIndex); - nextPageIndex++; + if (isLastPage) { nextPageIndex--; + } else { + nextPageIndex++; } + HsPropertyAnimationWrapper *animation = HsGui::instance()->pageChangeAnimation(); if (animation->isRunning()) { animation->stop();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/docml.pri Wed Aug 18 10:33:57 2010 +0300 @@ -0,0 +1,26 @@ +# 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: + +symbian { +docmlFiles+= \ + resource/hsappchecklist.docml \ + resource/hsarrangedialog.docml \ + resource/hscollectionslistdialog.docml \ + resource/hsdetailsdialog.docml \ + resource/hsinstallationlogdialog.docml \ + resource/hsuninstalldialog.docml \ + resource/hswidgetpreviewdialog.docml + + qrcFile = hsmenuworkerstateplugin.qrc + } +else { + qrcFile = hsmenuworkerstateplugin_non_symbian.qrc +}
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/hsmenuworkerstateplugin.pro Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/hsmenuworkerstateplugin.pro Wed Aug 18 10:33:57 2010 +0300 @@ -21,7 +21,7 @@ PLUGIN_SUBDIR = /private/20022F35/plugins/stateplugins include(../../common.pri) - +include(docml.pri) LIBS += -lhsdomainmodel \ -lhsmenuserviceprovider \ -lhsutils \ @@ -30,22 +30,26 @@ DEPENDPATH += ./inc \ ./src + + INCLUDEPATH += ./inc \ ../../serviceproviders/hsmenuserviceprovider/inc \ ../../hsutils/inc \ ../../hsdomainmodel/inc -symbian: { +symbian { TARGET.UID3 = 0x20022F99 -nft: { - LIBS += -lhal + nft: { + LIBS += -lhal + } + for(docmlFile, docmlFiles): DOCML+=$$docmlFile } -} + +RESOURCES += $$qrcFile include(hsmenuworkerstateplugin.pri) -RESOURCES = hsmenuworkerstateplugin.qrc
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/hsmenuworkerstateplugin.qrc Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/hsmenuworkerstateplugin.qrc Wed Aug 18 10:33:57 2010 +0300 @@ -1,11 +1,11 @@ <RCC> <qresource prefix="/xml" > - <file alias="hsappchecklist.docml">resource/hsappchecklist.docml</file> - <file alias="hswidgetpreviewdialog.docml">resource/hswidgetpreviewdialog.docml</file> - <file alias="hsarrangedialog.docml">resource/hsarrangedialog.docml</file> - <file alias="hsdetailsdialog.docml">resource/hsdetailsdialog.docml</file> - <file alias="hsuninstalldialog.docml">resource/hsuninstalldialog.docml</file> - <file alias="hsinstallationlogdialog.docml">resource/hsinstallationlogdialog.docml</file> - <file alias="hscollectionslistdialog.docml">resource/hscollectionslistdialog.docml</file> + <file alias="hsappchecklist.docml">resource/hsappchecklist.docml.bin</file> + <file alias="hswidgetpreviewdialog.docml">resource/hswidgetpreviewdialog.docml.bin</file> + <file alias="hsarrangedialog.docml">resource/hsarrangedialog.docml.bin</file> + <file alias="hsdetailsdialog.docml">resource/hsdetailsdialog.docml.bin</file> + <file alias="hsuninstalldialog.docml">resource/hsuninstalldialog.docml.bin</file> + <file alias="hsinstallationlogdialog.docml">resource/hsinstallationlogdialog.docml.bin</file> + <file alias="hscollectionslistdialog.docml">resource/hscollectionslistdialog.docml.bin</file> </qresource> </RCC>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/hsmenuworkerstateplugin_non_symbian.qrc Wed Aug 18 10:33:57 2010 +0300 @@ -0,0 +1,11 @@ +<RCC> + <qresource prefix="/xml" > + <file alias="hsappchecklist.docml">resource/hsappchecklist.docml</file> + <file alias="hswidgetpreviewdialog.docml">resource/hswidgetpreviewdialog.docml</file> + <file alias="hsarrangedialog.docml">resource/hsarrangedialog.docml</file> + <file alias="hsdetailsdialog.docml">resource/hsdetailsdialog.docml</file> + <file alias="hsuninstalldialog.docml">resource/hsuninstalldialog.docml</file> + <file alias="hsinstallationlogdialog.docml">resource/hsinstallationlogdialog.docml</file> + <file alias="hscollectionslistdialog.docml">resource/hscollectionslistdialog.docml</file> + </qresource> +</RCC>
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsaddappstocollectionstate.h Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsaddappstocollectionstate.h Wed Aug 18 10:33:57 2010 +0300 @@ -129,7 +129,7 @@ CollectionActionType mActionType; - HsSortAttribute mApplicationsSortAttribute; + Hs::HsSortAttribute mApplicationsSortAttribute; HsAppsCheckList *mAppsCheckList;
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsaddtohomescreenstate.h Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsaddtohomescreenstate.h Wed Aug 18 10:33:57 2010 +0300 @@ -83,7 +83,7 @@ QAction *mConfirmAction; - HsMenuMode mMenuMode; + Hs::HsMenuMode mMenuMode; QVariant mToken;
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsappschecklist.h Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsappschecklist.h Wed Aug 18 10:33:57 2010 +0300 @@ -45,9 +45,9 @@ void cleanUp(); - void setSortOrder(HsSortAttribute sortAttribute); + void setSortOrder(Hs::HsSortAttribute sortAttribute); - void showAppsCheckboxList(HsSortAttribute sortAttribute); + void showAppsCheckboxList(Hs::HsSortAttribute sortAttribute); signals: @@ -75,7 +75,7 @@ HsMenuItemModel *mModel; // delete with dialog - HsSortAttribute mSortAttribute; + Hs::HsSortAttribute mSortAttribute; };
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsuninstallitemstate.h Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/inc/hsuninstallitemstate.h Wed Aug 18 10:33:57 2010 +0300 @@ -39,8 +39,7 @@ public: enum UninstallDialogType { - UninstallDialogDefinition01 = 1, - UninstallDialogDefinition02, + UninstallDialogDefinition02 = 1, UninstallDialogDefinition03, UninstallDialogDefinition04 }; @@ -71,9 +70,8 @@ QStringList &applicationsNames, QString &confirmationMessage); - void createUninstallMessage(); + void createSimpleUninstallMessage(bool isJava=false); void createUninstallJavaMessage(); - void createSimpleUninstallJavaMessage(); private:
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsuninstalldialog.docml Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsuninstalldialog.docml Wed Aug 18 10:33:57 2010 +0300 @@ -25,7 +25,7 @@ <widget name="confirmation_dialog_label" type="HbLabel"> <enums name="textWrapping" value="TextWordWrap"/> <bool name="visible" value="TRUE"/> - <string locid="txt_applib_info_remove_1_all_its_shortcuts_and" name="plainText"/> + <string locid="txt_applib_info_delete_1_all_its_shortcuts_and" name="plainText"/> <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-primary)"/> </widget> <real name="z" value="0"/> @@ -62,58 +62,6 @@ <ref object="qtl_dialog_softkey_2_left" role="HbWidget:addAction"/> <ref object="qtl_dialog_softkey_2_right" role="HbWidget:addAction"/> </widget> - <section name="uninstallDialogDefinition01"> - <widget name="uninstall_dialog" type="HbDialog"> - <widget name="confirmation_dialog_label_large_graphic" role="HbDialog:contentWidget" type="HbScrollArea"> - <widget name="scrollAreaContents" role="HbScrollArea:contents" type="HbWidget"> - <widget name="common_confirmation" type="HbWidget"> - <widget name="icon" type="HbLabel"> - <enums name="alignment" value="AlignVCenter|AlignHCenter"/> - <icon iconName="qtg_large_info" name="icon"/> - <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/> - <sizehint height="var(hb-param-graphic-size-primary-large)" type="FIXED" width="var(hb-param-graphic-size-primary-large)"/> - <bool name="visible" value="TRUE"/> - </widget> - <widget name="confirmation_dialog_label" type="HbLabel"> - <enums name="textWrapping" value="TextWordWrap"/> - <bool name="visible" value="TRUE"/> - <string locid="txt_applib_info_remove_1_all_its_shortcuts_and" name="plainText"/> - <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-primary)"/> - </widget> - <real name="z" value="0"/> - <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/> - <layout orientation="Horizontal" spacing="var(hb-param-margin-gene-popup)" type="linear"> - <contentsmargins bottom="var(hb-param-margin-gene-popup)" left="var(hb-param-margin-gene-popup)" right="var(hb-param-margin-gene-popup)" top="var(hb-param-margin-gene-popup)"/> - <linearitem itemname="icon"/> - <linearitem itemname="confirmation_dialog_label"/> - </layout> - </widget> - <widget name="list_label" type="HbLabel"> - <enums name="textWrapping" value="TextWordWrap"/> - <bool name="visible" value="FALSE"/> - <string locid="txt_applib_info_following_applications_will_be_rem" name="plainText"/> - </widget> - <widget name="delete_message_label" type="HbLabel"> - <enums name="textWrapping" value="TextWordWrap"/> - <bool name="visible" value="FALSE"/> - <string name="plainText" value="Delete message details"/> - </widget> - <widget name="list_view_label" type="HbLabel"> - <bool name="visible" value="FALSE"/> - <string name="plainText" value=""/> - </widget> - <layout orientation="Vertical" spacing="var(hb-param-margin-gene-popup)" type="linear"> - <contentsmargins bottom="var(hb-param-margin-gene-popup)" left="var(hb-param-margin-gene-popup)" right="var(hb-param-margin-gene-popup)" top="var(hb-param-margin-gene-popup)"/> - <linearitem itemname="common_confirmation"/> - </layout> - </widget> - </widget> - <sizehint height="50un" type="PREFERRED" width="49.73un"/> - <contentsmargins bottom="var(hb-param-margin-view-bottom)" left="var(hb-param-margin-view-left)" right="var(hb-param-margin-view-right)" top="var(hb-param-margin-view-top)"/> - <ref object="qtl_dialog_softkey_2_left" role="HbWidget:addAction"/> - <ref object="qtl_dialog_softkey_2_right" role="HbWidget:addAction"/> - </widget> - </section> <section name="uninstallDialogDefinition02"> <widget name="uninstall_dialog" type="HbDialog"> <widget name="confirmation_dialog_label_large_graphic" role="HbDialog:contentWidget" type="HbScrollArea"> @@ -129,7 +77,7 @@ <widget name="confirmation_dialog_label" type="HbLabel"> <enums name="textWrapping" value="TextWordWrap"/> <bool name="visible" value="TRUE"/> - <string locid="txt_applib_info_remove_1_all_its_shortcuts_and" name="plainText"/> + <string locid="txt_applib_info_delete_1_all_its_shortcuts_and" name="plainText"/> <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-primary)"/> </widget> <real name="z" value="0"/> @@ -184,7 +132,7 @@ <widget name="confirmation_dialog_label" type="HbLabel"> <enums name="textWrapping" value="TextWordWrap"/> <bool name="visible" value="TRUE"/> - <string locid="txt_applib_info_remove_1_all_its_shortcuts_and" name="plainText"/> + <string locid="txt_applib_info_delete_1_all_its_shortcuts_and" name="plainText"/> <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-primary)"/> </widget> <real name="z" value="0"/> @@ -238,7 +186,7 @@ <widget name="confirmation_dialog_label" type="HbLabel"> <enums name="textWrapping" value="TextWordWrap"/> <bool name="visible" value="TRUE"/> - <string locid="txt_applib_info_remove_1_all_its_shortcuts_and" name="plainText"/> + <string locid="txt_applib_info_delete_1_all_its_shortcuts_and" name="plainText"/> <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-primary)"/> </widget> <real name="z" value="0"/> @@ -278,9 +226,8 @@ </section> <metadata activeUIState="Common ui state" display="NHD-3.2-inch_portrait" unit="un"> <uistate name="Common ui state" sections="#common"/> - <uistate name="Variant1" sections="#common uninstallDialogDefinition01"/> - <uistate name="Variant2" sections="#common uninstallDialogDefinition02"/> - <uistate name="Variant3" sections="#common uninstallDialogDefinition03"/> - <uistate name="Variant4" sections="#common uninstallDialogDefinition04"/> + <uistate name="Variant1" sections="#common uninstallDialogDefinition02"/> + <uistate name="Variant2" sections="#common uninstallDialogDefinition03"/> + <uistate name="Variant3" sections="#common uninstallDialogDefinition04"/> </metadata> </hbdocument>
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hswidgetpreviewdialog.docml Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hswidgetpreviewdialog.docml Wed Aug 18 10:33:57 2010 +0300 @@ -21,10 +21,10 @@ <real name="z" value="0"/> <layout type="anchor"> - <anchoritem dst="icon_box" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/> - <anchoritem dst="icon_box" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/> - <anchoritem dst="icon_box" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/> - <anchoritem dst="icon_box" dstEdge="BOTTOM" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="BOTTOM"/> + <anchoritem dst="icon_box" dstEdge="LEFT" src="" spacing="0.0un" srcEdge="LEFT"/> + <anchoritem dst="icon_box" dstEdge="TOP" src="" spacing="0.0un" srcEdge="TOP"/> + <anchoritem dst="icon_box" dstEdge="RIGHT" src="" spacing="0.0un" srcEdge="RIGHT"/> + <anchoritem dst="icon_box" dstEdge="BOTTOM" src="" spacing="0.0un" srcEdge="BOTTOM"/> </layout> </widget> <ref object="add_to_homescreen" role="HbWidget:addAction"/>
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsaddappstocollectionstate.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsaddappstocollectionstate.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -174,7 +174,7 @@ QState(parent), mCollectionName(), mCollectionId(0), mAppList(), mShowConfirmation(0), mInitialState(0), mSelectCollectionState(0), mNewCollectionState(0), mAppsCheckListState(0), mActionType( - NoActionType), mApplicationsSortAttribute(NoHsSortAttribute), + NoActionType), mApplicationsSortAttribute(Hs::NoHsSortAttribute), mAppsCheckList(0), mEditorDialog(0), mListDialog(0), mModel(0) { construct(); @@ -284,6 +284,7 @@ //Adds applications to colection. if ((mCollectionId > 0) && mAppList.count()) { HsMenuService::addApplicationsToCollection(mAppList, mCollectionId); + HsMenuService::touch(mAppList); if (mShowConfirmation) { showMessageAppsAdded(mCollectionId); } @@ -319,25 +320,25 @@ HsMenuEvent *menuEvent = static_cast<HsMenuEvent *>(event); QVariantMap data = menuEvent->data(); - mApplicationsSortAttribute = static_cast<HsSortAttribute>(data.value( - appSortOrderKey()).toInt()); + mApplicationsSortAttribute = static_cast<Hs::HsSortAttribute>(data.value( + Hs::appSortOrderKey).toInt()); - const int itemId = data.value(itemIdKey()).toInt(); - mCollectionId = data.value(collectionIdKey()).toInt(); + const int itemId = data.value(Hs::itemIdKey).toInt(); + mCollectionId = data.value(Hs::collectionIdKey).toInt(); if (itemId) { //add selected app item from allAppView or collectionView mAppList.append(itemId); mInitialState->addTransition(mSelectCollectionState); mShowConfirmation = true; - } else if (mApplicationsSortAttribute != NoHsSortAttribute) { + } else if (mApplicationsSortAttribute != Hs::NoHsSortAttribute) { //add apps from allAppView options menu mActionType = ViaAllViewOptionMenuType; mInitialState->addTransition(mAppsCheckListState); mShowConfirmation = true; } else if (mCollectionId) { //add apps from collectionView options menu - mApplicationsSortAttribute = AscendingNameHsSortAttribute; + mApplicationsSortAttribute = Hs::AscendingNameHsSortAttribute; mInitialState->addTransition(mAppsCheckListState); } HSMENUTEST_FUNC_EXIT("HsAddAppsToCollectionState::onEntry"); @@ -480,12 +481,13 @@ void HsAddAppsToCollectionState::collectionSelected( const QModelIndex &modelIndex) { - int selectedCollection = mModel->data( - modelIndex, CaItemModel::IdRole).toInt(); - mListDialog->close(); - - qDebug("emit collectionSelected(%d)", selectedCollection); - emit transitToSaveState(selectedCollection); + if (mListDialog) { + int selectedCollection = mModel->data( + modelIndex, CaItemModel::IdRole).toInt(); + mListDialog->close(); + qDebug("emit collectionSelected(%d)", selectedCollection); + emit transitToSaveState(selectedCollection); + } } /*!
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsaddtohomescreenstate.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsaddtohomescreenstate.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -57,7 +57,7 @@ HsAddToHomeScreenState::HsAddToHomeScreenState(QState *parent) : QState(parent), mCorruptedMessage(NULL), mConfirmAction(NULL), - mMenuMode(NormalHsMenuMode) + mMenuMode(Hs::NormalHsMenuMode) { setObjectName("/AddToHomeScreenState"); @@ -94,23 +94,22 @@ HsMenuEvent *menuEvent = static_cast<HsMenuEvent *>(event); QVariantMap data = menuEvent->data(); - mEntryId = data.value(itemIdKey()).toInt(); + mEntryId = data.value(Hs::itemIdKey).toInt(); QSharedPointer<CaEntry> entry = CaService::instance()->getEntry(mEntryId); const QString entryTypeName = entry->entryTypeName(); - mMenuMode = static_cast<HsMenuMode>(data.value(menuModeType()).toInt()); - mToken = data.value(HOMESCREENDATA); + mMenuMode = static_cast<Hs::HsMenuMode>(data.value(Hs::menuModeType).toInt()); + mToken = data.value(Hs::homescreenData); bool success = false; - if (entryTypeName == widgetTypeName()) { - const QString uri = entry->attribute(widgetUriAttributeName()); - success = addWidget(*HsContentService::instance(), uri); - HsMenuService::touch(mEntryId); + if (entryTypeName == Hs::widgetTypeName) { + const QString uri = entry->attribute(Hs::widgetUriAttributeName); + success = addWidget(*HsContentService::instance(), uri); } else { success = addApplication(*HsContentService::instance(), *entry); } - if (success && (mMenuMode == NormalHsMenuMode)) { + if (success && (mMenuMode == Hs::NormalHsMenuMode)) { HbNotificationDialog *notificationDialog = new HbNotificationDialog(); notificationDialog->setAttribute(Qt::WA_DeleteOnClose); notificationDialog->setSequentialShow(false); @@ -136,14 +135,14 @@ { HSMENUTEST_FUNC_ENTRY("HsAddToHomeScreenState::addWidget"); QVariantHash params; - params[URI] = uri; - params[HOMESCREENDATA] = mToken; + params[Hs::uri] = uri; + params[Hs::homescreenData] = mToken; bool success = contentService.createWidget(params); if (!success) { showMessageWidgetCorrupted(); } else { emit exit(); - if (mMenuMode == AddHsMenuMode) { + if (mMenuMode == Hs::AddHsMenuMode) { machine()->postEvent( HsMenuEventFactory::createOpenHomeScreenEvent()); } @@ -185,10 +184,10 @@ (HbAction* finishedAction) { if (static_cast<QAction*>(finishedAction) == mConfirmAction) { - HsMenuService::executeAction(mEntryId, removeActionIdentifier()); + HsMenuService::executeAction(mEntryId, Hs::removeActionIdentifier); } emit exit(); - if (mMenuMode == AddHsMenuMode) { + if (mMenuMode == Hs::AddHsMenuMode) { machine()->postEvent( HsMenuEventFactory::createOpenHomeScreenEvent()); } @@ -223,11 +222,11 @@ { HSMENUTEST_FUNC_ENTRY("HsAddToHomeScreenState::addShortcut"); QVariantHash params; - params[URI] = SHORTCUT_WIDGET_URI; + params[Hs::uri] = SHORTCUT_WIDGET_URI; QVariantHash preferences; preferences[SHORTCUT_ID] = QString::number(mEntryId); - params[PREFERENCES] = preferences; - params[HOMESCREENDATA] = mToken; + params[Hs::preferences] = preferences; + params[Hs::homescreenData] = mToken; const bool result = contentService.createWidget(params); logActionResult("Adding shortcut", mEntryId, result); HSMENUTEST_FUNC_EXIT("HsAddToHomeScreenState::addShortcut"); @@ -245,10 +244,10 @@ CaEntry& entry) { bool success = false; - if (entry.attributes().contains(widgetUriAttributeName())) { + if (entry.attributes().contains(Hs::widgetUriAttributeName)) { QVariantHash params; - const QString uri = entry.attribute(widgetUriAttributeName()); - params[URI] = uri; + const QString uri = entry.attribute(Hs::widgetUriAttributeName); + params[Hs::uri] = uri; QVariantHash preferences; QMap<QString, QString> attributes = entry.attributes(); @@ -257,12 +256,12 @@ i.next(); QString key(i.key()); QString value(i.value()); - if (key.contains(widgetParam())) { - preferences.insert(key.remove(widgetParam()),value); + if (key.contains(Hs::widgetParam)) { + preferences.insert(key.remove(Hs::widgetParam),value); } } - params[PREFERENCES] = preferences; - params[HOMESCREENDATA] = mToken; + params[Hs::preferences] = preferences; + params[Hs::homescreenData] = mToken; success = contentService.createWidget(params); if (!success) { @@ -272,7 +271,7 @@ success = addShortcut(contentService); } emit exit(); - if (mMenuMode == AddHsMenuMode) { + if (mMenuMode == Hs::AddHsMenuMode) { machine()->postEvent( HsMenuEventFactory::createOpenHomeScreenEvent()); }
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsappschecklist.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsappschecklist.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -82,7 +82,7 @@ */ HsAppsCheckList::HsAppsCheckList() : mAppsSelectDialog(0), mActionConfirm(0), mListView(0), mModel(0), - mSortAttribute(AscendingNameHsSortAttribute) + mSortAttribute(Hs::AscendingNameHsSortAttribute) { } @@ -105,14 +105,14 @@ mAppsSelectDialog->close(); } - mSortAttribute = AscendingNameHsSortAttribute; + mSortAttribute = Hs::AscendingNameHsSortAttribute; } /*! Sets sort order for applications. \param sortAttribute sort order. */ -void HsAppsCheckList::setSortOrder(HsSortAttribute sortOrder) +void HsAppsCheckList::setSortOrder(Hs::HsSortAttribute sortOrder) { mSortAttribute = sortOrder; } @@ -121,7 +121,7 @@ Shows check box list with all application. \param sortAttribute order to sort applications. */ -void HsAppsCheckList::showAppsCheckboxList(HsSortAttribute sortOrder) +void HsAppsCheckList::showAppsCheckboxList(Hs::HsSortAttribute sortOrder) { HSMENUTEST_FUNC_ENTRY("HsAppsCheckList::showAppsCheckboxList"); if (!mModel) { @@ -227,7 +227,7 @@ } QList<int> list = itemsMap.values(); - if (mSortAttribute == DescendingNameHsSortAttribute) { + if (mSortAttribute == Hs::DescendingNameHsSortAttribute) { QList<int> reversedList; int count = list.count(); for (int i = 0; i < count; i++) {
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsarrangestate.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsarrangestate.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -141,7 +141,7 @@ HsMenuEvent *menuEvent = static_cast<HsMenuEvent *>(event); QVariantMap data = menuEvent->data(); - mTopItemId = data.value(itemIdKey()).toInt(); + mTopItemId = data.value(Hs::itemIdKey).toInt(); HbDocumentLoader loader; bool loadStatusOk = false; @@ -160,10 +160,10 @@ if (mEntriesList && mDialog) { switch (menuEvent->operation()) { case HsMenuEvent::ArrangeCollection: - mCollectionId = data.value(collectionIdKey()).toInt(); + mCollectionId = data.value(Hs::collectionIdKey).toInt(); mItemModel = HsMenuService::getCollectionModel( mCollectionId, - NoHsSortAttribute); + Hs::NoHsSortAttribute); break; case HsMenuEvent::ArrangeAllCollections: mCollectionId = HsMenuService::allCollectionsId();
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionnamedialog.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionnamedialog.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -136,9 +136,8 @@ unsigned int numToAppend(1); while (mOtherCollectionsNames.contains(newName)) { - newName = - name - + QString("(%1)").arg(numToAppend, 2, 10, QLatin1Char('0')); + newName = hbTrId("txt_applib_dialog_entry_collectionl1").arg( + numToAppend); numToAppend++; }
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionnamestate.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionnamestate.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -97,7 +97,7 @@ HsMenuEvent *menuEvent = static_cast<HsMenuEvent *>(event); QVariantMap data = menuEvent->data(); - mItemId = data.value(itemIdKey()).toInt(); + mItemId = data.value(Hs::itemIdKey).toInt(); } mCollectionNameDialog = new HsCollectionNameDialog(mItemId); mCollectionNameDialog->open(this, SLOT(dialogFinished(HbAction*))); @@ -120,7 +120,8 @@ HsMenuService::createCollection(newName); } } - mCollectionNameDialog = NULL; //set to NULL since this will be deleted atfer close + //set to NULL since this will be deleted atfer close + mCollectionNameDialog = NULL; emit exit(); } @@ -130,7 +131,8 @@ void HsCollectionNameState::cleanUp() { if (mCollectionNameDialog) { - disconnect(mCollectionNameDialog, SIGNAL(finished(HbAction*)), this, SLOT(dialogFinished(HbAction*))); + disconnect(mCollectionNameDialog, SIGNAL(finished(HbAction*)), + this, SLOT(dialogFinished(HbAction*))); mCollectionNameDialog->close(); mCollectionNameDialog = NULL; }
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsdeletecollectionitemstate.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsdeletecollectionitemstate.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -78,8 +78,8 @@ HsMenuEvent *menuEvent = static_cast<HsMenuEvent *>(event); QVariantMap data = menuEvent->data(); - mItemId = data.value(itemIdKey()).toInt(); - mCollectionId = data.value(collectionIdKey()).toInt(); + mItemId = data.value(Hs::itemIdKey).toInt(); + mCollectionId = data.value(Hs::collectionIdKey).toInt(); QString message; message.append(
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsdeletecollectionstate.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsdeletecollectionstate.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -79,7 +79,7 @@ HsMenuEvent *menuEvent = static_cast<HsMenuEvent *>(event); QVariantMap data = menuEvent->data(); - mItemId = data.value(itemIdKey()).toInt(); + mItemId = data.value(Hs::itemIdKey).toInt(); QString message; if (HsShortcutService::instance()->isItemShortcutWidget(mItemId)) {
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hspreviewhswidgetstate.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hspreviewhswidgetstate.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -105,13 +105,13 @@ HsMenuEvent *menuEvent = static_cast<HsMenuEvent *>(event); QVariantMap data = menuEvent->data(); - mEntryId = data.value(itemIdKey()).toInt(); - mToken = data.value(HOMESCREENDATA); + mEntryId = data.value(Hs::itemIdKey).toInt(); + mToken = data.value(Hs::homescreenData); QSharedPointer<CaEntry> entry = CaService::instance()->getEntry(mEntryId); - mUri = entry->attribute(widgetUriAttributeName()); + mUri = entry->attribute(Hs::widgetUriAttributeName); mPreviewDialog = buildPreviewDialog(*entry); mAddToHomescreenAction = mPreviewDialog->actions().value(0); @@ -159,8 +159,8 @@ if (finishedAction == mAddToHomescreenAction) { QVariantHash widgetData; - widgetData[URI] = mUri; - widgetData[HOMESCREENDATA] = mToken; + widgetData[Hs::uri] = mUri; + widgetData[Hs::homescreenData] = mToken; bool success = HsContentService::instance()->createWidget(widgetData); @@ -207,7 +207,7 @@ mCorruptedMessage = NULL; if (static_cast<QAction*>(finishedAction) == mConfirmRemovalAction) { - HsMenuService::executeAction(mEntryId, removeActionIdentifier()); + HsMenuService::executeAction(mEntryId, Hs::removeActionIdentifier); } emit exit();
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsuninstallitemstate.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsuninstallitemstate.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -89,15 +89,15 @@ HsMenuEvent *menuEvent = static_cast<HsMenuEvent *>(event); QVariantMap data = menuEvent->data(); - mItemId = data.value(itemIdKey()).toInt(); + mItemId = data.value(Hs::itemIdKey).toInt(); QSharedPointer<CaEntry> entry = CaService::instance()->getEntry(mItemId); - QString appType = entry->attribute(swTypeKey()); - if (!appType.compare(javaSwType())) { + QString appType = entry->attribute(Hs::swTypeKey); + if (!appType.compare(Hs::javaSwType)) { // java createUninstallJavaMessage(); } else { // other - createUninstallMessage(); + createSimpleUninstallMessage(); } HSMENUTEST_FUNC_EXIT("HsUninstallItemState::onEntry"); @@ -111,7 +111,7 @@ void HsUninstallItemState::uninstallMessageFinished(HbAction* finishedAction) { if (static_cast<QAction*>(finishedAction) == mConfirmAction) { - HsMenuService::executeAction(mItemId, removeActionIdentifier()); + HsMenuService::executeAction(mItemId, Hs::removeActionIdentifier); } mConfirmAction = NULL; mUninstallMessage = NULL; @@ -138,7 +138,7 @@ QSharedPointer<CaService> service = CaService::instance(); QSharedPointer<CaEntry> entry = service->getEntry(mItemId); const int componentId = - entry->attribute(componentIdAttributeName()).toInt(); + entry->attribute(Hs::componentIdAttributeName).toInt(); QSharedPointer<CaSoftwareRegistry> softwareRegistry = CaSoftwareRegistry::create(); @@ -150,7 +150,7 @@ if (retval) { CaQuery query; foreach (QString uid, appUids) { - query.setAttribute(applicationUidEntryKey(), uid); + query.setAttribute(Hs::applicationUidEntryKey, uid); QList< QSharedPointer<CaEntry> > entries = service->getEntries(query); if (entries.length() > 0) { @@ -191,11 +191,11 @@ Method create uninstall confirmation message. \retval void */ -void HsUninstallItemState::createUninstallMessage() +void HsUninstallItemState::createSimpleUninstallMessage(bool isJava) { CaQuery parentsQuery; parentsQuery.setChildId(mItemId); - parentsQuery.setEntryTypeNames(QStringList(collectionTypeName())); + parentsQuery.setEntryTypeNames(QStringList(Hs::collectionTypeName)); QList<int> parentsIds = CaService::instance()->getEntryIds( parentsQuery); QString message; @@ -211,6 +211,11 @@ // create and show message box mUninstallMessage = HsMenuDialogFactory().create(message); + if( isJava ){ + QSharedPointer<CaEntry> entry = CaService::instance()->getEntry(mItemId); + HbIcon icon = entry->makeIcon(); + mUninstallMessage->setIcon(icon); + } mConfirmAction = mUninstallMessage->actions().value(0); QScopedPointer<HsMenuEntryRemovedHandler> entryObserver( @@ -221,34 +226,6 @@ } /*! - Method create uninstall confirmation message. - Used for java applications without deletion confirmation - and with midlet name equal to app name - \retval void - */ -void HsUninstallItemState::createSimpleUninstallJavaMessage() -{ - QString message; - message.append( - HbParameterLengthLimiter("txt_applib_dialog_1_will_be_removed_from_phone_c").arg( - HsMenuService::getName(mItemId))); - - // create and show message box - mUninstallMessage = HsMenuDialogFactory().create(message); - - QSharedPointer<CaEntry> entry = CaService::instance()->getEntry(mItemId); - HbIcon icon = entry->makeIcon(); - mUninstallMessage->setIcon(icon); - mConfirmAction = mUninstallMessage->actions().value(0); - - QScopedPointer<HsMenuEntryRemovedHandler> entryObserver( - new HsMenuEntryRemovedHandler(mItemId, this, SIGNAL(exit()))); - entryObserver.take()->setParent(mUninstallMessage); - - mUninstallMessage->open(this, SLOT(uninstallMessageFinished(HbAction*))); -} - -/*! Method create uninstall confirmation dialog for java. \retval void */ @@ -269,7 +246,7 @@ QString section; if (applicationsNames.isEmpty() && detailsMessage.isEmpty()) { - createSimpleUninstallJavaMessage(); + createSimpleUninstallMessage(true); } else { if ( (!applicationsNames.isEmpty()) && (!detailsMessage.isEmpty())) { @@ -307,10 +284,25 @@ HbIcon icon = entry2->makeIcon(); iconLabel->setIcon(icon); + CaQuery parentsQuery; + parentsQuery.setChildId(mItemId); + parentsQuery.setEntryTypeNames(QStringList(Hs::collectionTypeName)); + QList<int> parentsIds = CaService::instance()->getEntryIds( + parentsQuery); + HbLabel* textLabel = qobject_cast<HbLabel*>( loader.findWidget(HS_UNINSTALL_DIALOG_CONFIRMATION_DIALOG_LABEL)); - textLabel->setPlainText(textLabel->plainText().arg(componentName)); + if (HsShortcutService::instance()->isItemShortcutWidget(mItemId) || + (parentsIds.count() > 0)) { + textLabel->setPlainText(HbParameterLengthLimiter( + "txt_applib_info_delete_1_all_its_shortcuts_and").arg( + componentName)); + } else { + textLabel->setPlainText(HbParameterLengthLimiter( + "txt_applib_info_delete_1_and_associated_data").arg( + componentName)); + } HbLabel* detailsUninstalLabel; if ((mDialogType == UninstallDialogDefinition02) ||
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsviewappdetailsstate.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsviewappdetailsstate.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -78,16 +78,16 @@ HsMenuEvent *menuEvent = static_cast<HsMenuEvent *>(event); QVariantMap data = menuEvent->data(); - const int entryId = data.value(itemIdKey()).toInt(); + const int entryId = data.value(Hs::itemIdKey).toInt(); QSharedPointer<const CaEntry> entry = CaService::instance()->getEntry(entryId); const int componentId = entry->attribute( - componentIdAttributeName()).toInt(); + Hs::componentIdAttributeName).toInt(); QSharedPointer<CaSoftwareRegistry> scr = CaSoftwareRegistry::create(); CaSoftwareRegistry::DetailMap detailMap = scr->entryDetails(componentId); - QString appType = entry->attribute(swTypeKey()); + QString appType = entry->attribute(Hs::swTypeKey); //TODO: Should we display something In that case? @@ -102,7 +102,7 @@ Q_ASSERT_X(loadStatusOk, HS_DETAILS_DIALOG_LAYOUT, "Error while loading docml file."); - if (!appType.compare(javaSwType())) { + if (!appType.compare(Hs::javaSwType)) { QString section = QString(HS_VIEWAPPDETAILS_JAVA_DIALOG_SECTION_NAME); loader.load(HS_DETAILS_DIALOG_LAYOUT, section, &loadStatusOk); @@ -129,7 +129,7 @@ setFieldPresentation(CaSoftwareRegistry::componentTypeKey(), detailMap, loader); - if (!appType.compare(javaSwType())) { + if (!appType.compare(Hs::javaSwType)) { setFieldPresentation(CaSoftwareRegistry::componentDescriptionKey(), detailMap, loader); setFieldPresentation(CaSoftwareRegistry::componentProtectionDomainKey(),
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsviewappsettingsstate.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hsviewappsettingsstate.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -101,12 +101,12 @@ HsMenuEvent *menuEvent = static_cast<HsMenuEvent *>(event); QVariantMap data = menuEvent->data(); - const int entryId = data.value(itemIdKey()).toInt(); + const int entryId = data.value(Hs::itemIdKey).toInt(); QSharedPointer<const CaEntry> entry = CaService::instance()->getEntry(entryId); QString pluginPath; pluginPath = pluginPath.append("/resource/qt/plugins/appsettings/") - .append(entry->attribute(appSettingsPlugin())).append(".qtplugin"); + .append(entry->attribute(Hs::appSettingsPlugin)).append(".qtplugin"); QPluginLoader loader(pluginPath); mView = qobject_cast<HbView *>(loader.instance()); @@ -121,7 +121,7 @@ QObject::connect(this, SIGNAL(initialize(QString)), mView, SLOT(initialize(QString))); mView->setParent(this); - emit initialize(entry->attribute(applicationUidEntryKey())); + emit initialize(entry->attribute(Hs::applicationUidEntryKey)); // Add View to main window HbMainWindow *hbMainWindow = mainWindow(); // add confirm action
--- a/homescreenapp/widgetplugins/hsclockwidgetplugin/hsclockwidgetplugin_win.pri Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/widgetplugins/hsclockwidgetplugin/hsclockwidgetplugin_win.pri Wed Aug 18 10:33:57 2010 +0300 @@ -17,11 +17,11 @@ HEADERS += ./inc/hsanalogclockwidget.h \ ./inc/hsclockwidget.h \ ./inc/hsclockwidgetplugin.h \ - ./inc/hsdigitalclockwidget.h + ./inc/hsdigitalclockwidget.h \ + ./inc/hsclockwidgettimer.h SOURCES += ./src/hsanalogclockwidget.cpp \ ./src/hsclockwidget.cpp \ ./src/hsclockwidgetplugin.cpp \ - ./src/hsdigitalclockwidget.cpp - - + ./src/hsdigitalclockwidget.cpp \ + ./src/hsclockwidgettimer.cpp
--- a/homescreenapp/widgetplugins/hsclockwidgetplugin/inc/hsclockwidget.h Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/widgetplugins/hsclockwidgetplugin/inc/hsclockwidget.h Wed Aug 18 10:33:57 2010 +0300 @@ -55,8 +55,7 @@ private: HbWidget *mWidget; - QGraphicsLinearLayout *mLayout; - QTimer *mTimer; + QGraphicsLinearLayout *mLayout; QString mClockType; QString mTimeType; #ifdef Q_OS_SYMBIAN
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/widgetplugins/hsclockwidgetplugin/inc/hsclockwidgettimer.h Wed Aug 18 10:33:57 2010 +0300 @@ -0,0 +1,59 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#ifndef HSCLOCKWIDGETTIMER_H +#define HSCLOCKWIDGETTIMER_H + +#include <QObject> + +#include <hstest_global.h> + +HOMESCREEN_TEST_CLASS(TestClockWidget) + +class QTimer; + +class HsClockWidgetTimer : public QObject +{ + Q_OBJECT + +public: + ~HsClockWidgetTimer(); + + static HsClockWidgetTimer *instance(); + +signals: + void tick(); + +protected: + void connectNotify(const char *signal); + void disconnectNotify(const char *signal); + +private: + HsClockWidgetTimer(QObject *parent = 0); + Q_DISABLE_COPY(HsClockWidgetTimer) + +private slots: + void onTick(); + +private: + QTimer *mTimer; + static HsClockWidgetTimer *mInstance; + + HOMESCREEN_TEST_FRIEND_CLASS(TestClockWidget) +}; + +#endif // HSCLOCKWIDGETTIMER_H
--- a/homescreenapp/widgetplugins/hsclockwidgetplugin/resource/qtg_graf_hswidget_preview_clock.svg Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/widgetplugins/hsclockwidgetplugin/resource/qtg_graf_hswidget_preview_clock.svg Wed Aug 18 10:33:57 2010 +0300 @@ -1,161 +1,160 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd"> -<svg baseProfile="tiny" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="320px" height="210px" viewBox="-9 14 320 210"> -<path fill-opacity="0.4" stroke-opacity="0.4" d="M150.999,188.197c-38.155,0-69.195-31.039-69.195-69.195 c0-38.154,31.04-69.196,69.195-69.196c38.155,0,69.194,31.042,69.194,69.196C220.193,157.158,189.154,188.197,150.999,188.197 L150.999,188.197z"/> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="336.9785" y1="-63.1782" x2="336.9785" y2="-201.4114" gradientTransform="matrix(1 0 0 -1 -185.98 -13.5195)"> +<svg baseProfile="tiny" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="320px" height="210px" viewBox="0 0 320 210"> +<g> +<path fill-opacity="0.4" stroke-opacity="0.4" d="M160,187.164c-45.306,0-82.163-36.856-82.163-82.163S114.694,22.835,160,22.835 c45.307,0,82.162,36.86,82.162,82.166S205.307,187.164,160,187.164L160,187.164z"/> +<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="409.04" y1="1018.6201" x2="409.04" y2="1182.7592" gradientTransform="matrix(1 0 0 1 -249.04 -995.9609)"> <stop offset="0" style="stop-color:#DCDCDC"/> <stop offset="0.6" style="stop-color:#C0C0C0"/> <stop offset="1" style="stop-color:#A7A7A7"/> </linearGradient> -<circle fill="url(#SVGID_1_)" cx="150.999" cy="119.002" r="68.555"/> -<path fill-opacity="0.4" stroke-opacity="0.4" fill="#FFFFFF" d="M150.999,50.447c-37.862,0-68.556,30.691-68.556,68.555 c0,37.861,30.693,68.555,68.556,68.555c37.862,0,68.556-30.693,68.556-68.555C219.555,81.139,188.861,50.447,150.999,50.447z M150.999,186.916c-37.448,0-67.914-30.467-67.914-67.914c0-37.449,30.466-67.915,67.914-67.915 c37.446,0,67.914,30.466,67.914,67.915C218.913,156.449,188.445,186.916,150.999,186.916z"/> -<path fill="#E5E5E5" d="M150.999,181.791c-34.622,0-62.789-28.166-62.789-62.789s28.167-62.789,62.789-62.789 s62.788,28.166,62.788,62.789S185.621,181.791,150.999,181.791L150.999,181.791z"/> -<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="336.9795" y1="-194.0273" x2="336.9795" y2="-71.0137" gradientTransform="matrix(1 0 0 -1 -185.98 -13.5195)"> +<circle fill="url(#SVGID_1_)" cx="160" cy="105" r="81.404"/> +<path fill-opacity="0.4" stroke-opacity="0.4" fill="#FFFFFF" d="M160,23.596c-44.958,0-81.405,36.444-81.405,81.405 c0,44.956,36.446,81.402,81.405,81.402c44.958,0,81.404-36.446,81.404-81.402C241.404,60.042,204.958,23.596,160,23.596z M160,185.642c-44.467,0-80.643-36.176-80.643-80.644c0-44.467,36.176-80.644,80.643-80.644c44.465,0,80.643,36.176,80.643,80.644 S204.465,185.642,160,185.642z"/> +<path fill="#E5E5E5" d="M160,179.556c-41.111,0-74.557-33.443-74.557-74.558c0-41.112,33.445-74.557,74.557-74.557 s74.556,33.445,74.556,74.557C234.556,146.112,201.111,179.556,160,179.556L160,179.556z"/> +<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="409.0391" y1="1173.9941" x2="409.0391" y2="1027.9258" gradientTransform="matrix(1 0 0 1 -249.04 -995.9609)"> <stop offset="0" style="stop-color:#FFFFFF"/> <stop offset="0.4121" style="stop-color:#DCDCDC"/> <stop offset="0.9455" style="stop-color:#CBCBCB"/> <stop offset="1" style="stop-color:#CBCBCB"/> </linearGradient> -<circle fill="url(#SVGID_2_)" cx="150.999" cy="119.001" r="61.507"/> -<path fill-opacity="0.5" stroke-opacity="0.5" d="M150.999,57.494c-33.971,0-61.508,27.538-61.508,61.508 c0,33.969,27.537,61.506,61.508,61.506c33.97,0,61.508-27.537,61.508-61.506C212.507,85.032,184.969,57.494,150.999,57.494z M150.999,179.875c-33.565,0-60.874-27.307-60.874-60.873c0-33.565,27.309-60.873,60.874-60.873 c33.565,0,60.876,27.308,60.876,60.873C211.875,152.568,184.564,179.875,150.999,179.875z"/> -<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="336.9795" y1="-186.9824" x2="336.9795" y2="-78.0605" gradientTransform="matrix(1 0 0 -1 -185.98 -13.5195)"> +<circle fill="url(#SVGID_2_)" cx="160" cy="104.999" r="73.034"/> +<path fill-opacity="0.5" stroke-opacity="0.5" d="M160,31.964c-40.338,0-73.036,32.699-73.036,73.037 c0,40.333,32.698,73.032,73.036,73.032c40.336,0,73.035-32.698,73.035-73.032C233.035,64.663,200.336,31.964,160,31.964z M160,177.282c-39.854,0-72.283-32.425-72.283-72.281c0-39.856,32.427-72.283,72.283-72.283c39.855,0,72.285,32.426,72.285,72.283 C232.285,144.857,199.857,177.282,160,177.282z"/> +<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="409.04" y1="1165.6299" x2="409.04" y2="1036.293" gradientTransform="matrix(1 0 0 1 -249.04 -995.9609)"> <stop offset="0" style="stop-color:#B4B4B4"/> <stop offset="1" style="stop-color:#A0A0A0"/> </linearGradient> -<circle fill="url(#SVGID_3_)" cx="150.999" cy="119.002" r="54.461"/> -<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="336.9785" y1="-79.3413" x2="336.9785" y2="-185.6992" gradientTransform="matrix(1 0 0 -1 -185.98 -13.5195)"> +<circle fill="url(#SVGID_3_)" cx="160" cy="105.001" r="64.668"/> +<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="409.041" y1="1037.8115" x2="409.041" y2="1164.1035" gradientTransform="matrix(1 0 0 1 -249.04 -995.9609)"> <stop offset="0" style="stop-color:#FFFFFF"/> <stop offset="0.9455" style="stop-color:#CBCBCB"/> <stop offset="1" style="stop-color:#CBCBCB"/> </linearGradient> -<path fill="url(#SVGID_4_)" d="M150.999,172.18c-29.323,0-53.179-23.854-53.179-53.178c0-29.323,23.855-53.18,53.179-53.18 c29.323,0,53.179,23.857,53.179,53.18C204.178,148.325,180.322,172.18,150.999,172.18L150.999,172.18z"/> -<circle fill="#C8C8C8" cx="150.999" cy="119.002" r="1.922"/> -<path fill="none" d="M150.999,172.18c-29.323,0-53.179-23.854-53.179-53.178c0-29.323,23.855-53.18,53.179-53.18 c29.323,0,53.179,23.857,53.179,53.18C204.178,148.325,180.322,172.18,150.999,172.18L150.999,172.18z"/> -<circle fill="#646464" cx="150.999" cy="69.026" r="1.923"/> -<path fill="#646464" d="M147.145,73.971h-0.028l-1.643,0.887l-0.248-0.975l2.065-1.104h1.09v9.45h-1.236V73.971z"/> -<path fill="#646464" d="M150.738,82.229v-0.786l1.002-0.975c2.412-2.295,3.52-3.517,3.52-4.942c0-0.96-0.451-1.847-1.861-1.847 c-0.856,0-1.57,0.438-2.005,0.801l-0.41-0.9c0.642-0.539,1.587-0.96,2.662-0.96c2.035,0,2.894,1.395,2.894,2.747 c0,1.744-1.265,3.155-3.256,5.074l-0.741,0.697v0.03h4.23v1.061H150.738z"/> -<circle fill="#646464" cx="175.986" cy="75.723" r="1.922"/> -<circle fill="#646464" cx="194.277" cy="94.014" r="1.921"/> -<circle fill="#646464" cx="200.975" cy="119.002" r="1.922"/> -<path fill="#646464" d="M191.912,122.219c0.357,0.215,1.171,0.572,2.061,0.572c1.6,0,2.113-1.016,2.102-1.803 c-0.014-1.301-1.188-1.859-2.402-1.859h-0.699v-0.943h0.699c0.915,0,2.074-0.473,2.074-1.573c0-0.743-0.473-1.401-1.633-1.401 c-0.743,0-1.459,0.329-1.858,0.613l-0.344-0.914c0.5-0.357,1.444-0.715,2.446-0.715c1.83,0,2.66,1.087,2.66,2.217 c0,0.971-0.588,1.788-1.717,2.202v0.028c1.145,0.215,2.061,1.072,2.072,2.375c0,1.486-1.172,2.789-3.391,2.789 c-1.043,0-1.957-0.33-2.416-0.629L191.912,122.219z"/> -<path fill="#646464" d="M194.277,142.066c1.063,0,1.924,0.861,1.924,1.924c0,1.059-0.861,1.922-1.924,1.922 c-1.062,0-1.922-0.863-1.922-1.922C192.355,142.928,193.217,142.066,194.277,142.066z"/> -<rect x="183.879" y="133.423" transform="matrix(0.5006 -0.8657 0.8657 0.5006 -27.6308 229.1995)" fill="#646464" width="1.923" height="10.251"/> -<path fill="#646464" d="M175.986,160.359c1.063,0,1.922,0.863,1.922,1.922c0,1.063-0.859,1.924-1.922,1.924 s-1.924-0.861-1.924-1.924C174.063,161.223,174.924,160.359,175.986,160.359z"/> -<rect x="169.591" y="147.724" transform="matrix(0.8657 -0.5006 0.5006 0.8657 -53.609 105.9139)" fill="#646464" width="1.923" height="10.254"/> -<circle fill="#646464" cx="150.998" cy="168.978" r="1.923"/> -<path fill="#646464" d="M153.275,156.805c-0.258-0.016-0.588,0.014-0.944,0.068c-1.992,0.316-3.023,1.75-3.237,3.295h0.027 c0.445-0.602,1.233-1.088,2.264-1.088c1.648,0,2.809,1.203,2.809,3.008c0,1.719-1.159,3.293-3.107,3.293 c-1.977,0-3.28-1.545-3.28-3.967c0-1.834,0.645-3.279,1.574-4.197c0.775-0.758,1.807-1.23,2.979-1.373 c0.373-0.061,0.688-0.07,0.918-0.07v1.031H153.275z M152.917,162.174c0-1.332-0.758-2.131-1.919-2.131 c-0.758,0-1.474,0.457-1.819,1.145c-0.07,0.144-0.128,0.314-0.128,0.543c0.014,1.533,0.73,2.679,2.063,2.679 C152.188,164.408,152.917,163.508,152.917,162.174z"/> -<circle fill="#646464" cx="126.012" cy="162.281" r="1.922"/> -<rect x="130.504" y="147.719" transform="matrix(0.8652 0.5015 -0.5015 0.8652 94.3752 -45.32)" fill="#646464" width="1.924" height="10.25"/> -<rect x="169.748" y="79.205" transform="matrix(0.8657 0.5006 -0.5006 0.8657 65.1487 -74.1317)" fill="#646464" width="1.923" height="10.25"/> -<path fill="#646464" d="M107.72,142.066c1.061,0,1.921,0.861,1.921,1.924c0,1.059-0.86,1.922-1.921,1.922 c-1.062,0-1.923-0.863-1.923-1.922C105.797,142.928,106.658,142.066,107.72,142.066z"/> -<rect x="116.19" y="133.411" transform="matrix(0.5003 0.8659 -0.8659 0.5003 178.5003 -32.2056)" fill="#646464" width="1.922" height="10.254"/> -<rect x="184.436" y="93.813" transform="matrix(0.5003 0.8658 -0.8658 0.5003 178.2984 -111.0867)" fill="#646464" width="1.923" height="10.252"/> -<circle fill="#646464" cx="101.023" cy="119.002" r="1.922"/> -<path fill="#646464" d="M106.139,122.797c0.273,0.027,0.591,0,1.023-0.044c0.735-0.101,1.428-0.39,1.96-0.907 c0.621-0.563,1.067-1.385,1.241-2.479h-0.044c-0.519,0.635-1.269,0.993-2.22,0.993c-1.673,0-2.754-1.268-2.754-2.868 c0-1.773,1.283-3.33,3.2-3.33s3.099,1.544,3.099,3.965c0,2.047-0.69,3.487-1.613,4.381c-0.721,0.709-1.715,1.142-2.725,1.255 c-0.462,0.072-0.866,0.088-1.168,0.072L106.139,122.797L106.139,122.797z M106.6,117.42c0,1.168,0.707,1.99,1.803,1.99 c0.85,0,1.514-0.42,1.846-0.98c0.071-0.131,0.115-0.261,0.115-0.477c0-1.6-0.592-2.825-1.933-2.825 C107.363,115.128,106.6,116.079,106.6,117.42z"/> -<circle fill="#646464" cx="107.72" cy="94.014" r="1.921"/> -<rect x="116.202" y="94.334" transform="matrix(-0.5006 0.8657 -0.8657 -0.5006 261.918 47.8307)" fill="#646464" width="1.922" height="10.251"/> -<circle fill="#646464" cx="126.012" cy="75.722" r="1.923"/> -<rect x="130.503" y="80.027" transform="matrix(-0.8659 0.5002 -0.5002 -0.8659 287.8932 93.1373)" fill="#646464" width="1.922" height="10.252"/> -<rect x="144.655" y="59.73" transform="matrix(-0.9946 0.1039 -0.1039 -0.9946 295.5698 107.9097)" fill="#646464" width="0.639" height="3.844"/> -<rect x="156.703" y="174.428" transform="matrix(-0.9943 0.1067 -0.1067 -0.9943 331.9748 334.9315)" fill="#646464" width="0.64" height="3.846"/> -<rect x="138.682" y="60.684" transform="matrix(-0.9782 0.2075 -0.2075 -0.9782 287.9719 94.9994)" fill="#646464" width="0.64" height="3.844"/> -<rect x="162.672" y="173.466" transform="matrix(-0.977 0.2131 -0.2131 -0.977 359.6113 312.0218)" fill="#646464" width="0.642" height="3.845"/> -<rect x="132.859" y="62.234" transform="matrix(-0.9512 0.3085 -0.3085 -0.9512 279.6555 84.1022)" fill="#646464" width="0.643" height="3.844"/> -<rect x="168.492" y="171.929" transform="matrix(-0.9505 0.3107 -0.3107 -0.9505 383.2836 286.6476)" fill="#646464" width="0.638" height="3.846"/> -<rect x="127.219" y="64.404" transform="matrix(-0.9141 0.4054 -0.4054 -0.9141 271.0186 75.246)" fill="#646464" width="0.643" height="3.843"/> -<rect x="174.138" y="169.753" transform="matrix(-0.9139 0.4059 -0.4059 -0.9139 403.5764 257.7682)" fill="#646464" width="0.64" height="3.841"/> -<rect x="116.787" y="70.428" transform="matrix(-0.8096 0.587 -0.587 -0.8096 254.3857 62.1845)" fill="#646464" width="0.641" height="3.845"/> -<rect x="184.572" y="163.727" transform="matrix(-0.8098 0.5867 -0.5867 -0.8098 431.8035 191.3113)" fill="#646464" width="0.639" height="3.844"/> -<rect x="112.089" y="74.227" transform="matrix(-0.7441 0.6681 -0.6681 -0.7441 246.9279 57.7112)" fill="#646464" width="0.642" height="3.844"/> -<rect x="189.259" y="159.939" transform="matrix(-0.7427 0.6696 -0.6696 -0.7427 438.7674 155.124)" fill="#646464" width="0.642" height="3.845"/> -<rect x="107.82" y="78.497" transform="matrix(-0.6691 0.7431 -0.7431 -0.6691 240.262 53.8664)" fill="#646464" width="0.64" height="3.843"/> -<rect x="193.507" y="155.676" transform="matrix(-0.6696 0.7427 -0.7427 -0.6696 440.6693 119.1786)" fill="#646464" width="0.642" height="3.846"/> -<rect x="104.032" y="83.187" transform="matrix(-0.5869 0.8097 -0.8097 -0.5869 234.5073 50.5697)" fill="#646464" width="0.642" height="3.843"/> -<rect x="197.331" y="150.964" transform="matrix(-0.587 0.8096 -0.8096 -0.587 437.4468 82.6123)" fill="#646464" width="0.641" height="3.845"/> -<rect x="98" y="93.625" transform="matrix(-0.4074 0.9132 -0.9132 -0.4074 225.6352 44.6846)" fill="#646464" width="0.64" height="3.844"/> -<rect x="203.359" y="140.543" transform="matrix(-0.4078 0.9131 -0.9131 -0.4078 416.8253 14.5954)" fill="#646464" width="0.642" height="3.844"/> -<rect x="95.833" y="99.264" transform="matrix(-0.3066 0.9518 -0.9518 -0.3066 221.9467 40.688)" fill="#646464" width="0.64" height="3.845"/> -<rect x="205.522" y="134.9" transform="matrix(-0.3116 0.9502 -0.9502 -0.3116 399.9991 -16.1291)" fill="#646464" width="0.639" height="3.844"/> -<rect x="94.271" y="105.085" transform="matrix(-0.2072 0.9783 -0.9783 -0.2072 218.8786 36.6457)" fill="#646464" width="0.641" height="3.845"/> -<rect x="207.09" y="129.056" transform="matrix(-0.2087 0.978 -0.978 -0.2087 378.7904 -44.5298)" fill="#646464" width="0.641" height="3.845"/> -<rect x="93.335" y="111.049" transform="matrix(-0.1022 0.9948 -0.9948 -0.1022 215.6073 31.3552)" fill="#646464" width="0.64" height="3.845"/> -<rect x="208.031" y="123.119" transform="matrix(-0.1098 0.994 -0.994 -0.1098 355.5052 -68.328)" fill="#646464" width="0.641" height="3.843"/> -<rect x="93.33" y="123.116" transform="matrix(0.1052 0.9944 -0.9944 0.1052 208.1383 18.7487)" fill="#646464" width="0.64" height="3.844"/> -<rect x="208.037" y="111.046" transform="matrix(0.1008 0.9949 -0.9949 0.1008 299.7495 -105.7131)" fill="#646464" width="0.639" height="3.844"/> -<rect x="94.28" y="129.078" transform="matrix(0.2049 0.9788 -0.9788 0.2049 203.4314 11.5621)" fill="#646464" width="0.639" height="3.842"/> -<rect x="207.083" y="105.067" transform="matrix(0.2079 0.9782 -0.9782 0.2079 268.9449 -118.1214)" fill="#646464" width="0.639" height="3.846"/> -<rect x="95.837" y="134.894" transform="matrix(0.3087 0.9512 -0.9512 0.3087 196.6118 3.123)" fill="#646464" width="0.641" height="3.845"/> -<rect x="205.527" y="99.265" transform="matrix(0.3066 0.9518 -0.9518 0.3066 239.0479 -125.7694)" fill="#646464" width="0.64" height="3.844"/> -<rect x="98.001" y="140.536" transform="matrix(0.4078 0.9131 -0.9131 0.4078 188.2951 -5.4151)" fill="#646464" width="0.642" height="3.844"/> -<rect x="203.38" y="93.62" transform="matrix(0.4061 0.9138 -0.9138 0.4061 208.2778 -129.4044)" fill="#646464" width="0.64" height="3.845"/> -<rect x="104.025" y="150.966" transform="matrix(0.5873 0.8094 -0.8094 0.5873 166.8141 -21.3547)" fill="#646464" width="0.642" height="3.845"/> -<rect x="197.325" y="83.182" transform="matrix(0.586 0.8103 -0.8103 0.586 150.7878 -124.9214)" fill="#646464" width="0.64" height="3.843"/> -<rect x="107.839" y="155.664" transform="matrix(0.6707 0.7417 -0.7417 0.6707 152.4944 -28.3337)" fill="#646464" width="0.64" height="3.843"/> -<rect x="193.534" y="78.483" transform="matrix(0.6704 0.742 -0.742 0.6704 123.557 -117.3383)" fill="#646464" width="0.641" height="3.846"/> -<rect x="112.101" y="159.932" transform="matrix(0.7439 0.6683 -0.6683 0.7439 136.9672 -33.6781)" fill="#646464" width="0.64" height="3.843"/> -<rect x="189.271" y="74.219" transform="matrix(0.7413 0.6712 -0.6712 0.7413 100.1464 -107.548)" fill="#646464" width="0.64" height="3.846"/> -<rect x="116.771" y="163.73" transform="matrix(0.8102 0.5862 -0.5862 0.8102 119.3294 -37.1933)" fill="#646464" width="0.643" height="3.846"/> -<rect x="184.58" y="70.434" transform="matrix(0.8087 0.5882 -0.5882 0.8087 77.9324 -94.9199)" fill="#646464" width="0.64" height="3.845"/> -<rect x="127.237" y="169.758" transform="matrix(0.9128 0.4084 -0.4084 0.9128 81.2365 -37.1244)" fill="#646464" width="0.641" height="3.843"/> -<rect x="174.128" y="64.385" transform="matrix(0.9128 0.4083 -0.4083 0.9128 42.2816 -65.4531)" fill="#646464" width="0.64" height="3.844"/> -<rect x="132.858" y="171.933" transform="matrix(0.9515 0.3078 -0.3078 0.9515 59.9693 -32.5487)" fill="#646464" width="0.641" height="3.843"/> -<rect x="168.491" y="62.239" transform="matrix(0.9508 0.3098 -0.3098 0.9508 28.1799 -49.1374)" fill="#646464" width="0.637" height="3.845"/> -<rect x="138.683" y="173.483" transform="matrix(0.979 0.204 -0.204 0.979 38.7088 -24.6697)" fill="#646464" width="0.641" height="3.844"/> -<rect x="162.676" y="60.67" transform="matrix(0.9778 0.2097 -0.2097 0.9778 16.7533 -32.7942)" fill="#646464" width="0.64" height="3.845"/> -<rect x="144.665" y="174.417" transform="matrix(0.9949 0.1009 -0.1009 0.9949 18.5261 -13.7246)" fill="#646464" width="0.639" height="3.848"/> -<rect x="156.703" y="59.731" transform="matrix(0.9943 0.1071 -0.1071 0.9943 7.504 -16.4585)" fill="#646464" width="0.638" height="3.844"/> -<path fill="#646464" d="M149.543,58.717c0.483,0,0.847,0.17,1.094,0.514c0.247,0.342,0.368,0.945,0.368,1.812 c0,0.948-0.124,1.593-0.374,1.931c-0.249,0.34-0.617,0.508-1.103,0.508c-0.426,0-0.747-0.111-0.964-0.338 c-0.217-0.223-0.357-0.508-0.424-0.852c-0.065-0.344-0.098-0.762-0.098-1.249c0-0.849,0.125-1.448,0.379-1.799 C148.674,58.893,149.048,58.717,149.543,58.717z M149.522,62.963c0.213,0,0.368-0.119,0.468-0.359 c0.099-0.238,0.148-0.76,0.148-1.562c0-0.772-0.051-1.267-0.152-1.482c-0.104-0.214-0.257-0.323-0.464-0.323 c-0.188,0-0.326,0.075-0.414,0.225c-0.089,0.15-0.146,0.348-0.167,0.588c-0.021,0.243-0.033,0.572-0.033,0.993 c0,0.825,0.049,1.353,0.147,1.581C149.153,62.848,149.31,62.963,149.522,62.963z"/> -<path fill="#646464" d="M152.801,58.717c0.48,0,0.846,0.17,1.092,0.514c0.246,0.342,0.369,0.945,0.369,1.812 c0,0.948-0.125,1.593-0.373,1.931c-0.25,0.34-0.617,0.508-1.104,0.508c-0.428,0-0.747-0.111-0.965-0.338 c-0.217-0.223-0.357-0.508-0.424-0.852c-0.065-0.344-0.098-0.762-0.098-1.249c0-0.849,0.126-1.448,0.379-1.799 S152.303,58.717,152.801,58.717z M152.777,62.963c0.213,0,0.369-0.119,0.468-0.359c0.099-0.238,0.146-0.76,0.146-1.562 c0-0.772-0.05-1.267-0.15-1.482c-0.102-0.214-0.258-0.323-0.465-0.323c-0.188,0-0.326,0.075-0.414,0.225s-0.145,0.348-0.164,0.588 c-0.022,0.243-0.034,0.572-0.034,0.993c0,0.825,0.05,1.353,0.147,1.581C152.409,62.848,152.564,62.963,152.777,62.963z"/> -<path fill="#646464" d="M98.354,90.792l1.006,0.579c0.024-0.05,0.072-0.139,0.147-0.266c0.23-0.402,0.517-0.65,0.854-0.742 c0.338-0.093,0.71-0.023,1.116,0.213c0.463,0.266,0.737,0.582,0.826,0.947c0.09,0.366-0.008,0.791-0.288,1.278 c-0.159,0.274-0.371,0.548-0.634,0.817l-0.478-0.276l0.004-0.005c0.281-0.283,0.474-0.515,0.578-0.695 c0.156-0.272,0.202-0.513,0.137-0.723c-0.065-0.209-0.25-0.4-0.554-0.576c-0.267-0.154-0.51-0.199-0.726-0.135 c-0.218,0.064-0.409,0.24-0.574,0.526c-0.113,0.196-0.219,0.399-0.314,0.607l-1.965-1.134l1.205-2.086l0.467,0.27L98.354,90.792z"/> -<path fill="#646464" d="M99.691,87.299c0.24-0.417,0.57-0.646,0.99-0.689c0.419-0.041,1.004,0.154,1.753,0.588 c0.823,0.474,1.317,0.902,1.487,1.289c0.168,0.387,0.132,0.787-0.111,1.209c-0.213,0.369-0.472,0.592-0.775,0.665 c-0.304,0.076-0.622,0.057-0.951-0.06c-0.332-0.115-0.707-0.295-1.131-0.539c-0.734-0.424-1.191-0.834-1.368-1.227 C99.408,88.141,99.443,87.729,99.691,87.299z M103.357,89.441c0.106-0.186,0.08-0.381-0.076-0.586 c-0.157-0.203-0.584-0.508-1.279-0.91c-0.668-0.385-1.121-0.588-1.359-0.607c-0.238-0.019-0.409,0.061-0.512,0.238 c-0.094,0.164-0.098,0.32-0.013,0.473c0.087,0.151,0.228,0.298,0.427,0.438c0.198,0.141,0.479,0.314,0.841,0.524 c0.716,0.414,1.196,0.633,1.443,0.663C103.074,89.702,103.25,89.625,103.357,89.441z"/> -<path fill="#646464" d="M93.864,118.926h0.538v0.48h1.027v0.844h-1.027v1.879h-0.514l-2.398-1.469l-0.751-0.458v-0.796h3.125 V118.926z M93.864,121.475v-1.225H91.81L93.864,121.475z"/> -<path fill="#646464" d="M91.303,117.632h1.161c-0.005-0.057-0.008-0.157-0.008-0.306c0-0.465,0.124-0.821,0.37-1.071 c0.245-0.249,0.604-0.374,1.072-0.374c0.535,0,0.932,0.137,1.191,0.41c0.259,0.272,0.389,0.688,0.389,1.248 c0,0.32-0.047,0.661-0.141,1.026h-0.55v-0.005c0.102-0.387,0.152-0.684,0.152-0.893c0-0.313-0.081-0.545-0.242-0.693 c-0.162-0.148-0.418-0.225-0.769-0.225c-0.308,0-0.54,0.083-0.695,0.248c-0.156,0.164-0.234,0.413-0.234,0.74 c0,0.229,0.012,0.457,0.032,0.686h-2.269v-2.408h0.539v1.617H91.303z"/> -<path fill="#646464" d="M101.485,147.51l0.466-0.27l0.241,0.418l0.889-0.516l0.422,0.731l-0.89,0.515l0.938,1.625l-0.442,0.256 l-2.813-0.068l-0.88-0.023l-0.397-0.688l2.707-1.566L101.485,147.51z M102.76,149.717l-0.611-1.059l-1.781,1.027L102.76,149.717z"/> -<path fill="#646464" d="M97.89,147.586c-0.241-0.418-0.274-0.82-0.102-1.205c0.174-0.385,0.635-0.791,1.385-1.225 c0.821-0.473,1.44-0.688,1.859-0.643c0.419,0.047,0.749,0.28,0.992,0.7c0.213,0.369,0.275,0.705,0.188,1.004 c-0.086,0.3-0.262,0.563-0.526,0.791c-0.267,0.229-0.609,0.47-1.032,0.712c-0.734,0.424-1.317,0.614-1.747,0.571 C98.477,148.25,98.139,148.012,97.89,147.586z M101.576,145.48c-0.105-0.185-0.287-0.26-0.543-0.226 c-0.256,0.031-0.732,0.25-1.428,0.651c-0.668,0.386-1.071,0.679-1.207,0.871c-0.136,0.197-0.151,0.388-0.048,0.563 c0.093,0.164,0.228,0.246,0.402,0.246c0.175,0.002,0.372-0.047,0.591-0.149c0.222-0.101,0.514-0.256,0.877-0.465 c0.715-0.412,1.146-0.72,1.294-0.918C101.664,145.855,101.684,145.666,101.576,145.48z"/> -<path fill="#646464" d="M124.009,170.736c-0.531-0.309-0.894-0.443-1.089-0.41c-0.194,0.029-0.356,0.16-0.485,0.383 c-0.113,0.195-0.147,0.373-0.099,0.533s0.178,0.303,0.388,0.422c0.185,0.109,0.47,0.213,0.857,0.313l0.005,0.004l-0.274,0.478 c-0.388-0.112-0.721-0.246-0.995-0.403c-0.414-0.238-0.677-0.502-0.787-0.789c-0.112-0.285-0.072-0.595,0.12-0.929 c0.132-0.229,0.308-0.392,0.528-0.481c0.22-0.097,0.467-0.105,0.738-0.041c-0.227-0.191-0.359-0.408-0.397-0.654 c-0.038-0.244,0.016-0.492,0.16-0.742c0.239-0.412,0.54-0.652,0.899-0.723c0.361-0.066,0.781,0.037,1.265,0.318 c0.289,0.163,0.561,0.379,0.813,0.637l-0.271,0.473l-0.005-0.004c-0.304-0.293-0.558-0.498-0.761-0.615 c-0.247-0.143-0.467-0.188-0.662-0.137c-0.195,0.055-0.362,0.205-0.508,0.451c-0.152,0.266-0.188,0.498-0.106,0.699 c0.082,0.2,0.391,0.457,0.926,0.766L124.009,170.736z"/> -<path fill="#646464" d="M119.964,170.016l0.581-1.006c-0.052-0.025-0.14-0.074-0.268-0.146c-0.402-0.231-0.649-0.518-0.742-0.854 c-0.094-0.338-0.021-0.711,0.212-1.119c0.269-0.459,0.584-0.736,0.95-0.826c0.364-0.09,0.791,0.011,1.276,0.289 c0.276,0.16,0.55,0.371,0.819,0.638l-0.277,0.475l-0.005-0.004c-0.283-0.28-0.516-0.474-0.695-0.578 c-0.271-0.155-0.513-0.198-0.722-0.135c-0.211,0.063-0.402,0.25-0.578,0.551c-0.154,0.269-0.199,0.511-0.134,0.726 c0.064,0.221,0.24,0.41,0.525,0.574c0.197,0.112,0.4,0.221,0.608,0.317l-1.134,1.963l-2.086-1.207l0.27-0.467L119.964,170.016z"/> -<path fill="#646464" d="M153.499,177.301c-0.614,0-0.996,0.061-1.149,0.186c-0.152,0.125-0.229,0.316-0.229,0.578 c0,0.226,0.063,0.396,0.184,0.513s0.305,0.174,0.547,0.174c0.213,0,0.512-0.056,0.896-0.162h0.008v0.552 c-0.393,0.1-0.748,0.146-1.064,0.146c-0.478,0-0.838-0.097-1.075-0.285c-0.24-0.194-0.36-0.481-0.36-0.864 c0-0.269,0.072-0.496,0.217-0.685c0.144-0.188,0.349-0.326,0.619-0.404c-0.292-0.051-0.516-0.176-0.672-0.366 c-0.155-0.193-0.233-0.437-0.233-0.728c0-0.478,0.14-0.834,0.418-1.074c0.276-0.237,0.695-0.358,1.252-0.358 c0.334,0,0.678,0.049,1.026,0.146v0.543h-0.006c-0.41-0.101-0.731-0.151-0.966-0.151c-0.284,0-0.497,0.071-0.643,0.217 c-0.144,0.145-0.213,0.356-0.213,0.643c0,0.305,0.084,0.525,0.254,0.658c0.174,0.135,0.568,0.201,1.188,0.201V177.301 L153.499,177.301z"/> -<path fill="#646464" d="M149.197,179.285c-0.482,0-0.845-0.17-1.092-0.514c-0.245-0.34-0.367-0.943-0.367-1.81 c0-0.948,0.122-1.594,0.373-1.933c0.249-0.34,0.616-0.51,1.103-0.51c0.426,0,0.747,0.111,0.964,0.338 c0.218,0.228,0.358,0.511,0.424,0.854c0.065,0.347,0.098,0.761,0.098,1.248c0,0.851-0.125,1.451-0.377,1.799 C150.068,179.111,149.694,179.285,149.197,179.285z M149.22,175.041c-0.213,0-0.369,0.121-0.468,0.359 c-0.098,0.236-0.147,0.76-0.147,1.563c0,0.771,0.05,1.266,0.153,1.482c0.102,0.217,0.256,0.322,0.463,0.322 c0.188,0,0.325-0.072,0.414-0.226c0.088-0.149,0.145-0.349,0.166-0.588c0.021-0.242,0.033-0.574,0.033-0.992 c0-0.828-0.051-1.353-0.147-1.582C149.587,175.154,149.433,175.041,149.22,175.041z"/> -<path fill="#646464" d="M179.164,167.535l-0.273-0.469l2.418-1.396l0.17,0.295c0.164,0.283,0.258,0.559,0.287,0.836 c0.027,0.275,0.014,0.531-0.039,0.766c-0.054,0.238-0.136,0.515-0.248,0.822c-0.135,0.369-0.201,0.639-0.199,0.799 c0.002,0.158,0.037,0.299,0.104,0.418c0.12,0.209,0.268,0.334,0.441,0.379c0.171,0.039,0.369-0.002,0.59-0.131 c0.234-0.137,0.484-0.358,0.75-0.676l0.005-0.002l0.278,0.482c-0.285,0.313-0.598,0.564-0.928,0.756 c-0.412,0.238-0.773,0.326-1.09,0.27c-0.316-0.055-0.576-0.26-0.781-0.608c-0.112-0.197-0.176-0.416-0.189-0.664 c-0.016-0.246,0.068-0.623,0.252-1.125c0.104-0.281,0.176-0.513,0.227-0.688c0.047-0.178,0.069-0.354,0.068-0.533 c-0.002-0.18-0.043-0.352-0.131-0.518L179.164,167.535z"/> -<path fill="#646464" d="M179.66,171.387l-0.58-1.006c-0.046,0.029-0.135,0.084-0.26,0.156c-0.402,0.232-0.773,0.307-1.112,0.215 c-0.338-0.088-0.626-0.334-0.86-0.74c-0.266-0.463-0.348-0.873-0.24-1.236c0.104-0.356,0.399-0.68,0.887-0.961 c0.277-0.16,0.599-0.291,0.96-0.389l0.274,0.475l-0.006,0.004c-0.386,0.104-0.666,0.207-0.849,0.314 c-0.271,0.155-0.431,0.342-0.479,0.555c-0.045,0.215,0.017,0.475,0.192,0.779c0.153,0.266,0.341,0.426,0.562,0.479 s0.474-0.004,0.761-0.17c0.196-0.111,0.389-0.236,0.577-0.369l1.135,1.965l-2.087,1.203l-0.269-0.465L179.66,171.387z"/> -<path fill="#646464" d="M199.659,146.943l-0.47-0.271l1.395-2.416l0.295,0.171c0.283,0.161,0.504,0.356,0.666,0.577 c0.162,0.226,0.281,0.453,0.352,0.685c0.072,0.231,0.139,0.512,0.196,0.836c0.067,0.389,0.146,0.652,0.228,0.791 s0.182,0.242,0.302,0.311c0.209,0.121,0.397,0.156,0.569,0.107c0.168-0.051,0.317-0.187,0.445-0.408 c0.135-0.236,0.239-0.557,0.311-0.961l0.004-0.006l0.482,0.279c-0.094,0.414-0.233,0.786-0.427,1.12 c-0.235,0.41-0.506,0.669-0.81,0.779c-0.303,0.108-0.629,0.062-0.979-0.142c-0.198-0.112-0.362-0.272-0.497-0.479 c-0.136-0.206-0.25-0.574-0.345-1.102c-0.052-0.297-0.103-0.531-0.147-0.707c-0.049-0.176-0.117-0.342-0.207-0.498 c-0.092-0.152-0.213-0.281-0.369-0.381L199.659,146.943z"/> -<path fill="#646464" d="M202.305,150.705c-0.24,0.414-0.57,0.645-0.99,0.688c-0.418,0.041-1.002-0.154-1.752-0.586 c-0.821-0.475-1.317-0.904-1.485-1.291c-0.17-0.385-0.132-0.787,0.11-1.209c0.213-0.369,0.471-0.59,0.774-0.664 c0.304-0.076,0.622-0.057,0.95,0.06c0.332,0.114,0.708,0.295,1.131,0.541c0.734,0.422,1.191,0.834,1.371,1.226 C202.59,149.861,202.555,150.273,202.305,150.705z M198.641,148.564c-0.107,0.182-0.082,0.375,0.075,0.582 c0.157,0.205,0.582,0.51,1.278,0.912c0.669,0.385,1.122,0.588,1.357,0.604c0.238,0.02,0.41-0.059,0.516-0.238 c0.094-0.162,0.096-0.318,0.012-0.471c-0.086-0.15-0.227-0.297-0.426-0.438c-0.199-0.142-0.48-0.314-0.844-0.521 c-0.715-0.414-1.195-0.637-1.44-0.664C198.922,148.301,198.746,148.377,198.641,148.564z"/> -<path fill="#646464" d="M119.518,68.245l0.58,1.005c0.047-0.032,0.134-0.084,0.26-0.156c0.404-0.232,0.773-0.307,1.113-0.217 c0.337,0.09,0.626,0.336,0.859,0.742c0.268,0.463,0.348,0.873,0.241,1.236c-0.105,0.359-0.401,0.682-0.888,0.963 c-0.276,0.156-0.596,0.289-0.959,0.389l-0.275-0.477l0.006-0.004c0.387-0.102,0.668-0.207,0.848-0.312 c0.272-0.155,0.431-0.341,0.479-0.558c0.049-0.214-0.015-0.472-0.19-0.775c-0.154-0.266-0.341-0.428-0.562-0.479 c-0.22-0.055-0.474,0.003-0.759,0.168c-0.197,0.113-0.39,0.237-0.578,0.371l-1.133-1.965l2.085-1.205l0.27,0.465L119.518,68.245z"/> -<path fill="#646464" d="M122.338,66.618l0.58,1.004c0.046-0.031,0.134-0.083,0.259-0.156c0.403-0.232,0.774-0.306,1.113-0.216 c0.339,0.088,0.626,0.336,0.86,0.742c0.267,0.463,0.348,0.873,0.24,1.234c-0.104,0.361-0.401,0.682-0.887,0.963 c-0.276,0.16-0.596,0.29-0.958,0.391l-0.276-0.475l0.006-0.006c0.385-0.104,0.668-0.207,0.849-0.312 c0.271-0.157,0.431-0.343,0.479-0.558c0.048-0.214-0.015-0.474-0.19-0.775c-0.155-0.269-0.342-0.429-0.562-0.479 c-0.221-0.055-0.473,0.002-0.76,0.166c-0.197,0.114-0.39,0.238-0.577,0.371l-1.135-1.965l2.087-1.203l0.269,0.464L122.338,66.618z"/> -<path fill="#646464" d="M207.07,118.969h-0.502v-2.763h0.502v0.982h3.49l-0.227-0.982h0.501l0.435,1.378v0.455h-4.201 L207.07,118.969L207.07,118.969z"/> -<path fill="#646464" d="M210.693,120.371h-1.16c0.005,0.057,0.008,0.158,0.008,0.304c0,0.466-0.123,0.821-0.369,1.073 c-0.246,0.248-0.604,0.373-1.074,0.373c-0.533,0-0.93-0.137-1.188-0.408c-0.262-0.271-0.391-0.689-0.391-1.251 c0-0.317,0.047-0.659,0.143-1.026h0.55v0.007c-0.104,0.386-0.153,0.684-0.153,0.894c0,0.312,0.082,0.543,0.242,0.692 c0.162,0.148,0.416,0.225,0.768,0.225c0.31,0,0.543-0.083,0.697-0.249c0.155-0.164,0.232-0.411,0.232-0.739 c0-0.228-0.012-0.457-0.031-0.685h2.268v2.407h-0.539v-1.617H210.693z"/> -<path fill="#646464" d="M180.623,67.174l-0.58,1.006c0.053,0.023,0.141,0.072,0.266,0.146c0.402,0.233,0.652,0.519,0.744,0.855 c0.094,0.339,0.021,0.712-0.213,1.117c-0.267,0.462-0.584,0.737-0.949,0.827c-0.365,0.087-0.791-0.008-1.275-0.289 c-0.276-0.158-0.549-0.371-0.816-0.634l0.275-0.478l0.007,0.004c0.28,0.28,0.515,0.474,0.694,0.578 c0.271,0.156,0.511,0.201,0.722,0.136c0.21-0.065,0.401-0.25,0.577-0.552c0.152-0.268,0.199-0.51,0.134-0.729 c-0.065-0.215-0.24-0.406-0.524-0.57c-0.197-0.114-0.399-0.22-0.609-0.315l1.135-1.965l2.086,1.203l-0.268,0.468L180.623,67.174z"/> -<path fill="#646464" d="M199.538,90.932l-0.433,0.25l-1.383-2.392l0.434-0.25l0.492,0.851l3.023-1.746l-0.688-0.738l0.437-0.25 l1.065,0.977l0.226,0.393l-3.639,2.101L199.538,90.932z"/> -<path fill="#646464" d="M204.107,90.42c0.242,0.418,0.274,0.816,0.102,1.202c-0.173,0.384-0.634,0.792-1.385,1.226 c-0.819,0.475-1.441,0.688-1.859,0.641c-0.416-0.047-0.748-0.28-0.99-0.701c-0.213-0.366-0.275-0.703-0.189-1.002 c0.088-0.3,0.264-0.566,0.527-0.795c0.267-0.228,0.609-0.465,1.031-0.709c0.734-0.425,1.318-0.615,1.748-0.572 S203.859,89.99,204.107,90.42z M200.42,92.523c0.105,0.185,0.288,0.26,0.545,0.225c0.256-0.031,0.732-0.25,1.428-0.652 c0.67-0.385,1.07-0.678,1.207-0.871c0.135-0.197,0.151-0.386,0.049-0.564c-0.094-0.162-0.229-0.245-0.402-0.246 c-0.174-0.002-0.372,0.049-0.592,0.15c-0.223,0.102-0.514,0.256-0.877,0.467c-0.715,0.412-1.146,0.719-1.295,0.917 C200.335,92.148,200.313,92.34,200.42,92.523z"/> -<circle fill="none" cx="150.999" cy="119.001" r="61.507"/> -<rect x="81.162" y="49.164" fill="none" width="139.674" height="139.676"/> -<rect x="81.165" y="49.164" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -39.9185 141.6281)" fill="none" width="139.672" height="139.672"/> -<path fill-opacity="0.4" d="M166.857,135.764c-0.252,0.25-0.654,0.25-0.903,0.004l-50.748-50.75c-0.248-0.248-0.247-0.65,0.003-0.9 l0.906-0.906c0.25-0.25,0.654-0.252,0.901-0.006l50.751,50.75c0.246,0.248,0.246,0.651-0.006,0.899L166.857,135.764z"/> -<rect x="140.849" y="73.605" transform="matrix(0.7067 -0.7075 0.7075 0.7067 -35.968 132.2127)" fill="#FFFFFF" width="1.281" height="71.77"/> -<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="354.7988" y1="-95.1782" x2="354.7988" y2="-130.7611" gradientTransform="matrix(1 0 0 -1 -185.98 -13.5195)"> +<path fill="url(#SVGID_4_)" d="M160,168.144c-34.819,0-63.146-28.323-63.146-63.146c0-34.818,28.325-63.147,63.146-63.147 c34.818,0,63.146,28.329,63.146,63.147C223.146,139.819,194.82,168.144,160,168.144L160,168.144z"/> +<circle fill="#C8C8C8" cx="160" cy="105" r="2.282"/> +<path fill="none" d="M160,168.144c-34.819,0-63.146-28.323-63.146-63.146c0-34.818,28.325-63.147,63.146-63.147 c34.818,0,63.146,28.329,63.146,63.147C223.146,139.819,194.82,168.144,160,168.144L160,168.144z"/> +<circle fill="#646464" cx="160" cy="45.657" r="2.283"/> +<path fill="#646464" d="M155.424,51.53h-0.033l-1.951,1.053l-0.293-1.158l2.451-1.311h1.294v11.221h-1.467L155.424,51.53 L155.424,51.53z"/> +<path fill="#646464" d="M159.689,61.335v-0.933l1.19-1.157c2.862-2.726,4.181-4.176,4.181-5.869c0-1.14-0.535-2.193-2.21-2.193 c-1.018,0-1.864,0.52-2.382,0.951l-0.486-1.068c0.762-0.64,1.885-1.14,3.16-1.14c2.416,0,3.438,1.657,3.438,3.262 c0,2.07-1.504,3.746-3.864,6.024l-0.881,0.828v0.035h5.021v1.26H159.689z"/> +<circle fill="#646464" cx="189.67" cy="53.61" r="2.282"/> +<circle fill="#646464" cx="211.39" cy="75.329" r="2.281"/> +<circle fill="#646464" cx="219.342" cy="105" r="2.282"/> +<path fill="#646464" d="M208.58,108.819c0.425,0.256,1.392,0.68,2.447,0.68c1.898,0,2.51-1.205,2.496-2.141 c-0.019-1.545-1.41-2.207-2.854-2.207h-0.829v-1.121h0.829c1.086,0,2.463-0.562,2.463-1.867c0-0.882-0.563-1.664-1.938-1.664 c-0.883,0-1.733,0.391-2.207,0.729l-0.408-1.085c0.595-0.423,1.715-0.85,2.904-0.85c2.172,0,3.157,1.292,3.157,2.633 c0,1.153-0.696,2.124-2.038,2.616v0.031c1.358,0.255,2.446,1.273,2.461,2.82c0,1.765-1.393,3.312-4.025,3.312 c-1.238,0-2.323-0.392-2.868-0.747L208.58,108.819z"/> +<path fill="#646464" d="M211.39,132.386c1.263,0,2.284,1.023,2.284,2.285c0,1.258-1.021,2.282-2.284,2.282 c-1.262,0-2.282-1.024-2.282-2.282C209.107,133.41,210.13,132.386,211.39,132.386z"/> +<rect x="199.037" y="122.135" transform="matrix(-0.5001 0.8659 -0.8659 -0.5001 411.3268 19.0048)" fill="#646464" width="2.283" height="12.17"/> +<path fill="#646464" d="M189.67,154.108c1.262,0,2.281,1.025,2.281,2.281c0,1.263-1.021,2.285-2.281,2.285 c-1.264,0-2.284-1.022-2.284-2.285C187.386,155.134,188.408,154.108,189.67,154.108z"/> +<rect x="182.08" y="139.113" transform="matrix(-0.8658 0.5005 -0.5005 -0.8658 414.5156 179.2164)" fill="#646464" width="2.283" height="12.179"/> +<circle fill="#646464" cx="159.998" cy="164.343" r="2.283"/> +<path fill="#646464" d="M162.701,149.888c-0.308-0.021-0.697,0.017-1.119,0.08c-2.366,0.377-3.59,2.078-3.844,3.912h0.031 c0.528-0.715,1.465-1.291,2.688-1.291c1.956,0,3.336,1.43,3.336,3.57c0,2.041-1.376,3.91-3.688,3.91 c-2.349,0-3.896-1.835-3.896-4.71c0-2.179,0.766-3.896,1.868-4.983c0.92-0.898,2.146-1.462,3.539-1.631 c0.442-0.07,0.815-0.084,1.091-0.084v1.227H162.701z M162.277,156.263c0-1.582-0.897-2.53-2.276-2.53c-0.9,0-1.75,0.543-2.16,1.358 c-0.083,0.172-0.151,0.373-0.151,0.646c0.016,1.821,0.866,3.183,2.449,3.183C161.412,158.917,162.277,157.847,162.277,156.263z"/> +<circle fill="#646464" cx="130.33" cy="156.391" r="2.282"/> +<rect x="135.673" y="139.116" transform="matrix(-0.8649 -0.5019 0.5019 -0.8649 182.2667 339.4583)" fill="#646464" width="2.284" height="12.171"/> +<rect x="182.27" y="57.743" transform="matrix(-0.8657 -0.5006 0.5006 -0.8657 310.2312 210.9045)" fill="#646464" width="2.283" height="12.172"/> +<path fill="#646464" d="M108.61,132.386c1.259,0,2.28,1.023,2.28,2.285c0,1.258-1.021,2.282-2.28,2.282 c-1.262,0-2.284-1.024-2.284-2.282C106.326,133.41,107.349,132.386,108.61,132.386z"/> +<rect x="118.682" y="122.11" transform="matrix(-0.501 -0.8654 0.8654 -0.501 68.9082 296.1266)" fill="#646464" width="2.281" height="12.176"/> +<rect x="199.694" y="75.09" transform="matrix(-0.5005 -0.8658 0.8658 -0.5005 231.0666 295.6795)" fill="#646464" width="2.283" height="12.176"/> +<circle fill="#646464" cx="100.658" cy="105" r="2.282"/> +<path fill="#646464" d="M106.733,109.507c0.323,0.032,0.701,0,1.215-0.053c0.873-0.119,1.694-0.463,2.327-1.076 c0.737-0.668,1.267-1.646,1.474-2.943h-0.052c-0.617,0.754-1.507,1.179-2.637,1.179c-1.986,0-3.27-1.506-3.27-3.405 c0-2.105,1.523-3.954,3.799-3.954c2.276,0,3.681,1.833,3.681,4.708c0,2.431-0.819,4.14-1.916,5.202 c-0.856,0.843-2.036,1.356-3.235,1.491c-0.548,0.085-1.028,0.104-1.387,0.085L106.733,109.507L106.733,109.507z M107.28,103.121 c0,1.388,0.84,2.364,2.141,2.364c1.009,0,1.798-0.499,2.192-1.165c0.084-0.155,0.136-0.31,0.136-0.566 c0-1.899-0.703-3.354-2.295-3.354C108.186,100.4,107.28,101.529,107.28,103.121z"/> +<circle fill="#646464" cx="108.61" cy="75.329" r="2.281"/> +<rect x="118.688" y="75.73" transform="matrix(0.5005 -0.8658 0.8658 0.5005 -10.9739 144.6138)" fill="#646464" width="2.283" height="12.173"/> +<circle fill="#646464" cx="130.33" cy="53.608" r="2.283"/> +<rect x="135.664" y="58.733" transform="matrix(0.8661 -0.5 0.5 0.8661 -14.0812 77.0793)" fill="#646464" width="2.283" height="12.171"/> +<rect x="152.465" y="34.622" transform="matrix(0.9947 -0.1031 0.1031 0.9947 -2.9898 15.9509)" fill="#646464" width="0.758" height="4.564"/> +<rect x="166.781" y="170.8" transform="matrix(0.9942 -0.1079 0.1079 0.9942 -17.6988 19.0461)" fill="#646464" width="0.76" height="4.567"/> +<rect x="145.386" y="35.751" transform="matrix(0.9783 -0.2073 0.2073 0.9783 -4.7182 31.0491)" fill="#646464" width="0.761" height="4.564"/> +<rect x="173.859" y="169.688" transform="matrix(0.9771 -0.2126 0.2126 0.9771 -32.5762 40.9726)" fill="#646464" width="0.763" height="4.564"/> +<rect x="138.457" y="37.598" transform="matrix(0.9513 -0.3082 0.3082 0.9513 -5.5328 44.7255)" fill="#646464" width="0.764" height="4.564"/> +<rect x="180.774" y="167.848" transform="matrix(0.9507 -0.31 0.31 0.9507 -43.8184 64.5433)" fill="#646464" width="0.756" height="4.564"/> +<rect x="131.773" y="40.167" transform="matrix(0.9144 -0.4048 0.4048 0.9144 -5.8719 57.1258)" fill="#646464" width="0.764" height="4.563"/> +<rect x="187.461" y="165.269" transform="matrix(0.914 -0.4058 0.4058 0.914 -51.8284 90.6373)" fill="#646464" width="0.763" height="4.56"/> +<rect x="119.373" y="47.327" transform="matrix(0.8099 -0.5866 0.5866 0.8099 -6.3341 79.6745)" fill="#646464" width="0.761" height="4.566"/> +<rect x="199.879" y="158.11" transform="matrix(0.8096 -0.5869 0.5869 0.8096 -56.0172 148.0756)" fill="#646464" width="0.759" height="4.564"/> +<rect x="113.799" y="51.834" transform="matrix(0.7445 -0.6676 0.6676 0.7445 -6.9562 90.0548)" fill="#646464" width="0.762" height="4.563"/> +<rect x="205.434" y="153.598" transform="matrix(0.742 -0.6704 0.6704 0.742 -51.402 178.1881)" fill="#646464" width="0.763" height="4.564"/> +<rect x="108.736" y="56.902" transform="matrix(0.6685 -0.7437 0.7437 0.6685 -7.8437 100.77)" fill="#646464" width="0.76" height="4.564"/> +<rect x="210.48" y="148.555" transform="matrix(0.6697 -0.7426 0.7426 0.6697 -42.373 206.4011)" fill="#646464" width="0.764" height="4.568"/> +<rect x="104.222" y="62.489" transform="matrix(0.5862 -0.8102 0.8102 0.5862 -9.1904 111.55)" fill="#646464" width="0.763" height="4.565"/> +<rect x="215.034" y="142.94" transform="matrix(0.588 -0.8088 0.8088 0.588 -28.7162 234.0664)" fill="#646464" width="0.761" height="4.565"/> +<rect x="97.076" y="74.865" transform="matrix(0.4074 -0.9132 0.9132 0.4074 -12.7047 134.7127)" fill="#646464" width="0.76" height="4.563"/> +<rect x="222.191" y="130.6" transform="matrix(0.4104 -0.9119 0.9119 0.4104 10.0494 281.3069)" fill="#646464" width="0.761" height="4.563"/> +<rect x="94.501" y="81.561" transform="matrix(0.3058 -0.9521 0.9521 0.3058 -13.9611 148.5399)" fill="#646464" width="0.76" height="4.566"/> +<rect x="224.746" y="123.89" transform="matrix(0.3124 -0.95 0.95 0.3124 34.9469 300.6219)" fill="#646464" width="0.757" height="4.564"/> +<rect x="92.643" y="88.476" transform="matrix(0.2066 -0.9784 0.9784 0.2066 -14.9956 163.0256)" fill="#646464" width="0.761" height="4.567"/> +<rect x="226.604" y="116.941" transform="matrix(0.2055 -0.9787 0.9787 0.2055 63.6602 316.8646)" fill="#646464" width="0.76" height="4.567"/> +<rect x="91.525" y="95.564" transform="matrix(0.1015 -0.9948 0.9948 0.1015 -14.7675 179.3414)" fill="#646464" width="0.76" height="4.566"/> +<rect x="227.712" y="109.901" transform="matrix(0.1104 -0.9939 0.9939 0.1104 91.4231 326.5013)" fill="#646464" width="0.761" height="4.563"/> +<rect x="91.526" y="109.874" transform="matrix(-0.1041 -0.9946 0.9946 -0.1041 -10.0743 215.2361)" fill="#646464" width="0.76" height="4.563"/> +<rect x="227.73" y="95.544" transform="matrix(-0.1005 -0.9949 0.9949 -0.1005 153.7093 334.614)" fill="#646464" width="0.758" height="4.564"/> +<rect x="92.642" y="116.962" transform="matrix(-0.2043 -0.9789 0.9789 -0.2043 -4.7056 234.6612)" fill="#646464" width="0.76" height="4.562"/> +<rect x="226.609" y="88.465" transform="matrix(-0.2071 -0.9783 0.9783 -0.2071 185.2206 331.6101)" fill="#646464" width="0.759" height="4.566"/> +<rect x="94.498" y="123.878" transform="matrix(-0.3089 -0.9511 0.9511 -0.3089 4.1975 255.3723)" fill="#646464" width="0.762" height="4.565"/> +<rect x="224.747" y="81.55" transform="matrix(-0.3058 -0.9521 0.9521 -0.3058 214.1556 323.8108)" fill="#646464" width="0.76" height="4.564"/> +<rect x="97.058" y="130.565" transform="matrix(-0.4078 -0.9131 0.9131 -0.4078 15.876 275.9901)" fill="#646464" width="0.762" height="4.564"/> +<rect x="222.19" y="74.854" transform="matrix(-0.4061 -0.9138 0.9138 -0.4061 242.4765 311.8519)" fill="#646464" width="0.76" height="4.565"/> +<rect x="104.229" y="142.964" transform="matrix(-0.5868 -0.8097 0.8097 -0.5868 48.3844 315.1844)" fill="#646464" width="0.762" height="4.566"/> +<rect x="215.003" y="62.46" transform="matrix(-0.5843 -0.8115 0.8115 -0.5843 288.702 277.3557)" fill="#646464" width="0.759" height="4.561"/> +<rect x="108.753" y="148.511" transform="matrix(-0.6716 -0.7409 0.7409 -0.6716 70.6991 332.9232)" fill="#646464" width="0.761" height="4.564"/> +<rect x="210.512" y="56.891" transform="matrix(-0.6699 -0.7424 0.7424 -0.6699 308.2413 255.3895)" fill="#646464" width="0.761" height="4.567"/> +<rect x="113.822" y="153.608" transform="matrix(-0.744 -0.6682 0.6682 -0.744 95.0044 348.1786)" fill="#646464" width="0.76" height="4.563"/> +<rect x="205.449" y="51.851" transform="matrix(-0.7401 -0.6725 0.6725 -0.7401 321.7531 232.619)" fill="#646464" width="0.759" height="4.566"/> +<rect x="119.359" y="158.119" transform="matrix(-0.8102 -0.5862 0.5862 -0.8102 122.7238 360.5475)" fill="#646464" width="0.763" height="4.567"/> +<rect x="199.878" y="47.321" transform="matrix(-0.8088 -0.588 0.588 -0.8088 333.0692 207.4829)" fill="#646464" width="0.761" height="4.566"/> +<rect x="131.785" y="165.269" transform="matrix(-0.9129 -0.4083 0.4083 -0.9129 184.4057 374.4613)" fill="#646464" width="0.761" height="4.563"/> +<rect x="187.46" y="40.138" transform="matrix(-0.9129 -0.4083 0.4083 -0.9129 341.9913 157.8347)" fill="#646464" width="0.761" height="4.564"/> +<rect x="138.449" y="167.854" transform="matrix(-0.9518 -0.3066 0.3066 -0.9518 218.8126 374.6401)" fill="#646464" width="0.761" height="4.562"/> +<rect x="180.768" y="37.601" transform="matrix(-0.9507 -0.31 0.31 -0.9507 341.001 133.9623)" fill="#646464" width="0.756" height="4.566"/> +<rect x="145.384" y="169.696" transform="matrix(-0.979 -0.204 0.204 -0.979 253.3792 370.0781)" fill="#646464" width="0.761" height="4.567"/> +<rect x="173.89" y="35.722" transform="matrix(-0.9777 -0.2102 0.2102 -0.9777 336.6534 111.7981)" fill="#646464" width="0.757" height="4.566"/> +<rect x="152.472" y="170.807" transform="matrix(-0.995 -0.1003 0.1003 -0.995 287.5774 360.6373)" fill="#646464" width="0.76" height="4.57"/> +<rect x="166.782" y="34.628" transform="matrix(-0.9942 -0.1073 0.1073 -0.9942 329.3942 91.5465)" fill="#646464" width="0.755" height="4.565"/> +<path fill="#646464" d="M158.271,33.417c0.573,0,1.006,0.202,1.299,0.61c0.293,0.406,0.437,1.123,0.437,2.152 c0,1.125-0.147,1.892-0.444,2.293c-0.296,0.403-0.732,0.603-1.31,0.603c-0.505,0-0.888-0.132-1.146-0.401 c-0.257-0.265-0.424-0.603-0.502-1.012c-0.078-0.409-0.117-0.905-0.117-1.483c0-1.008,0.147-1.719,0.449-2.136 C157.238,33.625,157.683,33.417,158.271,33.417z M158.246,38.458c0.253,0,0.437-0.141,0.556-0.426 c0.117-0.283,0.177-0.902,0.177-1.855c0-0.917-0.062-1.504-0.182-1.76c-0.124-0.254-0.305-0.384-0.551-0.384 c-0.223,0-0.387,0.089-0.492,0.268c-0.105,0.178-0.174,0.413-0.198,0.698c-0.024,0.289-0.039,0.68-0.039,1.18 c0,0.979,0.058,1.606,0.175,1.877C157.808,38.322,157.994,38.458,158.246,38.458z"/> +<path fill="#646464" d="M162.14,33.417c0.569,0,1.005,0.202,1.298,0.61c0.293,0.406,0.438,1.123,0.438,2.152 c0,1.125-0.147,1.892-0.442,2.293c-0.297,0.403-0.732,0.603-1.313,0.603c-0.51,0-0.887-0.132-1.146-0.401 c-0.257-0.265-0.423-0.603-0.503-1.012c-0.075-0.409-0.116-0.905-0.116-1.483c0-1.008,0.15-1.719,0.45-2.136 C161.107,33.625,161.549,33.417,162.14,33.417z M162.111,38.458c0.252,0,0.438-0.141,0.558-0.426 c0.116-0.283,0.174-0.902,0.174-1.855c0-0.917-0.062-1.504-0.181-1.76c-0.118-0.254-0.305-0.384-0.551-0.384 c-0.225,0-0.389,0.089-0.492,0.268c-0.104,0.178-0.172,0.413-0.193,0.698c-0.025,0.289-0.04,0.68-0.04,1.18 c0,0.979,0.06,1.606,0.175,1.877C161.675,38.322,161.857,38.458,162.111,38.458z"/> +<path fill="#646464" d="M97.489,71.503l1.193,0.688c0.028-0.06,0.086-0.165,0.176-0.316c0.272-0.477,0.613-0.771,1.014-0.881 c0.402-0.11,0.843-0.027,1.326,0.253c0.55,0.315,0.875,0.691,0.98,1.125c0.106,0.435-0.01,0.939-0.342,1.517 c-0.188,0.326-0.439,0.651-0.753,0.971l-0.568-0.328l0.006-0.006c0.334-0.336,0.563-0.612,0.687-0.825 c0.186-0.323,0.24-0.609,0.163-0.858s-0.297-0.475-0.658-0.684c-0.316-0.183-0.604-0.237-0.862-0.161 c-0.258,0.076-0.484,0.285-0.681,0.625c-0.135,0.233-0.26,0.474-0.373,0.721l-2.333-1.347l1.432-2.477l0.555,0.32L97.489,71.503z"/> +<path fill="#646464" d="M99.076,67.355c0.286-0.495,0.677-0.767,1.176-0.818c0.498-0.049,1.192,0.183,2.082,0.698 c0.977,0.563,1.564,1.071,1.766,1.53c0.199,0.46,0.157,0.935-0.132,1.436c-0.252,0.438-0.561,0.704-0.92,0.79 c-0.36,0.09-0.739,0.068-1.129-0.071c-0.395-0.136-0.84-0.351-1.343-0.64c-0.872-0.504-1.414-0.99-1.625-1.457 C98.74,68.355,98.781,67.865,99.076,67.355z M103.429,69.899c0.126-0.221,0.096-0.453-0.09-0.696 c-0.186-0.241-0.692-0.603-1.519-1.081c-0.793-0.457-1.331-0.698-1.613-0.721c-0.283-0.022-0.486,0.073-0.608,0.283 c-0.11,0.194-0.115,0.38-0.015,0.561c0.104,0.18,0.271,0.354,0.507,0.52c0.235,0.168,0.569,0.373,0.999,0.623 c0.851,0.491,1.42,0.751,1.713,0.787C103.093,70.209,103.302,70.117,103.429,69.899z"/> +<path fill="#646464" d="M92.157,104.909h0.639v0.57h1.22v1.003h-1.22v2.229h-0.61l-2.847-1.744l-0.893-0.543v-0.945h3.711V104.909z M92.157,107.936v-1.454h-2.439L92.157,107.936z"/> +<path fill="#646464" d="M89.116,103.373h1.378c-0.006-0.067-0.009-0.187-0.009-0.363c0-0.552,0.146-0.975,0.438-1.272 c0.291-0.296,0.717-0.444,1.273-0.444c0.635,0,1.106,0.162,1.414,0.487c0.308,0.323,0.462,0.816,0.462,1.482 c0,0.38-0.057,0.785-0.167,1.218h-0.653v-0.006c0.121-0.459,0.18-0.813,0.18-1.061c0-0.373-0.096-0.647-0.287-0.822 c-0.192-0.176-0.496-0.268-0.913-0.268c-0.366,0-0.642,0.099-0.826,0.294c-0.186,0.195-0.277,0.491-0.277,0.878 c0,0.272,0.014,0.543,0.038,0.814h-2.694v-2.857h0.641v1.919L89.116,103.373L89.116,103.373z"/> +<path fill="#646464" d="M101.206,138.851l0.554-0.32l0.286,0.497l1.056-0.612l0.502,0.867l-1.058,0.611l1.114,1.931l-0.525,0.304 l-3.34-0.08l-1.044-0.029l-0.472-0.814l3.214-1.857L101.206,138.851z M102.72,141.472l-0.725-1.258l-2.115,1.221L102.72,141.472z"/> +<path fill="#646464" d="M96.938,138.941c-0.286-0.497-0.325-0.976-0.121-1.433c0.207-0.455,0.754-0.938,1.644-1.453 c0.977-0.563,1.71-0.817,2.208-0.765c0.498,0.058,0.889,0.332,1.178,0.83c0.252,0.438,0.326,0.839,0.224,1.192 c-0.103,0.355-0.312,0.668-0.625,0.938c-0.317,0.271-0.724,0.559-1.227,0.848c-0.872,0.502-1.563,0.729-2.073,0.678 C97.634,139.729,97.234,139.446,96.938,138.941z M101.315,136.441c-0.125-0.222-0.342-0.31-0.646-0.271 c-0.305,0.036-0.87,0.297-1.696,0.771c-0.793,0.459-1.271,0.809-1.433,1.033c-0.161,0.234-0.179,0.463-0.057,0.668 c0.109,0.195,0.271,0.295,0.477,0.295c0.208,0.002,0.442-0.057,0.702-0.18c0.264-0.119,0.61-0.304,1.042-0.551 c0.849-0.49,1.361-0.855,1.537-1.092C101.419,136.886,101.443,136.661,101.315,136.441z"/> +<path fill="#646464" d="M127.951,166.431c-0.63-0.367-1.062-0.526-1.293-0.487c-0.23,0.034-0.422,0.19-0.576,0.454 c-0.134,0.232-0.174,0.443-0.118,0.634c0.058,0.188,0.212,0.358,0.461,0.501c0.221,0.13,0.559,0.253,1.019,0.371l0.006,0.004 l-0.325,0.568c-0.461-0.133-0.856-0.293-1.182-0.479c-0.492-0.282-0.805-0.596-0.936-0.938c-0.133-0.338-0.085-0.707,0.144-1.104 c0.156-0.271,0.365-0.466,0.627-0.57c0.261-0.115,0.554-0.125,0.876-0.049c-0.271-0.228-0.427-0.484-0.472-0.775 s0.02-0.586,0.19-0.883c0.284-0.488,0.641-0.772,1.067-0.856c0.428-0.078,0.927,0.045,1.501,0.379 c0.343,0.19,0.667,0.449,0.965,0.756l-0.322,0.562l-0.005-0.004c-0.361-0.35-0.663-0.592-0.903-0.729 c-0.293-0.17-0.555-0.224-0.787-0.163c-0.23,0.064-0.429,0.244-0.603,0.536c-0.181,0.315-0.225,0.592-0.126,0.83 c0.097,0.235,0.464,0.543,1.1,0.909L127.951,166.431z"/> +<path fill="#646464" d="M123.149,165.574l0.689-1.194c-0.062-0.029-0.167-0.088-0.317-0.174c-0.478-0.273-0.771-0.613-0.882-1.014 c-0.111-0.4-0.024-0.844,0.251-1.328c0.32-0.545,0.694-0.875,1.128-0.98s0.939,0.015,1.517,0.344 c0.328,0.189,0.653,0.439,0.972,0.759l-0.329,0.563l-0.006-0.004c-0.336-0.332-0.612-0.564-0.825-0.688 c-0.321-0.185-0.608-0.233-0.856-0.159c-0.25,0.072-0.478,0.297-0.687,0.652c-0.183,0.32-0.235,0.607-0.158,0.863 c0.075,0.262,0.284,0.485,0.622,0.682c0.234,0.133,0.477,0.263,0.724,0.375l-1.348,2.33l-2.477-1.432l0.32-0.556L123.149,165.574z"/> +<path fill="#646464" d="M162.969,174.224c-0.729,0-1.184,0.072-1.363,0.222c-0.182,0.147-0.271,0.376-0.271,0.687 c0,0.271,0.074,0.471,0.22,0.61c0.144,0.14,0.36,0.206,0.647,0.206c0.254,0,0.607-0.066,1.063-0.191h0.009v0.655 c-0.467,0.118-0.889,0.173-1.263,0.173c-0.567,0-0.995-0.115-1.276-0.339c-0.285-0.229-0.429-0.571-0.429-1.026 c0-0.316,0.086-0.588,0.259-0.813c0.172-0.225,0.414-0.389,0.734-0.48c-0.348-0.06-0.611-0.207-0.798-0.435 c-0.185-0.229-0.276-0.519-0.276-0.864c0-0.566,0.166-0.99,0.497-1.275c0.326-0.279,0.824-0.426,1.485-0.426 c0.396,0,0.806,0.061,1.219,0.176v0.646h-0.008c-0.486-0.12-0.867-0.179-1.146-0.179c-0.337,0-0.59,0.083-0.764,0.258 c-0.171,0.171-0.253,0.422-0.253,0.764c0,0.36,0.101,0.625,0.302,0.78c0.206,0.16,0.676,0.239,1.411,0.239L162.969,174.224 L162.969,174.224z"/> +<path fill="#646464" d="M157.859,176.581c-0.572,0-1.002-0.201-1.295-0.609c-0.291-0.402-0.437-1.119-0.437-2.148 c0-1.125,0.146-1.895,0.442-2.296c0.297-0.403,0.732-0.604,1.311-0.604c0.506,0,0.887,0.133,1.145,0.4 c0.26,0.271,0.426,0.605,0.504,1.016c0.076,0.412,0.115,0.902,0.115,1.481c0,1.01-0.148,1.724-0.447,2.136 C158.895,176.376,158.449,176.581,157.859,176.581z M157.888,171.542c-0.253,0-0.438,0.145-0.556,0.428 c-0.117,0.279-0.176,0.901-0.176,1.854c0,0.916,0.06,1.503,0.183,1.761c0.121,0.258,0.304,0.383,0.55,0.383 c0.223,0,0.385-0.086,0.491-0.271c0.104-0.177,0.172-0.415,0.196-0.696c0.025-0.289,0.041-0.684,0.041-1.18 c0-0.982-0.062-1.607-0.176-1.878C158.322,171.677,158.141,171.542,157.888,171.542z"/> +<path fill="#646464" d="M193.443,162.63l-0.324-0.558l2.871-1.658l0.201,0.351c0.195,0.336,0.309,0.664,0.342,0.992 s0.018,0.631-0.047,0.91c-0.063,0.282-0.16,0.611-0.295,0.977c-0.158,0.438-0.238,0.76-0.236,0.947 c0.006,0.188,0.046,0.355,0.125,0.498c0.144,0.248,0.318,0.396,0.523,0.448c0.203,0.048,0.438-0.002,0.7-0.155 c0.276-0.162,0.574-0.424,0.892-0.802l0.006-0.003l0.328,0.573c-0.336,0.37-0.709,0.67-1.102,0.897 c-0.488,0.281-0.917,0.387-1.294,0.318c-0.376-0.064-0.685-0.311-0.929-0.723c-0.131-0.233-0.209-0.493-0.223-0.787 c-0.021-0.293,0.08-0.74,0.299-1.338c0.123-0.334,0.209-0.608,0.271-0.814c0.056-0.213,0.081-0.421,0.08-0.634 c-0.002-0.213-0.052-0.418-0.155-0.615L193.443,162.63z"/> +<path fill="#646464" d="M194.033,167.202l-0.689-1.193c-0.055,0.035-0.16,0.102-0.309,0.187c-0.479,0.274-0.918,0.362-1.32,0.256 c-0.4-0.104-0.743-0.396-1.021-0.879c-0.313-0.552-0.412-1.037-0.285-1.47c0.125-0.422,0.476-0.807,1.056-1.141 c0.328-0.191,0.711-0.347,1.14-0.463l0.325,0.563l-0.007,0.007c-0.458,0.124-0.791,0.246-1.01,0.373 c-0.319,0.187-0.512,0.405-0.567,0.657c-0.056,0.257,0.021,0.564,0.229,0.927c0.183,0.313,0.403,0.506,0.666,0.567 c0.265,0.063,0.563-0.004,0.904-0.201c0.231-0.131,0.463-0.278,0.686-0.438l1.349,2.333l-2.478,1.431l-0.32-0.555L194.033,167.202z "/> +<path fill="#646464" d="M217.779,138.177l-0.558-0.322l1.655-2.866l0.352,0.204c0.336,0.188,0.598,0.422,0.79,0.686 c0.192,0.27,0.335,0.536,0.417,0.813c0.086,0.271,0.166,0.605,0.233,0.99c0.08,0.463,0.173,0.774,0.271,0.939 s0.217,0.287,0.358,0.369c0.249,0.145,0.472,0.186,0.676,0.127c0.199-0.061,0.376-0.223,0.528-0.484 c0.16-0.279,0.283-0.66,0.369-1.142l0.006-0.007l0.57,0.332c-0.11,0.49-0.275,0.933-0.506,1.328 c-0.279,0.486-0.603,0.796-0.961,0.926c-0.359,0.128-0.748,0.074-1.164-0.169c-0.234-0.132-0.432-0.322-0.592-0.568 c-0.16-0.243-0.297-0.682-0.408-1.308c-0.063-0.354-0.121-0.631-0.176-0.84c-0.059-0.209-0.14-0.406-0.244-0.592 c-0.109-0.183-0.255-0.334-0.438-0.453L217.779,138.177z"/> +<path fill="#646464" d="M220.921,142.644c-0.285,0.492-0.677,0.767-1.177,0.816c-0.496,0.049-1.188-0.184-2.08-0.695 c-0.973-0.563-1.563-1.073-1.762-1.532c-0.201-0.457-0.158-0.935,0.129-1.437c0.254-0.438,0.562-0.699,0.92-0.787 c0.361-0.092,0.738-0.067,1.129,0.069c0.395,0.136,0.841,0.353,1.343,0.644c0.872,0.502,1.415,0.99,1.628,1.457 C221.26,141.642,221.218,142.132,220.921,142.644z M216.57,140.103c-0.125,0.216-0.098,0.445,0.09,0.691 c0.188,0.242,0.69,0.604,1.52,1.082c0.794,0.456,1.332,0.697,1.609,0.717c0.283,0.022,0.488-0.068,0.613-0.283 c0.11-0.191,0.113-0.377,0.016-0.559c-0.104-0.18-0.271-0.354-0.508-0.521c-0.234-0.17-0.568-0.372-1.002-0.618 c-0.849-0.491-1.418-0.757-1.709-0.788C216.904,139.79,216.695,139.882,216.57,140.103z"/> +<path fill="#646464" d="M122.619,44.73l0.688,1.193c0.057-0.038,0.159-0.1,0.31-0.185c0.479-0.276,0.918-0.365,1.322-0.258 c0.399,0.107,0.743,0.399,1.02,0.881c0.318,0.55,0.414,1.037,0.286,1.468c-0.125,0.426-0.477,0.81-1.054,1.143 c-0.328,0.186-0.708,0.343-1.14,0.462l-0.326-0.567l0.008-0.004c0.459-0.121,0.793-0.246,1.007-0.371 c0.323-0.184,0.511-0.405,0.568-0.663c0.059-0.254-0.018-0.56-0.226-0.92c-0.183-0.316-0.405-0.509-0.667-0.569 c-0.261-0.065-0.563,0.003-0.901,0.199c-0.233,0.134-0.463,0.281-0.687,0.441l-1.345-2.333l2.476-1.431l0.321,0.552L122.619,44.73z "/> +<path fill="#646464" d="M125.968,42.798l0.689,1.192c0.054-0.037,0.159-0.099,0.308-0.186c0.479-0.275,0.919-0.363,1.321-0.256 c0.402,0.104,0.743,0.399,1.021,0.881c0.317,0.549,0.414,1.036,0.286,1.465c-0.124,0.429-0.477,0.81-1.054,1.144 c-0.328,0.19-0.708,0.344-1.138,0.464l-0.328-0.564l0.007-0.007c0.457-0.124,0.793-0.246,1.008-0.371 c0.322-0.187,0.512-0.408,0.569-0.663c0.057-0.254-0.019-0.563-0.227-0.92c-0.184-0.319-0.405-0.51-0.667-0.569 c-0.263-0.065-0.562,0.002-0.902,0.197c-0.234,0.135-0.463,0.282-0.686,0.44l-1.348-2.333l2.478-1.428l0.319,0.551L125.968,42.798z "/> +<path fill="#646464" d="M226.58,104.96h-0.596v-3.28h0.596v1.166h4.145l-0.271-1.166h0.597l0.519,1.636v0.54h-4.988V104.96 L226.58,104.96z"/> +<path fill="#646464" d="M230.882,106.626h-1.377c0.006,0.067,0.009,0.188,0.009,0.36c0,0.553-0.146,0.976-0.438,1.274 c-0.293,0.295-0.717,0.442-1.275,0.442c-0.633,0-1.104-0.163-1.41-0.485c-0.311-0.322-0.464-0.817-0.464-1.484 c0-0.377,0.056-0.783,0.17-1.219h0.651v0.01c-0.123,0.458-0.182,0.813-0.182,1.061c0,0.37,0.098,0.645,0.286,0.822 c0.192,0.178,0.494,0.268,0.912,0.268c0.368,0,0.646-0.1,0.827-0.297c0.186-0.193,0.275-0.488,0.275-0.877 c0-0.271-0.014-0.543-0.037-0.813h2.691v2.857h-0.64V106.626L230.882,106.626L230.882,106.626z"/> +<path fill="#646464" d="M195.176,43.458l-0.688,1.195c0.063,0.027,0.166,0.085,0.313,0.173c0.479,0.276,0.772,0.616,0.886,1.015 c0.109,0.402,0.023,0.845-0.255,1.326c-0.315,0.549-0.692,0.875-1.127,0.982c-0.435,0.104-0.938-0.009-1.514-0.343 c-0.328-0.187-0.652-0.44-0.97-0.752l0.326-0.567l0.008,0.004c0.332,0.332,0.613,0.563,0.824,0.687 c0.321,0.185,0.606,0.238,0.856,0.161s0.476-0.297,0.687-0.655c0.18-0.318,0.234-0.605,0.158-0.865 c-0.076-0.256-0.285-0.482-0.621-0.677c-0.234-0.135-0.475-0.261-0.725-0.374l1.348-2.333l2.479,1.428l-0.317,0.556L195.176,43.458 z"/> +<path fill="#646464" d="M217.636,71.669l-0.515,0.297l-1.641-2.84l0.514-0.297l0.586,1.01l3.589-2.073l-0.817-0.876l0.52-0.297 l1.266,1.16l0.27,0.467l-4.319,2.495L217.636,71.669z"/> +<path fill="#646464" d="M223.063,71.061c0.287,0.497,0.324,0.969,0.12,1.428c-0.204,0.456-0.753,0.94-1.646,1.456 c-0.973,0.563-1.711,0.817-2.207,0.761c-0.494-0.056-0.889-0.332-1.176-0.832c-0.254-0.435-0.326-0.835-0.226-1.189 c0.104-0.357,0.313-0.672,0.625-0.944c0.315-0.271,0.726-0.553,1.226-0.842c0.873-0.505,1.564-0.73,2.076-0.679 C222.365,70.269,222.768,70.55,223.063,71.061z M218.684,73.558c0.125,0.22,0.342,0.309,0.646,0.267 c0.304-0.037,0.869-0.297,1.695-0.774c0.795-0.458,1.271-0.806,1.434-1.035c0.16-0.234,0.18-0.458,0.058-0.669 c-0.11-0.192-0.271-0.291-0.478-0.292c-0.206-0.002-0.44,0.058-0.703,0.178c-0.264,0.121-0.609,0.304-1.041,0.554 c-0.85,0.489-1.36,0.854-1.537,1.089C218.582,73.113,218.556,73.341,218.684,73.558z"/> +<circle fill="none" cx="160" cy="104.999" r="73.034"/> +<rect x="77.074" y="22.073" fill="none" width="165.852" height="165.854"/> +<path fill-opacity="0.4" d="M178.83,124.903c-0.299,0.297-0.776,0.297-1.072,0.005l-60.259-60.261 c-0.295-0.294-0.293-0.771,0.003-1.069l1.075-1.076c0.297-0.297,0.777-0.299,1.07-0.007l60.263,60.262 c0.291,0.295,0.291,0.773-0.008,1.068L178.83,124.903z"/> +<rect x="147.946" y="51.095" transform="matrix(-0.7065 0.7077 -0.7077 -0.7065 320.0809 54.657)" fill="#FFFFFF" width="1.521" height="85.22"/> +<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="426.8613" y1="1063.6152" x2="426.8613" y2="1099.1973" gradientTransform="matrix(1 0 0 1 -249.04 -995.9609)"> <stop offset="0" style="stop-color:#FFFFFF"/> <stop offset="0.9455" style="stop-color:#CBCBCB"/> <stop offset="1" style="stop-color:#CBCBCB"/> </linearGradient> -<path display="none" fill="url(#SVGID_5_)" d="M154.729,117.99c-3.874,0-6.007-2.244-6.007-6.319v-13.96 c0-4.23,3.511-5.73,6.517-5.73h0.287c0.248,0,0.271-0.002,0.472-0.01l0.164-0.006c1.626-0.056,3.36-1.23,3.358-4.359 c-0.002-2.646,0.717-4.59,2.139-5.769c1.215-1.011,2.662-1.222,3.664-1.222c0.71,0,1.21,0.107,1.229,0.112 c14.013,2.417,21.496,14.197,22.324,21.788c0.235,2.158-0.549,4.537-2.044,6.206c-1.003,1.117-2.794,2.45-5.637,2.45 c-4.256,0-5.939,1.467-6.84,2.57l-0.254,0.317c-1.168,1.472-3.125,3.933-7.32,3.933L154.729,117.99L154.729,117.99z"/> -<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="354.7988" y1="-131.1069" x2="354.7988" y2="-94.4508" gradientTransform="matrix(1 0 0 -1 -185.98 -13.5195)"> +<path display="none" fill="url(#SVGID_5_)" d="M163.73,103.988c-3.875,0-6.007-2.244-6.007-6.319v-13.96 c0-4.23,3.511-5.73,6.517-5.73h0.287c0.248,0,0.271-0.002,0.474-0.01l0.163-0.006c1.625-0.056,3.359-1.23,3.357-4.359 c-0.002-2.646,0.717-4.59,2.139-5.769c1.217-1.011,2.662-1.222,3.664-1.222c0.711,0,1.211,0.107,1.229,0.112 c14.013,2.417,21.495,14.197,22.323,21.788c0.234,2.158-0.549,4.538-2.045,6.206c-1.002,1.117-2.793,2.45-5.637,2.45 c-4.256,0-5.938,1.468-6.84,2.57l-0.255,0.317c-1.168,1.471-3.125,3.933-7.319,3.933L163.73,103.988L163.73,103.988z"/> +<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="426.8613" y1="1099.5459" x2="426.8613" y2="1062.8889" gradientTransform="matrix(1 0 0 1 -249.04 -995.9609)"> <stop offset="0" style="stop-color:#B4B4B4"/> <stop offset="1" style="stop-color:#A0A0A0"/> </linearGradient> -<path display="none" fill="url(#SVGID_6_)" d="M188.876,102.516c-0.828-7.591-8.312-19.371-22.323-21.788 c-0.021-0.005-0.521-0.112-1.23-0.112c-1.002,0-2.449,0.211-3.664,1.222c-1.422,1.179-2.141,3.122-2.139,5.769 c0.002,3.129-1.732,4.304-3.358,4.359l-0.164,0.006c-0.2,0.008-0.224,0.01-0.472,0.01h-0.287c-3.006,0-6.517,1.5-6.517,5.73v13.96 c0,4.075,2.134,6.319,6.007,6.319h12.054c4.194,0,6.151-2.461,7.319-3.931l0.254-0.317c0.898-1.104,2.586-2.57,6.842-2.57 c2.842,0,4.632-1.333,5.636-2.45C188.326,107.053,189.111,104.674,188.876,102.516z M181.193,110.531 c-4.494,0-6.334,1.576-7.336,2.807c-1.164,1.436-2.895,4.014-7.076,4.014s-7.477,0-12.055,0c-4.579,0-5.365-3.25-5.365-5.681 c0-2.429,0-13.96,0-13.96c0-3.771,3.05-5.091,5.876-5.091c0.639,0,0.482,0.002,0.947-0.015c2.119-0.072,3.977-1.645,3.975-4.998 c-0.006-7.635,6.253-6.255,6.253-6.255c13.789,2.379,21.036,13.987,21.825,21.231C188.607,105.965,186.218,110.531,181.193,110.531z "/> -<rect x="81.163" y="49.163" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 173.6274 309.9154)" fill="none" width="139.672" height="139.671"/> -<polygon fill-opacity="0.4" points="161.545,112.082 123.561,150.064 119.503,150.271 119.953,146.424 157.92,108.457 "/> -<polygon points="157.92,109.363 160.639,112.082 123.281,149.438 120.229,149.594 120.563,146.719 "/> -<rect x="81.162" y="49.164" transform="matrix(-0.7071 0.7071 -0.7071 -0.7071 341.915 96.3727)" fill="none" width="139.673" height="139.671"/> -<polygon fill-opacity="0.4" points="146.12,109.589 174.588,138.059 174.344,142.57 170.041,142.572 141.589,114.119 "/> -<polygon fill="#1A1A1A" points="142.495,114.119 146.12,110.495 173.962,138.336 173.665,141.844 170.337,141.963 "/> -<path fill-opacity="0.4" d="M146.924,114.924c2.247-2.25,5.905-2.248,8.154,0c2.248,2.248,2.248,5.905,0,8.152 c-2.249,2.249-5.906,2.251-8.154,0.002C144.675,120.829,144.675,117.17,146.924,114.924L146.924,114.924z"/> -<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="-3819.5313" y1="-1695.1787" x2="-3819.5313" y2="-1684.7993" gradientTransform="matrix(-0.7071 0.7071 -0.7071 -0.7071 -3744.7813 1624.7996)"> +<path display="none" fill="url(#SVGID_6_)" d="M197.877,88.514c-0.828-7.591-8.313-19.371-22.323-21.788 c-0.021-0.005-0.521-0.112-1.229-0.112c-1.002,0-2.447,0.211-3.664,1.222c-1.422,1.179-2.141,3.122-2.139,5.769 c0.002,3.129-1.732,4.304-3.357,4.359l-0.163,0.006c-0.2,0.008-0.226,0.01-0.474,0.01h-0.287c-3.006,0-6.517,1.5-6.517,5.73v13.96 c0,4.075,2.134,6.319,6.007,6.319h12.055c4.193,0,6.149-2.462,7.318-3.931l0.254-0.317c0.897-1.104,2.586-2.57,6.842-2.57 c2.844,0,4.634-1.333,5.638-2.45C197.326,93.051,198.113,90.672,197.877,88.514z M190.195,96.529c-4.494,0-6.334,1.576-7.336,2.807 c-1.164,1.436-2.896,4.014-7.076,4.014c-4.183,0-7.479,0-12.057,0s-5.365-3.25-5.365-5.681c0-2.429,0-13.96,0-13.96 c0-3.771,3.051-5.091,5.877-5.091c0.639,0,0.479,0.002,0.945-0.015c2.119-0.072,3.979-1.645,3.977-4.998 c-0.006-7.635,6.252-6.255,6.252-6.255c13.789,2.379,21.035,13.987,21.824,21.231C197.609,91.963,195.219,96.529,190.195,96.529z"/> +<polygon fill-opacity="0.4" points="172.523,96.783 127.42,141.884 122.601,142.13 123.136,137.562 168.218,92.478 "/> +<polygon points="168.218,93.554 171.447,96.783 127.087,141.14 123.463,141.325 123.86,137.911 "/> +<polygon fill-opacity="0.4" points="154.207,93.823 188.01,127.628 187.72,132.985 182.611,132.988 148.826,99.202 "/> +<polygon fill="#1A1A1A" points="149.902,99.202 154.207,94.899 187.267,127.958 186.914,132.123 182.962,132.265 "/> +<path fill-opacity="0.4" d="M155.16,100.157c2.668-2.672,7.013-2.669,9.684,0c2.669,2.669,2.669,7.012,0,9.68 c-2.671,2.672-7.014,2.674-9.684,0.002C152.49,107.171,152.49,102.824,155.16,100.157L155.16,100.157z"/> +<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="-4726.458" y1="3070.1074" x2="-4726.458" y2="3057.7832" gradientTransform="matrix(-0.7071 0.7071 0.7071 0.7071 -5348.5923 1280.5605)"> <stop offset="0" style="stop-color:#999999"/> <stop offset="0.31" style="stop-color:#4D4D4D"/> <stop offset="1" style="stop-color:#000000"/> </linearGradient> -<circle fill="url(#SVGID_7_)" cx="151" cy="119" r="5.19"/> -<path fill="#E6E6E6" d="M147.739,115.738c1.798-1.797,4.725-1.799,6.525,0c1.797,1.799,1.797,4.725-0.002,6.524 c-1.798,1.799-4.726,1.799-6.523,0C145.939,120.463,145.941,117.537,147.739,115.738L147.739,115.738z"/> -<rect fill="none" width="302" height="238"/> +<circle fill="url(#SVGID_7_)" cx="160.001" cy="104.998" r="6.162"/> +<path fill="#E6E6E6" d="M156.129,101.124c2.135-2.133,5.609-2.136,7.749,0c2.134,2.136,2.134,5.61-0.003,7.747 c-2.137,2.136-5.612,2.136-7.746,0C153.992,106.734,153.994,103.261,156.129,101.124L156.129,101.124z"/> +</g> +<rect fill="none" width="320" height="210"/> </svg>
--- a/homescreenapp/widgetplugins/hsclockwidgetplugin/src/hsclockwidget.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/widgetplugins/hsclockwidgetplugin/src/hsclockwidget.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -19,6 +19,7 @@ #include <QGraphicsLinearLayout> #include "hsclockwidget.h" +#include "hsclockwidgettimer.h" #include "hsanalogclockwidget.h" #include "hsdigitalclockwidget.h" @@ -56,7 +57,6 @@ : HbWidget(parent, flags), mWidget(0), mLayout(0), - mTimer(0), mClockType(ANALOG), mTimeType(TIME12) { @@ -90,9 +90,7 @@ mLayout = new QGraphicsLinearLayout(Qt::Vertical); mLayout->setContentsMargins(0, 0, 0, 0); mWidget = loadClockWidget(); - mLayout->addItem(mWidget); - mTimer = new QTimer(this); - connect(mTimer, SIGNAL(timeout()), SLOT(updateTime())); + mLayout->addItem(mWidget); setLayout(mLayout); #ifdef Q_OS_SYMBIAN connect(mClockSettingsNotifier, SIGNAL(settingsChanged(QString, QString)), this, SLOT(onSettingsChanged(QString, QString))); @@ -105,7 +103,11 @@ */ void HsClockWidget::onShow() { - mTimer->start(clockUpdateInterval); + HsClockWidgetTimer::instance(); + connect(HsClockWidgetTimer::instance(), + SIGNAL(tick()), + SLOT(updateTime()), + Qt::UniqueConnection); } @@ -114,7 +116,7 @@ */ void HsClockWidget::onHide() { - mTimer->stop(); + HsClockWidgetTimer::instance()->disconnect(this); } /*! @@ -122,7 +124,7 @@ */ void HsClockWidget::onUninitialize() { - mTimer->stop(); + HsClockWidgetTimer::instance()->disconnect(this); } /*!
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/homescreenapp/widgetplugins/hsclockwidgetplugin/src/hsclockwidgettimer.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -0,0 +1,93 @@ +/* +* 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: +* +*/ + +#include <QTimer> +#include "hsclockwidgettimer.h" + +/*! + \class HsClockWidgetTimer + \ingroup group_hsclockwidgetplugin + \brief Common timer for all clock widgets that run in the HS process. +*/ + +/*! + Constructs new timer with the given \a parent. +*/ +HsClockWidgetTimer::HsClockWidgetTimer(QObject *parent) + : QObject(parent), + mTimer(0) +{ + mTimer = new QTimer(this); + mTimer->setInterval(1000); + connect(mTimer, SIGNAL(timeout()), SLOT(onTick())); +} + +/*! + Destructor. +*/ +HsClockWidgetTimer::~HsClockWidgetTimer() +{ + mTimer->stop(); +} + +/*! + Return the static timer instance. +*/ +HsClockWidgetTimer *HsClockWidgetTimer::instance() +{ + if (!mInstance) { + mInstance = new HsClockWidgetTimer; + } + return mInstance; +} + +/*! + \internal +*/ +void HsClockWidgetTimer::connectNotify(const char *signal) +{ + mTimer->start(); + QObject::connectNotify(signal); +} + +/*! + \internal +*/ +void HsClockWidgetTimer::disconnectNotify(const char *signal) +{ + if (receivers(SIGNAL(tick())) == 0) { + mTimer->stop(); + } + QObject::disconnectNotify(signal); +} + +/*! + \internal +*/ +void HsClockWidgetTimer::onTick() +{ + if (0 < receivers(SIGNAL(tick()))) { + emit tick(); + } else { + mTimer->stop(); + } +} + +/*! + Static timer. +*/ +HsClockWidgetTimer *HsClockWidgetTimer::mInstance = 0;
--- a/homescreenapp/widgetplugins/hsshortcutwidgetplugin/src/hsshortcutwidget.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/homescreenapp/widgetplugins/hsshortcutwidgetplugin/src/hsshortcutwidget.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -133,19 +133,19 @@ //application UID for its preference. Entry Id is retrieved //from CA by UID. CaQuery query; - query.setEntryTypeNames(QStringList(applicationTypeName())); + query.setEntryTypeNames(QStringList(Hs::applicationTypeName)); //Convert UID from hex to ten base, because CA t UIDs in ten base. bool ok; int hexBaseInteger = mUid.toInt(&ok, 0); // Qt Assistant: If base is 0, the C language convention is used: // If the string begins with "0x", base 16 is used. QString tenBaseString = QString::number(hexBaseInteger); - query.setAttribute(applicationUidEntryKey(), tenBaseString); + query.setAttribute(Hs::applicationUidEntryKey, tenBaseString); QList< QSharedPointer<CaEntry> > appEntries = CaService::instance()->getEntries(query); //Verify that entry's UID is what we want since we get all application entries //if UID did not match in getEntries() above. if (!appEntries.isEmpty() - && appEntries.first()->attribute(applicationUidEntryKey()) == tenBaseString) { + && appEntries.first()->attribute(Hs::applicationUidEntryKey) == tenBaseString) { caEntry = appEntries.first(); mCaEntryId = caEntry->id(); //Save caEntryId to Homescreen database @@ -260,8 +260,8 @@ mCaEntryTypeName = caEntry.entryTypeName(); mIcon->setIcon(caEntry.makeIcon()); if (mText) { - if(caEntry.attribute(entryShortName()).length()) { - mText->setText(caEntry.attribute(entryShortName())); + if(caEntry.attribute(Hs::entryShortName).length()) { + mText->setText(caEntry.attribute(Hs::entryShortName)); } else { mText->setText(caEntry.text()); }
--- a/screensaver/devicedialogplugins/snsrdevicedialogplugin/inc/screensaverdomaincrkeys.h Fri Aug 13 14:38:12 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,118 +0,0 @@ -/* -* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -#ifndef SCREENSAVERDOMAINCRKEYS_H -#define SCREENSAVERDOMAINCRKEYS_H - -#include <e32cmn.h> - -/** -* Screensaver Settings repository UID. -* -* @publishedPartner -* @released -*/ -const TUid KCRUidScreensaverSettings = {0x2002FFAB}; - - -/* -* Swipe to open -* -* Boolean value for swipe-to-open widget on active mode. -* -* Possible integer values: -* -* 0 = Swipe_to_open not used -* 1 = Swipe_to_open exists on active mode -* -* Default value: 1 -* -* @publishedPartner -* @released -*/ -const unsigned long int KScreensaverSwipeToOpen = 0x00000001; - -/** -* Timeout from active mode to power save mode -* -* Screensaver timeout from active mode to power save mode -* Power save mode is clock display in OLED-devices, blank display in other devices -* -* Possible integer values: -* -* 5 - 60 Seconds -* -* Default value: 30 -* -* @publishedPartner -* @released -*/ -const unsigned long int KScreensaverTimeToPowerSave = 0x00000002; - -/** -* User setting whether screensaver is shown in power save mode -* -* Boolean value for screensaver on/off via control panel. -* Setting is visible only in OLED-devices, i.e. if FF_AVC_DISPLAY_OLED_LOWPOWER_SUPPORT is enabled -* Non-OLED devices have allways blank display in power save mode -* -* Possible integer values: -* -* 0 = Screensaver is off -* 1 = Screensaver is on -* -* Default value: 1 -* -* @publishedPartner -* @released -*/ -const unsigned long int KScreensaverStatus = 0x00000003; - -/** -* Type of display (for legacy reasons, prefer use of FF_AVC_DISPLAY_OLED_LOWPOWER_SUPPORT) -* -* 0 = Regular display type -* 1 = RegularAndOled -* 2 = OLED -* -* -* Default value: 2 -* -* @publishedPartner -* @released -*/ -const unsigned long int KScreensaverDisplayType = 0x00000004; - -/** -* Initial state of the screensaver -* -* 1 = ViewTypeActive -* 2 = ViewTypePowerSave -* -* Initial view type for startup -* -* Default value: 2 -* -* @publishedPartner -* @released -*/ -const unsigned long int KScreensaverStartupView = 0x00000005; - - -#endif // SCREENSAVERDOMAINCRKEYS_H - -// End of File
--- a/screensaver/devicedialogplugins/snsrdevicedialogplugin/snsrdevicedialogplugin_exports_to_rom.pri Fri Aug 13 14:38:12 2010 +0300 +++ b/screensaver/devicedialogplugins/snsrdevicedialogplugin/snsrdevicedialogplugin_exports_to_rom.pri Wed Aug 18 10:33:57 2010 +0300 @@ -1,5 +1,5 @@ # -# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (c) 2009 - 2010 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available # under the terms of "Eclipse Public License v1.0" @@ -17,5 +17,4 @@ BLD_INF_RULES.prj_exports += \ "$${LITERAL_HASH}include <platform_paths.hrh>" \ "conf/screensaver.confml APP_LAYER_CONFML(screensaver.confml)" \ - "conf/screensaver_2002FFAB.crml APP_LAYER_CRML(screensaver_2002FFAB.crml)" \ - "inc/screensaverdomaincrkeys.h APP_LAYER_PLATFORM_EXPORT_PATH(screensaverdomaincrkeys.h)" \ No newline at end of file + "conf/screensaver_2002FFAB.crml APP_LAYER_CRML(screensaver_2002FFAB.crml)" \ No newline at end of file
--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/src/snsrindicatormodel.cpp Fri Aug 13 14:38:12 2010 +0300 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/src/snsrindicatormodel.cpp Wed Aug 18 10:33:57 2010 +0300 @@ -17,8 +17,8 @@ #include <xqsettingsmanager.h> #include <xqsettingskey.h> -#include <settingsinternalcrkeys.h> - +#include <coreapplicationuissdkcrkeys.h> +//#include <settingsinternalcrkeys.h> //TODO? these don't work in wk30.. #include "snsrindicatormodel.h" #include "snsrindicatorinfo.h" @@ -178,8 +178,9 @@ { bool previousState(mOfflineStateOn); switch ( key.key() ) { - case KSettingsAirplaneMode: - if( value.toInt() == 1) + case KCoreAppUIsNetworkConnectionAllowed: + if(value.toInt() == ECoreAppUIsNetworkConnectionNotAllowed && + value.isValid()) { mOfflineStateOn = true; } @@ -407,8 +408,10 @@ //connect to offlineValueChanged slot so we get information if the value is changed while screensaver is on connect(mSettingsManager, SIGNAL(valueChanged(XQSettingsKey, QVariant)), this, SLOT(offlineValueChanged( const XQSettingsKey, const QVariant))); - mOfflineKey = new XQSettingsKey(XQSettingsKey::TargetCentralRepository, KCRUidCommunicationSettings.iUid, KSettingsAirplaneMode); - if(mSettingsManager->readItemValue(*mOfflineKey).toInt() == 1) + mOfflineKey = new XQSettingsKey(XQSettingsKey::TargetCentralRepository, + KCRUidCoreApplicationUIs.iUid, + KCoreAppUIsNetworkConnectionAllowed); + if(mSettingsManager->readItemValue(*mOfflineKey).toInt() == ECoreAppUIsNetworkConnectionNotAllowed) { mOfflineStateOn = true; } @@ -420,7 +423,7 @@ */ void SnsrIndicatorModel::getCurrentOfflineState() { - if(mSettingsManager->readItemValue(*mOfflineKey).toInt() == 1) { + if(mSettingsManager->readItemValue(*mOfflineKey).toInt() == ECoreAppUIsNetworkConnectionNotAllowed) { mOfflineStateOn = true; } else {
