- + + + - + diff -r 474929a40a0f -r 87476091b3f5 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaveroledanalog.docml --- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaveroledanalog.docml Wed Jul 14 15:53:30 2010 +0300 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaveroledanalog.docml Fri Jul 23 13:47:57 2010 +0300 @@ -2,15 +2,17 @@ + + - + - + @@ -18,7 +20,7 @@ - + @@ -33,14 +35,22 @@ - +

+ + + + + + + +

- + diff -r 474929a40a0f -r 87476091b3f5 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaveroleddigital.docml --- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaveroleddigital.docml Wed Jul 14 15:53:30 2010 +0300 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaveroleddigital.docml Fri Jul 23 13:47:57 2010 +0300 @@ -2,18 +2,21 @@ - + + + + - + - - + + @@ -21,40 +24,47 @@ - + - + - - - - - - - + + + + + - + - + - + -

+ + + + + + + + +

diff -r 474929a40a0f -r 87476091b3f5 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/inc/snsranalogclockwidget.h --- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/inc/snsranalogclockwidget.h Wed Jul 14 15:53:30 2010 +0300 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/inc/snsranalogclockwidget.h Fri Jul 23 13:47:57 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" diff -r 474929a40a0f -r 87476091b3f5 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/inc/snsroledclockwidget.h --- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/inc/snsroledclockwidget.h Wed Jul 14 15:53:30 2010 +0300 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/inc/snsroledclockwidget.h Fri Jul 23 13:47:57 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -53,6 +53,9 @@ HbIconItem *mClockHourHand; HbIconItem *mClockMinuteHand; // TODO: not known yet what label (or any) is shown in clock face (day or am/pm or none) + // If some label will be put onto the clock face, then it's color must come + // from theme and is most propably different than SnsrLabel uses (=text/icon color + // used in screensaver in general //HbIconItem *mClockDateFrame; //SnsrLabel *mClockDateLabel; diff -r 474929a40a0f -r 87476091b3f5 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/inc/snsroledtimelabel.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/inc/snsroledtimelabel.h Fri Jul 23 13:47:57 2010 +0300 @@ -0,0 +1,53 @@ +/* +* 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: Time label for oled digital clock. +* +*/ + +#ifndef SNSROLEDTIMELABEL_H +#define SNSROLEDTIMELABEL_H + +#include +#include "snsrtest_global.h" + +SCREENSAVER_TEST_CLASS(T_SnsrClockWidgets) + +class SnsrOledTimeLabel : public HbTextItem +{ + Q_OBJECT + + Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment) + +public: + + SnsrOledTimeLabel(QGraphicsItem *parent = 0); + ~SnsrOledTimeLabel(); + + virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); + +protected: + + virtual void changeEvent(QEvent *event); + +private: + + void setThemedTextColor(); + +private: + + Q_DISABLE_COPY(SnsrOledTimeLabel) + SCREENSAVER_TEST_FRIEND_CLASS(T_SnsrClockWidgets) +}; + +#endif // SNSROLEDTIMELABEL_H diff -r 474929a40a0f -r 87476091b3f5 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/src/snsranalogclockwidget.cpp --- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/src/snsranalogclockwidget.cpp Wed Jul 14 15:53:30 2010 +0300 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/src/snsranalogclockwidget.cpp Fri Jul 23 13:47:57 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" diff -r 474929a40a0f -r 87476091b3f5 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/src/snsroledclockwidget.cpp --- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/src/snsroledclockwidget.cpp Wed Jul 14 15:53:30 2010 +0300 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/src/snsroledclockwidget.cpp Fri Jul 23 13:47:57 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009 - 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -131,9 +131,12 @@ Q_ASSERT( mClockHourHand && mClockMinuteHand /*&& mClockDateLabel */); // Calculate angles for clock hands. + // Use granularity of one minute so that minute hand is always exactly + // on some minute and not between minutes. OLED clock is not updated more + // frequently than once per minute and using finer granularity would cause + // the minute hand to be always between even minutes. QTime time = QTime::currentTime(); - qreal s = 6 * time.second(); - qreal m = 6 * (time.minute() + s/360); + qreal m = 6 * time.minute(); qreal h = 30 * ((time.hour() % 12) + m/360); int x = mClockHourHand->preferredSize().width()/2; diff -r 474929a40a0f -r 87476091b3f5 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/src/snsroledtimelabel.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrclockwidgets/src/snsroledtimelabel.cpp Fri Jul 23 13:47:57 2010 +0300 @@ -0,0 +1,141 @@ +/* +* 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: Time label for oled digital clock. +* +*/ + +#include "snsroledtimelabel.h" + +#include +#include +#include + + +const QString snsrForegroundColorRole("snsrforeground"); + +/*! + \class SnsrOledTimeLabel + \ingroup group_snsrbigclockscreensaverprovider + \brief Screensaver oled digital clock's time label + */ + +/*! + Constructs a new SnsrOledTimeLabel. + \param parent Parent object. + */ + +SnsrOledTimeLabel::SnsrOledTimeLabel(QGraphicsItem *parent) + : HbTextItem(parent) +{ + setThemedTextColor(); + + setMinimumLines( 1 ); + setMaximumLines( 1 ); + setAlignment(Qt::AlignCenter); + + // as we do own painting, must disable the flag that is enabled + // by default due to performance optimatizations. + setFlag(QGraphicsItem::ItemHasNoContents,false); +} + +SnsrOledTimeLabel::~SnsrOledTimeLabel() +{ +} + +/*! + \reimp + We want to draw only the outlines of the time label text and thus + text is drawn here with QPainterPath and pen (no brush) which seems to be the + only way to accomplish this. + Base class's Paint method must not be called! + We use base class only to get the bounding rect inside which to draw the text + (boundingRect has been adjusted to current text, font, alignment etc.) + */ +void SnsrOledTimeLabel::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) +{ + Q_UNUSED(option); + Q_UNUSED(widget); + + // TODO: changes needed for mirrored layout and/or other than latin digits?? + + painter->save(); //saves the painter state. + + QPainterPath path; + + QRectF boundingRect = this->boundingRect(); + QString timeText = this->text(); + QFont font = this->font(); + + // As painterPath takes the left end of the text's baseline as + // a parameter we must calculate that point from boundingRect's bottom left + // so that font's descent (and baseline (=1)) are taken into account. + // We want to center the text horizontally too. The logic + // is basically the same as used inside the base class for drawing the text + // within boundingRect. + QPointF leftEndOfBaseline(0,0); // for painterPath + QFontMetrics fontMetrics(font); + int descent = fontMetrics.descent(); + int width = fontMetrics.width(timeText); + leftEndOfBaseline.setY(boundingRect.bottomLeft().y() - descent -1); + leftEndOfBaseline.setX((boundingRect.width() - width) / 2 ); // centerH + + path.addText(leftEndOfBaseline, font, timeText); + + painter->setFont(font); + + QPen newPen = painter->pen(); + newPen.setWidth( 1 ); // TODO: is this width ok? + newPen.setColor(this->textColor()); + painter->setPen(newPen); + + painter->setBrush(QBrush(Qt::NoBrush)); + + // painter->setLayoutDirection ( layoutDirection() ); // TODO: needed or not? + + painter->setRenderHint(QPainter::Antialiasing, true); // TODO: use or not? + + painter->drawPath(path); + + // Must restore the painter or the whole UI will be messed up! + painter->restore(); + +} + +/*! + \reimp + */ +void SnsrOledTimeLabel::changeEvent(QEvent * event) +{ + if (event->type() == HbEvent::ThemeChanged) { + setThemedTextColor(); + } + return HbTextItem::changeEvent(event); +} + + +/*! + Sets the time label's color to follow the theme. + */ +void SnsrOledTimeLabel::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 474929a40a0f -r 87476091b3f5 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/inc/snsrindicatormodel.h --- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/inc/snsrindicatormodel.h Wed Jul 14 15:53:30 2010 +0300 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/inc/snsrindicatormodel.h Fri Jul 23 13:47:57 2010 +0300 @@ -42,6 +42,8 @@ void handleActivatedIndicator(HbIndicatorInterface *activatedIndicator); void handleDeactivatedIndicator(HbIndicatorInterface *deactivatedIndicator); + void handleUpdatedIndicator(); + void initializeIndicatorWidget(); /* @@ -53,15 +55,18 @@ void indicatorsUpdated(const QList &activeIndicators); void allIndicatorsDeactivated(); - + private: - void addIndicator(const SnsrIndicatorInfo &indicatorInfo); - + bool addIndicator(const SnsrIndicatorInfo &indicatorInfo); + bool isIndicatorAlreadyAdded(const SnsrIndicatorInfo &indicatorInfo) const; + bool findAndRemoveIndicator(const SnsrIndicatorInfo &indicatorInfo); - + bool showIndicatorInScreensaver(const HbIndicatorInterface &indicatorInterface, SnsrIndicatorInfo &indicatorInfo); + + void connectToIndicatorsUpdateSignal(const HbIndicatorInterface &indicatorInterface); bool anyActiveIndicators() const; diff -r 474929a40a0f -r 87476091b3f5 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/resource/snsrindicatorwidget.widgetml --- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/resource/snsrindicatorwidget.widgetml Wed Jul 14 15:53:30 2010 +0300 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/resource/snsrindicatorwidget.widgetml Fri Jul 23 13:47:57 2010 +0300 @@ -1,16 +1,16 @@ - + - + - + - + - + - + \ No newline at end of file diff -r 474929a40a0f -r 87476091b3f5 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/src/snsrindicatormodel.cpp --- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/src/snsrindicatormodel.cpp Wed Jul 14 15:53:30 2010 +0300 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/snsrindicatorwidget/src/snsrindicatormodel.cpp Fri Jul 23 13:47:57 2010 +0300 @@ -29,10 +29,10 @@ \brief Model for handling indicator data. */ -// TODO: what is the type string of silent indicator? couldn't +// TODO: what is the final type string of silent indicator? couldn't // find it in wk22 -> workaround solution: assume that it contains -// substring "silent" -const char *gSilentIndicatorTypeString = "silent"; +// substring "silence" like in their demo app. +const char *gSilentIndicatorTypeString = "silence"; const char *gOfflineIndicatorTypeString = "offline"; @@ -80,6 +80,7 @@ if (activatedIndicator && showIndicatorInScreensaver(*activatedIndicator,indicatorInfo)) { addIndicator(indicatorInfo); + connectToIndicatorsUpdateSignal(*activatedIndicator); addedAny = true; } } @@ -89,12 +90,6 @@ 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()));*/ } /*! @@ -107,8 +102,10 @@ SnsrIndicatorInfo indicatorInfo; if (activatedIndicator && showIndicatorInScreensaver(*activatedIndicator,indicatorInfo)) { - addIndicator(indicatorInfo); - emitChangeSignal(); + if (addIndicator(indicatorInfo)) { + connectToIndicatorsUpdateSignal(*activatedIndicator); + emitChangeSignal(); + } } } @@ -132,6 +129,35 @@ } /*! + Called when some universal indicator updates its data by + emitting dataChanged signal. + We listen to this signal because at least the silent indicator plugin demo + uses this method to inform the clients when it gets deactivated/activated + once it has been activated once by setting its icon path to empty/valid string. + Don't know if this is going to be the final solution as it's unconventional (?) + but let's be prepared also to this kind of approach. + */ +void SnsrIndicatorModel::handleUpdatedIndicator() +{ + HbIndicatorInterface* indicator = + qobject_cast(sender()); + if (!indicator) { + return; + } + + // If indicator's icon path was set to empty string, then treat it + // like it were deactivated. And if not empty, then it's active again. + if (indicator->indicatorData( + HbIndicatorInterface::MonoDecorationNameRole).toString().isEmpty()) { + handleDeactivatedIndicator(indicator); + } + else { + handleActivatedIndicator(indicator); + } + +} + +/*! Sends a signal with a list of all currently active indicators. No signal is sent if there are no active indicators currently. */ @@ -175,24 +201,50 @@ 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. + chronological order. Silent indicator should always be the right-most one. + /retval true if indicator was added (not found already in the listings) */ -void SnsrIndicatorModel::addIndicator(const SnsrIndicatorInfo &indicatorInfo) +bool 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. + // To be on the safe side, check that the indicator doesn't already + // exists in the active indicator listings. + bool added(false); + + // Use prepend to keep the list in reversed chronological order + if (indicatorInfo.category == HbIndicatorInterface::NotificationCategory + && !isIndicatorAlreadyAdded(indicatorInfo)) { + mNotificationIndicators.prepend(indicatorInfo); + added = true; + } + else if (indicatorInfo.category == HbIndicatorInterface::SettingCategory + && !isIndicatorAlreadyAdded(indicatorInfo)) { + mSettingIndicators.append(indicatorInfo); + added = true; + } + + return added; +} - //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); +/*! + Check whether the indicator is already added in the active + indicator listing. + /retval true if indicator is already added; false if not. + */ +bool SnsrIndicatorModel::isIndicatorAlreadyAdded(const SnsrIndicatorInfo &indicatorInfo) const +{ + bool alreadyExits(false); + + const QList &indicatorList = + indicatorInfo.category == HbIndicatorInterface::NotificationCategory + ? mNotificationIndicators : mSettingIndicators; + + for (int i = 0; i < indicatorList.size(); ++i) { + if (indicatorList.at(i).type == indicatorInfo.type) { + alreadyExits = true; + break; + } } - else { - mSettingIndicators.append(indicatorInfo); - } + return alreadyExits; } /*! @@ -254,7 +306,7 @@ && !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" + // substring "silence" like in their demo app. // && type == gSilentIndicatorTypeString ) { && typeString.contains(gSilentIndicatorTypeString, Qt::CaseInsensitive)) { show = true; @@ -272,6 +324,27 @@ } /*! + Start listening to indicator's dataChanged signals. + /parameter indicator whose dataChanged signal we want to listen + */ +void SnsrIndicatorModel::connectToIndicatorsUpdateSignal(const HbIndicatorInterface &indicatorInterface) +{ + // Connect to silent indicator's dataChanged signal as it seems to + // use unconventional method (demo at least) to inform when + // it's get deactivated/activated: dataChanged signal is emitted and + // icon path is set to empty string/valid string. + // It's assumed that we don't need to listen to other indicators + // as we are not interested e.g. when primary/secondary texts change etc. + + // NOTE: do NOT disconnect the indicator signal anywhere explicitly here + // or we won't get activation/deactivation messages. + if (indicatorInterface.indicatorType().contains(gSilentIndicatorTypeString, Qt::CaseInsensitive)) { + QObject::connect( &indicatorInterface, SIGNAL(dataChanged()), + this, SLOT(handleUpdatedIndicator())); + } +} + +/*! Check whether there is any active indicator currently. /retval true if there is at least one indicator to show */ diff -r 474929a40a0f -r 87476091b3f5 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsranalogclockcontainer.cpp --- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsranalogclockcontainer.cpp Wed Jul 14 15:53:30 2010 +0300 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsranalogclockcontainer.cpp Fri Jul 23 13:47:57 2010 +0300 @@ -21,12 +21,13 @@ #include #include -#include -#include +#include +#include #include "snsranalogclockwidget.h" #include "snsrindicatorwidget.h" #include "snsrswipewidget.h" +#include "snsrlabel.h" /*! \class SnsrAnalogClockContainer @@ -61,41 +62,8 @@ 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") } @@ -104,6 +72,7 @@ */ SnsrAnalogClockContainer::~SnsrAnalogClockContainer() { + resetIndicatorConnections(); //mDateLabel, mAnalogClockWidget - deleted by the parent } @@ -131,43 +100,57 @@ 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; } +void SnsrAnalogClockContainer::loadWidgets() +{ + bool ok(true); + + // reset widget pointers, any previous widgets are already deleted by now + mMainView = 0; + mDateLabel = 0; + mAnalogClockWidget = 0; + mIndicatorWidget = 0; + + // load widgets from docml + 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." + ); + + // In case of landscape layout, read also the landscape delta section + if ( mCurrentOrientation == Qt::Horizontal ) { + qDebug() << "loading: " << gAnalogLayoutDocml << ", section: " << gLandscapeSectionName; + mDocumentLoader.load(gAnalogLayoutDocml, gLandscapeSectionName, &ok); + Q_ASSERT_X(ok, gAnalogLayoutDocml, "Invalid section in DocML file."); + } + + initIndicatorWidget(); + mIndicatorWidget->setLayoutType(SnsrIndicatorWidget::IndicatorsCentered); + + mBackgroundContainerLayout->addItem(mMainView); + + //connect( mSwipeWidget, SIGNAL(swipeDownDetected()), SIGNAL(unlockRequested()) ); + //mSwipeWidget->start(); + } +} + diff -r 474929a40a0f -r 87476091b3f5 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrbigclockcontainer.cpp --- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrbigclockcontainer.cpp Wed Jul 14 15:53:30 2010 +0300 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrbigclockcontainer.cpp Fri Jul 23 13:47:57 2010 +0300 @@ -22,11 +22,9 @@ #include #include -#include -#include -#include - -#include +#include +#include +#include #include "snsrbigclockcontainer.h" #include "snsrindicatorwidget.h" @@ -41,7 +39,6 @@ const QString snsrBackgroundColorRole("snsrbackground"); const int gStep(5); -QTM_USE_NAMESPACE /*! Constructs a new SnsrBigClockContainer. @@ -55,7 +52,7 @@ mCurrentOrientation(-1) { setBackgroundColor(); - mBackgroundContainerLayout = new QGraphicsLinearLayout(Qt::Vertical); + mBackgroundContainerLayout = new QGraphicsLinearLayout(Qt::Vertical, this); setLayout(mBackgroundContainerLayout); qsrand(QTime::currentTime().msec()); } @@ -64,9 +61,7 @@ Destructs the class. */ SnsrBigClockContainer::~SnsrBigClockContainer() -{ - resetIndicatorConnections(); - +{ // e.g. mIndicatorWidget gets deleted during these calls mDocumentLoader.reset(); qDeleteAll(mDocumentObjects); @@ -83,10 +78,74 @@ */ /*! - \fn virtual void changeLayout(Qt::Orientation orientation) = 0; + Changes screensaver layout based on orientation changes. + \param orientation Current orientation. + */ +void SnsrBigClockContainer::changeLayout(Qt::Orientation orientation) +{ + SCREENSAVER_TEST_FUNC_ENTRY("SnsrBigClockContainer::changeLayout") + + if (mCurrentOrientation != orientation) { + mCurrentOrientation = orientation; + + // delete any old widgets + if ( mBackgroundContainerLayout->count() ) { + mBackgroundContainerLayout->removeAt(0); + } + mDocumentLoader.reset(); + qDeleteAll(mDocumentObjects); + mDocumentObjects.clear(); + + // reload widgets from docml + loadWidgets(); + } + mBackgroundContainerLayout->setGeometry( mainWindow()->layoutRect() ); + update(); + + SCREENSAVER_TEST_FUNC_EXIT("SnsrBigClockContainer::changeLayout") +} - Slot for members update in container when orientation changed. +/*! + Set used indicator model that is owned by the screensaver class. + Model's life cycle must be the same as screensaver's so that indicators' + status data can be kept in memory and one can receive updates. + This method should be called when the current container is set. + */ +void SnsrBigClockContainer::setIndicatorModel(SnsrIndicatorModel &model) +{ + mIndicatorModel = &model; +} + +/*! + @copydoc Screensaver::getActiveScreenRows() */ +void SnsrBigClockContainer::getActiveScreenRows(int *firstActiveRow, int *lastActiveRow) +{ + // This default implementation return the whole area of the + // container. Inherited low power mode containers can and should + // return smaller area which just barely encloses all the content. + if ( mMainContainer ) { + QRect mainRect = mMainContainer->rect().toRect(); + if ( mCurrentOrientation == Qt::Vertical ) { + *firstActiveRow = mainRect.top(); + *lastActiveRow = mainRect.bottom(); + } + else { + *firstActiveRow = mainRect.left(); + *lastActiveRow = mainRect.right(); + } + } +} + +/*! + Tell if this container wants to lock the screen orientation. + Default implementation in not locked but inherited classes may + override this. + */ +bool SnsrBigClockContainer::isOrientationLocked() +{ + return false; +} /*! \fn virtual int updateIntervalInMilliseconds() = 0; @@ -96,22 +155,16 @@ */ /*! - Set used indicator model and do necessary initializations to show currently - active indicators. + \fn virtual int loadWidgets() = 0; + + Concrete inherited container classes must implement this to instantiate + all the widgets shown in the container. The base class calls this + method when screen layuot is changed. The old widgets are already + deleted by the base class before this is called. Also changing the visible + container is treated as a layout change, and results in call to this method. + Thus, inherited containers don't have to load their widgets yet in their + constructors. */ -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 @@ -229,15 +282,35 @@ } /*! + Do necessary initializations to show currently active indicators. + Should be called after the indicator widget is created. + */ +void SnsrBigClockContainer::initIndicatorWidget() +{ + Q_ASSERT(mIndicatorModel && mIndicatorWidget); + + connect(mIndicatorModel, SIGNAL(indicatorsUpdated(QList)), + mIndicatorWidget, SLOT(showIndicators(QList))); + + connect(mIndicatorModel, SIGNAL(allIndicatorsDeactivated()), + mIndicatorWidget, SLOT(removeAllIndicators())); + + mIndicatorModel->initializeIndicatorWidget(); +} + +/*! Disconnect connections between indicator model and widget. + Should be called before deleting the indicator widget. */ void SnsrBigClockContainer::resetIndicatorConnections() -{ - disconnect(mIndicatorModel, SIGNAL(indicatorsUpdated(QList)), - mIndicatorWidget, SLOT(showIndicators(QList))); - - disconnect(mIndicatorModel, SIGNAL(allIndicatorsDeactivated()), - mIndicatorWidget, SLOT(removeAllIndicators())); +{ + if (mIndicatorWidget && mIndicatorModel) { + disconnect(mIndicatorModel, SIGNAL(indicatorsUpdated(QList)), + mIndicatorWidget, SLOT(showIndicators(QList))); + + disconnect(mIndicatorModel, SIGNAL(allIndicatorsDeactivated()), + mIndicatorWidget, SLOT(removeAllIndicators())); + } } /*! diff -r 474929a40a0f -r 87476091b3f5 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrbigclockscreensaver.cpp --- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrbigclockscreensaver.cpp Wed Jul 14 15:53:30 2010 +0300 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrbigclockscreensaver.cpp Fri Jul 23 13:47:57 2010 +0300 @@ -24,14 +24,16 @@ #include #include #include +#include +#include +#include -#include -#include - +#include #include "snsranalogclockcontainer.h" #include "snsrdigitalclockcontainer.h" #include "snsroledanalogclockcontainer.h" #include "snsroleddigitalclockcontainer.h" +#include "snsrblankcontainer.h" #include "snsrindicatormodel.h" /*! @@ -40,15 +42,14 @@ \brief Screensaver with big digital clock. */ -const int gTimeInterval(100); - /*! Constructs a new SnsrBigClockScreensaver. */ SnsrBigClockScreensaver::SnsrBigClockScreensaver() : mMainWindow(0), mCurrentContainer(0), - mIndicatorModel(0) + mIndicatorModel(0), + m_setManager(0) { mMainWindow = HbInstance::instance()->allMainWindows().at(0); // for nice looking clock hand transformations @@ -64,6 +65,7 @@ */ SnsrBigClockScreensaver::~SnsrBigClockScreensaver() { + mMainWindow->unsetOrientation( /*animate*/false ); // mCurrentContainer, mIndicatorModel - deleted by the parent } @@ -86,6 +88,8 @@ removeCurrentContainer(); + emit screenPowerModeRequested( Screensaver::ScreenModeFullPower ); + SnsrBigClockContainer* newContainer( 0 ); if (clockFormat() == ClockFormatAnalog) { newContainer = new SnsrAnalogClockContainer(); @@ -95,7 +99,7 @@ } setCurrentContainer( newContainer ); - + SCREENSAVER_TEST_FUNC_EXIT("SnsrBigClockScreensaver::onForeground") return true; } @@ -111,13 +115,34 @@ removeCurrentContainer(); SnsrBigClockContainer* newContainer( 0 ); - if (clockFormat() == ClockFormatAnalog) { - newContainer = new SnsrOledAnalogClockContainer(); + + // Check ScreensaverStatus from repository + XQSettingsManager::Error error; + int screensaverOn = 1; + XQCentralRepositorySettingsKey settingsKey( + KCRUidScreensaverSettings.iUid, KScreensaverStatus ); // TUid as same repository used in control panel via Symbian APIs + m_setManager = new XQSettingsManager(this); + if (m_setManager) { + screensaverOn = m_setManager->readItemValue(settingsKey, XQSettingsManager::TypeInt).toInt(); + error = m_setManager->error(); + if (error != XQSettingsManager::NoError) { + qDebug("Error reading value from XQSettingsManager.. error = %d", error); + } + delete m_setManager; + } + + if (screensaverOn) { + if (clockFormat() == ClockFormatAnalog) { + newContainer = new SnsrOledAnalogClockContainer(); + } + else { + newContainer = new SnsrOledDigitalClockContainer(); + } } else { - newContainer = new SnsrOledDigitalClockContainer(); + newContainer = new SnsrBlankContainer(); } - + setCurrentContainer( newContainer ); SCREENSAVER_TEST_FUNC_EXIT("SnsrBigClockScreensaver::onPartialForeground") @@ -196,6 +221,46 @@ mIndicatorModel->handleDeactivatedIndicator(deactivatedIndicator); } +/*! + @copydoc Screensaver::getActiveScreenRows + */ +void SnsrBigClockScreensaver::getActiveScreenRows(int *firstActiveRow, int *lastActiveRow) +{ + if ( mCurrentContainer ) { + mCurrentContainer->getActiveScreenRows( firstActiveRow, lastActiveRow ); + } + else { + qWarning() << "No current container when active rows queried."; + } +} + +/*! + @copydoc Screensaver::updateLayout + */ +void SnsrBigClockScreensaver::updateLayout() +{ + if ( mCurrentContainer ) { + if ( mCurrentContainer->isOrientationLocked() ) { + mMainWindow->setOrientation( mMainWindow->orientation(), /*animate*/false ); + } + else { + mMainWindow->unsetOrientation( /*animate*/false ); + } + mCurrentContainer->changeLayout( mMainWindow->orientation() ); + } + else { + qWarning() << "No current container when updateLayout called."; + } +} + +/*! + Update the area visible in the power save screen mode. Power save mode gets + also activated on call if not already active. + */ +void SnsrBigClockScreensaver::updateActiveAreaForLowPower() +{ + emit screenPowerModeRequested( Screensaver::ScreenModeLowPower ); +} /*! Determines the curent clock format settings. @@ -223,38 +288,41 @@ { 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(); + if (mTimer.timerId()!= -1) { + mTimer.stop(); + } emit viewChanged(0); delete mCurrentContainer; mCurrentContainer = 0; } + + mMainWindow->unsetOrientation( /*animate*/false ); } void SnsrBigClockScreensaver::setCurrentContainer( SnsrBigClockContainer* newContainer ) { mCurrentContainer = newContainer; - connect( - mMainWindow, SIGNAL(orientationChanged(Qt::Orientation)), - mCurrentContainer, SLOT(changeLayout(Qt::Orientation)) - ); + mCurrentContainer->setParent(this); connect( &mTimer, SIGNAL(timeout()), mCurrentContainer, SLOT(update()) ); connect( mCurrentContainer, SIGNAL(unlockRequested()), SIGNAL(unlockRequested()) ); + connect( mCurrentContainer, SIGNAL(activeAreaMoved()), SLOT(updateActiveAreaForLowPower()) ); - mCurrentContainer->initIndicators(*mIndicatorModel); + mCurrentContainer->setIndicatorModel(*mIndicatorModel); + + int updateInterval = mCurrentContainer->updateIntervalInMilliseconds(); + // blankcontainer is empty one, don't start timer with -1 return value + if ( updateInterval != -1) { + mTimer.start(updateInterval); + } - mCurrentContainer->changeLayout(mMainWindow->orientation()); - mTimer.start( mCurrentContainer->updateIntervalInMilliseconds() ); + emit viewChanged(mCurrentContainer); } diff -r 474929a40a0f -r 87476091b3f5 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrblankcontainer.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrblankcontainer.cpp Fri Jul 23 13:47:57 2010 +0300 @@ -0,0 +1,57 @@ +/* +* 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: Container for blank screen. +* +*/ + +#include "snsrblankcontainer.h" + +/*! + \class SnsrBlankContainer + \ingroup group_snsrbigclockscreensaverplugin + \brief Container used for preparing layout for blank screen. + */ + +/*! + Constructs a new SnsrBlankContainer. + */ +SnsrBlankContainer::SnsrBlankContainer() : + SnsrBigClockContainer() +{ +} + +/*! + Destructs the class. + */ +SnsrBlankContainer::~SnsrBlankContainer() +{ +} + +void SnsrBlankContainer::update() +{ + // nothing to do +} + +int SnsrBlankContainer::updateIntervalInMilliseconds() +{ + // don't start timer + return -1; +} + +void SnsrBlankContainer::loadWidgets() +{ + // nothing to do as we have no visual components +} + +// end of file diff -r 474929a40a0f -r 87476091b3f5 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrdigitalclockcontainer.cpp --- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrdigitalclockcontainer.cpp Wed Jul 14 15:53:30 2010 +0300 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrdigitalclockcontainer.cpp Fri Jul 23 13:47:57 2010 +0300 @@ -21,11 +21,12 @@ #include #include -#include -#include +#include +#include #include "snsrswipewidget.h" #include "snsrindicatorwidget.h" +#include "snsrlabel.h" /*! \class SnsrDigitalClockContainer @@ -66,41 +67,6 @@ 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") } @@ -109,6 +75,7 @@ */ SnsrDigitalClockContainer::~SnsrDigitalClockContainer() { + resetIndicatorConnections(); //mTimeLabel, mAmPmLabel, mDateLabel - deleted by the parent } @@ -130,7 +97,8 @@ mTimeLabel->setPlainText( HbExtendedLocale().format(QTime::currentTime(), gTimeFormatStr) ); - // if clock type is 24, this will return an empty string. + + // if clock type is 24h, this will return an empty string. mAmPmLabel->setPlainText( HbExtendedLocale().format(QTime::currentTime(), gAmPmFormatStr) ); @@ -151,44 +119,60 @@ 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; } +void SnsrDigitalClockContainer::loadWidgets() +{ + // reset widget pointers, any previous widgets are already deleted by now + mMainView = 0; + mDateLabel = 0; + mTimeLabel = 0; + mAmPmLabel = 0; + mIndicatorWidget = 0; + + // load widgets from docml + bool ok(false); + 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." + ); + + // In case of landscape layout, read also the landscape delta section + if ( mCurrentOrientation == Qt::Horizontal ) { + qDebug() << "loading: " << gDigitalLayoutDocml << ", section: " << gLandscapeSectionName; + mDocumentLoader.load(gDigitalLayoutDocml, gLandscapeSectionName, &ok); + Q_ASSERT_X(ok, gDigitalLayoutDocml, "Invalid section in DocML file."); + } + + mIndicatorWidget->setLayoutType(SnsrIndicatorWidget::IndicatorsCentered); + initIndicatorWidget(); + + mBackgroundContainerLayout->addItem(mMainView); + + //connect( mSwipeWidget, SIGNAL(swipeDownDetected()), SIGNAL(unlockRequested()) ); + //mSwipeWidget->start(); + } +} + diff -r 474929a40a0f -r 87476091b3f5 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrdocumentloader.cpp --- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrdocumentloader.cpp Wed Jul 14 15:53:30 2010 +0300 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsrdocumentloader.cpp Fri Jul 23 13:47:57 2010 +0300 @@ -21,6 +21,7 @@ #include "snsroledclockwidget.h" #include "snsrlabel.h" #include "snsrindicatorwidget.h" +#include "snsroledtimelabel.h" #include "snsrswipewidget.h" /*! @@ -28,11 +29,11 @@ \ingroup group_snsrbigclockscreensaverplugin \brief Custom screensaver docml layout loader. - Used mainly to create the analog clock widget from docml. + Used to create the widgets from docml. */ /*! - Creates the analog clock. + Creates the requested widget. \param type Static type name. \param name Object name. \retval Created object. @@ -63,6 +64,12 @@ return object; } + if (type == SnsrOledTimeLabel::staticMetaObject.className()) { + QObject *object = new SnsrOledTimeLabel(); + object->setObjectName(name); + return object; + } + /* Add swipeWidget implementation later on if (type == SnsrSwipeWidget::staticMetaObject.className()) { diff -r 474929a40a0f -r 87476091b3f5 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsroledanalogclockcontainer.cpp --- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsroledanalogclockcontainer.cpp Wed Jul 14 15:53:30 2010 +0300 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsroledanalogclockcontainer.cpp Fri Jul 23 13:47:57 2010 +0300 @@ -21,11 +21,12 @@ #include #include #include -#include -#include +#include +#include #include "snsroledclockwidget.h" #include "snsrindicatorwidget.h" +#include "snsrlabel.h" /*! \class SnsrOledAnalogClockContainer @@ -57,34 +58,6 @@ 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") } @@ -93,6 +66,7 @@ */ SnsrOledAnalogClockContainer::~SnsrOledAnalogClockContainer() { + resetIndicatorConnections(); //mOledClockWidget etc - deleted by the parent } @@ -106,9 +80,14 @@ // 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(); + containerSize -= mClockContainer->size(); QRectF containerRect( mMainContainer->pos(), containerSize ); if ( mInitialize ) { + // disconnect container from parent layout, + // connected container resets its position to the one defined in docml + // after label text updates + mClockContainer->setParentLayoutItem(0); + QPointF clockPos = nextRandomPosition( mClockContainer->pos(), mDestPosition, containerRect ); mClockContainer->setPos( clockPos ); } @@ -116,6 +95,8 @@ mDestPosition = randomPosition( containerRect ); mInitialize = true; } + // the active area of power save mode needs to be updated when clock container is moved + emit activeAreaMoved(); } } @@ -143,57 +124,86 @@ // 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; } +/*! + @copydoc SnsrBigClockContainer::getActiveScreenRows() + */ +void SnsrOledAnalogClockContainer::getActiveScreenRows(int *firstActiveRow, int *lastActiveRow) +{ + if ( mClockContainer ) { + QRect clockRect( mClockContainer->pos().toPoint(), + mClockContainer->size().toSize() ); + if ( mCurrentOrientation == Qt::Vertical ) { + *firstActiveRow = clockRect.top(); + *lastActiveRow = clockRect.bottom() + 1; + } + else { + *firstActiveRow = clockRect.left(); + *lastActiveRow = clockRect.right() + 1; + } + } +} + +/*! + Orientation is locked in power save mode as sensors are off anyway, + at least after some timeout. + */ +bool SnsrOledAnalogClockContainer::isOrientationLocked() +{ + return true; +} + +void SnsrOledAnalogClockContainer::loadWidgets() +{ + bool ok(true); + + // reset widget pointers, any previous widgets are already deleted by now + mMainView = 0; + mMainContainer = 0; + mClockContainer = 0; + mOledClockWidget = 0; + mDateLabel = 0; + mIndicatorWidget = 0; + + // load widgets from docml + qDebug() << gOledAnalogLayoutDocml; + 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." + ); + + // In case of landscape layout, read also the landscape delta section + if ( mCurrentOrientation == Qt::Horizontal ) { + qDebug() << "loading: " << gOledAnalogLayoutDocml << ", section: " << gLandscapeSectionName; + mDocumentLoader.load(gOledAnalogLayoutDocml, gLandscapeSectionName, &ok); + Q_ASSERT_X(ok, gOledAnalogLayoutDocml, "Invalid section in DocML file."); + } + + mIndicatorWidget->setLayoutType(SnsrIndicatorWidget::IndicatorsCentered); + initIndicatorWidget(); + + mBackgroundContainerLayout->addItem(mMainView); + } +} + // end of file diff -r 474929a40a0f -r 87476091b3f5 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsroleddigitalclockcontainer.cpp --- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsroleddigitalclockcontainer.cpp Wed Jul 14 15:53:30 2010 +0300 +++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/src/snsroleddigitalclockcontainer.cpp Fri Jul 23 13:47:57 2010 +0300 @@ -22,10 +22,14 @@ #include #include -#include -#include + +#include +#include +#include "snsrlabel.h" #include "snsrindicatorwidget.h" +#include "snsroledtimelabel.h" + /*! \class SnsrOledDigitalClockContainer @@ -41,7 +45,7 @@ extern const char *gMainContainerName; extern const char *gClockContainerName; -extern const char *gTimeLabelName; +extern const char *gOledTimeLabelName = "oledTimeLabel"; extern const char *gAmPmLabelName; extern const char *gDateLabelName; @@ -54,46 +58,16 @@ extern const char *gIndicatorWidgetName; + /*! Constructs a new SnsrOledDigitalClockContainer. */ SnsrOledDigitalClockContainer::SnsrOledDigitalClockContainer() : - SnsrBigClockContainer(), mClockContainer(0), mTimeLabel(0), - mDateLabel(0), mAmPmLabel(0), mDestPosition(QPointF()), mInitialize(false) + SnsrBigClockContainer(), mClockContainer(0), mAmPmLabel(0), + mTimeLabel(0), mDateLabel(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") } @@ -102,6 +76,7 @@ */ SnsrOledDigitalClockContainer::~SnsrOledDigitalClockContainer() { + resetIndicatorConnections(); //mTimeLabel, mAmPmLabel, mDateLabel, mMoveTimer - deleted by the parent } @@ -118,6 +93,11 @@ containerSize -= mClockContainer->boundingRect().size(); QRectF containerRect( mMainContainer->pos(), containerSize ); if ( mInitialize ) { + // disconnect container from parent layout, + // connected container resets its position to the one defined in docml + // after label text updates + mClockContainer->setParentLayoutItem(0); + QPointF clockPos = nextRandomPosition( mClockContainer->pos(), mDestPosition, containerRect ); mClockContainer->setPos( clockPos ); } @@ -125,6 +105,8 @@ mDestPosition = randomPosition( containerRect ); mInitialize = true; } + // the active area of power save mode needs to be updated when clock container is moved + emit activeAreaMoved(); } } @@ -136,9 +118,11 @@ SCREENSAVER_TEST_FUNC_ENTRY("SnsrOledDigitalClockContainer::update") // time - mTimeLabel->setPlainText( + mTimeLabel->setText( HbExtendedLocale().format(QTime::currentTime(), gTimeFormatStr) ); + + // if clock type is 24h, this will return an empty string. mAmPmLabel->setPlainText( HbExtendedLocale().format(QTime::currentTime(), gAmPmFormatStr) ); @@ -161,48 +145,87 @@ 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; } +/*! + @copydoc SnsrBigClockContainer::getActiveScreenRows() + */ +void SnsrOledDigitalClockContainer::getActiveScreenRows(int *firstActiveRow, int *lastActiveRow) +{ + if ( mClockContainer ) { + QRect clockRect( mClockContainer->pos().toPoint(), + mClockContainer->size().toSize() ); + if ( mCurrentOrientation == Qt::Vertical ) { + *firstActiveRow = clockRect.top(); + *lastActiveRow = clockRect.bottom() + 1; + } + else { + *firstActiveRow = clockRect.left(); + *lastActiveRow = clockRect.right() + 1; + } + } +} + +/*! + Orientation is locked in power save mode as sensors are off anyway, + at least after some timeout. + */ +bool SnsrOledDigitalClockContainer::isOrientationLocked() +{ + return true; +} + +void SnsrOledDigitalClockContainer::loadWidgets() +{ + // reset widget pointers, any previous widgets are already deleted by now + mMainView = 0; + mMainContainer = 0; + mClockContainer = 0; + mDateLabel = 0; + mTimeLabel = 0; + mAmPmLabel = 0; + mIndicatorWidget = 0; + + // load widgets from docml + bool ok(false); + qDebug() << gOledDigitalLayoutDocml; + 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(gOledTimeLabelName)); + 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." + ); + + // In case of landscape layout, read also the landscape delta section + if ( mCurrentOrientation == Qt::Horizontal ) { + qDebug() << "loading: " << gOledDigitalLayoutDocml << ", section: " << gLandscapeSectionName; + mDocumentLoader.load(gOledDigitalLayoutDocml, gLandscapeSectionName, &ok); + Q_ASSERT_X(ok, gOledDigitalLayoutDocml, "Invalid section in DocML file."); + } + + mIndicatorWidget->setLayoutType(SnsrIndicatorWidget::IndicatorsCentered); + initIndicatorWidget(); + + mBackgroundContainerLayout->addItem(mMainView); + } +} + // end of file