- - - - - - +

+ + + + + - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + + + - - - - + + - + + + + + + + + + + +

- - - - - - +

+ + + - - - - - - - - + - - - - + + + + + + + + + + + + + + + + - - - - + + - + + + + + + + + + + +

- + diff -r 5de72ea7a065 -r 579cc610882e clock/clockui/clockviews/inc/clockmainview.h --- a/clock/clockui/clockviews/inc/clockmainview.h Wed Jun 23 18:11:28 2010 +0300 +++ b/clock/clockui/clockviews/inc/clockmainview.h Tue Jul 06 14:14:56 2010 +0300 @@ -90,6 +90,8 @@ HbLabel *mDayLabel; HbLabel *mPlaceLabel; + HbLabel *mHorizontalDivider; + HbLabel *mVerticalDivider; ClockWidget *mClockWidget; HbLabel *mNoAlarmLabel; HbListView *mAlarmList; diff -r 5de72ea7a065 -r 579cc610882e clock/clockui/clockviews/src/clockmainview.cpp --- a/clock/clockui/clockviews/src/clockmainview.cpp Wed Jun 23 18:11:28 2010 +0300 +++ b/clock/clockui/clockviews/src/clockmainview.cpp Tue Jul 06 14:14:56 2010 +0300 @@ -127,6 +127,12 @@ bool loadSuccess = false; Qt::Orientation currentOrienation = window->orientation(); + + // Get the dividers. + mHorizontalDivider = static_cast ( + mDocLoader->findObject("horizontalDivider")); + mVerticalDivider = static_cast ( + mDocLoader->findObject("verticalDivider")); // Get the "No alarm set" label. mNoAlarmLabel = qobject_cast ( @@ -159,11 +165,15 @@ CLOCK_MAIN_VIEW_DOCML, CLOCK_MAIN_VIEW_PORTRAIT_SECTION, &loadSuccess); + mHorizontalDivider->setVisible(true); + mVerticalDivider->setVisible(false); } else { mDocLoader->load( CLOCK_MAIN_VIEW_DOCML, CLOCK_MAIN_VIEW_LANDSCAPE_SECTION, &loadSuccess); + mHorizontalDivider->setVisible(false); + mVerticalDivider->setVisible(true); } if (loadSuccess) { if (0 == alarmCount) { @@ -174,14 +184,8 @@ } } - mDayLabel = static_cast ( - mDocLoader->findObject("dateLabel")); - - mPlaceLabel = static_cast ( - mDocLoader->findObject("placeLabel")); - - - + mDayLabel = static_cast (mDocLoader->findObject("dateLabel")); + mPlaceLabel = static_cast (mDocLoader->findObject("placeLabel")); mClockWidget = static_cast ( mDocLoader->findObject(CLOCK_WIDGET)); @@ -582,10 +586,14 @@ mDocLoader->load( CLOCK_MAIN_VIEW_DOCML, CLOCK_MAIN_VIEW_LANDSCAPE_SECTION, &success); + mHorizontalDivider->setVisible(false); + mVerticalDivider->setVisible(true); } else { mDocLoader->load( CLOCK_MAIN_VIEW_DOCML, CLOCK_MAIN_VIEW_PORTRAIT_SECTION, &success); + mHorizontalDivider->setVisible(true); + mVerticalDivider->setVisible(false); } if(success) { @@ -687,6 +695,23 @@ */ void ClockMainView::updateClockWidget() { + QStringList clockType; + int index = mSettingsUtility->clockType(clockType); + int zeroIndex(0); + if(zeroIndex == index){ + mClockWidget->setClockType(ClockWidget::ClockTypeDigital); + } else { + mClockWidget->setClockType(ClockWidget::ClockTypeAnalog); + } + + QStringList timeFormat; + + if (zeroIndex == mSettingsUtility->timeFormat(timeFormat)) { + mClockWidget->setTimeFormat(ClockWidget::TimeFormat24Hrs); + } else { + mClockWidget->setTimeFormat(ClockWidget::TimeFormat12Hrs); + } + mClockWidget->updateTime(); } diff -r 5de72ea7a065 -r 579cc610882e clock/clockui/clockwidget/clockwidgetimpl/bwins/clockwidgetu.def --- a/clock/clockui/clockwidget/clockwidgetimpl/bwins/clockwidgetu.def Wed Jun 23 18:11:28 2010 +0300 +++ b/clock/clockui/clockwidget/clockwidgetimpl/bwins/clockwidgetu.def Tue Jul 06 14:14:56 2010 +0300 @@ -15,4 +15,7 @@ ?getStaticMetaObject@ClockWidget@@SAABUQMetaObject@@XZ @ 14 NONAME ; struct QMetaObject const & ClockWidget::getStaticMetaObject(void) ?qt_metacall@ClockWidget@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 15 NONAME ; int ClockWidget::qt_metacall(enum QMetaObject::Call, int, void * *) ?clockType@ClockWidget@@QBE?AW4ClockType@1@XZ @ 16 NONAME ; enum ClockWidget::ClockType ClockWidget::clockType(void) const + ?updateClockWidget@ClockWidget@@AAEXXZ @ 17 NONAME ; void ClockWidget::updateClockWidget(void) + ?timeFormat@ClockWidget@@QBE?AW4TimeFormat@1@XZ @ 18 NONAME ; enum ClockWidget::TimeFormat ClockWidget::timeFormat(void) const + ?setTimeFormat@ClockWidget@@QAEXABW4TimeFormat@1@@Z @ 19 NONAME ; void ClockWidget::setTimeFormat(enum ClockWidget::TimeFormat const &) diff -r 5de72ea7a065 -r 579cc610882e clock/clockui/clockwidget/clockwidgetimpl/clockwidgetimpl.pro --- a/clock/clockui/clockwidget/clockwidgetimpl/clockwidgetimpl.pro Wed Jun 23 18:11:28 2010 +0300 +++ b/clock/clockui/clockwidget/clockwidgetimpl/clockwidgetimpl.pro Tue Jul 06 14:14:56 2010 +0300 @@ -40,12 +40,14 @@ SOURCES += \ clockwidget.cpp \ - analogclockwidget.cpp + analogclockwidget.cpp \ + digitalclockwidget.cpp HEADERS += \ clockwidgetdefines.h \ clockwidget.h \ - analogclockwidget.h + analogclockwidget.h \ + digitalclockwidget.h symbian { TARGET.UID3 = 0x2002E715 diff -r 5de72ea7a065 -r 579cc610882e clock/clockui/clockwidget/clockwidgetimpl/clockwidgetimpl.qrc --- a/clock/clockui/clockwidget/clockwidgetimpl/clockwidgetimpl.qrc Wed Jun 23 18:11:28 2010 +0300 +++ b/clock/clockui/clockwidget/clockwidgetimpl/clockwidgetimpl.qrc Tue Jul 06 14:14:56 2010 +0300 @@ -2,5 +2,9 @@ resource/analogclockwidget.widgetml resource/analogclockwidget.css + resource/digitalclockwidget.widgetml + resource/digitalclockwidget.css + resource/digitalclockwidget_color.css + diff -r 5de72ea7a065 -r 579cc610882e clock/clockui/clockwidget/clockwidgetimpl/eabi/clockwidgetu.def --- a/clock/clockui/clockwidget/clockwidgetimpl/eabi/clockwidgetu.def Wed Jun 23 18:11:28 2010 +0300 +++ b/clock/clockui/clockwidget/clockwidgetimpl/eabi/clockwidgetu.def Tue Jul 06 14:14:56 2010 +0300 @@ -19,4 +19,7 @@ _ZThn16_N11ClockWidgetD1Ev @ 18 NONAME _ZThn8_N11ClockWidgetD0Ev @ 19 NONAME _ZThn8_N11ClockWidgetD1Ev @ 20 NONAME + _ZN11ClockWidget13setTimeFormatERKNS_10TimeFormatE @ 21 NONAME + _ZN11ClockWidget17updateClockWidgetEv @ 22 NONAME + _ZNK11ClockWidget10timeFormatEv @ 23 NONAME diff -r 5de72ea7a065 -r 579cc610882e clock/clockui/clockwidget/clockwidgetimpl/inc/clockwidget.h --- a/clock/clockui/clockwidget/clockwidgetimpl/inc/clockwidget.h Wed Jun 23 18:11:28 2010 +0300 +++ b/clock/clockui/clockwidget/clockwidgetimpl/inc/clockwidget.h Tue Jul 06 14:14:56 2010 +0300 @@ -20,7 +20,7 @@ // System includes #include - +#include // User includes #include "clockwidgetdefines.h" @@ -28,11 +28,13 @@ class QGraphicsLinearLayout; class AnalogClockWidget; +class DigitalClockWidget; class CLOCKWIDGET_EXPORT ClockWidget : public HbWidget { Q_OBJECT Q_PROPERTY(ClockType clockType READ clockType WRITE setClockType) + Q_PROPERTY(TimeFormat timeFormat READ timeFormat WRITE setTimeFormat) public: enum ClockType @@ -40,20 +42,31 @@ ClockTypeAnalog, ClockTypeDigital }; + enum TimeFormat + { + TimeFormat12Hrs, + TimeFormat24Hrs + }; ClockWidget(QGraphicsItem *parent = 0, Qt::WindowFlags flags = 0); ~ClockWidget(); ClockType clockType() const; void setClockType(const ClockType &type); void loadClockWidget(); + TimeFormat timeFormat() const; + void setTimeFormat(const TimeFormat &timeFormat); public slots: void updateTime(); private: - ClockType mClockType; - AnalogClockWidget *mAnalogClock; - QGraphicsLinearLayout *mLayout; + void updateClockWidget(); +private: + ClockType mClockType; + TimeFormat mTimeFormat; + QPointer mAnalogClock; + QPointer mDigitalClock; + QGraphicsLinearLayout *mLayout; }; #endif // CLOCKWIDGET_H diff -r 5de72ea7a065 -r 579cc610882e clock/clockui/clockwidget/clockwidgetimpl/inc/digitalclockwidget.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/clock/clockui/clockwidget/clockwidgetimpl/inc/digitalclockwidget.h Tue Jul 06 14:14:56 2010 +0300 @@ -0,0 +1,64 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: DigitalClockWidget +* +*/ + +#ifndef DIGITALCLOCKWIDGET_H +#define DIGITALCLOCKWIDGET_H + +// System includes +#include +#include + +// User includes +#include "clockwidgetdefines.h" + +// Forward declarations +class QTimer; +class HbLabel; +class HbTextItem; + +class DigitalClockWidget : public HbWidget +{ + Q_OBJECT + +public: + DigitalClockWidget(bool useAmPm = true, QGraphicsItem *parent = 0); + ~DigitalClockWidget(); + +signals: + void clockTapped(); + +public slots: + void tick(); + void setAmPm(bool useAmPm); + +protected: + void resizeEvent(QGraphicsSceneResizeEvent *event); + +private: + void createPrimitives(); + +public: + void updatePrimitives(); + +private: + QPointer mTimer; + QPointer mClockLabel; + QPointer mAmPmLabel; + bool mUseAmPm; +}; + +#endif // DIGITALCLOCKWIDGET_H diff -r 5de72ea7a065 -r 579cc610882e clock/clockui/clockwidget/clockwidgetimpl/resource/digitalclockwidget.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/clock/clockui/clockwidget/clockwidgetimpl/resource/digitalclockwidget.css Tue Jul 06 14:14:56 2010 +0300 @@ -0,0 +1,25 @@ +DigitalClockWidget { + layout: digital_clock_layout; +} + +DigitalClockWidget::clockLabel { + size-policy: expanding expanding; + text-align: center center; + font-variant:primary; + text-height: 14.7un; +} + +DigitalClockWidget::clockLabel:landscape { + text-height: 9.8un; +} + +DigitalClockWidget::amPmLabel { + size-policy: expanding expanding; + text-align: left; + font-variant:primary; + bottom: -var(hb-param-margin-gene-middle-vertical); + text-height: var(hb-param-text-height-primary); +} +DigitalClockWidget::amPmLabel:landscape { + font-variant:secondary; +} \ No newline at end of file diff -r 5de72ea7a065 -r 579cc610882e clock/clockui/clockwidget/clockwidgetimpl/resource/digitalclockwidget.widgetml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/clock/clockui/clockwidget/clockwidgetimpl/resource/digitalclockwidget.widgetml Tue Jul 06 14:14:56 2010 +0300 @@ -0,0 +1,11 @@ + + + + + + + + + + + diff -r 5de72ea7a065 -r 579cc610882e clock/clockui/clockwidget/clockwidgetimpl/resource/digitalclockwidget_color.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/clock/clockui/clockwidget/clockwidgetimpl/resource/digitalclockwidget_color.css Tue Jul 06 14:14:56 2010 +0300 @@ -0,0 +1,9 @@ + + +DigitalClockWidget::clockLabel{ + color: var(qtc_list_item_content_normal); +} + +DigitalClockWidget::amPmLabel{ + color: var(qtc_list_item_content_normal); +} \ No newline at end of file diff -r 5de72ea7a065 -r 579cc610882e clock/clockui/clockwidget/clockwidgetimpl/src/analogclockwidget.cpp --- a/clock/clockui/clockwidget/clockwidgetimpl/src/analogclockwidget.cpp Wed Jun 23 18:11:28 2010 +0300 +++ b/clock/clockui/clockwidget/clockwidgetimpl/src/analogclockwidget.cpp Tue Jul 06 14:14:56 2010 +0300 @@ -41,7 +41,9 @@ AnalogClockWidget::AnalogClockWidget(QGraphicsItem *parent) : HbWidget(parent) { - HbStyleLoader::registerFilePath(":/resource"); + bool result = HbStyleLoader::registerFilePath(":/resource/analogclockwidget.widgetml"); + result = HbStyleLoader::registerFilePath(":/resource/analogclockwidget.css"); + updatePrimitives(); mTimer = new QTimer(this); connect(mTimer, SIGNAL(timeout()), SLOT(tick())); diff -r 5de72ea7a065 -r 579cc610882e clock/clockui/clockwidget/clockwidgetimpl/src/clockwidget.cpp --- a/clock/clockui/clockwidget/clockwidgetimpl/src/clockwidget.cpp Wed Jun 23 18:11:28 2010 +0300 +++ b/clock/clockui/clockwidget/clockwidgetimpl/src/clockwidget.cpp Tue Jul 06 14:14:56 2010 +0300 @@ -21,6 +21,7 @@ // User includes #include "clockwidget.h" #include "analogclockwidget.h" +#include "digitalclockwidget.h" /*! \class ClockWidget @@ -33,7 +34,7 @@ */ ClockWidget::ClockWidget(QGraphicsItem *parent, Qt::WindowFlags flags) : HbWidget(parent, flags), - mClockType(ClockTypeAnalog) + mClockType(ClockTypeDigital) { loadClockWidget(); } @@ -59,10 +60,16 @@ */ void ClockWidget::setClockType(const ClockType &type) { - if (type == ClockTypeDigital) { - mClockType = ClockTypeDigital; + if (type == ClockTypeAnalog) { + if(type != mClockType){ + mClockType = ClockTypeAnalog; + updateClockWidget(); + } } else { - mClockType = ClockTypeAnalog; + if(type != mClockType){ + mClockType = ClockTypeDigital; + updateClockWidget(); + } } } @@ -73,6 +80,8 @@ { if (mClockType == ClockTypeAnalog) { mAnalogClock->tick(); + } else { + mDigitalClock->updatePrimitives(); } } @@ -81,13 +90,57 @@ */ void ClockWidget::loadClockWidget() { + mLayout = new QGraphicsLinearLayout(Qt::Vertical); + mLayout->setContentsMargins(0,0,0,0); + if (mClockType == ClockTypeAnalog) { - mAnalogClock = new AnalogClockWidget(this); - mLayout = new QGraphicsLinearLayout(Qt::Vertical); - mLayout->setContentsMargins(0,0,0,0); + mAnalogClock = new AnalogClockWidget(this); + mLayout->addItem(mAnalogClock); + } else { + bool useAmPm = false; + mDigitalClock = new DigitalClockWidget(useAmPm, this); + mLayout->addItem(mDigitalClock); + } + setLayout(mLayout); +} + +/*! + Constructs the clockwidget based upon its type. +*/ +void ClockWidget::updateClockWidget() +{ + if (mClockType == ClockTypeAnalog) { + mLayout->removeItem(mDigitalClock); + delete mDigitalClock; + if (!mAnalogClock) { + mAnalogClock = new AnalogClockWidget(this); + } mLayout->addItem(mAnalogClock); - setLayout(mLayout); + } else { + mLayout->removeItem(mAnalogClock); + delete mAnalogClock; + if(!mDigitalClock){ + bool useAmPm = false; // find out this fronm the settings utility + mDigitalClock = new DigitalClockWidget(useAmPm, this); + } + mLayout->addItem(mDigitalClock); + } +} + +ClockWidget::TimeFormat ClockWidget::timeFormat() const +{ + return mTimeFormat; +} + +void ClockWidget::setTimeFormat(const TimeFormat &timeFormat) +{ + if(mDigitalClock){ + mTimeFormat = timeFormat; + if (timeFormat == ClockWidget::TimeFormat12Hrs) { + mDigitalClock->setAmPm(true); + } else { + mDigitalClock->setAmPm(false); + } } } - // End of file --Don't remove this. diff -r 5de72ea7a065 -r 579cc610882e clock/clockui/clockwidget/clockwidgetimpl/src/digitalclockwidget.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/clock/clockui/clockwidget/clockwidgetimpl/src/digitalclockwidget.cpp Tue Jul 06 14:14:56 2010 +0300 @@ -0,0 +1,157 @@ +/* +* 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: DigitalClockWidget +* +*/ + +// System includes +#include +#include +#include +#include +#include +#include +#include +#include + +// User includes +#include "digitalclockwidget.h" + +// Constants +const int clockUpdateInterval (60000); // msec + +/*! + \class DigitalClockWidget + + This class implements the digitalclock widget which gets displayed + in the clockmainview when the clocktype is set to digital type. +*/ + +/*! + Constructor. + \param useAmPm bool for setting 12 hour format + \param parent The parent of type QGraphicsItem. +*/ +DigitalClockWidget::DigitalClockWidget(bool useAmPm, QGraphicsItem *parent) + : HbWidget(parent), + mUseAmPm(useAmPm) +{ + bool result = HbStyleLoader::registerFilePath(":/resource/digitalclockwidget.widgetml"); + result = HbStyleLoader::registerFilePath(":/resource/digitalclockwidget.css"); + result = HbStyleLoader::registerFilePath(":/resource/digitalclockwidget_color.css"); + + createPrimitives(); + + mTimer = new QTimer(this); + connect(mTimer, SIGNAL(timeout()), SLOT(tick())); + + QTime time = QTime::currentTime(); + int initialIntervalTime = (clockUpdateInterval - ( time.msec() + (time.second() * 1000))); + mTimer->start(initialIntervalTime); + +} + +/*! + Destructor. +*/ +DigitalClockWidget::~DigitalClockWidget() +{ + mTimer->stop(); + HbStyleLoader::unregisterFilePath(":/resource/digitalclockwidget.widgetml"); + HbStyleLoader::unregisterFilePath(":/resource/digitalclockwidget.css"); + HbStyleLoader::unregisterFilePath(":/resource/digitalclockwidget_color.css"); + +} + +/*! + Updates clock visualization according to current time + */ +void DigitalClockWidget::tick() +{ + mTimer->setInterval(clockUpdateInterval); + updatePrimitives(); + update(); +} + +/*! + Toggles time format + */ +void DigitalClockWidget::setAmPm(bool useAmPm) +{ + + bool old = mUseAmPm; + mUseAmPm = useAmPm; + + if (mUseAmPm != old) { // change am/pm label + QTime time = QTime::currentTime(); + QString timeString; + if (mUseAmPm) { + mAmPmLabel->setText(time.toString("ap")); // set am/pm label + } else { + mAmPmLabel->setText(""); // set am/pm label as null + } + } + +} + +/*! + @copydoc HbWidget::resizeEvent() + */ +void DigitalClockWidget::resizeEvent(QGraphicsSceneResizeEvent *event) +{ + HbWidget::resizeEvent(event); +} + +/*! + Creates all widget primitives. + */ +void DigitalClockWidget::createPrimitives() +{ + mClockLabel = new HbTextItem(this); + mClockLabel->setTextWrapping( Hb::TextNoWrap ); + HbStyle::setItemName(mClockLabel, QLatin1String("clockLabel")); + + mAmPmLabel = new HbTextItem(this); + mClockLabel->setTextWrapping( Hb::TextNoWrap ); + HbStyle::setItemName(mAmPmLabel, QLatin1String("amPmLabel")); +} + +/*! + @copydoc HbWidget::updatePrimitives() + updates all widget primitives + */ +void DigitalClockWidget::updatePrimitives() +{ + + QTime time = QTime::currentTime(); + QString timeString; + + if (mUseAmPm) { + timeString = time.toString("hh:ap"); // covert time in 12 hours format + timeString = timeString.section(":", 0, 0); // it would remove :ap section from timeString + mAmPmLabel->setText(time.toString("ap")); // set am/pm label + } else { + mAmPmLabel->setText(""); // set am/pm label as null + timeString = time.toString("hh"); // append hour part + } + + int index(1); + HbExtendedLocale locale; + QChar timeSeparator(locale.timeSeparator(index)) ; + timeString.append(timeSeparator); // append time separator + timeString.append(time.toString("mm")); //append minute part + + mClockLabel->setText(timeString); + +} diff -r 5de72ea7a065 -r 579cc610882e clock/data/clock.qrc --- a/clock/data/clock.qrc Wed Jun 23 18:11:28 2010 +0300 +++ b/clock/data/clock.qrc Tue Jul 06 14:14:56 2010 +0300 @@ -11,8 +11,5 @@ effects/fade_out.fxml effects/fade_in.fxml - - - translations/clock.qm - + \ No newline at end of file diff -r 5de72ea7a065 -r 579cc610882e clock/data/translations/clock.qm Binary file clock/data/translations/clock.qm has changed diff -r 5de72ea7a065 -r 579cc610882e clock/data/translations/clock.ts --- a/clock/data/translations/clock.ts Wed Jun 23 18:11:28 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,376 +0,0 @@ - - - - - - Title for Date and time settings view - Clock - Clock - - Common - Common - Co - False - - - LayoutID Parent. Custom. When a city is added to the World Clock list view, its relative time offset is displayed with respect to Homecity. (Hour) - %1 hr - %1 hr - txt_clock_dblist_val_l1_hr - Clock_World clock_P05 - dblist_1_val - Cl - False - - - When a city is added to the World Clock list view, its relative time offset is displayed with respect to Homecity. (Hour and Mins) - %1 hr %2 mins - %1 hr %2 mins - txt_clock_dblist_val_l1_hr - Clock_World clock_P05 - dblist_1_val - Cl - False - - - When a city is added to the World Clock list view, its relative time offset is displayed with respect to Homecity. (Mins) - %1 mins - %1 mins - txt_clock_dblist_val_l1_hr - Clock_World clock_P05 - dblist_1_val - Cl - False - - - 2nd value in combo box list for Date format label - mm dd yyyy - mm dd yyyy - qtl_dataform_group_pri - Clock main view_P01 - setlabel_2_val - Cl - False - - - Secondary text displaying the time remaining for the alarm (hour, min) - In %1hr %2min - In %1hr %2min - txt_clock_main_view_setlabel_in_1hr_2min - Clock main view_P01 - setlabel_1 - Cl - False - - - - Add city - Add city - qtl_menu_pri - Clock_World clock_P05 - opt - Cl - False - - - Long tap menu on an added city in World clock view (both portrait and landscape) - Show on homescreen - Show on homescreen - qtl_menu_pri - Clock_World clock_P05 - menu - Cl - False - - - Long tap menu on an added city in World Clock view (both portrait and landscape) - Delete - Delete - qtl_menu_pri - Clock_World clock_P05 - menu - Cl - False - - - Secondary text displaying the time remaining for the alarm (hour, mins) - In %1hr %2mins - In %1hr %2mins - txt_clock_main_view_setlabel_in_1hr_2mins - Clock main view_P01 - setlabel_1 - Cl - False - - - - DST - DST - - Common - setlabel_1 - Co - False - - - Secondary text displaying the time remaining for the alarm (hours, mins) - In %1hrs %2mins - In %1hrs %2mins - txt_clock_main_view_setlabel_in_1hrs_2mins - Clock main view_P01 - setlabel_1 - Cl - False - - - - Alarms - Alarms - qtl_toolbar_tiny1_3 - Clock main view_P01 - button - Cl - False - - - - World clock - World clock - qtl_toolbar_tiny1_3 - Clock main view_P01 - button - Cl - False - - - Layout ID Parent. Custom Layout. Text to show the alarm occurance. - Workdays - Workdays - txt_clock_main_view_dblist_daily_val_today - Clock main view_P01 - dblist_1_val - Cl - False - - - 3rd value in combo box list for Date format label - yyyy mm dd - yyyy mm dd - qtl_dataform_group_pri - Clock main view_P01 - setlabel_3_val - Cl - False - - - Layout ID Parent. Custom Layout. Text to show the alarm occurance. - Daily - Daily - txt_clock_main_view_dblist_daily_val_today - Clock main view_P01 - dblist_1 - Cl - False - - - Subtitle for World Clock view - World Clock - World Clock - qtl_groupbox_simple_sec - Clock_World clock_P05 - subhead - Cl - False - - - - New alarm - New alarm - qtl_toolbar_tiny1_3 - Clock main view_P01 - button - Cl - False - - - - Add city - Add city - qtl_toolbar_tiny1_3 - Clock_World clock_P05 - button - Cl - False - - - Layout ID Parent. Custom. Text to display the GMT info for that city. - GMT %1 - GMT %1 - txt_clock_main_view_label_gmt_1 - Clock main view_P01 - setlabel_1 - Cl - False - - - Secondary text displaying the time remaining for the alarm (hours, min) - In %1hrs %2min - In %1hrs %2min - txt_clock_main_view_setlabel_in_1hrs_2min - Clock main view_P01 - setlabel_1 - Cl - False - - - - GMT - GMT - - Common - Common - Co - False - - - Clock application in Application library grid - Clock - Clock - qtl_grid_applications_sec - Clock - grid - Cl - False - - - Layout ID Parent. Custom layout. Days remaining for the alarm - In %1days - In %1days - txt_clock_main_view_setlabel_in_1days - Clock main view_P01 - setlabel_1 - Cl - False - - - When a city is added to the World Clock list view, its relative time offset is displayed with respect to Homecity. (Hours) - %1 hrs - %1 hrs - txt_clock_dblist_val_l1_hr - Clock_World clock_P05 - dblist_1_val - Cl - False - - - Long tap on an alarm in Alarm list opens the item specific menu displaying text "Delete alarm" - Delete alarm - Delete alarm - qtl_menu_pri - Clock main view_P01 - menu - Cl - False - - - Layout ID Parent. Custom. Alarm Occurance detail. - Every %1 - Every %1 - txt_clock_main_view_label_every_1 - Clock main view_P01 - setlabel_1 - Cl - False - - - Layout ID Parent. Custom Layout. Text to show the alarm occurance. - Today - Today - txt_clock_main_view_dblist_daily_val_today - Clock main view_P01 - dblist_1_val - Cl - False - - - Clock application in Application library list - Clock - Clock - qtl_list_pri_large_graphic - Clock - list - Cl - False - - - Item in Options menu from Clock main vew - Settings - Settings - qtl_menu_pri - Clock main view_P01 - opt - Cl - False - - - Long tap menu on an added city in the World clock view (both portrait and landscape) - Set as current location - Set as current location - qtl_menu_pri - Clock_World clock_P05 - menu - Cl - False - - - Information shown in a popup once the alarm is deactivated - Alarm Deactivated - Alarm Deactivated - qtl_notifdialog_pri2 - Clock main view_P01 - dpopinfo - Cl - False - - - When there are no alarms set in Clock main view, the text "No alarms set" is displayed in list. - No alarms set - No alarms set - qtl_list_pri - Clock main view_with no alarms set_P02 - list - Cl - False - - - Information shown in a popup once the alarm is activated - Alarm Activated - Alarm Activated - qtl_notifdialog_pri2 - Clock main view_P01 - dpopinfo - Cl - False - - - 1st value in combo box list for Date format label - dd mm yyyy - dd mm yyyy - qtl_dataform_group_pri - Clock main view_P01 - setlabel_1_val - Cl - False - - - When a city is added to the World Clock list view, its relative time offset is displayed with respect to Homecity. (Hours and Mins) - %1 hrs %2 mins - %1 hrs %2 mins - txt_clock_dblist_val_l1_hr - Clock_World clock_P05 - dblist_1_val - Cl - False - - - diff -r 5de72ea7a065 -r 579cc610882e clock/rom/clock.iby --- a/clock/rom/clock.iby Wed Jun 23 18:11:28 2010 +0300 +++ b/clock/rom/clock.iby Tue Jul 06 14:14:56 2010 +0300 @@ -41,6 +41,9 @@ data=DATAZ_\resource\mcc\mcc.rsc RESOURCE_FILES_DIR\mcc\mcc.rsc +// Stub sis +data=DATAZ_\system\install\clock_stub.sis \System\Install\clock_stub.sis + // Binaries. file=ABI_DIR\BUILD_DIR\clockalarmclient.dll SHARED_LIB_DIR\clockalarmclient.dll file=ABI_DIR\BUILD_DIR\timezoneclient.dll SHARED_LIB_DIR\timezoneclient.dll @@ -52,7 +55,7 @@ file=ABI_DIR\BUILD_DIR\clockviewmanager.dll SHARED_LIB_DIR\clockviewmanager.dll file=ABI_DIR\BUILD_DIR\clockviews.dll SHARED_LIB_DIR\clockviews.dll file=ABI_DIR\BUILD_DIR\clockwidget.dll SHARED_LIB_DIR\clockwidget.dll -file=ABI_DIR\BUILD_DIR\clockwidgetplugin.dll SHARED_LIB_DIR\clockwidgetplugin.dll +file=ABI_DIR\BUILD_DIR\clockwidgetplugin.dll SHARED_LIB_DIR\clockwidgetplugin.dll file=ABI_DIR\BUILD_DIR\datetimesettingsplugin.dll SHARED_LIB_DIR\datetimesettingsplugin.dll data=\epoc32\data\c\resource\qt\plugins\controlpanel\datetimesettingsplugin.qtplugin resource\qt\plugins\controlpanel\datetimesettingsplugin.qtplugin diff -r 5de72ea7a065 -r 579cc610882e clock/sis/clock.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/clock/sis/clock.pkg Tue Jul 06 14:14:56 2010 +0300 @@ -0,0 +1,75 @@ +; +; 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: pkg file of Clock Application for IAD. +; + +; Language +&EN + +; standard SIS file header +#{"Clock"}, (0x10005903), 1, 0, 0, TYPE=SA, RU + +; Localised vendor name +%{"Nokia"} + +; Unique vendor name +:"Nokia" + +; Clock engine components +"/epoc32/release/armv5/urel/clockserver.exe" - "!:/sys/bin/clockserver.exe" +"/epoc32/release/armv5/urel/clockserverclient.dll" - "!:/sys/bin/clockserverclient.dll" +"/epoc32/release/armv5/urel/clocktimezoneresolver.dll" - "!:/sys/bin/clocktimezoneresolver.dll" +"/epoc32/release/armv5/urel/clocktimesourceinterface.dll" - "!:/sys/bin/clocktimesourceinterface.dll" +"/epoc32/release/armv5/urel/clockecomlistener.dll" - "!:/sys/bin/clockecomlistener.dll" + +; Clock nitz Ecom plugin +"/epoc32/release/armv5/urel/clocknitzplugin.dll" - "!:/sys/bin/clocknitzplugin.dll" +"/epoc32/data/z/resource/plugins/clocknitzplugin.rsc" - "!:/resource/plugins/clocknitzplugin.rsc" + +; Clock executable and default resource files + +"/epoc32/release/armv5/urel/clock.exe" - "!:/sys/bin/clock.exe" +"/epoc32/data/Z/private/10003a3f/import/apps/clock_reg.rsc" - "!:/private/10003a3f/import/apps/clock_reg.rsc" +"/epoc32/data/z/resource/apps/clock.rsc" - "!:/resource/apps/clock.rsc" +"/epoc32/data/z/resource/qt/translations/clock_en.qm" - "!:/resource/qt/translations/clock_en.qm" + + +"/epoc32/release/armv5/urel/clockalarmclient.dll" - "!:/sys/bin/clockalarmclient.dll" +"/epoc32/release/armv5/urel/timezoneclient.dll" - "!:/sys/bin/timezoneclient.dll" +"/epoc32/release/armv5/urel/clocksettingsutility.dll" - "!:/sys/bin/clocksettingsutility.dll" +"/epoc32/release/armv5/urel/clocksettingsview.dll" - "!:/sys/bin/clocksettingsview.dll" +"/epoc32/release/armv5/urel/clockcityselectionlist.dll" - "!:/sys/bin/clockcityselectionlist.dll" +"/epoc32/release/armv5/urel/clockalarmeditor.dll" - "!:/sys/bin/clockalarmeditor.dll" +"/epoc32/release/armv5/urel/clockappcontroller.dll" - "!:/sys/bin/clockappcontroller.dll" +"/epoc32/release/armv5/urel/clockviewmanager.dll" - "!:/sys/bin/clockviewmanager.dll" +"/epoc32/release/armv5/urel/clockviews.dll" - "!:/sys/bin/clockviews.dll" +"/epoc32/release/armv5/urel/clockwidget.dll" - "!:/sys/bin/clockwidget.dll" +"/epoc32/release/armv5/urel/clockwidgetplugin.dll" - "!:/sys/bin/clockwidgetplugin.dll" + +"/epoc32/data/Z/resource/mcc/mcc.rsc" -"!:/resource/mcc/mcc.rsc" +"/epoc32/data/Z/resource/timezonelocalization/timezones.rsc" -"!:/resource/timezonelocalization/timezones.rsc" +"/epoc32/data/Z/resource/timezonelocalization/timezonegroups.rsc" -"!:/resource/timezonelocalization/timezonegroups.rsc" + +;Qt plugin files to be installed +"/epoc32/release/armv5/urel/datetimesettingsplugin.dll" - "!:/sys/bin/datetimesettingsplugin.dll" +"/epoc32/data/c/resource/qt/plugins/controlpanel/datetimesettingsplugin.qtplugin" - "!:/resource/qt/plugins/controlpanel/datetimesettingsplugin.qtplugin" + +"/epoc32/release/armv5/urel/clocksettingsviewplugin.dll" - "!:/sys/bin/clocksettingsviewplugin.dll" +"/epoc32/data/z/resource/qt/plugins/clock/clocksettingsviewplugin.qtplugin" - "!:/resource/qt/plugins/clock/clocksettingsviewplugin.qtplugin" + +"/epoc32/release/armv5/urel/ftudatetimewizard.dll" - "!:/sys/bin/ftudatetimewizard.dll" +"/epoc32/data/z/resource/qt/plugins/FTU/ftudatetimewizard.qtplugin" - "!:/resource/qt/plugins/FTU/ftudatetimewizard.qtplugin" +"/epoc32/data/z/fturesources/plugins/wizardproviders/ftudatetimewizard.manifest" - "!:/fturesources/plugins/wizardproviders/ftudatetimewizard.manifest" + +;END OF FILE diff -r 5de72ea7a065 -r 579cc610882e clock/sis/createandsign.bat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/clock/sis/createandsign.bat Tue Jul 06 14:14:56 2010 +0300 @@ -0,0 +1,22 @@ +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: Bat file to create Clock Application's sisx. +rem + +@echo -------- Create sis packages --------- +makesis clock.pkg + +@echo -------- Sign and rename sis packages ----------- +signsis clock.sis clock.sisx Nokia_RnDCert_02.der Nokia_RnDCert_02.key + diff -r 5de72ea7a065 -r 579cc610882e clock/sis/nokia_rndcert_02.der Binary file clock/sis/nokia_rndcert_02.der has changed diff -r 5de72ea7a065 -r 579cc610882e clock/sis/nokia_rndcert_02.key --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/clock/sis/nokia_rndcert_02.key Tue Jul 06 14:14:56 2010 +0300 @@ -0,0 +1,15 @@ +-----BEGIN RSA PRIVATE KEY----- +MIICXQIBAAKBgQC/TDP7KKIaf5+uW4OD2iVZuUMC2a+SeQTjf6srlKcOm+CpPNXn +uLNm/8fdEnyOIuRXPRKmqhs1n0JkxEGHynELWMTuKXbQx9SRAGUXzyneGn+IJNnO +vOKHWgKCouX2hfI8rtkdqJpqmO460gGsMgw+lsbeyWyW9lnfLxq+ZC7sqQIDAQAB +AoGBALmUWZE8GBaQ3P4u9WUCSd3DJkkrmXIFSULSZeH/chlwCwDjbbhArHothVzo +REE3hEFFlERvHbplZ+mNouzy7boduvgUzbksGrbGMLJ2qO1GzWWVwV+GzOWKd3ss +/98Gwoy5R8pjnkqUE2wP1iJFw0FjvUTKcYv/z6t3LLJ0CsoBAkEA+c7ixvsviQ3J +s0INytCKU2bf8fqFQJi1VI82ukxNsujGTQ9upVSjuvqPvWyDvvTdrUBHqO+3qPut +sEh01Q8aiQJBAMQKDJPVRu4ud3mwUfEavzL5EjqwG1k9VCNGYsT4FwtrHcxu1oP/ +pk6M3rIZukqomoEEnHWPMwhrK3fhBqi0OSECQQDr40VXege4FnH5OI2Hj4afHMyp +VdQQXGMWFyopnzXblFz0lXb43cTCIiorR9XcMqNFHybLypkWE5o+lRzlt55pAkBQ +P/zeF5Sts//cpL0mgdh7OVKpC6ZmZaCnwAx2rUhhuDu+kDDoYCLoTOps5fNI1LRK +1GRoC3LMo3Jr5IYhUYWBAkBpCpN6k4JU/mszq98EojHerQNxk8sPqvQKUzTutohT +1gLX9yepGayB/TtT2EEJDkWOlnTy/dvN6W3vzbJYz97x +-----END RSA PRIVATE KEY----- diff -r 5de72ea7a065 -r 579cc610882e clock/stubsis/clock_stub.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/clock/stubsis/clock_stub.pkg Tue Jul 06 14:14:56 2010 +0300 @@ -0,0 +1,27 @@ +; +; 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: pkg file of Clock Application for IAD. +; + +; Language +&EN + +; Header +#{"Clock"}, (0x10005903), 1, 0, 0, TYPE=SA + +; Localised vendor name +%{"Nokia"} + +; Unique vendor name +:"Nokia" \ No newline at end of file diff -r 5de72ea7a065 -r 579cc610882e clock/stubsis/clock_stub.sis Binary file clock/stubsis/clock_stub.sis has changed diff -r 5de72ea7a065 -r 579cc610882e notes/data/notes.qrc --- a/notes/data/notes.qrc Wed Jun 23 18:11:28 2010 +0300 +++ b/notes/data/notes.qrc Tue Jul 06 14:14:56 2010 +0300 @@ -1,1 +1,1 @@ - translations/notes.qm xml/notesmainview.docml xml/notescollectionsview.docml xml/notestodoview.docml xml/notesfavoriteview.docml xml/notesnoteview.docml style/hblistviewitem.css style/hblistviewitem.widgetml \ No newline at end of file + xml/notesmainview.docml xml/notescollectionsview.docml xml/notestodoview.docml xml/notesfavoriteview.docml xml/notesnoteview.docml style/hblistviewitem.css style/hblistviewitem.widgetml \ No newline at end of file diff -r 5de72ea7a065 -r 579cc610882e notes/data/translations/notes.qm Binary file notes/data/translations/notes.qm has changed diff -r 5de72ea7a065 -r 579cc610882e notes/data/translations/notes.ts --- a/notes/data/translations/notes.ts Wed Jun 23 18:11:28 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,856 +0,0 @@ - - - - - - Due date for To-do note - %1 - - qtl_list_pri_graphic - Notes_P11 - list - No - False - - - Toolbar button to create new To-do note - New To-do - - qtl_toolbar_tiny_4 - Notes_L7 - button - No - False - - - Default texxt value for Description field in a dataform - Description - - qtl_dataform_editor_sec - Notes_P12 - formlabel_5_val - No - False - - - Default text value for Subject field in a dataform - Subject - - qtl_dataform_editor_sec - Notes_P12 - formlabel_4_val - No - False - - - Item specific menu item . This action launchs the To-Do editor to add due date and remainder for the selected note - Make it as To-do note - - qtl_menu_sec - Notes_P1 - menu - No - False - - - toolbar button text in landscape mode . If user taps on this button, Find functionality is enabled in all notes view - Find - - qtl_toolbar_tiny_4 - Notes_L1 - button - No - False - - - Sub title in To-do Editor - To-do - - qtl_groupbox_simple_sec - Notes_P8 - subhead - No - False - - - Option menu item to create new note - New note - - qtl_menu_pri - Notes_P5 - opt - No - False - - - Secondary text item to mention modification time for a note - Modified at %1 - - qtl_list_sec_graphic - Notes_P1 - dblist_14_val - No - False - - - Priority value in Combo Box used in a dataform - Low - - qtl_dataform_combobox_sec - Notes_P8 - setlabel_4_val - No - False - - - Secondary text item to mention creation date and time for a task - Created on %1 %2 - - qtl_list_sec_graphic - Notes_P1 - dblist_1_val - No - False - - - Message dialog header text . Time picker component embedded - Alarm time - - qtl_dialog_pri_heading - Notes_P9 - title - No - False - - - Label item in Data form - Due date - - qtl_dataform_pri - Notes_P8 - formlabel_1 - No - False - - - Options menu item to remove description from the To-do editor - Remove description - - qtl_menu_pri - Notes_P12 - opt - No - False - - - Message dialog header text . Date picker component embedded - Alarm date - - qtl_dialog_pri_heading - Notes_P9 - title - No - False - - - Item specific menu item to mark a task as not done - Mark as not done - - qtl_menu_sec - Notes_P1 - menu - No - False - - - Soft notification dialog info text. This dialog is displayed once the note is modified and saved - Note saved - - qtl_notifdialog_pri2 - Notes - dpopinfo - No - False - - - toolbar button text in landscape mode . If user taps on this button, Notes editor is launched to add note - New note - - qtl_toolbar_tiny_4 - Notes_L1 - button - No - False - - - Secondary text item to mention creation time for a note - Created at %1 - - qtl_list_sec_graphic - Notes_P1 - dblist_12_val - No - False - - - Sub title for All Notes view - %Ln Notes - - qtl_groupbox_simple_sec - Notes_P1 - subhead - No - False - - - Primary text label in To-do Viewer - Description: - - qtl_list_pri - Notes_P11 - dblist_7 - No - False - - - Primary text label in To-do viewer - Subject: - - qtl_list_pri_graphic_add - Notes_P11 - dblist_5 - No - False - - - Options menu item to add description field in To-do note editor - Add description - - qtl_menu_pri - Notes_P8 - opt - No - False - - - List item to show the number<Count> of items (To-Dos, Recent notes, Favourites) - Right side of the list item - [ %1 ] - - qtl_list_pri - Notes_P2 - list - No - False - - - Date push button in Data Form to set due date for a To-do note. This action opens the date picker component - %1 - - qtl_dataform_button_sec - Notes_P8 - button - No - False - - - Priority value in Combo Box used in a dataform - High - - qtl_dataform_combobox_sec - Notes_P8 - setlabel_4_val - No - False - - - Completed date value (Secondary text ) in To-do viewer - %1 - - qtl_list_sec - Notes_P11 - dblist_6_val - No - False - - - Option menu item to discard the changes done in the notes editor - Discard changes - - qtl_menu_pri - Notes_P5 - opt - No - False - - - Notes application in application library grid view - Notes - - qtl_grid_applications_sec - Notes - list - No - False - - - Delete - Confirmation dialog softkey button - Delete - - qtl_dialog_softkey_2 - Notes_P19 - button - No - False - - - Options menu item to change the completed to-do status to not-completed - Mark as not done - - qtl_menu_pri - Notes_P11 - opt - No - False - - - Primary text label in To-do viewer - Completed date: - - qtl_list_pri - Notes_P11 - dblist_6 - No - False - - - Priority value in Combo Box used in a dataform - Normal - - qtl_dataform_combobox_sec - Notes_P8 - setlabel_4_val - No - False - - - Sub title in Recent notes list view - Plain notes - - qtl_groupbox_simple_sec - Notes_P6 - subhead - No - False - - - Toolbar button item to delete the note - Delete - - qtl_toolbar_tiny_3 - Notes_L4 - button - No - False - - - Collections name in the list widget (Left Side) - Favorites - - qtl_list_pri - Notes_P2 - list - No - False - - - Confirmation dialog text for deleting a note - Delete note? - - qtl_dialog_pri5_large_graphic - Notes_P19 - info - No - False - - - Creation & Modification time and date will be shown in the groupBox. Custom groupBox label . Text shown on the right side of the widget - %1 %2 - - txt_notes_subhead_1_2 - Notes_P5 - subhead - No - False - - - One of the toolbar button text in landscape mode . If user taps on this button, All notes view is displayed - All notes - - qtl_toolbar_tiny_4 - Notes_L1 - button - No - False - - - Confirmation dialog text for deleting a To-do note - Delete To-do note? - - qtl_dialog_pri5_large_graphic - Notes_P19 - info - No - False - - - Item specific menu item to remove the note from favorites - Remove from favorites - - qtl_menu_sec - Notes_P1 - menu - No - False - - - Toolbar button to launch calendar editor and add content in the subject and description field - Add to Calendar - - qtl_toolbar_tiny_3 - Notes_L4 - button - No - False - - - Notes application in application library list view - Notes - - qtl_list_pri_large_graphic - Notes - list - No - False - - - Custom layout ID. No parent . If the view is empty, this text should be displayed in the All notes empy list view. Same text is used in landscape as well - No notes available - - txt_notes_list_no_notes_available - Notes_P1 - list - No - False - - - Tool bar button used to send the note to other user - Send - - qtl_toolbar_tiny_3 - Notes_L4 - button - No - False - - - Collections name in the list widget (Left Side) - Plain notes - - qtl_list_pri - Notes_P2 - list - No - False - - - Alarm time and date for To-do note - %1 %2 - - qtl_list_pri_graphic - Notes_P11 - list - No - False - - - Secondary text item to mention creation date for a note - Created on %1 - - qtl_list_sec_graphic - Notes_P1 - dblist_11_val - No - False - - - Message dialog header text . Date picker component embedded - Due date - - qtl_dialog_pri_heading - Notes_P9 - title - No - False - - - Collections name in the list widget (Left Side) - To-do's - - qtl_list_pri - Notes_P2 - list - No - False - - - Layout ID Parent. Custom GroupBox. Sub title in Notes editor (Left Side) - Note - - txt_notes_subhead_note - Notes_P5 - subhead - No - False - - - Confirmation dialog text for deleting multiple to-do notes - Delete To-do notes? - - qtl_dialog_pri5_large_graphic - Notes_P19 - info - No - False - - - Soft notification dialog info text. This dialog is displayed once the new note is saved - New note saved - - qtl_notifdialog_pri2 - Notes - dpopinfo - No - False - - - Layout ID Parent. Date Push Button in Dataform to set alarm date for a To-do note. This action opens the date picker component - %2 - - txt_notes_button_2 - Notes_P8 - button - No - False - - - Options menu item to convert a note to To-Do item. This action launchs To-Do editor to add due date and reminder - Make it as To-do note - - qtl_menu_pri - Notes_P4 - opt - No - False - - - Options menu item to remove the note from favorites item - Remove from favorites - - qtl_menu_pri - Notes_P5 - opt - No - False - - - Layout ID Parent. Custom GroupBox. Sub title in Notes editor (Creating new note) - Left side text - New note - - txt_notes_subhead_new_note - Notes_P4 - subhead - No - False - - - Sub title in New To-do note editor - New To-do - - qtl_groupbox_simple_sec - Notes_P12 - subhead - No - False - - - Title bar text for Notes application+ - Notes - - qtl_titlebar - Notes_P1 - title - No - False - - - Options menu item to mark the note as favorite item - Mark as favorite - - qtl_menu_pri - Notes_P4 - opt - No - False - - - Notes application name in Task Switcher - Notes - - txt_tsw_caption_notes - tsw01 - caption - ts - False - - - Sub title for Collections view - Collections - - qtl_groupbox_simple_sec - Notes_P2 - subhead - No - False - - - Label item in Data form - Alarm date and time - - qtl_dataform_pri - Notes_P8 - formlabel_3 - No - False - - - toolbar button text in landscape mode . If user taps on this button, Collections view is displayed - Collections - - qtl_toolbar_tiny_4 - Notes_L1 - button - No - False - - - One of 3 buttons in Toolbar . Toolbar button item to edit the To-do note - Edit - - qtl_toolbar_tiny_3 - Notes_P11 - button - No - False - - - Secondary text item to mention modified date & time for a note - Modified on %1 %2 - - qtl_list_sec_graphic - Notes_P1 - dblist_2_val - No - False - - - Layout ID Parent. Custom Widget . Time Push Button in Dataform to set alarm time for a To-do note. This action opens the time picker component - %1 - - txt_notes_button_1 - Notes_P8 - button - No - False - - - Confirmation dialog text for deleting multiple notes - Delete notes? - - qtl_dialog_pri5_large_graphic - Notes_P19 - info - No - False - - - Sub title in Favorite notes list view - Favorites - - qtl_groupbox_simple_sec - Notes_P3 - subhead - No - False - - - Secondary text item in the list to show due date for a task - Due on %1 - - qtl_list_sec_graphic - Notes_P1 - dblist_3_val - No - False - - - Item specific menu item to mark a note as favorite - Mark as favorite - - qtl_menu_sec - Notes_P1 - menu - No - False - - - Secondary text in the list item. If subject is not mentioned for a note, this text is displayed as secondary text in the All notes list view - Unnamed - - qtl_list_sec_graphic - Notes_P11 - dblist_5_val - No - False - - - Secondary text item in the list to show completed date for To-do note - Completed on %1 - - qtl_list_sec_graphic - Notes_P1 - dblist_4_val - No - False - - - Options menu item to change the non-completed to-do status to completed - Mark as done - - qtl_menu_pri - Notes_P11 - opt - No - False - - - Soft notification dialog info text. This dialog is displayed once the new to-do note is saved - New To-do note saved - - qtl_notifdialog_pri2 - Notes_P10 - dpopinfo - No - False - - - Label item in Data form - Priority - - qtl_dataform_pri - Notes_P8 - setlabel_4 - No - False - - - Soft notification dialog info text. This dialog is displayed once to-do note is modified and saved - To-do note saved - - qtl_notifdialog_pri2 - Notes_P10 - dpopinfo - No - False - - - Sub title in To-do notes list view - To-do's (%Ln Pending ) - - qtl_groupbox_simple_sec - Notes_P7 - subhead - No - False - - - Notes application name in Task Switcher - Notes - - cell_tport_appsw_pane_t1 - Task Switcher - caption - Ta - False - - - Secondary text item to mention modification date for a note - Modified on %1 - - qtl_list_sec_graphic - Notes_P1 - dblist_13_val - No - False - - - Primary text in all notes list view if the subject is not mentioned for a To-do note - Unnamed - - qtl_list_pri_graphic_add - Notes_P1 - dblist_11 - No - False - - - Item specific menu item. This action launches the event editor and adds the notes content to the subject & description field - Add to Calendar - - qtl_menu_sec - Notes_P1 - menu - No - False - - - If a plain note is marked as To-do note in the list view, the marked item disappears from the current view with a notification dialog - Note moved to To-do's - - qtl_notifdialog_pri2 - Notes - dpopinfo - No - False - - - Item specific menu item to mark a task as completed - Mark as done - - qtl_menu_sec - Notes_P1 - menu - No - False - - - Checkbox label item to enable/disable alarm - Alarm - - qtl_dataform_checkbox_sec - Notes_P8 - formlabel_2 - No - False - - - diff -r 5de72ea7a065 -r 579cc610882e notes/data/xml/notescollectionsview.docml --- a/notes/data/xml/notescollectionsview.docml Wed Jun 23 18:11:28 2010 +0300 +++ b/notes/data/xml/notescollectionsview.docml Tue Jul 06 14:14:56 2010 +0300 @@ -1,10 +1,10 @@ - +