Battery info

+ + + + + diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaverplugin.s60xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaverplugin.s60xml Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,12 @@ + + + snsrbigclockscreensaverplugin + z:/snsrresources/plugins/screensaverplugins/snsrbigclockscreensaverplugin.qtplugin + ScreenSaver Big Clock Plugin + + com.nokia.screensaver.ISnsrBigClockScreensaver + 1.0 + Default implementation for screensaver big clock + + + diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaverplugin.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaverplugin.xml Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,12 @@ + + + snsrbigclockscreensaverplugin + snsrresources/plugins/screensaverplugins/snsrbigclockscreensaverplugin + ScreenSaver Big Clock Plugin + + com.nokia.screensaver.ISnsrBigClockScreensaver + 1.0 + Default implementation for screensaver big clock + + + diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrbigclockscreensaver.qrc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrbigclockscreensaver.qrc Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,21 @@ + + + resource/snsrbigclockscreensaverdigital.docml + resource/snsrbigclockscreensaveranalog.docml + resource/snsrbigclockscreensaveroledanalog.docml + resource/snsrbigclockscreensaveroleddigital.docml + snsrswipewidget/resource/animate_portrait.fxml + + + snsrclockwidgets/resource/snsroledclockwidget.css + snsrclockwidgets/resource/snsroledclockwidget.widgetml + snsrclockwidgets/resource/snsranalogclockwidget.css + snsrclockwidgets/resource/snsranalogclockwidget.widgetml + snsrindicatorwidget/resource/snsrindicatorwidget.css + snsrindicatorwidget/resource/snsrindicatorwidget.widgetml + snsrindicatorwidget/resource/snsrindicatorwidget_color.css + snsrswipewidget/resource/snsrswipewidget.css + snsrswipewidget/resource/snsrswipewidget.widgetml + snsrswipewidget/resource/snsrswipewidget_color.css + + diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrbigclockscreensaverplugin.pri --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrbigclockscreensaverplugin.pri Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,34 @@ +# +# 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" +# 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: snsrbigclockscreensaverplugin.pri +# + +HEADERS += ./inc/*.h \ + ./snsrclockwidgets/inc/*.h \ + ./snsrindicatorwidget/inc/*.h \ + ./snsrswipewidget/inc/*.h + +SOURCES += ./src/*.cpp \ + ./snsrclockwidgets/src/*.cpp \ + ./snsrindicatorwidget/src/*.cpp \ + ./snsrswipewidget/src/*.cpp + +DEPENDPATH += ./inc \ + ./src \ + ./resource + +INCLUDEPATH += ./inc \ + ./snsrclockwidgets/inc \ + ./snsrindicatorwidget/inc \ + ./snsrswipewidget/inc diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrbigclockscreensaverplugin.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrbigclockscreensaverplugin.pro Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,44 @@ +# +# 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" +# 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: snsrbigclockscreensaverplugin.pro +# + +TEMPLATE = lib +CONFIG += plugin hb mobility + +MOBILITY = serviceframework +MOBILITY += systeminfo + +PLUGIN_SUBDIR = /snsrresources/plugins/screensaverplugins + +#TRANSLATIONS = snsrbigclockscreensaverplugin.ts + +include (../../common.pri) + +LIBS += -lscreensavermodel \ + -lsnsrutils \ + -lxqsettingsmanager + +INCLUDEPATH += ../../snsrutils/inc + +symbian: { + TARGET.UID3 = 0x20027052 +} + +include(snsrbigclockscreensaverplugin.pri) + +RESOURCES = snsrbigclockscreensaver.qrc + +exportResources(./snsrbigclockscreensaverplugin.qm, resource/qt/translations) + diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrbigclockscreensaverplugin.qm Binary file screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrbigclockscreensaverplugin.qm has changed diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrbigclockscreensaverplugin.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrbigclockscreensaverplugin.ts Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,16 @@ + + + + + + Swipe in screensaver + Swipe to unlock + Swipe to unlock + + screensaver_001 + + sc + False + + + diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/inc/snsranalogclockwidget.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/inc/snsranalogclockwidget.h Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,60 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Analog Clock Widget. +* +*/ + +#ifndef SNSRANALOGCLOCKWIDGET_H +#define SNSRANALOGCLOCKWIDGET_H + +#include +#include "snsrtest_global.h" + +SCREENSAVER_TEST_CLASS(T_SnsrClockWidgets) + +class HbIconItem; + +class SnsrAnalogClockWidget: public HbWidget +{ + Q_OBJECT + +public: + + explicit SnsrAnalogClockWidget(QGraphicsItem *parent = 0); + virtual ~SnsrAnalogClockWidget(); + +public slots: + + void tick(); + +private: + + void resizeEvent (QGraphicsSceneResizeEvent *event); + void createPrimitives(); + void updatePrimitives(); + void polish( HbStyleParameters& params ); + +private: + + HbIconItem *mClockBackground; + HbIconItem *mClockHourHand; + HbIconItem *mClockMinuteHand; + HbIconItem *mClockSecondHand; + + Q_DISABLE_COPY(SnsrAnalogClockWidget) + SCREENSAVER_TEST_FRIEND_CLASS(T_SnsrClockWidgets) + +}; + +#endif // SNSRANALOGCLOCKWIDGET_H diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/inc/snsroledclockwidget.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/inc/snsroledclockwidget.h Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,64 @@ +/* +* 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: Oled Clock Widget. +* +*/ + +#ifndef SNSROLEDCLOCKWIDGET_H +#define SNSROLEDCLOCKWIDGET_H + +#include +#include "snsrtest_global.h" + +SCREENSAVER_TEST_CLASS(T_SnsrClockWidgets) + +class HbIconItem; +class HbTextItem; +//class SnsrLabel; + +class SnsrOledClockWidget: public HbWidget +{ + Q_OBJECT + +public: + + explicit SnsrOledClockWidget(QGraphicsItem *parent = 0); + virtual ~SnsrOledClockWidget(); + +public slots: + + void tick(); + +private: + + void resizeEvent (QGraphicsSceneResizeEvent *event); + void createPrimitives(); + void updatePrimitives(); + void polish( HbStyleParameters& params ); + +private: + + HbIconItem *mClockBackground; + HbIconItem *mClockHourHand; + HbIconItem *mClockMinuteHand; + // TODO: not known yet what label (or any) is shown in clock face (day or am/pm or none) + //HbIconItem *mClockDateFrame; + //SnsrLabel *mClockDateLabel; + + Q_DISABLE_COPY(SnsrOledClockWidget) + SCREENSAVER_TEST_FRIEND_CLASS(T_SnsrClockWidgets) + +}; + +#endif // SNSROLEDCLOCKWIDGET_H diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/resource/snsranalogclockwidget.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/resource/snsranalogclockwidget.css Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,32 @@ +HbWidget { + margin-left: 0un; + margin-top: 0un; +} + +SnsrAnalogClockWidget { + layout: layout_1; +} + +SnsrAnalogClockWidget::analog_clock_background { + pref-width: 32.8un; + pref-height: 32.8un; + zvalue: 0; +} + +SnsrAnalogClockWidget::analog_clock_hour_hand { + pref-height: 32.8un; + pref-width: 32.8un; + zvalue: 3; +} + +SnsrAnalogClockWidget::analog_clock_minute_hand { + pref-height: 32.8un; + pref-width: 32.8un; + zvalue: 2; +} + +SnsrAnalogClockWidget::analog_clock_second_hand { + pref-height: 32.8un; + pref-width: 32.8un; + zvalue: 1; +} \ No newline at end of file diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/resource/snsranalogclockwidget.widgetml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/resource/snsranalogclockwidget.widgetml Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/resource/snsroledclockwidget.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/resource/snsroledclockwidget.css Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,26 @@ +HbWidget { + margin-left: 0un; + margin-top: 0un; +} + +SnsrOledClockWidget { + layout: layout_1; +} + +SnsrOledClockWidget::oled_clock_background { + pref-height: 32.8un; + pref-width: 32.8un; + zvalue: 0; +} + +SnsrOledClockWidget::oled_clock_hour_hand { + pref-height: 32.8un; + pref-width: 32.8un; + zvalue: 4; +} + +SnsrOledClockWidget::oled_clock_minute_hand { + pref-height: 32.8un; + pref-width: 32.8un; + zvalue: 3; +} diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/resource/snsroledclockwidget.widgetml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/resource/snsroledclockwidget.widgetml Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,10 @@ + + + + + + + + + + diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/src/snsranalogclockwidget.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/src/snsranalogclockwidget.cpp Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,139 @@ +/* +* 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: Analog Clock Widget. +* +*/ + +#include "snsranalogclockwidget.h" + +#include +#include +#include + +#include +#include + + +const char *gClockCssFilePath =":/style/snsranalogclockwidget.css"; +const char *gClockWidgetMLFilePath = ":/style/snsranalogclockwidget.widgetml"; + +/*! + \class SnsrAnalogClockWidget + \ingroup group_snsrbigclockscreensaverprovider + \brief Screensaver analog clock widget. + */ + +/*! + Constructs a new SnsrAnalogClockWidget. + \param parent Parent object. + */ +SnsrAnalogClockWidget::SnsrAnalogClockWidget(QGraphicsItem* parent): + HbWidget(parent), + mClockBackground(0), mClockHourHand(0), + mClockMinuteHand(0), mClockSecondHand(0) +{ + HbStyleLoader::registerFilePath(gClockCssFilePath); + HbStyleLoader::registerFilePath(gClockWidgetMLFilePath); + + createPrimitives(); + updatePrimitives(); +} + +/*! + Destructs the class. + */ +SnsrAnalogClockWidget::~SnsrAnalogClockWidget() +{ + HbStyleLoader::unregisterFilePath( gClockCssFilePath ); + HbStyleLoader::unregisterFilePath( gClockWidgetMLFilePath ); + +} + +void SnsrAnalogClockWidget::polish( HbStyleParameters& params ) +{ + // TODO: updatePrimitives might not be needed to be called from here anymore (hb changes)? + HbWidget::polish(params); + updatePrimitives(); +} + +/*! + @copydoc HbWidget::resizeEvent() + */ +void SnsrAnalogClockWidget::resizeEvent(QGraphicsSceneResizeEvent *event) +{ + HbWidget::resizeEvent(event); + updatePrimitives(); +} + +/*! + Creates all widget primitives. + */ +void SnsrAnalogClockWidget::createPrimitives() +{ + // TODO: when final graphics are available in platform (qtg_graf_screensaver_clock_xxx) + // use them instead. Also am/pm label should be added into the clock face. + if (!mClockBackground) { + mClockBackground = new HbIconItem(QLatin1String("qtg_graf_clock_day_bg"), this); + HbStyle::setItemName(mClockBackground, QLatin1String("analog_clock_background")); + } + if (!mClockHourHand) { + mClockHourHand = new HbIconItem(QLatin1String("qtg_graf_clock_day_hour"), this); + HbStyle::setItemName(mClockHourHand, QLatin1String("analog_clock_hour_hand")); + } + if (!mClockMinuteHand) { + mClockMinuteHand = new HbIconItem(QLatin1String("qtg_graf_clock_day_min"), this); + HbStyle::setItemName(mClockMinuteHand, QLatin1String("analog_clock_minute_hand")); + } + if (!mClockSecondHand) { + mClockSecondHand = new HbIconItem(QLatin1String("qtg_graf_clock_day_sec"), this); + HbStyle::setItemName(mClockSecondHand, QLatin1String("analog_clock_second_hand")); + } +} + +/*! + @copydoc HbWidget::updatePrimitives() + */ +void SnsrAnalogClockWidget::updatePrimitives() +{ + if (!mClockHourHand || !mClockMinuteHand || !mClockSecondHand) { + createPrimitives(); + } + + // Calculate angles for clock hands. + QTime time = QTime::currentTime(); + qreal s = 6 * time.second(); + qreal m = 6 * (time.minute() + s/360); + qreal h = 30 * ((time.hour() % 12) + m/360); + + int x = mClockHourHand->preferredSize().width()/2; + int y = mClockHourHand->preferredSize().height()/2; + mClockHourHand->setTransform(QTransform().translate(x, y).rotate(h).translate(-x, -y)); + + x = mClockMinuteHand->preferredSize().width()/2; + y = mClockMinuteHand->preferredSize().height()/2; + mClockMinuteHand->setTransform(QTransform().translate(x, y).rotate(m).translate(-x, -y)); + + x = mClockSecondHand->preferredSize().width()/2; + y = mClockSecondHand->preferredSize().height()/2; + mClockSecondHand->setTransform(QTransform().translate(x, y).rotate(s).translate(-x, -y)); + +} + +/*! + Updates primitives when time change. + */ +void SnsrAnalogClockWidget::tick() +{ + updatePrimitives(); +} diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/src/snsroledclockwidget.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/src/snsroledclockwidget.cpp Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,157 @@ +/* +* 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: Oled Clock Widget. +* +*/ + +#include "snsroledclockwidget.h" +#include "snsrlabel.h" + +#include +#include +#include +#include + +#include +#include +#include + + +const char *gOledClockCssFilePath = ":/style/snsroledclockwidget.css"; +const char *gOledClockWidgetMLFilePath = ":/style/snsroledclockwidget.widgetml"; +const char *gDateFormatStr = "ddd d"; // this is Qt format string, not Hb format like the others + +/*! + \class SnsrOledClockWidget + \ingroup group_snsrbigclockscreensaverprovider + \brief Screensaver oled clock widget. + */ + +/*! + Constructs a new SnsrOledClockWidget. + \param parent Parent object. + */ +SnsrOledClockWidget::SnsrOledClockWidget(QGraphicsItem* parent): + HbWidget(parent), + mClockBackground(0), mClockHourHand(0), mClockMinuteHand(0) + //,mClockDateFrame(0), mClockDateLabel(0) +{ + HbStyleLoader::registerFilePath(gOledClockCssFilePath); + HbStyleLoader::registerFilePath(gOledClockWidgetMLFilePath); + + createPrimitives(); + updatePrimitives(); +} + +void SnsrOledClockWidget::polish( HbStyleParameters& params ) +{ + // TODO: updatePrimitives might not be needed to be called from here anymore (hb changes)? + HbWidget::polish(params); + updatePrimitives(); +} + +/*! + Destructs the class. + */ +SnsrOledClockWidget::~SnsrOledClockWidget() +{ + // TODO: deleted by parent? + /* delete mClockBackground; + delete mClockHourHand; + delete mClockMinuteHand; + delete mClockDateFrame; + delete mClockDateLabel;*/ + + HbStyleLoader::unregisterFilePath( gOledClockCssFilePath ); + HbStyleLoader::unregisterFilePath( gOledClockWidgetMLFilePath ); + +} + +/*! + @copydoc HbWidget::resizeEvent() + */ +void SnsrOledClockWidget::resizeEvent(QGraphicsSceneResizeEvent *event) +{ + HbWidget::resizeEvent(event); + updatePrimitives(); +} + +/*! + Creates all widget primitives. + */ +void SnsrOledClockWidget::createPrimitives() +{ + // TODO: final graphics will be named qtg_graf_screensaver_clock_oled_xxx. + // not available in platform yet + // Also am/pm label should be added into the clock face and date label + // be removed (=replace date with am/pm) ? + + if (!mClockBackground) { + mClockBackground = new HbIconItem(QLatin1String("qtg_graf_clock_night_bg"), this); + HbStyle::setItemName(mClockBackground, QLatin1String("oled_clock_background")); + } + if (!mClockHourHand) { + mClockHourHand = new HbIconItem(QLatin1String("qtg_graf_clock_night_hour"), this); + HbStyle::setItemName(mClockHourHand, QLatin1String("oled_clock_hour_hand")); + } + if (!mClockMinuteHand) { + mClockMinuteHand = new HbIconItem(QLatin1String("qtg_graf_clock_night_min"), this); + HbStyle::setItemName(mClockMinuteHand, QLatin1String("oled_clock_minute_hand")); + } + /* + if (!mClockDateFrame) { + mClockDateFrame = new HbIconItem(QLatin1String("oled-clock-date-frame"), this); + HbStyle::setItemName(mClockDateFrame, QLatin1String("oled_clock_date_frame")); + } + if (!mClockDateLabel) { + mClockDateLabel = new SnsrLabel(this); + HbStyle::setItemName(mClockDateLabel, QLatin1String("oled_clock_date_label")); + }*/ +} + +/*! + @copydoc HbWidget::updatePrimitives() + */ +void SnsrOledClockWidget::updatePrimitives() +{ + if (!mClockHourHand || !mClockMinuteHand /*|| !mClockDateLabel*/) { + createPrimitives(); + } + Q_ASSERT( mClockHourHand && mClockMinuteHand /*&& mClockDateLabel */); + + // Calculate angles for clock hands. + QTime time = QTime::currentTime(); + qreal s = 6 * time.second(); + qreal m = 6 * (time.minute() + s/360); + qreal h = 30 * ((time.hour() % 12) + m/360); + + int x = mClockHourHand->preferredSize().width()/2; + int y = mClockHourHand->preferredSize().height()/2; + mClockHourHand->setTransform(QTransform().translate(x, y).rotate(h).translate(-x, -y)); + + x = mClockMinuteHand->preferredSize().width()/2; + y = mClockMinuteHand->preferredSize().height()/2; + mClockMinuteHand->setTransform(QTransform().translate(x, y).rotate(m).translate(-x, -y)); + + // QString dateString = QLocale().toString(QDate::currentDate(), gDateFormatStr); + // mClockDateLabel->setPlainText(dateString); +} + +/*! + Updates primitives when time change. + */ +void SnsrOledClockWidget::tick() +{ + updatePrimitives(); +} diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/inc/snsrindicatorinfo.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/inc/snsrindicatorinfo.h Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,64 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Indicator information. +* +*/ + +#ifndef SNSRINDICATORINFO_H +#define SNSRINDICATORINFO_H + +// INCLUDES +#include +#include + +/*! + \class SnsrIndicatorInfo + \ingroup group_snsrbigclockscreensaverplugin + \brief Data structure used within big clock to handle indicator data. + */ + +struct SnsrIndicatorInfo { + + inline SnsrIndicatorInfo() : + type(QString()), + iconPath(QString()), + category(HbIndicatorInterface::NotificationCategory) {} + + inline SnsrIndicatorInfo(const QString &type, + const QString &iconPath, + HbIndicatorInterface::Category category) : + type(type), + iconPath(iconPath), + category(category){} + + inline SnsrIndicatorInfo(const SnsrIndicatorInfo ©Source) : + type(copySource.type), + iconPath(copySource.iconPath), + category(copySource.category){} + + inline bool isIconPathEmpty() const { + return !iconPath.isEmpty(); + } + + // Indicator type string that is defined by the indicator provider + QString type; + // Should be fetched by using HbIndicatorInterface::MonoDecorationNameRole + QString iconPath; + HbIndicatorInterface::Category category; + +}; + +#endif // SNSRINDICATORINFO_H + +// End of File diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/inc/snsrindicatormodel.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/inc/snsrindicatormodel.h Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,98 @@ +/* +* 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: Model for handling indicator data. +* +*/ + +#ifndef SNSRINDICATORMODEL_H +#define SNSRINDICATORMODEL_H + +#include +#include +#include "snsrindicatorinfo.h" +#include "snsrtest_global.h" + +SCREENSAVER_TEST_CLASS(T_SnsrIndicatorWidget) + +class HbIndicatorInterface; + +class SnsrIndicatorModel : public QObject +{ + Q_OBJECT + +public: + + SnsrIndicatorModel(QObject *parent = 0); + virtual ~SnsrIndicatorModel(); + +public slots: + + void handleActiveIndicators(const QList &activeIndicators); + void handleActivatedIndicator(HbIndicatorInterface *activatedIndicator); + void handleDeactivatedIndicator(HbIndicatorInterface *deactivatedIndicator); + + void initializeIndicatorWidget(); + + /* + * Provides notification of changes in online/offline mode + */ + void offlineValueChanged( const XQSettingsKey &key, const QVariant &value); + +signals: + + void indicatorsUpdated(const QList &activeIndicators); + void allIndicatorsDeactivated(); + +private: + + void addIndicator(const SnsrIndicatorInfo &indicatorInfo); + + bool findAndRemoveIndicator(const SnsrIndicatorInfo &indicatorInfo); + + bool showIndicatorInScreensaver(const HbIndicatorInterface &indicatorInterface, + SnsrIndicatorInfo &indicatorInfo); + + bool anyActiveIndicators() const; + + void emitChangeSignal(); + void updateIndicatorsToShowList(); + + void initializeOfflineModeIndication(); + void getCurrentOfflineState(); + +private: + + bool mOfflineStateOn; + SnsrIndicatorInfo mOfflineIndicatorInfo; + XQSettingsKey *mOfflineKey; + XQSettingsManager *mSettingsManager; + + // Save universal indicator statuses into these 2 lists. + // Active notification indicators in reversed chronological order: + // the first item is the most recent. + QList mNotificationIndicators; + // Screensaver should show only silent indicator from this category. + QList mSettingIndicators; + + // This is a combined ordered list of all indicators that should + // be shown in UI: offline + notification indicators + + // settings indicators + QList mIndicatorsToShow; + + Q_DISABLE_COPY(SnsrIndicatorModel) + SCREENSAVER_TEST_FRIEND_CLASS(T_SnsrIndicatorWidget) +}; + +#endif // SNSRINDICATORMODEL_H + diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/inc/snsrindicatorwidget.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/inc/snsrindicatorwidget.h Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,72 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Indicator Widget. +* +*/ + +#ifndef SNSRINDICATORWIDGET_H +#define SNSRINDICATORWIDGET_H + +#include +#include "snsrtest_global.h" + +SCREENSAVER_TEST_CLASS(T_SnsrIndicatorWidget) + +class HbIconItem; +class SnsrIndicatorInfo; + + +class SnsrIndicatorWidget: public HbWidget +{ + Q_OBJECT + + Q_ENUMS(IndicatorLayoutType) + Q_PROPERTY(IndicatorLayoutType layoutType READ layoutType WRITE setLayoutType) + +public: + + enum IndicatorLayoutType + { + IndicatorsAlignedLeft, + IndicatorsCentered + }; + +public: + + explicit SnsrIndicatorWidget(QGraphicsItem *parent = 0); + virtual ~SnsrIndicatorWidget(); + + IndicatorLayoutType layoutType() const; + void setLayoutType(IndicatorLayoutType type); + +public slots: + + void showIndicators(const QList &indicators); + void removeAllIndicators(); + +private: + + virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const; + void createPrimitives(); + +private: + + QList mIcons; + IndicatorLayoutType mLayoutType; + + Q_DISABLE_COPY(SnsrIndicatorWidget) + SCREENSAVER_TEST_FRIEND_CLASS(T_SnsrIndicatorWidget) +}; + +#endif // SNSRINDICATORWIDGET_H diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/resource/snsrindicatorwidget.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/resource/snsrindicatorwidget.css Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,33 @@ +SnsrIndicatorWidget { + layout: indicatorlayout; +} + +SnsrIndicatorWidget::icon1 { + fixed-width: 2.5un; + fixed-height: 2.5un; +} + +SnsrIndicatorWidget::icon2 { + fixed-width: 2.5un; + fixed-height: 2.5un; +} + +SnsrIndicatorWidget::icon3 { + fixed-width: 2.5un; + fixed-height: 2.5un; +} + +SnsrIndicatorWidget::icon4 { + fixed-width: 2.5un; + fixed-height: 2.5un; +} + +SnsrIndicatorWidget::icon5 { + fixed-width: 2.5un; + fixed-height: 2.5un; +} + +SnsrIndicatorWidget::icon6 { + fixed-width: 2.5un; + fixed-height: 2.5un; +} \ No newline at end of file diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/resource/snsrindicatorwidget.widgetml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/resource/snsrindicatorwidget.widgetml Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/resource/snsrindicatorwidget_color.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/resource/snsrindicatorwidget_color.css Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,29 @@ +SnsrIndicatorWidget::icon1 +{ + color:var(snsrforeground); +} + +SnsrIndicatorWidget::icon2 +{ + color:var(snsrforeground); +} + +SnsrIndicatorWidget::icon3 +{ + color:var(snsrforeground); +} + +SnsrIndicatorWidget::icon4 +{ + color:var(snsrforeground); +} + +SnsrIndicatorWidget::icon5 +{ + color:var(qtc_snsr_foreground); +} + +SnsrIndicatorWidget::icon6 +{ + color:var(qtc_snsr_foreground); +} \ No newline at end of file diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/src/snsrindicatormodel.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/src/snsrindicatormodel.cpp Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,357 @@ +/* +* 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: Model for handling indicator data. +* +*/ + +#include +#include +#include + + +#include "snsrindicatormodel.h" +#include "snsrindicatorinfo.h" + +/*! + \class SnsrIndicatorModel + \ingroup group_snsrbigclockscreensaverplugin + \brief Model for handling indicator data. + */ + +// TODO: what is the type string of silent indicator? couldn't +// find it in wk22 -> workaround solution: assume that it contains +// substring "silent" +const char *gSilentIndicatorTypeString = "silent"; +const char *gOfflineIndicatorTypeString = "offline"; + + +/*! + Constructs a new SnsrIndicatorModel + \param parent Parent object. + */ +SnsrIndicatorModel::SnsrIndicatorModel(QObject *parent): QObject(parent), + mOfflineStateOn(false) +{ + initializeOfflineModeIndication(); +} + +/*! + Destructs the class. + */ +SnsrIndicatorModel::~SnsrIndicatorModel() +{ + mNotificationIndicators.clear(); + mSettingIndicators.clear(); + mIndicatorsToShow.clear(); + delete mSettingsManager; + delete mOfflineKey; +} + +/*! + If there are already some active indicators when screensaver is + launched, then this method is called. + Indicators that are gonna be shown by the screensaver are + added to the model. + \param activeIndicators Active universal indicators in + chronological order according to their arrival time. + */ +void SnsrIndicatorModel::handleActiveIndicators( + const QList &activeIndicators) +{ + mNotificationIndicators.clear(); + mSettingIndicators.clear(); + + bool addedAny(false); + + for (int i = 0; i < activeIndicators.size(); ++i) { + HbIndicatorInterface* activatedIndicator = activeIndicators.at(i); + SnsrIndicatorInfo indicatorInfo; + if (activatedIndicator + && showIndicatorInScreensaver(*activatedIndicator,indicatorInfo)) { + addIndicator(indicatorInfo); + addedAny = true; + } + } + + // Send signal only once if there were any such indicators that + // screensaver is supposed to show (=added to the model). + if (addedAny) { + emitChangeSignal(); + } + + // TODO: no we need to listen to update signals? + // used for changing icon? + /* //connect indicator's update signal + QObject::connect(activatedIndicator, SIGNAL(dataChanged()), + this, SLOT(indicatorUpdated()));*/ +} + +/*! + Called when some universal indicator gets activated. + \param activatedIndicator Activated universal indicator + */ +void SnsrIndicatorModel::handleActivatedIndicator( + HbIndicatorInterface *activatedIndicator) +{ + SnsrIndicatorInfo indicatorInfo; + if (activatedIndicator + && showIndicatorInScreensaver(*activatedIndicator,indicatorInfo)) { + addIndicator(indicatorInfo); + emitChangeSignal(); + } +} + +/*! + Called when some universal indicator gets deactivated. + \param deactivatedIndicator Deactivated universal indicator + */ +void SnsrIndicatorModel::handleDeactivatedIndicator( + HbIndicatorInterface *deactivatedIndicator) +{ + if (deactivatedIndicator) { + SnsrIndicatorInfo indicatorInfo( + deactivatedIndicator->indicatorType(), + deactivatedIndicator->indicatorData(HbIndicatorInterface::MonoDecorationNameRole).toString(), + deactivatedIndicator->category()); + + if (findAndRemoveIndicator(indicatorInfo)) { + emitChangeSignal(); + } + } +} + +/*! + Sends a signal with a list of all currently active indicators. + No signal is sent if there are no active indicators currently. + */ +void SnsrIndicatorModel::initializeIndicatorWidget() +{ + getCurrentOfflineState(); // update status to be on the safe side + + if ( anyActiveIndicators() ) { + emitChangeSignal(); + } +} + +/*! + listens airplane repository key. Not sure if the state can even be changed at the moment. + TODO: do we really need this? + */ +void SnsrIndicatorModel::offlineValueChanged( const XQSettingsKey &key, const QVariant &value ) +{ + bool previousState(mOfflineStateOn); + switch ( key.key() ) { + case KSettingsAirplaneMode: + if( value.toInt() == 1) + { + mOfflineStateOn = true; + } + else + { + mOfflineStateOn = false; + } + if (previousState != mOfflineStateOn) { + emitChangeSignal(); + } + break; + default: + break; + + } +} + +/*! + Add the indicator into this model. Handle here the order in which + indicators are shown in screensaver: notification indicators should be + shown in the same order as shown in statusbar, that is in reversed + chronological order. Silent indicator should always be the right-most. + */ +void SnsrIndicatorModel::addIndicator(const SnsrIndicatorInfo &indicatorInfo) +{ + // info from pattern library - todo: remove + //Indicators are displayed inside of each group in reversed chronological order + // according to the arrival time; the indicator that appeared most recently is placed on top of the group. + + //Status bar indicators follow the same order; the most recent notification indicator (4) is on the left + // and similarly the most recent settings indicator (5) is on the right. + + // use prepend to keep the list in reversed chronological order + if (indicatorInfo.category == HbIndicatorInterface::NotificationCategory) { + mNotificationIndicators.prepend(indicatorInfo); + } + else { + mSettingIndicators.append(indicatorInfo); + } +} + +/*! + Remove indicator if it can be found. + /retval true if the indicator was removed + */ +bool SnsrIndicatorModel::findAndRemoveIndicator(const SnsrIndicatorInfo &indicatorInfo) +{ + bool removed(false); + int index(-1); + QList &indicatorList = + indicatorInfo.category == HbIndicatorInterface::NotificationCategory + ? mNotificationIndicators : mSettingIndicators; + + for (int i = 0; i < indicatorList.size(); ++i) { + if (indicatorList.at(i).type == indicatorInfo.type) { + index = i; + break; + } + } + if (index >= 0) { + indicatorList.removeAt(index); + removed = true; + } + return removed; +} + +/*! + Check whether to show the indicator in screensaver or not. + Icon path is asked with HbIndicatorInterface::MonoDecorationNameRole + which refers to the indicator icons shown also in the statusbar: + only 4 Notification indicators has premission to publish data with + that role. As those 4 are the ones wanted also by screensaver, no + extra checks are needed. + From the Setting category one should show only Silent indicator. + No indicators are shown from the Progress category. + If indicator should be shown by screensaver, indicator info is + packaged and returned within the parameter. + + /retval true if the indicator should be shown in screensaver + */ +bool SnsrIndicatorModel::showIndicatorInScreensaver( + const HbIndicatorInterface &indicatorInterface, SnsrIndicatorInfo &indicatorInfo) +{ + bool show(false); + // all indicators shown by screensaver must have valid status bar icon path + QString iconPath = + indicatorInterface.indicatorData(HbIndicatorInterface::MonoDecorationNameRole).toString(); + QString typeString = indicatorInterface.indicatorType(); + HbIndicatorInterface::Category category = indicatorInterface.category(); + + if (category == HbIndicatorInterface::NotificationCategory + && !iconPath.isEmpty()) { + // only 4 indicators of this category has permission to publish status bar + // icon path->we should show all of them->no additional checks are neeeded. + show = true; + } + else if (category == HbIndicatorInterface::SettingCategory + && !iconPath.isEmpty() + // TODO: what is the type string of silent indicator? couldn't + // find it in wk22 -> workaround solution: assume that it contains + // substring "silent" + // && type == gSilentIndicatorTypeString ) { + && typeString.contains(gSilentIndicatorTypeString, Qt::CaseInsensitive)) { + show = true; + } + else { // e.g. no Progress category indicators are shown + show = false; + } + + // package indicator data into indicatorInfo parameter + indicatorInfo.type = typeString; + indicatorInfo.iconPath = iconPath; + indicatorInfo.category = category; + + return show; +} + +/*! + Check whether there is any active indicator currently. + /retval true if there is at least one indicator to show + */ +bool SnsrIndicatorModel::anyActiveIndicators() const +{ + bool any(false); + if ( mNotificationIndicators.size() != 0 + || mSettingIndicators.size() != 0 + || mOfflineStateOn ) { + any = true; + } + return any; +} + +/*! + Send appropriate signal so that UI widget can update itself. + */ +void SnsrIndicatorModel::emitChangeSignal() +{ + if (anyActiveIndicators()) { + updateIndicatorsToShowList(); + emit indicatorsUpdated(mIndicatorsToShow); + } + else { + mIndicatorsToShow.clear(); + emit allIndicatorsDeactivated(); + } +} + +/*! + Updates the list that contains all the indicators that + should be shown in UI. List should contain active indicators + in this order: + offline + notification indicators + settings indicators. + This is the list that will be sent to the widget. + */ +void SnsrIndicatorModel::updateIndicatorsToShowList() +{ + mIndicatorsToShow.clear(); + + if (mOfflineStateOn) { + mIndicatorsToShow.append(mOfflineIndicatorInfo); + } + mIndicatorsToShow.append(mNotificationIndicators); + mIndicatorsToShow.append(mSettingIndicators); +} + +/*! + * Reads the airplanemode repository value and starts monitoring it. + * if the value is 1, offline indicator is shown. + */ +void SnsrIndicatorModel::initializeOfflineModeIndication() +{ + mOfflineIndicatorInfo = SnsrIndicatorInfo( + gOfflineIndicatorTypeString, + QLatin1String("qtg_mono_offline"), + HbIndicatorInterface::NotificationCategory); + + mSettingsManager = new XQSettingsManager(this); + //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) + { + mOfflineStateOn = true; + } + mSettingsManager->startMonitoring(*mOfflineKey); +} + +/*! + Get current offline status. + */ +void SnsrIndicatorModel::getCurrentOfflineState() +{ + if(mSettingsManager->readItemValue(*mOfflineKey).toInt() == 1) { + mOfflineStateOn = true; + } + else { + mOfflineStateOn = false; + } +} + diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/src/snsrindicatorwidget.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/src/snsrindicatorwidget.cpp Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,215 @@ +/* +* 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: Indicator Widget. +* +*/ + +#include "snsrindicatorwidget.h" +#include "snsrindicatorinfo.h" + +#include +#include +#include +#include +#include +#include + + +const char *gIndicatorCssFilePath =":/style/snsrindicatorwidget.css"; +const char *gIndicatorWidgetMLFilePath = ":/style/snsrindicatorwidget.widgetml"; +const char *gIndicatorColorCssFilePath = ":/style/snsrindicatorwidget_color.css"; + +const int gNumberOfIcons(6); + +/*! + \class SnsrIndicatorWidget + \ingroup group_snsrbigclockscreensaverprovider + \brief Screensaver indicator widget. + */ + +/*! + Constructs a new SnsrIndicatorWidget. + \param parent Parent object. + */ +SnsrIndicatorWidget::SnsrIndicatorWidget(QGraphicsItem* parent): + HbWidget(parent), mLayoutType(IndicatorsCentered) +{ + HbStyleLoader::registerFilePath(gIndicatorCssFilePath); + HbStyleLoader::registerFilePath(gIndicatorWidgetMLFilePath); + + // TODO: will some color variables be added into hbcolorgroup.css so + // that one don't need to use hard-coded values? If not, then + // changes needed in this widget. + HbStyleLoader::registerFilePath(gIndicatorColorCssFilePath); + + setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Preferred); + + createPrimitives(); +} + +/*! + Destructs the class. + */ +SnsrIndicatorWidget::~SnsrIndicatorWidget() +{ + // icons within the list are deleted by parent + mIcons.clear(); + + HbStyleLoader::unregisterFilePath( gIndicatorCssFilePath ); + HbStyleLoader::unregisterFilePath( gIndicatorWidgetMLFilePath ); + HbStyleLoader::unregisterFilePath(gIndicatorColorCssFilePath); +} + + +SnsrIndicatorWidget::IndicatorLayoutType SnsrIndicatorWidget::layoutType() const +{ + return mLayoutType; +} + +/*! + Sets the name of layout definition \a layoutName for selecting + the layout of view items of this view from css/xml files. + + This layout is accessible from css file as layout property + of the view item. + + */ +void SnsrIndicatorWidget::setLayoutType(IndicatorLayoutType type) +{ + if (mLayoutType != type ) { + mLayoutType = type; + QSizePolicy::Policy hSizePolicy(QSizePolicy::Expanding); + if ( mLayoutType == IndicatorsAlignedLeft ) { + hSizePolicy = QSizePolicy::Preferred; + } + setSizePolicy(hSizePolicy,QSizePolicy::Preferred); + } +} + +/*! + This is called whenever indicators' status changes: parameter list + tells which indicators should be shown at the given moment. All + previously shown indicators should be hidden and show only these + indicators passed as a parameter. + */ +void SnsrIndicatorWidget::showIndicators(const QList &indicators) +{ + // Update icon paths so that shown iconItems have + // valid icon path and rest have empty path (->invisible) + + int indicatorAmount = indicators.size(); + + removeAllIndicators(); + + // TODO: after wk18 color is lost after icon name is set again - bug or what? + // workaround: ask color from theme and set it again here + // If this must be left here, then change back-up color to white? + QColor iconColor = HbColorScheme::color("snsrforeground"); // TODO: final variable name? + if (iconColor.spec() == QColor::Invalid ) { + iconColor = Qt::magenta; + } + // update icon paths for items that are gonna be shown + for (int i=0; i < indicatorAmount && i < mIcons.size(); ++i) { + mIcons.at(i)->setIconName(indicators.at(i).iconPath); + mIcons.at(i)->setFlags(HbIcon::Colorized); + mIcons.at(i)->setColor(iconColor); + } + + // To recalculate layouts + updateGeometry(); + if ( parentLayoutItem() ) { + parentLayoutItem()->updateGeometry(); // clear the cache of the parent + } +} + +/*! + Remove all indicators from UI. + */ +void SnsrIndicatorWidget::removeAllIndicators() +{ + for (int i=0; i < mIcons.size(); ++i) { + mIcons.at(i)->setIconName(QString()); + } +} + +/*! + If indicator pane is going to be centered, then calculate width so that it's + exactly the same as visible icons are taking space (+spacers between them). + If indicator pane is left aligned, then actual width doesn't matter. + Assumption is that icons are fixed sized. + \reimp +*/ +QSizeF SnsrIndicatorWidget::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const +{ + QSizeF hint = HbWidget::sizeHint(which, constraint); + + // TODO: seems to work if icons are fixed-sized (units) + // TODO: even though size policy is preferred, should we give also + // minimum and maximum sizes? + if (which == Qt::PreferredSize && layoutType() == IndicatorsCentered ) { + qreal width(0); + qreal itemWidth(0); + qreal iconSpace(0); + int visibleIconCount(0); + + // TODO: use geometry or size? + for (int i=0; i < mIcons.size(); ++i) { + if (!mIcons.at(i)->iconName().isEmpty() ) { + visibleIconCount++; + itemWidth = mIcons.at(i)->iconItemSize().width(); + width = width + itemWidth; + } + } + if (visibleIconCount > 1) { + style()->parameter("hb-param-margin-gene-middle-horizontal", iconSpace); + width = width + ((visibleIconCount-1)*iconSpace); + } + + hint.setWidth(width); + } + + return hint; +} + +/*! + Creates all widget primitives. + Coloring is handled via CSS. + */ +void SnsrIndicatorWidget::createPrimitives() +{ + if (!mIcons.isEmpty()) { + return; + } + + HbIconItem *icon(0); + QLatin1String itemNameBase("icon"); + int itemNameEnd(1); + QString itemName(""); + + while (mIcons.count() < gNumberOfIcons) { + // When created, icon names are left empty -> nothing shown in UI. + icon = new HbIconItem(this); + icon->setFlags(HbIcon::Colorized); + icon->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed); + + // Create items that are named icon1..icon6. + itemName.clear(); + itemName.append(itemNameBase); + itemName.append(QString::number(itemNameEnd)); + HbStyle::setItemName(icon, itemName); + ++itemNameEnd; + + mIcons.append(icon); + } +} diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrswipewidget/inc/snsrswipewidget.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrswipewidget/inc/snsrswipewidget.h Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,77 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Swipe widget. +* +*/ + +#ifndef SNSRSWIPEWIDGET_H +#define SNSRSWIPEWIDGET_H + +#include + +#include +#include +#include +#include "snsrtest_global.h" + +// TODO: SCREENSAVER_TEST_CLASS +SCREENSAVER_TEST_CLASS(T_SnsrSwipeWidgets) + +class HbAction; +class HbPushButton; +class HbLabel; + +class SnsrSwipeWidget : public HbWidget + { + Q_OBJECT + +public: + + explicit SnsrSwipeWidget(QGraphicsItem *parent = 0); + virtual ~SnsrSwipeWidget(); + +public slots: + + void start(); + +protected: + + void reset(); + +private slots: + + void animationComplete(const HbEffect::EffectStatus &status); + void createPrimitives(); + +protected: // from base classes + + virtual void gestureEvent(QGestureEvent *event); + +signals: + void swipeDownDetected(); + +private: // data + + HbLabel *mSlideLabel; + HbLabel *mSlideIcon; + + Q_DISABLE_COPY(SnsrSwipeWidget) + + SCREENSAVER_TEST_FRIEND_CLASS(T_SnsrSwipeWidgets) + +}; + +#endif // SNSRSWIPEWIDGET_H + +// EOF diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrswipewidget/resource/animate_portrait.fxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrswipewidget/resource/animate_portrait.fxml Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,18 @@ + + + + + 1.5 + 400.0 + 600.0 + + + + + 1.5 + 1.0 + 0.1 + + + diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrswipewidget/resource/snsrswipewidget.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrswipewidget/resource/snsrswipewidget.css Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,24 @@ +HbWidget { + margin-left: 0un; + margin-top: 0un; +} + +SnsrSwipeWidget { + layout:layout-portrait; +} + +SnsrSwipeWidget::slideLabel { + text-align: AlignVCenter|AlignHCenter; + pref-width: 224.0px; + pref-height: hb-param-text-height-tiny; + zvalue: 0; +} + + +SnsrSwipeWidget::slideIcon { + text-align: AlignVCenter|AlignHCenter; + pref-height: 25.0un; + size-policy-vertical: fixed; + pref-width: 25.0un; + zvalue: 1; +} \ No newline at end of file diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrswipewidget/resource/snsrswipewidget.widgetml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrswipewidget/resource/snsrswipewidget.widgetml Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrswipewidget/resource/snsrswipewidget_color.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrswipewidget/resource/snsrswipewidget_color.css Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,10 @@ +SnsrSwipeWidget::slideLabel +{ + color:var(snsrforeground); +} + +SnsrSwipeWidget::slideIcon +{ + color:var(snsrforeground); +} + diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrswipewidget/src/snsrswipewidget.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrswipewidget/src/snsrswipewidget.cpp Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,153 @@ +/* +* 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: Swipe Widget. +* +*/ + +#include +#include +#include +#include + +#include "snsrbigclockcontainer.h" +#include "snsranalogclockcontainer.h" +#include "snsrswipewidget.h" + +const char *gSwipeCssFilePath =":/style/snsrswipewidget.css"; +const char *gSwipeWidgetMLFilePath = ":/style/snsrswipewidget.widgetml"; +const char *gSwipeColorCssFilePath = ":/style/snsrswipewidget_color.css"; + +const qreal gSwipeDownAngle = 270; +const qreal gSwipeAngleTolerance = 25; + +/*! + \class SnsrSwipeWidget + \ingroup group_snsrbigclockscreensaverplugins + \brief Screensaver swipe widget. + */ + +/*! + Constructs a new SnsrSwipeWidget. + \param parent Parent object. + */ +SnsrSwipeWidget::SnsrSwipeWidget(QGraphicsItem* parent): + HbWidget(parent), + mSlideLabel(0), mSlideIcon(0) +{ + HbStyleLoader::registerFilePath(gSwipeCssFilePath); + HbStyleLoader::registerFilePath(gSwipeWidgetMLFilePath); + HbStyleLoader::registerFilePath(gSwipeColorCssFilePath); + + setSizePolicy(QSizePolicy::Preferred,QSizePolicy::Preferred); + + createPrimitives(); + + HbEffect::add(mSlideIcon, + ":/xml/animate_portrait.fxml", + "slideDownPortrait"); + + reset(); + grabGesture(Qt::SwipeGesture); + +} + +/*! + Destructs the class. + */ +SnsrSwipeWidget::~SnsrSwipeWidget() +{ + HbStyleLoader::unregisterFilePath( gSwipeCssFilePath ); + HbStyleLoader::unregisterFilePath( gSwipeWidgetMLFilePath ); + HbStyleLoader::unregisterFilePath( gSwipeColorCssFilePath ); + + HbEffect::remove(mSlideIcon); +} + +void SnsrSwipeWidget::start() +{ + // Start animation + HbEffect::start(mSlideIcon, "slideDownPortrait", this, "animationComplete"); +} + +void SnsrSwipeWidget::reset() +{ + // Cancel animation and disable callback + HbEffect::cancel(mSlideIcon, "slideDownPortrait", false, false); +} + +void SnsrSwipeWidget::animationComplete(const HbEffect::EffectStatus &status) +{ + Q_UNUSED(status); + HbEffect::start(mSlideIcon, "slideDownPortrait", this, "animationComplete"); +} + + +/*! + Creates all widget primitives. + */ +void SnsrSwipeWidget::createPrimitives() +{ + if (!mSlideLabel) { + mSlideLabel = new HbLabel(this); + mSlideLabel->setPlainText(hbTrId("txt_screensaver_swipe")); + mSlideLabel->setAlignment(Qt::AlignCenter); + mSlideLabel->setPreferredHeight(50.0); + mSlideLabel->setPreferredWidth(224.0); + HbStyle::setItemName(mSlideLabel, QLatin1String("slideLabel")); + } + if (!mSlideIcon) { + mSlideIcon = new HbLabel(QLatin1String("slider"), this); + mSlideIcon->setIcon(HbIcon(":/slider")); + mSlideIcon->setAspectRatioMode(Qt::KeepAspectRatioByExpanding); + mSlideIcon->setAlignment(Qt::AlignCenter); + mSlideIcon->setPreferredHeight(50.0); + mSlideIcon->setPreferredWidth(100.0); + HbStyle::setItemName(mSlideIcon, QLatin1String("slideIcon")); + } +} + +/*! + \reimp + */ + +void SnsrSwipeWidget::gestureEvent(QGestureEvent *event) +{ + SCREENSAVER_TEST_FUNC_ENTRY("SnsrSwipeWidget::gestureEvent") + + QGesture *gesture = event->gesture(Qt::SwipeGesture); + QSwipeGesture *swipe = static_cast(gesture); + + if ( swipe && swipe->state() == Qt::GestureStarted ) { + start(); + event->accept(Qt::SwipeGesture); + } + else if ( swipe && swipe->state() == Qt::GestureFinished ) { + // TODO: Remove following, currently shows some debug data on screen + mSlideLabel->setPlainText( QString("angle=%1, horD=%2, verD=%3 ") + .arg(swipe->swipeAngle()) + .arg(swipe->horizontalDirection()) + .arg(swipe->verticalDirection()) ); + + // unclock with downward swipe + qreal swipeAngle = swipe->swipeAngle(); + if ( abs(swipeAngle - gSwipeDownAngle) < gSwipeAngleTolerance ) { + + emit swipeDownDetected(); + event->accept(Qt::SwipeGesture); + } + } + else { event->ignore(Qt::SwipeGesture); } + + SCREENSAVER_TEST_FUNC_EXIT("SnsrSwipeWidget::gestureEvent") +} diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsranalogclockcontainer.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsranalogclockcontainer.cpp Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,173 @@ +/* +* 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" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Container for analog clock. +* +*/ + +#include "snsranalogclockcontainer.h" + +#include +#include +#include + +#include +#include + +#include "snsranalogclockwidget.h" +#include "snsrindicatorwidget.h" +#include "snsrswipewidget.h" + +/*! + \class SnsrAnalogClockContainer + \ingroup group_snsrbigclockscreensaverplugin + \brief Container used for preparing layout for analog clock. + */ + +const char *gAnalogLayoutDocml = ":/xml/snsrbigclockscreensaveranalog.docml"; + +const char *gPortraitSectionName = "portrait"; +const char *gLandscapeSectionName = "landscape"; + +const char *gMainViewName = "view"; +const char *gMainContainerName = "mainContainer"; +const char *gClockContainerName = "clockContainer"; + +const char *gDateLabelName = "dateLabel"; +const char *gAnalogClockWidgetName = "analogClockWidget"; +const char *gIndicatorWidgetName = "indicatorWidget"; + +const char *gSwipeWidgetName = "swipeWidget"; + +const char *gDateFormatVerticalStr = r_qtn_date_usual_with_zero; //"%E%,% %*D%*N%/0%4%/1%5"; +const char *gDateFormatHorizontalStr = r_qtn_date_usual_with_zero; //"%E%,% %*D%N%/0%4%/1%5"; + + +/*! + Constructs a new SnsrAnalogClockContainer. + */ +SnsrAnalogClockContainer::SnsrAnalogClockContainer() : + SnsrBigClockContainer(), + mDateLabel(0), + mAnalogClockWidget(0)/*, + mSwipeWidget(0)*/ + { + SCREENSAVER_TEST_FUNC_ENTRY("SnsrAnalogClockContainer::SnsrAnalogClockContainer") + + bool ok(true); + + // load analog clock + qDebug() << gAnalogLayoutDocml; + mDocumentObjects = mDocumentLoader.load(gAnalogLayoutDocml, &ok); + Q_ASSERT_X(ok, gAnalogLayoutDocml, "Invalid DocML file."); + if (ok) { + mMainView = mDocumentLoader.findWidget(gMainViewName); + mDateLabel = qobject_cast( + mDocumentLoader.findWidget(gDateLabelName)); + mAnalogClockWidget = qobject_cast( + mDocumentLoader.findWidget(gAnalogClockWidgetName)); + mIndicatorWidget = qobject_cast( + mDocumentLoader.findWidget(gIndicatorWidgetName)); + //We don't implement swipe widget at this poin + /*mSwipeWidget = qobject_cast( + mDocumentLoader.findWidget(gSwipeWidgetName));*/ + + Q_ASSERT_X( + mMainView && mDateLabel && mAnalogClockWidget && + mIndicatorWidget /*&& mSwipeWidget*/, + gAnalogLayoutDocml, "Objects not found in DocML file." + ); + + //connect( mSwipeWidget, SIGNAL(swipeDownDetected()), SIGNAL(unlockRequested()) ); + + mIndicatorWidget->setLayoutType(SnsrIndicatorWidget::IndicatorsCentered); + + mBackgroundContainerLayout->addItem(mMainView); + // mSwipeWidget->start(); + } + + SCREENSAVER_TEST_FUNC_EXIT("SnsrAnalogClockContainer::SnsrAnalogClockContainer") +} + +/*! + Destructs the class. + */ +SnsrAnalogClockContainer::~SnsrAnalogClockContainer() +{ + //mDateLabel, mAnalogClockWidget - deleted by the parent +} + +/*! + Updates displayed time and date. + */ +void SnsrAnalogClockContainer::update() +{ + SCREENSAVER_TEST_FUNC_ENTRY("SnsrAnalogClockContainer::update") + + // time + mAnalogClockWidget->tick(); + + // date + if (mCurrentOrientation == Qt::Vertical) { + mDateLabel->setPlainText( + HbExtendedLocale().format(QDate::currentDate(), gDateFormatVerticalStr) + ); + } else { + mDateLabel->setPlainText( + HbExtendedLocale().format(QDate::currentDate(), gDateFormatHorizontalStr) + ); + } + + SCREENSAVER_TEST_FUNC_EXIT("SnsrAnalogClockContainer::update") +} + +/*! + Changes screensaver layout basing on orientation changes. + \param orientation Current orientation. + */ +void SnsrAnalogClockContainer::changeLayout(Qt::Orientation orientation) +{ + SCREENSAVER_TEST_FUNC_ENTRY("SnsrAnalogClockContainer::changeLayout") + + bool ok(false); + if (mCurrentOrientation != orientation) { + mCurrentOrientation = orientation; + + // hide controls to avoid screen flickering + mMainView->hide(); + + QString sectionToLoad(""); + if (mCurrentOrientation == Qt::Horizontal) { + sectionToLoad = gLandscapeSectionName; + } + qDebug() << "loading: " << gAnalogLayoutDocml << ", section: " << sectionToLoad; + mDocumentLoader.load(gAnalogLayoutDocml, sectionToLoad, &ok); + // view is rebuilt and ready to show + update(); + mMainView->show(); + Q_ASSERT_X(ok, gAnalogLayoutDocml, "Invalid section in DocML file."); + } + // update anyway - this is needed in situations when screensaver goes to + // foreground but layout change did not occur + if (!ok) { + update(); + } + + SCREENSAVER_TEST_FUNC_EXIT("SnsrAnalogClockContainer::changeLayout") +} + +int SnsrAnalogClockContainer::updateIntervalInMilliseconds() +{ + return 1000; +} + diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrbigclockcontainer.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrbigclockcontainer.cpp Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,277 @@ +/* +* 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" +* 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: Base class container. +* +*/ + +#include "snsrbigclockcontainer.h" + +#include +#include +#include +#include + +#include +#include +#include + +#include + +#include "snsrbigclockcontainer.h" +#include "snsrindicatorwidget.h" +#include "snsrindicatormodel.h" + +/*! + \class SnsrBigClockContainer + \ingroup group_snsrbigclockscreensaverplugin + \brief Base class. Container used for drawing background and for preparing layout. + */ + +const QString snsrBackgroundColorRole("snsrbackground"); +const int gStep(5); + +QTM_USE_NAMESPACE + +/*! + Constructs a new SnsrBigClockContainer. + */ +SnsrBigClockContainer::SnsrBigClockContainer() : + mBackgroundContainerLayout(0), + mMainView(0), + mMainContainer(0), + mIndicatorModel(0), + mIndicatorWidget(0), + mCurrentOrientation(-1) +{ + setBackgroundColor(); + mBackgroundContainerLayout = new QGraphicsLinearLayout(Qt::Vertical); + setLayout(mBackgroundContainerLayout); + qsrand(QTime::currentTime().msec()); +} + +/*! + Destructs the class. + */ +SnsrBigClockContainer::~SnsrBigClockContainer() +{ + resetIndicatorConnections(); + + // e.g. mIndicatorWidget gets deleted during these calls + mDocumentLoader.reset(); + qDeleteAll(mDocumentObjects); + mDocumentObjects.clear(); + + //mMainContainer,mBackgroundContainerLayout - deleted by the parent + mIndicatorModel=0; // not owned +} + +/*! + \fn virtual void update() = 0; + + Slot for members update in container e.g. when time or date changed. + */ + +/*! + \fn virtual void changeLayout(Qt::Orientation orientation) = 0; + + Slot for members update in container when orientation changed. + */ + +/*! + \fn virtual int updateIntervalInMilliseconds() = 0; + + Concrete inherited container classes must implement this to return + the desired update interval for that clock mode. + */ + +/*! + Set used indicator model and do necessary initializations to show currently + active indicators. + */ +void SnsrBigClockContainer::initIndicators(SnsrIndicatorModel &model) +{ + mIndicatorModel = &model; + if (mIndicatorWidget) { + connect(mIndicatorModel, SIGNAL(indicatorsUpdated(QList)), + mIndicatorWidget, SLOT(showIndicators(QList))); + + connect(mIndicatorModel, SIGNAL(allIndicatorsDeactivated()), + mIndicatorWidget, SLOT(removeAllIndicators())); + + mIndicatorModel->initializeIndicatorWidget(); + } +} + +/*! + \reimp + */ +void SnsrBigClockContainer::changeEvent(QEvent *event) +{ + if (event->type() == HbEvent::ThemeChanged) { + setBackgroundColor(); + } + return QGraphicsWidget::changeEvent(event); +} + +/*! + Returns random point for given range. + \param rect Area within which the generated point will be. + */ +QPointF SnsrBigClockContainer::randomPosition(const QRectF &rect) +{ + int width( rect.width() ); + int height( rect.height() ); + if ( width > 0 && height > 0 ) { + return rect.topLeft() + QPointF( qrand()%width, qrand()%height ); + } + else { + return QPointF(); + } + +} + +/*! + Returns new position between curRect position and destPos position. + \param curPos Current position. + \param destPos Destination position. When current position is near this + position or outside of the container, a new value is generated. + \param containerRect The container within which the destination position will always + be after a call. + */ +QPointF SnsrBigClockContainer::nextRandomPosition(const QPointF &curPos, QPointF &destPos, const QRectF &containerRect) +{ + const int delta(gStep+2); + const int minCntDimension(3*delta); + + // The random movement logic can work only if the container has enough space to move the + // clock around. If the container is too small, just return the middle point of the container. + if ( containerRect.width() < minCntDimension && containerRect.height() < minCntDimension ) { + return containerRect.center(); + } + + int xDistance = abs( destPos.x() - curPos.x() ); + int yDistance = abs( destPos.y() - curPos.y() ); + + // Generate new destination position when current widget position is close to + // destination random position or when current destination position is out of bounds. + // It is possible that the new random position is very close to the current position, + // in which case the random position is generated again. + // It is paramount that container is large enough when next loop is entered + // to prevent infinite looping. + while ( (xDistance < delta && yDistance < delta) + || !containerRect.contains(destPos) ) { + destPos = randomPosition( containerRect ); + xDistance = abs( destPos.x() - curPos.x() ); + yDistance = abs( destPos.y() - curPos.y() ); + } + + // If, for some reason, the current position is out-of-bounds, then there's no + // point to slowly move towards the destination. In that case, move immediately + // to destination point. + if ( !containerRect.contains(curPos) ) { + return destPos; + } + // Otherwise, this is normal case and we will calculate a point which is just + // a bit closer to the destination. + + // Version 1: + // o-----o---------------------------o + // p1 p2 p3 + // + // Version 2: + // o---------------------------o-----o + // p3 p2 p1 + // + // p1 - current widget position + // p2 - next position to compute + // p3 - destination random position + QPointF p1(curPos); + QPointF p2(0,0); + QPointF p3(destPos); + + // Computes point p2 - new position between p1 and p3 + + // Move the coordinate which is further away from the destination + // and calculate the other coordinate from that so that the + // result point p2 lies on the straigth line between p1 and p3. + if ( yDistance > xDistance ) { + if (p3.y() > p1.y()) { + p2.setY(p1.y()+gStep); + } + else { + p2.setY(p1.y()-gStep); + } + p2.setX((((p2.y()-p1.y())*(p3.x()-p1.x())) / (p3.y()-p1.y())) + p1.x()); // x2 = (((y2-y1)*(x3-x1)) / (y3-y1)) + x1 + } + else { + if (p3.x() > p1.x()) { + p2.setX(p1.x()+gStep); + } + else { + p2.setX(p1.x()-gStep); + } + p2.setY((((p3.y()-p1.y())*(p2.x()-p1.x())) / (p3.x()-p1.x())) + p1.y()); // y2 = (((y3-y1)*(x2-x1)) / (x3-x1)) + y1 + } + + // Return new position between points p1 and p3. + return p2; +} + +/*! + Disconnect connections between indicator model and widget. + */ +void SnsrBigClockContainer::resetIndicatorConnections() +{ + disconnect(mIndicatorModel, SIGNAL(indicatorsUpdated(QList)), + mIndicatorWidget, SLOT(showIndicators(QList))); + + disconnect(mIndicatorModel, SIGNAL(allIndicatorsDeactivated()), + mIndicatorWidget, SLOT(removeAllIndicators())); +} + +/*! + Set background color. + */ +void SnsrBigClockContainer::setBackgroundColor() +{ + QColor backgroundColor = HbColorScheme::color(snsrBackgroundColorRole); + if (backgroundColor.isValid()) { + mBackgroundColor = backgroundColor; + } + else { + mBackgroundColor = Qt::black; + } +} + +/*! + Paints the contents of an item in local coordinates. + */ +#ifdef COVERAGE_MEASUREMENT +#pragma CTC SKIP +#endif //COVERAGE_MEASUREMENT +void SnsrBigClockContainer::paint( + QPainter *painter, + const QStyleOptionGraphicsItem *option, + QWidget *widget + ) +{ + Q_UNUSED(option) + Q_UNUSED(widget) + + painter->fillRect(rect(), mBackgroundColor); +} +#ifdef COVERAGE_MEASUREMENT +#pragma CTC ENDSKIP +#endif //COVERAGE_MEASUREMENT + diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrbigclockscreensaver.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrbigclockscreensaver.cpp Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,260 @@ +/* +* 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" +* 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: Big clock Screensaver. +* +*/ + +#include "snsrbigclockscreensaver.h" + +#ifdef Q_OS_SYMBIAN +#include +#endif // Q_OS_SYMBIAN + +#include +#include +#include + +#include +#include + +#include "snsranalogclockcontainer.h" +#include "snsrdigitalclockcontainer.h" +#include "snsroledanalogclockcontainer.h" +#include "snsroleddigitalclockcontainer.h" +#include "snsrindicatormodel.h" + +/*! + \class SnsrBigClockScreensaver + \ingroup group_snsrbigclockscreensaverplugin + \brief Screensaver with big digital clock. + */ + +const int gTimeInterval(100); + +/*! + Constructs a new SnsrBigClockScreensaver. + */ +SnsrBigClockScreensaver::SnsrBigClockScreensaver() : + mMainWindow(0), + mCurrentContainer(0), + mIndicatorModel(0) +{ + mMainWindow = HbInstance::instance()->allMainWindows().at(0); + // for nice looking clock hand transformations + mMainWindow->setRenderHint(QPainter::SmoothPixmapTransform); + + // This model holds indicator status information and must exist as + // long as screensaver does. + mIndicatorModel = new SnsrIndicatorModel(this); +} + +/*! + Destructs the class. + */ +SnsrBigClockScreensaver::~SnsrBigClockScreensaver() +{ + // mCurrentContainer, mIndicatorModel - deleted by the parent +} + +/*! + @copydoc Screensaver::onInitialize() +*/ +bool SnsrBigClockScreensaver::onInitialize() +{ + qDebug() << "SnsrBigClockScreensaver::onInitialize()"; + return true; +} + +/*! + @copydoc Screensaver::onForeground() + */ +bool SnsrBigClockScreensaver::onForeground() +{ + SCREENSAVER_TEST_FUNC_ENTRY("SnsrBigClockScreensaver::onForeground") + qDebug() << "SnsrBigClockScreensaver::onForeground()"; + + removeCurrentContainer(); + + SnsrBigClockContainer* newContainer( 0 ); + if (clockFormat() == ClockFormatAnalog) { + newContainer = new SnsrAnalogClockContainer(); + } + else { + newContainer = new SnsrDigitalClockContainer(); + } + + setCurrentContainer( newContainer ); + + SCREENSAVER_TEST_FUNC_EXIT("SnsrBigClockScreensaver::onForeground") + return true; +} + +/*! + @copydoc Screensaver::onPartialForeground() + */ +bool SnsrBigClockScreensaver::onPartialForeground() +{ + SCREENSAVER_TEST_FUNC_ENTRY("SnsrBigClockScreensaver::onPartialForeground") + qDebug() << "SnsrBigClockScreensaver::onPartialForeground()"; + + removeCurrentContainer(); + + SnsrBigClockContainer* newContainer( 0 ); + if (clockFormat() == ClockFormatAnalog) { + newContainer = new SnsrOledAnalogClockContainer(); + } + else { + newContainer = new SnsrOledDigitalClockContainer(); + } + + setCurrentContainer( newContainer ); + + SCREENSAVER_TEST_FUNC_EXIT("SnsrBigClockScreensaver::onPartialForeground") + return true; +} + +/*! + @copydoc Screensaver::onBackground() + */ +bool SnsrBigClockScreensaver::onBackground() +{ + SCREENSAVER_TEST_FUNC_ENTRY("SnsrBigClockScreensaver::onBackground") + qDebug() << "SnsrBigClockScreensaver::onBackground()"; + + removeCurrentContainer(); + + SCREENSAVER_TEST_FUNC_EXIT("SnsrBigClockScreensaver::onBackground") + return true; +} + +/*! + @copydoc Screensaver::onPowerSave() + */ +bool SnsrBigClockScreensaver::onPowerSave() +{ + SCREENSAVER_TEST_FUNC_ENTRY("SnsrBigClockScreensaver::onPowerSave") + qDebug() << "SnsrBigClockScreensaver::onPowerSave()"; + + SCREENSAVER_TEST_FUNC_EXIT("SnsrBigClockScreensaver::onPowerSave") + return false; +} + +/*! + @copydoc Screensaver::onClose() + */ +bool SnsrBigClockScreensaver::onClose() +{ + SCREENSAVER_TEST_FUNC_ENTRY("SnsrBigClockScreensaver::onClose") + qDebug() << "SnsrBigClockScreensaver::onClose()"; + + bool ret(false); + if (onBackground()) { + delete mCurrentContainer; + mCurrentContainer = 0; + ret = true; + } + + SCREENSAVER_TEST_FUNC_EXIT("SnsrBigClockScreensaver::onClose") + return ret; +} + +/*! + @copydoc Screensaver::onHandleActiveIndicators + */ +void SnsrBigClockScreensaver::onHandleActiveIndicators( + const QList &activeIndicators) +{ + mIndicatorModel->handleActiveIndicators(activeIndicators); +} + +/*! + @copydoc Screensaver::onHandleActivatedIndicator + */ +void SnsrBigClockScreensaver::onHandleActivatedIndicator( + HbIndicatorInterface *activatedIndicator) +{ + mIndicatorModel->handleActivatedIndicator(activatedIndicator); +} + +/*! + @copydoc Screensaver::onHandleDeactivatedIndicator + */ +void SnsrBigClockScreensaver::onHandleDeactivatedIndicator( + HbIndicatorInterface *deactivatedIndicator) +{ + mIndicatorModel->handleDeactivatedIndicator(deactivatedIndicator); +} + + +/*! + Determines the curent clock format settings. + \retval ClockFormat. + */ +SnsrBigClockScreensaver::ClockFormat SnsrBigClockScreensaver::clockFormat() +{ +#ifdef Q_OS_SYMBIAN + if (TLocale().ClockFormat() == EClockAnalog) { + return ClockFormatAnalog; + } else { + return ClockFormatDigital; + } +#else + // windows build - change the format every 30 seconds for testing purposes + if (QTime::currentTime().second() < 30) { + return ClockFormatAnalog; + } else { + return ClockFormatDigital; + } +#endif // Q_OS_SYMBIAN +} + +void SnsrBigClockScreensaver::removeCurrentContainer() +{ + if ( mCurrentContainer ) { + disconnect( + mMainWindow, SIGNAL(orientationChanged(Qt::Orientation)), + mCurrentContainer, SLOT(changeLayout(Qt::Orientation)) + ); + disconnect( + &mTimer, SIGNAL(timeout()), + mCurrentContainer, SLOT(update()) + ); + disconnect( + mCurrentContainer, SIGNAL(unlockRequested()), + this, SIGNAL(unlockRequested()) ); + mTimer.stop(); + emit viewChanged(0); + + delete mCurrentContainer; + mCurrentContainer = 0; + } +} + +void SnsrBigClockScreensaver::setCurrentContainer( SnsrBigClockContainer* newContainer ) +{ + mCurrentContainer = newContainer; + connect( + mMainWindow, SIGNAL(orientationChanged(Qt::Orientation)), + mCurrentContainer, SLOT(changeLayout(Qt::Orientation)) + ); + connect( &mTimer, SIGNAL(timeout()), mCurrentContainer, SLOT(update()) ); + connect( mCurrentContainer, SIGNAL(unlockRequested()), SIGNAL(unlockRequested()) ); + + mCurrentContainer->initIndicators(*mIndicatorModel); + + mCurrentContainer->changeLayout(mMainWindow->orientation()); + mTimer.start( mCurrentContainer->updateIntervalInMilliseconds() ); + emit viewChanged(mCurrentContainer); +} + diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrbigclockscreensaverplugin.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrbigclockscreensaverplugin.cpp Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,90 @@ +/* +* 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: Big clock Screensaver plugin. +* +*/ + +#include +#include +#include + +#include +#include +#include + +#include "snsrbigclockscreensaverplugin.h" +#include "snsrbigclockscreensaver.h" + +const char *gBigClockInterfaceName = "com.nokia.screensaver.ISnsrBigClockScreensaver"; + +/*! + \class SnsrBigClockScreensaverPlugin + \ingroup group_snsrbigclockscreensaverplugin + \brief Screensaver big clock screensaver plugin collects ready-made screensaver clock. + */ + +#ifdef COVERAGE_MEASUREMENT +#pragma CTC SKIP +#endif //COVERAGE_MEASUREMENT + +/*! + \reimp + */ +QObject *SnsrBigClockScreensaverPlugin::createInstance( + const QServiceInterfaceDescriptor &descriptor, + QServiceContext *context, + QAbstractSecuritySession *session) +{ + Q_UNUSED(context); + Q_UNUSED(session); + + if (descriptor.interfaceName() == QLatin1String(gBigClockInterfaceName)) { + LoadTranslator(); + return new SnsrBigClockScreensaver(); + } + return 0; +} + + +/*! + Loads a translator. + */ +void SnsrBigClockScreensaverPlugin::LoadTranslator() +{ + QString locale = QLocale::system().name(); + QString filename = QString("snsrbigclockscreensaverplugin_%1").arg(locale); + QTranslator *translator = new QTranslator(this); +#ifdef Q_OS_SYMBIAN + bool loaded(false); + // TRAP is must here, otherwise it crashes + TRAP_IGNORE( + loaded = translator->load(filename, + QString("z:/resource/qt/translations")); + if (!loaded) { + loaded = translator->load(filename, + QString("c:/resource/qt/translations")); + } + ); +#else + translator->load(filename, QString("resource/qt/translations") ); +#endif //Q_OS_SYMBIAN + + qApp->installTranslator(translator); +} + +Q_EXPORT_PLUGIN2(snsrbigclockscreensaverplugin, SnsrBigClockScreensaverPlugin) + +#ifdef COVERAGE_MEASUREMENT +#pragma CTC ENDSKIP +#endif //COVERAGE_MEASUREMENT diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrdigitalclockcontainer.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrdigitalclockcontainer.cpp Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,194 @@ +/* +* 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" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Container for digital clock. +* +*/ + +#include "snsrdigitalclockcontainer.h" + +#include +#include +#include + +#include +#include + +#include "snsrswipewidget.h" +#include "snsrindicatorwidget.h" + +/*! + \class SnsrDigitalClockContainer + \ingroup group_snsrbigclockscreensaverplugin + \brief Container used for preparing layout for digital clock. + */ + +const char *gDigitalLayoutDocml = ":/xml/snsrbigclockscreensaverdigital.docml"; +extern const char *gPortraitSectionName; +extern const char *gLandscapeSectionName; + +extern const char *gMainViewName; + +const char *gTimeLabelName = "timeLabel"; +const char *gAmPmLabelName = "amPmLabel"; +extern const char *gDateLabelName; + +extern const char *gDateFormatVerticalStr; +extern const char *gDateFormatHorizontalStr; + +// This is same as r_qtn_time_usual_with_zero defined in +// hbi18ndef.h expect am/pm place holders are removed. +const char *gTimeFormatStr = "%:0%J%:1%T%:3"; +const char *gAmPmFormatStr = "%B"; + +extern const char *gIndicatorWidgetName; +extern const char *gSwipeWidgetName; + + +/*! + Constructs a new SnsrDigitalClockContainer. + */ +SnsrDigitalClockContainer::SnsrDigitalClockContainer() : + SnsrBigClockContainer(), + mTimeLabel(0), + mAmPmLabel(0), + mDateLabel(0)/*, + mSwipeWidget(0)*/ +{ + SCREENSAVER_TEST_FUNC_ENTRY("SnsrDigitalClockContainer::SnsrDigitalClockContainer") + + bool ok(false); + // load digital clock + qDebug() << gDigitalLayoutDocml; + mDocumentObjects = mDocumentLoader.load(gDigitalLayoutDocml, &ok); + Q_ASSERT_X(ok, gDigitalLayoutDocml, "Invalid DocML file."); + + if (ok) { + mMainView = mDocumentLoader.findWidget(gMainViewName); + mDateLabel = qobject_cast( + mDocumentLoader.findWidget(gDateLabelName)); + mTimeLabel = qobject_cast( + mDocumentLoader.findWidget(gTimeLabelName)); + mAmPmLabel = qobject_cast( + mDocumentLoader.findWidget(gAmPmLabelName)); + mIndicatorWidget = qobject_cast( + mDocumentLoader.findWidget(gIndicatorWidgetName)); + // implement swipewidget later on + /*mSwipeWidget = qobject_cast( + mDocumentLoader.findWidget(gSwipeWidgetName));*/ + + Q_ASSERT_X( + mMainView && mDateLabel && mTimeLabel && mAmPmLabel && + mIndicatorWidget /*&& mSwipeWidget*/, + gDigitalLayoutDocml, "Objects not found in DocML file." + ); + + //connect( mSwipeWidget, SIGNAL(swipeDownDetected()), SIGNAL(unlockRequested()) ); + + mIndicatorWidget->setLayoutType(SnsrIndicatorWidget::IndicatorsCentered); + + mBackgroundContainerLayout->addItem(mMainView); + // mSwipeWidget->start(); + } + + SCREENSAVER_TEST_FUNC_EXIT("SnsrDigitalClockContainer::SnsrDigitalClockContainer") +} + +/*! + Destructs the class. + */ +SnsrDigitalClockContainer::~SnsrDigitalClockContainer() +{ + //mTimeLabel, mAmPmLabel, mDateLabel - deleted by the parent +} + +/*! + Updates displayed time and date. + */ +void SnsrDigitalClockContainer::update() +{ + SCREENSAVER_TEST_FUNC_ENTRY("SnsrDigitalClockContainer::update") + + // time + // Even though the format string (hh:mm) contain the leading zero, it's + // removed always when clock type is 12h -> h:mm. + + // TODO: within this method call, you find a comment in code that + // it's intentional to remove leading zero always with 12h type clock. + // However it seems to be recommended to use hbExtendedLocale to get + // proper time formatting for all locales and settings.. + mTimeLabel->setPlainText( + HbExtendedLocale().format(QTime::currentTime(), gTimeFormatStr) + ); + // if clock type is 24, this will return an empty string. + mAmPmLabel->setPlainText( + HbExtendedLocale().format(QTime::currentTime(), gAmPmFormatStr) + ); + + // date + if (mCurrentOrientation == Qt::Vertical) { + mDateLabel->setPlainText( + HbExtendedLocale().format( + QDate::currentDate(), gDateFormatVerticalStr) + ); + } else { + mDateLabel->setPlainText( + HbExtendedLocale().format( + QDate::currentDate(), gDateFormatHorizontalStr) + ); + } + + SCREENSAVER_TEST_FUNC_EXIT("SnsrDigitalClockContainer::update") +} + +/*! + Changes screensaver layout basing on orientation changes. + \param orientation Current orientation. + */ +void SnsrDigitalClockContainer::changeLayout(Qt::Orientation orientation) +{ + SCREENSAVER_TEST_FUNC_ENTRY("SnsrDigitalClockContainer::changeLayout") + + bool ok(false); + if (mCurrentOrientation != orientation) { + mCurrentOrientation = orientation; + + // hide controls to avoid screen flickering + mMainView->hide(); + + QString sectionToLoad(""); + if (mCurrentOrientation == Qt::Horizontal) { + sectionToLoad = gLandscapeSectionName; + } + qDebug() << "loading: " << gDigitalLayoutDocml << ", section: " + << sectionToLoad; + mDocumentLoader.load(gDigitalLayoutDocml, sectionToLoad, &ok); + // view is rebuilt and ready to show + update(); + mMainView->show(); + Q_ASSERT_X(ok, gDigitalLayoutDocml, "Invalid section in DocML file."); + } + // update anyway - this is needed in situations when screensaver goes to + // foreground but layout change did not occur + if (!ok) { + update(); + } + + SCREENSAVER_TEST_FUNC_EXIT("SnsrDigitalClockContainer::changeLayout") +} + +int SnsrDigitalClockContainer::updateIntervalInMilliseconds() +{ + return 1000; +} + diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrdocumentloader.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrdocumentloader.cpp Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,75 @@ +/* +* 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" +* 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: Screensaver custom document loader. +* +*/ + +#include "snsrdocumentloader.h" + +#include "snsranalogclockwidget.h" +#include "snsroledclockwidget.h" +#include "snsrlabel.h" +#include "snsrindicatorwidget.h" +#include "snsrswipewidget.h" + +/*! + \class SnsrDocumentLoader + \ingroup group_snsrbigclockscreensaverplugin + \brief Custom screensaver docml layout loader. + + Used mainly to create the analog clock widget from docml. + */ + +/*! + Creates the analog clock. + \param type Static type name. + \param name Object name. + \retval Created object. + */ +QObject *SnsrDocumentLoader::createObject(const QString &type, const QString &name) +{ + if (type == SnsrAnalogClockWidget::staticMetaObject.className()) { + QObject *object = new SnsrAnalogClockWidget(); + object->setObjectName(name); + return object; + } + + if (type == SnsrOledClockWidget::staticMetaObject.className()) { + QObject *object = new SnsrOledClockWidget(); + object->setObjectName(name); + return object; + } + + if (type == SnsrLabel::staticMetaObject.className()) { + QObject *object = new SnsrLabel(); + object->setObjectName(name); + return object; + } + + if (type == SnsrIndicatorWidget::staticMetaObject.className()) { + QObject *object = new SnsrIndicatorWidget(); + object->setObjectName(name); + return object; + } + + /* Add swipeWidget implementation later on + + if (type == SnsrSwipeWidget::staticMetaObject.className()) { + QObject *object = new SnsrSwipeWidget(); + object->setObjectName(name); + return object; + }*/ + + return HbDocumentLoader::createObject(type, name); +} diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsroledanalogclockcontainer.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsroledanalogclockcontainer.cpp Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,199 @@ +/* +* 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" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Container for oled analog clock. +* +*/ + +#include "snsroledanalogclockcontainer.h" + +#include +#include +#include +#include +#include +#include + +#include "snsroledclockwidget.h" +#include "snsrindicatorwidget.h" + +/*! + \class SnsrOledAnalogClockContainer + \ingroup group_snsrbigclockscreensaverplugin + \brief Container used for preparing layout for oled analog clock. + */ + +const char *gOledAnalogLayoutDocml = ":/xml/snsrbigclockscreensaveroledanalog.docml"; +extern const char *gPortraitSectionName; +extern const char *gLandscapeSectionName; + +extern const char *gMainViewName; +extern const char *gMainContainerName; +extern const char *gClockContainerName; +extern const char *gIndicatorWidgetName; + +extern const char *gDateLabelName; +extern const char *gDateFormatVerticalStr; +extern const char *gDateFormatHorizontalStr; + +const char *gOledAnalogClockWidgetName = "oledAnalogClockWidget"; + + +/*! + Constructs a new SnsrOledAnalogClockContainer. + */ +SnsrOledAnalogClockContainer::SnsrOledAnalogClockContainer() : + SnsrBigClockContainer(), mClockContainer(0), mOledClockWidget(0), + mDateLabel(0), mDestPosition(QPointF()), mInitialize(false) +{ + SCREENSAVER_TEST_FUNC_ENTRY("SnsrOledAnalogClockContainer::SnsrOledAnalogClockContainer") + + bool ok(false); + qDebug() << gOledAnalogLayoutDocml; + + // load oled analog clock + mDocumentObjects = mDocumentLoader.load(gOledAnalogLayoutDocml, &ok); + Q_ASSERT_X(ok, gOledAnalogLayoutDocml, "Invalid DocML file."); + if (ok) { + mMainView = mDocumentLoader.findWidget(gMainViewName); + mMainContainer = mDocumentLoader.findWidget(gMainContainerName); + mClockContainer = mDocumentLoader.findWidget(gClockContainerName); + mOledClockWidget = qobject_cast( + mDocumentLoader.findWidget(gOledAnalogClockWidgetName)); + mDateLabel = qobject_cast( + mDocumentLoader.findWidget(gDateLabelName)); + mIndicatorWidget = qobject_cast( + mDocumentLoader.findWidget(gIndicatorWidgetName)); + Q_ASSERT_X( + mMainView && mMainContainer && mClockContainer + && mOledClockWidget && mDateLabel && mIndicatorWidget, + gOledAnalogLayoutDocml, "Objects not found in DocML file." + ); + + mIndicatorWidget->setLayoutType(SnsrIndicatorWidget::IndicatorsCentered); + + mBackgroundContainerLayout->addItem(mMainView); + } + + SCREENSAVER_TEST_FUNC_EXIT("SnsrOledAnalogClockContainer::SnsrOledAnalogClockContainer") +} + +/*! + Destructs the class. + */ +SnsrOledAnalogClockContainer::~SnsrOledAnalogClockContainer() +{ + //mOledClockWidget etc - deleted by the parent +} + +/*! + Updates OLED analog clock widget position. + */ +void SnsrOledAnalogClockContainer::updatePosition() +{ + QSizeF containerSize = mMainContainer->size(); + + // Container must have a valid size to enable calculating the + // destination position for the clock. + if ( containerSize.width() > 0 && containerSize.height() > 0 ) { + containerSize -= mClockContainer->boundingRect().size(); + QRectF containerRect( mMainContainer->pos(), containerSize ); + if ( mInitialize ) { + QPointF clockPos = nextRandomPosition( mClockContainer->pos(), mDestPosition, containerRect ); + mClockContainer->setPos( clockPos ); + } + else { + mDestPosition = randomPosition( containerRect ); + mInitialize = true; + } + } +} + +/*! + Updates displayed time. + */ +void SnsrOledAnalogClockContainer::update() +{ + SCREENSAVER_TEST_FUNC_ENTRY("SnsrOledAnalogClockContainer::update") + + // time + mOledClockWidget->tick(); + + // date + if (mCurrentOrientation == Qt::Vertical) { + mDateLabel->setPlainText( + HbExtendedLocale().format(QDate::currentDate(), gDateFormatVerticalStr) + ); + } else { + mDateLabel->setPlainText( + HbExtendedLocale().format(QDate::currentDate(), gDateFormatHorizontalStr) + ); + } + + // position + updatePosition(); + + // TODO: Currently, both time and position are updated 10 times per second. + // These should happen only once per minute in the power save mode. + + SCREENSAVER_TEST_FUNC_EXIT("SnsrOledAnalogClockContainer::update") +} + +/*! + Changes screensaver layout basing on orientation changes. + \param orientation Current orientation. + */ +void SnsrOledAnalogClockContainer::changeLayout(Qt::Orientation orientation) +{ + SCREENSAVER_TEST_FUNC_ENTRY("SnsrOledAnalogClockContainer::changeLayout") + + bool ok(false); + if (mCurrentOrientation != orientation) { + mCurrentOrientation = orientation; + // hide controls to avoid screen flickering + mMainView->hide(); + + QString sectionToLoad(""); + if (mCurrentOrientation == Qt::Horizontal) { + sectionToLoad = gLandscapeSectionName; + } + qDebug() << "loading: " << gOledAnalogLayoutDocml << ", section: " << sectionToLoad; + mDocumentLoader.load(gOledAnalogLayoutDocml, sectionToLoad, &ok); + Q_ASSERT_X(ok, gOledAnalogLayoutDocml, "Invalid section in DocML file."); + + // disconnect container from parent layout, + // connected container resets its position to the one defined in docml + // after label text updates + mClockContainer->setParentLayoutItem(0); + + update(); + + // view is rebuilt and ready to show + mMainView->show(); + } + + // update anyway - this is needed in situations when screensaver goes to + // foreground but layout change did not occur + if (!ok) { + update(); + } + + SCREENSAVER_TEST_FUNC_EXIT("SnsrOledAnalogClockContainer::changeLayout") +} + +int SnsrOledAnalogClockContainer::updateIntervalInMilliseconds() +{ + return 60*1000; +} + +// end of file diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsroleddigitalclockcontainer.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsroleddigitalclockcontainer.cpp Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,208 @@ +/* +* 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" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Container for oled digital clock. +* +*/ + +#include "snsroleddigitalclockcontainer.h" + +#include +#include +#include +#include + +#include +#include + +#include "snsrindicatorwidget.h" + +/*! + \class SnsrOledDigitalClockContainer + \ingroup group_snsrbigclockscreensaverplugin + \brief Container used for preparing layout for oled digital clock. + */ + +const char *gOledDigitalLayoutDocml = ":/xml/snsrbigclockscreensaveroleddigital.docml"; +extern const char *gPortraitSectionName; +extern const char *gLandscapeSectionName; + +extern const char *gMainViewName; +extern const char *gMainContainerName; +extern const char *gClockContainerName; + +extern const char *gTimeLabelName; +extern const char *gAmPmLabelName; +extern const char *gDateLabelName; + +extern const char *gDateFormatVerticalStr; +extern const char *gDateFormatHorizontalStr; + +extern const char *gTimeFormatStr; +extern const char *gAmPmFormatStr; + +extern const char *gIndicatorWidgetName; + + +/*! + Constructs a new SnsrOledDigitalClockContainer. + */ +SnsrOledDigitalClockContainer::SnsrOledDigitalClockContainer() : + SnsrBigClockContainer(), mClockContainer(0), mTimeLabel(0), + mDateLabel(0), mAmPmLabel(0), mDestPosition(QPointF()), mInitialize(false) +{ + SCREENSAVER_TEST_FUNC_ENTRY("SnsrOledDigitalClockContainer::SnsrOledDigitalClockContainer") + + bool ok(false); + qDebug() << gOledDigitalLayoutDocml; + + // load digital clock + mDocumentObjects = mDocumentLoader.load(gOledDigitalLayoutDocml, &ok); + Q_ASSERT_X(ok, gOledDigitalLayoutDocml, "Invalid DocML file."); + + if (ok) { + mMainView = mDocumentLoader.findWidget(gMainViewName); + mMainContainer = mDocumentLoader.findWidget(gMainContainerName); + mClockContainer = mDocumentLoader.findWidget(gClockContainerName); + mDateLabel = qobject_cast( + mDocumentLoader.findWidget(gDateLabelName)); + mTimeLabel = qobject_cast( + mDocumentLoader.findWidget(gTimeLabelName)); + mAmPmLabel = qobject_cast( + mDocumentLoader.findWidget(gAmPmLabelName)); + mIndicatorWidget = qobject_cast( + mDocumentLoader.findWidget(gIndicatorWidgetName)); + Q_ASSERT_X( + mMainView && mMainContainer && mClockContainer + && mDateLabel && mTimeLabel && mAmPmLabel + && mIndicatorWidget, + gOledDigitalLayoutDocml, "Objects not found in DocML file." + ); + + mIndicatorWidget->setLayoutType(SnsrIndicatorWidget::IndicatorsCentered); + + mBackgroundContainerLayout->addItem(mMainView); + } + + SCREENSAVER_TEST_FUNC_EXIT("SnsrOledDigitalClockContainer::SnsrOledDigitalClockContainer") +} + +/*! + Destructs the class. + */ +SnsrOledDigitalClockContainer::~SnsrOledDigitalClockContainer() +{ + //mTimeLabel, mAmPmLabel, mDateLabel, mMoveTimer - deleted by the parent +} + +/*! + Updates OLED digital clock widget position. + */ +void SnsrOledDigitalClockContainer::updatePosition() +{ + QSizeF containerSize = mMainContainer->size(); + + // Container must have a valid size to enable calculating the + // destination position for the clock. + if ( containerSize.width() > 0 && containerSize.height() > 0 ) { + containerSize -= mClockContainer->boundingRect().size(); + QRectF containerRect( mMainContainer->pos(), containerSize ); + if ( mInitialize ) { + QPointF clockPos = nextRandomPosition( mClockContainer->pos(), mDestPosition, containerRect ); + mClockContainer->setPos( clockPos ); + } + else { + mDestPosition = randomPosition( containerRect ); + mInitialize = true; + } + } +} + +/*! + Updates displayed time and date. + */ +void SnsrOledDigitalClockContainer::update() +{ + SCREENSAVER_TEST_FUNC_ENTRY("SnsrOledDigitalClockContainer::update") + + // time + mTimeLabel->setPlainText( + HbExtendedLocale().format(QTime::currentTime(), gTimeFormatStr) + ); + mAmPmLabel->setPlainText( + HbExtendedLocale().format(QTime::currentTime(), gAmPmFormatStr) + ); + + // date + if (mCurrentOrientation == Qt::Vertical) { + mDateLabel->setPlainText( + HbExtendedLocale().format( + QDate::currentDate(), gDateFormatVerticalStr) + ); + } else { + mDateLabel->setPlainText( + HbExtendedLocale().format( + QDate::currentDate(), gDateFormatHorizontalStr) + ); + } + + updatePosition(); + + SCREENSAVER_TEST_FUNC_EXIT("SnsrOledDigitalClockContainer::update") +} + +/*! + Changes screensaver layout basing on orientation changes. + \param orientation Current orientation. + */ +void SnsrOledDigitalClockContainer::changeLayout(Qt::Orientation orientation) +{ + SCREENSAVER_TEST_FUNC_ENTRY("SnsrOledDigitalClockContainer::changeLayout") + + if (mCurrentOrientation != orientation) { + mCurrentOrientation = orientation; + + // hide controls to avoid screen flickering + mMainView->hide(); + + QString sectionToLoad(""); + if (mCurrentOrientation == Qt::Horizontal) { + sectionToLoad = gLandscapeSectionName; + } + qDebug() << "loading: " << gOledDigitalLayoutDocml << ", section: " + << sectionToLoad; + bool ok(false); + mDocumentLoader.load(gOledDigitalLayoutDocml, sectionToLoad, &ok); + Q_ASSERT_X(ok, gOledDigitalLayoutDocml, "Invalid section in DocML file."); + + // disconnect container from parent layout, + // connected container resets its position to the one defined in docml + // after label text updates + mClockContainer->setParentLayoutItem(0); + + // update labels before showing the view + update(); + + // view is rebuilt and ready to show + mMainView->show(); + } + + SCREENSAVER_TEST_FUNC_EXIT("SnsrOledDigitalClockContainer::changeLayout") +} + +int SnsrOledDigitalClockContainer::updateIntervalInMilliseconds() +{ + return 60*1000; +} + +// end of file diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/sis/rd-key.pem --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/sis/rd-key.pem Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,15 @@ +-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDLRF+r1FGGkCwTrb420kbnAps7gi1yYUcXYUdWeFTuBeQe5eW4 +6Y+LWaA8HMlDdoHRB0FgASisYcFagwno9+oFf4AJka4H1gWEs5XTGwAA1s0d8XGh +7W7Dt9F5FZij8F7/9Pi6+FhhxZFIf1DD+yry9D7+Sp+BgdNALe4XOpf25QIBAwKB +gQCHgupyjYuvCsgNHn7PNtnvVxInrB5MQNoPli+O+uNJWUK/Q+57Rl+yO8AoEzDX +pFaLWiuVVhsdloDnAgabT/FXzYncs6uOHyEUV+dSXb78vtLPJqAX+Fg2i3hOXreB +yskcZ13/OsKVOu5wgrJkx2baZufkqMwOSytf5y9nwjEIKwJBAP+inobagVNrN62j +KQva3cC+UN/6XnKdTc0CA6bHyLOaJoH1xiMwG/VS2PGjHI0tiSMNtLn/QPpHJ003 +iabGhdUCQQDLjp/9UjFT6K6CF66Chqf30pZXhx+GTSQZmv/gvZiMly7X9fX9BGX3 +2MbJohBC4yI21XKTbisWywkF73Hwh+TRAkEAqmxprzxWN5zPyRdwspHpKymLP/w+ +9xOJM1atGdqFzRFvAU6EF3Vn+OHl9my9s3OwwgkjJqorUYTE3iUGby8D4wJBAIe0 +aqjhdjfwdFa6dFcEb/qMZDpaFQQzbWZnVUB+ZbMPdI/5TqitmU/l2dvBYCyXbCSO +TGJJcg8yBgP09qBamIsCQFL7j1tM0XPVQJQ89WpKCld7O9ORxRGVj1eG0tWijrH8 +mGbYh8SGCVoWV3vrKSS8GBrFVgQnqUaHuEdtM7tpCAQ= +-----END RSA PRIVATE KEY----- diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/sis/rd.cer --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/sis/rd.cer Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,17 @@ +-----BEGIN CERTIFICATE----- +MIICzDCCAjWgAwIBAgIBADANBgkqhkiG9w0BAQUFADArMRAwDgYDVQQKEwdSRCBD +ZXJ0MRcwFQYDVQQDEw5SRCBDZXJ0aWZpY2F0ZTAeFw0wNDExMTUxMjQyMDZaFw0z +NzA5MjMxMjQyMDZaMCsxEDAOBgNVBAoTB1JEIENlcnQxFzAVBgNVBAMTDlJEIENl +cnRpZmljYXRlMIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDLRF+r1FGGkCwT +rb420kbnAps7gi1yYUcXYUdWeFTuBeQe5eW46Y+LWaA8HMlDdoHRB0FgASisYcFa +gwno9+oFf4AJka4H1gWEs5XTGwAA1s0d8XGh7W7Dt9F5FZij8F7/9Pi6+FhhxZFI +f1DD+yry9D7+Sp+BgdNALe4XOpf25QIBA6OCAQAwgf0wDAYDVR0TBAUwAwEB/zAL +BgNVHQ8EBAMCAoQwHQYDVR0OBBYEFFi/kuGzxhVpjGxe9ZwlxC3fH9jFMFMGA1Ud +IwRMMEqAFFi/kuGzxhVpjGxe9ZwlxC3fH9jFoS+kLTArMRAwDgYDVQQKEwdSRCBD +ZXJ0MRcwFQYDVQQDEw5SRCBDZXJ0aWZpY2F0ZYIBADBsBgNVHSAEZTBjMGEGBFUd +IAAwWTATBggrBgEFBQcCARYHaHR0cDovLzBCBggrBgEFBQcCAjA2GjRGb3IgUiZE +IHVzYWdlIG9ubHkuIFRoaXMgY2VydGlmaWNhdGUgaXMgbm90IHRydXN0ZWQuMA0G +CSqGSIb3DQEBBQUAA4GBAHGB4RQMAgBdeT2hxfOr6f2nA/dZm+M5yX5daUtZnET9 +Ed0A9sazLawfN2G1KFQT9kxEParAyoAkpbMAsRrnRz/9cM3OHgFm/NiKRnf50DpT +7oCx0I/65mVD2kt+xXE62/Ii5KPnTufIkPi2uLvURCia1tTS8JmJ8dtxDGyQt8BR +-----END CERTIFICATE----- diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/sis/screensaverapp.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/sis/screensaverapp.pkg Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,47 @@ +; +; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +; All rights reserved. +; This component and the accompanying materials are made available +; under the terms of "Eclipse Public License v1.0" +; which accompanies this distribution, and is available +; at the URL "http://www.eclipse.org/legal/epl-v10.html". +; +; Initial Contributors: +; Nokia Corporation - initial contribution. +; +; Contributors: +; +; Description: +; + +; Language +&EN + +; SIS header: name, uid, version +#{"screensaverapp"},(0x2002704E),1,0,0 + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +; Supports S60 5th Edition +[0x1028315F], 0, 0, 0, {"S60ProductID"} + + +// ---- devicedialogplugin -------------------------------------------- +"/epoc32/release/armv5/urel/snsrdevicedialogplugin.dll" - "c:/sys/bin/snsrdevicedialogplugin.dll" +"/epoc32/data/z/resource/plugins/devicedialogs/snsrdevicedialogplugin.qtplugin" - "c:/resource/plugins/devicedialogs/snsrdevicedialogplugin.qtplugin + +; ---- screensaverplugins -------------------------------------------- + +; -------- snsrbigclockscreensaverplugin +"/epoc32/release/armv5/urel/snsrbigclockscreensaverplugin.dll" - "c:/sys/bin/snsrbigclockscreensaverplugin.dll" +"/epoc32/data/z/resource/qt/translations/snsrbigclockscreensaverplugin.qm" - "c:/resource/qt/translations/snsrbigclockscreensaverplugin.qm" +"/epoc32/data/z/snsrresources/plugins/screensaverplugins/snsrbigclockscreensaverplugin.qtplugin" - "c:/snsrresources/plugins/screensaverplugins/snsrbigclockscreensaverplugin.qtplugin" +"/epoc32/data/z/snsrresources/plugins/screensaverplugins/snsrbigclockscreensaverplugin.xml" - "c:/snsrresources/plugins/screensaverplugins/snsrbigclockscreensaverplugin.xml" + +; ---- snsrutils -------------------------------------------- + +"/epoc32/release/armv5/urel/snsrutils.dll" - "c:/sys/bin/snsrutils.dll" diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/sis/screensaverapp_sisx.bat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/sis/screensaverapp_sisx.bat Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,30 @@ +@rem +@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +@rem All rights reserved. +@rem This component and the accompanying materials are made available +@rem under the terms of "Eclipse Public License v1.0" +@rem which accompanies this distribution, and is available +@rem at the URL "http://www.eclipse.org/legal/epl-v10.html". +@rem +@rem Initial Contributors: +@rem Nokia Corporation - initial contribution. +@rem +@rem Contributors: +@rem +@rem Description: +@rem +@echo off + +if exist screensaverapp.sisx del screensaverapp.sisx + +makesis screensaverapp.pkg +signsis screensaverapp.sis screensaverapp.sisx rd.cer rd-key.pem + +if exist screensaverapp.sisx ( +echo screensaverapp.sisx creation SUCCEEDED +del screensaverapp.sis +) + +if not exist screensaverapp.sisx ( +echo screensaverapp.sisx creation FAILED +) \ No newline at end of file diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/snsrutils/inc/snsrlabel.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/snsrutils/inc/snsrlabel.h Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,51 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Screensaver label. +* +*/ + +#ifndef SNSRLABEL_H +#define SNSRLABEL_H + +#include + +#include "snsrutils_global.h" +#include "snsrtest_global.h" + +SCREENSAVER_TEST_CLASS(T_SnsrUtils) + +class SNSRUTILS_EXPORT SnsrLabel : public HbLabel +{ + + Q_OBJECT + +public: + + SnsrLabel(QGraphicsItem *parent = 0); + SnsrLabel(const QString &displayText, QGraphicsItem *parent = 0); + ~SnsrLabel(); + +protected: + + virtual void changeEvent(QEvent *event); + +private: + + void setThemedTextColor(); + + SCREENSAVER_TEST_FRIEND_CLASS(T_SnsrUtils) + +}; + +#endif // SNSRLABEL_H diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/snsrutils/inc/snsrutils_global.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/snsrutils/inc/snsrutils_global.h Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,33 @@ +/* +* 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: snsrutils_global.h +* +*/ + +#ifndef SNSRUTILS_GLOBAL_H +#define SNSRUTILS_GLOBAL_H + +#include + +#ifdef SNSRUTILS_LIB + #define SNSRUTILS_EXPORT Q_DECL_EXPORT +#else + #ifdef SNSRUTILS_TEST + #define SNSRUTILS_EXPORT + #else + #define SNSRUTILS_EXPORT Q_DECL_IMPORT + #endif +#endif + +#endif // SNSRUTILS_GLOBAL_H diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/snsrutils/snsrutils.pri --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/snsrutils/snsrutils.pri Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,26 @@ +# +# 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: +# + +HEADERS += ./inc/*.h + +SOURCES += ./src/*.cpp + +DEPENDPATH += . \ + inc \ + src + +INCLUDEPATH += . \ + inc diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/snsrutils/snsrutils.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/snsrutils/snsrutils.pro Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,29 @@ +# +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + +TEMPLATE = lib + +include (../common.pri) + +CONFIG += hb + +DEFINES += SNSRUTILS_LIB + +symbian: { + TARGET.UID3 = 0x20027056 +} + +include(snsrutils.pri) diff -r f75922b9e380 -r 4c11ecddf6b2 screensaver/snsrutils/src/snsrlabel.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/snsrutils/src/snsrlabel.cpp Thu Jul 22 16:31:09 2010 +0100 @@ -0,0 +1,82 @@ +/* +* 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: Screensaver label. +* +*/ + +#include "snsrlabel.h" + +#include +#include + +const QString snsrForegroundColorRole("snsrforeground"); + +/*! + \class SnsrLabel + \ingroup group_snsrutils + \brief Screensaver label. + */ + +/*! + Constructs a new SnsrLabel. + \param parent Graphics parent item. + */ +SnsrLabel::SnsrLabel(QGraphicsItem *parent) + : HbLabel(parent) +{ + setThemedTextColor(); +} + +/*! + Constructs a new SnsrLabel. + \param displayText Text the label should display. + \param parent Graphics parent item. + */ +SnsrLabel::SnsrLabel(const QString &displayText, QGraphicsItem *parent) + : HbLabel(displayText, parent) +{ + setThemedTextColor(); +} + +/*! + Destructs the class. + */ +SnsrLabel::~SnsrLabel() +{ +} + +/*! + \reimp + */ +void SnsrLabel::changeEvent(QEvent * event) +{ + if (event->type() == HbEvent::ThemeChanged) { + setThemedTextColor(); + } + return HbLabel::changeEvent(event); +} + +/*! + Sets the label's color to follow the theme. + */ +void SnsrLabel::setThemedTextColor() +{ + QColor textColor(HbColorScheme::color(snsrForegroundColorRole)); + if (textColor.isValid()) { + setTextColor(textColor); + } else { + // fallback mechanism when color definition is missing in default theme + setTextColor(Qt::white); + } +} diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/common.pri --- a/taskswitcherapp/common.pri Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,77 +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: taskswitcherapp project - common QMake settings -# - -CONFIG += debug_and_release - -# On win32 and mac, debug and release libraries are named differently. -# We must follow the debug and release settings Qt was compiled with: -# build debug iff Qt built debug, build release iff Qt built release. -win32|mac { - !contains(QT_CONFIG,debug)|!contains(QT_CONFIG,release) { - CONFIG -= debug_and_release debug release - contains(QT_CONFIG,debug): CONFIG+=debug - contains(QT_CONFIG,release):CONFIG+=release - } -} - -CONFIG(debug, debug|release) { - SUBDIRPART = debug -} else { - SUBDIRPART = release -} - -win32: OUTPUT_DIR = $$PWD/../../bin/$$SUBDIRPART -symbian: OUTPUT_DIR = $$PWD/bin - -#test whether we have a unit test -!testcase { - OBJECTS_DIR = $$OUTPUT_DIR/tmp/$$TARGET - DESTDIR = $$OUTPUT_DIR - MOC_DIR = $$OUTPUT_DIR/tmp/$$TARGET/moc - RCC_DIR = $$OUTPUT_DIR/tmp/$$TARGET/rcc - UI_DIR = $$OUTPUT_DIR/tmp/$$TARGET/ui -} else { # test part is NOT DONE - QT *= testlib - CONFIG += console - CONFIG -= app_bundle - OBJECTS_DIR = $$OUTPUT_DIR/tests/tmp/$$TARGET - DESTDIR = $$OUTPUT_DIR - MOC_DIR = $$OUTPUT_DIR/tests/tmp/$$TARGET/moc - RCC_DIR = $$OUTPUT_DIR/tests/tmp/$$TARGET/rcc - UI_DIR = $$OUTPUT_DIR/tests/tmp/$$TARGET/ui - coverage { - DEFINES += COVERAGE_MEASUREMENT - DEFINES += QT_NO_DEBUG # omit ASSERTS in coverage measurements - } -} - -# Add the output dirs to the link path too -LIBS += -L$$DESTDIR - -#For some reason the default include path doesn't include MOC_DIR on symbian -symbian { - INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE - INCLUDEPATH += $$MOC_DIR - TARGET.CAPABILITY = ALL -TCB - TARGET.EPOCALLOWDLLDATA=1 -} - -win32 { - # add platfrom API for windows - INCLUDEPATH += \ - $$PWD/../../homescreensrv/homescreensrv_plat/contentstorage_api \ - $$PWD/../../homescreensrv/homescreensrv_plat/hswidgetmodel_api \ -} diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/rom.pri --- a/taskswitcherapp/rom.pri Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +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: -# - -BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include " -BLD_INF_RULES.prj_exports += "rom/tsapplication_core.iby CORE_APP_LAYER_IBY_EXPORT_PATH(tsapplication_core.iby)" -BLD_INF_RULES.prj_exports += "rom/tsapplication_resources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(tsapplication_resources.iby)" -BLD_INF_RULES.prj_exports += "./sis/stubs/taskswitcher_stub.sis /epoc32/release/winscw/udeb/z/system/install/taskswitcher_stub.sis" -BLD_INF_RULES.prj_exports += "./sis/stubs/taskswitcher_stub.sis /epoc32/data/z/system/install/taskswitcher_stub.sis" \ No newline at end of file diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/rom/tsapplication_core.iby --- a/taskswitcherapp/rom/tsapplication_core.iby Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ -#ifndef __TSAPP_CORE_IBY__ -#define __TSAPP_CORE_IBY__ - -data=\epoc32\data\z\resource\qt\crml\tsexternalactivation.qcrml resource\qt\crml\tsexternalactivation.qcrml - -file=ABI_DIR\BUILD_DIR\tsdevicedialogplugin.dll SHARED_LIB_DIR\tsdevicedialogplugin.dll -data=\epoc32\data\z\resource\plugins\devicedialogs\tsdevicedialogplugin.qtplugin resource\plugins\devicedialogs\tsdevicedialogplugin.qtplugin - -// stub sis -data=ZSYSTEM/install/taskswitcher_stub.sis system/install/taskswitcher_stub.sis - -#endif //__TSAPP_CORE_IBY__ diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/rom/tsapplication_resources.iby --- a/taskswitcherapp/rom/tsapplication_resources.iby Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ -#ifndef __TSAPP_LANGUAGE_IBY__ -#define __TSAPP_LANGUAGE_IBY__ - -// -------- hsapplication -data=DATAZ_\resource\qt\translations\taskswitcher.qm resource\qt\translations\taskswitcher.qm - -#endif //__TSAPP_LANGUAGE_IBY__ diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/sis/buildSis.cmd --- a/taskswitcherapp/sis/buildSis.cmd Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -@rem -@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -@rem All rights reserved. -@rem This component and the accompanying materials are made available -@rem under the terms of "Eclipse Public License v1.0" -@rem which accompanies this distribution, and is available -@rem at the URL "http://www.eclipse.org/legal/epl-v10.html". -@rem -@rem Initial Contributors: -@rem Nokia Corporation - initial contribution. -@rem -@rem Contributors: -@rem -@rem Description: -@rem -@echo off -setlocal EnableDelayedExpansion -set openpar=( -set closepar=) - -if exist *.sis* ( del *.sis* ) -if exist tmp.pkg ( del tmp.pkg ) - -copy /Y taskswitcher.pkg tmp.pkg > NUL - -echo Creating sis for each component: -for /R .. %%i IN (*_template.pkg) DO set tmpname=%%~ni && set modulename=!tmpname:~0,-10!&& call createpackage %%i release-armv5 cert.cer key.pem > NUL && set sisname=%%~dpi!modulename!_release-armv5.sis && if exist !sisname! ( echo [SUCCEEDED] !modulename! [SUCCEEDED] && move !sisname! . && FOR /F "eol=( tokens=4 delims=({}" %%j IN (%%i) DO FOR /F "tokens=1 delims=)" %%k IN ("%%j") DO echo @"!modulename!_release-armv5.sis",!openpar!%%k!closepar! >> tmp.pkg ) else ( echo [FAILED] !modulename! [FAILED] ) - -REM echo. - -echo Embedding all sis files into single sis -makesis tmp.pkg taskswitcher.sis >NUL -signsis taskswitcher.sis taskswitcher.sisx cert.cer key.pem >NUL - -echo Cleaning up -del tmp.pkg -del taskswitcher.sis -del *_release-armv5.sis* -pause diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/sis/edit_pkg.pl --- a/taskswitcherapp/sis/edit_pkg.pl Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,225 +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: -# -#Options: -# -version -adds Qt version (4,6,0) intp pkg files -# -target -replaces $(PLATFORM)/$(TARGET) into armv5/urel -# -module -creates script for module tests sis -# -module -delete module tests pkg -# default -version - -use strict; -use File::Find; -my $base = `cd`; -$base =~ s/\\\w+\s+$//; #move one dir upper -my $modulebase = `cd`; -$modulebase =~s/(\s+)$//; #remove linefeed from end -print $base;; -my $qtversion = "\, 4\, 6\, 0\,"; -my $target = "armv5\/urel"; - -my $qtversionchnage = 0; -my $qtversionarg = "-version"; -my $targetchnage = 0; -my $targetarg = "-target"; -my $module = 0; -my $modulearg = "-module"; -my $delmodule = 0; -my $delmodulearg = "-delmodule"; -my $moduledir = "modulesis"; -my $modulepath = $base."\\".$moduledir; -my $ccert = $modulebase."\\"."cert.cer"; -my $ckey = $modulebase."\\"."key.pem"; -my $modulebatpath = $modulebase."\\".$moduledir."\\createmodulesis.bat"; - -checkCmdLine(); - -if ( $qtversionchnage == 1 || $targetchnage == 1 ) - { - find( \&edits, $base ); - } -if ( $module == 1 ) - { - system "mkdir $moduledir"; - if ( not ( open (FWM, ">$modulebatpath") ) ) - { - print "\n***Error: Couldn't open $modulebatpath file to write\n"; - return; - } - binmode FWM; - print FWM "del /S/Q *.SIS\r\n"; - print FWM "del /S/Q *.SISX\r\n"; - close FWM; - find( \&moduleSis, $base ); - } -if ( $delmodule == 1 ) - { - find( \&delModuleSis, $base ); - } - -sub edits() - { - my $file=$_; - my $winpath=$File::Find::name; - $winpath=~s/\//\\/g; - if( -f $file && $file=~/(_template\.pkg)$/i ) - { - print "$winpath "; - system "attrib -R $winpath"; - if ( not ( open (FR, $winpath) ) ) - { - print "Error: Couldn't open $winpath file to read\n"; - return; - } - binmode FR; - my $buf=""; - my $length = 0; - $length = -s $winpath; - read( FR, $buf, $length ); - close FR; - if ( $qtversionchnage == 1 ) - { - $buf =~s/\,\s*\,\s*\,\s*\,\s*\{\"Qt\"\}/$qtversion \{\"Qt\"\}/si; - } - if ( $targetchnage == 1 ) - { - $buf =~s/\$$PLATFORM$\/\$$TARGET$/$target/si; - } - - if ( not ( open (FW, ">$winpath") ) ) - { - print "\n***Error: Couldn't open $winpath file to write\n"; - return; - } - binmode FW; - print FW $buf; - close FW; - - print "\r\n"; - } - } - -sub checkCmdLine() - { - my $numArgs = $#ARGV + 1; - if ( $numArgs == 0 ) - { - $qtversionchnage = 1; - } - else - { - foreach my $argnum ( 0 .. $#ARGV ) - { - my $argName = lc $ARGV[$argnum]; - if ( $argName eq $qtversionarg ) - { - $qtversionchnage = 1; - } - elsif ( $argName eq $targetarg ) - { - $targetchnage = 1; - } - elsif ( $argName eq $modulearg ) - { - $module = 1; - } - elsif ( $argName eq $delmodulearg ) - { - $delmodule = 1; - } - else - { - die "\n***Error: Bad arguments\n"; - } - } - } - } - -sub moduleSis() - { - my $file=$_; - my $winpath=$File::Find::name; - $winpath=~s/\//\\/g; - - - if( -f $file && $file=~/(_template\.pkg)$/i && ( $file=~/^(t_)/i || $file=~/test/i ) ) - { - print "$winpath "; - system "attrib -R $winpath"; - if ( not ( open (FR, $winpath) ) ) - { - print "Error: Couldn't open $winpath file to read\n"; - return; - } - binmode FR; - my $buf=""; - my $length = 0; - $length = -s $winpath; - read( FR, $buf, $length ); - close FR; - $buf =~s/\,\s*\,\s*\,\s*\,\s*\{\"Qt\"\}/$qtversion \{\"Qt\"\}/si; - $buf =~s/\$$PLATFORM$\/\$$TARGET$/$target/si; - - if ( not ( open (FW, ">$winpath") ) ) - { - print "Error: Couldn't open $winpath file to write\n"; - return; - } - binmode FW; - print FW $buf; - close FW; - print "\r\n"; - - my $pkgname = sisName( $winpath ); - - if ( not ( open (FWM2, ">>$modulebatpath") ) ) - { - print "Error: Couldn't open $modulebatpath file to append\n"; - return; - } - binmode FWM2; - print FWM2 "makesis $winpath $pkgname\.SIS\r\n"; - print FWM2 "signsis $pkgname\.SIS $pkgname\.SISX $ccert $ckey\r\n"; - close FWM2; - } - } - -sub sisName() - { - my $path = shift; - my $name = ""; - if ( $path =~ /\\(\w+)\.pkg/i ) - { - $name = $1; - } - return $name; - } - -sub delModuleSis() - { - my $file=$_; - my $winpath=$File::Find::name; - $winpath=~s/\//\\/g; - - - if( -f $file && $file=~/(_template\.pkg)$/i && ( $file=~/^(t_)/i || $file=~/test/i ) ) - { - print "Deleting: "; - print "$winpath "; - system "attrib -R $winpath"; - system "del /S/Q $winpath"; - print "\r\n"; - } - } \ No newline at end of file diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/sis/stubs/createstubs.bat --- a/taskswitcherapp/sis/stubs/createstubs.bat Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -@rem -@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -@rem All rights reserved. -@rem This component and the accompanying materials are made available -@rem under the terms of "Eclipse Public License v1.0" -@rem which accompanies this distribution, and is available -@rem at the URL "http://www.eclipse.org/legal/epl-v10.html". -@rem -@rem Initial Contributors: -@rem Nokia Corporation - initial contribution. -@rem -@rem Contributors: -@rem -@rem Description: -@rem - -for %%f in (*.pkg) do makesis -s %%f diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/sis/stubs/taskswitcher_stub.pkg --- a/taskswitcherapp/sis/stubs/taskswitcher_stub.pkg Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +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: -; -; ------------------------------------------------------------------------------ -; Taskswitcher stub SIS package file. -; Used to enable Taskswitcher to be updated from ROM with a SIS package. -; When you add new files into this stub, please remember to update -; SIS stub with "makesis -s" command. -; ------------------------------------------------------------------------------ -; -;Language - standard language definitions -&EN - -; standard SIS file header -#{"taskswitcher"},(0x2002677F),1,0,0,TYPE=SA - -;Localized Vendor Name -%{"Nokia"} - -;Unique Vendor name -:"Nokia" - -""-"Z:\resource\qt\translations\taskswitcher.qm" -""-"Z:\resource\qt\crml\tsexternalactivation.qcrml" - -""-"Z:\sys\bin\tsdevicedialogplugin.dll" -""-"Z:\resource\plugins\devicedialogs\tsdevicedialogplugin.qtplugin" diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/sis/stubs/taskswitcher_stub.sis Binary file taskswitcherapp/sis/stubs/taskswitcher_stub.sis has changed diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/sis/taskswitcher.pkg --- a/taskswitcherapp/sis/taskswitcher.pkg Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +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: -; - -;Language - standard language definitions -&EN - -; standard SIS file header -#{"taskswitcher"},(0x2002677F),1,0,0,TYPE=SA, RU - -;Localized Vendor Name -%{"Nokia"} - -;Unique Vendor name -:"Nokia" - -"/epoc32/data/z/resource/qt/translations/taskswitcher.qm"-"!:\resource\qt\translations\taskswitcher.qm" -"/epoc32/data/z/resource/qt/crml/tsexternalactivation.qcrml"-"!:\resource\qt\crml\tsexternalactivation.qcrml" - -"/epoc32/release/armv5/urel/tsdevicedialogplugin.dll"-"!:\sys\bin\tsdevicedialogplugin.dll" -"/epoc32/data/z/resource/plugins/devicedialogs/tsdevicedialogplugin.qtplugin"-"!:\resource\plugins\devicedialogs\tsdevicedialogplugin.qtplugin" \ No newline at end of file diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/taskswitcherapp.pro --- a/taskswitcherapp/taskswitcherapp.pro Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -# -# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -# All rights reserved. -# This component and the accompanying materials are made available -# under the terms of "Eclipse Public License v1.0" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# - -TEMPLATE = subdirs - -SUBDIRS += tsdevicedialogplugin - -tests { - SUBDIRS += internal\tstestrunner - SUBDIRS += tsdevicedialogplugin\tsrc - SUBDIRS += ..\..\homescreensrv\activityfw\activityserviceplugin\unittests - SUBDIRS += ..\..\homescreensrv\activityfw\activitydatabase\hsactivitydbclient\t_hsactivitydbclient - SUBDIRS += ..\..\homescreensrv\hsappkeyhandler\tsrc\t_hsappkeyhandler - SUBDIRS += ..\..\homescreensrv\activityfw\activityserviceplugin\s60\tsrc -} - -coverage { - SUBDIRS += ..\..\homescreensrv\activityfw - SUBDIRS += ..\..\homescreensrv\hsappkeyhandler -} - -symbian:include(rom.pri) - -CONFIG += ordered diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/tsdevicedialogplugin/conf/tsdevicedialog.confml Binary file taskswitcherapp/tsdevicedialogplugin/conf/tsdevicedialog.confml has changed diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/tsdevicedialogplugin/conf/tsdevicedialog_2002677F.crml Binary file taskswitcherapp/tsdevicedialogplugin/conf/tsdevicedialog_2002677F.crml has changed diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/tsdevicedialogplugin/inc/tsactivitymodelitem.h --- a/taskswitcherapp/tsdevicedialogplugin/inc/tsactivitymodelitem.h Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,56 +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: tsactivitymodelitem.h -* -*/ - -#ifndef TSACTIVITYMODELITEM_H -#define TSACTIVITYMODELITEM_H -#include "tsmodelitem.h" -#include -#include -/*! - Implements model item which represents Activity entry -*/ -class TsActivityModelItem : public TsModelItem -{ - Q_OBJECT -public: - TsActivityModelItem(QAbstractListModel &model, QObject &service, const QVariantHash &activity); - ~TsActivityModelItem(); - QVariant data(int role) const; - void close(); - void open(); - static QString applicationKeyword(); - static QString visibilityKeyword(); - static QString screenshotKeyword(); - -private: - QVariant decorationRole() const; - QVariant displayRole() const; - QVariant visibilityRole() const; - -private slots: - void thumbnailReady(QPixmap, void *); -signals: - void entryChanged(TsModelItem *); - -private: - QObject &mService; - const QVariantHash mActivity; - QIcon mIcon; - bool mRequetPending; -}; - -#endif // TSACTIVITYMODELITEM_H diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/tsdevicedialogplugin/inc/tsdataroles.h --- a/taskswitcherapp/tsdevicedialogplugin/inc/tsdataroles.h Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ -#ifndef TSDATAROLES_H -#define TSDATAROLES_H - -namespace TsDataRoles { - enum EntryAttributes { - Closable = Qt::UserRole + 1, - Visible, - }; -} - -#endif // TSDATAROLES_H diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/tsdevicedialogplugin/inc/tsdevicedialog.h --- a/taskswitcherapp/tsdevicedialogplugin/inc/tsdevicedialog.h Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,51 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -#ifndef TSDEVICEDIALOG_H -#define TSDEVICEDIALOG_H - -#include -#include - -class QGraphicsLinearLayout; -class HbDocumentLoader; - -class TsDeviceDialog : public HbDialog, public HbDeviceDialogInterface -{ - Q_OBJECT - -public: - TsDeviceDialog(HbDocumentLoader &loader, QGraphicsItem *parent = 0); - ~TsDeviceDialog(); - - virtual bool setDeviceDialogParameters(const QVariantMap ¶meters); - virtual int deviceDialogError() const; - virtual void closeDeviceDialog(bool byClient); - virtual HbPopup *deviceDialogWidget() const; - -signals: - void deviceDialogClosed(); - -public slots: - void changeOrientation(Qt::Orientation orientation); - -private: - HbDocumentLoader &mLoader; - -}; - -#endif // TSDEVICEDIALOG_H diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/tsdevicedialogplugin/inc/tsdevicedialogplugin.h --- a/taskswitcherapp/tsdevicedialogplugin/inc/tsdevicedialogplugin.h Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -#ifndef TSDEVICEDIALOGPLUGIN_H -#define TSDEVICEDIALOGPLUGIN_H - -#include - -#include -#include -#include -#include - -#include "tsdocumentloader.h" - -class CaService; -class TsDeviceDialogPlugin : public HbDeviceDialogPlugin -{ - Q_OBJECT - -public: - TsDeviceDialogPlugin(); - ~TsDeviceDialogPlugin(); - - bool accessAllowed(const QString &deviceDialogType, const QVariantMap ¶meters, const QVariantMap &securityInfo) const; - HbDeviceDialogInterface *createDeviceDialog(const QString &deviceDialogType, const QVariantMap ¶meters); - bool deviceDialogInfo(const QString &deviceDialogType, const QVariantMap ¶meters, DeviceDialogInfo *info) const; - QStringList deviceDialogTypes() const; - PluginFlags pluginFlags() const; - int error() const; - -private slots: - void activated(QModelIndex index); - void pressed(); - void longPressed(); - -signals: - void activate(QModelIndex); - -private: - int mError; - TsDocumentLoader mLoader; - QAbstractListModel *mModel; - QSharedPointer mStorage; - bool mLongPressed; - - Q_DISABLE_COPY(TsDeviceDialogPlugin) -}; - -#endif // TSDEVICEDIALOGPLUGIN_H diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/tsdevicedialogplugin/inc/tsdocumentloader.h --- a/taskswitcherapp/tsdevicedialogplugin/inc/tsdocumentloader.h Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +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: Screensaver custom document loader. -* -*/ - -#ifndef TSDOCUMENTLOADER_H -#define TSDOCUMENTLOADER_H - -#include - -class TsDocumentLoader : public HbDocumentLoader -{ - -private: - virtual QObject *createObject(const QString &type, const QString &name); - -}; - -#endif // TSDOCUMENTLOADER_H diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/tsdevicedialogplugin/inc/tsentrymodelitem.h --- a/taskswitcherapp/tsdevicedialogplugin/inc/tsentrymodelitem.h Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +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: tsentrymodelitem.h -* -*/ - -#ifndef TSENTRYMODELITEM_H -#define TSENTRYMODELITEM_H -#include "tsmodelitem.h" -#include - -class CaEntry; - -/*! - Class implements model item which represents Content Arsenal entry -*/ -class TsEntryModelItem : public TsModelItem -{ -public: - TsEntryModelItem(CaService &service, QSharedPointer entry, QSize mSize); - ~TsEntryModelItem(); - QVariant data(int role) const; - void close(); - void open(); - -private: - bool closable() const; - -private: - CaService &mService; - const QSharedPointer mEntry; - const QSize mSize; -}; - -#endif // TSMODEL_H diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/tsdevicedialogplugin/inc/tsmodel.h --- a/taskswitcherapp/tsdevicedialogplugin/inc/tsmodel.h Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,97 +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: tsmodel.h -* -*/ - -#ifndef TSMODEL_H -#define TSMODEL_H - -#include -#include -#include -#include -#include -#include - -class CaService; -class ActivityManager; -class CaNotifier; -class TsModelItem; - -class TsModel : public QAbstractListModel -{ - Q_OBJECT - -public: - explicit TsModel(CaService &applicationSrv, - QObject &activitySrv, - QObject *parent = 0); - ~TsModel(); - - int rowCount(const QModelIndex &parent = QModelIndex()) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - int maxRowCount()const; - -public slots: - void openApplication(const QModelIndex &index); - void closeApplication(const QModelIndex &index); - void updateModel(); - void entryChanged(CaEntry, ChangeType); - void entryChanged(TsModelItem *); -private: - TsModelItem *entry(const QModelIndex &index) const; - void getApplications(); - void getActivities(); - void prepareActivityEntry(QVariantHash &activity); - QString getApplicationName(int id); - -private: - /* - * List containing result - */ - QList mEntries; - - /* - * Query - */ - CaQuery mQuery; - - /* - * Content Arsenal Service - */ - CaService &mApplicationService; - - /* - * Activity Service - */ - QObject &mActivityService; - - /* - * Content Arsenal Notifier - */ - CaNotifier *mNotifier; - - /* - * Icon size in model - */ - QSize mSize; - - /* - * Maximum number of items (only for running apps + activities) - */ - int mMaxItems; -}; - -#endif // TSMODEL_H diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/tsdevicedialogplugin/inc/tsmodelitem.h --- a/taskswitcherapp/tsdevicedialogplugin/inc/tsmodelitem.h Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +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: tsmodelitem.h -* -*/ - -#ifndef TSMODELITEM_H -#define TSMODELITEM_H -#include -#include -/*! - Abstract class which define model item for taskswitcher -*/ -class TsModelItem: public QObject -{ - Q_OBJECT - -public: - virtual QVariant data(int role) const =0; - virtual void close() =0; - virtual void open() =0; -}; - -#endif // TSMODELITEM_H diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/tsdevicedialogplugin/inc/tstasksgrid.h --- a/taskswitcherapp/tsdevicedialogplugin/inc/tstasksgrid.h Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ -#ifndef TSTASKSGRID_H -#define TSTASKSGRID_H - -#include - -class TsTasksGrid : public HbGridView -{ - Q_OBJECT - -signals: - void deleteButtonClicked(const QModelIndex &index); - -protected: - virtual void polishEvent(); - -}; - -#endif // TSTASKSGRID_H diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/tsdevicedialogplugin/inc/tstasksgriditem.h --- a/taskswitcherapp/tsdevicedialogplugin/inc/tstasksgriditem.h Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ -#ifndef TSTASKSGRIDITEM_H -#define TSTASKSGRIDITEM_H - -#include - -class HbLabel; -class HbPushButton; - -class TsTasksGridItem : public HbAbstractViewItem -{ - Q_OBJECT - -public: - TsTasksGridItem(); - TsTasksGridItem(const TsTasksGridItem &item); - ~TsTasksGridItem(); - - HbAbstractViewItem *createItem(); - void updateChildItems(); - -private slots: - void handleDeleteClicked(); - -signals: - void deleteClicked(const QModelIndex &index); - -private: - HbLabel *mScreenshotLabel; - HbLabel *mApplicationNameLabel; - HbPushButton *mDeleteButton; - -}; - -#endif //TSTASKSGRIDITEM_H diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/tsdevicedialogplugin/resource/delete.png Binary file taskswitcherapp/tsdevicedialogplugin/resource/delete.png has changed diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/tsdevicedialogplugin/resource/layout.docml --- a/taskswitcherapp/tsdevicedialogplugin/resource/layout.docml Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - -

- - - - - - - - -

- diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/tsdevicedialogplugin/src/tsactivitymodelitem.cpp --- a/taskswitcherapp/tsdevicedialogplugin/src/tsactivitymodelitem.cpp Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,186 +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: tsactivitymodelitem.cpp -* -*/ -#include "tsactivitymodelitem.h" -#include "tsdataroles.h" -#include -#include - -/*! - \class TsActivityModelItem - \ingroup group_tsdevicedialogplugin - \brief Item presenting activity in the grid. -*/ - -/*! - Standard C++ constructor - /param model - reference to parent model - /param service - reference to initialized ActivityManager instance - /param entry - Activity data -*/ -TsActivityModelItem::TsActivityModelItem(QAbstractListModel &model, - QObject& service, - const QVariantHash & activity) - : - mService(service), - mActivity(activity), - mIcon(), - mRequetPending(false) -{ - connect(this, - SIGNAL(entryChanged(TsModelItem *)), - &model, - SLOT(entryChanged(TsModelItem *))); - connect(&mService, - SIGNAL(thumbnailReady(QPixmap, void *)), - this, - SLOT(thumbnailReady(QPixmap, void *))); -} - -/*! - Standard C++ destructor - /param service - reference to initialized ActivityManager instance - /param entry - Activity data -*/ -TsActivityModelItem::~TsActivityModelItem() -{ -} - -/*! - Returns the data stored under the given role. - /param role - requested data role - /return data encapulated by QVariant -*/ -QVariant TsActivityModelItem::data(int role) const -{ - switch (role) { - case Qt::DisplayRole: - return displayRole(); - case Qt::DecorationRole: - return decorationRole(); - case TsDataRoles::Closable: - return QVariant(false); - case TsDataRoles::Visible: - return visibilityRole(); - default: - return QVariant(QVariant::Invalid); - } -} - -/*! - Empty interface implementation -*/ -void TsActivityModelItem::close() -{ - //no implementation required -} - -/*! - Open or move to foreground activity repesented by entry -*/ -void TsActivityModelItem::open() -{ - QVariantHash::const_iterator - app(mActivity.constFind(ActivityApplicationKeyword)), - act(mActivity.constFind(ActivityActivityKeyword)); - - if (mActivity.end() != app && mActivity.end() != act) { - QMetaObject::invokeMethod(&mService, - "launchActivity", - Q_ARG(int, app.value().toInt()), - Q_ARG(QString, act.value().toString())); - } -} - -/*! - Return application name keyword -*/ -QString TsActivityModelItem::applicationKeyword() -{ - static QString applciationName(":ApplicationName"); - return applciationName; -} - -/*! - Return activity visibility status keyword -*/ -QString TsActivityModelItem::visibilityKeyword() -{ - static QString visibility("visible"); - return visibility; -} - -/*! - Return activity screenshot keyword -*/ -QString TsActivityModelItem::screenshotKeyword() -{ - static QString screenshot("screenshot"); - return screenshot; -} - -/*! - Returns the data stored under decoration role. - /return data encapulated by QVariant -*/ -QVariant TsActivityModelItem::decorationRole() const -{ - if (!mRequetPending) { - const_cast(this)->mRequetPending = true; - QVariantHash::const_iterator node(mActivity.constFind(screenshotKeyword())); - if (mActivity.end() != node) { - QMetaObject::invokeMethod(&mService, - "getThumbnail", - Q_ARG(QSize, QSize(128, 128)), - Q_ARG(QString, node.value().toString()), - Q_ARG(void *, const_cast(this))); - } - } - return QVariant::fromValue(HbIcon(mIcon)); -} - -/*! - Returns the data stored under display role. - /return data encapulated by QVariant -*/ -QVariant TsActivityModelItem::displayRole() const -{ - QVariantHash::const_iterator node(mActivity.find(applicationKeyword())); - return mActivity.end() != node ? node.value() : QVariant(QString::null); -} - -/*! - Returns the data stored under visibility role. - /return data encapulated by QVariant -*/ -QVariant TsActivityModelItem::visibilityRole() const -{ - QVariantHash::const_iterator node(mActivity.find(visibilityKeyword())); - return mActivity.end() != node ? node.value() : QVariant(true); -} - -/*! - Slot retrieve thumbnail form TM, update content and notify observers - /param pixmap - thumbnail content - /ptr - user data provided to request -*/ -void TsActivityModelItem::thumbnailReady(QPixmap pixmap, void *ptr) -{ - if (ptr == this) { - mIcon = pixmap; - emit entryChanged(this); - } -} diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/tsdevicedialogplugin/src/tsdevicedialog.cpp --- a/taskswitcherapp/tsdevicedialogplugin/src/tsdevicedialog.cpp Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,94 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Default Screensaver runtime. -* -*/ - -#include -#include - -#include "tsdevicedialog.h" - -/*! - \class TsDeviceDialog - \ingroup group_tsdevicedialogplugin - \brief TaskSwitcher Device Dialog. - */ - -/*! - Constructor. - \param parent Parent. - */ -TsDeviceDialog::TsDeviceDialog(HbDocumentLoader &loader, QGraphicsItem *parent) : HbDialog(parent), mLoader(loader) -{ - connect(mainWindow(), SIGNAL(orientationChanged(Qt::Orientation)), this, SLOT(changeOrientation(Qt::Orientation))); - connect(this, SIGNAL(aboutToClose()), this, SIGNAL(deviceDialogClosed())); -} - -TsDeviceDialog::~TsDeviceDialog() -{ - qDebug("Destruction"); -} - -/*! - Sets device dialog parameters. - \param parameters Device Dialog's parameters to be set. - \ret return true if parameters are correct. - */ -bool TsDeviceDialog::setDeviceDialogParameters(const QVariantMap ¶meters) -{ - Q_UNUSED(parameters); - return false; -} - -/*! - Returns error code. - \ret error code. - */ -int TsDeviceDialog::deviceDialogError() const -{ - return 0; -} - -/*! - Closes device dialog. - \param byClient If dialog is close by client. - */ -void TsDeviceDialog::closeDeviceDialog(bool byClient) -{ - Q_UNUSED(byClient) - hide(); - emit deviceDialogClosed(); -} - -/*! - Returns device dialog instance. - \ret Device dialog instance. - */ -HbPopup *TsDeviceDialog::deviceDialogWidget() const -{ - return const_cast(this); -} - -void TsDeviceDialog::changeOrientation(Qt::Orientation orientation) -{ - qDebug("Loading DOCML data for orientation %d", orientation); - bool ok(true); - if (orientation == Qt::Horizontal) { - mLoader.load(":/xml/resource/layout.docml", "landscape", &ok); - } else { - mLoader.load(":/xml/resource/layout.docml", "portrait", &ok); - } - Q_ASSERT(ok); -} diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/tsdevicedialogplugin/src/tsdevicedialogplugin.cpp --- a/taskswitcherapp/tsdevicedialogplugin/src/tsdevicedialogplugin.cpp Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,177 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -#include -#include -#include -#include - -#include "tsdevicedialogplugin.h" -#include "tsdevicedialog.h" -#include "tstasksgrid.h" -#include "tstasksgriditem.h" -#include "tsdocumentloader.h" -#include "tsmodel.h" -#include - -/*! - \class TsDeviceDialogPlugin - \ingroup group_tsdevicedialogplugin - \brief TaskSwitcher Device Dialog Plug-in. - */ - -const QString KTsDialogType = "com.nokia.taskswitcher.tsdevicedialogplugin/1.0"; - -/*! - Constructor. - */ -TsDeviceDialogPlugin::TsDeviceDialogPlugin() : mError(0), mModel(0), mStorage(CaService::instance()), mLongPressed(false) -{ -} - -TsDeviceDialogPlugin::~TsDeviceDialogPlugin() -{ - delete mModel; -} -/*! - \reimp - */ -bool TsDeviceDialogPlugin::accessAllowed(const QString &deviceDialogType, const QVariantMap ¶meters, const QVariantMap &securityInfo) const -{ - Q_UNUSED(deviceDialogType) - Q_UNUSED(parameters) - Q_UNUSED(securityInfo) - - // This plugin doesn't perform operations that may compromise security. - // All clients are allowed to use. - return true; -} - -/*! - \reimp - */ -HbDeviceDialogInterface *TsDeviceDialogPlugin::createDeviceDialog(const QString &deviceDialogType, const QVariantMap ¶meters) -{ - Q_UNUSED(parameters) - TsDeviceDialog *dialog(0); - if (deviceDialogType == KTsDialogType) { - if (0 == mModel) { - QtMobility::QServiceManager serviceManager; - QObject *objPtr(serviceManager.loadInterface("com.nokia.qt.activities.ActivityManager")); - if (objPtr) { - objPtr->setParent(this);//make it autodestucted - } else { - objPtr = this;//activity plugin is not present. provide invalid instance because its not critical functionality. - //QMetaObject::invokeMethod is safe to use in such a case. - } - mModel = new TsModel(*mStorage, *objPtr); - } - - mLoader.reset(); - bool ok(true); - mLoader.load(":/xml/resource/layout.docml", &ok); - Q_ASSERT(ok); - - dialog = qobject_cast(mLoader.findWidget("tsdevicedialog")); - TsTasksGrid *grid = qobject_cast(mLoader.findWidget("taskgrid")); - Q_ASSERT(dialog); - Q_ASSERT(grid); - - dialog->changeOrientation(dialog->mainWindow()->orientation()); - - grid->setItemPrototype(new TsTasksGridItem()); - grid->setModel(mModel); - - static_cast(mModel)->updateModel(); - - // connect the grid and model - qRegisterMetaType("QModelIndex"); - - disconnect(grid, SIGNAL(activated(QModelIndex)), this, SLOT(activated(QModelIndex))); - disconnect(grid, SIGNAL(pressed(QModelIndex)), this, SLOT(pressed())); - disconnect(grid, SIGNAL(longPressed(HbAbstractViewItem *, QPointF)), this, SLOT(longPressed())); - disconnect(this, SIGNAL(activate(QModelIndex)), mModel, SLOT(openApplication(QModelIndex))); - disconnect(this, SIGNAL(activate(QModelIndex)), dialog, SLOT(close())); - disconnect(grid, SIGNAL(deleteButtonClicked(QModelIndex)), mModel, SLOT(closeApplication(QModelIndex))); - - connect(grid, SIGNAL(activated(QModelIndex)), this, SLOT(activated(QModelIndex))); - connect(grid, SIGNAL(pressed(QModelIndex)), this, SLOT(pressed())); - connect(grid, SIGNAL(longPressed(HbAbstractViewItem *, QPointF)), this, SLOT(longPressed())); - connect(this, SIGNAL(activate(QModelIndex)), mModel, SLOT(openApplication(QModelIndex))); - connect(this, SIGNAL(activate(QModelIndex)), dialog, SLOT(close())); - connect(grid, SIGNAL(deleteButtonClicked(QModelIndex)), mModel, SLOT(closeApplication(QModelIndex)), Qt::QueuedConnection); - } - return dialog; -} - -/*! - \reimp - */ -bool TsDeviceDialogPlugin::deviceDialogInfo(const QString &deviceDialogType, const QVariantMap ¶meters, DeviceDialogInfo *info) const -{ - Q_UNUSED(parameters) - Q_UNUSED(deviceDialogType) - - info->group = GenericDeviceDialogGroup; - info->flags = NoDeviceDialogFlags; - info->priority = DefaultPriority; - - return true; -} - -/*! - \reimp - */ -QStringList TsDeviceDialogPlugin::deviceDialogTypes() const -{ - return QStringList(KTsDialogType); -} - -/*! - \reimp - */ -HbDeviceDialogPlugin::PluginFlags TsDeviceDialogPlugin::pluginFlags() const -{ - return PluginFlags(PreloadPlugin | KeepPluginLoaded); -} - -/*! - \reimp - */ -int TsDeviceDialogPlugin::error() const -{ - return mError; -} - -void TsDeviceDialogPlugin::activated(QModelIndex index) -{ - if (!mLongPressed) { - emit activate(index); - } -} - -void TsDeviceDialogPlugin::pressed() -{ - mLongPressed = false; -} - -void TsDeviceDialogPlugin::longPressed() -{ - mLongPressed = true; -} - -Q_EXPORT_PLUGIN2(tsdevicedialogplugin, TsDeviceDialogPlugin) diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/tsdevicedialogplugin/src/tsdocumentloader.cpp --- a/taskswitcherapp/tsdevicedialogplugin/src/tsdocumentloader.cpp Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +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: Screensaver custom document loader. -* -*/ - -#include "tsdocumentloader.h" -#include "tstasksgrid.h" -#include "tsdevicedialog.h" - -/*! - \class TsDocumentLoader - \ingroup group_tsdevicedialogplugin - \brief Document loader. - - TS implementation of document loader. It is creating TS objects used in UI -*/ - -QObject *TsDocumentLoader::createObject(const QString &type, const QString &name) -{ - if (type == TsTasksGrid::staticMetaObject.className()) { - QObject *object = new TsTasksGrid(); - object->setObjectName(name); - return object; - } else if (type == TsDeviceDialog::staticMetaObject.className()) { - QObject *object = new TsDeviceDialog(*this); - object->setObjectName(name); - return object; - } - - return HbDocumentLoader::createObject(type, name); -} diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/tsdevicedialogplugin/src/tsentrymodelitem.cpp --- a/taskswitcherapp/tsdevicedialogplugin/src/tsentrymodelitem.cpp Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,95 +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: tsentrymodelitem.cpp -* -*/ -#include "tsentrymodelitem.h" -#include "tsdataroles.h" - -#include - -/*! - \class TsEntryModelItem - \ingroup group_tsdevicedialogplugin - \brief Item presenting running apps in the grid. -*/ - -/*! - Standard C++ constructor - /param service - reference to initialized Content Aresnal client instance - /param entry - Content Arsenal data - /param size - icon size -*/ -TsEntryModelItem::TsEntryModelItem(CaService& service, QSharedPointer entry, QSize size) - : - mService(service), - mEntry(entry), - mSize(size) -{ - //no implementation required -} - -/*! - Standard C++ destructor -*/ -TsEntryModelItem::~TsEntryModelItem() -{ -} - -/*! - Returns the data stored under the given role. - /param role - requested data role - /return data encapulated by QVariant -*/ -QVariant TsEntryModelItem::data(int role) const -{ - switch (role) { - case Qt::DisplayRole: - return QVariant(mEntry->text()); - case Qt::DecorationRole: - return QVariant(mEntry->makeIcon(mSize)); - case TsDataRoles::Closable: - return QVariant(closable()); - case TsDataRoles::Visible: - return QVariant(true); - default: - return QVariant(QVariant::Invalid); - } -} - -/*! - Close running application repesented by entry -*/ -void TsEntryModelItem::close() -{ - mService.executeCommand(mEntry->id(), QString("close")); -} - -/*! - Open or move to foreground application repesented by entry -*/ -void TsEntryModelItem::open() -{ - mService.executeCommand(mEntry->id(), QString("open")); -} - -/*! - Check if application represented by entry is running. - /return true if application is running, false otherwise -*/ -bool TsEntryModelItem::closable() const -{ - return (mEntry->flags().testFlag(RunningEntryFlag) && - !mEntry->flags().testFlag(SystemEntryFlag)); -} diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/tsdevicedialogplugin/src/tsmodel.cpp --- a/taskswitcherapp/tsdevicedialogplugin/src/tsmodel.cpp Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,287 +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: tsmodel.cpp -* -*/ -#include "tsmodel.h" -#include "tsmodelitem.h" -#include "tsentrymodelitem.h" -#include "tsactivitymodelitem.h" -#include "tsdataroles.h" - -#include -#include -#include -#include - -#include -#include -#include - -#ifdef Q_OS_SYMBIAN -#include - -const int TSDeviceDialogUid = 0x2002677F; -const int ItemsLimit = 0x00000001; -#endif - -const char entryTypeKeyword[] = "application"; -const char applicationUidKeyword [] = "application:uid"; -const int maxItems(10); -/*! - \class TsModel - \ingroup group_tsdevicedialogplugin - \brief Model storing running application and activieties. -*/ - -/*! - Constructor - \param query used to create model - \param pointer to parent object -*/ -TsModel::TsModel(CaService &applicationSrv, QObject &activitySrv, QObject *parent) : - QAbstractListModel(parent), - mEntries(), - mApplicationService(applicationSrv), - mActivityService(activitySrv), - mNotifier(NULL), - mSize(240, 240), - mMaxItems(maxItems) -{ - // creating query - mQuery.setEntryRoles(ItemEntryRole); - mQuery.addEntryTypeName(entryTypeKeyword); - mQuery.setFlagsOn(VisibleEntryFlag); - mQuery.setFlagsOff(MissingEntryFlag); - mQuery.setFlagsOn(UsedEntryFlag); - mQuery.setSort(LastUsedSortAttribute, Qt::DescendingOrder); - // requesting new data - updateModel(); - // creating notyfication filter - CaNotifierFilter filter(mQuery); - mNotifier = mApplicationService.createNotifier(filter); - connect(mNotifier, SIGNAL(entryChanged(CaEntry,ChangeType)), this, SLOT(entryChanged(CaEntry, ChangeType))); - connect(mNotifier, SIGNAL(entryTouched(int)), this, SLOT(updateModel())); - if (mQuery.parentId() > 0) { - connect(mNotifier, SIGNAL(groupContentChanged(int)), this, SLOT(updateModel())); - } - -#ifdef Q_OS_SYMBIAN - XQSettingsManager *crManager = new XQSettingsManager; - XQCentralRepositorySettingsKey itemsNumberKey(TSDeviceDialogUid, ItemsLimit); - QVariant itemsNumberVariant = crManager->readItemValue(itemsNumberKey, XQSettingsManager::TypeInt); - if (!itemsNumberVariant.isNull()) { - int number = itemsNumberVariant.toInt(); - if (number > 0) { - mMaxItems = number; - } - } -#endif -} - -/*! - Destructor -*/ -TsModel::~TsModel() -{ - qDeleteAll(mEntries); - delete mNotifier; -} - -/*! - Returns count of rows in model - \retval number of rows -*/ -int TsModel::rowCount( - const QModelIndex &parent) const -{ - Q_UNUSED(parent); - return mEntries.count(); -} - -/*! - Returns appropiate model's data - \param index model index - \param role which data role to return - \retval models data -*/ -QVariant TsModel::data(const QModelIndex &index, - int role) const -{ - return index.isValid() ? entry(index)->data(role) : QVariant(); -} - -/*! - Returns maximum anount of data allowed for model - \retval maximum data count -*/ - -int TsModel::maxRowCount()const -{ - return mMaxItems; -} - -/*! - Activate one of model entries -*/ -void TsModel::openApplication(const QModelIndex &index) -{ - if (!index.isValid()) { - return; - } - entry(index)->open(); -} - -/*! - Close one of moder entries -*/ -void TsModel::closeApplication(const QModelIndex &index) -{ - if (!index.isValid() || !entry(index)->data(TsDataRoles::Closable).toBool()) { - return; - } - entry(index)->close(); -} - -/*! - Updates model with fresh entries -*/ -void TsModel::updateModel() -{ - //clear current data - qDeleteAll(mEntries); - mEntries.clear(); - - beginResetModel(); - getApplications(); - getActivities(); - endResetModel(); - -} - -/*! - Read list of running applications -*/ -void TsModel::getApplications() -{ - //get running applications - TsModelItem *entry(0); - QList< QSharedPointer > applications(mApplicationService.getEntries(mQuery)); - foreach(QSharedPointer application, applications) { - //CA entry ownership is transfered to model item - entry = new TsEntryModelItem(mApplicationService, application, mSize); - if (entry) { - //add running application filtering - if (entry->data(TsDataRoles::Closable).toBool() && //running application filtering - entry->data(TsDataRoles::Visible).toBool()) { //visible applications filtering - mEntries.append(entry); - } else { - delete entry; - } - } - } -} - -/*! - Read current activities -*/ -void TsModel::getActivities() -{ - //get activities - TsModelItem *entry(0); - QList activities; - QMetaObject::invokeMethod(&mActivityService, "activitiesList", Q_RETURN_ARG(QList, activities)); - foreach(QVariantHash activity, activities) { - prepareActivityEntry(activity); - entry = new TsActivityModelItem(*this, mActivityService, activity); - if (entry) { - if (maxRowCount() <= mEntries.count()) { - break; - } - if (entry->data(TsDataRoles::Visible).toBool()) { //visible activity filtering - mEntries.append(entry); - } else { - delete entry; - } - } - } -} - -/*! - Modify activity entry replacing application id with name -*/ -void TsModel::prepareActivityEntry(QVariantHash &activity) -{ - activity.insert(TsActivityModelItem::applicationKeyword(), - activity.find(ActivityActivityKeyword) == activity.end() ? - QString::null : - getApplicationName(activity[ActivityApplicationKeyword].toInt())); -} - -/*! - Return application name - \param id - reqiested application identyfier -*/ -QString TsModel::getApplicationName(int id) -{ - CaQuery query; - QString retVal; - query.setEntryRoles(ItemEntryRole); - query.addEntryTypeName(entryTypeKeyword); - query.setAttribute(applicationUidKeyword, QString::number(id)); - QList< QSharedPointer > applications(mApplicationService.getEntries(query)); - if (applications.begin() != applications.end()) { - retVal = (*applications.begin())->text(); - } - return retVal; -} - -/*! - Called when some entry was changed - \param updatedEntry entry that was changed - \param change change type -*/ -void TsModel::entryChanged(CaEntry updatedEntry, - ChangeType change) -{ - Q_UNUSED(updatedEntry); - Q_UNUSED(change) - updateModel(); -} - -/*! - Called when some item was changed - \param itemPtr - address of updated item -*/ -void TsModel::entryChanged(TsModelItem *itemPtr) -{ - QList::const_iterator iter(mEntries.constBegin()); - for (int offset(0); iter != mEntries.constEnd(); ++iter, ++offset) { - if ((*iter) == itemPtr) { - emit dataChanged(index(offset, 0), index(offset, 0)); - break; - } - } -} - -/*! - Returns an entry from model - \param index of entry in model - \retval pointer to an entry -*/ -TsModelItem *TsModel::entry(const QModelIndex &index) const -{ - return mEntries.at(index.row()); -} - diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/tsdevicedialogplugin/src/tstasksgrid.cpp --- a/taskswitcherapp/tsdevicedialogplugin/src/tstasksgrid.cpp Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -#include "tstasksgrid.h" - -void TsTasksGrid::polishEvent() -{ - HbGridView::polishEvent(); - scrollContentsTo(QPointF(size().width() / 4, 0), 0); -} diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/tsdevicedialogplugin/src/tstasksgriditem.cpp --- a/taskswitcherapp/tsdevicedialogplugin/src/tstasksgriditem.cpp Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,102 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ -#include "tstasksgriditem.h" - -#include -#include -#include -#include -#include "tsdataroles.h" - -/*! - \class TsTasksGridItem - \ingroup group_tsdevicedialogplugin - \brief Item that should be presented in grid. -*/ - - -TsTasksGridItem::TsTasksGridItem() : HbAbstractViewItem(), mScreenshotLabel(0), mApplicationNameLabel(0), mDeleteButton(0) -{ -} - -TsTasksGridItem::TsTasksGridItem(const TsTasksGridItem &item) : HbAbstractViewItem(item) -{ - // add screenshot - mScreenshotLabel = new HbLabel(); - mScreenshotLabel->setAlignment(Qt::AlignHCenter); - - // add application name label - mApplicationNameLabel = new HbLabel(); - mApplicationNameLabel->setAlignment(Qt::AlignCenter); - - // add close app button - HbIcon deleteIcon(":/resource/delete.png"); - mDeleteButton = new HbPushButton(); - mDeleteButton->setIcon(deleteIcon); - mDeleteButton->setPreferredSize(48, 48); - mDeleteButton->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum); - mDeleteButton->setEnabled(true); - connect(mDeleteButton, SIGNAL(clicked()), this, SLOT(handleDeleteClicked())); - mDeleteButton->hide(); - - setContentsMargins(5, 5, 5, 5); - - // add all items to layout - HbAnchorLayout *anchorLayout = new HbAnchorLayout(); - anchorLayout->setAnchor(mApplicationNameLabel, Hb::LeftEdge, anchorLayout, Hb::LeftEdge, 0); - anchorLayout->setAnchor(mApplicationNameLabel, Hb::TopEdge, anchorLayout, Hb::TopEdge, 0); - anchorLayout->setAnchor(mApplicationNameLabel, Hb::RightEdge, anchorLayout, Hb::RightEdge, 0); - - anchorLayout->setAnchor(mScreenshotLabel, Hb::TopEdge, mApplicationNameLabel, Hb::BottomEdge, 0); - anchorLayout->setAnchor(mScreenshotLabel, Hb::LeftEdge, anchorLayout, Hb::LeftEdge, 0); - anchorLayout->setAnchor(mScreenshotLabel, Hb::RightEdge, anchorLayout, Hb::RightEdge, 0); - anchorLayout->setAnchor(mScreenshotLabel, Hb::BottomEdge, anchorLayout, Hb::BottomEdge, 0); - - anchorLayout->setAnchor(mDeleteButton, Hb::RightEdge, mScreenshotLabel, Hb::RightEdge, 0); - anchorLayout->setAnchor(mDeleteButton, Hb::TopEdge, mScreenshotLabel, Hb::TopEdge, 0); - - setLayout(anchorLayout); -} - -TsTasksGridItem::~TsTasksGridItem() -{ -} - -HbAbstractViewItem *TsTasksGridItem::createItem() -{ - TsTasksGridItem *newItem = new TsTasksGridItem(*this); - connect(newItem, SIGNAL(deleteClicked(QModelIndex)), itemView(), SIGNAL(deleteButtonClicked(QModelIndex))); - return newItem; -} - -void TsTasksGridItem::handleDeleteClicked() -{ - emit deleteClicked(modelIndex()); -} - -void TsTasksGridItem::updateChildItems() -{ - mScreenshotLabel->setIcon(modelIndex().data(Qt::DecorationRole).value()); - mApplicationNameLabel->setPlainText(modelIndex().data(Qt::DisplayRole).toString()); - QVariant status(modelIndex().data(TsDataRoles::Closable)); - const bool isRunning(status.isValid() && status.toBool()); - if (isRunning) { - mDeleteButton->show(); - } else { - mDeleteButton->hide(); - } -} diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/tsdevicedialogplugin/taskswitcher.qm Binary file taskswitcherapp/tsdevicedialogplugin/taskswitcher.qm has changed diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/tsdevicedialogplugin/taskswitcher.ts --- a/taskswitcherapp/tsdevicedialogplugin/taskswitcher.ts Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ - - - - - - Task switcher popup title text. Application allows user to swap between running and recently used applications and to clear them from the list. - Task switcher - Task switcher - cell_tport_appsw_pane_t1 - tsw_01 - title - ts - False - - - diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/tsdevicedialogplugin/tsdevicedialogplugin.pro --- a/taskswitcherapp/tsdevicedialogplugin/tsdevicedialogplugin.pro Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,75 +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: tsdevicedialogplugin.pro -# - -TEMPLATE = lib -CONFIG += hb plugin mobility -MOBILITY = serviceframework - -include (../common.pri) - -HEADERS += inc/tsdevicedialog.h \ - inc/tsdevicedialogplugin.h \ - inc/tsmodel.h \ - inc/tsmodelitem.h \ - inc/tsentrymodelitem.h \ - inc/tsactivitymodelitem.h \ - inc/tstasksgrid.h \ - inc/tstasksgriditem.h \ - inc/tsdocumentloader.h \ - inc/tsdataroles.h \ - -SOURCES += src/tsdevicedialog.cpp \ - src/tsdevicedialogplugin.cpp \ - src/tsmodel.cpp \ - src/tsentrymodelitem.cpp \ - src/tsactivitymodelitem.cpp \ - src/tstasksgrid.cpp \ - src/tstasksgriditem.cpp \ - src/tsdocumentloader.cpp \ - -INCLUDEPATH += . \ - ./inc \ - -LIBS += -lcaclient - -TRANSLATIONS = taskswitcher.ts - -RESOURCES += tsdevicedialogplugin.qrc - -symbian { - TARGET.CAPABILITY = CAP_ECOM_PLUGIN - TARGET.UID3 = 0x2002677F - pluginstub.sources = tsdevicedialogplugin.dll - pluginstub.path = /resource/plugins/devicedialogs - - LIBS += -lxqsettingsmanager - - # ugly hack - translation.sources = ./*.qm - translation.path = $$QT_PLUGINS_BASE_DIR/../translations - - DEPLOYMENT += pluginstub translation - - BLD_INF_RULES.prj_exports += \ - "$${LITERAL_HASH}include " \ - "conf/tsdevicedialog.confml APP_LAYER_CONFML(tsdevicedialog.confml)" \ - "conf/tsdevicedialog_2002677F.crml APP_LAYER_CRML(tsdevicedialog_2002677F.crml)" -} - -win32 { - include ($$[QMAKE_MKSPECS]/features/hb_install.prf) - DESTDIR = $$HB_PLUGINS_DIR/devicedialogs -} diff -r f75922b9e380 -r 4c11ecddf6b2 taskswitcherapp/tsdevicedialogplugin/tsdevicedialogplugin.qrc --- a/taskswitcherapp/tsdevicedialogplugin/tsdevicedialogplugin.qrc Fri Jun 11 16:23:43 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ - - - resource/layout.docml - - - resource/delete.png - -